… | |
… | |
762 | /* ------------------------------------------------------------------------- */ |
762 | /* ------------------------------------------------------------------------- */ |
763 | /* |
763 | /* |
764 | * Add text given in <str> of length <len> to screen struct |
764 | * Add text given in <str> of length <len> to screen struct |
765 | */ |
765 | */ |
766 | void |
766 | void |
767 | rxvt_term::scr_add_lines (const uint32_t *str, int nlines, int len) |
767 | rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) |
768 | { |
768 | { |
769 | unsigned char checksel, clearsel; |
769 | unsigned char checksel, clearsel; |
770 | uint32_t c; |
770 | unicode_t c; |
771 | int i, row, last_col; |
771 | int i, row, last_col; |
772 | text_t *stp; |
772 | text_t *stp; |
773 | rend_t *srp; |
773 | rend_t *srp; |
774 | |
774 | |
775 | if (len <= 0) /* sanity */ |
775 | if (len <= 0) /* sanity */ |
776 | return; |
776 | return; |
777 | |
777 | |
778 | want_refresh = 1; |
778 | want_refresh = 1; |
… | |
… | |
846 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
846 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
847 | { |
847 | { |
848 | checksel = 0; |
848 | checksel = 0; |
849 | clearsel = 1; |
849 | clearsel = 1; |
850 | } |
850 | } |
|
|
851 | |
851 | if (screen.flags & Screen_WrapNext) |
852 | if (screen.flags & Screen_WrapNext) |
852 | { |
853 | { |
853 | screen.tlen[row] = -1; |
854 | screen.tlen[row] = -1; |
854 | if (screen.cur.row == screen.bscroll) |
855 | if (screen.cur.row == screen.bscroll) |
855 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
856 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
856 | else if (screen.cur.row < (TermWin.nrow - 1)) |
857 | else if (screen.cur.row < (TermWin.nrow - 1)) |
857 | row = (++screen.cur.row) + TermWin.saveLines; |
858 | row = (++screen.cur.row) + TermWin.saveLines; |
|
|
859 | |
858 | stp = screen.text[row]; /* _must_ refresh */ |
860 | stp = screen.text[row]; /* _must_ refresh */ |
859 | srp = screen.rend[row]; /* _must_ refresh */ |
861 | srp = screen.rend[row]; /* _must_ refresh */ |
860 | screen.cur.col = 0; |
862 | screen.cur.col = 0; |
861 | screen.flags &= ~Screen_WrapNext; |
863 | screen.flags &= ~Screen_WrapNext; |
862 | } |
864 | } |
|
|
865 | |
863 | if (screen.flags & Screen_Insert) |
866 | if (screen.flags & Screen_Insert) |
864 | scr_insdel_chars (1, INSERT); |
867 | scr_insdel_chars (1, INSERT); |
|
|
868 | |
|
|
869 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
|
|
870 | // do wcwidth before further replacements, as wcwidth says that line-drawing |
|
|
871 | // characters have width -1 (DOH!) on gnu/linux sometimes. |
|
|
872 | int width = c < 256 ? 1 : wcwidth (c); |
865 | |
873 | |
866 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
874 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
867 | switch (c) |
875 | switch (c) |
868 | { |
876 | { |
869 | // dunno where these come from |
|
|
870 | #if 0 |
|
|
871 | case '+': c = 0x2192; break; case ',': c = 0x2190; break; case '-': c = 0x2191; break; |
|
|
872 | case '.': c = 0x2193; break; case '0': c = 0x25ae; break; |
|
|
873 | #endif |
|
|
874 | // vt100 special graphics and line drawing |
877 | // vt100 special graphics and line drawing |
875 | case '`': c = 0x25c6; break; case '_': c = 0x0020; break; |
878 | case '`': c = 0x25c6; break; case '_': c = 0x0020; break; |
876 | case 'a': c = 0x2592; break; case 'b': c = 0x2409; break; case 'c': c = 0x240c; break; |
879 | case 'a': c = 0x2592; break; case 'b': c = 0x2409; break; case 'c': c = 0x240c; break; |
877 | case 'd': c = 0x240d; break; case 'e': c = 0x240a; break; case 'f': c = 0x00b0; break; |
880 | case 'd': c = 0x240d; break; case 'e': c = 0x240a; break; case 'f': c = 0x00b0; break; |
878 | case 'g': c = 0x00b1; break; case 'h': c = 0x2424; break; case 'i': c = 0x240b; break; |
881 | case 'g': c = 0x00b1; break; case 'h': c = 0x2424; break; case 'i': c = 0x240b; break; |
… | |
… | |
883 | case 'v': c = 0x2534; break; case 'w': c = 0x252c; break; case 'x': c = 0x2502; break; |
886 | case 'v': c = 0x2534; break; case 'w': c = 0x252c; break; case 'x': c = 0x2502; break; |
884 | case 'y': c = 0x2264; break; case 'z': c = 0x2265; break; case '{': c = 0x03c0; break; |
887 | case 'y': c = 0x2264; break; case 'z': c = 0x2265; break; case '{': c = 0x03c0; break; |
885 | case '|': c = 0x2260; break; case '}': c = 0x00a3; break; case '~': c = 0x00b7; break; |
888 | case '|': c = 0x2260; break; case '}': c = 0x00a3; break; case '~': c = 0x00b7; break; |
886 | } |
889 | } |
887 | |
890 | |
888 | rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); |
|
|
889 | // rely on wcwidth to tell us the character width, at least for non-ascii |
|
|
890 | int width = c <= 128 ? 1 : wcwidth (c); |
|
|
891 | |
|
|
892 | // width -1 characters (e.g. combining chars) are ignored currently. |
|
|
893 | if (width > 0) |
891 | if (width > 0) |
894 | { |
892 | { |
|
|
893 | #if !UNICODE_3 && ENABLE_COMBINING |
|
|
894 | // trim characters we can't store directly :( |
|
|
895 | if (c >= 0x10000) |
|
|
896 | c = rxvt_composite.compose (c); // map to lower 16 bits |
|
|
897 | #endif |
|
|
898 | rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); |
|
|
899 | |
895 | do |
900 | do |
896 | { |
901 | { |
897 | stp[screen.cur.col] = c; |
902 | stp[screen.cur.col] = c; |
898 | srp[screen.cur.col] = rend; |
903 | srp[screen.cur.col] = rend; |
899 | |
904 | |
… | |
… | |
910 | c = NOCHAR; |
915 | c = NOCHAR; |
911 | } |
916 | } |
912 | while (--width > 0); |
917 | while (--width > 0); |
913 | |
918 | |
914 | // pad with spaces when overwriting wide character with smaller one |
919 | // pad with spaces when overwriting wide character with smaller one |
915 | for (int c = screen.cur.col; stp[c] == NOCHAR && c < last_col; c++) |
920 | for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) |
916 | { |
921 | { |
917 | stp[c] = ' '; |
922 | stp[c] = ' '; |
918 | srp[c] = rend; |
923 | srp[c] = rend; |
919 | } |
924 | } |
920 | } |
925 | } |
|
|
926 | else if (width == 0) |
|
|
927 | { |
|
|
928 | #if ENABLE_COMBINING |
|
|
929 | // handle combining characters |
|
|
930 | // we just tag the accent on the previous on-screen character. |
|
|
931 | // this is arguably not correct, but also arguably not wrong. |
|
|
932 | // we don't handle double-width characters nicely yet. |
|
|
933 | |
|
|
934 | text_t *tp; |
|
|
935 | rend_t *rp; |
|
|
936 | |
|
|
937 | if (screen.cur.col > 0) |
|
|
938 | { |
|
|
939 | tp = stp + screen.cur.col - 1; |
|
|
940 | rp = srp + screen.cur.col - 1; |
|
|
941 | } |
|
|
942 | else if (screen.cur.row > 0 |
|
|
943 | && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) |
|
|
944 | { |
|
|
945 | tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; |
|
|
946 | rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; |
|
|
947 | } |
921 | else |
948 | else |
922 | (void)0; /* handle combining character etc. here. */ |
949 | continue; |
|
|
950 | |
|
|
951 | // handle double-width-chars by making them look extremely ugly |
|
|
952 | if (*tp == NOCHAR) |
|
|
953 | *tp = ' '; // hack //D //TODO //--tp, --rp; |
|
|
954 | |
|
|
955 | // first try to find a precomposed character |
|
|
956 | unicode_t n = rxvt_compose (*tp, c); |
|
|
957 | if (n == NOCHAR) |
|
|
958 | n = rxvt_composite.compose (*tp, c); |
|
|
959 | |
|
|
960 | *tp = n; |
|
|
961 | *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); |
|
|
962 | #endif |
|
|
963 | } |
923 | } |
964 | } |
924 | |
965 | |
925 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
966 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
926 | MAX_IT (screen.tlen[row], screen.cur.col); |
967 | MAX_IT (screen.tlen[row], screen.cur.col); |
927 | |
968 | |
… | |
… | |
2147 | else |
2188 | else |
2148 | rvid = !rvid; |
2189 | rvid = !rvid; |
2149 | } |
2190 | } |
2150 | |
2191 | |
2151 | if (rend & RS_Uline) |
2192 | if (rend & RS_Uline) |
2152 | { |
|
|
2153 | if (ISSET_PIXCOLOR (Color_UL)) |
2193 | if (ISSET_PIXCOLOR (Color_UL)) |
2154 | fore = Color_UL; |
2194 | fore = Color_UL; |
2155 | } |
|
|
2156 | #endif |
2195 | #endif |
2157 | |
2196 | |
2158 | if (rvid) |
2197 | if (rvid) |
2159 | { |
2198 | { |
2160 | SWAP_IT (fore, back, int); |
2199 | SWAP_IT (fore, back, int); |
… | |
… | |
2529 | } |
2568 | } |
2530 | |
2569 | |
2531 | if (ct.nitems == 0) |
2570 | if (ct.nitems == 0) |
2532 | { |
2571 | { |
2533 | D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); |
2572 | D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); |
|
|
2573 | |
2534 | if (selection_wait == Sel_normal && nread == 0 |
2574 | if (selection_wait == Sel_normal && nread == 0 |
2535 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2575 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2536 | { |
2576 | { |
2537 | /* |
2577 | /* |
2538 | * pass through again trying CUT_BUFFER0 if we've come from |
2578 | * pass through again trying CUT_BUFFER0 if we've come from |
… | |
… | |
2593 | { |
2633 | { |
2594 | int reget_time = 0; |
2634 | int reget_time = 0; |
2595 | |
2635 | |
2596 | if (prop == None) |
2636 | if (prop == None) |
2597 | return; |
2637 | return; |
|
|
2638 | |
2598 | D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop)); |
2639 | D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop)); |
2599 | if (selection_wait == Sel_normal) |
2640 | if (selection_wait == Sel_normal) |
2600 | { |
2641 | { |
2601 | int a, afmt; |
2642 | int a, afmt; |
2602 | Atom atype; |
2643 | Atom atype; |
2603 | unsigned long bytes_after, nitems; |
2644 | unsigned long bytes_after, nitems; |
2604 | unsigned char *s = NULL; |
2645 | unsigned char *s = NULL; |
2605 | |
2646 | |
2606 | a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False, |
2647 | a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False, |
2607 | xa[XA_INCR], &atype, &afmt, &nitems, |
2648 | xa[XA_INCR], &atype, &afmt, &nitems, |
2608 | &bytes_after, &s); |
2649 | &bytes_after, &s); |
2609 | if (s) |
2650 | if (s) |
2610 | XFree (s); |
2651 | XFree (s); |
2611 | if (a != Success) |
2652 | if (a != Success) |
2612 | return; |
2653 | return; |
|
|
2654 | |
2613 | #ifndef __CYGWIN32__ |
2655 | #ifndef __CYGWIN32__ |
2614 | if (atype == xa[XA_INCR]) |
2656 | if (atype == xa[XA_INCR]) |
2615 | { /* start an INCR transfer */ |
2657 | { /* start an INCR transfer */ |
2616 | D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer")); |
2658 | D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer")); |
2617 | XDeleteProperty (display->display, win, prop); |
2659 | XDeleteProperty (display->display, win, prop); |
… | |
… | |
2623 | |
2665 | |
2624 | } |
2666 | } |
2625 | else if (selection_wait == Sel_incr) |
2667 | else if (selection_wait == Sel_incr) |
2626 | { |
2668 | { |
2627 | reget_time = 1; |
2669 | reget_time = 1; |
|
|
2670 | |
2628 | if (selection_paste (win, prop, True) == -1) |
2671 | if (selection_paste (win, prop, True) == -1) |
2629 | { |
2672 | { |
2630 | D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end")); |
2673 | D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end")); |
2631 | selection_wait = Sel_none; |
2674 | selection_wait = Sel_none; |
2632 | incr_ev.stop (); |
2675 | incr_ev.stop (); |
2633 | } |
2676 | } |
2634 | } |
2677 | } |
2635 | if (reget_time) /* received more data so reget time */ |
2678 | if (reget_time) /* received more data so reget time */ |
2636 | incr_ev.start (NOW + 10); |
2679 | incr_ev.start (NOW + 10); |
2637 | } |
2680 | } |
|
|
2681 | |
2638 | /* ------------------------------------------------------------------------- */ |
2682 | /* ------------------------------------------------------------------------- */ |
2639 | /* |
2683 | /* |
2640 | * Request the current selection: |
2684 | * Request the current selection: |
2641 | * Order: > internal selection if available |
2685 | * Order: > internal selection if available |
2642 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2686 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
… | |
… | |
2647 | */ |
2691 | */ |
2648 | void |
2692 | void |
2649 | rxvt_term::selection_request (Time tm, int x, int y) |
2693 | rxvt_term::selection_request (Time tm, int x, int y) |
2650 | { |
2694 | { |
2651 | D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y)); |
2695 | D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y)); |
|
|
2696 | |
2652 | if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) |
2697 | if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) |
2653 | return; /* outside window */ |
2698 | return; /* outside window */ |
2654 | |
2699 | |
2655 | if (selection.text != NULL) |
2700 | if (selection.text) |
2656 | { /* internal selection */ |
2701 | { /* internal selection */ |
2657 | D_SELECT ((stderr, "rxvt_selection_request: pasting internal")); |
2702 | D_SELECT ((stderr, "rxvt_selection_request: pasting internal")); |
2658 | paste (selection.text, selection.len); |
2703 | char *str = rxvt_wcstombs (selection.text, selection.len); |
|
|
2704 | paste ((unsigned char *)str, strlen (str)); |
|
|
2705 | free (str); |
2659 | return; |
2706 | return; |
2660 | } |
2707 | } |
2661 | else |
2708 | else |
2662 | { |
2709 | { |
2663 | int i; |
2710 | int i; |
2664 | |
2711 | |
2665 | selection_request_time = tm; |
2712 | selection_request_time = tm; |
2666 | selection_wait = Sel_normal; |
2713 | selection_wait = Sel_normal; |
2667 | for (i = Sel_Primary; i <= Sel_Clipboard; i++) |
2714 | for (i = Sel_Primary; i <= Sel_Clipboard; i++) |
2668 | { |
2715 | { |
… | |
… | |
2676 | return; |
2723 | return; |
2677 | #endif |
2724 | #endif |
2678 | |
2725 | |
2679 | } |
2726 | } |
2680 | } |
2727 | } |
|
|
2728 | |
2681 | selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ |
2729 | selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ |
2682 | D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); |
2730 | D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); |
2683 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2731 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2684 | } |
2732 | } |
2685 | |
2733 | |
2686 | int |
2734 | int |
2687 | rxvt_term::selection_request_other (Atom target, int selnum) |
2735 | rxvt_term::selection_request_other (Atom target, int selnum) |
2688 | { |
2736 | { |
2689 | Atom sel; |
2737 | Atom sel; |
2690 | #ifdef DEBUG_SELECT |
2738 | #ifdef DEBUG_SELECT |
2691 | char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; |
2739 | char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; |
2692 | #endif |
2740 | #endif |
2693 | |
2741 | |
2694 | selection_type |= selnum; |
2742 | selection_type |= selnum; |
|
|
2743 | |
2695 | if (selnum == Sel_Primary) |
2744 | if (selnum == Sel_Primary) |
2696 | sel = XA_PRIMARY; |
2745 | sel = XA_PRIMARY; |
2697 | else if (selnum == Sel_Secondary) |
2746 | else if (selnum == Sel_Secondary) |
2698 | sel = XA_SECONDARY; |
2747 | sel = XA_SECONDARY; |
2699 | else |
2748 | else |
2700 | sel = xa[XA_CLIPBOARD]; |
2749 | sel = xa[XA_CLIPBOARD]; |
|
|
2750 | |
2701 | if (XGetSelectionOwner (display->display, sel) != None) |
2751 | if (XGetSelectionOwner (display->display, sel) != None) |
2702 | { |
2752 | { |
2703 | D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); |
2753 | D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); |
2704 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2754 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2705 | TermWin.vt, selection_request_time); |
2755 | TermWin.vt, selection_request_time); |
2706 | return 1; |
2756 | return 1; |
2707 | } |
2757 | } |
|
|
2758 | |
2708 | return 0; |
2759 | return 0; |
2709 | } |
2760 | } |
2710 | |
2761 | |
2711 | /* ------------------------------------------------------------------------- */ |
2762 | /* ------------------------------------------------------------------------- */ |
2712 | /* |
2763 | /* |
… | |
… | |
2732 | */ |
2783 | */ |
2733 | void |
2784 | void |
2734 | rxvt_term::selection_make (Time tm) |
2785 | rxvt_term::selection_make (Time tm) |
2735 | { |
2786 | { |
2736 | int i, col, end_col, row, end_row; |
2787 | int i, col, end_col, row, end_row; |
2737 | unsigned char *new_selection_text; |
2788 | wchar_t *new_selection_text; |
2738 | char *str; |
|
|
2739 | text_t *t; |
2789 | text_t *t; |
2740 | |
2790 | |
2741 | D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks)); |
2791 | D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks)); |
2742 | switch (selection.op) |
2792 | switch (selection.op) |
2743 | { |
2793 | { |
… | |
… | |
2756 | selection.op = SELECTION_DONE; |
2806 | selection.op = SELECTION_DONE; |
2757 | |
2807 | |
2758 | if (selection.clicks == 4) |
2808 | if (selection.clicks == 4) |
2759 | return; /* nothing selected, go away */ |
2809 | return; /* nothing selected, go away */ |
2760 | |
2810 | |
2761 | i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1; |
2811 | i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); |
2762 | str = (char *)rxvt_malloc ((i + 2) * MB_CUR_MAX + 1); |
2812 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2763 | |
|
|
2764 | new_selection_text = (unsigned char *)str; |
|
|
2765 | |
2813 | |
2766 | col = selection.beg.col; |
2814 | col = selection.beg.col; |
2767 | MAX_IT (col, 0); |
2815 | MAX_IT (col, 0); |
2768 | row = selection.beg.row + TermWin.saveLines; |
2816 | row = selection.beg.row + TermWin.saveLines; |
2769 | end_row = selection.end.row + TermWin.saveLines; |
2817 | end_row = selection.end.row + TermWin.saveLines; |
2770 | struct mbstate mbs; |
2818 | int ofs = 0; |
|
|
2819 | int extra = 0; |
2771 | |
2820 | |
2772 | for (; row <= end_row; row++, col = 0) |
2821 | for (; row <= end_row; row++, col = 0) |
2773 | { |
2822 | { |
2774 | t = & (screen.text[row][col]); |
2823 | t = &(screen.text[row][col]); |
2775 | |
2824 | |
2776 | end_col = screen.tlen[row]; |
2825 | end_col = screen.tlen[row]; |
2777 | |
2826 | |
2778 | if (end_col == -1) |
2827 | if (end_col == -1) |
2779 | end_col = TermWin.ncol; |
2828 | end_col = TermWin.ncol; |
2780 | |
2829 | |
2781 | if (row == end_row) |
2830 | if (row == end_row) |
2782 | MIN_IT (end_col, selection.end.col); |
2831 | MIN_IT (end_col, selection.end.col); |
2783 | |
2832 | |
2784 | for (; col < end_col; col++) |
2833 | for (; col < end_col; col++) |
|
|
2834 | { |
2785 | if (*t == NOCHAR) |
2835 | if (*t == NOCHAR) |
2786 | t++; |
2836 | t++; |
|
|
2837 | #if ENABLE_COMBINING |
|
|
2838 | else if (IS_COMPOSE (*t)) |
|
|
2839 | { |
|
|
2840 | int len = rxvt_composite.expand (*t, 0); |
|
|
2841 | |
|
|
2842 | extra -= (len - 1); |
|
|
2843 | |
|
|
2844 | if (extra < 0) |
|
|
2845 | { |
|
|
2846 | extra += i; |
|
|
2847 | i += i; |
|
|
2848 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); |
|
|
2849 | } |
|
|
2850 | |
|
|
2851 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
|
|
2852 | } |
|
|
2853 | #endif |
2787 | else |
2854 | else |
2788 | { |
2855 | new_selection_text[ofs++] = *t++; |
2789 | int len = wcrtomb (str, *t++, mbs); |
|
|
2790 | if (len > 0) |
|
|
2791 | str += len; |
|
|
2792 | } |
2856 | } |
2793 | |
2857 | |
2794 | if (screen.tlen[row] != -1 && row != end_row) |
2858 | if (screen.tlen[row] != -1 && row != end_row) |
2795 | *str++ = '\n'; |
2859 | new_selection_text[ofs++] = L'\n'; |
2796 | } |
2860 | } |
2797 | |
2861 | |
2798 | #ifndef NO_OLD_SELECTION |
|
|
2799 | if (selection_style == OLD_SELECT) |
|
|
2800 | if (end_col == TermWin.ncol) |
|
|
2801 | *str++ = '\n'; |
|
|
2802 | #endif |
|
|
2803 | #ifndef NO_NEW_SELECTION |
|
|
2804 | if (selection_style != OLD_SELECT) |
|
|
2805 | if (end_col != selection.end.col) |
2862 | if (end_col != selection.end.col) |
2806 | *str++ = '\n'; |
2863 | new_selection_text[ofs++] = L'\n'; |
2807 | #endif |
|
|
2808 | *str = '\0'; |
|
|
2809 | |
2864 | |
2810 | i = str - (char *)new_selection_text; |
2865 | new_selection_text[ofs] = 0; |
|
|
2866 | |
2811 | if (i == 0) |
2867 | if (ofs == 0) |
2812 | { |
2868 | { |
2813 | free (new_selection_text); |
2869 | free (new_selection_text); |
2814 | return; |
2870 | return; |
2815 | } |
2871 | } |
2816 | |
2872 | |
2817 | // due to MB_CUR_MAX, selection wastage is usually high, so realloc |
|
|
2818 | if (str - (char *)new_selection_text > 1024) |
|
|
2819 | new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1); |
|
|
2820 | |
|
|
2821 | selection.len = i; |
|
|
2822 | |
|
|
2823 | if (selection.text) |
|
|
2824 | free (selection.text); |
2873 | free (selection.text); |
2825 | |
2874 | |
2826 | selection.text = new_selection_text; |
2875 | // we usually allocate much more than necessary, so realloc it smaller again |
|
|
2876 | selection.len = ofs; |
|
|
2877 | selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); |
2827 | |
2878 | |
2828 | XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); |
2879 | XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); |
2829 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) |
2880 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) |
2830 | display->set_selection_owner (this); |
2881 | display->set_selection_owner (this); |
2831 | else |
2882 | else |
2832 | rxvt_print_error ("can't get primary selection"); |
2883 | rxvt_print_error ("can't get primary selection"); |
2833 | |
2884 | |
2834 | { |
2885 | #if 0 |
2835 | XTextProperty ct; |
2886 | XTextProperty ct; |
2836 | char *cl = (char *)selection.text; |
|
|
2837 | |
2887 | |
2838 | if (XmbTextListToTextProperty (display->display, &cl, 1, XStringStyle, &ct) >= 0) |
2888 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
2839 | { |
2889 | { |
2840 | XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, |
|
|
2841 | PropModeReplace, ct.value, ct.nitems); |
|
|
2842 | XFree (ct.value); |
|
|
2843 | } |
|
|
2844 | else |
|
|
2845 | XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, |
2890 | XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, |
2846 | PropModeReplace, selection.text, (int)selection.len); |
2891 | PropModeReplace, ct.value, ct.nitems); |
|
|
2892 | XFree (ct.value); |
2847 | } |
2893 | } |
|
|
2894 | #endif |
2848 | |
2895 | |
2849 | selection_time = tm; |
2896 | selection_time = tm; |
2850 | D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len)); |
2897 | D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len)); |
2851 | } |
2898 | } |
2852 | |
2899 | |
… | |
… | |
2881 | rxvt_term::selection_start_colrow (int col, int row) |
2928 | rxvt_term::selection_start_colrow (int col, int row) |
2882 | { |
2929 | { |
2883 | want_refresh = 1; |
2930 | want_refresh = 1; |
2884 | selection.mark.col = col; |
2931 | selection.mark.col = col; |
2885 | selection.mark.row = row - TermWin.view_start; |
2932 | selection.mark.row = row - TermWin.view_start; |
|
|
2933 | |
2886 | MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); |
2934 | MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); |
2887 | MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); |
2935 | MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); |
2888 | MAX_IT (selection.mark.col, 0); |
2936 | MAX_IT (selection.mark.col, 0); |
2889 | MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); |
2937 | MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); |
2890 | |
2938 | |
|
|
2939 | while (selection.mark.col > 0 |
|
|
2940 | && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR) |
|
|
2941 | --selection.mark.col; |
|
|
2942 | |
2891 | if (selection.op) |
2943 | if (selection.op) |
2892 | { /* clear the old selection */ |
2944 | { /* clear the old selection */ |
2893 | selection.beg.row = selection.end.row = selection.mark.row; |
2945 | selection.beg.row = selection.end.row = selection.mark.row; |
2894 | selection.beg.col = selection.end.col = selection.mark.col; |
2946 | selection.beg.col = selection.end.col = selection.mark.col; |
2895 | } |
2947 | } |
|
|
2948 | |
2896 | selection.op = SELECTION_INIT; |
2949 | selection.op = SELECTION_INIT; |
2897 | selection.screen = current_screen; |
2950 | selection.screen = current_screen; |
2898 | } |
2951 | } |
2899 | |
2952 | |
2900 | /* ------------------------------------------------------------------------- */ |
2953 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
2902 | * Word select: select text for 2 clicks |
2955 | * Word select: select text for 2 clicks |
2903 | * We now only find out the boundary in one direction |
2956 | * We now only find out the boundary in one direction |
2904 | */ |
2957 | */ |
2905 | |
2958 | |
2906 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
2959 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
2907 | #define DELIMIT_TEXT(x) \ |
2960 | #define DELIMIT_TEXT(x) \ |
2908 | (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR (rs[Rs_cutchars], (x)) != NULL)) |
2961 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x))) |
2909 | #define DELIMIT_REND(x) 1 |
2962 | #define DELIMIT_REND(x) 1 |
2910 | |
2963 | |
2911 | void |
2964 | void |
2912 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) |
2965 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) |
2913 | { |
2966 | { |
2914 | int col, row, dirnadd, tcol, trow, w1, w2; |
2967 | int col, row, dirnadd, tcol, trow, w1, w2; |
2915 | row_col_t bound; |
2968 | row_col_t bound; |
2916 | text_t *stp; |
2969 | text_t *stp; |
2917 | rend_t *srp; |
2970 | rend_t *srp; |
2918 | |
2971 | |
2919 | if (dirn == UP) |
2972 | if (dirn == UP) |
2920 | { |
2973 | { |
2921 | bound.row = TermWin.saveLines - TermWin.nscrolled - 1; |
2974 | bound.row = TermWin.saveLines - TermWin.nscrolled - 1; |
2922 | bound.col = 0; |
2975 | bound.col = 0; |
… | |
… | |
2926 | { |
2979 | { |
2927 | bound.row = TermWin.saveLines + TermWin.nrow; |
2980 | bound.row = TermWin.saveLines + TermWin.nrow; |
2928 | bound.col = TermWin.ncol - 1; |
2981 | bound.col = TermWin.ncol - 1; |
2929 | dirnadd = 1; |
2982 | dirnadd = 1; |
2930 | } |
2983 | } |
|
|
2984 | |
2931 | row = mark->row + TermWin.saveLines; |
2985 | row = mark->row + TermWin.saveLines; |
2932 | col = mark->col; |
2986 | col = mark->col; |
2933 | MAX_IT (col, 0); |
2987 | MAX_IT (col, 0); |
2934 | /* find the edge of a word */ |
2988 | /* find the edge of a word */ |
2935 | stp = & (screen.text[row][col]); |
2989 | stp = & (screen.text[row][col]); |
2936 | w1 = DELIMIT_TEXT (*stp); |
2990 | w1 = DELIMIT_TEXT (*stp); |
2937 | |
2991 | |
2938 | if (selection_style != NEW_SELECT) |
|
|
2939 | { |
|
|
2940 | if (w1 == 1) |
|
|
2941 | { |
|
|
2942 | stp += dirnadd; |
|
|
2943 | if (DELIMIT_TEXT (*stp) == 1) |
|
|
2944 | goto Old_Word_Selection_You_Die; |
|
|
2945 | col += dirnadd; |
|
|
2946 | } |
|
|
2947 | w1 = 0; |
|
|
2948 | } |
|
|
2949 | srp = (&screen.rend[row][col]); |
2992 | srp = (&screen.rend[row][col]); |
2950 | w2 = DELIMIT_REND (*srp); |
2993 | w2 = DELIMIT_REND (*srp); |
2951 | |
2994 | |
2952 | for (;;) |
2995 | for (;;) |
2953 | { |
2996 | { |
2954 | for (; col != bound.col; col += dirnadd) |
2997 | for (; col != bound.col; col += dirnadd) |
2955 | { |
2998 | { |
2956 | stp += dirnadd; |
2999 | stp += dirnadd; |
|
|
3000 | srp += dirnadd; |
|
|
3001 | |
|
|
3002 | if (*stp == NOCHAR) |
|
|
3003 | continue; |
|
|
3004 | |
2957 | if (DELIMIT_TEXT (*stp) != w1) |
3005 | if (DELIMIT_TEXT (*stp) != w1) |
2958 | break; |
3006 | break; |
2959 | srp += dirnadd; |
|
|
2960 | if (DELIMIT_REND (*srp) != w2) |
3007 | if (DELIMIT_REND (*srp) != w2) |
2961 | break; |
3008 | break; |
2962 | } |
3009 | } |
|
|
3010 | |
2963 | if ((col == bound.col) && (row != bound.row)) |
3011 | if ((col == bound.col) && (row != bound.row)) |
2964 | { |
3012 | { |
2965 | if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) |
3013 | if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) |
2966 | { |
3014 | { |
2967 | trow = row + dirnadd; |
3015 | trow = row + dirnadd; |
2968 | tcol = dirn == UP ? TermWin.ncol - 1 : 0; |
3016 | tcol = dirn == UP ? TermWin.ncol - 1 : 0; |
|
|
3017 | |
2969 | if (screen.text[trow] == NULL) |
3018 | if (screen.text[trow] == NULL) |
2970 | break; |
3019 | break; |
|
|
3020 | |
2971 | stp = & (screen.text[trow][tcol]); |
3021 | stp = & (screen.text[trow][tcol]); |
2972 | srp = & (screen.rend[trow][tcol]); |
3022 | srp = & (screen.rend[trow][tcol]); |
|
|
3023 | |
2973 | if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) |
3024 | if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) |
2974 | break; |
3025 | break; |
|
|
3026 | |
2975 | row = trow; |
3027 | row = trow; |
2976 | col = tcol; |
3028 | col = tcol; |
2977 | continue; |
3029 | continue; |
2978 | } |
3030 | } |
2979 | } |
3031 | } |
2980 | break; |
3032 | break; |
2981 | } |
3033 | } |
|
|
3034 | |
2982 | Old_Word_Selection_You_Die: |
3035 | Old_Word_Selection_You_Die: |
2983 | D_SELECT ((stderr, "rxvt_selection_delimit_word (%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - TermWin.saveLines, col)); |
3036 | D_SELECT ((stderr, "rxvt_selection_delimit_word (%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - TermWin.saveLines, col)); |
2984 | |
3037 | |
2985 | if (dirn == DN) |
3038 | if (dirn == DN) |
2986 | col++; /* put us on one past the end */ |
3039 | col++; /* put us on one past the end */ |
… | |
… | |
3008 | MAX_IT (row, 0); |
3061 | MAX_IT (row, 0); |
3009 | MIN_IT (row, (int)TermWin.nrow - 1); |
3062 | MIN_IT (row, (int)TermWin.nrow - 1); |
3010 | MAX_IT (col, 0); |
3063 | MAX_IT (col, 0); |
3011 | MIN_IT (col, (int)TermWin.ncol); |
3064 | MIN_IT (col, (int)TermWin.ncol); |
3012 | |
3065 | |
3013 | #ifndef NO_NEW_SELECTION |
|
|
3014 | /* |
3066 | /* |
3015 | * If we're selecting characters (single click) then we must check first |
3067 | * If we're selecting characters (single click) then we must check first |
3016 | * if we are at the same place as the original mark. If we are then |
3068 | * if we are at the same place as the original mark. If we are then |
3017 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
3069 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
3018 | * be _past_ a character for it to be selected. |
3070 | * be _past_ a character for it to be selected. |
3019 | */ |
3071 | */ |
3020 | if (selection_style != OLD_SELECT) |
|
|
3021 | { |
|
|
3022 | if (((selection.clicks % 3) == 1) && !flag |
3072 | if (((selection.clicks % 3) == 1) && !flag |
3023 | && (col == selection.mark.col |
3073 | && (col == selection.mark.col |
3024 | && (row == selection.mark.row + TermWin.view_start))) |
3074 | && (row == selection.mark.row + TermWin.view_start))) |
3025 | { |
3075 | { |
3026 | /* select nothing */ |
3076 | /* select nothing */ |
3027 | selection.beg.row = selection.end.row = 0; |
3077 | selection.beg.row = selection.end.row = 0; |
3028 | selection.beg.col = selection.end.col = 0; |
3078 | selection.beg.col = selection.end.col = 0; |
3029 | selection.clicks = 4; |
3079 | selection.clicks = 4; |
3030 | want_refresh = 1; |
3080 | want_refresh = 1; |
3031 | D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4")); |
3081 | D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4")); |
3032 | return; |
3082 | return; |
3033 | } |
|
|
3034 | } |
3083 | } |
3035 | #endif |
3084 | |
3036 | if (selection.clicks == 4) |
3085 | if (selection.clicks == 4) |
3037 | selection.clicks = 1; |
3086 | selection.clicks = 1; |
3038 | |
3087 | |
3039 | selection_extend_colrow (col, row, !!flag, /* ? button 3 */ |
3088 | selection_extend_colrow (col, row, !!flag, /* ? button 3 */ |
3040 | flag == 1 ? 1 : 0, /* ? button press */ |
3089 | flag == 1 ? 1 : 0, /* ? button press */ |
… | |
… | |
3094 | pos.col = col; |
3143 | pos.col = col; |
3095 | pos.row = row; |
3144 | pos.row = row; |
3096 | |
3145 | |
3097 | pos.row -= TermWin.view_start; /* adjust for scroll */ |
3146 | pos.row -= TermWin.view_start; /* adjust for scroll */ |
3098 | |
3147 | |
3099 | #ifndef NO_OLD_SELECTION |
|
|
3100 | /* |
|
|
3101 | * This mimics some of the selection behaviour of version 2.20 and before. |
|
|
3102 | * There are no ``selection modes'', button3 is always character extension. |
|
|
3103 | * Note: button3 drag is always available, c.f. v2.20 |
|
|
3104 | * Selection always terminates (left or right as appropriate) at the mark. |
|
|
3105 | */ |
|
|
3106 | if (selection_style == OLD_SELECT) |
|
|
3107 | { |
|
|
3108 | if (selection.clicks == 1 || button3) |
|
|
3109 | { |
|
|
3110 | if (hate_those_clicks) |
|
|
3111 | { |
|
|
3112 | hate_those_clicks = 0; |
|
|
3113 | if (selection.clicks == 1) |
|
|
3114 | { |
|
|
3115 | selection.beg.row = selection.mark.row; |
|
|
3116 | selection.beg.col = selection.mark.col; |
|
|
3117 | } |
|
|
3118 | else |
|
|
3119 | { |
|
|
3120 | selection.mark.row = selection.beg.row; |
|
|
3121 | selection.mark.col = selection.beg.col; |
|
|
3122 | } |
|
|
3123 | } |
|
|
3124 | if (ROWCOL_IS_BEFORE (pos, selection.mark)) |
|
|
3125 | { |
|
|
3126 | selection.end.row = selection.mark.row; |
|
|
3127 | selection.end.col = selection.mark.col + 1; |
|
|
3128 | selection.beg.row = pos.row; |
|
|
3129 | selection.beg.col = pos.col; |
|
|
3130 | } |
|
|
3131 | else |
|
|
3132 | { |
|
|
3133 | selection.beg.row = selection.mark.row; |
|
|
3134 | selection.beg.col = selection.mark.col; |
|
|
3135 | selection.end.row = pos.row; |
|
|
3136 | selection.end.col = pos.col + 1; |
|
|
3137 | } |
|
|
3138 | } |
|
|
3139 | else if (selection.clicks == 2) |
|
|
3140 | { |
|
|
3141 | selection_delimit_word (UP, & (selection.mark), |
|
|
3142 | & (selection.beg)); |
|
|
3143 | selection_delimit_word (DN, & (selection.mark), |
|
|
3144 | & (selection.end)); |
|
|
3145 | hate_those_clicks = 1; |
|
|
3146 | } |
|
|
3147 | else if (selection.clicks == 3) |
|
|
3148 | { |
|
|
3149 | selection.beg.row = selection.end.row = selection.mark.row; |
|
|
3150 | selection.beg.col = 0; |
|
|
3151 | selection.end.col = ncol; |
|
|
3152 | hate_those_clicks = 1; |
|
|
3153 | } |
|
|
3154 | D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); |
|
|
3155 | return; |
|
|
3156 | } |
|
|
3157 | #endif /* ! NO_OLD_SELECTION */ |
|
|
3158 | #ifndef NO_NEW_SELECTION |
|
|
3159 | /* selection_style must not be OLD_SELECT to get here */ |
|
|
3160 | /* |
3148 | /* |
3161 | * This is mainly xterm style selection with a couple of differences, mainly |
3149 | * This is mainly xterm style selection with a couple of differences, mainly |
3162 | * in the way button3 drag extension works. |
3150 | * in the way button3 drag extension works. |
3163 | * We're either doing: button1 drag; button3 press; or button3 drag |
3151 | * We're either doing: button1 drag; button3 press; or button3 drag |
3164 | * a) button1 drag : select around a midpoint/word/line - that point/word/line |
3152 | * a) button1 drag : select around a midpoint/word/line - that point/word/line |
… | |
… | |
3169 | * a point/word/line which is either the start or end of the selection |
3157 | * a point/word/line which is either the start or end of the selection |
3170 | * and it was decided by whichever point/word/line was `fixed' at the |
3158 | * and it was decided by whichever point/word/line was `fixed' at the |
3171 | * time of the most recent button3 press |
3159 | * time of the most recent button3 press |
3172 | */ |
3160 | */ |
3173 | if (button3 && buttonpress) |
3161 | if (button3 && buttonpress) |
3174 | { /* button3 press */ |
3162 | { /* button3 press */ |
3175 | /* |
3163 | /* |
3176 | * first determine which edge of the selection we are closest to |
3164 | * first determine which edge of the selection we are closest to |
3177 | */ |
3165 | */ |
3178 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3166 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3179 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
3167 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
3180 | && (((pos.col - selection.beg.col) |
3168 | && (((pos.col - selection.beg.col) |
3181 | + ((pos.row - selection.beg.row) * ncol)) |
3169 | + ((pos.row - selection.beg.row) * ncol)) |
3182 | < ((selection.end.col - pos.col) |
3170 | < ((selection.end.col - pos.col) |
3183 | + ((selection.end.row - pos.row) * ncol))))) |
3171 | + ((selection.end.row - pos.row) * ncol))))) |
3184 | closeto = LEFT; |
3172 | closeto = LEFT; |
|
|
3173 | |
3185 | if (closeto == LEFT) |
3174 | if (closeto == LEFT) |
3186 | { |
3175 | { |
3187 | selection.beg.row = pos.row; |
3176 | selection.beg.row = pos.row; |
3188 | selection.beg.col = pos.col; |
3177 | selection.beg.col = pos.col; |
3189 | selection.mark.row = selection.end.row; |
3178 | selection.mark.row = selection.end.row; |
3190 | selection.mark.col = selection.end.col |
3179 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3191 | - (selection.clicks == 2); |
|
|
3192 | } |
3180 | } |
3193 | else |
3181 | else |
3194 | { |
3182 | { |
3195 | selection.end.row = pos.row; |
3183 | selection.end.row = pos.row; |
3196 | selection.end.col = pos.col; |
3184 | selection.end.col = pos.col; |
3197 | selection.mark.row = selection.beg.row; |
3185 | selection.mark.row = selection.beg.row; |
3198 | selection.mark.col = selection.beg.col; |
3186 | selection.mark.col = selection.beg.col; |
3199 | } |
3187 | } |
3200 | } |
3188 | } |
3201 | else |
3189 | else |
3202 | { /* button1 drag or button3 drag */ |
3190 | { /* button1 drag or button3 drag */ |
3203 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3191 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3204 | { |
3192 | { |
3205 | if ((selection.mark.row == selection.end.row) |
3193 | if ((selection.mark.row == selection.end.row) |
3206 | && (selection.mark.col == selection.end.col) |
3194 | && (selection.mark.col == selection.end.col) |
3207 | && clickchange && selection.clicks == 2) |
3195 | && clickchange && selection.clicks == 2) |
3208 | selection.mark.col--; |
3196 | selection.mark.col--; |
|
|
3197 | |
3209 | selection.beg.row = pos.row; |
3198 | selection.beg.row = pos.row; |
3210 | selection.beg.col = pos.col; |
3199 | selection.beg.col = pos.col; |
3211 | selection.end.row = selection.mark.row; |
3200 | selection.end.row = selection.mark.row; |
3212 | selection.end.col = selection.mark.col |
3201 | selection.end.col = selection.mark.col + (selection.clicks == 2); |
3213 | + (selection.clicks == 2); |
|
|
3214 | } |
3202 | } |
3215 | else |
3203 | else |
3216 | { |
3204 | { |
3217 | selection.beg.row = selection.mark.row; |
3205 | selection.beg.row = selection.mark.row; |
3218 | selection.beg.col = selection.mark.col; |
3206 | selection.beg.col = selection.mark.col; |
… | |
… | |
3222 | } |
3210 | } |
3223 | |
3211 | |
3224 | if (selection.clicks == 1) |
3212 | if (selection.clicks == 1) |
3225 | { |
3213 | { |
3226 | end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; |
3214 | end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; |
|
|
3215 | |
3227 | if (end_col != -1 && selection.beg.col > end_col) |
3216 | if (end_col != -1 && selection.beg.col > end_col) |
3228 | { |
3217 | { |
3229 | #if 1 |
3218 | #if 1 |
3230 | selection.beg.col = ncol; |
3219 | selection.beg.col = ncol; |
3231 | #else |
3220 | #else |
3232 | if (selection.beg.row != selection.end.row) |
3221 | if (selection.beg.row != selection.end.row) |
3233 | selection.beg.col = ncol; |
3222 | selection.beg.col = ncol; |
3234 | else |
3223 | else |
3235 | selection.beg.col = selection.mark.col; |
3224 | selection.beg.col = selection.mark.col; |
3236 | #endif |
3225 | #endif |
3237 | |
|
|
3238 | } |
3226 | } |
|
|
3227 | |
3239 | end_col = screen.tlen[selection.end.row + TermWin.saveLines]; |
3228 | end_col = screen.tlen[selection.end.row + TermWin.saveLines]; |
|
|
3229 | |
3240 | if (end_col != -1 && selection.end.col > end_col) |
3230 | if (end_col != -1 && selection.end.col > end_col) |
3241 | selection.end.col = ncol; |
3231 | selection.end.col = ncol; |
3242 | |
|
|
3243 | } |
3232 | } |
3244 | else if (selection.clicks == 2) |
3233 | else if (selection.clicks == 2) |
3245 | { |
3234 | { |
3246 | if (ROWCOL_IS_AFTER (selection.end, selection.beg)) |
3235 | if (ROWCOL_IS_AFTER (selection.end, selection.beg)) |
3247 | selection.end.col--; |
3236 | selection.end.col--; |
|
|
3237 | |
3248 | selection_delimit_word (UP, & (selection.beg), |
3238 | selection_delimit_word (UP, & (selection.beg), & (selection.beg)); |
3249 | & (selection.beg)); |
|
|
3250 | selection_delimit_word (DN, & (selection.end), |
3239 | selection_delimit_word (DN, & (selection.end), & (selection.end)); |
3251 | & (selection.end)); |
|
|
3252 | } |
3240 | } |
3253 | else if (selection.clicks == 3) |
3241 | else if (selection.clicks == 3) |
3254 | { |
3242 | { |
3255 | #ifndef NO_FRILLS |
3243 | #ifndef NO_FRILLS |
3256 | if ((Options & Opt_tripleclickwords)) |
3244 | if ((Options & Opt_tripleclickwords)) |
3257 | { |
3245 | { |
3258 | int end_row; |
3246 | int end_row; |
3259 | |
3247 | |
3260 | selection_delimit_word (UP, & (selection.beg), |
3248 | selection_delimit_word (UP, & (selection.beg), & (selection.beg)); |
3261 | & (selection.beg)); |
|
|
3262 | end_row = screen.tlen[selection.mark.row |
3249 | end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; |
3263 | + TermWin.saveLines]; |
3250 | |
3264 | for (end_row = selection.mark.row; end_row < TermWin.nrow; |
3251 | for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) |
3265 | end_row++) |
|
|
3266 | { |
3252 | { |
3267 | end_col = screen.tlen[end_row + TermWin.saveLines]; |
3253 | end_col = screen.tlen[end_row + TermWin.saveLines]; |
|
|
3254 | |
3268 | if (end_col != -1) |
3255 | if (end_col != -1) |
3269 | { |
3256 | { |
3270 | selection.end.row = end_row; |
3257 | selection.end.row = end_row; |
3271 | selection.end.col = end_col; |
3258 | selection.end.col = end_col; |
3272 | selection_remove_trailing_spaces (); |
3259 | selection_remove_trailing_spaces (); |
… | |
… | |
3274 | } |
3261 | } |
3275 | } |
3262 | } |
3276 | } |
3263 | } |
3277 | else |
3264 | else |
3278 | #endif |
3265 | #endif |
3279 | |
|
|
3280 | { |
3266 | { |
3281 | if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) |
3267 | if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) |
3282 | selection.mark.col++; |
3268 | selection.mark.col++; |
3283 | selection.beg.col = 0; |
3269 | selection.beg.col = 0; |
3284 | selection.end.col = ncol; |
3270 | selection.end.col = ncol; |
3285 | } |
3271 | } |
3286 | } |
3272 | } |
|
|
3273 | |
3287 | if (button3 && buttonpress) |
3274 | if (button3 && buttonpress) |
3288 | { /* mark may need to be changed */ |
3275 | { /* mark may need to be changed */ |
3289 | if (closeto == LEFT) |
3276 | if (closeto == LEFT) |
3290 | { |
3277 | { |
3291 | selection.mark.row = selection.end.row; |
3278 | selection.mark.row = selection.end.row; |
3292 | selection.mark.col = selection.end.col |
3279 | selection.mark.col = selection.end.col |
3293 | - (selection.clicks == 2); |
3280 | - (selection.clicks == 2); |
… | |
… | |
3297 | selection.mark.row = selection.beg.row; |
3284 | selection.mark.row = selection.beg.row; |
3298 | selection.mark.col = selection.beg.col; |
3285 | selection.mark.col = selection.beg.col; |
3299 | } |
3286 | } |
3300 | } |
3287 | } |
3301 | D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); |
3288 | D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); |
3302 | #endif /* ! NO_NEW_SELECTION */ |
|
|
3303 | } |
3289 | } |
3304 | |
3290 | |
3305 | #ifndef NO_FRILLS |
3291 | #ifndef NO_FRILLS |
3306 | void |
3292 | void |
3307 | rxvt_term::selection_remove_trailing_spaces () |
3293 | rxvt_term::selection_remove_trailing_spaces () |
… | |
… | |
3381 | ev.target = rq.target; |
3367 | ev.target = rq.target; |
3382 | ev.time = rq.time; |
3368 | ev.time = rq.time; |
3383 | |
3369 | |
3384 | if (rq.target == xa[XA_TARGETS]) |
3370 | if (rq.target == xa[XA_TARGETS]) |
3385 | { |
3371 | { |
3386 | Atom32 target_list[5]; |
3372 | Atom32 target_list[6]; |
3387 | Atom32 *target = target_list; |
3373 | Atom32 *target = target_list; |
3388 | |
3374 | |
3389 | *target++ = (Atom32) xa[XA_TARGETS]; |
3375 | *target++ = (Atom32) xa[XA_TARGETS]; |
|
|
3376 | *target++ = (Atom32) xa[XA_TIMESTAMP]; |
3390 | *target++ = (Atom32) XA_STRING; |
3377 | *target++ = (Atom32) XA_STRING; |
3391 | *target++ = (Atom32) xa[XA_TEXT]; |
3378 | *target++ = (Atom32) xa[XA_TEXT]; |
3392 | *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; |
3379 | *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; |
3393 | #if X_HAVE_UTF8_STRING |
3380 | #if X_HAVE_UTF8_STRING |
3394 | *target++ = (Atom32) xa[XA_UTF8_STRING]; |
3381 | *target++ = (Atom32) xa[XA_UTF8_STRING]; |
3395 | #endif |
3382 | #endif |
|
|
3383 | |
3396 | XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, |
3384 | XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, |
3397 | (8 * sizeof (target_list[0])), PropModeReplace, |
3385 | (8 * sizeof (target_list[0])), PropModeReplace, |
3398 | (unsigned char *)target_list, |
3386 | (unsigned char *)target_list, |
3399 | target - target_list); |
3387 | target - target_list); |
3400 | ev.property = rq.property; |
3388 | ev.property = rq.property; |
3401 | } |
3389 | } |
3402 | else if (rq.target == xa[XA_MULTIPLE]) |
3390 | else if (rq.target == xa[XA_MULTIPLE]) |
3403 | { |
3391 | { |
3404 | /* TODO: Handle MULTIPLE */ |
3392 | /* TODO: Handle MULTIPLE */ |
… | |
… | |
3416 | || rq.target == xa[XA_UTF8_STRING] |
3404 | || rq.target == xa[XA_UTF8_STRING] |
3417 | ) |
3405 | ) |
3418 | { |
3406 | { |
3419 | short freect = 0; |
3407 | short freect = 0; |
3420 | int selectlen; |
3408 | int selectlen; |
3421 | char *cl; |
3409 | wchar_t *cl; |
3422 | |
3410 | |
3423 | target = rq.target; |
3411 | target = rq.target; |
3424 | |
3412 | |
3425 | if (target == XA_STRING) |
3413 | if (target == XA_STRING) |
3426 | // we actually don't do XA_STRING, but who cares, as i18n clients |
3414 | // we actually don't do XA_STRING, but who cares, as i18n clients |
3427 | // will ask for another format anyways. |
3415 | // will ask for another format anyways. |
3428 | style = XStringStyle; |
3416 | style = XStringStyle; |
3429 | else if (target == xa[XA_TEXT]) |
3417 | else if (target == xa[XA_TEXT]) |
3430 | style = XTextStyle; |
3418 | style = XStdICCTextStyle; |
3431 | else if (target == xa[XA_COMPOUND_TEXT]) |
3419 | else if (target == xa[XA_COMPOUND_TEXT]) |
3432 | style = XCompoundTextStyle; |
3420 | style = XCompoundTextStyle; |
3433 | #if X_HAVE_UTF8_STRING |
3421 | #if X_HAVE_UTF8_STRING |
3434 | else if (target == xa[XA_UTF8_STRING]) |
3422 | else if (target == xa[XA_UTF8_STRING]) |
3435 | style = XUTF8StringStyle; |
3423 | style = XUTF8StringStyle; |
… | |
… | |
3440 | style = XCompoundTextStyle; |
3428 | style = XCompoundTextStyle; |
3441 | } |
3429 | } |
3442 | |
3430 | |
3443 | if (selection.text) |
3431 | if (selection.text) |
3444 | { |
3432 | { |
3445 | cl = (char *)selection.text; |
3433 | cl = selection.text; |
3446 | selectlen = selection.len; |
3434 | selectlen = selection.len; |
3447 | } |
3435 | } |
3448 | else |
3436 | else |
3449 | { |
3437 | { |
3450 | cl = ""; |
3438 | cl = L""; |
3451 | selectlen = 0; |
3439 | selectlen = 0; |
3452 | } |
3440 | } |
3453 | |
3441 | |
|
|
3442 | // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it |
|
|
3443 | // manually for XUTF8StringStyle. |
3454 | if (XmbTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) |
3444 | if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) |
3455 | freect = 1; |
3445 | freect = 1; |
3456 | else |
3446 | else |
3457 | { |
3447 | { |
3458 | /* if we failed to convert then send it raw */ |
3448 | /* if we failed to convert then send it raw */ |
3459 | ct.value = (unsigned char *)cl; |
3449 | ct.value = (unsigned char *)cl; |
… | |
… | |
3466 | ev.property = rq.property; |
3456 | ev.property = rq.property; |
3467 | |
3457 | |
3468 | if (freect) |
3458 | if (freect) |
3469 | XFree (ct.value); |
3459 | XFree (ct.value); |
3470 | } |
3460 | } |
|
|
3461 | |
3471 | XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); |
3462 | XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); |
3472 | } |
3463 | } |
3473 | |
3464 | |
3474 | /* ------------------------------------------------------------------------- * |
3465 | /* ------------------------------------------------------------------------- * |
3475 | * MOUSE ROUTINES * |
3466 | * MOUSE ROUTINES * |