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.262 by root, Mon Feb 20 22:42:01 2006 UTC vs.
Revision 1.272 by root, Fri Aug 10 23:52:12 2007 UTC

… …
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() \
… …
161{ 161{
162#if ENABLE_OVERLAY 162#if ENABLE_OVERLAY
163 scr_overlay_off (); 163 scr_overlay_off ();
164#endif 164#endif
165 165
166 rvideo_mode = false;
166 view_start = 0; 167 view_start = 0;
167 num_scr = 0; 168 num_scr = 0;
168 169
169 if (ncol == 0) 170 if (ncol == 0)
170 ncol = 80; 171 ncol = 80;
… …
237 selection.text = NULL; 238 selection.text = NULL;
238 selection.len = 0; 239 selection.len = 0;
239 selection.op = SELECTION_CLEAR; 240 selection.op = SELECTION_CLEAR;
240 selection.screen = PRIMARY; 241 selection.screen = PRIMARY;
241 selection.clicks = 0; 242 selection.clicks = 0;
242 rvideo_state = rvideo_mode = false;
243 } 243 }
244 else 244 else
245 { 245 {
246 /* 246 /*
247 * add or delete rows as appropriate 247 * add or delete rows as appropriate
… …
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
512void 512void
513rxvt_term::scr_swap_screen () 513rxvt_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
565void 565void
… …
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
1902 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1915 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1903 } 1916 }
1904 else 1917 else
1905 XBell (dpy, 0); 1918 XBell (dpy, 0);
1906
1907#endif 1919#endif
1908} 1920}
1909 1921
1910/* ------------------------------------------------------------------------- */ 1922/* ------------------------------------------------------------------------- */
1911/* ARGSUSED */ 1923/* ARGSUSED */
… …
1978 int i; /* tmp */ 1990 int i; /* tmp */
1979#ifndef NO_CURSORCOLOR 1991#ifndef NO_CURSORCOLOR
1980 rend_t cc1; /* store colours at cursor position (s) */ 1992 rend_t cc1; /* store colours at cursor position (s) */
1981#endif 1993#endif
1982 rend_t *crp; // cursor rendition pointer 1994 rend_t *crp; // cursor rendition pointer
1995 rend_t ccol1, /* Cursor colour */
1996 ccol2; /* Cursor colour2 */
1983 1997
1984 want_refresh = 0; /* screen is current */ 1998 want_refresh = 0; /* screen is current */
1985 1999
1986 if (refresh_type == NO_REFRESH || !mapped) 2000 if (refresh_type == NO_REFRESH || !mapped)
1987 return; 2001 return;
… …
1990 * A: set up vars 2004 * A: set up vars
1991 */ 2005 */
1992 have_bg = 0; 2006 have_bg = 0;
1993 refresh_count = 0; 2007 refresh_count = 0;
1994 2008
1995#if XPM_BACKGROUND 2009#ifdef HAVE_BG_PIXMAP
1996 have_bg |= bgPixmap.pixmap != None; 2010 have_bg |= bgPixmap.pixmap != None;
1997#endif 2011#endif
1998#if TRANSPARENT 2012#if ENABLE_TRANSPARENCY
1999 have_bg |= OPTION (Opt_transparent) && am_transparent; 2013 have_bg |= option (Opt_transparent) && am_transparent;
2000#endif 2014#endif
2001 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2015 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2002 2016
2003 /* 2017 /*
2004 * B: reverse any characters which are selected 2018 * B: reverse any characters which are selected
… …
2008 /* 2022 /*
2009 * C: set the cursor character (s) 2023 * C: set the cursor character (s)
2010 */ 2024 */
2011 { 2025 {
2012 unsigned char setoldcursor; 2026 unsigned char setoldcursor;
2013 rend_t ccol1, /* Cursor colour */
2014 ccol2; /* Cursor colour2 */
2015 2027
2016 showcursor = (screen.flags & Screen_VisibleCursor); 2028 showcursor = (screen.flags & Screen_VisibleCursor);
2017#ifdef CURSOR_BLINK 2029#ifdef CURSOR_BLINK
2018 if (hidden_cursor) 2030 if (hidden_cursor)
2019 showcursor = 0; 2031 showcursor = 0;
… …
2026 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2038 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2027 col--; 2039 col--;
2028 2040
2029 crp = &ROW(screen.cur.row).r[col]; 2041 crp = &ROW(screen.cur.row).r[col];
2030 2042
2043#ifndef NO_CURSORCOLOR
2044 cc1 = *crp & (RS_fgMask | RS_bgMask);
2045 if (ISSET_PIXCOLOR (Color_cursor))
2046 ccol1 = Color_cursor;
2047 else
2048#endif
2049#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2050 ccol1 = fgcolor_of (rstyle);
2051#else
2052 ccol1 = Color_fg;
2053#endif
2054
2055#ifndef NO_CURSORCOLOR
2056 if (ISSET_PIXCOLOR (Color_cursor2))
2057 ccol2 = Color_cursor2;
2058 else
2059#endif
2060#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2061 ccol2 = bgcolor_of (rstyle);
2062#else
2063 ccol2 = Color_bg;
2064#endif
2065
2031 if (showcursor && focus) 2066 if (showcursor && focus)
2032 { 2067 {
2033 if (OPTION (Opt_cursorUnderline)) 2068 if (option (Opt_cursorUnderline))
2034 *crp ^= RS_Uline; 2069 *crp ^= RS_Uline;
2035 else 2070 else
2036 { 2071 {
2037 *crp ^= RS_RVid; 2072 *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); 2073 *crp = SET_FGCOLOR (*crp, ccol1);
2058 *crp = SET_BGCOLOR (*crp, ccol2); 2074 *crp = SET_BGCOLOR (*crp, ccol2);
2059#endif
2060 } 2075 }
2061 } 2076 }
2062 } 2077 }
2063 2078
2064 /* make sure no outline cursor is left around */ 2079 /* make sure no outline cursor is left around */
… …
2253 int back = bgcolor_of (rend); // desired background 2268 int back = bgcolor_of (rend); // desired background
2254 2269
2255 // only do special processing if any attributes are set, which is unlikely 2270 // 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)) 2271 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2257 { 2272 {
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; 2273 bool invert = rend & RS_RVid;
2277 2274
2278#ifndef NO_BOLD_UNDERLINE_REVERSE 2275#ifndef NO_BOLD_UNDERLINE_REVERSE
2279 if (rend & RS_Bold 2276 if (rend & RS_Bold
2280 && fore == Color_fg) 2277 && fore == Color_fg)
… …
2296 else 2293 else
2297 invert = !invert; 2294 invert = !invert;
2298# endif 2295# endif
2299 } 2296 }
2300 2297
2301 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2298 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2302 fore = Color_UL; 2299 fore = Color_UL;
2303#endif 2300#endif
2304 2301
2305 if (invert) 2302 if (invert)
2306 { 2303 {
2304#ifdef OPTION_HC
2305 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2306 || !ISSET_PIXCOLOR (Color_HC))
2307#endif
2308 /* invert the column if no highlightColor is set or it is the
2309 * current cursor column */
2307 ::swap (fore, back); 2310 ::swap (fore, back);
2311#ifdef OPTION_HC
2312 else if (ISSET_PIXCOLOR (Color_HC))
2313 back = Color_HC;
2314#endif
2308 2315
2309#ifndef NO_BOLD_UNDERLINE_REVERSE 2316#ifndef NO_BOLD_UNDERLINE_REVERSE
2317# ifndef OPTION_HC
2310 if (ISSET_PIXCOLOR (Color_RV)) 2318 if (ISSET_PIXCOLOR (Color_RV))
2311 back = Color_RV; 2319 back = Color_RV;
2312 2320# endif
2313 if (fore == back) 2321 if (fore == back)
2314 { 2322 {
2315 fore = Color_bg; 2323 fore = Color_bg;
2316 back = Color_fg; 2324 back = Color_fg;
2317 } 2325 }
… …
2328 } 2336 }
2329 else if (hidden_text) 2337 else if (hidden_text)
2330 fore = back; 2338 fore = back;
2331 } 2339 }
2332#endif 2340#endif
2341
2342#if ENABLE_STYLES
2343 // "careful" (too wide) character handling
2344
2345 // include previous careful character(s) if possible, looks nicer (best effort...)
2346 while (text > stp
2347 && srp[text - stp - 1] & RS_Careful
2348 && RS_SAME (rend, srp[text - stp - 1]))
2349 text--, count++, xpixel -= fwidth;
2350
2351 // force redraw after "careful" characters to avoid pixel droppings
2352 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2353 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2354
2355 // force redraw before "careful" characters to avoid pixel droppings
2356 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2357 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2358#endif
2333 } 2359 }
2334 2360
2335 /* 2361 /*
2336 * Actually do the drawing of the string here 2362 * Actually do the drawing of the string here
2337 */ 2363 */
2338 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2364 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2339 2365
2340 if (back == fore) 2366 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 { 2367 {
2344 // this is very ugly, maybe push it into ->draw? 2368 // this is very ugly, maybe push it into ->draw?
2345 2369
2346 for (i = 0; i < count; i++) /* don't draw empty strings */ 2370 for (i = 0; i < count; i++) /* don't draw empty strings */
2347 if (text[i] != ' ') 2371 if (text[i] != ' ')
2348 { 2372 {
2349 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2373 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2350 goto did_clear; 2374 goto did_clear;
2351 } 2375 }
2352 2376
2353 CLEAR_CHARS (xpixel, ypixel, count); 2377 CLEAR_CHARS (xpixel, ypixel, count);
2354 did_clear: ; 2378 did_clear: ;
… …
2382 */ 2406 */
2383 if (showcursor) 2407 if (showcursor)
2384 { 2408 {
2385 if (focus) 2409 if (focus)
2386 { 2410 {
2387 if (OPTION (Opt_cursorUnderline)) 2411 if (option (Opt_cursorUnderline))
2388 *crp ^= RS_Uline; 2412 *crp ^= RS_Uline;
2389 else 2413 else
2390 { 2414 {
2391 *crp ^= RS_RVid; 2415 *crp ^= RS_RVid;
2392#ifndef NO_CURSORCOLOR 2416#ifndef NO_CURSORCOLOR
… …
2407 cursorwidth++; 2431 cursorwidth++;
2408 2432
2409#ifndef NO_CURSORCOLOR 2433#ifndef NO_CURSORCOLOR
2410 if (ISSET_PIXCOLOR (Color_cursor)) 2434 if (ISSET_PIXCOLOR (Color_cursor))
2411 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2435 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2436 else
2412#endif 2437#endif
2438 XSetForeground (dpy, gc, pix_colors[ccol1]);
2413 2439
2414 XDrawRectangle (dpy, drawBuffer, gc, 2440 XDrawRectangle (dpy, drawBuffer, gc,
2415 Col2Pixel (col), 2441 Col2Pixel (col),
2416 Row2Pixel (oldcursor.row), 2442 Row2Pixel (oldcursor.row),
2417 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2443 (unsigned int) (Width2Pixel (cursorwidth) - 1),
… …
2455 2481
2456void 2482void
2457rxvt_term::scr_recolour () NOTHROW 2483rxvt_term::scr_recolour () NOTHROW
2458{ 2484{
2459 if (1 2485 if (1
2460#if TRANSPARENT 2486#if ENABLE_TRANSPARENCY
2461 && !am_transparent 2487 && !am_transparent
2462#endif 2488#endif
2463#if XPM_BACKGROUND 2489#ifdef HAVE_BG_PIXMAP
2464 && !bgPixmap.pixmap 2490 && !bgPixmap.pixmap
2465#endif 2491#endif
2466 ) 2492 )
2467 { 2493 {
2468 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2494 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
… …
3400 selection_delimit_word (DN, &selection.end, &selection.end); 3426 selection_delimit_word (DN, &selection.end, &selection.end);
3401 } 3427 }
3402 else if (selection.clicks == 3) 3428 else if (selection.clicks == 3)
3403 { 3429 {
3404#if ENABLE_FRILLS 3430#if ENABLE_FRILLS
3405 if (OPTION (Opt_tripleclickwords)) 3431 if (option (Opt_tripleclickwords))
3406 { 3432 {
3407 selection_delimit_word (UP, &selection.beg, &selection.beg); 3433 selection_delimit_word (UP, &selection.beg, &selection.beg);
3408 3434
3409 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3435 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3410 { 3436 {

Diff Legend

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