… | |
… | |
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 | |
37 | inline void fill_text (text_t *start, text_t value, int len) |
36 | inline 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; |
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 |
… | |
… | |
2400 | else |
2390 | else |
2401 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); |
2391 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); |
2402 | |
2392 | |
2403 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2393 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2404 | { |
2394 | { |
|
|
2395 | #if ENABLE_FRILLS |
|
|
2396 | if (ISSET_PIXCOLOR (Color_underline)) |
|
|
2397 | XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]); |
|
|
2398 | else |
|
|
2399 | #endif |
2405 | XSetForeground (display->display, TermWin.gc, pix_colors[fore]); |
2400 | XSetForeground (display->display, TermWin.gc, pix_colors[fore]); |
|
|
2401 | |
2406 | XDrawLine (display->display, drawBuffer, TermWin.gc, |
2402 | XDrawLine (display->display, drawBuffer, TermWin.gc, |
2407 | xpixel, ypixel + font->ascent + 1, |
2403 | xpixel, ypixel + font->ascent + 1, |
2408 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2404 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2409 | } |
2405 | } |
2410 | } /* for (col....) */ |
2406 | } /* for (col....) */ |
… | |
… | |
2656 | /* ------------------------------------------------------------------------- */ |
2652 | /* ------------------------------------------------------------------------- */ |
2657 | /* |
2653 | /* |
2658 | * Paste a selection direct to the command fd |
2654 | * Paste a selection direct to the command fd |
2659 | */ |
2655 | */ |
2660 | void |
2656 | void |
2661 | rxvt_term::paste (const unsigned char *data, unsigned int len) |
2657 | rxvt_term::paste (unsigned char *data, unsigned int len) |
2662 | { |
2658 | { |
2663 | unsigned int i, j, n; |
|
|
2664 | unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE); |
|
|
2665 | |
|
|
2666 | /* convert normal newline chars into common keyboard Return key sequence */ |
2659 | /* convert normal newline chars into common keyboard Return key sequence */ |
2667 | for (i = 0; i < len; i += PROP_SIZE) |
2660 | for (unsigned int i = 0; i < len; i++) |
2668 | { |
|
|
2669 | n = min (len - i, PROP_SIZE); |
|
|
2670 | memcpy (ds, data + i, n); |
|
|
2671 | |
|
|
2672 | for (j = 0; j < n; j++) |
|
|
2673 | if (ds[j] == C0_LF) |
2661 | if (data[i] == C0_LF) |
2674 | ds[j] = C0_CR; |
2662 | data[i] = C0_CR; |
2675 | |
2663 | |
2676 | tt_write (ds, (int)n); |
2664 | tt_write (data, len); |
2677 | } |
|
|
2678 | |
|
|
2679 | free (ds); |
|
|
2680 | } |
2665 | } |
2681 | |
2666 | |
2682 | /* ------------------------------------------------------------------------- */ |
2667 | /* ------------------------------------------------------------------------- */ |
2683 | /* |
2668 | /* |
2684 | * Respond to a notification that a primary selection has been sent |
2669 | * Respond to a notification that a primary selection has been sent |
2685 | * EXT: SelectionNotify |
2670 | * EXT: SelectionNotify |
2686 | */ |
2671 | */ |
2687 | int |
2672 | void |
2688 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) |
2673 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) |
2689 | { |
2674 | { |
2690 | long nread = 0; |
|
|
2691 | unsigned long bytes_after; |
|
|
2692 | XTextProperty ct; |
|
|
2693 | |
|
|
2694 | if (prop == None) /* check for failed XConvertSelection */ |
2675 | if (prop == None) /* check for failed XConvertSelection */ |
2695 | { |
2676 | { |
2696 | if ((selection_type & Sel_CompoundText)) |
2677 | if ((selection_type & Sel_CompoundText)) |
2697 | { |
2678 | { |
2698 | int selnum = selection_type & Sel_whereMask; |
2679 | int selnum = selection_type & Sel_whereMask; |
… | |
… | |
2711 | selection_request_other (xa[XA_COMPOUND_TEXT], selnum); |
2692 | selection_request_other (xa[XA_COMPOUND_TEXT], selnum); |
2712 | else |
2693 | else |
2713 | selection_type = 0; |
2694 | selection_type = 0; |
2714 | } |
2695 | } |
2715 | |
2696 | |
2716 | return 0; |
2697 | return; |
2717 | } |
|
|
2718 | |
|
|
2719 | for (;;) |
|
|
2720 | { |
2698 | } |
|
|
2699 | |
|
|
2700 | unsigned long bytes_after; |
|
|
2701 | XTextProperty ct; |
|
|
2702 | |
|
|
2703 | if (XGetWindowProperty (display->display, win, prop, |
|
|
2704 | 0, PROP_SIZE / 4, |
|
|
2705 | delete_prop, AnyPropertyType, |
|
|
2706 | &ct.encoding, &ct.format, |
|
|
2707 | &ct.nitems, &bytes_after, |
|
|
2708 | &ct.value) != Success) |
|
|
2709 | { |
|
|
2710 | ct.value = 0; |
|
|
2711 | goto bailout; |
|
|
2712 | } |
|
|
2713 | |
|
|
2714 | if (ct.encoding == None) |
|
|
2715 | goto bailout; |
|
|
2716 | |
|
|
2717 | if (bytes_after) |
|
|
2718 | { |
|
|
2719 | // fetch and append remaining data |
|
|
2720 | XTextProperty ct2; |
|
|
2721 | |
2721 | if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), |
2722 | if (XGetWindowProperty (display->display, win, prop, |
2722 | (long) (PROP_SIZE / 4), delete_prop, |
2723 | ct.nitems / 4, (bytes_after + 3) / 4, |
|
|
2724 | delete_prop, AnyPropertyType, |
2723 | AnyPropertyType, &ct.encoding, &ct.format, |
2725 | &ct2.encoding, &ct2.format, |
2724 | &ct.nitems, &bytes_after, |
2726 | &ct2.nitems, &bytes_after, |
2725 | &ct.value) != Success) |
2727 | &ct2.value) != Success) |
2726 | break; |
2728 | goto bailout; |
2727 | |
2729 | |
2728 | if (ct.encoding == 0) |
2730 | // realloc should be compatible to XFree, here, and elsewhere, too |
2729 | break; |
2731 | ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); |
|
|
2732 | memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); |
|
|
2733 | ct.nitems += ct2.nitems; |
2730 | |
2734 | |
|
|
2735 | XFree (ct2.value); |
|
|
2736 | } |
|
|
2737 | |
|
|
2738 | if (ct.value == 0) |
|
|
2739 | goto bailout; |
|
|
2740 | |
2731 | if (ct.encoding == xa[XA_INCR]) |
2741 | if (ct.encoding == xa[XA_INCR]) |
2732 | { |
2742 | { |
2733 | // INCR selection, start handshake |
2743 | // INCR selection, start handshake |
|
|
2744 | if (!delete_prop) |
2734 | XDeleteProperty (display->display, win, prop); |
2745 | XDeleteProperty (display->display, win, prop); |
|
|
2746 | |
2735 | selection_wait = Sel_incr; |
2747 | selection_wait = Sel_incr; |
|
|
2748 | incr_buf_fill = 0; |
2736 | incr_ev.start (NOW + 10); |
2749 | incr_ev.start (NOW + 10); |
2737 | break; |
|
|
2738 | } |
|
|
2739 | |
2750 | |
2740 | if (ct.value == NULL) |
2751 | goto bailout; |
2741 | continue; |
2752 | } |
2742 | |
2753 | |
2743 | if (ct.nitems == 0) |
2754 | if (ct.nitems == 0) |
|
|
2755 | { |
|
|
2756 | if (selection_wait == Sel_incr) |
|
|
2757 | { |
|
|
2758 | XFree (ct.value); |
|
|
2759 | |
|
|
2760 | // finally complete, now paste the whole thing |
|
|
2761 | selection_wait = Sel_normal; |
|
|
2762 | ct.value = (unsigned char *)incr_buf; |
|
|
2763 | ct.nitems = incr_buf_fill; |
|
|
2764 | incr_buf = 0; |
|
|
2765 | incr_buf_size = 0; |
|
|
2766 | incr_ev.stop (); |
2744 | { |
2767 | } |
|
|
2768 | else |
|
|
2769 | { |
2745 | if (selection_wait == Sel_normal && nread == 0 |
2770 | if (selection_wait == Sel_normal |
2746 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2771 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2747 | { |
2772 | { |
2748 | /* |
2773 | /* |
2749 | * pass through again trying CUT_BUFFER0 if we've come from |
2774 | * pass through again trying CUT_BUFFER0 if we've come from |
2750 | * XConvertSelection () but nothing was presented |
2775 | * XConvertSelection () but nothing was presented |
2751 | */ |
2776 | */ |
2752 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2777 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2753 | } |
2778 | } |
2754 | |
2779 | |
2755 | nread = -1; /* discount any previous stuff */ |
2780 | goto bailout; |
2756 | break; |
2781 | } |
|
|
2782 | } |
|
|
2783 | else if (selection_wait == Sel_incr) |
|
|
2784 | { |
|
|
2785 | incr_ev.start (NOW + 10); |
|
|
2786 | |
|
|
2787 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2757 | } |
2788 | { |
|
|
2789 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
|
|
2790 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
|
|
2791 | } |
2758 | |
2792 | |
|
|
2793 | memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); |
2759 | nread += ct.nitems; |
2794 | incr_buf_fill += ct.nitems; |
2760 | |
2795 | |
|
|
2796 | goto bailout; |
|
|
2797 | } |
|
|
2798 | |
2761 | char **cl; |
2799 | char **cl; |
2762 | int cr; |
2800 | int cr; |
2763 | |
2801 | |
2764 | #if ENABLE_FRILLS |
2802 | #if ENABLE_FRILLS |
2765 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
2803 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
2766 | // so recode it manually |
2804 | // so recode it manually |
2767 | if (ct.encoding == xa[XA_UTF8_STRING]) |
2805 | if (ct.encoding == xa[XA_UTF8_STRING]) |
2768 | { |
2806 | { |
2769 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
2807 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
2770 | char *s = rxvt_wcstombs (w); |
2808 | char *s = rxvt_wcstombs (w); |
2771 | |
2809 | free (w); |
2772 | // TODO: strlen == only the first element will be converted. well... |
2810 | // TODO: strlen == only the first element will be converted. well... |
2773 | paste ((unsigned char *)s, strlen (s)); |
2811 | paste ((unsigned char *)s, strlen (s)); |
2774 | |
|
|
2775 | free (s); |
2812 | free (s); |
2776 | free (w); |
2813 | } |
2777 | } |
|
|
2778 | else |
2814 | else |
2779 | #endif |
2815 | #endif |
2780 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) |
2816 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 |
2781 | { |
2817 | && cl) |
|
|
2818 | { |
2782 | for (int i = 0; i < cr; i++) |
2819 | for (int i = 0; i < cr; i++) |
2783 | paste ((unsigned char *)cl[i], strlen (cl[i])); |
2820 | paste ((unsigned char *)cl[i], strlen (cl[i])); |
2784 | |
2821 | |
2785 | XFreeStringList (cl); |
2822 | XFreeStringList (cl); |
2786 | } |
2823 | } |
2787 | else |
2824 | else |
2788 | paste (ct.value, ct.nitems); |
2825 | paste (ct.value, ct.nitems); // paste raw |
2789 | |
2826 | |
2790 | if (bytes_after == 0) |
2827 | bailout: |
2791 | break; |
|
|
2792 | |
|
|
2793 | XFree (ct.value); |
|
|
2794 | } |
|
|
2795 | |
|
|
2796 | if (ct.value) |
|
|
2797 | XFree (ct.value); |
2828 | XFree (ct.value); |
2798 | |
2829 | |
2799 | if (selection_wait == Sel_normal) |
2830 | if (selection_wait == Sel_normal) |
2800 | selection_wait = Sel_none; |
2831 | selection_wait = Sel_none; |
2801 | |
|
|
2802 | return (int)nread; |
|
|
2803 | } |
2832 | } |
2804 | |
2833 | |
2805 | void |
2834 | void |
2806 | rxvt_term::incr_cb (time_watcher &w) |
2835 | rxvt_term::incr_cb (time_watcher &w) |
2807 | { |
2836 | { |
2808 | selection_wait = Sel_none; |
2837 | selection_wait = Sel_none; |
2809 | |
2838 | |
|
|
2839 | incr_buf_size = 0; |
|
|
2840 | free (incr_buf); |
|
|
2841 | |
2810 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
2842 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
2811 | } |
2843 | } |
2812 | |
2844 | |
2813 | /* |
|
|
2814 | * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> |
|
|
2815 | */ |
|
|
2816 | void |
2845 | void |
2817 | rxvt_term::selection_property (Window win, Atom prop) |
2846 | rxvt_term::selection_property (Window win, Atom prop) |
2818 | { |
2847 | { |
2819 | if (prop == None || selection_wait != Sel_incr) |
2848 | if (prop == None || selection_wait != Sel_incr) |
2820 | return; |
2849 | return; |
2821 | |
2850 | |
2822 | if (selection_paste (win, prop, 1) > 0) |
2851 | selection_paste (win, prop, true); |
2823 | incr_ev.start (NOW + 10); |
|
|
2824 | else |
|
|
2825 | { |
|
|
2826 | selection_wait = Sel_none; |
|
|
2827 | incr_ev.stop (); |
|
|
2828 | } |
|
|
2829 | } |
2852 | } |
2830 | |
2853 | |
2831 | /* ------------------------------------------------------------------------- */ |
2854 | /* ------------------------------------------------------------------------- */ |
2832 | /* |
2855 | /* |
2833 | * Request the current selection: |
2856 | * Request the current selection: |
… | |
… | |
2870 | return; |
2893 | return; |
2871 | #endif |
2894 | #endif |
2872 | } |
2895 | } |
2873 | } |
2896 | } |
2874 | |
2897 | |
2875 | selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ |
2898 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2876 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2899 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
2877 | } |
2900 | } |
2878 | |
2901 | |
2879 | int |
2902 | int |
2880 | rxvt_term::selection_request_other (Atom target, int selnum) |
2903 | rxvt_term::selection_request_other (Atom target, int selnum) |
2881 | { |
2904 | { |
… | |
… | |
3385 | selection_delimit_word (DN, &selection.end, &selection.end); |
3408 | selection_delimit_word (DN, &selection.end, &selection.end); |
3386 | } |
3409 | } |
3387 | else if (selection.clicks == 3) |
3410 | else if (selection.clicks == 3) |
3388 | { |
3411 | { |
3389 | #if ENABLE_FRILLS |
3412 | #if ENABLE_FRILLS |
3390 | if ((options & Opt_tripleclickwords)) |
3413 | if (options & Opt_tripleclickwords) |
3391 | { |
3414 | { |
3392 | int end_row; |
3415 | int end_row; |
3393 | |
3416 | |
3394 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3417 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3395 | end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; |
3418 | end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; |
… | |
… | |
3413 | if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) |
3436 | if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) |
3414 | selection.mark.col++; |
3437 | selection.mark.col++; |
3415 | |
3438 | |
3416 | selection.beg.col = 0; |
3439 | selection.beg.col = 0; |
3417 | selection.end.col = ncol; |
3440 | selection.end.col = ncol; |
|
|
3441 | |
|
|
3442 | // select a complete logical line |
|
|
3443 | while (selection.beg.row > -TermWin.saveLines |
|
|
3444 | && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1) |
|
|
3445 | selection.beg.row--; |
|
|
3446 | |
|
|
3447 | while (selection.end.row < TermWin.nrow |
|
|
3448 | && screen.tlen[selection.end.row + TermWin.saveLines] == -1) |
|
|
3449 | selection.end.row++; |
3418 | } |
3450 | } |
3419 | } |
3451 | } |
3420 | |
3452 | |
3421 | if (button3 && buttonpress) |
3453 | if (button3 && buttonpress) |
3422 | { /* mark may need to be changed */ |
3454 | { /* mark may need to be changed */ |
… | |
… | |
3502 | */ |
3534 | */ |
3503 | void |
3535 | void |
3504 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) |
3536 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) |
3505 | { |
3537 | { |
3506 | XSelectionEvent ev; |
3538 | XSelectionEvent ev; |
|
|
3539 | dDisp; |
3507 | |
3540 | |
3508 | ev.type = SelectionNotify; |
3541 | ev.type = SelectionNotify; |
3509 | ev.property = None; |
3542 | ev.property = None; |
3510 | ev.display = rq.display; |
3543 | ev.display = rq.display; |
3511 | ev.requestor = rq.requestor; |
3544 | ev.requestor = rq.requestor; |
… | |
… | |
3525 | *target++ = xa[XA_COMPOUND_TEXT]; |
3558 | *target++ = xa[XA_COMPOUND_TEXT]; |
3526 | #if X_HAVE_UTF8_STRING |
3559 | #if X_HAVE_UTF8_STRING |
3527 | *target++ = xa[XA_UTF8_STRING]; |
3560 | *target++ = xa[XA_UTF8_STRING]; |
3528 | #endif |
3561 | #endif |
3529 | |
3562 | |
3530 | XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, |
3563 | XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, |
3531 | 32, PropModeReplace, |
3564 | 32, PropModeReplace, |
3532 | (unsigned char *)target_list, target - target_list); |
3565 | (unsigned char *)target_list, target - target_list); |
3533 | ev.property = rq.property; |
3566 | ev.property = rq.property; |
3534 | } |
3567 | } |
3535 | #if TODO // TODO |
3568 | #if TODO // TODO |
… | |
… | |
3538 | /* TODO: Handle MULTIPLE */ |
3571 | /* TODO: Handle MULTIPLE */ |
3539 | } |
3572 | } |
3540 | #endif |
3573 | #endif |
3541 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3574 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3542 | { |
3575 | { |
3543 | XChangeProperty (display->display, rq.requestor, rq.property, rq.target, |
3576 | XChangeProperty (disp, rq.requestor, rq.property, rq.target, |
3544 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3577 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3545 | ev.property = rq.property; |
3578 | ev.property = rq.property; |
3546 | } |
3579 | } |
3547 | else if (rq.target == XA_STRING |
3580 | else if (rq.target == XA_STRING |
3548 | || rq.target == xa[XA_TEXT] |
3581 | || rq.target == xa[XA_TEXT] |
… | |
… | |
3606 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3639 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3607 | ct.nitems = strlen ((char *)ct.value); |
3640 | ct.nitems = strlen ((char *)ct.value); |
3608 | } |
3641 | } |
3609 | else |
3642 | else |
3610 | #endif |
3643 | #endif |
3611 | if (XwcTextListToTextProperty (display->display, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3644 | if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3612 | freect = 1; |
3645 | freect = 1; |
3613 | else |
3646 | else |
3614 | { |
3647 | { |
3615 | /* if we failed to convert then send it raw */ |
3648 | /* if we failed to convert then send it raw */ |
3616 | ct.value = (unsigned char *)cl; |
3649 | ct.value = (unsigned char *)cl; |
3617 | ct.nitems = selectlen; |
3650 | ct.nitems = selectlen; |
3618 | ct.encoding = target; |
3651 | ct.encoding = target; |
3619 | } |
3652 | } |
3620 | |
3653 | |
3621 | XChangeProperty (display->display, rq.requestor, rq.property, |
3654 | XChangeProperty (disp, rq.requestor, rq.property, |
3622 | ct.encoding, 8, PropModeReplace, |
3655 | ct.encoding, 8, PropModeReplace, |
3623 | ct.value, (int)ct.nitems); |
3656 | ct.value, (int)ct.nitems); |
3624 | ev.property = rq.property; |
3657 | ev.property = rq.property; |
3625 | |
3658 | |
3626 | if (freect) |
3659 | if (freect) |
3627 | XFree (ct.value); |
3660 | XFree (ct.value); |
3628 | } |
3661 | } |
3629 | |
3662 | |
3630 | XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); |
3663 | XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); |
3631 | } |
3664 | } |
3632 | |
3665 | |
3633 | /* ------------------------------------------------------------------------- * |
3666 | /* ------------------------------------------------------------------------- * |
3634 | * MOUSE ROUTINES * |
3667 | * MOUSE ROUTINES * |
3635 | * ------------------------------------------------------------------------- */ |
3668 | * ------------------------------------------------------------------------- */ |