… | |
… | |
47 | |
47 | |
48 | /* ------------------------------------------------------------------------- * |
48 | /* ------------------------------------------------------------------------- * |
49 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
49 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
50 | * ------------------------------------------------------------------------- */ |
50 | * ------------------------------------------------------------------------- */ |
51 | #define ZERO_SCROLLBACK() \ |
51 | #define ZERO_SCROLLBACK() \ |
52 | if (OPTION (Opt_scrollTtyOutput)) \ |
52 | if (option (Opt_scrollTtyOutput)) \ |
53 | view_start = 0 |
53 | view_start = 0 |
54 | #define CLEAR_SELECTION() \ |
54 | #define CLEAR_SELECTION() \ |
55 | selection.beg.row = selection.beg.col \ |
55 | selection.beg.row = selection.beg.col \ |
56 | = selection.end.row = selection.end.col = 0 |
56 | = selection.end.row = selection.end.col = 0 |
57 | #define CLEAR_ALL_SELECTION() \ |
57 | #define CLEAR_ALL_SELECTION() \ |
… | |
… | |
409 | prev_nrow = nrow; |
409 | prev_nrow = nrow; |
410 | prev_ncol = ncol; |
410 | prev_ncol = ncol; |
411 | |
411 | |
412 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
412 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
413 | |
413 | |
414 | for (int col = ncol; col--; ) |
414 | for (int col = ncol; --col; ) |
415 | tabs [col] = col % TABSIZE == 0; |
415 | tabs [col] = col % TABSIZE == 0; |
416 | |
416 | |
417 | if (current_screen != PRIMARY) |
417 | if (current_screen != PRIMARY) |
418 | scr_swap_screen (); |
418 | scr_swap_screen (); |
419 | |
419 | |
… | |
… | |
510 | } |
510 | } |
511 | |
511 | |
512 | void |
512 | void |
513 | rxvt_term::scr_swap_screen () |
513 | rxvt_term::scr_swap_screen () |
514 | { |
514 | { |
515 | if (!OPTION (Opt_secondaryScreen)) |
515 | if (!option (Opt_secondaryScreen)) |
516 | return; |
516 | return; |
517 | |
517 | |
518 | for (int i = prev_nrow; i--; ) |
518 | for (int i = prev_nrow; i--; ) |
519 | ::swap (ROW(i), swap_buf [i]); |
519 | ::swap (ROW(i), swap_buf [i]); |
520 | |
520 | |
… | |
… | |
542 | selection_check (2); /* check for boundary cross */ |
542 | selection_check (2); /* check for boundary cross */ |
543 | |
543 | |
544 | int i = current_screen; current_screen = scrn; scrn = i; |
544 | int i = current_screen; current_screen = scrn; scrn = i; |
545 | |
545 | |
546 | #if NSCREENS |
546 | #if NSCREENS |
547 | if (OPTION (Opt_secondaryScreen)) |
547 | if (option (Opt_secondaryScreen)) |
548 | { |
548 | { |
549 | num_scr = 0; |
549 | num_scr = 0; |
550 | |
550 | |
551 | scr_swap_screen (); |
551 | scr_swap_screen (); |
552 | |
552 | |
… | |
… | |
555 | screen.flags |= Screen_VisibleCursor; |
555 | screen.flags |= Screen_VisibleCursor; |
556 | swap.flags |= Screen_VisibleCursor; |
556 | swap.flags |= Screen_VisibleCursor; |
557 | } |
557 | } |
558 | else |
558 | else |
559 | #endif |
559 | #endif |
560 | if (OPTION (Opt_secondaryScroll)) |
560 | if (option (Opt_secondaryScroll)) |
561 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
561 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
562 | } |
562 | } |
563 | |
563 | |
564 | // clear WrapNext indicator, solidifying position on next line |
564 | // clear WrapNext indicator, solidifying position on next line |
565 | void |
565 | void |
… | |
… | |
624 | want_refresh = 1; |
624 | want_refresh = 1; |
625 | num_scr += count; |
625 | num_scr += count; |
626 | |
626 | |
627 | if (count > 0 |
627 | if (count > 0 |
628 | && row1 == 0 |
628 | && row1 == 0 |
629 | && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) |
629 | && (current_screen == PRIMARY || option (Opt_secondaryScroll))) |
630 | { |
630 | { |
631 | top_row = max (top_row - count, -saveLines); |
631 | top_row = max (top_row - count, -saveLines); |
632 | |
632 | |
633 | // scroll everything up 'count' lines |
633 | // scroll everything up 'count' lines |
634 | term_start = (term_start + count) % total_rows; |
634 | term_start = (term_start + count) % total_rows; |
… | |
… | |
684 | selection.op = SELECTION_CLEAR; |
684 | selection.op = SELECTION_CLEAR; |
685 | } |
685 | } |
686 | } |
686 | } |
687 | |
687 | |
688 | // finally move the view window, if desired |
688 | // finally move the view window, if desired |
689 | if (OPTION (Opt_scrollWithBuffer) |
689 | if (option (Opt_scrollWithBuffer) |
690 | && view_start != 0 |
690 | && view_start != 0 |
691 | && view_start != -saveLines) |
691 | && view_start != -saveLines) |
692 | scr_page (UP, count); |
692 | scr_page (UP, count); |
693 | |
693 | |
694 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
694 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
… | |
… | |
1071 | if (count) |
1071 | if (count) |
1072 | x = ncol - 1; |
1072 | x = ncol - 1; |
1073 | |
1073 | |
1074 | // store horizontal tab commands as characters inside the text |
1074 | // store horizontal tab commands as characters inside the text |
1075 | // buffer so they can be selected and pasted. |
1075 | // buffer so they can be selected and pasted. |
1076 | if (ht && OPTION (Opt_pastableTabs)) |
1076 | if (ht && option (Opt_pastableTabs)) |
1077 | { |
1077 | { |
1078 | base_rend = SET_FONT (base_rend, 0); |
1078 | base_rend = SET_FONT (base_rend, 0); |
1079 | |
1079 | |
1080 | l.touch (x); |
1080 | l.touch (x); |
1081 | |
1081 | |
… | |
… | |
1648 | if (rvideo_state != on) |
1648 | if (rvideo_state != on) |
1649 | { |
1649 | { |
1650 | rvideo_state = on; |
1650 | rvideo_state = on; |
1651 | |
1651 | |
1652 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1652 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1653 | #if XPM_BACKGROUND |
1653 | #ifdef HAVE_BG_PIXMAP |
1654 | if (bgPixmap.pixmap == None) |
1654 | if (bgPixmap.pixmap == None) |
1655 | #endif |
1655 | #endif |
1656 | #if TRANSPARENT |
1656 | #if ENABLE_TRANSPARENCY |
1657 | if (!OPTION (Opt_transparent) || am_transparent == 0) |
1657 | if (!option (Opt_transparent) || am_transparent == 0) |
1658 | #endif |
1658 | #endif |
1659 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1659 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1660 | |
1660 | |
1661 | XGCValues gcvalue; |
1661 | XGCValues gcvalue; |
1662 | gcvalue.foreground = pix_colors[Color_fg]; |
1662 | gcvalue.foreground = pix_colors[Color_fg]; |
… | |
… | |
1886 | { |
1886 | { |
1887 | #ifndef NO_BELL |
1887 | #ifndef NO_BELL |
1888 | |
1888 | |
1889 | # ifndef NO_MAPALERT |
1889 | # ifndef NO_MAPALERT |
1890 | # ifdef MAPALERT_OPTION |
1890 | # ifdef MAPALERT_OPTION |
1891 | if (OPTION (Opt_mapAlert)) |
1891 | if (option (Opt_mapAlert)) |
1892 | # endif |
1892 | # endif |
1893 | XMapWindow (dpy, parent[0]); |
1893 | XMapWindow (dpy, parent[0]); |
1894 | # endif |
1894 | # endif |
|
|
1895 | # if ENABLE_FRILLS |
|
|
1896 | if (option (Opt_urgentOnBell)) |
|
|
1897 | { |
|
|
1898 | XWMHints *h; |
1895 | |
1899 | |
|
|
1900 | h = XGetWMHints(dpy, parent[0]); |
|
|
1901 | if (h != NULL) |
|
|
1902 | { |
|
|
1903 | h->flags |= XUrgencyHint; |
|
|
1904 | XSetWMHints(dpy, parent[0], h); |
|
|
1905 | } |
|
|
1906 | } |
|
|
1907 | # endif |
|
|
1908 | |
1896 | if (OPTION (Opt_visualBell)) |
1909 | if (option (Opt_visualBell)) |
1897 | { |
1910 | { |
1898 | rvideo_bell = true; |
1911 | rvideo_bell = true; |
1899 | scr_rvideo_mode (rvideo_mode); |
1912 | scr_rvideo_mode (rvideo_mode); |
1900 | display->flush (); |
1913 | display->flush (); |
1901 | |
1914 | |
… | |
… | |
1978 | int i; /* tmp */ |
1991 | int i; /* tmp */ |
1979 | #ifndef NO_CURSORCOLOR |
1992 | #ifndef NO_CURSORCOLOR |
1980 | rend_t cc1; /* store colours at cursor position (s) */ |
1993 | rend_t cc1; /* store colours at cursor position (s) */ |
1981 | #endif |
1994 | #endif |
1982 | rend_t *crp; // cursor rendition pointer |
1995 | rend_t *crp; // cursor rendition pointer |
|
|
1996 | rend_t ccol1, /* Cursor colour */ |
|
|
1997 | ccol2; /* Cursor colour2 */ |
1983 | |
1998 | |
1984 | want_refresh = 0; /* screen is current */ |
1999 | want_refresh = 0; /* screen is current */ |
1985 | |
2000 | |
1986 | if (refresh_type == NO_REFRESH || !mapped) |
2001 | if (refresh_type == NO_REFRESH || !mapped) |
1987 | return; |
2002 | return; |
… | |
… | |
1990 | * A: set up vars |
2005 | * A: set up vars |
1991 | */ |
2006 | */ |
1992 | have_bg = 0; |
2007 | have_bg = 0; |
1993 | refresh_count = 0; |
2008 | refresh_count = 0; |
1994 | |
2009 | |
1995 | #if XPM_BACKGROUND |
2010 | #ifdef HAVE_BG_PIXMAP |
1996 | have_bg |= bgPixmap.pixmap != None; |
2011 | have_bg |= bgPixmap.pixmap != None; |
1997 | #endif |
2012 | #endif |
1998 | #if TRANSPARENT |
2013 | #if ENABLE_TRANSPARENCY |
1999 | have_bg |= OPTION (Opt_transparent) && am_transparent; |
2014 | have_bg |= option (Opt_transparent) && am_transparent; |
2000 | #endif |
2015 | #endif |
2001 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2016 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2002 | |
2017 | |
2003 | /* |
2018 | /* |
2004 | * B: reverse any characters which are selected |
2019 | * B: reverse any characters which are selected |
… | |
… | |
2008 | /* |
2023 | /* |
2009 | * C: set the cursor character (s) |
2024 | * C: set the cursor character (s) |
2010 | */ |
2025 | */ |
2011 | { |
2026 | { |
2012 | unsigned char setoldcursor; |
2027 | unsigned char setoldcursor; |
2013 | rend_t ccol1, /* Cursor colour */ |
|
|
2014 | ccol2; /* Cursor colour2 */ |
|
|
2015 | |
2028 | |
2016 | showcursor = (screen.flags & Screen_VisibleCursor); |
2029 | showcursor = (screen.flags & Screen_VisibleCursor); |
2017 | #ifdef CURSOR_BLINK |
2030 | #ifdef CURSOR_BLINK |
2018 | if (hidden_cursor) |
2031 | if (hidden_cursor) |
2019 | showcursor = 0; |
2032 | showcursor = 0; |
… | |
… | |
2026 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2039 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2027 | col--; |
2040 | col--; |
2028 | |
2041 | |
2029 | crp = &ROW(screen.cur.row).r[col]; |
2042 | crp = &ROW(screen.cur.row).r[col]; |
2030 | |
2043 | |
|
|
2044 | #ifndef NO_CURSORCOLOR |
|
|
2045 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
|
|
2046 | if (ISSET_PIXCOLOR (Color_cursor)) |
|
|
2047 | ccol1 = Color_cursor; |
|
|
2048 | else |
|
|
2049 | #endif |
|
|
2050 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2051 | ccol1 = fgcolor_of (rstyle); |
|
|
2052 | #else |
|
|
2053 | ccol1 = Color_fg; |
|
|
2054 | #endif |
|
|
2055 | |
|
|
2056 | #ifndef NO_CURSORCOLOR |
|
|
2057 | if (ISSET_PIXCOLOR (Color_cursor2)) |
|
|
2058 | ccol2 = Color_cursor2; |
|
|
2059 | else |
|
|
2060 | #endif |
|
|
2061 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2062 | ccol2 = bgcolor_of (rstyle); |
|
|
2063 | #else |
|
|
2064 | ccol2 = Color_bg; |
|
|
2065 | #endif |
|
|
2066 | |
2031 | if (showcursor && focus) |
2067 | if (showcursor && focus) |
2032 | { |
2068 | { |
2033 | if (OPTION (Opt_cursorUnderline)) |
2069 | if (option (Opt_cursorUnderline)) |
2034 | *crp ^= RS_Uline; |
2070 | *crp ^= RS_Uline; |
2035 | else |
2071 | else |
2036 | { |
2072 | { |
2037 | *crp ^= RS_RVid; |
2073 | *crp ^= RS_RVid; |
2038 | |
|
|
2039 | #ifndef NO_CURSORCOLOR |
|
|
2040 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
|
|
2041 | if (ISSET_PIXCOLOR (Color_cursor)) |
|
|
2042 | ccol1 = Color_cursor; |
|
|
2043 | else |
|
|
2044 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2045 | ccol1 = fgcolor_of (rstyle); |
|
|
2046 | #else |
|
|
2047 | ccol1 = Color_fg; |
|
|
2048 | #endif |
|
|
2049 | if (ISSET_PIXCOLOR (Color_cursor2)) |
|
|
2050 | ccol2 = Color_cursor2; |
|
|
2051 | else |
|
|
2052 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2053 | ccol2 = bgcolor_of (rstyle); |
|
|
2054 | #else |
|
|
2055 | ccol2 = Color_bg; |
|
|
2056 | #endif |
|
|
2057 | *crp = SET_FGCOLOR (*crp, ccol1); |
2074 | *crp = SET_FGCOLOR (*crp, ccol1); |
2058 | *crp = SET_BGCOLOR (*crp, ccol2); |
2075 | *crp = SET_BGCOLOR (*crp, ccol2); |
2059 | #endif |
|
|
2060 | } |
2076 | } |
2061 | } |
2077 | } |
2062 | } |
2078 | } |
2063 | |
2079 | |
2064 | /* make sure no outline cursor is left around */ |
2080 | /* make sure no outline cursor is left around */ |
… | |
… | |
2253 | int back = bgcolor_of (rend); // desired background |
2269 | int back = bgcolor_of (rend); // desired background |
2254 | |
2270 | |
2255 | // only do special processing if any attributes are set, which is unlikely |
2271 | // only do special processing if any attributes are set, which is unlikely |
2256 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2272 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2257 | { |
2273 | { |
2258 | #if ENABLE_STYLES |
|
|
2259 | // "careful" (too wide) character handling |
|
|
2260 | |
|
|
2261 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2262 | while (text > stp |
|
|
2263 | && srp[text - stp - 1] & RS_Careful |
|
|
2264 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2265 | text--, count++, xpixel -= fwidth; |
|
|
2266 | |
|
|
2267 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2268 | for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) |
|
|
2269 | drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw; |
|
|
2270 | |
|
|
2271 | // force redraw before "careful" characters to avoid pixel droppings |
|
|
2272 | for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++) |
|
|
2273 | drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw; |
|
|
2274 | #endif |
|
|
2275 | |
|
|
2276 | bool invert = rend & RS_RVid; |
2274 | bool invert = rend & RS_RVid; |
2277 | |
2275 | |
2278 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2276 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2279 | if (rend & RS_Bold |
2277 | if (rend & RS_Bold |
2280 | && fore == Color_fg) |
2278 | && fore == Color_fg) |
… | |
… | |
2296 | else |
2294 | else |
2297 | invert = !invert; |
2295 | invert = !invert; |
2298 | # endif |
2296 | # endif |
2299 | } |
2297 | } |
2300 | |
2298 | |
2301 | if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) |
2299 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2302 | fore = Color_UL; |
2300 | fore = Color_UL; |
2303 | #endif |
2301 | #endif |
2304 | |
2302 | |
2305 | if (invert) |
2303 | if (invert) |
2306 | { |
2304 | { |
|
|
2305 | #ifdef OPTION_HC |
|
|
2306 | if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2307 | || !ISSET_PIXCOLOR (Color_HC)) |
|
|
2308 | #endif |
|
|
2309 | /* invert the column if no highlightColor is set or it is the |
|
|
2310 | * current cursor column */ |
2307 | ::swap (fore, back); |
2311 | ::swap (fore, back); |
|
|
2312 | #ifdef OPTION_HC |
|
|
2313 | else if (ISSET_PIXCOLOR (Color_HC)) |
|
|
2314 | back = Color_HC; |
|
|
2315 | #endif |
2308 | |
2316 | |
2309 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2317 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
|
|
2318 | # ifndef OPTION_HC |
2310 | if (ISSET_PIXCOLOR (Color_RV)) |
2319 | if (ISSET_PIXCOLOR (Color_RV)) |
2311 | back = Color_RV; |
2320 | back = Color_RV; |
2312 | |
2321 | # endif |
2313 | if (fore == back) |
2322 | if (fore == back) |
2314 | { |
2323 | { |
2315 | fore = Color_bg; |
2324 | fore = Color_bg; |
2316 | back = Color_fg; |
2325 | back = Color_fg; |
2317 | } |
2326 | } |
… | |
… | |
2328 | } |
2337 | } |
2329 | else if (hidden_text) |
2338 | else if (hidden_text) |
2330 | fore = back; |
2339 | fore = back; |
2331 | } |
2340 | } |
2332 | #endif |
2341 | #endif |
|
|
2342 | |
|
|
2343 | #if ENABLE_STYLES |
|
|
2344 | // "careful" (too wide) character handling |
|
|
2345 | |
|
|
2346 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2347 | while (text > stp |
|
|
2348 | && srp[text - stp - 1] & RS_Careful |
|
|
2349 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2350 | text--, count++, xpixel -= fwidth; |
|
|
2351 | |
|
|
2352 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2353 | for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) |
|
|
2354 | drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw; |
|
|
2355 | |
|
|
2356 | // force redraw before "careful" characters to avoid pixel droppings |
|
|
2357 | for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++) |
|
|
2358 | drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw; |
|
|
2359 | #endif |
2333 | } |
2360 | } |
2334 | |
2361 | |
2335 | /* |
2362 | /* |
2336 | * Actually do the drawing of the string here |
2363 | * Actually do the drawing of the string here |
2337 | */ |
2364 | */ |
2338 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2365 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2339 | |
2366 | |
2340 | if (back == fore) |
2367 | if (have_bg && back == Color_bg) |
2341 | font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back); |
|
|
2342 | else if (back == Color_bg && have_bg) |
|
|
2343 | { |
2368 | { |
2344 | // this is very ugly, maybe push it into ->draw? |
2369 | // this is very ugly, maybe push it into ->draw? |
2345 | |
2370 | |
2346 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2371 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2347 | if (text[i] != ' ') |
2372 | if (text[i] != ' ') |
2348 | { |
2373 | { |
2349 | font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); |
2374 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent); |
2350 | goto did_clear; |
2375 | goto did_clear; |
2351 | } |
2376 | } |
2352 | |
2377 | |
2353 | CLEAR_CHARS (xpixel, ypixel, count); |
2378 | CLEAR_CHARS (xpixel, ypixel, count); |
2354 | did_clear: ; |
2379 | did_clear: ; |
… | |
… | |
2382 | */ |
2407 | */ |
2383 | if (showcursor) |
2408 | if (showcursor) |
2384 | { |
2409 | { |
2385 | if (focus) |
2410 | if (focus) |
2386 | { |
2411 | { |
2387 | if (OPTION (Opt_cursorUnderline)) |
2412 | if (option (Opt_cursorUnderline)) |
2388 | *crp ^= RS_Uline; |
2413 | *crp ^= RS_Uline; |
2389 | else |
2414 | else |
2390 | { |
2415 | { |
2391 | *crp ^= RS_RVid; |
2416 | *crp ^= RS_RVid; |
2392 | #ifndef NO_CURSORCOLOR |
2417 | #ifndef NO_CURSORCOLOR |
… | |
… | |
2407 | cursorwidth++; |
2432 | cursorwidth++; |
2408 | |
2433 | |
2409 | #ifndef NO_CURSORCOLOR |
2434 | #ifndef NO_CURSORCOLOR |
2410 | if (ISSET_PIXCOLOR (Color_cursor)) |
2435 | if (ISSET_PIXCOLOR (Color_cursor)) |
2411 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
2436 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
|
|
2437 | else |
2412 | #endif |
2438 | #endif |
|
|
2439 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2413 | |
2440 | |
2414 | XDrawRectangle (dpy, drawBuffer, gc, |
2441 | XDrawRectangle (dpy, drawBuffer, gc, |
2415 | Col2Pixel (col), |
2442 | Col2Pixel (col), |
2416 | Row2Pixel (oldcursor.row), |
2443 | Row2Pixel (oldcursor.row), |
2417 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2444 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
… | |
… | |
2455 | |
2482 | |
2456 | void |
2483 | void |
2457 | rxvt_term::scr_recolour () NOTHROW |
2484 | rxvt_term::scr_recolour () NOTHROW |
2458 | { |
2485 | { |
2459 | if (1 |
2486 | if (1 |
2460 | #if TRANSPARENT |
2487 | #if ENABLE_TRANSPARENCY |
2461 | && !am_transparent |
2488 | && !am_transparent |
2462 | #endif |
2489 | #endif |
2463 | #if XPM_BACKGROUND |
2490 | #ifdef HAVE_BG_PIXMAP |
2464 | && !bgPixmap.pixmap |
2491 | && !bgPixmap.pixmap |
2465 | #endif |
2492 | #endif |
2466 | ) |
2493 | ) |
2467 | { |
2494 | { |
2468 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2495 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
… | |
… | |
3400 | selection_delimit_word (DN, &selection.end, &selection.end); |
3427 | selection_delimit_word (DN, &selection.end, &selection.end); |
3401 | } |
3428 | } |
3402 | else if (selection.clicks == 3) |
3429 | else if (selection.clicks == 3) |
3403 | { |
3430 | { |
3404 | #if ENABLE_FRILLS |
3431 | #if ENABLE_FRILLS |
3405 | if (OPTION (Opt_tripleclickwords)) |
3432 | if (option (Opt_tripleclickwords)) |
3406 | { |
3433 | { |
3407 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3434 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3408 | |
3435 | |
3409 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3436 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3410 | { |
3437 | { |