1 | /*---------------------------------------------------------------------------* |
1 | /*---------------------------------------------------------------------------* |
2 | * File: screen.C |
2 | * File: screen.C |
3 | *---------------------------------------------------------------------------* |
3 | *---------------------------------------------------------------------------* |
4 | * |
4 | * |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
6 | * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> |
6 | * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de> |
7 | * |
7 | * |
8 | * This program is free software; you can redistribute it and/or modify |
8 | * This program is free software; you can redistribute it and/or modify |
9 | * it under the terms of the GNU General Public License as published by |
9 | * it under the terms of the GNU General Public License as published by |
10 | * the Free Software Foundation; either version 2 of the License, or |
10 | * the Free Software Foundation; either version 2 of the License, or |
11 | * (at your option) any later version. |
11 | * (at your option) any later version. |
… | |
… | |
28 | #include "rxvt.h" /* NECESSARY */ |
28 | #include "rxvt.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
30 | |
30 | |
31 | #include <inttypes.h> |
31 | #include <inttypes.h> |
32 | |
32 | |
33 | #include "salloc.C" // HACK, should be a seperate compile! |
33 | #include "salloc.C" // HACK, should be a separate compile! |
34 | |
34 | |
35 | static inline void |
35 | static inline void |
36 | fill_text (text_t *start, text_t value, int len) |
36 | fill_text (text_t *start, text_t value, int len) |
37 | { |
37 | { |
38 | while (len--) |
38 | while (len--) |
39 | *start++ = value; |
39 | *start++ = value; |
40 | } |
40 | } |
41 | |
41 | |
42 | /* ------------------------------------------------------------------------- */ |
42 | /* ------------------------------------------------------------------------- */ |
43 | #define PROP_SIZE 256*1024 |
|
|
44 | #define PASTE_SIZE 32768 |
|
|
45 | #define TABSIZE 8 /* default tab size */ |
43 | #define TABSIZE 8 /* default tab size */ |
46 | |
44 | |
47 | /* ------------------------------------------------------------------------- * |
45 | /* ------------------------------------------------------------------------- * |
48 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
46 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
49 | * ------------------------------------------------------------------------- */ |
47 | * ------------------------------------------------------------------------- */ |
… | |
… | |
144 | col--; |
142 | col--; |
145 | |
143 | |
146 | rend_t rend = l.r[col] & ~RS_baseattrMask; |
144 | rend_t rend = l.r[col] & ~RS_baseattrMask; |
147 | rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); |
145 | rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); |
148 | |
146 | |
|
|
147 | l.touch (); |
|
|
148 | |
149 | // found start, nuke |
149 | // found start, nuke |
150 | do { |
150 | do { |
151 | l.t[col] = ' '; |
151 | l.t[col] = ' '; |
152 | l.r[col] = rend; |
152 | l.r[col] = rend; |
153 | col++; |
153 | col++; |
… | |
… | |
159 | * ------------------------------------------------------------------------- */ |
159 | * ------------------------------------------------------------------------- */ |
160 | |
160 | |
161 | void |
161 | void |
162 | rxvt_term::scr_reset () |
162 | rxvt_term::scr_reset () |
163 | { |
163 | { |
|
|
164 | #if ENABLE_OVERLAY |
|
|
165 | scr_overlay_off (); |
|
|
166 | #endif |
|
|
167 | |
164 | view_start = 0; |
168 | view_start = 0; |
165 | num_scr = 0; |
169 | num_scr = 0; |
166 | |
170 | |
167 | if (ncol == 0) |
171 | if (ncol == 0) |
168 | ncol = 80; |
172 | ncol = 80; |
… | |
… | |
398 | } |
402 | } |
399 | |
403 | |
400 | free (tabs); |
404 | free (tabs); |
401 | tabs = (char *)rxvt_malloc (ncol); |
405 | tabs = (char *)rxvt_malloc (ncol); |
402 | |
406 | |
403 | for (int col = ncol; --col; ) |
407 | for (int col = ncol; col--; ) |
404 | tabs [col] = col % TABSIZE == 0; |
408 | tabs [col] = col % TABSIZE == 0; |
405 | |
409 | |
406 | CLEAR_ALL_SELECTION (); |
410 | CLEAR_ALL_SELECTION (); |
407 | |
411 | |
408 | prev_nrow = nrow; |
412 | prev_nrow = nrow; |
… | |
… | |
795 | |
799 | |
796 | while (str < strend) |
800 | while (str < strend) |
797 | { |
801 | { |
798 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
802 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
799 | |
803 | |
800 | if (expect_false (c < 0x20)) |
804 | if (ecb_unlikely (c < 0x20)) |
801 | if (c == C0_LF) |
805 | if (c == C0_LF) |
802 | { |
806 | { |
803 | max_it (line->l, screen.cur.col); |
807 | max_it (line->l, screen.cur.col); |
804 | |
808 | |
805 | screen.flags &= ~Screen_WrapNext; |
809 | screen.flags &= ~Screen_WrapNext; |
… | |
… | |
824 | { |
828 | { |
825 | scr_tab (1, true); |
829 | scr_tab (1, true); |
826 | continue; |
830 | continue; |
827 | } |
831 | } |
828 | |
832 | |
829 | if (expect_false ( |
833 | if (ecb_unlikely ( |
830 | checksel /* see if we're writing within selection */ |
834 | checksel /* see if we're writing within selection */ |
831 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
835 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
832 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
836 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
833 | )) |
837 | )) |
834 | { |
838 | { |
… | |
… | |
839 | * should be a similar check. |
843 | * should be a similar check. |
840 | */ |
844 | */ |
841 | CLEAR_SELECTION (); |
845 | CLEAR_SELECTION (); |
842 | } |
846 | } |
843 | |
847 | |
844 | if (expect_false (screen.flags & Screen_WrapNext)) |
848 | if (ecb_unlikely (screen.flags & Screen_WrapNext)) |
845 | { |
849 | { |
846 | scr_do_wrap (); |
850 | scr_do_wrap (); |
847 | |
851 | |
848 | line->l = ncol; |
852 | line->l = ncol; |
849 | line->is_longer (1); |
853 | line->is_longer (1); |
… | |
… | |
851 | row = screen.cur.row; |
855 | row = screen.cur.row; |
852 | line = &ROW(row); /* _must_ refresh */ |
856 | line = &ROW(row); /* _must_ refresh */ |
853 | } |
857 | } |
854 | |
858 | |
855 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
859 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
856 | if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
860 | if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
857 | c = 0xfffd; |
861 | c = 0xfffd; |
858 | |
862 | |
859 | // rely on wcwidth to tell us the character width, do wcwidth before |
863 | // rely on wcwidth to tell us the character width, do wcwidth before |
860 | // further replacements, as wcwidth might return -1 for the line |
864 | // further replacements, as wcwidth might return -1 for the line |
861 | // drawing characters below as they might be invalid in the current |
865 | // drawing characters below as they might be invalid in the current |
862 | // locale. |
866 | // locale. |
863 | int width = WCWIDTH (c); |
867 | int width = WCWIDTH (c); |
864 | |
868 | |
865 | if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL |
869 | if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL |
866 | { |
870 | { |
867 | // vt100 special graphics and line drawing |
871 | // vt100 special graphics and line drawing |
868 | // 5f-7e standard vt100 |
872 | // 5f-7e standard vt100 |
869 | // 40-5e rxvt extension for extra curses acs chars |
873 | // 40-5e rxvt extension for extra curses acs chars |
870 | static uint16_t vt100_0[62] = { // 41 .. 7e |
874 | static uint16_t vt100_0[62] = { // 41 .. 7e |
… | |
… | |
883 | c = vt100_0[c - 0x41]; |
887 | c = vt100_0[c - 0x41]; |
884 | width = 1; // vt100 line drawing characters are always single-width |
888 | width = 1; // vt100 line drawing characters are always single-width |
885 | } |
889 | } |
886 | } |
890 | } |
887 | |
891 | |
888 | if (expect_false (screen.flags & Screen_Insert)) |
892 | if (ecb_unlikely (screen.flags & Screen_Insert)) |
889 | scr_insdel_chars (width, INSERT); |
893 | scr_insdel_chars (width, INSERT); |
890 | |
894 | |
891 | if (width != 0) |
895 | if (width != 0) |
892 | { |
896 | { |
893 | #if !UNICODE_3 |
897 | #if !UNICODE_3 |
… | |
… | |
898 | # else |
902 | # else |
899 | c = 0xfffd; |
903 | c = 0xfffd; |
900 | # endif |
904 | # endif |
901 | #endif |
905 | #endif |
902 | |
906 | |
|
|
907 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
908 | |
|
|
909 | // if the character doesn't fit into the remaining columns... |
|
|
910 | if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width)) |
|
|
911 | { |
|
|
912 | if (screen.flags & Screen_Autowrap) |
|
|
913 | { |
|
|
914 | // ... artificially enlargen the previous one |
|
|
915 | c = NOCHAR; |
|
|
916 | // and try the same character next loop iteration |
|
|
917 | --str; |
|
|
918 | } |
|
|
919 | else |
|
|
920 | screen.cur.col = ncol - width; |
|
|
921 | } |
|
|
922 | |
903 | // nuke the character at this position, if required |
923 | // nuke the character at this position, if required |
904 | if (expect_false ( |
924 | // due to wonderful coincidences everywhere else in this loop |
|
|
925 | // we never have to check for overwriting a wide char itself, |
|
|
926 | // only its tail. |
905 | line->t[screen.cur.col] == NOCHAR |
927 | if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR)) |
906 | || (screen.cur.col < ncol - 1 |
|
|
907 | && line->t[screen.cur.col + 1] == NOCHAR) |
|
|
908 | )) |
|
|
909 | scr_kill_char (*line, screen.cur.col); |
928 | scr_kill_char (*line, screen.cur.col); |
910 | |
|
|
911 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
912 | |
|
|
913 | // if the character doesn't fit into the remaining columns... |
|
|
914 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
|
|
915 | { |
|
|
916 | // ... artificially enlargen the previous one |
|
|
917 | c = NOCHAR; |
|
|
918 | // and try the same character next loop iteration |
|
|
919 | --str; |
|
|
920 | } |
|
|
921 | |
929 | |
922 | line->touch (); |
930 | line->touch (); |
923 | |
931 | |
924 | do |
932 | do |
925 | { |
933 | { |
926 | line->t[screen.cur.col] = c; |
934 | line->t[screen.cur.col] = c; |
927 | line->r[screen.cur.col] = rend; |
935 | line->r[screen.cur.col] = rend; |
928 | |
936 | |
929 | if (expect_true (screen.cur.col < ncol - 1)) |
937 | if (ecb_likely (screen.cur.col < ncol - 1)) |
930 | screen.cur.col++; |
938 | screen.cur.col++; |
931 | else |
939 | else |
932 | { |
940 | { |
933 | line->l = ncol; |
941 | line->l = ncol; |
934 | if (screen.flags & Screen_Autowrap) |
942 | if (screen.flags & Screen_Autowrap) |
935 | screen.flags |= Screen_WrapNext; |
943 | screen.flags |= Screen_WrapNext; |
936 | break; |
944 | |
|
|
945 | goto end_of_line; |
937 | } |
946 | } |
938 | |
947 | |
939 | c = NOCHAR; |
948 | c = NOCHAR; |
940 | } |
949 | } |
941 | while (expect_false (--width > 0)); |
950 | while (ecb_unlikely (--width > 0)); |
942 | |
951 | |
943 | // pad with spaces when overwriting wide character with smaller one |
952 | // pad with spaces when overwriting wide character with smaller one |
944 | if (expect_false (!width)) |
953 | for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++) |
945 | { |
954 | { |
946 | line->touch (); |
|
|
947 | |
|
|
948 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
|
|
949 | { |
|
|
950 | line->t[c] = ' '; |
955 | line->t[c] = ' '; |
951 | line->r[c] = rend; |
956 | line->r[c] = rend; |
952 | } |
|
|
953 | } |
957 | } |
|
|
958 | |
|
|
959 | end_of_line: |
|
|
960 | ; |
954 | } |
961 | } |
955 | #if ENABLE_COMBINING |
962 | #if ENABLE_COMBINING |
956 | else // width == 0 |
963 | else // width == 0 |
957 | { |
964 | { |
958 | if (c != 0xfeff) // ignore BOM |
965 | if (c != 0xfeff) // ignore BOM |
… | |
… | |
1021 | |
1028 | |
1022 | want_refresh = 1; |
1029 | want_refresh = 1; |
1023 | #endif |
1030 | #endif |
1024 | } |
1031 | } |
1025 | } |
1032 | } |
|
|
1033 | else if (screen.flags & Screen_WrapNext) |
|
|
1034 | screen.flags &= ~Screen_WrapNext; |
1026 | else |
1035 | else |
1027 | scr_gotorc (0, -1, RELATIVE); |
1036 | scr_gotorc (0, -1, RELATIVE); |
1028 | } |
1037 | } |
1029 | |
1038 | |
1030 | /* ------------------------------------------------------------------------- */ |
1039 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1336 | if (row >= nrow) /* Out Of Bounds */ |
1345 | if (row >= nrow) /* Out Of Bounds */ |
1337 | return; |
1346 | return; |
1338 | |
1347 | |
1339 | min_it (num, nrow - row); |
1348 | min_it (num, nrow - row); |
1340 | |
1349 | |
1341 | // TODO: the code below does not work when view_start != 0 |
|
|
1342 | // the workaround is to disable the clear and use a normal refresh |
|
|
1343 | // when view_start != 0. mysterious. |
|
|
1344 | if (rstyle & (RS_Blink | RS_RVid | RS_Uline)) |
1350 | if (rstyle & (RS_Blink | RS_RVid | RS_Uline)) |
1345 | ren = (rend_t) ~RS_None; |
1351 | ren = (rend_t) ~RS_None; |
1346 | else if (GET_BASEBG (rstyle) == Color_bg) |
1352 | else if (GET_BASEBG (rstyle) == Color_bg) |
1347 | { |
1353 | { |
1348 | ren = DEFAULT_RSTYLE; |
1354 | ren = DEFAULT_RSTYLE; |
1349 | |
1355 | |
1350 | if (mapped && !view_start) |
1356 | if (mapped) |
1351 | XClearArea (dpy, vt, 0, |
1357 | XClearArea (dpy, vt, 0, |
1352 | Row2Pixel (row - view_start), (unsigned int)width, |
1358 | Row2Pixel (row - view_start), (unsigned int)width, |
1353 | (unsigned int)Height2Pixel (num), False); |
1359 | (unsigned int)Height2Pixel (num), False); |
1354 | } |
1360 | } |
1355 | else |
1361 | else |
1356 | { |
1362 | { |
1357 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1363 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1358 | |
1364 | |
1359 | if (mapped && !view_start) |
1365 | if (mapped) |
1360 | { |
1366 | { |
1361 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1367 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1362 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1368 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1363 | XFillRectangle (dpy, vt, gc, |
1369 | XFillRectangle (dpy, vt, gc, |
1364 | 0, Row2Pixel (row - view_start), |
1370 | 0, Row2Pixel (row - view_start), |
… | |
… | |
1371 | |
1377 | |
1372 | for (; num--; row++) |
1378 | for (; num--; row++) |
1373 | { |
1379 | { |
1374 | scr_blank_screen_mem (ROW(row), rstyle); |
1380 | scr_blank_screen_mem (ROW(row), rstyle); |
1375 | |
1381 | |
1376 | if (!view_start) |
1382 | if (row - view_start < nrow) |
1377 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1383 | scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren); |
1378 | } |
1384 | } |
1379 | } |
1385 | } |
1380 | |
1386 | |
1381 | #if !ENABLE_MINIMAL |
1387 | #if !ENABLE_MINIMAL |
1382 | void |
1388 | void |
… | |
… | |
1681 | { |
1687 | { |
1682 | rvideo_state = on; |
1688 | rvideo_state = on; |
1683 | |
1689 | |
1684 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1690 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1685 | #ifdef HAVE_BG_PIXMAP |
1691 | #ifdef HAVE_BG_PIXMAP |
1686 | if (bgPixmap.pixmap == None) |
1692 | if (bg_pixmap == None) |
1687 | #endif |
1693 | #endif |
1688 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1694 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1689 | |
1695 | |
1690 | XGCValues gcvalue; |
1696 | XGCValues gcvalue; |
1691 | gcvalue.foreground = pix_colors[Color_fg]; |
1697 | gcvalue.foreground = pix_colors[Color_fg]; |
… | |
… | |
1918 | |
1924 | |
1919 | # ifndef NO_MAPALERT |
1925 | # ifndef NO_MAPALERT |
1920 | # ifdef MAPALERT_OPTION |
1926 | # ifdef MAPALERT_OPTION |
1921 | if (option (Opt_mapAlert)) |
1927 | if (option (Opt_mapAlert)) |
1922 | # endif |
1928 | # endif |
1923 | XMapWindow (dpy, parent[0]); |
1929 | XMapWindow (dpy, parent); |
1924 | # endif |
1930 | # endif |
1925 | |
1931 | |
1926 | # if ENABLE_FRILLS |
1932 | # if ENABLE_FRILLS |
1927 | if (option (Opt_urgentOnBell)) |
1933 | if (option (Opt_urgentOnBell)) |
1928 | set_urgency (1); |
1934 | set_urgency (1); |
… | |
… | |
1941 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1947 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1942 | #endif |
1948 | #endif |
1943 | } |
1949 | } |
1944 | |
1950 | |
1945 | /* ------------------------------------------------------------------------- */ |
1951 | /* ------------------------------------------------------------------------- */ |
1946 | /* ARGSUSED */ |
|
|
1947 | void |
1952 | void |
1948 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1953 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1949 | { |
1954 | { |
1950 | #ifdef PRINTPIPE |
1955 | #ifdef PRINTPIPE |
1951 | int nrows, row_start; |
1956 | int nrows, row_start; |
… | |
… | |
2027 | refresh_count = 0; |
2032 | refresh_count = 0; |
2028 | |
2033 | |
2029 | unsigned int old_screen_flags = screen.flags; |
2034 | unsigned int old_screen_flags = screen.flags; |
2030 | char have_bg = 0; |
2035 | char have_bg = 0; |
2031 | #ifdef HAVE_BG_PIXMAP |
2036 | #ifdef HAVE_BG_PIXMAP |
2032 | have_bg = bgPixmap.pixmap != None; |
2037 | have_bg = bg_pixmap != None; |
2033 | #endif |
2038 | #endif |
2034 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2039 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2035 | |
2040 | |
2036 | /* |
2041 | /* |
2037 | * B: reverse any characters which are selected |
2042 | * B: reverse any characters which are selected |
… | |
… | |
2229 | continue; |
2234 | continue; |
2230 | |
2235 | |
2231 | // redraw one or more characters |
2236 | // redraw one or more characters |
2232 | |
2237 | |
2233 | // seek to the beginning of wide characters |
2238 | // seek to the beginning of wide characters |
2234 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2239 | while (ecb_unlikely (stp[col] == NOCHAR && col > 0)) |
2235 | --col; |
2240 | --col; |
2236 | |
2241 | |
2237 | rend_t rend = srp[col]; /* screen rendition (target rendition) */ |
2242 | rend_t rend = srp[col]; /* screen rendition (target rendition) */ |
2238 | text_t *text = stp + col; |
2243 | text_t *text = stp + col; |
2239 | int count = 1; |
2244 | int count = 1; |
… | |
… | |
2277 | |
2282 | |
2278 | col--; /* went one too far. move back */ |
2283 | col--; /* went one too far. move back */ |
2279 | count -= i; /* dump any matching trailing chars */ |
2284 | count -= i; /* dump any matching trailing chars */ |
2280 | |
2285 | |
2281 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2286 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2282 | while (expect_false (i && text[count] == NOCHAR)) |
2287 | while (ecb_unlikely (i && text[count] == NOCHAR)) |
2283 | count++, i--; |
2288 | count++, i--; |
2284 | |
2289 | |
2285 | /* |
2290 | /* |
2286 | * Determine the attributes for the string |
2291 | * Determine the attributes for the string |
2287 | */ |
2292 | */ |
2288 | int fore = fgcolor_of (rend); // desired foreground |
2293 | int fore = fgcolor_of (rend); // desired foreground |
2289 | int back = bgcolor_of (rend); // desired background |
2294 | int back = bgcolor_of (rend); // desired background |
2290 | |
2295 | |
2291 | // only do special processing if any attributes are set, which is unlikely |
2296 | // only do special processing if any attributes are set, which is unlikely |
2292 | if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) |
2297 | if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) |
2293 | { |
2298 | { |
2294 | bool invert = rend & RS_RVid; |
2299 | bool invert = rend & RS_RVid; |
2295 | |
2300 | |
2296 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2301 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2297 | if (rend & RS_Bold && fore == Color_fg) |
2302 | if (rend & RS_Bold && fore == Color_fg) |
… | |
… | |
2386 | /* |
2391 | /* |
2387 | * Actually do the drawing of the string here |
2392 | * Actually do the drawing of the string here |
2388 | */ |
2393 | */ |
2389 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2394 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2390 | |
2395 | |
2391 | if (expect_true (have_bg && back == Color_bg)) |
2396 | if (ecb_likely (have_bg && back == Color_bg)) |
2392 | { |
2397 | { |
2393 | // this is very ugly, maybe push it into ->draw? |
2398 | // this is very ugly, maybe push it into ->draw? |
2394 | |
2399 | |
2395 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2400 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2396 | if (text[i] != ' ') |
2401 | if (text[i] != ' ') |
… | |
… | |
2403 | did_clear: ; |
2408 | did_clear: ; |
2404 | } |
2409 | } |
2405 | else |
2410 | else |
2406 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2411 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2407 | |
2412 | |
2408 | if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) |
2413 | if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) |
2409 | { |
2414 | { |
2410 | #if ENABLE_FRILLS |
2415 | #if ENABLE_FRILLS |
2411 | if (ISSET_PIXCOLOR (Color_underline)) |
2416 | if (ISSET_PIXCOLOR (Color_underline)) |
2412 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2417 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2413 | else |
2418 | else |
… | |
… | |
2504 | scr_remap_chars (swap_buf [i]); |
2509 | scr_remap_chars (swap_buf [i]); |
2505 | } |
2510 | } |
2506 | } |
2511 | } |
2507 | |
2512 | |
2508 | void |
2513 | void |
2509 | rxvt_term::scr_recolour () NOTHROW |
2514 | rxvt_term::scr_recolour (bool refresh) NOTHROW |
2510 | { |
2515 | { |
|
|
2516 | bool transparent = false; |
|
|
2517 | |
2511 | #ifdef HAVE_BG_PIXMAP |
2518 | #ifdef HAVE_BG_PIXMAP |
2512 | bgPixmap.apply (); |
2519 | if (bg_pixmap != None) |
2513 | #else |
2520 | { |
|
|
2521 | # ifdef ENABLE_TRANSPARENCY |
|
|
2522 | if (bg_flags & BG_IS_TRANSPARENT) |
|
|
2523 | { |
|
|
2524 | XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); |
|
|
2525 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
2514 | |
2526 | |
|
|
2527 | transparent = true; |
|
|
2528 | } |
|
|
2529 | else |
|
|
2530 | # endif |
|
|
2531 | { |
|
|
2532 | XSetWindowBackground (dpy, parent, pix_colors[Color_border]); |
|
|
2533 | XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); |
|
|
2534 | } |
|
|
2535 | } |
|
|
2536 | else |
|
|
2537 | #endif |
|
|
2538 | { |
2515 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2539 | XSetWindowBackground (dpy, parent, pix_colors[Color_border]); |
2516 | XClearWindow (dpy, parent[0]); |
|
|
2517 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2540 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
|
|
2541 | } |
|
|
2542 | |
|
|
2543 | XClearWindow (dpy, parent); |
2518 | |
2544 | |
2519 | if (scrollBar.win) |
2545 | if (scrollBar.win) |
2520 | { |
2546 | { |
|
|
2547 | if (transparent) |
|
|
2548 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
|
|
2549 | else |
2521 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2550 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2522 | scrollBar.state = STATE_IDLE; |
2551 | scrollBar.state = STATE_IDLE; |
2523 | scrollBar.show (0); |
2552 | scrollBar.show (0); |
2524 | } |
2553 | } |
2525 | |
2554 | |
2526 | #endif |
2555 | if (refresh) |
2527 | |
2556 | { |
2528 | /* bgPixmap.apply () does not do the following : */ |
|
|
2529 | scr_clear (); |
2557 | scr_clear (); |
2530 | scr_touch (true); |
2558 | scr_touch (true); |
|
|
2559 | } |
2531 | want_refresh = 1; |
2560 | want_refresh = 1; |
2532 | } |
2561 | } |
2533 | |
2562 | |
2534 | /* ------------------------------------------------------------------------- */ |
2563 | /* ------------------------------------------------------------------------- */ |
2535 | void |
2564 | void |
… | |
… | |
2623 | void |
2652 | void |
2624 | rxvt_term::scr_dump (int fd) NOTHROW |
2653 | rxvt_term::scr_dump (int fd) NOTHROW |
2625 | { |
2654 | { |
2626 | int row, wrote; |
2655 | int row, wrote; |
2627 | unsigned int width, towrite; |
2656 | unsigned int width, towrite; |
2628 | char r1[] = "\n"; |
2657 | const char r1[] = "\n"; |
2629 | |
2658 | |
2630 | for (row = saveLines + top_row; |
2659 | for (row = saveLines + top_row; |
2631 | row < saveLines + nrow - 1; row++) |
2660 | row < saveLines + nrow - 1; row++) |
2632 | { |
2661 | { |
2633 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2662 | width = row_buf[row].l >= 0 ? row_buf[row].l |
… | |
… | |
2679 | /* ------------------------------------------------------------------------- */ |
2708 | /* ------------------------------------------------------------------------- */ |
2680 | /* |
2709 | /* |
2681 | * Paste a selection direct to the command fd |
2710 | * Paste a selection direct to the command fd |
2682 | */ |
2711 | */ |
2683 | void |
2712 | void |
2684 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2713 | rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW |
2685 | { |
2714 | { |
2686 | /* convert normal newline chars into common keyboard Return key sequence */ |
2715 | /* convert normal newline chars into common keyboard Return key sequence */ |
2687 | for (unsigned int i = 0; i < len; i++) |
2716 | for (unsigned int i = 0; i < len; i++) |
2688 | if (data[i] == C0_LF) |
2717 | if (data[i] == C0_LF) |
2689 | data[i] = C0_CR; |
2718 | data[i] = C0_CR; |
… | |
… | |
2695 | |
2724 | |
2696 | if (priv_modes & PrivMode_BracketPaste) |
2725 | if (priv_modes & PrivMode_BracketPaste) |
2697 | tt_printf ("\e[201~"); |
2726 | tt_printf ("\e[201~"); |
2698 | } |
2727 | } |
2699 | |
2728 | |
2700 | /* ------------------------------------------------------------------------- */ |
|
|
2701 | /* |
|
|
2702 | * Respond to a notification that a primary selection has been sent |
|
|
2703 | * EXT: SelectionNotify |
|
|
2704 | */ |
|
|
2705 | void |
2729 | void |
2706 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW |
2730 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2707 | { |
2731 | { |
2708 | if (prop == None) /* check for failed XConvertSelection */ |
2732 | if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END))) |
2709 | { |
|
|
2710 | if ((selection_type & Sel_CompoundText)) |
|
|
2711 | { |
|
|
2712 | int selnum = selection_type & Sel_whereMask; |
|
|
2713 | |
|
|
2714 | selection_type = 0; |
|
|
2715 | if (selnum != Sel_direct) |
|
|
2716 | selection_request_other (XA_STRING, selnum); |
|
|
2717 | } |
|
|
2718 | |
|
|
2719 | if ((selection_type & Sel_UTF8String)) |
|
|
2720 | { |
|
|
2721 | int selnum = selection_type & Sel_whereMask; |
|
|
2722 | |
|
|
2723 | selection_type = Sel_CompoundText; |
|
|
2724 | if (selnum != Sel_direct) |
|
|
2725 | selection_request_other (xa[XA_COMPOUND_TEXT], selnum); |
|
|
2726 | else |
|
|
2727 | selection_type = 0; |
|
|
2728 | } |
|
|
2729 | |
|
|
2730 | return; |
|
|
2731 | } |
|
|
2732 | |
|
|
2733 | unsigned long bytes_after; |
|
|
2734 | XTextProperty ct; |
|
|
2735 | |
|
|
2736 | if (XGetWindowProperty (dpy, win, prop, |
|
|
2737 | 0, PROP_SIZE / 4, |
|
|
2738 | delete_prop, AnyPropertyType, |
|
|
2739 | &ct.encoding, &ct.format, |
|
|
2740 | &ct.nitems, &bytes_after, |
|
|
2741 | &ct.value) != Success) |
|
|
2742 | { |
|
|
2743 | ct.value = 0; |
|
|
2744 | goto bailout; |
|
|
2745 | } |
|
|
2746 | |
|
|
2747 | if (ct.encoding == None) |
|
|
2748 | goto bailout; |
|
|
2749 | |
|
|
2750 | if (bytes_after) |
|
|
2751 | { |
|
|
2752 | // fetch and append remaining data |
|
|
2753 | XTextProperty ct2; |
|
|
2754 | |
|
|
2755 | if (XGetWindowProperty (dpy, win, prop, |
|
|
2756 | ct.nitems / 4, (bytes_after + 3) / 4, |
|
|
2757 | delete_prop, AnyPropertyType, |
|
|
2758 | &ct2.encoding, &ct2.format, |
|
|
2759 | &ct2.nitems, &bytes_after, |
|
|
2760 | &ct2.value) != Success) |
|
|
2761 | goto bailout; |
|
|
2762 | |
|
|
2763 | // realloc should be compatible to XFree, here, and elsewhere, too |
|
|
2764 | ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); |
|
|
2765 | memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); |
|
|
2766 | ct.nitems += ct2.nitems; |
|
|
2767 | |
|
|
2768 | XFree (ct2.value); |
|
|
2769 | } |
|
|
2770 | |
|
|
2771 | if (ct.value == 0) |
|
|
2772 | goto bailout; |
|
|
2773 | |
|
|
2774 | if (ct.encoding == xa[XA_INCR]) |
|
|
2775 | { |
|
|
2776 | // INCR selection, start handshake |
|
|
2777 | if (!delete_prop) |
|
|
2778 | XDeleteProperty (dpy, win, prop); |
|
|
2779 | |
|
|
2780 | selection_wait = Sel_incr; |
|
|
2781 | incr_buf_fill = 0; |
|
|
2782 | incr_ev.start (10); |
|
|
2783 | |
|
|
2784 | goto bailout; |
|
|
2785 | } |
|
|
2786 | |
|
|
2787 | if (ct.nitems == 0) |
|
|
2788 | { |
|
|
2789 | if (selection_wait == Sel_incr) |
|
|
2790 | { |
|
|
2791 | XFree (ct.value); |
|
|
2792 | |
|
|
2793 | // finally complete, now paste the whole thing |
|
|
2794 | selection_wait = Sel_normal; |
|
|
2795 | ct.value = (unsigned char *)incr_buf; |
|
|
2796 | ct.nitems = incr_buf_fill; |
|
|
2797 | incr_buf = 0; |
|
|
2798 | incr_buf_size = 0; |
|
|
2799 | incr_ev.stop (); |
|
|
2800 | } |
|
|
2801 | else |
|
|
2802 | { |
|
|
2803 | if (selection_wait == Sel_normal |
|
|
2804 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
|
|
2805 | { |
|
|
2806 | /* |
|
|
2807 | * pass through again trying CUT_BUFFER0 if we've come from |
|
|
2808 | * XConvertSelection () but nothing was presented |
|
|
2809 | */ |
|
|
2810 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
|
|
2811 | } |
|
|
2812 | |
|
|
2813 | goto bailout; |
|
|
2814 | } |
|
|
2815 | } |
|
|
2816 | else if (selection_wait == Sel_incr) |
|
|
2817 | { |
|
|
2818 | incr_ev.start (10); |
|
|
2819 | |
|
|
2820 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
|
|
2821 | { |
|
|
2822 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
|
|
2823 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
|
|
2824 | } |
|
|
2825 | |
|
|
2826 | memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); |
|
|
2827 | incr_buf_fill += ct.nitems; |
|
|
2828 | |
|
|
2829 | goto bailout; |
|
|
2830 | } |
|
|
2831 | |
|
|
2832 | char **cl; |
|
|
2833 | int cr; |
|
|
2834 | |
|
|
2835 | #if !ENABLE_MINIMAL |
|
|
2836 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
|
|
2837 | // so recode it manually |
|
|
2838 | if (ct.encoding == xa[XA_UTF8_STRING]) |
|
|
2839 | { |
|
|
2840 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
|
|
2841 | char *s = rxvt_wcstombs (w); |
|
|
2842 | free (w); |
|
|
2843 | // TODO: strlen == only the first element will be converted. well... |
|
|
2844 | paste (s, strlen (s)); |
|
|
2845 | free (s); |
|
|
2846 | } |
|
|
2847 | else |
|
|
2848 | #endif |
|
|
2849 | if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0 |
|
|
2850 | && cl) |
|
|
2851 | { |
|
|
2852 | for (int i = 0; i < cr; i++) |
|
|
2853 | paste (cl[i], strlen (cl[i])); |
|
|
2854 | |
|
|
2855 | XFreeStringList (cl); |
|
|
2856 | } |
|
|
2857 | else |
|
|
2858 | paste ((char *)ct.value, ct.nitems); // paste raw |
|
|
2859 | |
|
|
2860 | bailout: |
|
|
2861 | XFree (ct.value); |
|
|
2862 | |
|
|
2863 | if (selection_wait == Sel_normal) |
|
|
2864 | selection_wait = Sel_none; |
|
|
2865 | } |
|
|
2866 | |
|
|
2867 | void |
|
|
2868 | rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW |
|
|
2869 | { |
|
|
2870 | selection_wait = Sel_none; |
|
|
2871 | |
|
|
2872 | incr_buf_size = 0; |
|
|
2873 | free (incr_buf); |
|
|
2874 | |
|
|
2875 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
|
|
2876 | } |
|
|
2877 | |
|
|
2878 | void |
|
|
2879 | rxvt_term::selection_property (Window win, Atom prop) NOTHROW |
|
|
2880 | { |
|
|
2881 | if (prop == None || selection_wait != Sel_incr) |
|
|
2882 | return; |
2733 | return; |
2883 | |
2734 | |
2884 | selection_paste (win, prop, true); |
2735 | tt_paste (data, len); |
2885 | } |
2736 | } |
2886 | |
2737 | |
2887 | /* ------------------------------------------------------------------------- */ |
2738 | /* ------------------------------------------------------------------------- */ |
2888 | /* |
2739 | /* |
2889 | * Request the current selection: |
2740 | * Request PRIMARY, SECONDARY or CLIPBOARD selection. |
2890 | * Order: > internal selection if available |
2741 | * if the requested selection has no owner or is empty CUT_BUFFER0 is used |
2891 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2742 | * as fallback |
2892 | * > CUT_BUFFER0 |
|
|
2893 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
|
|
2894 | * will auto fallback to CUT_BUFFER0 |
|
|
2895 | * EXT: button 2 release |
2743 | * EXT: button 2 release |
2896 | */ |
2744 | */ |
2897 | void |
2745 | void |
2898 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2746 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2899 | { |
2747 | { |
2900 | if (selection.text && selnum == Sel_Primary) |
2748 | if (!selection_req) |
2901 | { |
|
|
2902 | /* internal selection */ |
|
|
2903 | char *str = rxvt_wcstombs (selection.text, selection.len); |
|
|
2904 | paste (str, strlen (str)); |
|
|
2905 | free (str); |
|
|
2906 | return; |
|
|
2907 | } |
2749 | { |
2908 | else |
2750 | selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this); |
|
|
2751 | selection_req->run (); |
2909 | { |
2752 | } |
2910 | selection_request_time = tm; |
|
|
2911 | selection_wait = Sel_normal; |
|
|
2912 | |
|
|
2913 | #if X_HAVE_UTF8_STRING |
|
|
2914 | selection_type = Sel_UTF8String; |
|
|
2915 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
|
|
2916 | return; |
|
|
2917 | #else |
|
|
2918 | selection_type = Sel_CompoundText; |
|
|
2919 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
|
|
2920 | return; |
|
|
2921 | #endif |
|
|
2922 | } |
|
|
2923 | |
|
|
2924 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
|
|
2925 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
|
|
2926 | } |
|
|
2927 | |
|
|
2928 | int |
|
|
2929 | rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW |
|
|
2930 | { |
|
|
2931 | Atom sel; |
|
|
2932 | |
|
|
2933 | selection_type |= selnum; |
|
|
2934 | |
|
|
2935 | if (selnum == Sel_Primary) |
|
|
2936 | sel = XA_PRIMARY; |
|
|
2937 | else if (selnum == Sel_Secondary) |
|
|
2938 | sel = XA_SECONDARY; |
|
|
2939 | else |
|
|
2940 | sel = xa[XA_CLIPBOARD]; |
|
|
2941 | |
|
|
2942 | if (XGetSelectionOwner (dpy, sel) != None) |
|
|
2943 | { |
|
|
2944 | XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION], |
|
|
2945 | vt, selection_request_time); |
|
|
2946 | return 1; |
|
|
2947 | } |
|
|
2948 | |
|
|
2949 | return 0; |
|
|
2950 | } |
2753 | } |
2951 | |
2754 | |
2952 | /* ------------------------------------------------------------------------- */ |
2755 | /* ------------------------------------------------------------------------- */ |
2953 | /* |
2756 | /* |
2954 | * Clear all selected text |
2757 | * Clear all selected text |
… | |
… | |
2977 | if (display->clipboard_owner == this) |
2780 | if (display->clipboard_owner == this) |
2978 | display->clipboard_owner = 0; |
2781 | display->clipboard_owner = 0; |
2979 | } |
2782 | } |
2980 | } |
2783 | } |
2981 | |
2784 | |
2982 | void |
|
|
2983 | rxvt_term::clipboard_copy (Time tm) |
|
|
2984 | { |
|
|
2985 | if (selection.len > 0) |
|
|
2986 | { |
|
|
2987 | free (selection.clip_text); |
|
|
2988 | selection.clip_len = selection.len; |
|
|
2989 | selection.clip_text = (wchar_t *) malloc (sizeof (wchar_t) * selection.clip_len); |
|
|
2990 | memcpy (selection.clip_text, selection.text, |
|
|
2991 | sizeof (wchar_t) * selection.clip_len); |
|
|
2992 | selection_grab (tm, true); |
|
|
2993 | } |
|
|
2994 | } |
|
|
2995 | |
|
|
2996 | /* ------------------------------------------------------------------------- */ |
2785 | /* ------------------------------------------------------------------------- */ |
2997 | /* |
2786 | /* |
2998 | * Copy a selection into the cut buffer |
2787 | * Copy a selection into the cut buffer |
2999 | * EXT: button 1 or 3 release |
2788 | * EXT: button 1 or 3 release |
3000 | */ |
2789 | */ |
3001 | void |
2790 | void |
3002 | rxvt_term::selection_make (Time tm) |
2791 | rxvt_term::selection_make (Time tm) |
3003 | { |
2792 | { |
3004 | int i; |
2793 | int size; |
3005 | wchar_t *new_selection_text; |
2794 | wchar_t *new_selection_text; |
3006 | text_t *t; |
2795 | text_t *t; |
3007 | |
2796 | |
3008 | switch (selection.op) |
2797 | switch (selection.op) |
3009 | { |
2798 | { |
… | |
… | |
3025 | return; /* nothing selected, go away */ |
2814 | return; /* nothing selected, go away */ |
3026 | |
2815 | |
3027 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
2816 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
3028 | return; |
2817 | return; |
3029 | |
2818 | |
3030 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2819 | size = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
3031 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2820 | new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t)); |
3032 | |
2821 | |
3033 | int ofs = 0; |
2822 | int ofs = 0; |
3034 | int extra = 0; |
2823 | int extra = 0; |
3035 | |
2824 | |
3036 | int col = selection.beg.col; |
2825 | int col = selection.beg.col; |
… | |
… | |
3042 | { |
2831 | { |
3043 | #if !ENABLE_MINIMAL |
2832 | #if !ENABLE_MINIMAL |
3044 | if (selection.rect) |
2833 | if (selection.rect) |
3045 | { |
2834 | { |
3046 | col = selection.beg.col; |
2835 | col = selection.beg.col; |
3047 | end_col = ncol + 1; |
2836 | end_col = selection.end.col; |
3048 | } |
2837 | } |
3049 | else |
2838 | else |
3050 | #endif |
2839 | #endif |
3051 | end_col = ROW(row).l; |
2840 | end_col = ROW(row).l; |
3052 | |
2841 | |
3053 | col = max (col, 0); |
2842 | col = max (col, 0); |
3054 | |
2843 | |
3055 | if (row == selection.end.row |
2844 | if (row == selection.end.row) |
3056 | #if !ENABLE_MINIMAL |
|
|
3057 | || selection.rect |
|
|
3058 | #endif |
|
|
3059 | ) |
|
|
3060 | min_it (end_col, selection.end.col); |
2845 | min_it (end_col, selection.end.col); |
3061 | |
2846 | |
3062 | t = ROW(row).t + col; |
2847 | t = ROW(row).t + col; |
3063 | |
2848 | |
3064 | for (; col < end_col; col++) |
2849 | for (; col < end_col; col++) |
… | |
… | |
3072 | |
2857 | |
3073 | extra -= (len - 1); |
2858 | extra -= (len - 1); |
3074 | |
2859 | |
3075 | if (extra < 0) |
2860 | if (extra < 0) |
3076 | { |
2861 | { |
3077 | extra += i; |
2862 | extra += size; |
3078 | i += i; |
2863 | size += size; |
3079 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); |
2864 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t)); |
3080 | } |
2865 | } |
3081 | |
2866 | |
3082 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
2867 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
3083 | } |
2868 | } |
3084 | #endif |
2869 | #endif |
… | |
… | |
3096 | |
2881 | |
3097 | new_selection_text[ofs++] = C0_LF; |
2882 | new_selection_text[ofs++] = C0_LF; |
3098 | } |
2883 | } |
3099 | else |
2884 | else |
3100 | #endif |
2885 | #endif |
3101 | if (!ROW(row).is_longer () && row != selection.end.row) |
2886 | if (!ROW(row).is_longer () |
|
|
2887 | && (row != selection.end.row || end_col != selection.end.col) |
|
|
2888 | && (row != selection.beg.row || selection.beg.col < ncol)) |
3102 | new_selection_text[ofs++] = C0_LF; |
2889 | new_selection_text[ofs++] = C0_LF; |
3103 | } |
2890 | } |
3104 | |
|
|
3105 | if (end_col != selection.end.col) |
|
|
3106 | new_selection_text[ofs++] = C0_LF; |
|
|
3107 | |
2891 | |
3108 | new_selection_text[ofs] = 0; |
2892 | new_selection_text[ofs] = 0; |
3109 | |
2893 | |
3110 | if (ofs == 0) |
2894 | if (ofs == 0) |
3111 | { |
2895 | { |
… | |
… | |
3617 | * EXT: SelectionRequest |
3401 | * EXT: SelectionRequest |
3618 | */ |
3402 | */ |
3619 | void |
3403 | void |
3620 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3404 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3621 | { |
3405 | { |
|
|
3406 | Atom property = rq.property == None ? rq.target : rq.property; |
3622 | XSelectionEvent ev; |
3407 | XSelectionEvent ev; |
3623 | |
3408 | |
3624 | ev.type = SelectionNotify; |
3409 | ev.type = SelectionNotify; |
3625 | ev.property = None; |
3410 | ev.property = None; |
3626 | ev.display = rq.display; |
3411 | ev.display = rq.display; |
… | |
… | |
3641 | *target++ = xa[XA_COMPOUND_TEXT]; |
3426 | *target++ = xa[XA_COMPOUND_TEXT]; |
3642 | #if X_HAVE_UTF8_STRING |
3427 | #if X_HAVE_UTF8_STRING |
3643 | *target++ = xa[XA_UTF8_STRING]; |
3428 | *target++ = xa[XA_UTF8_STRING]; |
3644 | #endif |
3429 | #endif |
3645 | |
3430 | |
3646 | XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, |
3431 | XChangeProperty (dpy, rq.requestor, property, XA_ATOM, |
3647 | 32, PropModeReplace, |
3432 | 32, PropModeReplace, |
3648 | (unsigned char *)target_list, target - target_list); |
3433 | (unsigned char *)target_list, target - target_list); |
3649 | ev.property = rq.property; |
3434 | ev.property = property; |
3650 | } |
3435 | } |
3651 | #if TODO // TODO |
3436 | #if TODO // TODO |
3652 | else if (rq.target == xa[XA_MULTIPLE]) |
3437 | else if (rq.target == xa[XA_MULTIPLE]) |
3653 | { |
3438 | { |
3654 | /* TODO: Handle MULTIPLE */ |
3439 | /* TODO: Handle MULTIPLE */ |
3655 | } |
3440 | } |
3656 | #endif |
3441 | #endif |
3657 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) |
3442 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) |
3658 | { |
3443 | { |
3659 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3444 | XChangeProperty (dpy, rq.requestor, property, rq.target, |
3660 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3445 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3661 | ev.property = rq.property; |
3446 | ev.property = property; |
3662 | } |
3447 | } |
3663 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
3448 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
3664 | { |
3449 | { |
3665 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3450 | XChangeProperty (dpy, rq.requestor, property, rq.target, |
3666 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
3451 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
3667 | ev.property = rq.property; |
3452 | ev.property = property; |
3668 | } |
3453 | } |
3669 | else if (rq.target == XA_STRING |
3454 | else if (rq.target == XA_STRING |
3670 | || rq.target == xa[XA_TEXT] |
3455 | || rq.target == xa[XA_TEXT] |
3671 | || rq.target == xa[XA_COMPOUND_TEXT] |
3456 | || rq.target == xa[XA_COMPOUND_TEXT] |
3672 | || rq.target == xa[XA_UTF8_STRING] |
3457 | || rq.target == xa[XA_UTF8_STRING] |
… | |
… | |
3743 | ct.value = (unsigned char *)cl; |
3528 | ct.value = (unsigned char *)cl; |
3744 | ct.nitems = selectlen; |
3529 | ct.nitems = selectlen; |
3745 | ct.encoding = target; |
3530 | ct.encoding = target; |
3746 | } |
3531 | } |
3747 | |
3532 | |
3748 | XChangeProperty (dpy, rq.requestor, rq.property, |
3533 | XChangeProperty (dpy, rq.requestor, property, |
3749 | ct.encoding, 8, PropModeReplace, |
3534 | ct.encoding, 8, PropModeReplace, |
3750 | ct.value, (int)ct.nitems); |
3535 | ct.value, (int)ct.nitems); |
3751 | ev.property = rq.property; |
3536 | ev.property = property; |
3752 | |
3537 | |
3753 | if (freect) |
3538 | if (freect) |
3754 | XFree (ct.value); |
3539 | XFree (ct.value); |
3755 | } |
3540 | } |
3756 | |
3541 | |