… | |
… | |
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 | |
… | |
… | |
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 | #if XPM_BACKGROUND |
1654 | if (bgPixmap.pixmap == None) |
1654 | if (bgPixmap.pixmap == None) |
1655 | #endif |
1655 | #endif |
1656 | #if TRANSPARENT |
1656 | #if TRANSPARENT |
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 | |
1895 | |
1896 | if (OPTION (Opt_visualBell)) |
1896 | if (option (Opt_visualBell)) |
1897 | { |
1897 | { |
1898 | rvideo_bell = true; |
1898 | rvideo_bell = true; |
1899 | scr_rvideo_mode (rvideo_mode); |
1899 | scr_rvideo_mode (rvideo_mode); |
1900 | display->flush (); |
1900 | display->flush (); |
1901 | |
1901 | |
… | |
… | |
1978 | int i; /* tmp */ |
1978 | int i; /* tmp */ |
1979 | #ifndef NO_CURSORCOLOR |
1979 | #ifndef NO_CURSORCOLOR |
1980 | rend_t cc1; /* store colours at cursor position (s) */ |
1980 | rend_t cc1; /* store colours at cursor position (s) */ |
1981 | #endif |
1981 | #endif |
1982 | rend_t *crp; // cursor rendition pointer |
1982 | rend_t *crp; // cursor rendition pointer |
|
|
1983 | rend_t ccol1, /* Cursor colour */ |
|
|
1984 | ccol2; /* Cursor colour2 */ |
1983 | |
1985 | |
1984 | want_refresh = 0; /* screen is current */ |
1986 | want_refresh = 0; /* screen is current */ |
1985 | |
1987 | |
1986 | if (refresh_type == NO_REFRESH || !mapped) |
1988 | if (refresh_type == NO_REFRESH || !mapped) |
1987 | return; |
1989 | return; |
… | |
… | |
1994 | |
1996 | |
1995 | #if XPM_BACKGROUND |
1997 | #if XPM_BACKGROUND |
1996 | have_bg |= bgPixmap.pixmap != None; |
1998 | have_bg |= bgPixmap.pixmap != None; |
1997 | #endif |
1999 | #endif |
1998 | #if TRANSPARENT |
2000 | #if TRANSPARENT |
1999 | have_bg |= OPTION (Opt_transparent) && am_transparent; |
2001 | have_bg |= option (Opt_transparent) && am_transparent; |
2000 | #endif |
2002 | #endif |
2001 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2003 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2002 | |
2004 | |
2003 | /* |
2005 | /* |
2004 | * B: reverse any characters which are selected |
2006 | * B: reverse any characters which are selected |
… | |
… | |
2008 | /* |
2010 | /* |
2009 | * C: set the cursor character (s) |
2011 | * C: set the cursor character (s) |
2010 | */ |
2012 | */ |
2011 | { |
2013 | { |
2012 | unsigned char setoldcursor; |
2014 | unsigned char setoldcursor; |
2013 | rend_t ccol1, /* Cursor colour */ |
|
|
2014 | ccol2; /* Cursor colour2 */ |
|
|
2015 | |
2015 | |
2016 | showcursor = (screen.flags & Screen_VisibleCursor); |
2016 | showcursor = (screen.flags & Screen_VisibleCursor); |
2017 | #ifdef CURSOR_BLINK |
2017 | #ifdef CURSOR_BLINK |
2018 | if (hidden_cursor) |
2018 | if (hidden_cursor) |
2019 | showcursor = 0; |
2019 | showcursor = 0; |
… | |
… | |
2026 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2026 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2027 | col--; |
2027 | col--; |
2028 | |
2028 | |
2029 | crp = &ROW(screen.cur.row).r[col]; |
2029 | crp = &ROW(screen.cur.row).r[col]; |
2030 | |
2030 | |
|
|
2031 | #ifndef NO_CURSORCOLOR |
|
|
2032 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
|
|
2033 | if (ISSET_PIXCOLOR (Color_cursor)) |
|
|
2034 | ccol1 = Color_cursor; |
|
|
2035 | else |
|
|
2036 | #endif |
|
|
2037 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2038 | ccol1 = fgcolor_of (rstyle); |
|
|
2039 | #else |
|
|
2040 | ccol1 = Color_fg; |
|
|
2041 | #endif |
|
|
2042 | |
|
|
2043 | #ifndef NO_CURSORCOLOR |
|
|
2044 | if (ISSET_PIXCOLOR (Color_cursor2)) |
|
|
2045 | ccol2 = Color_cursor2; |
|
|
2046 | else |
|
|
2047 | #endif |
|
|
2048 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2049 | ccol2 = bgcolor_of (rstyle); |
|
|
2050 | #else |
|
|
2051 | ccol2 = Color_bg; |
|
|
2052 | #endif |
|
|
2053 | |
2031 | if (showcursor && focus) |
2054 | if (showcursor && focus) |
2032 | { |
2055 | { |
2033 | if (OPTION (Opt_cursorUnderline)) |
2056 | if (option (Opt_cursorUnderline)) |
2034 | *crp ^= RS_Uline; |
2057 | *crp ^= RS_Uline; |
2035 | else |
2058 | else |
2036 | { |
2059 | { |
2037 | *crp ^= RS_RVid; |
2060 | *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); |
2061 | *crp = SET_FGCOLOR (*crp, ccol1); |
2058 | *crp = SET_BGCOLOR (*crp, ccol2); |
2062 | *crp = SET_BGCOLOR (*crp, ccol2); |
2059 | #endif |
|
|
2060 | } |
2063 | } |
2061 | } |
2064 | } |
2062 | } |
2065 | } |
2063 | |
2066 | |
2064 | /* make sure no outline cursor is left around */ |
2067 | /* make sure no outline cursor is left around */ |
… | |
… | |
2346 | /* |
2349 | /* |
2347 | * Actually do the drawing of the string here |
2350 | * Actually do the drawing of the string here |
2348 | */ |
2351 | */ |
2349 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2352 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2350 | |
2353 | |
2351 | if (back == fore) |
2354 | if (have_bg && back == Color_bg) |
2352 | font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back); |
|
|
2353 | else if (back == Color_bg && have_bg) |
|
|
2354 | { |
2355 | { |
2355 | // this is very ugly, maybe push it into ->draw? |
2356 | // this is very ugly, maybe push it into ->draw? |
2356 | |
2357 | |
2357 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2358 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2358 | if (text[i] != ' ') |
2359 | if (text[i] != ' ') |
2359 | { |
2360 | { |
2360 | font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); |
2361 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent); |
2361 | goto did_clear; |
2362 | goto did_clear; |
2362 | } |
2363 | } |
2363 | |
2364 | |
2364 | CLEAR_CHARS (xpixel, ypixel, count); |
2365 | CLEAR_CHARS (xpixel, ypixel, count); |
2365 | did_clear: ; |
2366 | did_clear: ; |
… | |
… | |
2393 | */ |
2394 | */ |
2394 | if (showcursor) |
2395 | if (showcursor) |
2395 | { |
2396 | { |
2396 | if (focus) |
2397 | if (focus) |
2397 | { |
2398 | { |
2398 | if (OPTION (Opt_cursorUnderline)) |
2399 | if (option (Opt_cursorUnderline)) |
2399 | *crp ^= RS_Uline; |
2400 | *crp ^= RS_Uline; |
2400 | else |
2401 | else |
2401 | { |
2402 | { |
2402 | *crp ^= RS_RVid; |
2403 | *crp ^= RS_RVid; |
2403 | #ifndef NO_CURSORCOLOR |
2404 | #ifndef NO_CURSORCOLOR |
… | |
… | |
2418 | cursorwidth++; |
2419 | cursorwidth++; |
2419 | |
2420 | |
2420 | #ifndef NO_CURSORCOLOR |
2421 | #ifndef NO_CURSORCOLOR |
2421 | if (ISSET_PIXCOLOR (Color_cursor)) |
2422 | if (ISSET_PIXCOLOR (Color_cursor)) |
2422 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
2423 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
|
|
2424 | else |
2423 | #endif |
2425 | #endif |
|
|
2426 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2424 | |
2427 | |
2425 | XDrawRectangle (dpy, drawBuffer, gc, |
2428 | XDrawRectangle (dpy, drawBuffer, gc, |
2426 | Col2Pixel (col), |
2429 | Col2Pixel (col), |
2427 | Row2Pixel (oldcursor.row), |
2430 | Row2Pixel (oldcursor.row), |
2428 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2431 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
… | |
… | |
3411 | selection_delimit_word (DN, &selection.end, &selection.end); |
3414 | selection_delimit_word (DN, &selection.end, &selection.end); |
3412 | } |
3415 | } |
3413 | else if (selection.clicks == 3) |
3416 | else if (selection.clicks == 3) |
3414 | { |
3417 | { |
3415 | #if ENABLE_FRILLS |
3418 | #if ENABLE_FRILLS |
3416 | if (OPTION (Opt_tripleclickwords)) |
3419 | if (option (Opt_tripleclickwords)) |
3417 | { |
3420 | { |
3418 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3421 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3419 | |
3422 | |
3420 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3423 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3421 | { |
3424 | { |