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.136 by root, Tue Sep 7 21:05:41 2004 UTC vs.
Revision 1.155 by root, Thu Feb 3 07:45:39 2005 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 * ------------------------------------------------------------------------- */
… …
293 ralloc->free (drawn_rend[p]); 294 ralloc->free (drawn_rend[p]);
294 } 295 }
295 296
296 /* we have fewer rows so fix up cursor position */ 297 /* we have fewer rows so fix up cursor position */
297 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 298 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
298 MIN_IT (swap.cur.row, (int32_t)nrow - 1);
299 299
300 scr_reset_realloc (); /* realloc _last_ */ 300 scr_reset_realloc (); /* realloc _last_ */
301 } 301 }
302 else if (nrow > prev_nrow) 302 else if (nrow > prev_nrow)
303 { 303 {
… …
334 scr_scroll_text (0, (int)nrow - 1, -k, 1); 334 scr_scroll_text (0, (int)nrow - 1, -k, 1);
335 screen.cur.row += k; 335 screen.cur.row += k;
336 screen.s_cur.row += k; 336 screen.s_cur.row += k;
337 TermWin.nscrolled -= k; 337 TermWin.nscrolled -= k;
338 } 338 }
339
339#ifdef DEBUG_STRICT 340#ifdef DEBUG_STRICT
340 assert (screen.cur.row < TermWin.nrow); 341 assert (screen.cur.row < TermWin.nrow);
341 assert (swap.cur.row < TermWin.nrow);
342#else /* drive with your eyes closed */ 342#else /* drive with your eyes closed */
343
344 MIN_IT (screen.cur.row, nrow - 1); 343 MIN_IT (screen.cur.row, nrow - 1);
345 MIN_IT (swap.cur.row, nrow - 1);
346#endif 344#endif
347 TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this 345 TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this
348 } 346 }
349 347
350 /* resize columns */ 348 /* resize columns */
… …
393 } 391 }
394 392
395 } 393 }
396 394
397 MIN_IT (screen.cur.col, (int16_t)ncol - 1); 395 MIN_IT (screen.cur.col, (int16_t)ncol - 1);
398 MIN_IT (swap.cur.col, (int16_t)ncol - 1);
399 396
400 delete talloc; talloc = ta; 397 delete talloc; talloc = ta;
401 delete ralloc; ralloc = ra; 398 delete ralloc; ralloc = ra;
402 } 399 }
403 400
… …
565 if (current_screen == scrn) 562 if (current_screen == scrn)
566 return scrn; 563 return scrn;
567 564
568 selection_check (2); /* check for boundary cross */ 565 selection_check (2); /* check for boundary cross */
569 566
570 SWAP_IT (current_screen, scrn, int); 567 i = current_screen; current_screen = scrn; scrn = i;
568
569 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
570 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
571 MAX_IT (screen.cur.row, 0);
572 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
573 MAX_IT (screen.cur.col, 0);
574 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
575
571#if NSCREENS 576#if NSCREENS
572 if (options & Opt_secondaryScreen) 577 if (options & Opt_secondaryScreen)
573 { 578 {
574 num_scr = 0; 579 num_scr = 0;
575 offset = TermWin.saveLines; 580 offset = TermWin.saveLines;
581
576 for (i = prev_nrow; i--;) 582 for (i = prev_nrow; i--;)
577 { 583 {
578 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); 584 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
579 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); 585 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
580 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); 586 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
581 } 587 }
582 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 588
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); 589 SWAP_IT (screen.charset, swap.charset, int16_t);
594 SWAP_IT (screen.flags, swap.flags, int); 590 SWAP_IT (screen.flags, swap.flags, int);
595 screen.flags |= Screen_VisibleCursor; 591 screen.flags |= Screen_VisibleCursor;
596 swap.flags |= Screen_VisibleCursor; 592 swap.flags |= Screen_VisibleCursor;
597 } 593 }
598 else 594 else
599#endif 595#endif
600 if (options & Opt_secondaryScroll) 596 if (options & Opt_secondaryScroll)
601 //if (current_screen == PRIMARY)
602 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); 597 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0);
598
603 return scrn; 599 return scrn;
604} 600}
605 601
606// clear WrapNext indicator, solidifying position on next line 602// clear WrapNext indicator, solidifying position on next line
607void 603void
… …
878 874
879 stp = screen.text[row]; /* _must_ refresh */ 875 stp = screen.text[row]; /* _must_ refresh */
880 srp = screen.rend[row]; /* _must_ refresh */ 876 srp = screen.rend[row]; /* _must_ refresh */
881 } 877 }
882 878
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 879 // 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 880 // do wcwidth before further replacements, as wcwidth says that line-drawing
888 // characters have width -1 (DOH!) on GNU/Linux sometimes. 881 // characters have width -1 (DOH!) on GNU/Linux sometimes.
889 int width = c < 0x100 ? 1 : wcwidth (c); 882 int width = c < 0x100 ? 1 : wcwidth (c);
890 883
891 if (charsets[screen.charset] == '0') // DEC SPECIAL 884 if (charsets[screen.charset] == '0') // DEC SPECIAL
892 { 885 {
893 // vt100 special graphics and line drawing 886 // vt100 special graphics and line drawing
894 // 5f-7e standard vt100 887 // 5f-7e standard vt100
895 // 40-5e rxvt extension for extra curses acs chars 888 // 40-5e rxvt extension for extra curses acs chars
896 static uint16_t vt100_0[63] = { // 5f .. 7e 889 static uint16_t vt100_0[63] = { // 40 .. 7e
897 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman! 890 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman!
898 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f 891 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f
899 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57 892 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57
900 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f 893 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f
901 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 894 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
… …
909 c = vt100_0[c - 0x40]; 902 c = vt100_0[c - 0x40];
910 width = 1; 903 width = 1;
911 } 904 }
912 } 905 }
913 906
907 if (screen.flags & Screen_Insert)
908 scr_insdel_chars (width, INSERT);
909
914 if (width != 0) 910 if (width != 0)
915 { 911 {
916 // some utf-8 decoders decode surrogate characters. 912 // some utf-8 decoders decode surrogate characters.
917 if (0xd800 <= c && c <= 0xdfff) 913 if (0xd800 <= c && c <= 0xdfff)
918 c = 0xfffd; 914 c = 0xfffd;
… …
968 c = NOCHAR; 964 c = NOCHAR;
969 } 965 }
970 while (--width > 0); 966 while (--width > 0);
971 967
972 // pad with spaces when overwriting wide character with smaller one 968 // pad with spaces when overwriting wide character with smaller one
969 if (!width)
973 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) 970 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)
974 { 971 {
975 stp[c] = ' '; 972 stp[c] = ' ';
976 srp[c] = rend; 973 srp[c] = rend;
977 } 974 }
978 } 975 }
979 else if (width == 0) 976 else if (width == 0)
980 { 977 {
981#if ENABLE_COMBINING 978#if ENABLE_COMBINING
982 // handle combining characters 979 // handle combining characters
… …
1095 if (count) 1092 if (count)
1096 x = TermWin.ncol - 1; 1093 x = TermWin.ncol - 1;
1097 1094
1098 // store horizontal tab commands as characters inside the text 1095 // store horizontal tab commands as characters inside the text
1099 // buffer so they can be selected and pasted. 1096 // buffer so they can be selected and pasted.
1100 if (ht) 1097 if (ht && options & Opt_pastableTabs)
1101 { 1098 {
1102 base_rend = SET_FONT (base_rend, 0); 1099 base_rend = SET_FONT (base_rend, 0);
1103 1100
1104 if (screen.tlen[row] != -1) /* XXX: think about this */ 1101 if (screen.tlen[row] != -1) /* XXX: think about this */
1105 MAX_IT (screen.tlen[row], x); 1102 MAX_IT (screen.tlen[row], x);
… …
1378 ren = DEFAULT_RSTYLE; 1375 ren = DEFAULT_RSTYLE;
1379 CLEAR_ROWS (row, num); 1376 CLEAR_ROWS (row, num);
1380 } 1377 }
1381 else 1378 else
1382 { 1379 {
1383 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1380 ren = rstyle & (RS_fgMask | RS_bgMask);
1384 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1381 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1385 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1382 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1386 ERASE_ROWS (row, num); 1383 ERASE_ROWS (row, num);
1387 gcvalue.foreground = pix_colors[Color_fg]; 1384 gcvalue.foreground = pix_colors[Color_fg];
1388 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1385 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1389 } 1386 }
1390 1387
1391 for (; num--; row++) 1388 for (; num--; row++)
1392 { 1389 {
1393 scr_blank_screen_mem (screen.text, screen.rend, 1390 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle);
1394 (unsigned int) (row + row_offset), rstyle);
1395 screen.tlen[row + row_offset] = 0; 1391 screen.tlen[row + row_offset] = 0;
1396 scr_blank_line (drawn_text[row], drawn_rend[row], 1392 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);
1397 (unsigned int)TermWin.ncol, ren);
1398 } 1393 }
1399} 1394}
1400 1395
1401/* ------------------------------------------------------------------------- */ 1396/* ------------------------------------------------------------------------- */
1402/* 1397/*
… …
2241 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) 2236 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2242 continue; 2237 continue;
2243 2238
2244 // redraw one or more characters 2239 // redraw one or more characters
2245 2240
2246 // seek to the beginning if wide characters 2241 // seek to the beginning of wide characters
2247 while (stp[col] == NOCHAR && col > 0) 2242 while (stp[col] == NOCHAR && col > 0)
2248 --col; 2243 --col;
2249 2244
2250 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2245 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2251 text_t *text = stp + col; 2246 text_t *text = stp + col;
… …
2395 } 2390 }
2396 else 2391 else
2397 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2392 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2398 2393
2399 if (rend & RS_Uline && font->descent > 1 && fore != back) 2394 if (rend & RS_Uline && font->descent > 1 && fore != back)
2395 {
2396#if ENABLE_FRILLS
2397 if (ISSET_PIXCOLOR (Color_underline))
2398 XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]);
2399 else
2400#endif
2401 XSetForeground (display->display, TermWin.gc, pix_colors[fore]);
2402
2400 XDrawLine (display->display, drawBuffer, TermWin.gc, 2403 XDrawLine (display->display, drawBuffer, TermWin.gc,
2401 xpixel, ypixel + font->ascent + 1, 2404 xpixel, ypixel + font->ascent + 1,
2402 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2405 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2406 }
2403 } /* for (col....) */ 2407 } /* for (col....) */
2404 } /* for (row....) */ 2408 } /* for (row....) */
2405 2409
2406#if ENABLE_OVERLAY 2410#if ENABLE_OVERLAY
2407 scr_swap_overlay (); 2411 scr_swap_overlay ();
… …
2649/* ------------------------------------------------------------------------- */ 2653/* ------------------------------------------------------------------------- */
2650/* 2654/*
2651 * Paste a selection direct to the command fd 2655 * Paste a selection direct to the command fd
2652 */ 2656 */
2653void 2657void
2654rxvt_term::paste (const unsigned char *data, unsigned int len) 2658rxvt_term::paste (unsigned char *data, unsigned int len)
2655{ 2659{
2656 unsigned int i, j, n;
2657 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2658
2659 /* convert normal newline chars into common keyboard Return key sequence */ 2660 /* convert normal newline chars into common keyboard Return key sequence */
2660 for (i = 0; i < len; i += PROP_SIZE) 2661 for (unsigned int i = 0; i < len; i++)
2661 {
2662 n = min (len - i, PROP_SIZE);
2663 memcpy (ds, data + i, n);
2664
2665 for (j = 0; j < n; j++)
2666 if (ds[j] == C0_LF) 2662 if (data[i] == C0_LF)
2667 ds[j] = C0_CR; 2663 data[i] = C0_CR;
2668 2664
2669 tt_write (ds, (int)n); 2665 tt_write (data, len);
2670 }
2671
2672 free (ds);
2673} 2666}
2674 2667
2675/* ------------------------------------------------------------------------- */ 2668/* ------------------------------------------------------------------------- */
2676/* 2669/*
2677 * Respond to a notification that a primary selection has been sent 2670 * Respond to a notification that a primary selection has been sent
2678 * EXT: SelectionNotify 2671 * EXT: SelectionNotify
2679 */ 2672 */
2680int 2673void
2681rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2674rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2682{ 2675{
2683 long nread = 0;
2684 unsigned long bytes_after;
2685 XTextProperty ct;
2686
2687 if (prop == None) /* check for failed XConvertSelection */ 2676 if (prop == None) /* check for failed XConvertSelection */
2688 { 2677 {
2689 if ((selection_type & Sel_CompoundText)) 2678 if ((selection_type & Sel_CompoundText))
2690 { 2679 {
2691 int selnum = selection_type & Sel_whereMask; 2680 int selnum = selection_type & Sel_whereMask;
… …
2704 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2693 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2705 else 2694 else
2706 selection_type = 0; 2695 selection_type = 0;
2707 } 2696 }
2708 2697
2709 return 0; 2698 return;
2710 }
2711
2712 for (;;)
2713 { 2699 }
2700
2701 unsigned long bytes_after;
2702 XTextProperty ct;
2703
2704 if (XGetWindowProperty (display->display, win, prop,
2705 0, PROP_SIZE / 4,
2706 delete_prop, AnyPropertyType,
2707 &ct.encoding, &ct.format,
2708 &ct.nitems, &bytes_after,
2709 &ct.value) != Success)
2710 {
2711 ct.value = 0;
2712 goto bailout;
2713 }
2714
2715 if (ct.encoding == None)
2716 goto bailout;
2717
2718 if (bytes_after)
2719 {
2720 // fetch and append remaining data
2721 XTextProperty ct2;
2722
2714 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2723 if (XGetWindowProperty (display->display, win, prop,
2715 (long) (PROP_SIZE / 4), delete_prop, 2724 ct.nitems / 4, (bytes_after + 3) / 4,
2725 delete_prop, AnyPropertyType,
2716 AnyPropertyType, &ct.encoding, &ct.format, 2726 &ct2.encoding, &ct2.format,
2717 &ct.nitems, &bytes_after, 2727 &ct2.nitems, &bytes_after,
2718 &ct.value) != Success) 2728 &ct2.value) != Success)
2719 break; 2729 goto bailout;
2720 2730
2721 if (ct.encoding == 0) 2731 // realloc should be compatible to XFree, here, and elsewhere, too
2722 break; 2732 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2733 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2734 ct.nitems += ct2.nitems;
2723 2735
2736 XFree (ct2.value);
2737 }
2738
2739 if (ct.value == 0)
2740 goto bailout;
2741
2724 if (ct.encoding == xa[XA_INCR]) 2742 if (ct.encoding == xa[XA_INCR])
2725 { 2743 {
2726 // INCR selection, start handshake 2744 // INCR selection, start handshake
2745 if (!delete_prop)
2727 XDeleteProperty (display->display, win, prop); 2746 XDeleteProperty (display->display, win, prop);
2747
2728 selection_wait = Sel_incr; 2748 selection_wait = Sel_incr;
2749 incr_buf_fill = 0;
2729 incr_ev.start (NOW + 10); 2750 incr_ev.start (NOW + 10);
2730 break;
2731 }
2732 2751
2733 if (ct.value == NULL) 2752 goto bailout;
2734 continue; 2753 }
2735 2754
2736 if (ct.nitems == 0) 2755 if (ct.nitems == 0)
2756 {
2757 if (selection_wait == Sel_incr)
2758 {
2759 XFree (ct.value);
2760
2761 // finally complete, now paste the whole thing
2762 selection_wait = Sel_normal;
2763 ct.value = (unsigned char *)incr_buf;
2764 ct.nitems = incr_buf_fill;
2765 incr_buf = 0;
2766 incr_buf_size = 0;
2767 incr_ev.stop ();
2737 { 2768 }
2769 else
2770 {
2738 if (selection_wait == Sel_normal && nread == 0 2771 if (selection_wait == Sel_normal
2739 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2772 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2740 { 2773 {
2741 /* 2774 /*
2742 * pass through again trying CUT_BUFFER0 if we've come from 2775 * pass through again trying CUT_BUFFER0 if we've come from
2743 * XConvertSelection () but nothing was presented 2776 * XConvertSelection () but nothing was presented
2744 */ 2777 */
2745 selection_paste (display->root, XA_CUT_BUFFER0, False); 2778 selection_paste (display->root, XA_CUT_BUFFER0, False);
2746 } 2779 }
2747 2780
2748 nread = -1; /* discount any previous stuff */ 2781 goto bailout;
2749 break; 2782 }
2783 }
2784 else if (selection_wait == Sel_incr)
2785 {
2786 incr_ev.start (NOW + 10);
2787
2788 while (incr_buf_fill + ct.nitems > incr_buf_size)
2750 } 2789 {
2790 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2791 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2792 }
2751 2793
2794 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2752 nread += ct.nitems; 2795 incr_buf_fill += ct.nitems;
2753 2796
2797 goto bailout;
2798 }
2799
2754 char **cl; 2800 char **cl;
2755 int cr; 2801 int cr;
2802
2803#if ENABLE_FRILLS
2804 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2805 // so recode it manually
2806 if (ct.encoding == xa[XA_UTF8_STRING])
2807 {
2808 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2809 char *s = rxvt_wcstombs (w);
2810 free (w);
2811 // TODO: strlen == only the first element will be converted. well...
2812 paste ((unsigned char *)s, strlen (s));
2813 free (s);
2814 }
2815 else
2816#endif
2756 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) 2817 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2757 { 2818 && cl)
2819 {
2758 for (int i = 0; i < cr; i++) 2820 for (int i = 0; i < cr; i++)
2759 paste ((unsigned char *)cl[i], strlen (cl[i])); 2821 paste ((unsigned char *)cl[i], strlen (cl[i]));
2760 2822
2761 XFreeStringList (cl); 2823 XFreeStringList (cl);
2762 } 2824 }
2763 else 2825 else
2764 paste (ct.value, ct.nitems); 2826 paste (ct.value, ct.nitems); // paste raw
2765 2827
2766 if (bytes_after == 0) 2828bailout:
2767 break;
2768
2769 XFree (ct.value);
2770 }
2771
2772 if (ct.value)
2773 XFree (ct.value); 2829 XFree (ct.value);
2774 2830
2775 if (selection_wait == Sel_normal) 2831 if (selection_wait == Sel_normal)
2776 selection_wait = Sel_none; 2832 selection_wait = Sel_none;
2777
2778 return (int)nread;
2779} 2833}
2780 2834
2781void 2835void
2782rxvt_term::incr_cb (time_watcher &w) 2836rxvt_term::incr_cb (time_watcher &w)
2783{ 2837{
2784 selection_wait = Sel_none; 2838 selection_wait = Sel_none;
2785 2839
2840 incr_buf_size = 0;
2841 free (incr_buf);
2842
2786 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2843 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2787} 2844}
2788 2845
2789/*
2790 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2791 */
2792void 2846void
2793rxvt_term::selection_property (Window win, Atom prop) 2847rxvt_term::selection_property (Window win, Atom prop)
2794{ 2848{
2795 if (prop == None || selection_wait != Sel_incr) 2849 if (prop == None || selection_wait != Sel_incr)
2796 return; 2850 return;
2797 2851
2798 if (selection_paste (win, prop, 1) > 0) 2852 selection_paste (win, prop, true);
2799 incr_ev.start (NOW + 10);
2800 else
2801 {
2802 selection_wait = Sel_none;
2803 incr_ev.stop ();
2804 }
2805} 2853}
2806 2854
2807/* ------------------------------------------------------------------------- */ 2855/* ------------------------------------------------------------------------- */
2808/* 2856/*
2809 * Request the current selection: 2857 * Request the current selection:
… …
2843#else 2891#else
2844 selection_type = Sel_CompoundText; 2892 selection_type = Sel_CompoundText;
2845 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2893 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2846 return; 2894 return;
2847#endif 2895#endif
2848
2849 } 2896 }
2850 } 2897 }
2851 2898
2852 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2899 selection_wait = Sel_none; /* don't loop in selection_paste () */
2853 selection_paste (display->root, XA_CUT_BUFFER0, False); 2900 selection_paste (display->root, XA_CUT_BUFFER0, false);
2854} 2901}
2855 2902
2856int 2903int
2857rxvt_term::selection_request_other (Atom target, int selnum) 2904rxvt_term::selection_request_other (Atom target, int selnum)
2858{ 2905{
… …
3014#if 0 3061#if 0
3015 XTextProperty ct; 3062 XTextProperty ct;
3016 3063
3017 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3064 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
3018 { 3065 {
3019 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 3066 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3020 PropModeReplace, ct.value, ct.nitems);
3021 XFree (ct.value); 3067 XFree (ct.value);
3022 } 3068 }
3023#endif 3069#endif
3024 3070
3025 selection_time = tm; 3071 selection_time = tm;
… …
3363 selection_delimit_word (DN, &selection.end, &selection.end); 3409 selection_delimit_word (DN, &selection.end, &selection.end);
3364 } 3410 }
3365 else if (selection.clicks == 3) 3411 else if (selection.clicks == 3)
3366 { 3412 {
3367#if ENABLE_FRILLS 3413#if ENABLE_FRILLS
3368 if ((options & Opt_tripleclickwords)) 3414 if (options & Opt_tripleclickwords)
3369 { 3415 {
3370 int end_row; 3416 int end_row;
3371 3417
3372 selection_delimit_word (UP, & (selection.beg), & (selection.beg)); 3418 selection_delimit_word (UP, &selection.beg, &selection.beg);
3373 end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; 3419 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3374 3420
3375 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) 3421 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3376 { 3422 {
3377 end_col = screen.tlen[end_row + TermWin.saveLines]; 3423 end_col = screen.tlen[end_row + TermWin.saveLines];
… …
3391 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3437 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3392 selection.mark.col++; 3438 selection.mark.col++;
3393 3439
3394 selection.beg.col = 0; 3440 selection.beg.col = 0;
3395 selection.end.col = ncol; 3441 selection.end.col = ncol;
3442
3443 // select a complete logical line
3444 while (selection.beg.row > -TermWin.saveLines
3445 && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1)
3446 selection.beg.row--;
3447
3448 while (selection.end.row < TermWin.nrow
3449 && screen.tlen[selection.end.row + TermWin.saveLines] == -1)
3450 selection.end.row++;
3396 } 3451 }
3397 } 3452 }
3398 3453
3399 if (button3 && buttonpress) 3454 if (button3 && buttonpress)
3400 { /* mark may need to be changed */ 3455 { /* mark may need to be changed */
… …
3473 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3528 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3474} 3529}
3475 3530
3476/* ------------------------------------------------------------------------- */ 3531/* ------------------------------------------------------------------------- */
3477/* 3532/*
3478 * On some systems, the Atom typedef is 64 bits wide. We need to have a type
3479 * that is exactly 32 bits wide, because a format of 64 is not allowed by
3480 * the X11 protocol.
3481 */
3482typedef CARD32 Atom32;
3483
3484/* ------------------------------------------------------------------------- */
3485/*
3486 * Respond to a request for our current selection 3533 * Respond to a request for our current selection
3487 * EXT: SelectionRequest 3534 * EXT: SelectionRequest
3488 */ 3535 */
3489void 3536void
3490rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3537rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3491{ 3538{
3492 XSelectionEvent ev; 3539 XSelectionEvent ev;
3493 XTextProperty ct;
3494 XICCEncodingStyle style;
3495 Atom target;
3496 3540
3497 ev.type = SelectionNotify; 3541 ev.type = SelectionNotify;
3498 ev.property = None; 3542 ev.property = None;
3499 ev.display = rq.display; 3543 ev.display = rq.display;
3500 ev.requestor = rq.requestor; 3544 ev.requestor = rq.requestor;
… …
3502 ev.target = rq.target; 3546 ev.target = rq.target;
3503 ev.time = rq.time; 3547 ev.time = rq.time;
3504 3548
3505 if (rq.target == xa[XA_TARGETS]) 3549 if (rq.target == xa[XA_TARGETS])
3506 { 3550 {
3507 Atom32 target_list[6]; 3551 Atom target_list[6];
3508 Atom32 *target = target_list; 3552 Atom *target = target_list;
3509 3553
3510 *target++ = (Atom32) xa[XA_TARGETS]; 3554 *target++ = xa[XA_TARGETS];
3511 *target++ = (Atom32) xa[XA_TIMESTAMP]; 3555 *target++ = xa[XA_TIMESTAMP];
3512 *target++ = (Atom32) XA_STRING; 3556 *target++ = XA_STRING;
3513 *target++ = (Atom32) xa[XA_TEXT]; 3557 *target++ = xa[XA_TEXT];
3514 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3558 *target++ = xa[XA_COMPOUND_TEXT];
3515#if X_HAVE_UTF8_STRING 3559#if X_HAVE_UTF8_STRING
3516 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3560 *target++ = xa[XA_UTF8_STRING];
3517#endif 3561#endif
3518 3562
3519 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3563 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,
3520 (8 * sizeof (target_list[0])), PropModeReplace, 3564 32, PropModeReplace,
3521 (unsigned char *)target_list, 3565 (unsigned char *)target_list, target - target_list);
3522 target - target_list);
3523 ev.property = rq.property; 3566 ev.property = rq.property;
3524 } 3567 }
3525#if TODO // TODO 3568#if TODO // TODO
3526 else if (rq.target == xa[XA_MULTIPLE]) 3569 else if (rq.target == xa[XA_MULTIPLE])
3527 { 3570 {
3528 /* TODO: Handle MULTIPLE */ 3571 /* TODO: Handle MULTIPLE */
3529 } 3572 }
3530#endif 3573#endif
3531 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3574 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3532 { 3575 {
3533 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3576 XChangeProperty (display->display, rq.requestor, rq.property, rq.target,
3534 (8 * sizeof (Time)), PropModeReplace,
3535 (unsigned char *)&selection_time, 1); 3577 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3536 ev.property = rq.property; 3578 ev.property = rq.property;
3537 } 3579 }
3538 else if (rq.target == XA_STRING 3580 else if (rq.target == XA_STRING
3539 || rq.target == xa[XA_TEXT] 3581 || rq.target == xa[XA_TEXT]
3540 || rq.target == xa[XA_COMPOUND_TEXT] 3582 || rq.target == xa[XA_COMPOUND_TEXT]
3541 || rq.target == xa[XA_UTF8_STRING] 3583 || rq.target == xa[XA_UTF8_STRING]
3542 ) 3584 )
3543 { 3585 {
3586 XTextProperty ct;
3587 Atom target = rq.target;
3544 short freect = 0; 3588 short freect = 0;
3545 int selectlen; 3589 int selectlen;
3546 wchar_t *cl; 3590 wchar_t *cl;
3547 3591 enum {
3548 target = rq.target; 3592 enc_string = XStringStyle,
3593 enc_text = XStdICCTextStyle,
3594 enc_compound_text = XCompoundTextStyle,
3595#ifdef X_HAVE_UTF8_STRING
3596 enc_utf8 = XUTF8StringStyle,
3597#else
3598 enc_utf8 = -1,
3599#endif
3600 } style;
3549 3601
3550 if (target == XA_STRING) 3602 if (target == XA_STRING)
3551 // we actually don't do XA_STRING, but who cares, as i18n clients 3603 // we actually don't do XA_STRING, but who cares, as i18n clients
3552 // will ask for another format anyways. 3604 // will ask for another format anyways.
3553 style = XStringStyle; 3605 style = enc_string;
3554 else if (target == xa[XA_TEXT]) 3606 else if (target == xa[XA_TEXT])
3555 style = XStdICCTextStyle; 3607 style = enc_text;
3556 else if (target == xa[XA_COMPOUND_TEXT]) 3608 else if (target == xa[XA_COMPOUND_TEXT])
3557 style = XCompoundTextStyle; 3609 style = enc_compound_text;
3558#if X_HAVE_UTF8_STRING 3610#if ENABLE_FRILLS
3559 else if (target == xa[XA_UTF8_STRING]) 3611 else if (target == xa[XA_UTF8_STRING])
3560 style = XUTF8StringStyle; 3612 style = enc_utf8;
3561#endif 3613#endif
3562 else 3614 else
3563 { 3615 {
3564 target = xa[XA_COMPOUND_TEXT]; 3616 target = xa[XA_COMPOUND_TEXT];
3565 style = XCompoundTextStyle; 3617 style = enc_compound_text;
3566 } 3618 }
3567 3619
3568 if (selection.text) 3620 if (selection.text)
3569 { 3621 {
3570 cl = selection.text; 3622 cl = selection.text;
… …
3574 { 3626 {
3575 cl = L""; 3627 cl = L"";
3576 selectlen = 0; 3628 selectlen = 0;
3577 } 3629 }
3578 3630
3579 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it 3631#if ENABLE_FRILLS
3580 // manually for XUTF8StringStyle. 3632 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3633 // so recode it manually
3634 if (style == enc_utf8)
3635 {
3636 freect = 1;
3637 ct.encoding = target;
3638 ct.format = 8;
3639 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3640 ct.nitems = strlen ((char *)ct.value);
3641 }
3642 else
3643#endif
3581 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3644 if (XwcTextListToTextProperty (display->display, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3582 freect = 1; 3645 freect = 1;
3583 else 3646 else
3584 { 3647 {
3585 /* if we failed to convert then send it raw */ 3648 /* if we failed to convert then send it raw */
3586 ct.value = (unsigned char *)cl; 3649 ct.value = (unsigned char *)cl;
3587 ct.nitems = selectlen; 3650 ct.nitems = selectlen;
3651 ct.encoding = target;
3588 } 3652 }
3589 3653
3590 XChangeProperty (display->display, rq.requestor, rq.property, 3654 XChangeProperty (display->display, rq.requestor, rq.property,
3591 target, 8, PropModeReplace, 3655 ct.encoding, 8, PropModeReplace,
3592 ct.value, (int)ct.nitems); 3656 ct.value, (int)ct.nitems);
3593 ev.property = rq.property; 3657 ev.property = rq.property;
3594 3658
3595 if (freect) 3659 if (freect)
3596 XFree (ct.value); 3660 XFree (ct.value);

Diff Legend

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