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.139 by root, Sun Nov 21 18:51:13 2004 UTC vs.
Revision 1.159 by root, Mon Feb 21 19:26:07 2005 UTC

… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29 29
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 30#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 31
32#include <inttypes.h> 32#include <inttypes.h>
33#include <wchar.h>
34 33
35#include "salloc.C" // HACK, should be a seperate compile! 34#include "salloc.C" // HACK, should be a seperate compile!
36 35
37inline void fill_text (text_t *start, text_t value, int len) 36inline void fill_text (text_t *start, text_t value, int len)
38{ 37{
39 while (len--) 38 while (len--)
40 *start++ = value; 39 *start++ = value;
41} 40}
42 41
43/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
44#define PROP_SIZE 16384 43#define PROP_SIZE 256*1024
44#define PASTE_SIZE 32768
45#define TABSIZE 8 /* default tab size */ 45#define TABSIZE 8 /* default tab size */
46 46
47/* ------------------------------------------------------------------------- * 47/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 49 * ------------------------------------------------------------------------- */
… …
202 /* 202 /*
203 * first time called so just malloc everything: don't rely on realloc 203 * first time called so just malloc everything: don't rely on realloc
204 * Note: this is still needed so that all the scrollback lines are NULL 204 * Note: this is still needed so that all the scrollback lines are NULL
205 */ 205 */
206 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 206 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
207 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 207 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
208 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); 208 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
209 swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); 209 swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
210 210
211 screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t)); 211 screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t));
212 swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t)); 212 swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t));
213 213
214 screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); 214 screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
215 buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); 215 buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
216 drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *)); 216 drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
217 swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *)); 217 swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
218 218
219 for (p = 0; p < nrow; p++) 219 for (p = 0; p < nrow; p++)
220 { 220 {
221 q = p + TermWin.saveLines; 221 q = p + TermWin.saveLines;
222 scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE); 222 scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE);
… …
293 ralloc->free (drawn_rend[p]); 293 ralloc->free (drawn_rend[p]);
294 } 294 }
295 295
296 /* we have fewer rows so fix up cursor position */ 296 /* we have fewer rows so fix up cursor position */
297 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 297 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
298 MIN_IT (swap.cur.row, (int32_t)nrow - 1);
299 298
300 scr_reset_realloc (); /* realloc _last_ */ 299 scr_reset_realloc (); /* realloc _last_ */
301 } 300 }
302 else if (nrow > prev_nrow) 301 else if (nrow > prev_nrow)
303 { 302 {
… …
334 scr_scroll_text (0, (int)nrow - 1, -k, 1); 333 scr_scroll_text (0, (int)nrow - 1, -k, 1);
335 screen.cur.row += k; 334 screen.cur.row += k;
336 screen.s_cur.row += k; 335 screen.s_cur.row += k;
337 TermWin.nscrolled -= k; 336 TermWin.nscrolled -= k;
338 } 337 }
338
339#ifdef DEBUG_STRICT 339#ifdef DEBUG_STRICT
340 assert (screen.cur.row < TermWin.nrow); 340 assert (screen.cur.row < TermWin.nrow);
341 assert (swap.cur.row < TermWin.nrow);
342#else /* drive with your eyes closed */ 341#else /* drive with your eyes closed */
343
344 MIN_IT (screen.cur.row, nrow - 1); 342 MIN_IT (screen.cur.row, nrow - 1);
345 MIN_IT (swap.cur.row, nrow - 1);
346#endif 343#endif
347 TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this 344 TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this
348 } 345 }
349 346
350 /* resize columns */ 347 /* resize columns */
… …
393 } 390 }
394 391
395 } 392 }
396 393
397 MIN_IT (screen.cur.col, (int16_t)ncol - 1); 394 MIN_IT (screen.cur.col, (int16_t)ncol - 1);
398 MIN_IT (swap.cur.col, (int16_t)ncol - 1);
399 395
400 delete talloc; talloc = ta; 396 delete talloc; talloc = ta;
401 delete ralloc; ralloc = ra; 397 delete ralloc; ralloc = ra;
402 } 398 }
403 399
… …
565 if (current_screen == scrn) 561 if (current_screen == scrn)
566 return scrn; 562 return scrn;
567 563
568 selection_check (2); /* check for boundary cross */ 564 selection_check (2); /* check for boundary cross */
569 565
570 SWAP_IT (current_screen, scrn, int); 566 i = current_screen; current_screen = scrn; scrn = i;
571 567
572 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 568 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
573 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 569 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
574# ifdef DEBUG_STRICT
575 assert (screen.cur.row >= 0 && screen.cur.row < prev_nrow);
576 assert (screen.cur.col >= 0 && screen.cur.col < prev_ncol);
577# else /* drive with your eyes closed */
578 MAX_IT (screen.cur.row, 0); 570 MAX_IT (screen.cur.row, 0);
579 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 571 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
580 MAX_IT (screen.cur.col, 0); 572 MAX_IT (screen.cur.col, 0);
581 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); 573 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
582# endif
583 574
584#if NSCREENS 575#if NSCREENS
585 if (options & Opt_secondaryScreen) 576 if (options & Opt_secondaryScreen)
586 { 577 {
587 num_scr = 0; 578 num_scr = 0;
… …
600 swap.flags |= Screen_VisibleCursor; 591 swap.flags |= Screen_VisibleCursor;
601 } 592 }
602 else 593 else
603#endif 594#endif
604 if (options & Opt_secondaryScroll) 595 if (options & Opt_secondaryScroll)
605 //if (current_screen == PRIMARY)
606 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0); 596 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0);
607 597
608 return scrn; 598 return scrn;
609} 599}
610 600
611// clear WrapNext indicator, solidifying position on next line 601// clear WrapNext indicator, solidifying position on next line
… …
709 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 699 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */
710 } 700 }
711 else if (j >= row1 && j <= row2) 701 else if (j >= row1 && j <= row2)
712 { 702 {
713 /* move selected region too */ 703 /* move selected region too */
714 selection.beg.row -= count; 704 selection.beg.row -= count;
715 selection.end.row -= count; 705 selection.end.row -= count;
716 selection.mark.row -= count; 706 selection.mark.row -= count;
717 } 707 }
718 } 708 }
719 709
720 selection_check (0); /* _after_ TermWin.nscrolled update */ 710 selection_check (0); /* _after_ TermWin.nscrolled update */
… …
728 i = row2 - row1 + 1; 718 i = row2 - row1 + 1;
729 MIN_IT (count, i); 719 MIN_IT (count, i);
730 720
731 if (j > 0) 721 if (j > 0)
732 { 722 {
733 /* A: scroll up */ 723 /* scroll up */
734 724
735 /* A1: Copy lines that will get clobbered by the rotation */ 725 /* Copy lines that will get clobbered by the rotation */
736 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *)); 726 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));
737 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *)); 727 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
738 728
739 /* A2: Rotate lines */ 729 /* Rotate lines */
740 i = row2 - row1 - count + 1; 730 i = row2 - row1 - count + 1;
741 memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t)); 731 memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t));
742 memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *)); 732 memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *));
743 memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *)); 733 memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *));
744 734
745 j = row2 - count + 1, i = count; 735 j = row2 - count + 1, i = count;
746 } 736 }
747 else /* if (j < 0) */ 737 else /* if (j < 0) */
748 { 738 {
749 /* B: scroll down */ 739 /* scroll down */
750 740
751 /* B1: Copy lines that will get clobbered by the rotation */ 741 /* Copy lines that will get clobbered by the rotation */
752 for (i = 0, j = row2; i < count; i++, j--) 742 for (i = 0, j = row2; i < count; i++, j--)
753 { 743 {
754 buf_text[i] = screen.text[j]; 744 buf_text[i] = screen.text[j];
755 buf_rend[i] = screen.rend[j]; 745 buf_rend[i] = screen.rend[j];
756 } 746 }
757 747
758 /* B2: Rotate lines */ 748 /* Rotate lines */
759 for (j = row2, i = j - count; i >= row1; i--, j--) 749 for (j = row2, i = j - count; i >= row1; i--, j--)
760 { 750 {
761 screen.tlen[j] = screen.tlen[i]; 751 screen.tlen[j] = screen.tlen[i];
762 screen.text[j] = screen.text[i]; 752 screen.text[j] = screen.text[i];
763 screen.rend[j] = screen.rend[i]; 753 screen.rend[j] = screen.rend[i];
… …
765 755
766 j = row1, i = count; 756 j = row1, i = count;
767 count = -count; 757 count = -count;
768 } 758 }
769 759
770 /* C: Resurrect lines */ 760 /* Resurrect lines */
771 memset (screen.tlen + j, 0, i * sizeof (int16_t)); 761 memset (screen.tlen + j, 0, i * sizeof (int16_t));
772 memcpy (screen.text + j, buf_text, i * sizeof (text_t *)); 762 memcpy (screen.text + j, buf_text, i * sizeof (text_t *));
773 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *)); 763 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));
774 if (!spec) /* line length may not equal TermWin.ncol */ 764 if (!spec) /* line length may not equal TermWin.ncol */
775 for (; i--; j++) 765 for (; i--; j++)
… …
883 873
884 stp = screen.text[row]; /* _must_ refresh */ 874 stp = screen.text[row]; /* _must_ refresh */
885 srp = screen.rend[row]; /* _must_ refresh */ 875 srp = screen.rend[row]; /* _must_ refresh */
886 } 876 }
887 877
888 if (screen.flags & Screen_Insert)
889 scr_insdel_chars (1, INSERT);
890
891 // 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
892 // do wcwidth before further replacements, as wcwidth says that line-drawing 879 // do wcwidth before further replacements, as wcwidth says that line-drawing
893 // characters have width -1 (DOH!) on GNU/Linux sometimes. 880 // characters have width -1 (DOH!) on GNU/Linux sometimes.
894 int width = c < 0x100 ? 1 : wcwidth (c); 881 int width = c < 0x100 ? 1 : wcwidth (c);
895 882
896 if (charsets[screen.charset] == '0') // DEC SPECIAL 883 if (charsets[screen.charset] == '0') // DEC SPECIAL
897 { 884 {
898 // vt100 special graphics and line drawing 885 // vt100 special graphics and line drawing
899 // 5f-7e standard vt100 886 // 5f-7e standard vt100
900 // 40-5e rxvt extension for extra curses acs chars 887 // 40-5e rxvt extension for extra curses acs chars
901 static uint16_t vt100_0[63] = { // 5f .. 7e 888 static uint16_t vt100_0[63] = { // 40 .. 7e
902 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!
903 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f 890 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f
904 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57 891 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57
905 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f 892 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f
906 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 893 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
… …
914 c = vt100_0[c - 0x40]; 901 c = vt100_0[c - 0x40];
915 width = 1; 902 width = 1;
916 } 903 }
917 } 904 }
918 905
906 if (screen.flags & Screen_Insert)
907 scr_insdel_chars (width, INSERT);
908
919 if (width != 0) 909 if (width != 0)
920 { 910 {
921 // some utf-8 decoders decode surrogate characters. 911 // some utf-8 decoders decode surrogate characters.
922 if (0xd800 <= c && c <= 0xdfff) 912 if (0xd800 <= c && c <= 0xdfff)
923 c = 0xfffd; 913 c = 0xfffd;
… …
973 c = NOCHAR; 963 c = NOCHAR;
974 } 964 }
975 while (--width > 0); 965 while (--width > 0);
976 966
977 // pad with spaces when overwriting wide character with smaller one 967 // pad with spaces when overwriting wide character with smaller one
968 if (!width)
978 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++)
979 { 970 {
980 stp[c] = ' '; 971 stp[c] = ' ';
981 srp[c] = rend; 972 srp[c] = rend;
982 } 973 }
983 } 974 }
984 else if (width == 0) 975 else if (width == 0)
985 { 976 {
986#if ENABLE_COMBINING 977#if ENABLE_COMBINING
987 // handle combining characters 978 // handle combining characters
… …
1100 if (count) 1091 if (count)
1101 x = TermWin.ncol - 1; 1092 x = TermWin.ncol - 1;
1102 1093
1103 // store horizontal tab commands as characters inside the text 1094 // store horizontal tab commands as characters inside the text
1104 // buffer so they can be selected and pasted. 1095 // buffer so they can be selected and pasted.
1105 if (ht) 1096 if (ht && options & Opt_pastableTabs)
1106 { 1097 {
1107 base_rend = SET_FONT (base_rend, 0); 1098 base_rend = SET_FONT (base_rend, 0);
1108 1099
1109 if (screen.tlen[row] != -1) /* XXX: think about this */ 1100 if (screen.tlen[row] != -1) /* XXX: think about this */
1110 MAX_IT (screen.tlen[row], x); 1101 MAX_IT (screen.tlen[row], x);
… …
1399 screen.tlen[row + row_offset] = 0; 1390 screen.tlen[row + row_offset] = 0;
1400 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren); 1391 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);
1401 } 1392 }
1402} 1393}
1403 1394
1395void
1396rxvt_term::scr_erase_savelines ()
1397{
1398 want_refresh = 1;
1399 ZERO_SCROLLBACK ();
1400
1401 for (int i = 0; i < TermWin.saveLines; ++i)
1402 if (screen.text [i])
1403 {
1404 screen.tlen[i] = 0;
1405 scr_blank_line (screen.text [i], screen.rend [i], (unsigned int)TermWin.ncol, DEFAULT_RSTYLE);
1406 }
1407}
1408
1404/* ------------------------------------------------------------------------- */ 1409/* ------------------------------------------------------------------------- */
1405/* 1410/*
1406 * Fill the screen with `E's 1411 * Fill the screen with `E's
1407 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1412 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1408 */ 1413 */
1409void 1414void
1410rxvt_term::scr_E () 1415rxvt_term::scr_E ()
1411{ 1416{
1412 int i, j, k; 1417 int i, j, k;
1413 rend_t *r1, fs; 1418 rend_t *r1, fs;
1414 1419
1415 want_refresh = 1; 1420 want_refresh = 1;
1416 ZERO_SCROLLBACK (); 1421 ZERO_SCROLLBACK ();
1417 1422
1418 num_scr_allow = 0; 1423 num_scr_allow = 0;
… …
1901rxvt_term::scr_page (enum page_dirn direction, int nlines) 1906rxvt_term::scr_page (enum page_dirn direction, int nlines)
1902{ 1907{
1903 int n; 1908 int n;
1904 unsigned int oldviewstart; 1909 unsigned int oldviewstart;
1905 1910
1906#ifdef DEBUG_STRICT
1907 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1908#endif
1909 oldviewstart = TermWin.view_start; 1911 oldviewstart = TermWin.view_start;
1912
1910 if (direction == UP) 1913 if (direction == UP)
1911 { 1914 {
1912 n = TermWin.view_start + nlines; 1915 n = TermWin.view_start + nlines;
1913 TermWin.view_start = min (n, TermWin.nscrolled); 1916 TermWin.view_start = min (n, TermWin.nscrolled);
1914 } 1917 }
1915 else 1918 else
1916 { 1919 {
1917 n = TermWin.view_start - nlines; 1920 n = TermWin.view_start - nlines;
1918 TermWin.view_start = max (n, 0); 1921 TermWin.view_start = max (n, 0);
1919 } 1922 }
1923
1920 return scr_changeview (oldviewstart); 1924 return scr_changeview (oldviewstart);
1921} 1925}
1922 1926
1923int 1927int
1924rxvt_term::scr_changeview (unsigned int oldviewstart) 1928rxvt_term::scr_changeview (unsigned int oldviewstart)
… …
2244 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) 2248 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2245 continue; 2249 continue;
2246 2250
2247 // redraw one or more characters 2251 // redraw one or more characters
2248 2252
2249 // seek to the beginning if wide characters 2253 // seek to the beginning of wide characters
2250 while (stp[col] == NOCHAR && col > 0) 2254 while (stp[col] == NOCHAR && col > 0)
2251 --col; 2255 --col;
2252 2256
2253 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2257 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2254 text_t *text = stp + col; 2258 text_t *text = stp + col;
… …
2398 } 2402 }
2399 else 2403 else
2400 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2404 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2401 2405
2402 if (rend & RS_Uline && font->descent > 1 && fore != back) 2406 if (rend & RS_Uline && font->descent > 1 && fore != back)
2407 {
2408#if ENABLE_FRILLS
2409 if (ISSET_PIXCOLOR (Color_underline))
2410 XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]);
2411 else
2412#endif
2413 XSetForeground (display->display, TermWin.gc, pix_colors[fore]);
2414
2403 XDrawLine (display->display, drawBuffer, TermWin.gc, 2415 XDrawLine (display->display, drawBuffer, TermWin.gc,
2404 xpixel, ypixel + font->ascent + 1, 2416 xpixel, ypixel + font->ascent + 1,
2405 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2417 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2418 }
2406 } /* for (col....) */ 2419 } /* for (col....) */
2407 } /* for (row....) */ 2420 } /* for (row....) */
2408 2421
2409#if ENABLE_OVERLAY 2422#if ENABLE_OVERLAY
2410 scr_swap_overlay (); 2423 scr_swap_overlay ();
… …
2652/* ------------------------------------------------------------------------- */ 2665/* ------------------------------------------------------------------------- */
2653/* 2666/*
2654 * Paste a selection direct to the command fd 2667 * Paste a selection direct to the command fd
2655 */ 2668 */
2656void 2669void
2657rxvt_term::paste (const unsigned char *data, unsigned int len) 2670rxvt_term::paste (unsigned char *data, unsigned int len)
2658{ 2671{
2659 unsigned int i, j, n;
2660 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2661
2662 /* convert normal newline chars into common keyboard Return key sequence */ 2672 /* convert normal newline chars into common keyboard Return key sequence */
2663 for (i = 0; i < len; i += PROP_SIZE) 2673 for (unsigned int i = 0; i < len; i++)
2664 {
2665 n = min (len - i, PROP_SIZE);
2666 memcpy (ds, data + i, n);
2667
2668 for (j = 0; j < n; j++)
2669 if (ds[j] == C0_LF) 2674 if (data[i] == C0_LF)
2670 ds[j] = C0_CR; 2675 data[i] = C0_CR;
2671 2676
2672 tt_write (ds, (int)n); 2677 tt_write (data, len);
2673 }
2674
2675 free (ds);
2676} 2678}
2677 2679
2678/* ------------------------------------------------------------------------- */ 2680/* ------------------------------------------------------------------------- */
2679/* 2681/*
2680 * Respond to a notification that a primary selection has been sent 2682 * Respond to a notification that a primary selection has been sent
2681 * EXT: SelectionNotify 2683 * EXT: SelectionNotify
2682 */ 2684 */
2683int 2685void
2684rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2686rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2685{ 2687{
2686 long nread = 0;
2687 unsigned long bytes_after;
2688 XTextProperty ct;
2689
2690 if (prop == None) /* check for failed XConvertSelection */ 2688 if (prop == None) /* check for failed XConvertSelection */
2691 { 2689 {
2692 if ((selection_type & Sel_CompoundText)) 2690 if ((selection_type & Sel_CompoundText))
2693 { 2691 {
2694 int selnum = selection_type & Sel_whereMask; 2692 int selnum = selection_type & Sel_whereMask;
… …
2707 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2705 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2708 else 2706 else
2709 selection_type = 0; 2707 selection_type = 0;
2710 } 2708 }
2711 2709
2712 return 0; 2710 return;
2713 }
2714
2715 for (;;)
2716 { 2711 }
2712
2713 unsigned long bytes_after;
2714 XTextProperty ct;
2715
2716 if (XGetWindowProperty (display->display, win, prop,
2717 0, PROP_SIZE / 4,
2718 delete_prop, AnyPropertyType,
2719 &ct.encoding, &ct.format,
2720 &ct.nitems, &bytes_after,
2721 &ct.value) != Success)
2722 {
2723 ct.value = 0;
2724 goto bailout;
2725 }
2726
2727 if (ct.encoding == None)
2728 goto bailout;
2729
2730 if (bytes_after)
2731 {
2732 // fetch and append remaining data
2733 XTextProperty ct2;
2734
2717 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2735 if (XGetWindowProperty (display->display, win, prop,
2718 (long) (PROP_SIZE / 4), delete_prop, 2736 ct.nitems / 4, (bytes_after + 3) / 4,
2737 delete_prop, AnyPropertyType,
2719 AnyPropertyType, &ct.encoding, &ct.format, 2738 &ct2.encoding, &ct2.format,
2720 &ct.nitems, &bytes_after, 2739 &ct2.nitems, &bytes_after,
2721 &ct.value) != Success) 2740 &ct2.value) != Success)
2722 break; 2741 goto bailout;
2723 2742
2724 if (ct.encoding == 0) 2743 // realloc should be compatible to XFree, here, and elsewhere, too
2725 break; 2744 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2745 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2746 ct.nitems += ct2.nitems;
2726 2747
2748 XFree (ct2.value);
2749 }
2750
2751 if (ct.value == 0)
2752 goto bailout;
2753
2727 if (ct.encoding == xa[XA_INCR]) 2754 if (ct.encoding == xa[XA_INCR])
2728 { 2755 {
2729 // INCR selection, start handshake 2756 // INCR selection, start handshake
2757 if (!delete_prop)
2730 XDeleteProperty (display->display, win, prop); 2758 XDeleteProperty (display->display, win, prop);
2759
2731 selection_wait = Sel_incr; 2760 selection_wait = Sel_incr;
2761 incr_buf_fill = 0;
2732 incr_ev.start (NOW + 10); 2762 incr_ev.start (NOW + 10);
2733 break;
2734 }
2735 2763
2736 if (ct.value == NULL) 2764 goto bailout;
2737 continue; 2765 }
2738 2766
2739 if (ct.nitems == 0) 2767 if (ct.nitems == 0)
2768 {
2769 if (selection_wait == Sel_incr)
2770 {
2771 XFree (ct.value);
2772
2773 // finally complete, now paste the whole thing
2774 selection_wait = Sel_normal;
2775 ct.value = (unsigned char *)incr_buf;
2776 ct.nitems = incr_buf_fill;
2777 incr_buf = 0;
2778 incr_buf_size = 0;
2779 incr_ev.stop ();
2740 { 2780 }
2781 else
2782 {
2741 if (selection_wait == Sel_normal && nread == 0 2783 if (selection_wait == Sel_normal
2742 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2784 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2743 { 2785 {
2744 /* 2786 /*
2745 * pass through again trying CUT_BUFFER0 if we've come from 2787 * pass through again trying CUT_BUFFER0 if we've come from
2746 * XConvertSelection () but nothing was presented 2788 * XConvertSelection () but nothing was presented
2747 */ 2789 */
2748 selection_paste (display->root, XA_CUT_BUFFER0, False); 2790 selection_paste (display->root, XA_CUT_BUFFER0, False);
2749 } 2791 }
2750 2792
2751 nread = -1; /* discount any previous stuff */ 2793 goto bailout;
2752 break; 2794 }
2795 }
2796 else if (selection_wait == Sel_incr)
2797 {
2798 incr_ev.start (NOW + 10);
2799
2800 while (incr_buf_fill + ct.nitems > incr_buf_size)
2753 } 2801 {
2802 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2803 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2804 }
2754 2805
2806 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2755 nread += ct.nitems; 2807 incr_buf_fill += ct.nitems;
2756 2808
2809 goto bailout;
2810 }
2811
2757 char **cl; 2812 char **cl;
2758 int cr; 2813 int cr;
2814
2815#if ENABLE_FRILLS
2816 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2817 // so recode it manually
2818 if (ct.encoding == xa[XA_UTF8_STRING])
2819 {
2820 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2821 char *s = rxvt_wcstombs (w);
2822 free (w);
2823 // TODO: strlen == only the first element will be converted. well...
2824 paste ((unsigned char *)s, strlen (s));
2825 free (s);
2826 }
2827 else
2828#endif
2759 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) 2829 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2760 { 2830 && cl)
2831 {
2761 for (int i = 0; i < cr; i++) 2832 for (int i = 0; i < cr; i++)
2762 paste ((unsigned char *)cl[i], strlen (cl[i])); 2833 paste ((unsigned char *)cl[i], strlen (cl[i]));
2763 2834
2764 XFreeStringList (cl); 2835 XFreeStringList (cl);
2765 } 2836 }
2766 else 2837 else
2767 paste (ct.value, ct.nitems); 2838 paste (ct.value, ct.nitems); // paste raw
2768 2839
2769 if (bytes_after == 0) 2840bailout:
2770 break;
2771
2772 XFree (ct.value);
2773 }
2774
2775 if (ct.value)
2776 XFree (ct.value); 2841 XFree (ct.value);
2777 2842
2778 if (selection_wait == Sel_normal) 2843 if (selection_wait == Sel_normal)
2779 selection_wait = Sel_none; 2844 selection_wait = Sel_none;
2780
2781 return (int)nread;
2782} 2845}
2783 2846
2784void 2847void
2785rxvt_term::incr_cb (time_watcher &w) 2848rxvt_term::incr_cb (time_watcher &w)
2786{ 2849{
2787 selection_wait = Sel_none; 2850 selection_wait = Sel_none;
2788 2851
2852 incr_buf_size = 0;
2853 free (incr_buf);
2854
2789 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2855 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2790} 2856}
2791 2857
2792/*
2793 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2794 */
2795void 2858void
2796rxvt_term::selection_property (Window win, Atom prop) 2859rxvt_term::selection_property (Window win, Atom prop)
2797{ 2860{
2798 if (prop == None || selection_wait != Sel_incr) 2861 if (prop == None || selection_wait != Sel_incr)
2799 return; 2862 return;
2800 2863
2801 if (selection_paste (win, prop, 1) > 0) 2864 selection_paste (win, prop, true);
2802 incr_ev.start (NOW + 10);
2803 else
2804 {
2805 selection_wait = Sel_none;
2806 incr_ev.stop ();
2807 }
2808} 2865}
2809 2866
2810/* ------------------------------------------------------------------------- */ 2867/* ------------------------------------------------------------------------- */
2811/* 2868/*
2812 * Request the current selection: 2869 * Request the current selection:
… …
2846#else 2903#else
2847 selection_type = Sel_CompoundText; 2904 selection_type = Sel_CompoundText;
2848 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2905 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2849 return; 2906 return;
2850#endif 2907#endif
2851
2852 } 2908 }
2853 } 2909 }
2854 2910
2855 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2911 selection_wait = Sel_none; /* don't loop in selection_paste () */
2856 selection_paste (display->root, XA_CUT_BUFFER0, False); 2912 selection_paste (display->root, XA_CUT_BUFFER0, false);
2857} 2913}
2858 2914
2859int 2915int
2860rxvt_term::selection_request_other (Atom target, int selnum) 2916rxvt_term::selection_request_other (Atom target, int selnum)
2861{ 2917{
… …
3017#if 0 3073#if 0
3018 XTextProperty ct; 3074 XTextProperty ct;
3019 3075
3020 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3076 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
3021 { 3077 {
3022 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 3078 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3023 PropModeReplace, ct.value, ct.nitems);
3024 XFree (ct.value); 3079 XFree (ct.value);
3025 } 3080 }
3026#endif 3081#endif
3027 3082
3028 selection_time = tm; 3083 selection_time = tm;
… …
3366 selection_delimit_word (DN, &selection.end, &selection.end); 3421 selection_delimit_word (DN, &selection.end, &selection.end);
3367 } 3422 }
3368 else if (selection.clicks == 3) 3423 else if (selection.clicks == 3)
3369 { 3424 {
3370#if ENABLE_FRILLS 3425#if ENABLE_FRILLS
3371 if ((options & Opt_tripleclickwords)) 3426 if (options & Opt_tripleclickwords)
3372 { 3427 {
3373 int end_row; 3428 int end_row;
3374 3429
3375 selection_delimit_word (UP, &selection.beg, &selection.beg); 3430 selection_delimit_word (UP, &selection.beg, &selection.beg);
3376 end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; 3431 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
… …
3394 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3449 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3395 selection.mark.col++; 3450 selection.mark.col++;
3396 3451
3397 selection.beg.col = 0; 3452 selection.beg.col = 0;
3398 selection.end.col = ncol; 3453 selection.end.col = ncol;
3454
3455 // select a complete logical line
3456 while (selection.beg.row > -TermWin.saveLines
3457 && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1)
3458 selection.beg.row--;
3459
3460 while (selection.end.row < TermWin.nrow
3461 && screen.tlen[selection.end.row + TermWin.saveLines] == -1)
3462 selection.end.row++;
3399 } 3463 }
3400 } 3464 }
3401 3465
3402 if (button3 && buttonpress) 3466 if (button3 && buttonpress)
3403 { /* mark may need to be changed */ 3467 { /* mark may need to be changed */
… …
3483 */ 3547 */
3484void 3548void
3485rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3549rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3486{ 3550{
3487 XSelectionEvent ev; 3551 XSelectionEvent ev;
3488 XTextProperty ct; 3552 dDisp;
3489 XICCEncodingStyle style;
3490 Atom target;
3491 3553
3492 ev.type = SelectionNotify; 3554 ev.type = SelectionNotify;
3493 ev.property = None; 3555 ev.property = None;
3494 ev.display = rq.display; 3556 ev.display = rq.display;
3495 ev.requestor = rq.requestor; 3557 ev.requestor = rq.requestor;
… …
3509 *target++ = xa[XA_COMPOUND_TEXT]; 3571 *target++ = xa[XA_COMPOUND_TEXT];
3510#if X_HAVE_UTF8_STRING 3572#if X_HAVE_UTF8_STRING
3511 *target++ = xa[XA_UTF8_STRING]; 3573 *target++ = xa[XA_UTF8_STRING];
3512#endif 3574#endif
3513 3575
3514 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3576 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,
3515 32, PropModeReplace, 3577 32, PropModeReplace,
3516 (unsigned char *)target_list, target - target_list); 3578 (unsigned char *)target_list, target - target_list);
3517 ev.property = rq.property; 3579 ev.property = rq.property;
3518 } 3580 }
3519#if TODO // TODO 3581#if TODO // TODO
… …
3522 /* TODO: Handle MULTIPLE */ 3584 /* TODO: Handle MULTIPLE */
3523 } 3585 }
3524#endif 3586#endif
3525 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3587 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3526 { 3588 {
3527 XChangeProperty (display->display, rq.requestor, rq.property, rq.target, 3589 XChangeProperty (disp, rq.requestor, rq.property, rq.target,
3528 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3590 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3529 ev.property = rq.property; 3591 ev.property = rq.property;
3530 } 3592 }
3531 else if (rq.target == XA_STRING 3593 else if (rq.target == XA_STRING
3532 || rq.target == xa[XA_TEXT] 3594 || rq.target == xa[XA_TEXT]
3533 || rq.target == xa[XA_COMPOUND_TEXT] 3595 || rq.target == xa[XA_COMPOUND_TEXT]
3534 || rq.target == xa[XA_UTF8_STRING] 3596 || rq.target == xa[XA_UTF8_STRING]
3535 ) 3597 )
3536 { 3598 {
3599 XTextProperty ct;
3600 Atom target = rq.target;
3537 short freect = 0; 3601 short freect = 0;
3538 int selectlen; 3602 int selectlen;
3539 wchar_t *cl; 3603 wchar_t *cl;
3540 3604 enum {
3541 target = rq.target; 3605 enc_string = XStringStyle,
3606 enc_text = XStdICCTextStyle,
3607 enc_compound_text = XCompoundTextStyle,
3608#ifdef X_HAVE_UTF8_STRING
3609 enc_utf8 = XUTF8StringStyle,
3610#else
3611 enc_utf8 = -1,
3612#endif
3613 } style;
3542 3614
3543 if (target == XA_STRING) 3615 if (target == XA_STRING)
3544 // we actually don't do XA_STRING, but who cares, as i18n clients 3616 // we actually don't do XA_STRING, but who cares, as i18n clients
3545 // will ask for another format anyways. 3617 // will ask for another format anyways.
3546 style = XStringStyle; 3618 style = enc_string;
3547 else if (target == xa[XA_TEXT]) 3619 else if (target == xa[XA_TEXT])
3548 style = XStdICCTextStyle; 3620 style = enc_text;
3549 else if (target == xa[XA_COMPOUND_TEXT]) 3621 else if (target == xa[XA_COMPOUND_TEXT])
3550 style = XCompoundTextStyle; 3622 style = enc_compound_text;
3551#if X_HAVE_UTF8_STRING 3623#if ENABLE_FRILLS
3552 else if (target == xa[XA_UTF8_STRING]) 3624 else if (target == xa[XA_UTF8_STRING])
3553 style = XUTF8StringStyle; 3625 style = enc_utf8;
3554#endif 3626#endif
3555 else 3627 else
3556 { 3628 {
3557 target = xa[XA_COMPOUND_TEXT]; 3629 target = xa[XA_COMPOUND_TEXT];
3558 style = XCompoundTextStyle; 3630 style = enc_compound_text;
3559 } 3631 }
3560 3632
3561 if (selection.text) 3633 if (selection.text)
3562 { 3634 {
3563 cl = selection.text; 3635 cl = selection.text;
… …
3567 { 3639 {
3568 cl = L""; 3640 cl = L"";
3569 selectlen = 0; 3641 selectlen = 0;
3570 } 3642 }
3571 3643
3572 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it 3644#if ENABLE_FRILLS
3573 // manually for XUTF8StringStyle. 3645 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3646 // so recode it manually
3647 if (style == enc_utf8)
3648 {
3649 freect = 1;
3650 ct.encoding = target;
3651 ct.format = 8;
3652 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3653 ct.nitems = strlen ((char *)ct.value);
3654 }
3655 else
3656#endif
3574 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3657 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3575 freect = 1; 3658 freect = 1;
3576 else 3659 else
3577 { 3660 {
3578 /* if we failed to convert then send it raw */ 3661 /* if we failed to convert then send it raw */
3579 ct.value = (unsigned char *)cl; 3662 ct.value = (unsigned char *)cl;
3580 ct.nitems = selectlen; 3663 ct.nitems = selectlen;
3664 ct.encoding = target;
3581 } 3665 }
3582 3666
3583 XChangeProperty (display->display, rq.requestor, rq.property, 3667 XChangeProperty (disp, rq.requestor, rq.property,
3584 target, 8, PropModeReplace, 3668 ct.encoding, 8, PropModeReplace,
3585 ct.value, (int)ct.nitems); 3669 ct.value, (int)ct.nitems);
3586 ev.property = rq.property; 3670 ev.property = rq.property;
3587 3671
3588 if (freect) 3672 if (freect)
3589 XFree (ct.value); 3673 XFree (ct.value);
3590 } 3674 }
3591 3675
3592 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3676 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
3593} 3677}
3594 3678
3595/* ------------------------------------------------------------------------- * 3679/* ------------------------------------------------------------------------- *
3596 * MOUSE ROUTINES * 3680 * MOUSE ROUTINES *
3597 * ------------------------------------------------------------------------- */ 3681 * ------------------------------------------------------------------------- */

Diff Legend

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