… | |
… | |
24 | * This file handles _all_ screen updates and selections |
24 | * This file handles _all_ screen updates and selections |
25 | */ |
25 | */ |
26 | |
26 | |
27 | #include "../config.h" /* NECESSARY */ |
27 | #include "../config.h" /* NECESSARY */ |
28 | #include "rxvt.h" /* NECESSARY */ |
28 | #include "rxvt.h" /* NECESSARY */ |
|
|
29 | #include "rxvtperl.h" /* NECESSARY */ |
29 | |
30 | |
30 | #include <X11/Xmd.h> /* get the typedef for CARD32 */ |
31 | #include <X11/Xmd.h> /* get the typedef for CARD32 */ |
31 | |
32 | |
32 | #include <inttypes.h> |
33 | #include <inttypes.h> |
33 | |
34 | |
… | |
… | |
46 | |
47 | |
47 | /* ------------------------------------------------------------------------- * |
48 | /* ------------------------------------------------------------------------- * |
48 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
49 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
49 | * ------------------------------------------------------------------------- */ |
50 | * ------------------------------------------------------------------------- */ |
50 | #define ZERO_SCROLLBACK() \ |
51 | #define ZERO_SCROLLBACK() \ |
51 | if (options & Opt_scrollTtyOutput) \ |
52 | if (OPTION (Opt_scrollTtyOutput)) \ |
52 | view_start = 0 |
53 | view_start = 0 |
53 | #define CLEAR_SELECTION() \ |
54 | #define CLEAR_SELECTION() \ |
54 | selection.beg.row = selection.beg.col \ |
55 | selection.beg.row = selection.beg.col \ |
55 | = selection.end.row = selection.end.col = 0 |
56 | = selection.end.row = selection.end.col = 0 |
56 | #define CLEAR_ALL_SELECTION() \ |
57 | #define CLEAR_ALL_SELECTION() \ |
… | |
… | |
351 | lofs += len; |
352 | lofs += len; |
352 | qcol += len; |
353 | qcol += len; |
353 | } |
354 | } |
354 | } |
355 | } |
355 | |
356 | |
356 | qline->l = llen < ncol ? llen : MOD (llen - 1, ncol) + 1; |
357 | qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0; |
|
|
358 | #ifdef DEBUG_STRICT //TODO//FIXME//TEMPORARY |
|
|
359 | if (qline->l < 0) |
|
|
360 | { |
|
|
361 | fprintf (stderr, "ERROR, PLEASE REPORT to rxvt-unicode@plan9.de: qline->l %d = llen %d < ncol %d ? %d : MOD %d\n", qline->l,llen,ncol,llen,MOD (llen - 1, ncol) + 1);//D |
|
|
362 | qline->l = 0; |
|
|
363 | } |
|
|
364 | #endif |
357 | scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); |
365 | scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); |
358 | } |
366 | } |
359 | while (p != pend && q > 0); |
367 | while (p != pend && q > 0); |
360 | |
368 | |
361 | term_start = total_rows - nrow; |
369 | term_start = total_rows - nrow; |
… | |
… | |
410 | |
418 | |
411 | for (int col = ncol; col--; ) |
419 | for (int col = ncol; col--; ) |
412 | tabs [col] = col % TABSIZE == 0; |
420 | tabs [col] = col % TABSIZE == 0; |
413 | |
421 | |
414 | tt_winch (); |
422 | tt_winch (); |
|
|
423 | |
|
|
424 | PERL_INVOKE ((this, HOOK_RESET, DT_END)); |
415 | } |
425 | } |
416 | |
426 | |
417 | /* ------------------------------------------------------------------------- */ |
427 | /* ------------------------------------------------------------------------- */ |
418 | /* |
428 | /* |
419 | * Free everything. That way malloc debugging can find leakage. |
429 | * Free everything. That way malloc debugging can find leakage. |
… | |
… | |
523 | |
533 | |
524 | screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); |
534 | screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); |
525 | screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); |
535 | screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); |
526 | |
536 | |
527 | #if NSCREENS |
537 | #if NSCREENS |
528 | if (options & Opt_secondaryScreen) |
538 | if (OPTION (Opt_secondaryScreen)) |
529 | { |
539 | { |
530 | num_scr = 0; |
540 | num_scr = 0; |
531 | |
541 | |
532 | for (int i = prev_nrow; i--; ) |
542 | for (int i = prev_nrow; i--; ) |
533 | ::swap (ROW(i), swap_buf [i]); |
543 | ::swap (ROW(i), swap_buf [i]); |
… | |
… | |
537 | screen.flags |= Screen_VisibleCursor; |
547 | screen.flags |= Screen_VisibleCursor; |
538 | swap.flags |= Screen_VisibleCursor; |
548 | swap.flags |= Screen_VisibleCursor; |
539 | } |
549 | } |
540 | else |
550 | else |
541 | #endif |
551 | #endif |
542 | if (options & Opt_secondaryScroll) |
552 | if (OPTION (Opt_secondaryScroll)) |
543 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
553 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
544 | |
554 | |
545 | return scrn; |
555 | return scrn; |
546 | } |
556 | } |
547 | |
557 | |
… | |
… | |
609 | num_scr += count; |
619 | num_scr += count; |
610 | |
620 | |
611 | if (count > 0 |
621 | if (count > 0 |
612 | && row1 == 0 |
622 | && row1 == 0 |
613 | && row2 == nrow - 1 |
623 | && row2 == nrow - 1 |
614 | && (current_screen == PRIMARY || options & Opt_secondaryScroll)) |
624 | && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) |
615 | { |
625 | { |
616 | nsaved = min (nsaved + count, saveLines); |
626 | nsaved = min (nsaved + count, saveLines); |
|
|
627 | |
|
|
628 | PERL_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END)); |
|
|
629 | |
617 | term_start = (term_start + count) % total_rows; |
630 | term_start = (term_start + count) % total_rows; |
618 | |
631 | |
619 | if (selection.op && current_screen == selection.screen) |
632 | if (selection.op && current_screen == selection.screen) |
620 | { |
633 | { |
621 | selection.beg.row -= count; |
634 | selection.beg.row -= count; |
622 | selection.end.row -= count; |
635 | selection.end.row -= count; |
623 | selection.mark.row -= count; |
636 | selection.mark.row -= count; |
624 | |
637 | |
625 | selection_check (0); |
638 | if (selection.beg.row < -nsaved |
|
|
639 | || selection.end.row < -nsaved |
|
|
640 | || selection.mark.row < -nsaved) |
|
|
641 | { |
|
|
642 | CLEAR_ALL_SELECTION (); |
|
|
643 | selection.op = SELECTION_CLEAR; |
|
|
644 | } |
626 | } |
645 | } |
627 | |
646 | |
628 | for (int i = count; i--; ) |
647 | for (int i = count; i--; ) |
|
|
648 | { |
|
|
649 | ROW(row2 - i).l = 0; |
629 | scr_blank_screen_mem (ROW(row2 - i), rstyle); |
650 | scr_blank_screen_mem (ROW(row2 - i), rstyle); |
|
|
651 | } |
630 | |
652 | |
631 | if ((options & Opt_scrollWithBuffer) |
653 | if (OPTION (Opt_scrollWithBuffer) |
632 | && view_start != 0 |
654 | && view_start != 0 |
633 | && view_start != saveLines) |
655 | && view_start != saveLines) |
634 | scr_page (UP, count); |
656 | scr_page (UP, count); |
635 | } |
657 | } |
636 | else |
658 | else |
637 | { |
659 | { |
638 | if (selection.op && current_screen == selection.screen) |
660 | if (selection.op && current_screen == selection.screen) |
639 | { |
661 | { |
640 | int i = selection.beg.row; |
662 | if ((selection.beg.row < row1 && selection.end.row > row1) |
641 | int j = selection.end.row; |
663 | || (selection.beg.row < row2 && selection.end.row > row2) |
642 | |
|
|
643 | if ((i < row1 && j > row1) |
|
|
644 | || (i < row2 && j > row2) |
|
|
645 | || (i - count < row1 && i >= row1) |
664 | || (selection.beg.row - count < row1 && selection.beg.row >= row1) |
646 | || (i - count > row2 && i <= row2) |
665 | || (selection.beg.row - count > row2 && selection.beg.row <= row2) |
647 | || (j - count < row1 && j >= row1) |
666 | || (selection.end.row - count < row1 && selection.end.row >= row1) |
648 | || (j - count > row2 && j <= row2)) |
667 | || (selection.end.row - count > row2 && selection.end.row <= row2)) |
649 | { |
668 | { |
650 | CLEAR_ALL_SELECTION (); |
669 | CLEAR_ALL_SELECTION (); |
651 | selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ |
670 | selection.op = SELECTION_CLEAR; |
652 | } |
671 | } |
653 | else if (j >= row1 && j <= row2) |
672 | else if (selection.end.row >= row1 && selection.end.row <= row2) |
654 | { |
673 | { |
655 | /* move selected region too */ |
674 | /* move selected region too */ |
656 | selection.beg.row -= count; |
675 | selection.beg.row -= count; |
657 | selection.end.row -= count; |
676 | selection.end.row -= count; |
658 | selection.mark.row -= count; |
677 | selection.mark.row -= count; |
… | |
… | |
730 | { |
749 | { |
731 | c = *str++; |
750 | c = *str++; |
732 | |
751 | |
733 | if (c < 0x20) |
752 | if (c < 0x20) |
734 | if (c == C0_LF) |
753 | if (c == C0_LF) |
735 | { |
754 | { |
736 | if (!line->is_longer ()) /* XXX: think about this */ |
755 | if (!line->is_longer ()) /* XXX: think about this */ |
737 | max_it (line->l, screen.cur.col); |
756 | max_it (line->l, screen.cur.col); |
738 | |
757 | |
739 | screen.flags &= ~Screen_WrapNext; |
758 | screen.flags &= ~Screen_WrapNext; |
740 | |
759 | |
… | |
… | |
1005 | if (count) |
1024 | if (count) |
1006 | x = ncol - 1; |
1025 | x = ncol - 1; |
1007 | |
1026 | |
1008 | // store horizontal tab commands as characters inside the text |
1027 | // store horizontal tab commands as characters inside the text |
1009 | // buffer so they can be selected and pasted. |
1028 | // buffer so they can be selected and pasted. |
1010 | if (ht && options & Opt_pastableTabs) |
1029 | if (ht && OPTION (Opt_pastableTabs)) |
1011 | { |
1030 | { |
1012 | base_rend = SET_FONT (base_rend, 0); |
1031 | base_rend = SET_FONT (base_rend, 0); |
1013 | |
1032 | |
1014 | if (!l.is_longer ()) /* XXX: think about this */ |
1033 | if (!l.is_longer ()) /* XXX: think about this */ |
1015 | max_it (l.l, x); |
1034 | max_it (l.l, x); |
… | |
… | |
1271 | CLEAR_ROWS (row, num); |
1290 | CLEAR_ROWS (row, num); |
1272 | } |
1291 | } |
1273 | else |
1292 | else |
1274 | { |
1293 | { |
1275 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1294 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1276 | gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; |
1295 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1277 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1296 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1278 | ERASE_ROWS (row, num); |
1297 | ERASE_ROWS (row, num); |
1279 | gcvalue.foreground = pix_colors[Color_fg]; |
1298 | gcvalue.foreground = pix_colors[Color_fg]; |
1280 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1299 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1281 | } |
1300 | } |
1282 | |
1301 | |
1283 | for (; num--; row++) |
1302 | for (; num--; row++) |
1284 | { |
1303 | { |
|
|
1304 | ROW (row).l = 0; |
1285 | scr_blank_screen_mem (ROW (row), rstyle); |
1305 | scr_blank_screen_mem (ROW (row), rstyle); |
1286 | ROW (row).l = 0; |
|
|
1287 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1306 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1288 | } |
1307 | } |
1289 | } |
1308 | } |
1290 | |
1309 | |
1291 | #if ENABLE_FRILLS |
1310 | #if ENABLE_FRILLS |
… | |
… | |
1580 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1599 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1581 | #if XPM_BACKGROUND |
1600 | #if XPM_BACKGROUND |
1582 | if (bgPixmap.pixmap == None) |
1601 | if (bgPixmap.pixmap == None) |
1583 | #endif |
1602 | #endif |
1584 | #if TRANSPARENT |
1603 | #if TRANSPARENT |
1585 | if (! (options & Opt_transparent) || am_transparent == 0) |
1604 | if (! OPTION (Opt_transparent) || am_transparent == 0) |
1586 | #endif |
1605 | #endif |
1587 | XSetWindowBackground (display->display, vt, |
1606 | XSetWindowBackground (display->display, vt, |
1588 | pix_colors[Color_bg]); |
1607 | pix_colors[Color_bg]); |
1589 | |
1608 | |
1590 | gcvalue.foreground = pix_colors[Color_fg]; |
1609 | gcvalue.foreground = pix_colors[Color_fg]; |
… | |
… | |
1806 | } |
1825 | } |
1807 | |
1826 | |
1808 | int |
1827 | int |
1809 | rxvt_term::scr_changeview (unsigned int oldviewstart) |
1828 | rxvt_term::scr_changeview (unsigned int oldviewstart) |
1810 | { |
1829 | { |
|
|
1830 | PERL_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); |
|
|
1831 | |
1811 | if (view_start != oldviewstart) |
1832 | if (view_start != oldviewstart) |
1812 | { |
1833 | { |
1813 | want_refresh = 1; |
1834 | want_refresh = 1; |
1814 | num_scr -= (view_start - oldviewstart); |
1835 | num_scr -= (view_start - oldviewstart); |
1815 | } |
1836 | } |
… | |
… | |
1823 | { |
1844 | { |
1824 | #ifndef NO_BELL |
1845 | #ifndef NO_BELL |
1825 | |
1846 | |
1826 | # ifndef NO_MAPALERT |
1847 | # ifndef NO_MAPALERT |
1827 | # ifdef MAPALERT_OPTION |
1848 | # ifdef MAPALERT_OPTION |
1828 | if (options & Opt_mapAlert) |
1849 | if (OPTION (Opt_mapAlert)) |
1829 | # endif |
1850 | # endif |
1830 | XMapWindow (display->display, parent[0]); |
1851 | XMapWindow (display->display, parent[0]); |
1831 | # endif |
1852 | # endif |
1832 | |
1853 | |
1833 | if (options & Opt_visualBell) |
1854 | if (OPTION (Opt_visualBell)) |
1834 | { |
1855 | { |
1835 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1856 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1836 | rxvt_usleep (VISUAL_BELL_DURATION); |
1857 | rxvt_usleep (VISUAL_BELL_DURATION); |
1837 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1858 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1838 | } |
1859 | } |
… | |
… | |
1929 | |
1950 | |
1930 | #if XPM_BACKGROUND |
1951 | #if XPM_BACKGROUND |
1931 | must_clear |= bgPixmap.pixmap != None; |
1952 | must_clear |= bgPixmap.pixmap != None; |
1932 | #endif |
1953 | #endif |
1933 | #if TRANSPARENT |
1954 | #if TRANSPARENT |
1934 | must_clear |= (options & Opt_transparent) && am_transparent; |
1955 | must_clear |= OPTION (Opt_transparent) && am_transparent; |
1935 | #endif |
1956 | #endif |
1936 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
1957 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
1937 | |
1958 | |
1938 | /* |
1959 | /* |
1939 | * B: reverse any characters which are selected |
1960 | * B: reverse any characters which are selected |
… | |
… | |
1963 | |
1984 | |
1964 | crp = &ROW(screen.cur.row).r[col]; |
1985 | crp = &ROW(screen.cur.row).r[col]; |
1965 | |
1986 | |
1966 | if (showcursor && focus) |
1987 | if (showcursor && focus) |
1967 | { |
1988 | { |
1968 | if (options & Opt_cursorUnderline) |
1989 | if (OPTION (Opt_cursorUnderline)) |
1969 | *crp ^= RS_Uline; |
1990 | *crp ^= RS_Uline; |
1970 | else |
1991 | else |
1971 | { |
1992 | { |
1972 | *crp ^= RS_RVid; |
1993 | *crp ^= RS_RVid; |
1973 | |
1994 | |
… | |
… | |
1975 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
1996 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
1976 | if (ISSET_PIXCOLOR (Color_cursor)) |
1997 | if (ISSET_PIXCOLOR (Color_cursor)) |
1977 | ccol1 = Color_cursor; |
1998 | ccol1 = Color_cursor; |
1978 | else |
1999 | else |
1979 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2000 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
1980 | ccol1 = GET_FGCOLOR (rstyle); |
2001 | ccol1 = fgcolor_of (rstyle); |
1981 | #else |
2002 | #else |
1982 | ccol1 = Color_fg; |
2003 | ccol1 = Color_fg; |
1983 | #endif |
2004 | #endif |
1984 | if (ISSET_PIXCOLOR (Color_cursor2)) |
2005 | if (ISSET_PIXCOLOR (Color_cursor2)) |
1985 | ccol2 = Color_cursor2; |
2006 | ccol2 = Color_cursor2; |
1986 | else |
2007 | else |
1987 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2008 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
1988 | ccol2 = GET_BGCOLOR (rstyle); |
2009 | ccol2 = bgcolor_of (rstyle); |
1989 | #else |
2010 | #else |
1990 | ccol2 = Color_bg; |
2011 | ccol2 = Color_bg; |
1991 | #endif |
2012 | #endif |
1992 | *crp = SET_FGCOLOR (*crp, ccol1); |
2013 | *crp = SET_FGCOLOR (*crp, ccol1); |
1993 | *crp = SET_BGCOLOR (*crp, ccol2); |
2014 | *crp = SET_BGCOLOR (*crp, ccol2); |
… | |
… | |
2026 | oldcursor.col = screen.cur.col; |
2047 | oldcursor.col = screen.cur.col; |
2027 | } |
2048 | } |
2028 | } |
2049 | } |
2029 | } |
2050 | } |
2030 | |
2051 | |
|
|
2052 | PERL_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
2031 | #if ENABLE_OVERLAY |
2053 | #if ENABLE_OVERLAY |
2032 | scr_swap_overlay (); |
2054 | scr_swap_overlay (); |
2033 | #endif |
2055 | #endif |
2034 | |
2056 | |
2035 | #ifndef NO_SLOW_LINK_SUPPORT |
2057 | #ifndef NO_SLOW_LINK_SUPPORT |
… | |
… | |
2174 | count++, i--; |
2196 | count++, i--; |
2175 | |
2197 | |
2176 | /* |
2198 | /* |
2177 | * Determine the attributes for the string |
2199 | * Determine the attributes for the string |
2178 | */ |
2200 | */ |
2179 | int fore = GET_FGCOLOR (rend); // desired foreground |
2201 | int fore = fgcolor_of (rend); // desired foreground |
2180 | int back = GET_BGCOLOR (rend); // desired background |
2202 | int back = bgcolor_of (rend); // desired background |
2181 | |
2203 | |
2182 | // only do special processing if any attributes are set, which is rare |
2204 | // only do special processing if any attributes are set, which is unlikely |
2183 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2205 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2184 | { |
2206 | { |
2185 | #if ENABLE_STYLES |
2207 | #if ENABLE_STYLES |
2186 | // force redraw after "careful" characters to avoid pixel droppings |
2208 | // force redraw after "careful" characters to avoid pixel droppings |
2187 | if (srp[col] & RS_Careful && col < ncol - 1 && 0) |
2209 | if (srp[col] & RS_Careful && col < ncol - 1 && 0) |
… | |
… | |
2298 | } /* for (row....) */ |
2320 | } /* for (row....) */ |
2299 | |
2321 | |
2300 | #if ENABLE_OVERLAY |
2322 | #if ENABLE_OVERLAY |
2301 | scr_swap_overlay (); |
2323 | scr_swap_overlay (); |
2302 | #endif |
2324 | #endif |
|
|
2325 | PERL_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
2303 | |
2326 | |
2304 | /* |
2327 | /* |
2305 | * G: cleanup cursor and display outline cursor if necessary |
2328 | * G: cleanup cursor and display outline cursor if necessary |
2306 | */ |
2329 | */ |
2307 | if (showcursor) |
2330 | if (showcursor) |
2308 | { |
2331 | { |
2309 | if (focus) |
2332 | if (focus) |
2310 | { |
2333 | { |
2311 | if (options & Opt_cursorUnderline) |
2334 | if (OPTION (Opt_cursorUnderline)) |
2312 | *crp ^= RS_Uline; |
2335 | *crp ^= RS_Uline; |
2313 | else |
2336 | else |
2314 | { |
2337 | { |
2315 | *crp ^= RS_RVid; |
2338 | *crp ^= RS_RVid; |
2316 | #ifndef NO_CURSORCOLOR |
2339 | #ifndef NO_CURSORCOLOR |
… | |
… | |
2435 | |
2458 | |
2436 | #if ENABLE_FRILLS |
2459 | #if ENABLE_FRILLS |
2437 | if (selection.rect) |
2460 | if (selection.rect) |
2438 | { |
2461 | { |
2439 | for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) |
2462 | for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) |
|
|
2463 | { |
|
|
2464 | text_t *stp = ROW(row).t; |
|
|
2465 | rend_t *srp = ROW(row).r; |
|
|
2466 | |
2440 | for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) |
2467 | for (col = selection.beg.col; col < selection.end.col; col++) |
2441 | srp[col] ^= RS_RVid; |
2468 | srp[col] ^= RS_RVid; |
|
|
2469 | |
|
|
2470 | while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col]))) |
|
|
2471 | srp[col] ^= RS_RVid | RS_Uline; |
|
|
2472 | |
|
|
2473 | if (++col < selection.end.col) |
|
|
2474 | srp[col] ^= RS_RVid | RS_Uline; |
|
|
2475 | } |
2442 | } |
2476 | } |
2443 | else |
2477 | else |
2444 | #endif |
2478 | #endif |
2445 | { |
2479 | { |
2446 | if (selection.beg.row >= -view_start) |
2480 | if (selection.beg.row >= -view_start) |
… | |
… | |
2449 | row = selection.beg.row; |
2483 | row = selection.beg.row; |
2450 | } |
2484 | } |
2451 | else |
2485 | else |
2452 | { |
2486 | { |
2453 | col = 0; |
2487 | col = 0; |
2454 | row = view_start; |
2488 | row = -view_start; |
2455 | } |
2489 | } |
2456 | |
2490 | |
2457 | for (; row < min (selection.end.row, view_end); row++, col = 0) |
2491 | for (; row < min (selection.end.row, view_end); row++, col = 0) |
2458 | for (rend_t *srp = ROW(row).r; col < ncol; col++) |
2492 | for (rend_t *srp = ROW(row).r; col < ncol; col++) |
2459 | srp[col] ^= RS_RVid; |
2493 | srp[col] ^= RS_RVid; |
… | |
… | |
2848 | selection.op = SELECTION_DONE; |
2882 | selection.op = SELECTION_DONE; |
2849 | |
2883 | |
2850 | if (selection.clicks == 4) |
2884 | if (selection.clicks == 4) |
2851 | return; /* nothing selected, go away */ |
2885 | return; /* nothing selected, go away */ |
2852 | |
2886 | |
|
|
2887 | if (PERL_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
|
|
2888 | return; |
|
|
2889 | |
2853 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2890 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2854 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2891 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2855 | |
2892 | |
2856 | int ofs = 0; |
2893 | int ofs = 0; |
2857 | int extra = 0; |
2894 | int extra = 0; |
… | |
… | |
2873 | #endif |
2910 | #endif |
2874 | end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN |
2911 | end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN |
2875 | |
2912 | |
2876 | col = max (col, 0); |
2913 | col = max (col, 0); |
2877 | |
2914 | |
2878 | if (row == selection.end.row || selection.rect) |
2915 | if (row == selection.end.row |
|
|
2916 | #if ENABLE_FRILLS |
|
|
2917 | || selection.rect |
|
|
2918 | #endif |
|
|
2919 | ) |
2879 | end_col = min (end_col, selection.end.col); |
2920 | min_it (end_col, selection.end.col); |
2880 | |
2921 | |
2881 | t = ROW(row).t + col; |
2922 | t = ROW(row).t + col; |
2882 | for (; col < end_col; col++) |
2923 | for (; col < end_col; col++) |
2883 | { |
2924 | { |
2884 | if (*t == NOCHAR) |
2925 | if (*t == NOCHAR) |
… | |
… | |
2902 | #endif |
2943 | #endif |
2903 | else |
2944 | else |
2904 | new_selection_text[ofs++] = *t++; |
2945 | new_selection_text[ofs++] = *t++; |
2905 | } |
2946 | } |
2906 | |
2947 | |
|
|
2948 | #if ENABLE_FRILLS |
|
|
2949 | if (selection.rect) |
|
|
2950 | { |
|
|
2951 | while (ofs |
|
|
2952 | && new_selection_text[ofs - 1] != C0_LF |
|
|
2953 | && unicode::is_space (new_selection_text[ofs - 1])) |
|
|
2954 | --ofs; |
|
|
2955 | |
|
|
2956 | new_selection_text[ofs++] = C0_LF; |
|
|
2957 | } |
|
|
2958 | else |
|
|
2959 | #endif |
2907 | if (!ROW(row).is_longer () && row != selection.end.row) |
2960 | if (!ROW(row).is_longer () && row != selection.end.row) |
2908 | new_selection_text[ofs++] = C0_LF; |
2961 | new_selection_text[ofs++] = C0_LF; |
2909 | } |
2962 | } |
2910 | |
2963 | |
2911 | if (end_col != selection.end.col) |
2964 | if (end_col != selection.end.col) |
2912 | new_selection_text[ofs++] = C0_LF; |
2965 | new_selection_text[ofs++] = C0_LF; |
2913 | |
2966 | |
… | |
… | |
2923 | |
2976 | |
2924 | // we usually allocate much more than necessary, so realloc it smaller again |
2977 | // we usually allocate much more than necessary, so realloc it smaller again |
2925 | selection.len = ofs; |
2978 | selection.len = ofs; |
2926 | selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); |
2979 | selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); |
2927 | |
2980 | |
|
|
2981 | if (PERL_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END))) |
|
|
2982 | return; |
|
|
2983 | |
|
|
2984 | selection_grab (tm); |
|
|
2985 | } |
|
|
2986 | |
|
|
2987 | bool |
|
|
2988 | rxvt_term::selection_grab (Time tm) |
|
|
2989 | { |
|
|
2990 | selection_time = tm; |
|
|
2991 | |
2928 | XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); |
2992 | XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); |
2929 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) |
2993 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) |
|
|
2994 | { |
2930 | display->set_selection_owner (this); |
2995 | display->set_selection_owner (this); |
|
|
2996 | return true; |
|
|
2997 | } |
2931 | else |
2998 | else |
2932 | rxvt_warn ("can't get primary selection, ignoring.\n"); |
2999 | return false; |
2933 | |
3000 | |
2934 | #if 0 |
3001 | #if 0 |
2935 | XTextProperty ct; |
3002 | XTextProperty ct; |
2936 | |
3003 | |
2937 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
3004 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
2938 | { |
3005 | { |
2939 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3006 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
2940 | XFree (ct.value); |
3007 | XFree (ct.value); |
2941 | } |
3008 | } |
2942 | #endif |
3009 | #endif |
2943 | |
|
|
2944 | selection_time = tm; |
|
|
2945 | } |
3010 | } |
2946 | |
3011 | |
2947 | /* ------------------------------------------------------------------------- */ |
3012 | /* ------------------------------------------------------------------------- */ |
2948 | /* |
3013 | /* |
2949 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
3014 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
… | |
… | |
3264 | selection_delimit_word (DN, &selection.end, &selection.end); |
3329 | selection_delimit_word (DN, &selection.end, &selection.end); |
3265 | } |
3330 | } |
3266 | else if (selection.clicks == 3) |
3331 | else if (selection.clicks == 3) |
3267 | { |
3332 | { |
3268 | #if ENABLE_FRILLS |
3333 | #if ENABLE_FRILLS |
3269 | if (options & Opt_tripleclickwords) |
3334 | if (OPTION (Opt_tripleclickwords)) |
3270 | { |
3335 | { |
3271 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3336 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3272 | |
3337 | |
3273 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3338 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3274 | { |
3339 | { |
… | |
… | |
3335 | { |
3400 | { |
3336 | stp = ROW(end_row).t; |
3401 | stp = ROW(end_row).t; |
3337 | |
3402 | |
3338 | while (--end_col >= 0) |
3403 | while (--end_col >= 0) |
3339 | { |
3404 | { |
3340 | if (stp[end_col] != ' ' |
3405 | if (stp[end_col] != NOCHAR |
3341 | && stp[end_col] != '\t' |
3406 | && !unicode::is_space (stp[end_col])) |
3342 | && stp[end_col] != NOCHAR) |
|
|
3343 | break; |
3407 | break; |
3344 | } |
3408 | } |
3345 | |
3409 | |
3346 | if (end_col >= 0 |
3410 | if (end_col >= 0 |
3347 | || !ROW(end_row - 1).is_longer ()) |
3411 | || !ROW(end_row - 1).is_longer ()) |
… | |
… | |
3546 | |
3610 | |
3547 | #if ENABLE_OVERLAY |
3611 | #if ENABLE_OVERLAY |
3548 | void |
3612 | void |
3549 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) |
3613 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) |
3550 | { |
3614 | { |
3551 | if (nrow < 3 || ncol < 3) |
3615 | if (nrow < 1 || ncol < 1) |
3552 | return; |
3616 | return; |
3553 | |
3617 | |
3554 | want_refresh = 1; |
3618 | want_refresh = 1; |
3555 | |
3619 | |
3556 | scr_overlay_off (); |
3620 | scr_overlay_off (); |
… | |
… | |
3663 | for (int y = ov_h; y--; ) |
3727 | for (int y = ov_h; y--; ) |
3664 | { |
3728 | { |
3665 | text_t *t1 = ov_text[y]; |
3729 | text_t *t1 = ov_text[y]; |
3666 | rend_t *r1 = ov_rend[y]; |
3730 | rend_t *r1 = ov_rend[y]; |
3667 | |
3731 | |
3668 | text_t *t2 = ROW(y - view_start).t + ov_x; |
3732 | text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; |
3669 | rend_t *r2 = ROW(y - view_start).r + ov_x; |
3733 | rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; |
3670 | |
3734 | |
3671 | for (int x = ov_w; x--; ) |
3735 | for (int x = ov_w; x--; ) |
3672 | { |
3736 | { |
3673 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3737 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3674 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3738 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |