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.158 by root, Sat Feb 19 19:37:34 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 * ------------------------------------------------------------------------- */
… …
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
… …
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);
… …
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}
1401 1394
1402/* ------------------------------------------------------------------------- */ 1395/* ------------------------------------------------------------------------- */
1403/* 1396/*
… …
1487 slp = &screen.tlen[row]; 1480 slp = &screen.tlen[row];
1488 1481
1489 switch (insdel) 1482 switch (insdel)
1490 { 1483 {
1491 case INSERT: 1484 case INSERT:
1492 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1485 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--)
1493 col--)
1494 { 1486 {
1495 stp[col] = stp[col - count]; 1487 stp[col] = stp[col - count];
1496 srp[col] = srp[col - count]; 1488 srp[col] = srp[col - count];
1497 } 1489 }
1498 1490
… …
1508 if (selection.end.row != screen.cur.row 1500 if (selection.end.row != screen.cur.row
1509 || (selection.end.col + count >= TermWin.ncol)) 1501 || (selection.end.col + count >= TermWin.ncol))
1510 CLEAR_SELECTION (); 1502 CLEAR_SELECTION ();
1511 else 1503 else
1512 { /* shift selection */ 1504 { /* shift selection */
1513 selection.beg.col += count; 1505 selection.beg.col += count;
1514 selection.mark.col += count; /* XXX: yes? */ 1506 selection.mark.col += count; /* XXX: yes? */
1515 selection.end.col += count; 1507 selection.end.col += count;
1516 } 1508 }
1517 } 1509 }
1518 1510
1519 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1511 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1520 (unsigned int)count, rstyle); 1512 (unsigned int)count, rstyle);
1521 break; 1513 break;
1522 1514
1523 case ERASE: 1515 case ERASE:
1524 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1516 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1525 selection_check (1); 1517 selection_check (1);
1526 screen.cur.col -= count; 1518 screen.cur.col -= count;
1527 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1519 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1528 (unsigned int)count, rstyle); 1520 (unsigned int)count, rstyle);
1529 break; 1521 break;
1530 1522
1531 case DELETE: 1523 case DELETE:
1532 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1524 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1535 { 1527 {
1536 stp[col] = stp[col + count]; 1528 stp[col] = stp[col + count];
1537 srp[col] = srp[col + count]; 1529 srp[col] = srp[col + count];
1538 } 1530 }
1539 1531
1540 scr_blank_line (& (stp[TermWin.ncol - count]), 1532 scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count],
1541 & (srp[TermWin.ncol - count]),
1542 (unsigned int)count, tr); 1533 (unsigned int)count, tr);
1543 1534
1544 if (*slp == -1) /* break line continuation */ 1535 if (*slp == -1) /* break line continuation */
1545 *slp = TermWin.ncol; 1536 *slp = TermWin.ncol;
1546 1537
… …
1555 || selection.end.col >= TermWin.ncol) 1546 || selection.end.col >= TermWin.ncol)
1556 CLEAR_SELECTION (); 1547 CLEAR_SELECTION ();
1557 else 1548 else
1558 { 1549 {
1559 /* shift selection */ 1550 /* shift selection */
1560 selection.beg.col -= count; 1551 selection.beg.col -= count;
1561 selection.mark.col -= count; /* XXX: yes? */ 1552 selection.mark.col -= count; /* XXX: yes? */
1562 selection.end.col -= count; 1553 selection.end.col -= count;
1563 } 1554 }
1564 } 1555 }
1565 1556
1566 break; 1557 break;
1567 } 1558 }
… …
1751 * XTERM_SEQ: Invoke G2 character set: ESC N 1742 * XTERM_SEQ: Invoke G2 character set: ESC N
1752 * XTERM_SEQ: Invoke G3 character set: ESC O 1743 * XTERM_SEQ: Invoke G3 character set: ESC O
1753 */ 1744 */
1754void 1745void
1755rxvt_term::scr_charset_choose (int set) 1746rxvt_term::scr_charset_choose (int set)
1756 { 1747{
1757 screen.charset = set; 1748 screen.charset = set;
1758 set_font_style (); 1749 set_font_style ();
1759 } 1750}
1760 1751
1761/* ------------------------------------------------------------------------- */ 1752/* ------------------------------------------------------------------------- */
1762/* 1753/*
1763 * Set a font 1754 * Set a font
1764 * XTERM_SEQ: Set G0 character set: ESC ( <C> 1755 * XTERM_SEQ: Set G0 character set: ESC ( <C>
… …
1767 * XTERM_SEQ: Set G3 character set: ESC + <C> 1758 * XTERM_SEQ: Set G3 character set: ESC + <C>
1768 * See set_font_style for possible values for <C> 1759 * See set_font_style for possible values for <C>
1769 */ 1760 */
1770void 1761void
1771rxvt_term::scr_charset_set (int set, unsigned int ch) 1762rxvt_term::scr_charset_set (int set, unsigned int ch)
1772 { 1763{
1773 charsets[set] = (unsigned char)ch; 1764 charsets[set] = (unsigned char)ch;
1774 set_font_style (); 1765 set_font_style ();
1775 } 1766}
1776 1767
1777 1768
1778/* ------------------------------------------------------------------------- * 1769/* ------------------------------------------------------------------------- *
1779 * MAJOR SCREEN MANIPULATION * 1770 * MAJOR SCREEN MANIPULATION *
1780 * ------------------------------------------------------------------------- */ 1771 * ------------------------------------------------------------------------- */
… …
1901rxvt_term::scr_page (enum page_dirn direction, int nlines) 1892rxvt_term::scr_page (enum page_dirn direction, int nlines)
1902{ 1893{
1903 int n; 1894 int n;
1904 unsigned int oldviewstart; 1895 unsigned int oldviewstart;
1905 1896
1906#ifdef DEBUG_STRICT
1907 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1908#endif
1909 oldviewstart = TermWin.view_start; 1897 oldviewstart = TermWin.view_start;
1898
1910 if (direction == UP) 1899 if (direction == UP)
1911 { 1900 {
1912 n = TermWin.view_start + nlines; 1901 n = TermWin.view_start + nlines;
1913 TermWin.view_start = min (n, TermWin.nscrolled); 1902 TermWin.view_start = min (n, TermWin.nscrolled);
1914 } 1903 }
1915 else 1904 else
1916 { 1905 {
1917 n = TermWin.view_start - nlines; 1906 n = TermWin.view_start - nlines;
1918 TermWin.view_start = max (n, 0); 1907 TermWin.view_start = max (n, 0);
1919 } 1908 }
1909
1920 return scr_changeview (oldviewstart); 1910 return scr_changeview (oldviewstart);
1921} 1911}
1922 1912
1923int 1913int
1924rxvt_term::scr_changeview (unsigned int oldviewstart) 1914rxvt_term::scr_changeview (unsigned int oldviewstart)
… …
2035 row_offset; /* basic offset in screen structure */ 2025 row_offset; /* basic offset in screen structure */
2036#ifndef NO_CURSORCOLOR 2026#ifndef NO_CURSORCOLOR
2037 rend_t cc1; /* store colours at cursor position (s) */ 2027 rend_t cc1; /* store colours at cursor position (s) */
2038#endif 2028#endif
2039 rend_t *crp; // cursor rendition pointer 2029 rend_t *crp; // cursor rendition pointer
2030
2031 want_refresh = 0; /* screen is current */
2040 2032
2041 if (refresh_type == NO_REFRESH || !TermWin.mapped) 2033 if (refresh_type == NO_REFRESH || !TermWin.mapped)
2042 return; 2034 return;
2043 2035
2044 /* 2036 /*
… …
2242 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) 2234 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2243 continue; 2235 continue;
2244 2236
2245 // redraw one or more characters 2237 // redraw one or more characters
2246 2238
2247 // seek to the beginning if wide characters 2239 // seek to the beginning of wide characters
2248 while (stp[col] == NOCHAR && col > 0) 2240 while (stp[col] == NOCHAR && col > 0)
2249 --col; 2241 --col;
2250 2242
2251 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2243 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2252 text_t *text = stp + col; 2244 text_t *text = stp + col;
… …
2396 } 2388 }
2397 else 2389 else
2398 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2390 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2399 2391
2400 if (rend & RS_Uline && font->descent > 1 && fore != back) 2392 if (rend & RS_Uline && font->descent > 1 && fore != back)
2393 {
2394#if ENABLE_FRILLS
2395 if (ISSET_PIXCOLOR (Color_underline))
2396 XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]);
2397 else
2398#endif
2399 XSetForeground (display->display, TermWin.gc, pix_colors[fore]);
2400
2401 XDrawLine (display->display, drawBuffer, TermWin.gc, 2401 XDrawLine (display->display, drawBuffer, TermWin.gc,
2402 xpixel, ypixel + font->ascent + 1, 2402 xpixel, ypixel + font->ascent + 1,
2403 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2403 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2404 }
2404 } /* for (col....) */ 2405 } /* for (col....) */
2405 } /* for (row....) */ 2406 } /* for (row....) */
2406 2407
2407#if ENABLE_OVERLAY 2408#if ENABLE_OVERLAY
2408 scr_swap_overlay (); 2409 scr_swap_overlay ();
… …
2447 if (refresh_type & SMOOTH_REFRESH) 2448 if (refresh_type & SMOOTH_REFRESH)
2448 XFlush (display->display); 2449 XFlush (display->display);
2449 2450
2450 num_scr = 0; 2451 num_scr = 0;
2451 num_scr_allow = 1; 2452 num_scr_allow = 1;
2452 want_refresh = 0; /* screen is current */
2453} 2453}
2454 2454
2455void 2455void
2456rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2456rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp)
2457{ 2457{
… …
2544 int end_row = TermWin.saveLines - TermWin.view_start; 2544 int end_row = TermWin.saveLines - TermWin.view_start;
2545 int i = selection.beg.row + TermWin.saveLines; 2545 int i = selection.beg.row + TermWin.saveLines;
2546 int col, row = selection.end.row + TermWin.saveLines; 2546 int col, row = selection.end.row + TermWin.saveLines;
2547 rend_t *srp; 2547 rend_t *srp;
2548 2548
2549 if (i >= end_row) 2549#if ENABLE_FRILLS
2550 col = selection.beg.col; 2550 if (selection.rect)
2551 {
2552 end_row += TermWin.nrow;
2553
2554 for (; i <= row && i <= end_row; i++)
2555 for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++)
2556 srp[col] ^= RS_RVid;
2557 }
2551 else 2558 else
2559#endif
2560 {
2561 if (i >= end_row)
2562 col = selection.beg.col;
2563 else
2552 { 2564 {
2553 col = 0; 2565 col = 0;
2554 i = end_row; 2566 i = end_row;
2555 } 2567 }
2556 2568
2557 end_row += TermWin.nrow; 2569 end_row += TermWin.nrow;
2570
2558 for (; i < row && i < end_row; i++, col = 0) 2571 for (; i < row && i < end_row; i++, col = 0)
2559 for (srp = screen.rend[i]; col < TermWin.ncol; col++) 2572 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2560 srp[col] ^= RS_RVid; 2573 srp[col] ^= RS_RVid;
2561 2574
2562 if (i == row && i < end_row) 2575 if (i == row && i < end_row)
2563 for (srp = screen.rend[i]; col < selection.end.col; col++) 2576 for (srp = screen.rend[i]; col < selection.end.col; col++)
2564 srp[col] ^= RS_RVid; 2577 srp[col] ^= RS_RVid;
2578 }
2565 } 2579 }
2566} 2580}
2567 2581
2568/* ------------------------------------------------------------------------- */ 2582/* ------------------------------------------------------------------------- */
2569/* 2583/*
… …
2637/* ------------------------------------------------------------------------- */ 2651/* ------------------------------------------------------------------------- */
2638/* 2652/*
2639 * Paste a selection direct to the command fd 2653 * Paste a selection direct to the command fd
2640 */ 2654 */
2641void 2655void
2642rxvt_term::paste (const unsigned char *data, unsigned int len) 2656rxvt_term::paste (unsigned char *data, unsigned int len)
2643{ 2657{
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 */ 2658 /* convert normal newline chars into common keyboard Return key sequence */
2648 for (i = 0; i < len; i += PROP_SIZE) 2659 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) 2660 if (data[i] == C0_LF)
2655 ds[j] = C0_CR; 2661 data[i] = C0_CR;
2656 2662
2657 tt_write (ds, (int)n); 2663 tt_write (data, len);
2658 }
2659
2660 free (ds);
2661} 2664}
2662 2665
2663/* ------------------------------------------------------------------------- */ 2666/* ------------------------------------------------------------------------- */
2664/* 2667/*
2665 * Respond to a notification that a primary selection has been sent 2668 * Respond to a notification that a primary selection has been sent
2666 * EXT: SelectionNotify 2669 * EXT: SelectionNotify
2667 */ 2670 */
2668int 2671void
2669rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2672rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2670{ 2673{
2671 long nread = 0;
2672 unsigned long bytes_after;
2673 XTextProperty ct;
2674
2675 if (prop == None) /* check for failed XConvertSelection */ 2674 if (prop == None) /* check for failed XConvertSelection */
2676 { 2675 {
2677 if ((selection_type & Sel_CompoundText)) 2676 if ((selection_type & Sel_CompoundText))
2678 { 2677 {
2679 int selnum = selection_type & Sel_whereMask; 2678 int selnum = selection_type & Sel_whereMask;
… …
2692 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2691 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2693 else 2692 else
2694 selection_type = 0; 2693 selection_type = 0;
2695 } 2694 }
2696 2695
2697 return 0; 2696 return;
2698 }
2699
2700 for (;;)
2701 { 2697 }
2698
2699 unsigned long bytes_after;
2700 XTextProperty ct;
2701
2702 if (XGetWindowProperty (display->display, win, prop,
2703 0, PROP_SIZE / 4,
2704 delete_prop, AnyPropertyType,
2705 &ct.encoding, &ct.format,
2706 &ct.nitems, &bytes_after,
2707 &ct.value) != Success)
2708 {
2709 ct.value = 0;
2710 goto bailout;
2711 }
2712
2713 if (ct.encoding == None)
2714 goto bailout;
2715
2716 if (bytes_after)
2717 {
2718 // fetch and append remaining data
2719 XTextProperty ct2;
2720
2702 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2721 if (XGetWindowProperty (display->display, win, prop,
2703 (long) (PROP_SIZE / 4), delete_prop, 2722 ct.nitems / 4, (bytes_after + 3) / 4,
2723 delete_prop, AnyPropertyType,
2704 AnyPropertyType, &ct.encoding, &ct.format, 2724 &ct2.encoding, &ct2.format,
2705 &ct.nitems, &bytes_after, 2725 &ct2.nitems, &bytes_after,
2706 &ct.value) != Success) 2726 &ct2.value) != Success)
2707 break; 2727 goto bailout;
2708 2728
2709 if (ct.encoding == 0) 2729 // realloc should be compatible to XFree, here, and elsewhere, too
2710 break; 2730 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2731 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2732 ct.nitems += ct2.nitems;
2711 2733
2734 XFree (ct2.value);
2735 }
2736
2737 if (ct.value == 0)
2738 goto bailout;
2739
2712 if (ct.encoding == xa[XA_INCR]) 2740 if (ct.encoding == xa[XA_INCR])
2713 { 2741 {
2714 // INCR selection, start handshake 2742 // INCR selection, start handshake
2743 if (!delete_prop)
2715 XDeleteProperty (display->display, win, prop); 2744 XDeleteProperty (display->display, win, prop);
2745
2716 selection_wait = Sel_incr; 2746 selection_wait = Sel_incr;
2747 incr_buf_fill = 0;
2717 incr_ev.start (NOW + 10); 2748 incr_ev.start (NOW + 10);
2718 break;
2719 }
2720 2749
2721 if (ct.value == NULL) 2750 goto bailout;
2722 continue; 2751 }
2723 2752
2724 if (ct.nitems == 0) 2753 if (ct.nitems == 0)
2754 {
2755 if (selection_wait == Sel_incr)
2756 {
2757 XFree (ct.value);
2758
2759 // finally complete, now paste the whole thing
2760 selection_wait = Sel_normal;
2761 ct.value = (unsigned char *)incr_buf;
2762 ct.nitems = incr_buf_fill;
2763 incr_buf = 0;
2764 incr_buf_size = 0;
2765 incr_ev.stop ();
2725 { 2766 }
2767 else
2768 {
2726 if (selection_wait == Sel_normal && nread == 0 2769 if (selection_wait == Sel_normal
2727 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2770 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2728 { 2771 {
2729 /* 2772 /*
2730 * pass through again trying CUT_BUFFER0 if we've come from 2773 * pass through again trying CUT_BUFFER0 if we've come from
2731 * XConvertSelection () but nothing was presented 2774 * XConvertSelection () but nothing was presented
2732 */ 2775 */
2733 selection_paste (display->root, XA_CUT_BUFFER0, False); 2776 selection_paste (display->root, XA_CUT_BUFFER0, False);
2734 } 2777 }
2735 2778
2736 nread = -1; /* discount any previous stuff */ 2779 goto bailout;
2737 break; 2780 }
2781 }
2782 else if (selection_wait == Sel_incr)
2783 {
2784 incr_ev.start (NOW + 10);
2785
2786 while (incr_buf_fill + ct.nitems > incr_buf_size)
2738 } 2787 {
2788 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2789 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2790 }
2739 2791
2792 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2740 nread += ct.nitems; 2793 incr_buf_fill += ct.nitems;
2741 2794
2795 goto bailout;
2796 }
2797
2742 char **cl; 2798 char **cl;
2743 int cr; 2799 int cr;
2800
2801#if ENABLE_FRILLS
2802 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2803 // so recode it manually
2804 if (ct.encoding == xa[XA_UTF8_STRING])
2805 {
2806 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2807 char *s = rxvt_wcstombs (w);
2808 free (w);
2809 // TODO: strlen == only the first element will be converted. well...
2810 paste ((unsigned char *)s, strlen (s));
2811 free (s);
2812 }
2813 else
2814#endif
2744 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) 2815 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2745 { 2816 && cl)
2817 {
2746 for (int i = 0; i < cr; i++) 2818 for (int i = 0; i < cr; i++)
2747 paste ((unsigned char *)cl[i], strlen (cl[i])); 2819 paste ((unsigned char *)cl[i], strlen (cl[i]));
2748 2820
2749 XFreeStringList (cl); 2821 XFreeStringList (cl);
2750 } 2822 }
2751 else 2823 else
2752 paste (ct.value, ct.nitems); 2824 paste (ct.value, ct.nitems); // paste raw
2753 2825
2754 if (bytes_after == 0) 2826bailout:
2755 break;
2756
2757 XFree (ct.value);
2758 }
2759
2760 if (ct.value)
2761 XFree (ct.value); 2827 XFree (ct.value);
2762 2828
2763 if (selection_wait == Sel_normal) 2829 if (selection_wait == Sel_normal)
2764 selection_wait = Sel_none; 2830 selection_wait = Sel_none;
2765
2766 return (int)nread;
2767} 2831}
2768 2832
2769void 2833void
2770rxvt_term::incr_cb (time_watcher &w) 2834rxvt_term::incr_cb (time_watcher &w)
2771{ 2835{
2772 selection_wait = Sel_none; 2836 selection_wait = Sel_none;
2773 2837
2838 incr_buf_size = 0;
2839 free (incr_buf);
2840
2774 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2841 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2775} 2842}
2776 2843
2777/*
2778 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2779 */
2780void 2844void
2781rxvt_term::selection_property (Window win, Atom prop) 2845rxvt_term::selection_property (Window win, Atom prop)
2782{ 2846{
2783 if (prop == None || selection_wait != Sel_incr) 2847 if (prop == None || selection_wait != Sel_incr)
2784 return; 2848 return;
2785 2849
2786 if (selection_paste (win, prop, 1) > 0) 2850 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} 2851}
2794 2852
2795/* ------------------------------------------------------------------------- */ 2853/* ------------------------------------------------------------------------- */
2796/* 2854/*
2797 * Request the current selection: 2855 * Request the current selection:
… …
2831#else 2889#else
2832 selection_type = Sel_CompoundText; 2890 selection_type = Sel_CompoundText;
2833 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2891 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2834 return; 2892 return;
2835#endif 2893#endif
2836
2837 } 2894 }
2838 } 2895 }
2839 2896
2840 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2897 selection_wait = Sel_none; /* don't loop in selection_paste () */
2841 selection_paste (display->root, XA_CUT_BUFFER0, False); 2898 selection_paste (display->root, XA_CUT_BUFFER0, false);
2842} 2899}
2843 2900
2844int 2901int
2845rxvt_term::selection_request_other (Atom target, int selnum) 2902rxvt_term::selection_request_other (Atom target, int selnum)
2846{ 2903{
… …
2919 2976
2920 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 2977 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2921 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2978 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2922 2979
2923 col = selection.beg.col; 2980 col = selection.beg.col;
2924 MAX_IT (col, 0);
2925 row = selection.beg.row + TermWin.saveLines; 2981 row = selection.beg.row + TermWin.saveLines;
2926 end_row = selection.end.row + TermWin.saveLines; 2982 end_row = selection.end.row + TermWin.saveLines;
2927 int ofs = 0; 2983 int ofs = 0;
2928 int extra = 0; 2984 int extra = 0;
2929 2985
2930 for (; row <= end_row; row++, col = 0) 2986 for (; row <= end_row; row++, col = 0)
2931 { 2987 {
2932 t = &screen.text[row][col];
2933
2934 end_col = screen.tlen[row]; 2988 end_col = screen.tlen[row];
2989
2990#if ENABLE_FRILLS
2991 if (selection.rect)
2992 {
2993 col = selection.beg.col;
2994 end_col = TermWin.ncol + 1;
2995 }
2996#endif
2997
2998 MAX_IT (col, 0);
2935 2999
2936 if (end_col == -1) 3000 if (end_col == -1)
2937 end_col = TermWin.ncol; 3001 end_col = TermWin.ncol;
2938 3002
2939 if (row == end_row) 3003 if (row == end_row || selection.rect)
2940 MIN_IT (end_col, selection.end.col); 3004 MIN_IT (end_col, selection.end.col);
2941 3005
3006 t = &screen.text[row][col];
2942 for (; col < end_col; col++) 3007 for (; col < end_col; col++)
2943 { 3008 {
2944 if (*t == NOCHAR) 3009 if (*t == NOCHAR)
2945 t++; 3010 t++;
2946#if ENABLE_COMBINING 3011#if ENABLE_COMBINING
… …
2994#if 0 3059#if 0
2995 XTextProperty ct; 3060 XTextProperty ct;
2996 3061
2997 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3062 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2998 { 3063 {
2999 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 3064 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3000 PropModeReplace, ct.value, ct.nitems);
3001 XFree (ct.value); 3065 XFree (ct.value);
3002 } 3066 }
3003#endif 3067#endif
3004 3068
3005 selection_time = tm; 3069 selection_time = tm;
… …
3206 enum { 3270 enum {
3207 LEFT, RIGHT 3271 LEFT, RIGHT
3208 } closeto = RIGHT; 3272 } closeto = RIGHT;
3209 3273
3210 want_refresh = 1; 3274 want_refresh = 1;
3275
3211 switch (selection.op) 3276 switch (selection.op)
3212 { 3277 {
3213 case SELECTION_INIT: 3278 case SELECTION_INIT:
3214 CLEAR_SELECTION (); 3279 CLEAR_SELECTION ();
3215 selection.op = SELECTION_BEGIN; 3280 selection.op = SELECTION_BEGIN;
… …
3228 selection_start_colrow (col, row); 3293 selection_start_colrow (col, row);
3229 /* FALLTHROUGH */ 3294 /* FALLTHROUGH */
3230 default: 3295 default:
3231 return; 3296 return;
3232 } 3297 }
3298
3233 if (selection.beg.col == selection.end.col 3299 if (selection.beg.col == selection.end.col
3234 && selection.beg.col != selection.mark.col 3300 && selection.beg.col != selection.mark.col
3235 && selection.beg.row == selection.end.row 3301 && selection.beg.row == selection.end.row
3236 && selection.beg.row != selection.mark.row) 3302 && selection.beg.row != selection.mark.row)
3237 { 3303 {
… …
3287 } 3353 }
3288 else 3354 else
3289 { /* button1 drag or button3 drag */ 3355 { /* button1 drag or button3 drag */
3290 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3356 if (ROWCOL_IS_AFTER (selection.mark, pos))
3291 { 3357 {
3292 if ((selection.mark.row == selection.end.row) 3358 if (selection.mark.row == selection.end.row
3293 && (selection.mark.col == selection.end.col) 3359 && selection.mark.col == selection.end.col
3360 && clickchange
3294 && clickchange && selection.clicks == 2) 3361 && selection.clicks == 2)
3295 selection.mark.col--; 3362 selection.mark.col--;
3296 3363
3297 selection.beg.row = pos.row; 3364 selection.beg.row = pos.row;
3298 selection.beg.col = pos.col; 3365 selection.beg.col = pos.col;
3299 selection.end.row = selection.mark.row; 3366 selection.end.row = selection.mark.row;
… …
3310 3377
3311 if (selection.clicks == 1) 3378 if (selection.clicks == 1)
3312 { 3379 {
3313 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3380 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3314 3381
3315 if (end_col != -1 && selection.beg.col > end_col) 3382 if (selection.beg.col > end_col
3383 && end_col != -1
3384#if ENABLE_FRILLS
3385 && !selection.rect
3386#endif
3316 { 3387 )
3317#if 1
3318 selection.beg.col = ncol; 3388 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 3389
3327 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3390 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3328 3391
3329 if (end_col != -1 && selection.end.col > end_col) 3392 if (
3393 selection.end.col > end_col
3394 && end_col != -1
3395#if ENABLE_FRILLS
3396 && !selection.rect
3397#endif
3398 )
3330 selection.end.col = ncol; 3399 selection.end.col = ncol;
3331 } 3400 }
3332 else if (selection.clicks == 2) 3401 else if (selection.clicks == 2)
3333 { 3402 {
3334 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3403 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3335 selection.end.col--; 3404 selection.end.col--;
3336 3405
3337 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3338 selection_delimit_word (DN, & (selection.end), & (selection.end)); 3406 selection_delimit_word (UP, &selection.beg, &selection.beg);
3407 selection_delimit_word (DN, &selection.end, &selection.end);
3339 } 3408 }
3340 else if (selection.clicks == 3) 3409 else if (selection.clicks == 3)
3341 { 3410 {
3342#if ENABLE_FRILLS 3411#if ENABLE_FRILLS
3343 if ((options & Opt_tripleclickwords)) 3412 if (options & Opt_tripleclickwords)
3344 { 3413 {
3345 int end_row; 3414 int end_row;
3346 3415
3347 selection_delimit_word (UP, & (selection.beg), & (selection.beg)); 3416 selection_delimit_word (UP, &selection.beg, &selection.beg);
3348 end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; 3417 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3349 3418
3350 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) 3419 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3351 { 3420 {
3352 end_col = screen.tlen[end_row + TermWin.saveLines]; 3421 end_col = screen.tlen[end_row + TermWin.saveLines];
… …
3363 else 3432 else
3364#endif 3433#endif
3365 { 3434 {
3366 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3435 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3367 selection.mark.col++; 3436 selection.mark.col++;
3437
3368 selection.beg.col = 0; 3438 selection.beg.col = 0;
3369 selection.end.col = ncol; 3439 selection.end.col = ncol;
3440
3441 // select a complete logical line
3442 while (selection.beg.row > -TermWin.saveLines
3443 && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1)
3444 selection.beg.row--;
3445
3446 while (selection.end.row < TermWin.nrow
3447 && screen.tlen[selection.end.row + TermWin.saveLines] == -1)
3448 selection.end.row++;
3370 } 3449 }
3371 } 3450 }
3372 3451
3373 if (button3 && buttonpress) 3452 if (button3 && buttonpress)
3374 { /* mark may need to be changed */ 3453 { /* mark may need to be changed */
… …
3381 { 3460 {
3382 selection.mark.row = selection.beg.row; 3461 selection.mark.row = selection.beg.row;
3383 selection.mark.col = selection.beg.col; 3462 selection.mark.col = selection.beg.col;
3384 } 3463 }
3385 } 3464 }
3386}
3387 3465
3388#if ENABLE_FRILLS 3466#if ENABLE_FRILLS
3467 if (selection.rect && selection.beg.col > selection.end.col)
3468 SWAP_IT (selection.beg.col, selection.end.col, int);
3469#endif
3470}
3471
3472#if ENABLE_FRILLS
3389void 3473void
3390rxvt_term::selection_remove_trailing_spaces () 3474rxvt_term::selection_remove_trailing_spaces ()
3391{ 3475{
3392 int32_t end_col, end_row; 3476 int32_t end_col, end_row;
3393 text_t *stp; 3477 text_t *stp;
3394 3478
3395 end_col = selection.end.col; 3479 end_col = selection.end.col;
3396 end_row = selection.end.row; 3480 end_row = selection.end.row;
3481
3397 for ( ; end_row >= selection.beg.row; ) 3482 for ( ; end_row >= selection.beg.row; )
3398 { 3483 {
3399 stp = screen.text[end_row + TermWin.saveLines]; 3484 stp = screen.text[end_row + TermWin.saveLines];
3485
3400 while (--end_col >= 0) 3486 while (--end_col >= 0)
3401 { 3487 {
3402 if (stp[end_col] != ' ' && stp[end_col] != '\t') 3488 if (stp[end_col] != ' '
3489 && stp[end_col] != '\t'
3490 && stp[end_col] != NOCHAR)
3403 break; 3491 break;
3404 } 3492 }
3493
3405 if (end_col >= 0 3494 if (end_col >= 0
3406 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3495 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1)
3407 { 3496 {
3408 selection.end.col = end_col + 1; 3497 selection.end.col = end_col + 1;
3409 selection.end.row = end_row; 3498 selection.end.row = end_row;
3410 break; 3499 break;
3411 } 3500 }
3501
3412 end_row--; 3502 end_row--;
3413 end_col = TermWin.ncol; 3503 end_col = TermWin.ncol;
3414 } 3504 }
3505
3415 if (selection.mark.row > selection.end.row) 3506 if (selection.mark.row > selection.end.row)
3416 { 3507 {
3417 selection.mark.row = selection.end.row; 3508 selection.mark.row = selection.end.row;
3418 selection.mark.col = selection.end.col; 3509 selection.mark.col = selection.end.col;
3419 } 3510 }
… …
3435 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3526 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3436} 3527}
3437 3528
3438/* ------------------------------------------------------------------------- */ 3529/* ------------------------------------------------------------------------- */
3439/* 3530/*
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 3531 * Respond to a request for our current selection
3449 * EXT: SelectionRequest 3532 * EXT: SelectionRequest
3450 */ 3533 */
3451void 3534void
3452rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3535rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3453{ 3536{
3454 XSelectionEvent ev; 3537 XSelectionEvent ev;
3455 XTextProperty ct; 3538 dDisp;
3456 XICCEncodingStyle style;
3457 Atom target;
3458 3539
3459 ev.type = SelectionNotify; 3540 ev.type = SelectionNotify;
3460 ev.property = None; 3541 ev.property = None;
3461 ev.display = rq.display; 3542 ev.display = rq.display;
3462 ev.requestor = rq.requestor; 3543 ev.requestor = rq.requestor;
… …
3464 ev.target = rq.target; 3545 ev.target = rq.target;
3465 ev.time = rq.time; 3546 ev.time = rq.time;
3466 3547
3467 if (rq.target == xa[XA_TARGETS]) 3548 if (rq.target == xa[XA_TARGETS])
3468 { 3549 {
3469 Atom32 target_list[6]; 3550 Atom target_list[6];
3470 Atom32 *target = target_list; 3551 Atom *target = target_list;
3471 3552
3472 *target++ = (Atom32) xa[XA_TARGETS]; 3553 *target++ = xa[XA_TARGETS];
3473 *target++ = (Atom32) xa[XA_TIMESTAMP]; 3554 *target++ = xa[XA_TIMESTAMP];
3474 *target++ = (Atom32) XA_STRING; 3555 *target++ = XA_STRING;
3475 *target++ = (Atom32) xa[XA_TEXT]; 3556 *target++ = xa[XA_TEXT];
3476 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3557 *target++ = xa[XA_COMPOUND_TEXT];
3477#if X_HAVE_UTF8_STRING 3558#if X_HAVE_UTF8_STRING
3478 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3559 *target++ = xa[XA_UTF8_STRING];
3479#endif 3560#endif
3480 3561
3481 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3562 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,
3482 (8 * sizeof (target_list[0])), PropModeReplace, 3563 32, PropModeReplace,
3483 (unsigned char *)target_list, 3564 (unsigned char *)target_list, target - target_list);
3484 target - target_list);
3485 ev.property = rq.property; 3565 ev.property = rq.property;
3486 } 3566 }
3487#if TODO // TODO 3567#if TODO // TODO
3488 else if (rq.target == xa[XA_MULTIPLE]) 3568 else if (rq.target == xa[XA_MULTIPLE])
3489 { 3569 {
3490 /* TODO: Handle MULTIPLE */ 3570 /* TODO: Handle MULTIPLE */
3491 } 3571 }
3492#endif 3572#endif
3493 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3573 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3494 { 3574 {
3495 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3575 XChangeProperty (disp, rq.requestor, rq.property, rq.target,
3496 (8 * sizeof (Time)), PropModeReplace,
3497 (unsigned char *)&selection_time, 1); 3576 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3498 ev.property = rq.property; 3577 ev.property = rq.property;
3499 } 3578 }
3500 else if (rq.target == XA_STRING 3579 else if (rq.target == XA_STRING
3501 || rq.target == xa[XA_TEXT] 3580 || rq.target == xa[XA_TEXT]
3502 || rq.target == xa[XA_COMPOUND_TEXT] 3581 || rq.target == xa[XA_COMPOUND_TEXT]
3503 || rq.target == xa[XA_UTF8_STRING] 3582 || rq.target == xa[XA_UTF8_STRING]
3504 ) 3583 )
3505 { 3584 {
3585 XTextProperty ct;
3586 Atom target = rq.target;
3506 short freect = 0; 3587 short freect = 0;
3507 int selectlen; 3588 int selectlen;
3508 wchar_t *cl; 3589 wchar_t *cl;
3509 3590 enum {
3510 target = rq.target; 3591 enc_string = XStringStyle,
3592 enc_text = XStdICCTextStyle,
3593 enc_compound_text = XCompoundTextStyle,
3594#ifdef X_HAVE_UTF8_STRING
3595 enc_utf8 = XUTF8StringStyle,
3596#else
3597 enc_utf8 = -1,
3598#endif
3599 } style;
3511 3600
3512 if (target == XA_STRING) 3601 if (target == XA_STRING)
3513 // we actually don't do XA_STRING, but who cares, as i18n clients 3602 // we actually don't do XA_STRING, but who cares, as i18n clients
3514 // will ask for another format anyways. 3603 // will ask for another format anyways.
3515 style = XStringStyle; 3604 style = enc_string;
3516 else if (target == xa[XA_TEXT]) 3605 else if (target == xa[XA_TEXT])
3517 style = XStdICCTextStyle; 3606 style = enc_text;
3518 else if (target == xa[XA_COMPOUND_TEXT]) 3607 else if (target == xa[XA_COMPOUND_TEXT])
3519 style = XCompoundTextStyle; 3608 style = enc_compound_text;
3520#if X_HAVE_UTF8_STRING 3609#if ENABLE_FRILLS
3521 else if (target == xa[XA_UTF8_STRING]) 3610 else if (target == xa[XA_UTF8_STRING])
3522 style = XUTF8StringStyle; 3611 style = enc_utf8;
3523#endif 3612#endif
3524 else 3613 else
3525 { 3614 {
3526 target = xa[XA_COMPOUND_TEXT]; 3615 target = xa[XA_COMPOUND_TEXT];
3527 style = XCompoundTextStyle; 3616 style = enc_compound_text;
3528 } 3617 }
3529 3618
3530 if (selection.text) 3619 if (selection.text)
3531 { 3620 {
3532 cl = selection.text; 3621 cl = selection.text;
… …
3536 { 3625 {
3537 cl = L""; 3626 cl = L"";
3538 selectlen = 0; 3627 selectlen = 0;
3539 } 3628 }
3540 3629
3541 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it 3630#if ENABLE_FRILLS
3542 // manually for XUTF8StringStyle. 3631 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3632 // so recode it manually
3633 if (style == enc_utf8)
3634 {
3635 freect = 1;
3636 ct.encoding = target;
3637 ct.format = 8;
3638 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3639 ct.nitems = strlen ((char *)ct.value);
3640 }
3641 else
3642#endif
3543 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3643 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3544 freect = 1; 3644 freect = 1;
3545 else 3645 else
3546 { 3646 {
3547 /* if we failed to convert then send it raw */ 3647 /* if we failed to convert then send it raw */
3548 ct.value = (unsigned char *)cl; 3648 ct.value = (unsigned char *)cl;
3549 ct.nitems = selectlen; 3649 ct.nitems = selectlen;
3650 ct.encoding = target;
3550 } 3651 }
3551 3652
3552 XChangeProperty (display->display, rq.requestor, rq.property, 3653 XChangeProperty (disp, rq.requestor, rq.property,
3553 target, 8, PropModeReplace, 3654 ct.encoding, 8, PropModeReplace,
3554 ct.value, (int)ct.nitems); 3655 ct.value, (int)ct.nitems);
3555 ev.property = rq.property; 3656 ev.property = rq.property;
3556 3657
3557 if (freect) 3658 if (freect)
3558 XFree (ct.value); 3659 XFree (ct.value);
3559 } 3660 }
3560 3661
3561 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3662 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
3562} 3663}
3563 3664
3564/* ------------------------------------------------------------------------- * 3665/* ------------------------------------------------------------------------- *
3565 * MOUSE ROUTINES * 3666 * MOUSE ROUTINES *
3566 * ------------------------------------------------------------------------- */ 3667 * ------------------------------------------------------------------------- */

Diff Legend

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