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.285 by root, Tue Dec 11 03:30:50 2007 UTC vs.
Revision 1.294 by root, Wed Jan 9 00:51:50 2008 UTC

1/*---------------------------------------------------------------------------* 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-2007 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
596/* 596/*
597 * Change the rendition style for following text 597 * Change the rendition style for following text
598 */ 598 */
599void 599void
600rxvt_term::scr_rendition (int set, int style) NOTHROW 600rxvt_term::scr_rendition (int set, int style) NOTHROW
601 { 601{
602 if (set) 602 if (set)
603 rstyle |= style; 603 rstyle |= style;
604 else if (style == ~RS_None) 604 else if (style == ~RS_None)
605 rstyle = DEFAULT_RSTYLE; 605 rstyle = DEFAULT_RSTYLE;
606 else 606 else
607 rstyle &= ~style; 607 rstyle &= ~style;
608 } 608}
609 609
610/* ------------------------------------------------------------------------- */ 610/* ------------------------------------------------------------------------- */
611/* 611/*
612 * Scroll text between <row1> and <row2> inclusive, by <count> lines 612 * Scroll text between <row1> and <row2> inclusive, by <count> lines
613 * count positive ==> scroll up 613 * count positive ==> scroll up
… …
1024 screen.cur.row--; 1024 screen.cur.row--;
1025 return; 1025 return;
1026#endif 1026#endif
1027 } 1027 }
1028 } 1028 }
1029 else if (!(screen.flags & Screen_WrapNext)) 1029 else
1030 scr_gotorc (0, -1, RELATIVE); 1030 scr_gotorc (0, -1, RELATIVE);
1031 1031
1032 screen.flags &= ~Screen_WrapNext; 1032 screen.flags &= ~Screen_WrapNext;
1033} 1033}
1034 1034
… …
1872void 1872void
1873rxvt_term::bell_cb (ev::timer &w, int revents) 1873rxvt_term::bell_cb (ev::timer &w, int revents)
1874{ 1874{
1875 rvideo_bell = false; 1875 rvideo_bell = false;
1876 scr_rvideo_mode (rvideo_mode); 1876 scr_rvideo_mode (rvideo_mode);
1877 refresh_check ();
1877} 1878}
1878#endif 1879#endif
1879 1880
1880/* ------------------------------------------------------------------------- */ 1881/* ------------------------------------------------------------------------- */
1881void 1882void
… …
1903 1904
1904 if (option (Opt_visualBell)) 1905 if (option (Opt_visualBell))
1905 { 1906 {
1906 rvideo_bell = true; 1907 rvideo_bell = true;
1907 scr_rvideo_mode (rvideo_mode); 1908 scr_rvideo_mode (rvideo_mode);
1908 display->flush (); 1909 flush ();
1909 1910
1910 bell_ev.start (VISUAL_BELL_DURATION); 1911 bell_ev.start (VISUAL_BELL_DURATION);
1911 } 1912 }
1912 else 1913 else
1913 XBell (dpy, 0); 1914 XBell (dpy, 0);
… …
2263 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2264 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2264 { 2265 {
2265 bool invert = rend & RS_RVid; 2266 bool invert = rend & RS_RVid;
2266 2267
2267#ifndef NO_BOLD_UNDERLINE_REVERSE 2268#ifndef NO_BOLD_UNDERLINE_REVERSE
2268 if (rend & RS_Bold
2269 && fore == Color_fg) 2269 if (rend & RS_Bold && fore == Color_fg)
2270 { 2270 {
2271 if (ISSET_PIXCOLOR (Color_BD)) 2271 if (ISSET_PIXCOLOR (Color_BD))
2272 fore = Color_BD; 2272 fore = Color_BD;
2273# if !ENABLE_STYLES 2273# if !ENABLE_STYLES
2274 else 2274 else
2275 invert = !invert; 2275 invert = !invert;
2276# endif 2276# endif
2277 } 2277 }
2278 2278
2279 if (rend & RS_Italic 2279 if (rend & RS_Italic && fore == Color_fg)
2280 && fore == Color_fg)
2281 { 2280 {
2282 if (ISSET_PIXCOLOR (Color_IT)) 2281 if (ISSET_PIXCOLOR (Color_IT))
2283 fore = Color_IT; 2282 fore = Color_IT;
2284# if !ENABLE_STYLES 2283# if !ENABLE_STYLES
2285 else 2284 else
… …
2319 } 2318 }
2320 2319
2321#ifdef TEXT_BLINK 2320#ifdef TEXT_BLINK
2322 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2321 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2323 { 2322 {
2324 if (!ev_is_active (&text_blink_ev)) 2323 if (!text_blink_ev.is_active ())
2325 { 2324 {
2326 text_blink_ev.start (TEXT_BLINK_INTERVAL, TEXT_BLINK_INTERVAL); 2325 text_blink_ev.again ();
2327 hidden_text = 0; 2326 hidden_text = 0;
2328 } 2327 }
2329 else if (hidden_text) 2328 else if (hidden_text)
2330 fore = back; 2329 fore = back;
2331 } 2330 }
… …
2475rxvt_term::scr_recolour () NOTHROW 2474rxvt_term::scr_recolour () NOTHROW
2476{ 2475{
2477#ifdef HAVE_BG_PIXMAP 2476#ifdef HAVE_BG_PIXMAP
2478 bgPixmap.apply (); 2477 bgPixmap.apply ();
2479#else 2478#else
2479
2480 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2480 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2481 XClearWindow (dpy, parent[0]); 2481 XClearWindow (dpy, parent[0]);
2482 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2482 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2483
2483# if HAVE_SCROLLBARS 2484# if HAVE_SCROLLBARS
2484 if (scrollBar.win) 2485 if (scrollBar.win)
2485 { 2486 {
2486 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2487 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2487 scrollBar.setIdle (); 2488 scrollBar.setIdle ();
2488 scrollbar_show (0); 2489 scrollbar_show (0);
2489 } 2490 }
2490# endif 2491# endif
2492
2491 scr_clear (); 2493 scr_clear ();
2492 scr_touch (true); 2494 scr_touch (true);
2493 want_refresh = 1; 2495 want_refresh = 1;
2494#endif
2495 2496
2497#endif
2496} 2498}
2497 2499
2498/* ------------------------------------------------------------------------- */ 2500/* ------------------------------------------------------------------------- */
2499void 2501void
2500rxvt_term::scr_clear (bool really) NOTHROW 2502rxvt_term::scr_clear (bool really) NOTHROW

Diff Legend

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