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.149 by root, Mon Dec 13 06:44:18 2004 UTC

… …
39 while (len--) 39 while (len--)
40 *start++ = value; 40 *start++ = value;
41} 41}
42 42
43/* ------------------------------------------------------------------------- */ 43/* ------------------------------------------------------------------------- */
44#define PROP_SIZE 16384 44#define PROP_SIZE 256*1024
45#define PASTE_SIZE 32768
45#define TABSIZE 8 /* default tab size */ 46#define TABSIZE 8 /* default tab size */
46 47
47/* ------------------------------------------------------------------------- * 48/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 50 * ------------------------------------------------------------------------- */
… …
566 return scrn; 567 return scrn;
567 568
568 selection_check (2); /* check for boundary cross */ 569 selection_check (2); /* check for boundary cross */
569 570
570 SWAP_IT (current_screen, scrn, int); 571 SWAP_IT (current_screen, scrn, int);
572
573 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
574 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
575# ifdef DEBUG_STRICT
576 assert (screen.cur.row >= 0 && screen.cur.row < prev_nrow);
577 assert (screen.cur.col >= 0 && screen.cur.col < prev_ncol);
578# else /* drive with your eyes closed */
579 MAX_IT (screen.cur.row, 0);
580 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
581 MAX_IT (screen.cur.col, 0);
582 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
583# endif
584
571#if NSCREENS 585#if NSCREENS
572 if (options & Opt_secondaryScreen) 586 if (options & Opt_secondaryScreen)
573 { 587 {
574 num_scr = 0; 588 num_scr = 0;
575 offset = TermWin.saveLines; 589 offset = TermWin.saveLines;
590
576 for (i = prev_nrow; i--;) 591 for (i = prev_nrow; i--;)
577 { 592 {
578 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); 593 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
579 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); 594 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
580 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); 595 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
581 } 596 }
582 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 597
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); 598 SWAP_IT (screen.charset, swap.charset, int16_t);
594 SWAP_IT (screen.flags, swap.flags, int); 599 SWAP_IT (screen.flags, swap.flags, int);
595 screen.flags |= Screen_VisibleCursor; 600 screen.flags |= Screen_VisibleCursor;
596 swap.flags |= Screen_VisibleCursor; 601 swap.flags |= Screen_VisibleCursor;
597 } 602 }
598 else 603 else
599#endif 604#endif
600 if (options & Opt_secondaryScroll) 605 if (options & Opt_secondaryScroll)
601 //if (current_screen == PRIMARY)
602 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); 606 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0);
607
603 return scrn; 608 return scrn;
604} 609}
605 610
606// clear WrapNext indicator, solidifying position on next line 611// clear WrapNext indicator, solidifying position on next line
607void 612void
… …
878 883
879 stp = screen.text[row]; /* _must_ refresh */ 884 stp = screen.text[row]; /* _must_ refresh */
880 srp = screen.rend[row]; /* _must_ refresh */ 885 srp = screen.rend[row]; /* _must_ refresh */
881 } 886 }
882 887
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 888 // 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 889 // do wcwidth before further replacements, as wcwidth says that line-drawing
888 // characters have width -1 (DOH!) on GNU/Linux sometimes. 890 // characters have width -1 (DOH!) on GNU/Linux sometimes.
889 int width = c < 0x100 ? 1 : wcwidth (c); 891 int width = c < 0x100 ? 1 : wcwidth (c);
890 892
891 if (charsets[screen.charset] == '0') // DEC SPECIAL 893 if (charsets[screen.charset] == '0') // DEC SPECIAL
892 { 894 {
893 // vt100 special graphics and line drawing 895 // vt100 special graphics and line drawing
894 // 5f-7e standard vt100 896 // 5f-7e standard vt100
895 // 40-5e rxvt extension for extra curses acs chars 897 // 40-5e rxvt extension for extra curses acs chars
896 static uint16_t vt100_0[63] = { // 5f .. 7e 898 static uint16_t vt100_0[63] = { // 40 .. 7e
897 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman! 899 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman!
898 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f 900 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f
899 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57 901 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57
900 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f 902 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f
901 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 903 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
… …
909 c = vt100_0[c - 0x40]; 911 c = vt100_0[c - 0x40];
910 width = 1; 912 width = 1;
911 } 913 }
912 } 914 }
913 915
916 if (screen.flags & Screen_Insert)
917 scr_insdel_chars (width, INSERT);
918
914 if (width != 0) 919 if (width != 0)
915 { 920 {
916 // some utf-8 decoders decode surrogate characters. 921 // some utf-8 decoders decode surrogate characters.
917 if (0xd800 <= c && c <= 0xdfff) 922 if (0xd800 <= c && c <= 0xdfff)
918 c = 0xfffd; 923 c = 0xfffd;
… …
968 c = NOCHAR; 973 c = NOCHAR;
969 } 974 }
970 while (--width > 0); 975 while (--width > 0);
971 976
972 // pad with spaces when overwriting wide character with smaller one 977 // pad with spaces when overwriting wide character with smaller one
978 if (!width)
973 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) 979 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)
974 { 980 {
975 stp[c] = ' '; 981 stp[c] = ' ';
976 srp[c] = rend; 982 srp[c] = rend;
977 } 983 }
978 } 984 }
979 else if (width == 0) 985 else if (width == 0)
980 { 986 {
981#if ENABLE_COMBINING 987#if ENABLE_COMBINING
982 // handle combining characters 988 // handle combining characters
… …
989 995
990 if (screen.cur.col > 0) 996 if (screen.cur.col > 0)
991 { 997 {
992 tp = stp + screen.cur.col - 1; 998 tp = stp + screen.cur.col - 1;
993 rp = srp + screen.cur.col - 1; 999 rp = srp + screen.cur.col - 1;
1000
1001 while (*tp == NOCHAR && tp > stp)
1002 tp--, rp--;
994 } 1003 }
995 else if (screen.cur.row > 0 1004 else if (screen.cur.row > 0
996 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) 1005 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)
997 { 1006 {
998 tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 1007 int line = screen.cur.row - 1 + TermWin.saveLines;
999 rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 1008
1009 tp = screen.text[line] + last_col - 1;
1010 rp = screen.rend[line] + last_col - 1;
1011
1012 while (*tp == NOCHAR && tp > screen.text[line])
1013 tp--, rp--;
1000 } 1014 }
1001 else 1015 else
1002 continue; 1016 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 1017
1013 // first try to find a precomposed character 1018 // first try to find a precomposed character
1014 unicode_t n = rxvt_compose (*tp, c); 1019 unicode_t n = rxvt_compose (*tp, c);
1015 if (n == NOCHAR) 1020 if (n == NOCHAR)
1016 n = rxvt_composite.compose (*tp, c); 1021 n = rxvt_composite.compose (*tp, c);
… …
1096 if (count) 1101 if (count)
1097 x = TermWin.ncol - 1; 1102 x = TermWin.ncol - 1;
1098 1103
1099 // store horizontal tab commands as characters inside the text 1104 // store horizontal tab commands as characters inside the text
1100 // buffer so they can be selected and pasted. 1105 // buffer so they can be selected and pasted.
1101 if (ht) 1106 if (ht && options & Opt_pastableTabs)
1102 { 1107 {
1103 base_rend = SET_FONT (base_rend, 0); 1108 base_rend = SET_FONT (base_rend, 0);
1104 1109
1105 if (screen.tlen[row] != -1) /* XXX: think about this */ 1110 if (screen.tlen[row] != -1) /* XXX: think about this */
1106 MAX_IT (screen.tlen[row], x); 1111 MAX_IT (screen.tlen[row], x);
… …
1379 ren = DEFAULT_RSTYLE; 1384 ren = DEFAULT_RSTYLE;
1380 CLEAR_ROWS (row, num); 1385 CLEAR_ROWS (row, num);
1381 } 1386 }
1382 else 1387 else
1383 { 1388 {
1384 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1389 ren = rstyle & (RS_fgMask | RS_bgMask);
1385 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1390 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1386 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1391 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1387 ERASE_ROWS (row, num); 1392 ERASE_ROWS (row, num);
1388 gcvalue.foreground = pix_colors[Color_fg]; 1393 gcvalue.foreground = pix_colors[Color_fg];
1389 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1394 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1390 } 1395 }
1391 1396
1392 for (; num--; row++) 1397 for (; num--; row++)
1393 { 1398 {
1394 scr_blank_screen_mem (screen.text, screen.rend, 1399 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; 1400 screen.tlen[row + row_offset] = 0;
1397 scr_blank_line (drawn_text[row], drawn_rend[row], 1401 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);
1398 (unsigned int)TermWin.ncol, ren);
1399 } 1402 }
1400} 1403}
1401 1404
1402/* ------------------------------------------------------------------------- */ 1405/* ------------------------------------------------------------------------- */
1403/* 1406/*
… …
1487 slp = &screen.tlen[row]; 1490 slp = &screen.tlen[row];
1488 1491
1489 switch (insdel) 1492 switch (insdel)
1490 { 1493 {
1491 case INSERT: 1494 case INSERT:
1492 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1495 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--)
1493 col--)
1494 { 1496 {
1495 stp[col] = stp[col - count]; 1497 stp[col] = stp[col - count];
1496 srp[col] = srp[col - count]; 1498 srp[col] = srp[col - count];
1497 } 1499 }
1498 1500
… …
1508 if (selection.end.row != screen.cur.row 1510 if (selection.end.row != screen.cur.row
1509 || (selection.end.col + count >= TermWin.ncol)) 1511 || (selection.end.col + count >= TermWin.ncol))
1510 CLEAR_SELECTION (); 1512 CLEAR_SELECTION ();
1511 else 1513 else
1512 { /* shift selection */ 1514 { /* shift selection */
1513 selection.beg.col += count; 1515 selection.beg.col += count;
1514 selection.mark.col += count; /* XXX: yes? */ 1516 selection.mark.col += count; /* XXX: yes? */
1515 selection.end.col += count; 1517 selection.end.col += count;
1516 } 1518 }
1517 } 1519 }
1518 1520
1519 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1521 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1520 (unsigned int)count, rstyle); 1522 (unsigned int)count, rstyle);
1521 break; 1523 break;
1522 1524
1523 case ERASE: 1525 case ERASE:
1524 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1526 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1525 selection_check (1); 1527 selection_check (1);
1526 screen.cur.col -= count; 1528 screen.cur.col -= count;
1527 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1529 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1528 (unsigned int)count, rstyle); 1530 (unsigned int)count, rstyle);
1529 break; 1531 break;
1530 1532
1531 case DELETE: 1533 case DELETE:
1532 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1534 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1535 { 1537 {
1536 stp[col] = stp[col + count]; 1538 stp[col] = stp[col + count];
1537 srp[col] = srp[col + count]; 1539 srp[col] = srp[col + count];
1538 } 1540 }
1539 1541
1540 scr_blank_line (& (stp[TermWin.ncol - count]), 1542 scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count],
1541 & (srp[TermWin.ncol - count]),
1542 (unsigned int)count, tr); 1543 (unsigned int)count, tr);
1543 1544
1544 if (*slp == -1) /* break line continuation */ 1545 if (*slp == -1) /* break line continuation */
1545 *slp = TermWin.ncol; 1546 *slp = TermWin.ncol;
1546 1547
… …
1555 || selection.end.col >= TermWin.ncol) 1556 || selection.end.col >= TermWin.ncol)
1556 CLEAR_SELECTION (); 1557 CLEAR_SELECTION ();
1557 else 1558 else
1558 { 1559 {
1559 /* shift selection */ 1560 /* shift selection */
1560 selection.beg.col -= count; 1561 selection.beg.col -= count;
1561 selection.mark.col -= count; /* XXX: yes? */ 1562 selection.mark.col -= count; /* XXX: yes? */
1562 selection.end.col -= count; 1563 selection.end.col -= count;
1563 } 1564 }
1564 } 1565 }
1565 1566
1566 break; 1567 break;
1567 } 1568 }
… …
1751 * XTERM_SEQ: Invoke G2 character set: ESC N 1752 * XTERM_SEQ: Invoke G2 character set: ESC N
1752 * XTERM_SEQ: Invoke G3 character set: ESC O 1753 * XTERM_SEQ: Invoke G3 character set: ESC O
1753 */ 1754 */
1754void 1755void
1755rxvt_term::scr_charset_choose (int set) 1756rxvt_term::scr_charset_choose (int set)
1756 { 1757{
1757 screen.charset = set; 1758 screen.charset = set;
1758 set_font_style (); 1759 set_font_style ();
1759 } 1760}
1760 1761
1761/* ------------------------------------------------------------------------- */ 1762/* ------------------------------------------------------------------------- */
1762/* 1763/*
1763 * Set a font 1764 * Set a font
1764 * XTERM_SEQ: Set G0 character set: ESC ( <C> 1765 * XTERM_SEQ: Set G0 character set: ESC ( <C>
… …
1767 * XTERM_SEQ: Set G3 character set: ESC + <C> 1768 * XTERM_SEQ: Set G3 character set: ESC + <C>
1768 * See set_font_style for possible values for <C> 1769 * See set_font_style for possible values for <C>
1769 */ 1770 */
1770void 1771void
1771rxvt_term::scr_charset_set (int set, unsigned int ch) 1772rxvt_term::scr_charset_set (int set, unsigned int ch)
1772 { 1773{
1773 charsets[set] = (unsigned char)ch; 1774 charsets[set] = (unsigned char)ch;
1774 set_font_style (); 1775 set_font_style ();
1775 } 1776}
1776 1777
1777 1778
1778/* ------------------------------------------------------------------------- * 1779/* ------------------------------------------------------------------------- *
1779 * MAJOR SCREEN MANIPULATION * 1780 * MAJOR SCREEN MANIPULATION *
1780 * ------------------------------------------------------------------------- */ 1781 * ------------------------------------------------------------------------- */
… …
2035 row_offset; /* basic offset in screen structure */ 2036 row_offset; /* basic offset in screen structure */
2036#ifndef NO_CURSORCOLOR 2037#ifndef NO_CURSORCOLOR
2037 rend_t cc1; /* store colours at cursor position (s) */ 2038 rend_t cc1; /* store colours at cursor position (s) */
2038#endif 2039#endif
2039 rend_t *crp; // cursor rendition pointer 2040 rend_t *crp; // cursor rendition pointer
2041
2042 want_refresh = 0; /* screen is current */
2040 2043
2041 if (refresh_type == NO_REFRESH || !TermWin.mapped) 2044 if (refresh_type == NO_REFRESH || !TermWin.mapped)
2042 return; 2045 return;
2043 2046
2044 /* 2047 /*
… …
2242 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) 2245 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2243 continue; 2246 continue;
2244 2247
2245 // redraw one or more characters 2248 // redraw one or more characters
2246 2249
2247 // seek to the beginning if wide characters 2250 // seek to the beginning of wide characters
2248 while (stp[col] == NOCHAR && col > 0) 2251 while (stp[col] == NOCHAR && col > 0)
2249 --col; 2252 --col;
2250 2253
2251 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2254 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2252 text_t *text = stp + col; 2255 text_t *text = stp + col;
… …
2396 } 2399 }
2397 else 2400 else
2398 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2401 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2399 2402
2400 if (rend & RS_Uline && font->descent > 1 && fore != back) 2403 if (rend & RS_Uline && font->descent > 1 && fore != back)
2404 {
2405 XSetForeground (display->display, TermWin.gc, pix_colors[fore]);
2401 XDrawLine (display->display, drawBuffer, TermWin.gc, 2406 XDrawLine (display->display, drawBuffer, TermWin.gc,
2402 xpixel, ypixel + font->ascent + 1, 2407 xpixel, ypixel + font->ascent + 1,
2403 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2408 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2409 }
2404 } /* for (col....) */ 2410 } /* for (col....) */
2405 } /* for (row....) */ 2411 } /* for (row....) */
2406 2412
2407#if ENABLE_OVERLAY 2413#if ENABLE_OVERLAY
2408 scr_swap_overlay (); 2414 scr_swap_overlay ();
… …
2447 if (refresh_type & SMOOTH_REFRESH) 2453 if (refresh_type & SMOOTH_REFRESH)
2448 XFlush (display->display); 2454 XFlush (display->display);
2449 2455
2450 num_scr = 0; 2456 num_scr = 0;
2451 num_scr_allow = 1; 2457 num_scr_allow = 1;
2452 want_refresh = 0; /* screen is current */
2453} 2458}
2454 2459
2455void 2460void
2456rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2461rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp)
2457{ 2462{
… …
2544 int end_row = TermWin.saveLines - TermWin.view_start; 2549 int end_row = TermWin.saveLines - TermWin.view_start;
2545 int i = selection.beg.row + TermWin.saveLines; 2550 int i = selection.beg.row + TermWin.saveLines;
2546 int col, row = selection.end.row + TermWin.saveLines; 2551 int col, row = selection.end.row + TermWin.saveLines;
2547 rend_t *srp; 2552 rend_t *srp;
2548 2553
2549 if (i >= end_row) 2554#if ENABLE_FRILLS
2550 col = selection.beg.col; 2555 if (selection.rect)
2556 {
2557 end_row += TermWin.nrow;
2558
2559 for (; i <= row && i <= end_row; i++)
2560 for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++)
2561 srp[col] ^= RS_RVid;
2562 }
2551 else 2563 else
2564#endif
2565 {
2566 if (i >= end_row)
2567 col = selection.beg.col;
2568 else
2552 { 2569 {
2553 col = 0; 2570 col = 0;
2554 i = end_row; 2571 i = end_row;
2555 } 2572 }
2556 2573
2557 end_row += TermWin.nrow; 2574 end_row += TermWin.nrow;
2575
2558 for (; i < row && i < end_row; i++, col = 0) 2576 for (; i < row && i < end_row; i++, col = 0)
2559 for (srp = screen.rend[i]; col < TermWin.ncol; col++) 2577 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2560 srp[col] ^= RS_RVid; 2578 srp[col] ^= RS_RVid;
2561 2579
2562 if (i == row && i < end_row) 2580 if (i == row && i < end_row)
2563 for (srp = screen.rend[i]; col < selection.end.col; col++) 2581 for (srp = screen.rend[i]; col < selection.end.col; col++)
2564 srp[col] ^= RS_RVid; 2582 srp[col] ^= RS_RVid;
2583 }
2565 } 2584 }
2566} 2585}
2567 2586
2568/* ------------------------------------------------------------------------- */ 2587/* ------------------------------------------------------------------------- */
2569/* 2588/*
… …
2640 */ 2659 */
2641void 2660void
2642rxvt_term::paste (const unsigned char *data, unsigned int len) 2661rxvt_term::paste (const unsigned char *data, unsigned int len)
2643{ 2662{
2644 unsigned int i, j, n; 2663 unsigned int i, j, n;
2645 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE); 2664 unsigned char *ds = (unsigned char *)rxvt_malloc (PASTE_SIZE);
2646 2665
2647 /* convert normal newline chars into common keyboard Return key sequence */ 2666 /* convert normal newline chars into common keyboard Return key sequence */
2648 for (i = 0; i < len; i += PROP_SIZE) 2667 for (i = 0; i < len; i += PASTE_SIZE)
2649 { 2668 {
2650 n = min (len - i, PROP_SIZE); 2669 n = min (len - i, PASTE_SIZE);
2651 memcpy (ds, data + i, n); 2670 memcpy (ds, data + i, n);
2652 2671
2653 for (j = 0; j < n; j++) 2672 for (j = 0; j < n; j++)
2654 if (ds[j] == C0_LF) 2673 if (ds[j] == C0_LF)
2655 ds[j] = C0_CR; 2674 ds[j] = C0_CR;
… …
2663/* ------------------------------------------------------------------------- */ 2682/* ------------------------------------------------------------------------- */
2664/* 2683/*
2665 * Respond to a notification that a primary selection has been sent 2684 * Respond to a notification that a primary selection has been sent
2666 * EXT: SelectionNotify 2685 * EXT: SelectionNotify
2667 */ 2686 */
2668int 2687void
2669rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2688rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2670{ 2689{
2671 long nread = 0;
2672 unsigned long bytes_after;
2673 XTextProperty ct;
2674
2675 if (prop == None) /* check for failed XConvertSelection */ 2690 if (prop == None) /* check for failed XConvertSelection */
2676 { 2691 {
2677 if ((selection_type & Sel_CompoundText)) 2692 if ((selection_type & Sel_CompoundText))
2678 { 2693 {
2679 int selnum = selection_type & Sel_whereMask; 2694 int selnum = selection_type & Sel_whereMask;
… …
2692 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2707 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2693 else 2708 else
2694 selection_type = 0; 2709 selection_type = 0;
2695 } 2710 }
2696 2711
2697 return 0; 2712 return;
2698 }
2699
2700 for (;;)
2701 { 2713 }
2714
2715 unsigned long bytes_after;
2716 XTextProperty ct;
2717
2718 if (XGetWindowProperty (display->display, win, prop,
2719 0, PROP_SIZE / 4,
2720 delete_prop, AnyPropertyType,
2721 &ct.encoding, &ct.format,
2722 &ct.nitems, &bytes_after,
2723 &ct.value) != Success)
2724 {
2725 ct.value = 0;
2726 goto bailout;
2727 }
2728
2729 if (ct.encoding == None)
2730 goto bailout;
2731
2732 if (bytes_after)
2733 {
2734 // fetch and append remaining data
2735 XTextProperty ct2;
2736
2702 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2737 if (XGetWindowProperty (display->display, win, prop,
2703 (long) (PROP_SIZE / 4), delete_prop, 2738 ct.nitems / 4, (bytes_after + 3) / 4,
2739 delete_prop, AnyPropertyType,
2704 AnyPropertyType, &ct.encoding, &ct.format, 2740 &ct2.encoding, &ct2.format,
2705 &ct.nitems, &bytes_after, 2741 &ct2.nitems, &bytes_after,
2706 &ct.value) != Success) 2742 &ct2.value) != Success)
2707 break; 2743 goto bailout;
2708 2744
2709 if (ct.encoding == 0) 2745 // realloc should be compatible to XFree, here, and elsewhere, too
2710 break; 2746 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2747 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2748 ct.nitems += ct2.nitems;
2711 2749
2750 XFree (ct2.value);
2751 }
2752
2753 if (ct.value == 0)
2754 goto bailout;
2755
2712 if (ct.encoding == xa[XA_INCR]) 2756 if (ct.encoding == xa[XA_INCR])
2713 { 2757 {
2714 // INCR selection, start handshake 2758 // INCR selection, start handshake
2759 if (!delete_prop)
2715 XDeleteProperty (display->display, win, prop); 2760 XDeleteProperty (display->display, win, prop);
2761
2716 selection_wait = Sel_incr; 2762 selection_wait = Sel_incr;
2763 incr_buf_fill = 0;
2717 incr_ev.start (NOW + 10); 2764 incr_ev.start (NOW + 10);
2718 break;
2719 }
2720 2765
2721 if (ct.value == NULL) 2766 goto bailout;
2722 continue; 2767 }
2723 2768
2724 if (ct.nitems == 0) 2769 if (ct.nitems == 0)
2770 {
2771 if (selection_wait == Sel_incr)
2772 {
2773 XFree (ct.value);
2774
2775 // finally complete, now paste the whole thing
2776 selection_wait = Sel_normal;
2777 ct.value = (unsigned char *)incr_buf;
2778 ct.nitems = incr_buf_fill;
2779 incr_buf = 0;
2780 incr_buf_size = 0;
2781 incr_ev.stop ();
2725 { 2782 }
2783 else
2784 {
2726 if (selection_wait == Sel_normal && nread == 0 2785 if (selection_wait == Sel_normal
2727 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2786 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2728 { 2787 {
2729 /* 2788 /*
2730 * pass through again trying CUT_BUFFER0 if we've come from 2789 * pass through again trying CUT_BUFFER0 if we've come from
2731 * XConvertSelection () but nothing was presented 2790 * XConvertSelection () but nothing was presented
2732 */ 2791 */
2733 selection_paste (display->root, XA_CUT_BUFFER0, False); 2792 selection_paste (display->root, XA_CUT_BUFFER0, False);
2734 } 2793 }
2735 2794
2736 nread = -1; /* discount any previous stuff */ 2795 goto bailout;
2737 break; 2796 }
2797 }
2798 else if (selection_wait == Sel_incr)
2799 {
2800 incr_ev.start (NOW + 10);
2801
2802 while (incr_buf_fill + ct.nitems > incr_buf_size)
2738 } 2803 {
2804 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2805 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2806 }
2739 2807
2808 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2740 nread += ct.nitems; 2809 incr_buf_fill += ct.nitems;
2741 2810
2811 goto bailout;
2812 }
2813
2742 char **cl; 2814 char **cl;
2743 int cr; 2815 int cr;
2816
2817#if ENABLE_FRILLS
2818 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2819 // so recode it manually
2820 if (ct.encoding == xa[XA_UTF8_STRING])
2821 {
2822 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2823 char *s = rxvt_wcstombs (w);
2824 free (w);
2825 // TODO: strlen == only the first element will be converted. well...
2826 paste ((unsigned char *)s, strlen (s));
2827 free (s);
2828 }
2829 else
2830#endif
2744 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) 2831 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2745 { 2832 && cl)
2833 {
2746 for (int i = 0; i < cr; i++) 2834 for (int i = 0; i < cr; i++)
2747 paste ((unsigned char *)cl[i], strlen (cl[i])); 2835 paste ((unsigned char *)cl[i], strlen (cl[i]));
2748 2836
2749 XFreeStringList (cl); 2837 XFreeStringList (cl);
2750 } 2838 }
2751 else 2839 else
2752 paste (ct.value, ct.nitems); 2840 paste (ct.value, ct.nitems); // paste raw
2753 2841
2754 if (bytes_after == 0) 2842bailout:
2755 break;
2756
2757 XFree (ct.value);
2758 }
2759
2760 if (ct.value)
2761 XFree (ct.value); 2843 XFree (ct.value);
2762 2844
2763 if (selection_wait == Sel_normal) 2845 if (selection_wait == Sel_normal)
2764 selection_wait = Sel_none; 2846 selection_wait = Sel_none;
2765
2766 return (int)nread;
2767} 2847}
2768 2848
2769void 2849void
2770rxvt_term::incr_cb (time_watcher &w) 2850rxvt_term::incr_cb (time_watcher &w)
2771{ 2851{
2772 selection_wait = Sel_none; 2852 selection_wait = Sel_none;
2773 2853
2854 incr_buf_size = 0;
2855 free (incr_buf);
2856
2774 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2857 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2775} 2858}
2776 2859
2777/*
2778 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2779 */
2780void 2860void
2781rxvt_term::selection_property (Window win, Atom prop) 2861rxvt_term::selection_property (Window win, Atom prop)
2782{ 2862{
2783 if (prop == None || selection_wait != Sel_incr) 2863 if (prop == None || selection_wait != Sel_incr)
2784 return; 2864 return;
2785 2865
2786 if (selection_paste (win, prop, 1) > 0) 2866 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} 2867}
2794 2868
2795/* ------------------------------------------------------------------------- */ 2869/* ------------------------------------------------------------------------- */
2796/* 2870/*
2797 * Request the current selection: 2871 * Request the current selection:
… …
2831#else 2905#else
2832 selection_type = Sel_CompoundText; 2906 selection_type = Sel_CompoundText;
2833 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2907 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2834 return; 2908 return;
2835#endif 2909#endif
2836
2837 } 2910 }
2838 } 2911 }
2839 2912
2840 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2913 selection_wait = Sel_none; /* don't loop in selection_paste () */
2841 selection_paste (display->root, XA_CUT_BUFFER0, False); 2914 selection_paste (display->root, XA_CUT_BUFFER0, false);
2842} 2915}
2843 2916
2844int 2917int
2845rxvt_term::selection_request_other (Atom target, int selnum) 2918rxvt_term::selection_request_other (Atom target, int selnum)
2846{ 2919{
… …
2919 2992
2920 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 2993 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2921 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2994 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2922 2995
2923 col = selection.beg.col; 2996 col = selection.beg.col;
2924 MAX_IT (col, 0);
2925 row = selection.beg.row + TermWin.saveLines; 2997 row = selection.beg.row + TermWin.saveLines;
2926 end_row = selection.end.row + TermWin.saveLines; 2998 end_row = selection.end.row + TermWin.saveLines;
2927 int ofs = 0; 2999 int ofs = 0;
2928 int extra = 0; 3000 int extra = 0;
2929 3001
2930 for (; row <= end_row; row++, col = 0) 3002 for (; row <= end_row; row++, col = 0)
2931 { 3003 {
2932 t = &screen.text[row][col];
2933
2934 end_col = screen.tlen[row]; 3004 end_col = screen.tlen[row];
3005
3006#if ENABLE_FRILLS
3007 if (selection.rect)
3008 {
3009 col = selection.beg.col;
3010 end_col = TermWin.ncol + 1;
3011 }
3012#endif
3013
3014 MAX_IT (col, 0);
2935 3015
2936 if (end_col == -1) 3016 if (end_col == -1)
2937 end_col = TermWin.ncol; 3017 end_col = TermWin.ncol;
2938 3018
2939 if (row == end_row) 3019 if (row == end_row || selection.rect)
2940 MIN_IT (end_col, selection.end.col); 3020 MIN_IT (end_col, selection.end.col);
2941 3021
3022 t = &screen.text[row][col];
2942 for (; col < end_col; col++) 3023 for (; col < end_col; col++)
2943 { 3024 {
2944 if (*t == NOCHAR) 3025 if (*t == NOCHAR)
2945 t++; 3026 t++;
2946#if ENABLE_COMBINING 3027#if ENABLE_COMBINING
… …
2994#if 0 3075#if 0
2995 XTextProperty ct; 3076 XTextProperty ct;
2996 3077
2997 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3078 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2998 { 3079 {
2999 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 3080 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3000 PropModeReplace, ct.value, ct.nitems);
3001 XFree (ct.value); 3081 XFree (ct.value);
3002 } 3082 }
3003#endif 3083#endif
3004 3084
3005 selection_time = tm; 3085 selection_time = tm;
… …
3206 enum { 3286 enum {
3207 LEFT, RIGHT 3287 LEFT, RIGHT
3208 } closeto = RIGHT; 3288 } closeto = RIGHT;
3209 3289
3210 want_refresh = 1; 3290 want_refresh = 1;
3291
3211 switch (selection.op) 3292 switch (selection.op)
3212 { 3293 {
3213 case SELECTION_INIT: 3294 case SELECTION_INIT:
3214 CLEAR_SELECTION (); 3295 CLEAR_SELECTION ();
3215 selection.op = SELECTION_BEGIN; 3296 selection.op = SELECTION_BEGIN;
… …
3228 selection_start_colrow (col, row); 3309 selection_start_colrow (col, row);
3229 /* FALLTHROUGH */ 3310 /* FALLTHROUGH */
3230 default: 3311 default:
3231 return; 3312 return;
3232 } 3313 }
3314
3233 if (selection.beg.col == selection.end.col 3315 if (selection.beg.col == selection.end.col
3234 && selection.beg.col != selection.mark.col 3316 && selection.beg.col != selection.mark.col
3235 && selection.beg.row == selection.end.row 3317 && selection.beg.row == selection.end.row
3236 && selection.beg.row != selection.mark.row) 3318 && selection.beg.row != selection.mark.row)
3237 { 3319 {
… …
3287 } 3369 }
3288 else 3370 else
3289 { /* button1 drag or button3 drag */ 3371 { /* button1 drag or button3 drag */
3290 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3372 if (ROWCOL_IS_AFTER (selection.mark, pos))
3291 { 3373 {
3292 if ((selection.mark.row == selection.end.row) 3374 if (selection.mark.row == selection.end.row
3293 && (selection.mark.col == selection.end.col) 3375 && selection.mark.col == selection.end.col
3376 && clickchange
3294 && clickchange && selection.clicks == 2) 3377 && selection.clicks == 2)
3295 selection.mark.col--; 3378 selection.mark.col--;
3296 3379
3297 selection.beg.row = pos.row; 3380 selection.beg.row = pos.row;
3298 selection.beg.col = pos.col; 3381 selection.beg.col = pos.col;
3299 selection.end.row = selection.mark.row; 3382 selection.end.row = selection.mark.row;
… …
3310 3393
3311 if (selection.clicks == 1) 3394 if (selection.clicks == 1)
3312 { 3395 {
3313 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3396 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3314 3397
3315 if (end_col != -1 && selection.beg.col > end_col) 3398 if (selection.beg.col > end_col
3399 && end_col != -1
3400#if ENABLE_FRILLS
3401 && !selection.rect
3402#endif
3316 { 3403 )
3317#if 1
3318 selection.beg.col = ncol; 3404 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 3405
3327 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3406 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3328 3407
3329 if (end_col != -1 && selection.end.col > end_col) 3408 if (
3409 selection.end.col > end_col
3410 && end_col != -1
3411#if ENABLE_FRILLS
3412 && !selection.rect
3413#endif
3414 )
3330 selection.end.col = ncol; 3415 selection.end.col = ncol;
3331 } 3416 }
3332 else if (selection.clicks == 2) 3417 else if (selection.clicks == 2)
3333 { 3418 {
3334 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3419 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3335 selection.end.col--; 3420 selection.end.col--;
3336 3421
3337 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3338 selection_delimit_word (DN, & (selection.end), & (selection.end)); 3422 selection_delimit_word (UP, &selection.beg, &selection.beg);
3423 selection_delimit_word (DN, &selection.end, &selection.end);
3339 } 3424 }
3340 else if (selection.clicks == 3) 3425 else if (selection.clicks == 3)
3341 { 3426 {
3342#if ENABLE_FRILLS 3427#if ENABLE_FRILLS
3343 if ((options & Opt_tripleclickwords)) 3428 if ((options & Opt_tripleclickwords))
3344 { 3429 {
3345 int end_row; 3430 int end_row;
3346 3431
3347 selection_delimit_word (UP, & (selection.beg), & (selection.beg)); 3432 selection_delimit_word (UP, &selection.beg, &selection.beg);
3348 end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; 3433 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3349 3434
3350 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) 3435 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3351 { 3436 {
3352 end_col = screen.tlen[end_row + TermWin.saveLines]; 3437 end_col = screen.tlen[end_row + TermWin.saveLines];
… …
3363 else 3448 else
3364#endif 3449#endif
3365 { 3450 {
3366 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3451 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3367 selection.mark.col++; 3452 selection.mark.col++;
3453
3368 selection.beg.col = 0; 3454 selection.beg.col = 0;
3369 selection.end.col = ncol; 3455 selection.end.col = ncol;
3370 } 3456 }
3371 } 3457 }
3372 3458
… …
3381 { 3467 {
3382 selection.mark.row = selection.beg.row; 3468 selection.mark.row = selection.beg.row;
3383 selection.mark.col = selection.beg.col; 3469 selection.mark.col = selection.beg.col;
3384 } 3470 }
3385 } 3471 }
3386}
3387 3472
3388#if ENABLE_FRILLS 3473#if ENABLE_FRILLS
3474 if (selection.rect && selection.beg.col > selection.end.col)
3475 SWAP_IT (selection.beg.col, selection.end.col, int);
3476#endif
3477}
3478
3479#if ENABLE_FRILLS
3389void 3480void
3390rxvt_term::selection_remove_trailing_spaces () 3481rxvt_term::selection_remove_trailing_spaces ()
3391{ 3482{
3392 int32_t end_col, end_row; 3483 int32_t end_col, end_row;
3393 text_t *stp; 3484 text_t *stp;
3394 3485
3395 end_col = selection.end.col; 3486 end_col = selection.end.col;
3396 end_row = selection.end.row; 3487 end_row = selection.end.row;
3488
3397 for ( ; end_row >= selection.beg.row; ) 3489 for ( ; end_row >= selection.beg.row; )
3398 { 3490 {
3399 stp = screen.text[end_row + TermWin.saveLines]; 3491 stp = screen.text[end_row + TermWin.saveLines];
3492
3400 while (--end_col >= 0) 3493 while (--end_col >= 0)
3401 { 3494 {
3402 if (stp[end_col] != ' ' && stp[end_col] != '\t') 3495 if (stp[end_col] != ' '
3496 && stp[end_col] != '\t'
3497 && stp[end_col] != NOCHAR)
3403 break; 3498 break;
3404 } 3499 }
3500
3405 if (end_col >= 0 3501 if (end_col >= 0
3406 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3502 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1)
3407 { 3503 {
3408 selection.end.col = end_col + 1; 3504 selection.end.col = end_col + 1;
3409 selection.end.row = end_row; 3505 selection.end.row = end_row;
3410 break; 3506 break;
3411 } 3507 }
3508
3412 end_row--; 3509 end_row--;
3413 end_col = TermWin.ncol; 3510 end_col = TermWin.ncol;
3414 } 3511 }
3512
3415 if (selection.mark.row > selection.end.row) 3513 if (selection.mark.row > selection.end.row)
3416 { 3514 {
3417 selection.mark.row = selection.end.row; 3515 selection.mark.row = selection.end.row;
3418 selection.mark.col = selection.end.col; 3516 selection.mark.col = selection.end.col;
3419 } 3517 }
… …
3435 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3533 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3436} 3534}
3437 3535
3438/* ------------------------------------------------------------------------- */ 3536/* ------------------------------------------------------------------------- */
3439/* 3537/*
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 3538 * Respond to a request for our current selection
3449 * EXT: SelectionRequest 3539 * EXT: SelectionRequest
3450 */ 3540 */
3451void 3541void
3452rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3542rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3453{ 3543{
3454 XSelectionEvent ev; 3544 XSelectionEvent ev;
3455 XTextProperty ct;
3456 XICCEncodingStyle style;
3457 Atom target;
3458 3545
3459 ev.type = SelectionNotify; 3546 ev.type = SelectionNotify;
3460 ev.property = None; 3547 ev.property = None;
3461 ev.display = rq.display; 3548 ev.display = rq.display;
3462 ev.requestor = rq.requestor; 3549 ev.requestor = rq.requestor;
… …
3464 ev.target = rq.target; 3551 ev.target = rq.target;
3465 ev.time = rq.time; 3552 ev.time = rq.time;
3466 3553
3467 if (rq.target == xa[XA_TARGETS]) 3554 if (rq.target == xa[XA_TARGETS])
3468 { 3555 {
3469 Atom32 target_list[6]; 3556 Atom target_list[6];
3470 Atom32 *target = target_list; 3557 Atom *target = target_list;
3471 3558
3472 *target++ = (Atom32) xa[XA_TARGETS]; 3559 *target++ = xa[XA_TARGETS];
3473 *target++ = (Atom32) xa[XA_TIMESTAMP]; 3560 *target++ = xa[XA_TIMESTAMP];
3474 *target++ = (Atom32) XA_STRING; 3561 *target++ = XA_STRING;
3475 *target++ = (Atom32) xa[XA_TEXT]; 3562 *target++ = xa[XA_TEXT];
3476 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3563 *target++ = xa[XA_COMPOUND_TEXT];
3477#if X_HAVE_UTF8_STRING 3564#if X_HAVE_UTF8_STRING
3478 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3565 *target++ = xa[XA_UTF8_STRING];
3479#endif 3566#endif
3480 3567
3481 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3568 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,
3482 (8 * sizeof (target_list[0])), PropModeReplace, 3569 32, PropModeReplace,
3483 (unsigned char *)target_list, 3570 (unsigned char *)target_list, target - target_list);
3484 target - target_list);
3485 ev.property = rq.property; 3571 ev.property = rq.property;
3486 } 3572 }
3487#if TODO // TODO 3573#if TODO // TODO
3488 else if (rq.target == xa[XA_MULTIPLE]) 3574 else if (rq.target == xa[XA_MULTIPLE])
3489 { 3575 {
3490 /* TODO: Handle MULTIPLE */ 3576 /* TODO: Handle MULTIPLE */
3491 } 3577 }
3492#endif 3578#endif
3493 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3579 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3494 { 3580 {
3495 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3581 XChangeProperty (display->display, rq.requestor, rq.property, rq.target,
3496 (8 * sizeof (Time)), PropModeReplace,
3497 (unsigned char *)&selection_time, 1); 3582 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3498 ev.property = rq.property; 3583 ev.property = rq.property;
3499 } 3584 }
3500 else if (rq.target == XA_STRING 3585 else if (rq.target == XA_STRING
3501 || rq.target == xa[XA_TEXT] 3586 || rq.target == xa[XA_TEXT]
3502 || rq.target == xa[XA_COMPOUND_TEXT] 3587 || rq.target == xa[XA_COMPOUND_TEXT]
3503 || rq.target == xa[XA_UTF8_STRING] 3588 || rq.target == xa[XA_UTF8_STRING]
3504 ) 3589 )
3505 { 3590 {
3591 XTextProperty ct;
3592 Atom target = rq.target;
3506 short freect = 0; 3593 short freect = 0;
3507 int selectlen; 3594 int selectlen;
3508 wchar_t *cl; 3595 wchar_t *cl;
3509 3596 enum {
3510 target = rq.target; 3597 enc_string = XStringStyle,
3598 enc_text = XStdICCTextStyle,
3599 enc_compound_text = XCompoundTextStyle,
3600#ifdef X_HAVE_UTF8_STRING
3601 enc_utf8 = XUTF8StringStyle,
3602#else
3603 enc_utf8 = -1,
3604#endif
3605 } style;
3511 3606
3512 if (target == XA_STRING) 3607 if (target == XA_STRING)
3513 // we actually don't do XA_STRING, but who cares, as i18n clients 3608 // we actually don't do XA_STRING, but who cares, as i18n clients
3514 // will ask for another format anyways. 3609 // will ask for another format anyways.
3515 style = XStringStyle; 3610 style = enc_string;
3516 else if (target == xa[XA_TEXT]) 3611 else if (target == xa[XA_TEXT])
3517 style = XStdICCTextStyle; 3612 style = enc_text;
3518 else if (target == xa[XA_COMPOUND_TEXT]) 3613 else if (target == xa[XA_COMPOUND_TEXT])
3519 style = XCompoundTextStyle; 3614 style = enc_compound_text;
3520#if X_HAVE_UTF8_STRING 3615#if ENABLE_FRILLS
3521 else if (target == xa[XA_UTF8_STRING]) 3616 else if (target == xa[XA_UTF8_STRING])
3522 style = XUTF8StringStyle; 3617 style = enc_utf8;
3523#endif 3618#endif
3524 else 3619 else
3525 { 3620 {
3526 target = xa[XA_COMPOUND_TEXT]; 3621 target = xa[XA_COMPOUND_TEXT];
3527 style = XCompoundTextStyle; 3622 style = enc_compound_text;
3528 } 3623 }
3529 3624
3530 if (selection.text) 3625 if (selection.text)
3531 { 3626 {
3532 cl = selection.text; 3627 cl = selection.text;
… …
3536 { 3631 {
3537 cl = L""; 3632 cl = L"";
3538 selectlen = 0; 3633 selectlen = 0;
3539 } 3634 }
3540 3635
3541 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it 3636#if ENABLE_FRILLS
3542 // manually for XUTF8StringStyle. 3637 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3638 // so recode it manually
3639 if (style == enc_utf8)
3640 {
3641 freect = 1;
3642 ct.encoding = target;
3643 ct.format = 8;
3644 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3645 ct.nitems = strlen ((char *)ct.value);
3646 }
3647 else
3648#endif
3543 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3649 if (XwcTextListToTextProperty (display->display, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3544 freect = 1; 3650 freect = 1;
3545 else 3651 else
3546 { 3652 {
3547 /* if we failed to convert then send it raw */ 3653 /* if we failed to convert then send it raw */
3548 ct.value = (unsigned char *)cl; 3654 ct.value = (unsigned char *)cl;
3549 ct.nitems = selectlen; 3655 ct.nitems = selectlen;
3656 ct.encoding = target;
3550 } 3657 }
3551 3658
3552 XChangeProperty (display->display, rq.requestor, rq.property, 3659 XChangeProperty (display->display, rq.requestor, rq.property,
3553 target, 8, PropModeReplace, 3660 ct.encoding, 8, PropModeReplace,
3554 ct.value, (int)ct.nitems); 3661 ct.value, (int)ct.nitems);
3555 ev.property = rq.property; 3662 ev.property = rq.property;
3556 3663
3557 if (freect) 3664 if (freect)
3558 XFree (ct.value); 3665 XFree (ct.value);

Diff Legend

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