… | |
… | |
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 fill_text (text_t *start, text_t value, int len) |
36 | fill_text (text_t *start, text_t value, int len) |
36 | { |
37 | { |
37 | while (len--) |
38 | while (len--) |
38 | *start++ = value; |
39 | *start++ = value; |
39 | } |
40 | } |
40 | |
41 | |
… | |
… | |
143 | col--; |
144 | col--; |
144 | |
145 | |
145 | rend_t rend = l.r[col] & ~RS_baseattrMask; |
146 | rend_t rend = l.r[col] & ~RS_baseattrMask; |
146 | rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); |
147 | rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); |
147 | |
148 | |
|
|
149 | l.touch (); |
|
|
150 | |
148 | // found start, nuke |
151 | // found start, nuke |
149 | do { |
152 | do { |
150 | l.t[col] = ' '; |
153 | l.t[col] = ' '; |
151 | l.r[col] = rend; |
154 | l.r[col] = rend; |
152 | col++; |
155 | col++; |
… | |
… | |
231 | selection.text = NULL; |
234 | selection.text = NULL; |
232 | selection.len = 0; |
235 | selection.len = 0; |
233 | selection.op = SELECTION_CLEAR; |
236 | selection.op = SELECTION_CLEAR; |
234 | selection.screen = PRIMARY; |
237 | selection.screen = PRIMARY; |
235 | selection.clicks = 0; |
238 | selection.clicks = 0; |
|
|
239 | selection.clip_text = NULL; |
|
|
240 | selection.clip_len = 0; |
236 | } |
241 | } |
237 | else |
242 | else |
238 | { |
243 | { |
239 | /* |
244 | /* |
240 | * add or delete rows as appropriate |
245 | * add or delete rows as appropriate |
… | |
… | |
286 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
291 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
287 | |
292 | |
288 | do |
293 | do |
289 | { |
294 | { |
290 | p = MOD (p - 1, prev_total_rows); |
295 | p = MOD (p - 1, prev_total_rows); |
291 | #ifdef DEBUG_STRICT |
|
|
292 | assert (old_buf [MOD (p, prev_total_rows)].t); |
296 | assert (old_buf [MOD (p, prev_total_rows)].t); |
293 | #endif |
|
|
294 | int plines = 1; |
297 | int plines = 1; |
295 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
298 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
296 | |
299 | |
297 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
300 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
298 | { |
301 | { |
… | |
… | |
397 | } |
400 | } |
398 | |
401 | |
399 | free (tabs); |
402 | free (tabs); |
400 | tabs = (char *)rxvt_malloc (ncol); |
403 | tabs = (char *)rxvt_malloc (ncol); |
401 | |
404 | |
402 | for (int col = ncol; --col; ) |
405 | for (int col = ncol; col--; ) |
403 | tabs [col] = col % TABSIZE == 0; |
406 | tabs [col] = col % TABSIZE == 0; |
404 | |
407 | |
405 | CLEAR_ALL_SELECTION (); |
408 | CLEAR_ALL_SELECTION (); |
406 | |
409 | |
407 | prev_nrow = nrow; |
410 | prev_nrow = nrow; |
… | |
… | |
510 | } |
513 | } |
511 | |
514 | |
512 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
515 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
513 | min_it (s->cur.row, nrow - 1); |
516 | min_it (s->cur.row, nrow - 1); |
514 | min_it (s->cur.col, ncol - 1); |
517 | min_it (s->cur.col, ncol - 1); |
515 | #ifdef DEBUG_STRICT |
|
|
516 | assert (s->cur.row >= 0); |
518 | assert (s->cur.row >= 0); |
517 | assert (s->cur.col >= 0); |
519 | assert (s->cur.col >= 0); |
518 | #endif |
|
|
519 | } |
520 | } |
520 | |
521 | |
521 | void |
522 | void |
522 | rxvt_term::scr_swap_screen () |
523 | rxvt_term::scr_swap_screen () |
523 | { |
524 | { |
… | |
… | |
548 | want_refresh = 1; |
549 | want_refresh = 1; |
549 | view_start = 0; |
550 | view_start = 0; |
550 | |
551 | |
551 | selection_check (2); /* check for boundary cross */ |
552 | selection_check (2); /* check for boundary cross */ |
552 | |
553 | |
553 | int i = current_screen; current_screen = scrn; scrn = i; |
554 | current_screen = scrn; |
554 | |
555 | |
555 | #if NSCREENS |
556 | #if NSCREENS |
556 | if (option (Opt_secondaryScreen)) |
557 | if (option (Opt_secondaryScreen)) |
557 | { |
558 | { |
558 | num_scr = 0; |
559 | num_scr = 0; |
… | |
… | |
783 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
784 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
784 | screen.cur.row -= minlines; |
785 | screen.cur.row -= minlines; |
785 | } |
786 | } |
786 | } |
787 | } |
787 | |
788 | |
788 | #ifdef DEBUG_STRICT |
|
|
789 | assert (screen.cur.col < ncol); |
789 | assert (screen.cur.col < ncol); |
790 | assert (screen.cur.row < nrow |
790 | assert (screen.cur.row < nrow |
791 | && screen.cur.row >= top_row); |
791 | && screen.cur.row >= top_row); |
792 | #endif |
|
|
793 | int row = screen.cur.row; |
792 | int row = screen.cur.row; |
794 | |
793 | |
795 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
794 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
796 | |
795 | |
797 | line_t *line = &ROW(row); |
796 | line_t *line = &ROW(row); |
… | |
… | |
901 | # else |
900 | # else |
902 | c = 0xfffd; |
901 | c = 0xfffd; |
903 | # endif |
902 | # endif |
904 | #endif |
903 | #endif |
905 | |
904 | |
906 | // nuke the character at this position, if required |
|
|
907 | if (expect_false ( |
|
|
908 | line->t[screen.cur.col] == NOCHAR |
|
|
909 | || (screen.cur.col < ncol - 1 |
|
|
910 | && line->t[screen.cur.col + 1] == NOCHAR) |
|
|
911 | )) |
|
|
912 | scr_kill_char (*line, screen.cur.col); |
|
|
913 | |
|
|
914 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
905 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
915 | |
906 | |
916 | // if the character doesn't fit into the remaining columns... |
907 | // if the character doesn't fit into the remaining columns... |
917 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
908 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
918 | { |
909 | { |
|
|
910 | if (screen.flags & Screen_Autowrap) |
|
|
911 | { |
919 | // ... artificially enlargen the previous one |
912 | // ... artificially enlargen the previous one |
920 | c = NOCHAR; |
913 | c = NOCHAR; |
921 | // and try the same character next loop iteration |
914 | // and try the same character next loop iteration |
922 | --str; |
915 | --str; |
|
|
916 | } |
|
|
917 | else |
|
|
918 | screen.cur.col = ncol - width; |
923 | } |
919 | } |
|
|
920 | |
|
|
921 | // nuke the character at this position, if required |
|
|
922 | // due to wonderful coincidences everywhere else in this loop |
|
|
923 | // we never have to check for overwriting a wide char itself, |
|
|
924 | // only its tail. |
|
|
925 | if (expect_false (line->t[screen.cur.col] == NOCHAR)) |
|
|
926 | scr_kill_char (*line, screen.cur.col); |
924 | |
927 | |
925 | line->touch (); |
928 | line->touch (); |
926 | |
929 | |
927 | do |
930 | do |
928 | { |
931 | { |
… | |
… | |
934 | else |
937 | else |
935 | { |
938 | { |
936 | line->l = ncol; |
939 | line->l = ncol; |
937 | if (screen.flags & Screen_Autowrap) |
940 | if (screen.flags & Screen_Autowrap) |
938 | screen.flags |= Screen_WrapNext; |
941 | screen.flags |= Screen_WrapNext; |
939 | break; |
942 | |
|
|
943 | goto end_of_line; |
940 | } |
944 | } |
941 | |
945 | |
942 | c = NOCHAR; |
946 | c = NOCHAR; |
943 | } |
947 | } |
944 | while (expect_false (--width > 0)); |
948 | while (expect_false (--width > 0)); |
945 | |
949 | |
946 | // pad with spaces when overwriting wide character with smaller one |
950 | // pad with spaces when overwriting wide character with smaller one |
947 | if (expect_false (!width)) |
951 | for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++) |
948 | { |
952 | { |
949 | line->touch (); |
|
|
950 | |
|
|
951 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
|
|
952 | { |
|
|
953 | line->t[c] = ' '; |
953 | line->t[c] = ' '; |
954 | line->r[c] = rend; |
954 | line->r[c] = rend; |
955 | } |
|
|
956 | } |
955 | } |
|
|
956 | |
|
|
957 | end_of_line: |
|
|
958 | ; |
957 | } |
959 | } |
958 | #if ENABLE_COMBINING |
960 | #if ENABLE_COMBINING |
959 | else // width == 0 |
961 | else // width == 0 |
960 | { |
962 | { |
961 | if (c != 0xfeff) // ignore BOM |
963 | if (c != 0xfeff) // ignore BOM |
… | |
… | |
1001 | #endif |
1003 | #endif |
1002 | } |
1004 | } |
1003 | |
1005 | |
1004 | max_it (line->l, screen.cur.col); |
1006 | max_it (line->l, screen.cur.col); |
1005 | |
1007 | |
1006 | #ifdef DEBUG_STRICT |
|
|
1007 | assert (screen.cur.row >= 0); |
1008 | assert (screen.cur.row >= 0); |
1008 | #endif |
|
|
1009 | } |
1009 | } |
1010 | |
1010 | |
1011 | /* ------------------------------------------------------------------------- */ |
1011 | /* ------------------------------------------------------------------------- */ |
1012 | /* |
1012 | /* |
1013 | * Process Backspace. Move back the cursor back a position, wrap if have to |
1013 | * Process Backspace. Move back the cursor back a position, wrap if have to |
… | |
… | |
1026 | |
1026 | |
1027 | want_refresh = 1; |
1027 | want_refresh = 1; |
1028 | #endif |
1028 | #endif |
1029 | } |
1029 | } |
1030 | } |
1030 | } |
|
|
1031 | else if (screen.flags & Screen_WrapNext) |
|
|
1032 | screen.flags &= ~Screen_WrapNext; |
1031 | else |
1033 | else |
1032 | scr_gotorc (0, -1, RELATIVE); |
1034 | scr_gotorc (0, -1, RELATIVE); |
1033 | } |
1035 | } |
1034 | |
1036 | |
1035 | /* ------------------------------------------------------------------------- */ |
1037 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1341 | if (row >= nrow) /* Out Of Bounds */ |
1343 | if (row >= nrow) /* Out Of Bounds */ |
1342 | return; |
1344 | return; |
1343 | |
1345 | |
1344 | min_it (num, nrow - row); |
1346 | min_it (num, nrow - row); |
1345 | |
1347 | |
1346 | // TODO: the code below does not work when view_start != 0 |
|
|
1347 | // the workaround is to disable the clear and use a normal refresh |
|
|
1348 | // when view_start != 0. mysterious. |
|
|
1349 | if (rstyle & (RS_RVid | RS_Uline)) |
1348 | if (rstyle & (RS_Blink | RS_RVid | RS_Uline)) |
1350 | ren = (rend_t) ~RS_None; |
1349 | ren = (rend_t) ~RS_None; |
1351 | else if (GET_BASEBG (rstyle) == Color_bg) |
1350 | else if (GET_BASEBG (rstyle) == Color_bg) |
1352 | { |
1351 | { |
1353 | ren = DEFAULT_RSTYLE; |
1352 | ren = DEFAULT_RSTYLE; |
1354 | |
1353 | |
1355 | if (mapped && !view_start) |
1354 | if (mapped) |
1356 | XClearArea (dpy, vt, 0, |
1355 | XClearArea (dpy, vt, 0, |
1357 | Row2Pixel (row - view_start), (unsigned int)width, |
1356 | Row2Pixel (row - view_start), (unsigned int)width, |
1358 | (unsigned int)Height2Pixel (num), False); |
1357 | (unsigned int)Height2Pixel (num), False); |
1359 | } |
1358 | } |
1360 | else |
1359 | else |
1361 | { |
1360 | { |
1362 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1361 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1363 | |
1362 | |
1364 | if (mapped && !view_start) |
1363 | if (mapped) |
1365 | { |
1364 | { |
1366 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1365 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1367 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1366 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1368 | XFillRectangle (dpy, vt, gc, |
1367 | XFillRectangle (dpy, vt, gc, |
1369 | 0, Row2Pixel (row - view_start), |
1368 | 0, Row2Pixel (row - view_start), |
… | |
… | |
1376 | |
1375 | |
1377 | for (; num--; row++) |
1376 | for (; num--; row++) |
1378 | { |
1377 | { |
1379 | scr_blank_screen_mem (ROW(row), rstyle); |
1378 | scr_blank_screen_mem (ROW(row), rstyle); |
1380 | |
1379 | |
1381 | if (!view_start) |
1380 | if (row - view_start < nrow) |
1382 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1381 | scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren); |
1383 | } |
1382 | } |
1384 | } |
1383 | } |
1385 | |
1384 | |
1386 | #if !ENABLE_MINIMAL |
1385 | #if !ENABLE_MINIMAL |
1387 | void |
1386 | void |
… | |
… | |
1840 | for (i = PART_BEG; i < RC_COUNT; i++) |
1839 | for (i = PART_BEG; i < RC_COUNT; i++) |
1841 | { |
1840 | { |
1842 | min_it (rc[i].col, ncol - 1); |
1841 | min_it (rc[i].col, ncol - 1); |
1843 | min_it (rc[i].row, nrow - 1); |
1842 | min_it (rc[i].row, nrow - 1); |
1844 | } |
1843 | } |
1845 | // TODO: this line somehow causes segfault if scr_expose() is called just after resize |
1844 | |
1846 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1845 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1847 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1846 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1848 | |
1847 | |
1849 | num_scr_allow = 0; |
1848 | num_scr_allow = 0; |
1850 | |
1849 | |
… | |
… | |
1941 | |
1940 | |
1942 | bell_ev.start (VISUAL_BELL_DURATION); |
1941 | bell_ev.start (VISUAL_BELL_DURATION); |
1943 | } |
1942 | } |
1944 | else |
1943 | else |
1945 | XBell (dpy, 0); |
1944 | XBell (dpy, 0); |
|
|
1945 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1946 | #endif |
1946 | #endif |
1947 | } |
1947 | } |
1948 | |
1948 | |
1949 | /* ------------------------------------------------------------------------- */ |
1949 | /* ------------------------------------------------------------------------- */ |
1950 | /* ARGSUSED */ |
1950 | /* ARGSUSED */ |
… | |
… | |
1969 | row_start = view_start; |
1969 | row_start = view_start; |
1970 | } |
1970 | } |
1971 | |
1971 | |
1972 | wctomb (0, 0); |
1972 | wctomb (0, 0); |
1973 | |
1973 | |
1974 | for (int r1 = 0; r1 < nrows; r1++) |
1974 | for (int r1 = row_start; r1 < row_start + nrows; r1++) |
1975 | { |
1975 | { |
1976 | text_t *tp = ROW(r1).t; |
1976 | text_t *tp = ROW(r1).t; |
1977 | int len = ROW(r1).l; |
1977 | int len = ROW(r1).l; |
1978 | |
1978 | |
1979 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
1979 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
… | |
… | |
2090 | ccol2 = bgcolor_of (rstyle); |
2090 | ccol2 = bgcolor_of (rstyle); |
2091 | #else |
2091 | #else |
2092 | ccol2 = Color_bg; |
2092 | ccol2 = Color_bg; |
2093 | #endif |
2093 | #endif |
2094 | |
2094 | |
2095 | if (showcursor && focus) |
2095 | if (focus) |
2096 | { |
2096 | { |
2097 | if (option (Opt_cursorUnderline)) |
2097 | if (option (Opt_cursorUnderline)) |
2098 | *crp ^= RS_Uline; |
2098 | *crp ^= RS_Uline; |
2099 | else |
2099 | else |
2100 | { |
2100 | { |
… | |
… | |
2236 | |
2236 | |
2237 | // seek to the beginning of wide characters |
2237 | // seek to the beginning of wide characters |
2238 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2238 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2239 | --col; |
2239 | --col; |
2240 | |
2240 | |
2241 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2241 | rend_t rend = srp[col]; /* screen rendition (target rendition) */ |
2242 | text_t *text = stp + col; |
2242 | text_t *text = stp + col; |
2243 | int count = 1; |
2243 | int count = 1; |
2244 | |
2244 | |
2245 | dtp[col] = stp[col]; |
2245 | dtp[col] = stp[col]; |
2246 | drp[col] = rend; |
2246 | drp[col] = rend; |
… | |
… | |
2250 | for (i = 0; ++col < ncol; ) |
2250 | for (i = 0; ++col < ncol; ) |
2251 | { |
2251 | { |
2252 | if (stp[col] == NOCHAR) |
2252 | if (stp[col] == NOCHAR) |
2253 | { |
2253 | { |
2254 | dtp[col] = stp[col]; |
2254 | dtp[col] = stp[col]; |
2255 | drp[col] = rend; |
2255 | drp[col] = srp[col]; |
|
|
2256 | |
2256 | count++; |
2257 | count++; |
2257 | i++; |
2258 | i++; |
2258 | |
2259 | |
2259 | continue; |
2260 | continue; |
2260 | } |
2261 | } |
… | |
… | |
2290 | */ |
2291 | */ |
2291 | int fore = fgcolor_of (rend); // desired foreground |
2292 | int fore = fgcolor_of (rend); // desired foreground |
2292 | int back = bgcolor_of (rend); // desired background |
2293 | int back = bgcolor_of (rend); // desired background |
2293 | |
2294 | |
2294 | // only do special processing if any attributes are set, which is unlikely |
2295 | // only do special processing if any attributes are set, which is unlikely |
2295 | if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) |
2296 | if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) |
2296 | { |
2297 | { |
2297 | bool invert = rend & RS_RVid; |
2298 | bool invert = rend & RS_RVid; |
2298 | |
2299 | |
2299 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2300 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2300 | if (rend & RS_Bold && fore == Color_fg) |
2301 | if (rend & RS_Bold && fore == Color_fg) |
… | |
… | |
2319 | |
2320 | |
2320 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2321 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2321 | fore = Color_UL; |
2322 | fore = Color_UL; |
2322 | #endif |
2323 | #endif |
2323 | |
2324 | |
|
|
2325 | #ifdef OPTION_HC |
|
|
2326 | if (rend & RS_Sel) |
|
|
2327 | { |
|
|
2328 | /* invert the column if no highlightColor is set or it is the |
|
|
2329 | * current cursor column */ |
|
|
2330 | if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2331 | && ISSET_PIXCOLOR (Color_HC)) |
|
|
2332 | { |
|
|
2333 | if (ISSET_PIXCOLOR (Color_HTC)) |
|
|
2334 | fore = Color_HTC; |
|
|
2335 | // if invert is 0 reverse video is set so we use bg color as fg color |
|
|
2336 | else if (!invert) |
|
|
2337 | fore = back; |
|
|
2338 | |
|
|
2339 | back = Color_HC; |
|
|
2340 | invert = 0; |
|
|
2341 | } |
|
|
2342 | } |
|
|
2343 | #endif |
|
|
2344 | |
2324 | if (invert) |
2345 | if (invert) |
2325 | { |
2346 | { |
2326 | #ifdef OPTION_HC |
|
|
2327 | if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2328 | || !ISSET_PIXCOLOR (Color_HC)) |
|
|
2329 | #endif |
|
|
2330 | /* invert the column if no highlightColor is set or it is the |
|
|
2331 | * current cursor column */ |
|
|
2332 | ::swap (fore, back); |
2347 | ::swap (fore, back); |
2333 | #ifdef OPTION_HC |
|
|
2334 | else if (ISSET_PIXCOLOR (Color_HC)) |
|
|
2335 | back = Color_HC; |
|
|
2336 | #endif |
|
|
2337 | |
2348 | |
2338 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2349 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2339 | # ifndef OPTION_HC |
|
|
2340 | if (ISSET_PIXCOLOR (Color_RV)) |
|
|
2341 | back = Color_RV; |
|
|
2342 | # endif |
|
|
2343 | if (fore == back) |
2350 | if (fore == back) |
2344 | { |
2351 | { |
2345 | fore = Color_bg; |
2352 | fore = Color_bg; |
2346 | back = Color_fg; |
2353 | back = Color_fg; |
2347 | } |
2354 | } |
… | |
… | |
2600 | { |
2607 | { |
2601 | #if !ENABLE_MINIMAL |
2608 | #if !ENABLE_MINIMAL |
2602 | if (selection.rect) |
2609 | if (selection.rect) |
2603 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2610 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2604 | selection.end.row, selection.end.col, |
2611 | selection.end.row, selection.end.col, |
2605 | RS_RVid, RS_RVid | RS_Uline); |
2612 | RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline); |
2606 | else |
2613 | else |
2607 | #endif |
2614 | #endif |
2608 | scr_xor_span (selection.beg.row, selection.beg.col, |
2615 | scr_xor_span (selection.beg.row, selection.beg.col, |
2609 | selection.end.row, selection.end.col, |
2616 | selection.end.row, selection.end.col, |
2610 | RS_RVid); |
2617 | RS_Sel | RS_RVid); |
2611 | } |
2618 | } |
2612 | } |
2619 | } |
2613 | |
2620 | |
2614 | /* ------------------------------------------------------------------------- */ |
2621 | /* ------------------------------------------------------------------------- */ |
2615 | /* |
2622 | /* |
… | |
… | |
2620 | void |
2627 | void |
2621 | rxvt_term::scr_dump (int fd) NOTHROW |
2628 | rxvt_term::scr_dump (int fd) NOTHROW |
2622 | { |
2629 | { |
2623 | int row, wrote; |
2630 | int row, wrote; |
2624 | unsigned int width, towrite; |
2631 | unsigned int width, towrite; |
2625 | char r1[] = "\n"; |
2632 | const char r1[] = "\n"; |
2626 | |
2633 | |
2627 | for (row = saveLines + top_row; |
2634 | for (row = saveLines + top_row; |
2628 | row < saveLines + nrow - 1; row++) |
2635 | row < saveLines + nrow - 1; row++) |
2629 | { |
2636 | { |
2630 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2637 | width = row_buf[row].l >= 0 ? row_buf[row].l |
… | |
… | |
2676 | /* ------------------------------------------------------------------------- */ |
2683 | /* ------------------------------------------------------------------------- */ |
2677 | /* |
2684 | /* |
2678 | * Paste a selection direct to the command fd |
2685 | * Paste a selection direct to the command fd |
2679 | */ |
2686 | */ |
2680 | void |
2687 | void |
2681 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2688 | rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW |
2682 | { |
2689 | { |
2683 | /* convert normal newline chars into common keyboard Return key sequence */ |
2690 | /* convert normal newline chars into common keyboard Return key sequence */ |
2684 | for (unsigned int i = 0; i < len; i++) |
2691 | for (unsigned int i = 0; i < len; i++) |
2685 | if (data[i] == C0_LF) |
2692 | if (data[i] == C0_LF) |
2686 | data[i] = C0_CR; |
2693 | data[i] = C0_CR; |
… | |
… | |
2690 | |
2697 | |
2691 | tt_write (data, len); |
2698 | tt_write (data, len); |
2692 | |
2699 | |
2693 | if (priv_modes & PrivMode_BracketPaste) |
2700 | if (priv_modes & PrivMode_BracketPaste) |
2694 | tt_printf ("\e[201~"); |
2701 | tt_printf ("\e[201~"); |
|
|
2702 | } |
|
|
2703 | |
|
|
2704 | void |
|
|
2705 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
|
|
2706 | { |
|
|
2707 | if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END))) |
|
|
2708 | return; |
|
|
2709 | |
|
|
2710 | tt_paste (data, len); |
2695 | } |
2711 | } |
2696 | |
2712 | |
2697 | /* ------------------------------------------------------------------------- */ |
2713 | /* ------------------------------------------------------------------------- */ |
2698 | /* |
2714 | /* |
2699 | * Respond to a notification that a primary selection has been sent |
2715 | * Respond to a notification that a primary selection has been sent |
… | |
… | |
2908 | selection_wait = Sel_normal; |
2924 | selection_wait = Sel_normal; |
2909 | |
2925 | |
2910 | #if X_HAVE_UTF8_STRING |
2926 | #if X_HAVE_UTF8_STRING |
2911 | selection_type = Sel_UTF8String; |
2927 | selection_type = Sel_UTF8String; |
2912 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
2928 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
2913 | return; |
2929 | return; |
2914 | #else |
2930 | #else |
2915 | selection_type = Sel_CompoundText; |
2931 | selection_type = Sel_CompoundText; |
2916 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
2932 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
2917 | return; |
2933 | return; |
2918 | #endif |
2934 | #endif |
2919 | } |
2935 | } |
2920 | |
2936 | |
2921 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2937 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2922 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
2938 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
… | |
… | |
2950 | /* |
2966 | /* |
2951 | * Clear all selected text |
2967 | * Clear all selected text |
2952 | * EXT: SelectionClear |
2968 | * EXT: SelectionClear |
2953 | */ |
2969 | */ |
2954 | void |
2970 | void |
2955 | rxvt_term::selection_clear () NOTHROW |
2971 | rxvt_term::selection_clear (bool clipboard) NOTHROW |
2956 | { |
2972 | { |
|
|
2973 | if (!clipboard) |
|
|
2974 | { |
2957 | want_refresh = 1; |
2975 | want_refresh = 1; |
2958 | free (selection.text); |
2976 | free (selection.text); |
2959 | selection.text = NULL; |
2977 | selection.text = NULL; |
2960 | selection.len = 0; |
2978 | selection.len = 0; |
2961 | CLEAR_SELECTION (); |
2979 | CLEAR_SELECTION (); |
2962 | |
2980 | |
2963 | if (display->selection_owner == this) |
2981 | if (display->selection_owner == this) |
2964 | display->selection_owner = 0; |
2982 | display->selection_owner = 0; |
|
|
2983 | } |
|
|
2984 | else |
|
|
2985 | { |
|
|
2986 | free (selection.clip_text); |
|
|
2987 | selection.clip_text = NULL; |
|
|
2988 | selection.clip_len = 0; |
|
|
2989 | |
|
|
2990 | if (display->clipboard_owner == this) |
|
|
2991 | display->clipboard_owner = 0; |
|
|
2992 | } |
2965 | } |
2993 | } |
2966 | |
2994 | |
2967 | /* ------------------------------------------------------------------------- */ |
2995 | /* ------------------------------------------------------------------------- */ |
2968 | /* |
2996 | /* |
2969 | * Copy a selection into the cut buffer |
2997 | * Copy a selection into the cut buffer |
2970 | * EXT: button 1 or 3 release |
2998 | * EXT: button 1 or 3 release |
2971 | */ |
2999 | */ |
2972 | void |
3000 | void |
2973 | rxvt_term::selection_make (Time tm) |
3001 | rxvt_term::selection_make (Time tm) |
2974 | { |
3002 | { |
2975 | int i; |
3003 | int size; |
2976 | wchar_t *new_selection_text; |
3004 | wchar_t *new_selection_text; |
2977 | text_t *t; |
3005 | text_t *t; |
2978 | |
3006 | |
2979 | switch (selection.op) |
3007 | switch (selection.op) |
2980 | { |
3008 | { |
… | |
… | |
2996 | return; /* nothing selected, go away */ |
3024 | return; /* nothing selected, go away */ |
2997 | |
3025 | |
2998 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
3026 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
2999 | return; |
3027 | return; |
3000 | |
3028 | |
3001 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
3029 | size = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
3002 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
3030 | new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t)); |
3003 | |
3031 | |
3004 | int ofs = 0; |
3032 | int ofs = 0; |
3005 | int extra = 0; |
3033 | int extra = 0; |
3006 | |
3034 | |
3007 | int col = selection.beg.col; |
3035 | int col = selection.beg.col; |
… | |
… | |
3013 | { |
3041 | { |
3014 | #if !ENABLE_MINIMAL |
3042 | #if !ENABLE_MINIMAL |
3015 | if (selection.rect) |
3043 | if (selection.rect) |
3016 | { |
3044 | { |
3017 | col = selection.beg.col; |
3045 | col = selection.beg.col; |
3018 | end_col = ncol + 1; |
3046 | end_col = selection.end.col; |
3019 | } |
3047 | } |
3020 | else |
3048 | else |
3021 | #endif |
3049 | #endif |
3022 | end_col = ROW(row).l; |
3050 | end_col = ROW(row).l; |
3023 | |
3051 | |
3024 | col = max (col, 0); |
3052 | col = max (col, 0); |
3025 | |
3053 | |
3026 | if (row == selection.end.row |
3054 | if (row == selection.end.row) |
3027 | #if !ENABLE_MINIMAL |
|
|
3028 | || selection.rect |
|
|
3029 | #endif |
|
|
3030 | ) |
|
|
3031 | min_it (end_col, selection.end.col); |
3055 | min_it (end_col, selection.end.col); |
3032 | |
3056 | |
3033 | t = ROW(row).t + col; |
3057 | t = ROW(row).t + col; |
3034 | |
3058 | |
3035 | for (; col < end_col; col++) |
3059 | for (; col < end_col; col++) |
… | |
… | |
3043 | |
3067 | |
3044 | extra -= (len - 1); |
3068 | extra -= (len - 1); |
3045 | |
3069 | |
3046 | if (extra < 0) |
3070 | if (extra < 0) |
3047 | { |
3071 | { |
3048 | extra += i; |
3072 | extra += size; |
3049 | i += i; |
3073 | size += size; |
3050 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); |
3074 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t)); |
3051 | } |
3075 | } |
3052 | |
3076 | |
3053 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
3077 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
3054 | } |
3078 | } |
3055 | #endif |
3079 | #endif |
… | |
… | |
3067 | |
3091 | |
3068 | new_selection_text[ofs++] = C0_LF; |
3092 | new_selection_text[ofs++] = C0_LF; |
3069 | } |
3093 | } |
3070 | else |
3094 | else |
3071 | #endif |
3095 | #endif |
3072 | if (!ROW(row).is_longer () && row != selection.end.row) |
3096 | if (!ROW(row).is_longer () && row != selection.end.row |
|
|
3097 | && (row != selection.beg.row || selection.beg.col < ncol)) |
3073 | new_selection_text[ofs++] = C0_LF; |
3098 | new_selection_text[ofs++] = C0_LF; |
3074 | } |
3099 | } |
3075 | |
3100 | |
3076 | if (end_col != selection.end.col) |
3101 | if (end_col != selection.end.col) |
3077 | new_selection_text[ofs++] = C0_LF; |
3102 | new_selection_text[ofs++] = C0_LF; |
… | |
… | |
3095 | |
3120 | |
3096 | selection_grab (tm); |
3121 | selection_grab (tm); |
3097 | } |
3122 | } |
3098 | |
3123 | |
3099 | bool |
3124 | bool |
3100 | rxvt_term::selection_grab (Time tm) NOTHROW |
3125 | rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW |
3101 | { |
3126 | { |
|
|
3127 | Atom sel; |
|
|
3128 | |
|
|
3129 | if (!clipboard) |
|
|
3130 | { |
3102 | selection_time = tm; |
3131 | selection_time = tm; |
|
|
3132 | sel = XA_PRIMARY; |
|
|
3133 | } |
|
|
3134 | else |
|
|
3135 | { |
|
|
3136 | clipboard_time = tm; |
|
|
3137 | sel = xa[XA_CLIPBOARD]; |
|
|
3138 | } |
3103 | |
3139 | |
3104 | XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); |
3140 | XSetSelectionOwner (dpy, sel, vt, tm); |
3105 | if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) |
3141 | if (XGetSelectionOwner (dpy, sel) == vt) |
3106 | { |
3142 | { |
3107 | display->set_selection_owner (this); |
3143 | display->set_selection_owner (this, clipboard); |
3108 | return true; |
3144 | return true; |
3109 | } |
3145 | } |
3110 | else |
3146 | else |
3111 | { |
3147 | { |
3112 | selection_clear (); |
3148 | selection_clear (clipboard); |
3113 | return false; |
3149 | return false; |
3114 | } |
3150 | } |
3115 | |
3151 | |
3116 | #if 0 |
3152 | #if 0 |
3117 | XTextProperty ct; |
3153 | XTextProperty ct; |
… | |
… | |
3612 | else if (rq.target == xa[XA_MULTIPLE]) |
3648 | else if (rq.target == xa[XA_MULTIPLE]) |
3613 | { |
3649 | { |
3614 | /* TODO: Handle MULTIPLE */ |
3650 | /* TODO: Handle MULTIPLE */ |
3615 | } |
3651 | } |
3616 | #endif |
3652 | #endif |
3617 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3653 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) |
3618 | { |
3654 | { |
3619 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3655 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3620 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3656 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
|
|
3657 | ev.property = rq.property; |
|
|
3658 | } |
|
|
3659 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3660 | { |
|
|
3661 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
|
|
3662 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
3621 | ev.property = rq.property; |
3663 | ev.property = rq.property; |
3622 | } |
3664 | } |
3623 | else if (rq.target == XA_STRING |
3665 | else if (rq.target == XA_STRING |
3624 | || rq.target == xa[XA_TEXT] |
3666 | || rq.target == xa[XA_TEXT] |
3625 | || rq.target == xa[XA_COMPOUND_TEXT] |
3667 | || rq.target == xa[XA_COMPOUND_TEXT] |
… | |
… | |
3658 | { |
3700 | { |
3659 | target = xa[XA_COMPOUND_TEXT]; |
3701 | target = xa[XA_COMPOUND_TEXT]; |
3660 | style = enc_compound_text; |
3702 | style = enc_compound_text; |
3661 | } |
3703 | } |
3662 | |
3704 | |
3663 | if (selection.text) |
3705 | if (rq.selection == XA_PRIMARY && selection.text) |
3664 | { |
3706 | { |
3665 | cl = selection.text; |
3707 | cl = selection.text; |
3666 | selectlen = selection.len; |
3708 | selectlen = selection.len; |
|
|
3709 | } |
|
|
3710 | else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3711 | { |
|
|
3712 | cl = selection.clip_text; |
|
|
3713 | selectlen = selection.clip_len; |
3667 | } |
3714 | } |
3668 | else |
3715 | else |
3669 | { |
3716 | { |
3670 | cl = L""; |
3717 | cl = L""; |
3671 | selectlen = 0; |
3718 | selectlen = 0; |