ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.260 by root, Sat Feb 18 15:24:39 2006 UTC vs.
Revision 1.275 by sasha, Wed Aug 15 22:41:52 2007 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
… …
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#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <X11/Xmd.h> /* get the typedef for CARD32 */
32
33#include <inttypes.h> 31#include <inttypes.h>
34 32
35#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a seperate compile!
36 34
37inline void fill_text (text_t *start, text_t value, int len) 35inline void fill_text (text_t *start, text_t value, int len)
… …
47 45
48/* ------------------------------------------------------------------------- * 46/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 48 * ------------------------------------------------------------------------- */
51#define ZERO_SCROLLBACK() \ 49#define ZERO_SCROLLBACK() \
52 if (OPTION (Opt_scrollTtyOutput)) \ 50 if (option (Opt_scrollTtyOutput)) \
53 view_start = 0 51 view_start = 0
54#define CLEAR_SELECTION() \ 52#define CLEAR_SELECTION() \
55 selection.beg.row = selection.beg.col \ 53 selection.beg.row = selection.beg.col \
56 = selection.end.row = selection.end.col = 0 54 = selection.end.row = selection.end.col = 0
57#define CLEAR_ALL_SELECTION() \ 55#define CLEAR_ALL_SELECTION() \
… …
161{ 159{
162#if ENABLE_OVERLAY 160#if ENABLE_OVERLAY
163 scr_overlay_off (); 161 scr_overlay_off ();
164#endif 162#endif
165 163
164 rvideo_mode = false;
166 view_start = 0; 165 view_start = 0;
167 num_scr = 0; 166 num_scr = 0;
168 167
169 if (ncol == 0) 168 if (ncol == 0)
170 ncol = 80; 169 ncol = 80;
… …
237 selection.text = NULL; 236 selection.text = NULL;
238 selection.len = 0; 237 selection.len = 0;
239 selection.op = SELECTION_CLEAR; 238 selection.op = SELECTION_CLEAR;
240 selection.screen = PRIMARY; 239 selection.screen = PRIMARY;
241 selection.clicks = 0; 240 selection.clicks = 0;
242 rvideo_state = rvideo_mode = false;
243 } 241 }
244 else 242 else
245 { 243 {
246 /* 244 /*
247 * add or delete rows as appropriate 245 * add or delete rows as appropriate
… …
409 prev_nrow = nrow; 407 prev_nrow = nrow;
410 prev_ncol = ncol; 408 prev_ncol = ncol;
411 409
412 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 410 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
413 411
414 for (int col = ncol; col--; ) 412 for (int col = ncol; --col; )
415 tabs [col] = col % TABSIZE == 0; 413 tabs [col] = col % TABSIZE == 0;
416 414
417 if (current_screen != PRIMARY) 415 if (current_screen != PRIMARY)
418 scr_swap_screen (); 416 scr_swap_screen ();
419 417
… …
510} 508}
511 509
512void 510void
513rxvt_term::scr_swap_screen () 511rxvt_term::scr_swap_screen ()
514{ 512{
515 if (!OPTION (Opt_secondaryScreen)) 513 if (!option (Opt_secondaryScreen))
516 return; 514 return;
517 515
518 for (int i = prev_nrow; i--; ) 516 for (int i = prev_nrow; i--; )
519 ::swap (ROW(i), swap_buf [i]); 517 ::swap (ROW(i), swap_buf [i]);
520 518
… …
542 selection_check (2); /* check for boundary cross */ 540 selection_check (2); /* check for boundary cross */
543 541
544 int i = current_screen; current_screen = scrn; scrn = i; 542 int i = current_screen; current_screen = scrn; scrn = i;
545 543
546#if NSCREENS 544#if NSCREENS
547 if (OPTION (Opt_secondaryScreen)) 545 if (option (Opt_secondaryScreen))
548 { 546 {
549 num_scr = 0; 547 num_scr = 0;
550 548
551 scr_swap_screen (); 549 scr_swap_screen ();
552 550
… …
555 screen.flags |= Screen_VisibleCursor; 553 screen.flags |= Screen_VisibleCursor;
556 swap.flags |= Screen_VisibleCursor; 554 swap.flags |= Screen_VisibleCursor;
557 } 555 }
558 else 556 else
559#endif 557#endif
560 if (OPTION (Opt_secondaryScroll)) 558 if (option (Opt_secondaryScroll))
561 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 559 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
562} 560}
563 561
564// clear WrapNext indicator, solidifying position on next line 562// clear WrapNext indicator, solidifying position on next line
565void 563void
… …
624 want_refresh = 1; 622 want_refresh = 1;
625 num_scr += count; 623 num_scr += count;
626 624
627 if (count > 0 625 if (count > 0
628 && row1 == 0 626 && row1 == 0
629 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 627 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
630 { 628 {
631 top_row = max (top_row - count, -saveLines); 629 top_row = max (top_row - count, -saveLines);
632 630
633 // scroll everything up 'count' lines 631 // scroll everything up 'count' lines
634 term_start = (term_start + count) % total_rows; 632 term_start = (term_start + count) % total_rows;
… …
684 selection.op = SELECTION_CLEAR; 682 selection.op = SELECTION_CLEAR;
685 } 683 }
686 } 684 }
687 685
688 // finally move the view window, if desired 686 // finally move the view window, if desired
689 if (OPTION (Opt_scrollWithBuffer) 687 if (option (Opt_scrollWithBuffer)
690 && view_start != 0 688 && view_start != 0
691 && view_start != -saveLines) 689 && view_start != -saveLines)
692 scr_page (UP, count); 690 scr_page (UP, count);
693 691
694 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 692 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
1071 if (count) 1069 if (count)
1072 x = ncol - 1; 1070 x = ncol - 1;
1073 1071
1074 // store horizontal tab commands as characters inside the text 1072 // store horizontal tab commands as characters inside the text
1075 // buffer so they can be selected and pasted. 1073 // buffer so they can be selected and pasted.
1076 if (ht && OPTION (Opt_pastableTabs)) 1074 if (ht && option (Opt_pastableTabs))
1077 { 1075 {
1078 base_rend = SET_FONT (base_rend, 0); 1076 base_rend = SET_FONT (base_rend, 0);
1079 1077
1080 l.touch (x); 1078 l.touch (x);
1081 1079
… …
1648 if (rvideo_state != on) 1646 if (rvideo_state != on)
1649 { 1647 {
1650 rvideo_state = on; 1648 rvideo_state = on;
1651 1649
1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1650 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1653#if XPM_BACKGROUND 1651#ifdef HAVE_BG_PIXMAP
1654 if (bgPixmap.pixmap == None) 1652 if (bgPixmap.pixmap == None)
1655#endif
1656#if TRANSPARENT
1657 if (!OPTION (Opt_transparent) || am_transparent == 0)
1658#endif 1653#endif
1659 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1654 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1660 1655
1661 XGCValues gcvalue; 1656 XGCValues gcvalue;
1662 gcvalue.foreground = pix_colors[Color_fg]; 1657 gcvalue.foreground = pix_colors[Color_fg];
… …
1806 for (i = PART_BEG; i < RC_COUNT; i++) 1801 for (i = PART_BEG; i < RC_COUNT; i++)
1807 { 1802 {
1808 min_it (rc[i].col, ncol - 1); 1803 min_it (rc[i].col, ncol - 1);
1809 min_it (rc[i].row, nrow - 1); 1804 min_it (rc[i].row, nrow - 1);
1810 } 1805 }
1811 1806// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1812 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1807 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1813 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1808 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1814 1809
1815 num_scr_allow = 0; 1810 num_scr_allow = 0;
1816 1811
… …
1886{ 1881{
1887#ifndef NO_BELL 1882#ifndef NO_BELL
1888 1883
1889# ifndef NO_MAPALERT 1884# ifndef NO_MAPALERT
1890# ifdef MAPALERT_OPTION 1885# ifdef MAPALERT_OPTION
1891 if (OPTION (Opt_mapAlert)) 1886 if (option (Opt_mapAlert))
1892# endif 1887# endif
1893 XMapWindow (dpy, parent[0]); 1888 XMapWindow (dpy, parent[0]);
1894# endif 1889# endif
1890# if ENABLE_FRILLS
1891 if (option (Opt_urgentOnBell))
1892 {
1893 XWMHints *h;
1895 1894
1895 h = XGetWMHints(dpy, parent[0]);
1896 if (h != NULL)
1897 {
1898 h->flags |= XUrgencyHint;
1899 XSetWMHints(dpy, parent[0], h);
1900 }
1901 }
1902# endif
1903
1896 if (OPTION (Opt_visualBell)) 1904 if (option (Opt_visualBell))
1897 { 1905 {
1898 rvideo_bell = true; 1906 rvideo_bell = true;
1899 scr_rvideo_mode (rvideo_mode); 1907 scr_rvideo_mode (rvideo_mode);
1900 display->flush (); 1908 display->flush ();
1901 1909
1902 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1910 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1903 } 1911 }
1904 else 1912 else
1905 XBell (dpy, 0); 1913 XBell (dpy, 0);
1906
1907#endif 1914#endif
1908} 1915}
1909 1916
1910/* ------------------------------------------------------------------------- */ 1917/* ------------------------------------------------------------------------- */
1911/* ARGSUSED */ 1918/* ARGSUSED */
… …
1978 int i; /* tmp */ 1985 int i; /* tmp */
1979#ifndef NO_CURSORCOLOR 1986#ifndef NO_CURSORCOLOR
1980 rend_t cc1; /* store colours at cursor position (s) */ 1987 rend_t cc1; /* store colours at cursor position (s) */
1981#endif 1988#endif
1982 rend_t *crp; // cursor rendition pointer 1989 rend_t *crp; // cursor rendition pointer
1990 rend_t ccol1, /* Cursor colour */
1991 ccol2; /* Cursor colour2 */
1983 1992
1984 want_refresh = 0; /* screen is current */ 1993 want_refresh = 0; /* screen is current */
1985 1994
1986 if (refresh_type == NO_REFRESH || !mapped) 1995 if (refresh_type == NO_REFRESH || !mapped)
1987 return; 1996 return;
… …
1990 * A: set up vars 1999 * A: set up vars
1991 */ 2000 */
1992 have_bg = 0; 2001 have_bg = 0;
1993 refresh_count = 0; 2002 refresh_count = 0;
1994 2003
1995#if XPM_BACKGROUND 2004#ifdef HAVE_BG_PIXMAP
1996 have_bg |= bgPixmap.pixmap != None; 2005 have_bg |= bgPixmap.pixmap != None;
1997#endif
1998#if TRANSPARENT
1999 have_bg |= OPTION (Opt_transparent) && am_transparent;
2000#endif 2006#endif
2001 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2007 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2002 2008
2003 /* 2009 /*
2004 * B: reverse any characters which are selected 2010 * B: reverse any characters which are selected
… …
2008 /* 2014 /*
2009 * C: set the cursor character (s) 2015 * C: set the cursor character (s)
2010 */ 2016 */
2011 { 2017 {
2012 unsigned char setoldcursor; 2018 unsigned char setoldcursor;
2013 rend_t ccol1, /* Cursor colour */
2014 ccol2; /* Cursor colour2 */
2015 2019
2016 showcursor = (screen.flags & Screen_VisibleCursor); 2020 showcursor = (screen.flags & Screen_VisibleCursor);
2017#ifdef CURSOR_BLINK 2021#ifdef CURSOR_BLINK
2018 if (hidden_cursor) 2022 if (hidden_cursor)
2019 showcursor = 0; 2023 showcursor = 0;
… …
2026 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2030 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2027 col--; 2031 col--;
2028 2032
2029 crp = &ROW(screen.cur.row).r[col]; 2033 crp = &ROW(screen.cur.row).r[col];
2030 2034
2035#ifndef NO_CURSORCOLOR
2036 cc1 = *crp & (RS_fgMask | RS_bgMask);
2037 if (ISSET_PIXCOLOR (Color_cursor))
2038 ccol1 = Color_cursor;
2039 else
2040#endif
2041#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2042 ccol1 = fgcolor_of (rstyle);
2043#else
2044 ccol1 = Color_fg;
2045#endif
2046
2047#ifndef NO_CURSORCOLOR
2048 if (ISSET_PIXCOLOR (Color_cursor2))
2049 ccol2 = Color_cursor2;
2050 else
2051#endif
2052#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2053 ccol2 = bgcolor_of (rstyle);
2054#else
2055 ccol2 = Color_bg;
2056#endif
2057
2031 if (showcursor && focus) 2058 if (showcursor && focus)
2032 { 2059 {
2033 if (OPTION (Opt_cursorUnderline)) 2060 if (option (Opt_cursorUnderline))
2034 *crp ^= RS_Uline; 2061 *crp ^= RS_Uline;
2035 else 2062 else
2036 { 2063 {
2037 *crp ^= RS_RVid; 2064 *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); 2065 *crp = SET_FGCOLOR (*crp, ccol1);
2058 *crp = SET_BGCOLOR (*crp, ccol2); 2066 *crp = SET_BGCOLOR (*crp, ccol2);
2059#endif
2060 } 2067 }
2061 } 2068 }
2062 } 2069 }
2063 2070
2064 /* make sure no outline cursor is left around */ 2071 /* make sure no outline cursor is left around */
… …
2106 if (!display->is_local 2113 if (!display->is_local
2107 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2114 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2108 && abs (num_scr) < nrow && !have_bg) 2115 && abs (num_scr) < nrow && !have_bg)
2109 { 2116 {
2110 int16_t nits; 2117 int16_t nits;
2118 int i = num_scr;
2111 int j; 2119 int j;
2112 int len, wlen; 2120 int len, wlen;
2113 dLocal (int, num_scr); 2121 dLocal (int, num_scr);
2114 2122
2115 j = nrow; 2123 j = nrow;
2116 wlen = len = -1; 2124 wlen = len = -1;
2117 row = i > 0 ? 0 : j - 1; 2125 row = i > 0 ? 0 : j - 1;
2126
2118 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2127 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2119 { 2128 {
2120 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2129 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2121 { 2130 {
2122 line_t s = ROW(view_start + row); 2131 line_t s = ROW(view_start + row);
… …
2143 wlen = row; 2152 wlen = row;
2144 continue; 2153 continue;
2145 } 2154 }
2146 } 2155 }
2147 2156
2148 if (len != -1) 2157 if (len >= 0)
2149 { 2158 {
2150 /* also comes here at end if needed because of >= above */ 2159 /* also comes here at end if needed because of >= above */
2151 if (wlen < len) 2160 if (wlen < len)
2152 ::swap (wlen, len); 2161 ::swap (wlen, len);
2153 2162
… …
2251 int back = bgcolor_of (rend); // desired background 2260 int back = bgcolor_of (rend); // desired background
2252 2261
2253 // only do special processing if any attributes are set, which is unlikely 2262 // only do special processing if any attributes are set, which is unlikely
2254 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2263 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2255 { 2264 {
2256#if ENABLE_STYLES
2257 // "careful" (too wide) character handling
2258
2259 // include previous careful character(s) if possible, looks nicer (best effort...)
2260 while (text > stp
2261 && srp[text - stp - 1] & RS_Careful
2262 && RS_SAME (rend, srp[text - stp - 1]))
2263 text--, count++, xpixel -= fwidth;
2264
2265 // force redraw after "careful" characters to avoid pixel droppings
2266 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2267 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2268
2269 // force redraw before "careful" characters to avoid pixel droppings
2270 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2271 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2272#endif
2273
2274 bool invert = rend & RS_RVid; 2265 bool invert = rend & RS_RVid;
2275 2266
2276#ifndef NO_BOLD_UNDERLINE_REVERSE 2267#ifndef NO_BOLD_UNDERLINE_REVERSE
2277 if (rend & RS_Bold 2268 if (rend & RS_Bold
2278 && fore == Color_fg) 2269 && fore == Color_fg)
… …
2294 else 2285 else
2295 invert = !invert; 2286 invert = !invert;
2296# endif 2287# endif
2297 } 2288 }
2298 2289
2299 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2290 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2300 fore = Color_UL; 2291 fore = Color_UL;
2301#endif 2292#endif
2302 2293
2303 if (invert) 2294 if (invert)
2304 { 2295 {
2296#ifdef OPTION_HC
2297 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2298 || !ISSET_PIXCOLOR (Color_HC))
2299#endif
2300 /* invert the column if no highlightColor is set or it is the
2301 * current cursor column */
2305 ::swap (fore, back); 2302 ::swap (fore, back);
2303#ifdef OPTION_HC
2304 else if (ISSET_PIXCOLOR (Color_HC))
2305 back = Color_HC;
2306#endif
2306 2307
2307#ifndef NO_BOLD_UNDERLINE_REVERSE 2308#ifndef NO_BOLD_UNDERLINE_REVERSE
2309# ifndef OPTION_HC
2308 if (ISSET_PIXCOLOR (Color_RV)) 2310 if (ISSET_PIXCOLOR (Color_RV))
2309 back = Color_RV; 2311 back = Color_RV;
2310 2312# endif
2311 if (fore == back) 2313 if (fore == back)
2312 { 2314 {
2313 fore = Color_bg; 2315 fore = Color_bg;
2314 back = Color_fg; 2316 back = Color_fg;
2315 } 2317 }
… …
2326 } 2328 }
2327 else if (hidden_text) 2329 else if (hidden_text)
2328 fore = back; 2330 fore = back;
2329 } 2331 }
2330#endif 2332#endif
2333
2334#if ENABLE_STYLES
2335 // "careful" (too wide) character handling
2336
2337 // include previous careful character(s) if possible, looks nicer (best effort...)
2338 while (text > stp
2339 && srp[text - stp - 1] & RS_Careful
2340 && RS_SAME (rend, srp[text - stp - 1]))
2341 text--, count++, xpixel -= fwidth;
2342
2343 // force redraw after "careful" characters to avoid pixel droppings
2344 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2345 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2346
2347 // force redraw before "careful" characters to avoid pixel droppings
2348 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2349 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2350#endif
2331 } 2351 }
2332 2352
2333 /* 2353 /*
2334 * Actually do the drawing of the string here 2354 * Actually do the drawing of the string here
2335 */ 2355 */
2336 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2356 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2337 2357
2338 if (back == fore) 2358 if (have_bg && back == Color_bg)
2339 font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back);
2340 else if (back == Color_bg && have_bg)
2341 { 2359 {
2342 // this is very ugly, maybe push it into ->draw? 2360 // this is very ugly, maybe push it into ->draw?
2343 2361
2344 for (i = 0; i < count; i++) /* don't draw empty strings */ 2362 for (i = 0; i < count; i++) /* don't draw empty strings */
2345 if (text[i] != ' ') 2363 if (text[i] != ' ')
2346 { 2364 {
2347 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2365 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2348 goto did_clear; 2366 goto did_clear;
2349 } 2367 }
2350 2368
2351 CLEAR_CHARS (xpixel, ypixel, count); 2369 CLEAR_CHARS (xpixel, ypixel, count);
2352 did_clear: ; 2370 did_clear: ;
… …
2380 */ 2398 */
2381 if (showcursor) 2399 if (showcursor)
2382 { 2400 {
2383 if (focus) 2401 if (focus)
2384 { 2402 {
2385 if (OPTION (Opt_cursorUnderline)) 2403 if (option (Opt_cursorUnderline))
2386 *crp ^= RS_Uline; 2404 *crp ^= RS_Uline;
2387 else 2405 else
2388 { 2406 {
2389 *crp ^= RS_RVid; 2407 *crp ^= RS_RVid;
2390#ifndef NO_CURSORCOLOR 2408#ifndef NO_CURSORCOLOR
… …
2405 cursorwidth++; 2423 cursorwidth++;
2406 2424
2407#ifndef NO_CURSORCOLOR 2425#ifndef NO_CURSORCOLOR
2408 if (ISSET_PIXCOLOR (Color_cursor)) 2426 if (ISSET_PIXCOLOR (Color_cursor))
2409 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2427 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2428 else
2410#endif 2429#endif
2430 XSetForeground (dpy, gc, pix_colors[ccol1]);
2411 2431
2412 XDrawRectangle (dpy, drawBuffer, gc, 2432 XDrawRectangle (dpy, drawBuffer, gc,
2413 Col2Pixel (col), 2433 Col2Pixel (col),
2414 Row2Pixel (oldcursor.row), 2434 Row2Pixel (oldcursor.row),
2415 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2435 (unsigned int) (Width2Pixel (cursorwidth) - 1),
… …
2452} 2472}
2453 2473
2454void 2474void
2455rxvt_term::scr_recolour () NOTHROW 2475rxvt_term::scr_recolour () NOTHROW
2456{ 2476{
2457 if (1 2477#ifdef HAVE_BG_PIXMAP
2458#if TRANSPARENT 2478 bgPixmap.apply ();
2459 && !am_transparent 2479#else
2460#endif
2461#if XPM_BACKGROUND
2462 && !bgPixmap.pixmap
2463#endif
2464 )
2465 {
2466 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2480 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2467 XClearWindow (dpy, parent[0]); 2481 XClearWindow (dpy, parent[0]);
2468 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2482 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2469#if HAVE_SCROLLBARS 2483# if HAVE_SCROLLBARS
2470 if (scrollBar.win) 2484 if (scrollBar.win)
2471 { 2485 {
2472 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2486 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2473 scrollBar.setIdle (); 2487 scrollBar.setIdle ();
2474 scrollbar_show (0); 2488 scrollbar_show (0);
2475 } 2489 }
2476#endif 2490# endif
2477 } 2491#endif
2478 2492
2479 scr_clear (); 2493 scr_clear ();
2480 scr_touch (true); 2494 scr_touch (true);
2481 want_refresh = 1; 2495 want_refresh = 1;
2482} 2496}
2483 2497
… …
3398 selection_delimit_word (DN, &selection.end, &selection.end); 3412 selection_delimit_word (DN, &selection.end, &selection.end);
3399 } 3413 }
3400 else if (selection.clicks == 3) 3414 else if (selection.clicks == 3)
3401 { 3415 {
3402#if ENABLE_FRILLS 3416#if ENABLE_FRILLS
3403 if (OPTION (Opt_tripleclickwords)) 3417 if (option (Opt_tripleclickwords))
3404 { 3418 {
3405 selection_delimit_word (UP, &selection.beg, &selection.beg); 3419 selection_delimit_word (UP, &selection.beg, &selection.beg);
3406 3420
3407 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3421 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3408 { 3422 {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines