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.296 by root, Wed Jan 9 01:05:24 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
… …
1011 * XTERM_SEQ: CTRL-H 1011 * XTERM_SEQ: CTRL-H
1012 */ 1012 */
1013void 1013void
1014rxvt_term::scr_backspace () NOTHROW 1014rxvt_term::scr_backspace () NOTHROW
1015{ 1015{
1016 want_refresh = 1;
1017
1018 if (screen.cur.col == 0) 1016 if (screen.cur.col == 0)
1019 { 1017 {
1020 if (screen.cur.row > 0) 1018 if (screen.cur.row > 0)
1021 { 1019 {
1022#ifdef TERMCAP_HAS_BW 1020#ifdef TERMCAP_HAS_BW
1023 screen.cur.col = ncol - 1; 1021 screen.cur.col = ncol - 1;
1024 screen.cur.row--; 1022 screen.cur.row--;
1025 return; 1023 want_refresh = 1;
1026#endif 1024#endif
1027 } 1025 }
1028 } 1026 }
1029 else if (!(screen.flags & Screen_WrapNext)) 1027 else
1030 scr_gotorc (0, -1, RELATIVE); 1028 scr_gotorc (0, -1, RELATIVE);
1031
1032 screen.flags &= ~Screen_WrapNext;
1033} 1029}
1034 1030
1035/* ------------------------------------------------------------------------- */ 1031/* ------------------------------------------------------------------------- */
1036/* 1032/*
1037 * Process Horizontal Tab 1033 * Process Horizontal Tab
… …
1872void 1868void
1873rxvt_term::bell_cb (ev::timer &w, int revents) 1869rxvt_term::bell_cb (ev::timer &w, int revents)
1874{ 1870{
1875 rvideo_bell = false; 1871 rvideo_bell = false;
1876 scr_rvideo_mode (rvideo_mode); 1872 scr_rvideo_mode (rvideo_mode);
1873 refresh_check ();
1877} 1874}
1878#endif 1875#endif
1879 1876
1880/* ------------------------------------------------------------------------- */ 1877/* ------------------------------------------------------------------------- */
1881void 1878void
… …
1903 1900
1904 if (option (Opt_visualBell)) 1901 if (option (Opt_visualBell))
1905 { 1902 {
1906 rvideo_bell = true; 1903 rvideo_bell = true;
1907 scr_rvideo_mode (rvideo_mode); 1904 scr_rvideo_mode (rvideo_mode);
1908 display->flush (); 1905 flush ();
1909 1906
1910 bell_ev.start (VISUAL_BELL_DURATION); 1907 bell_ev.start (VISUAL_BELL_DURATION);
1911 } 1908 }
1912 else 1909 else
1913 XBell (dpy, 0); 1910 XBell (dpy, 0);
… …
2263 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2260 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2264 { 2261 {
2265 bool invert = rend & RS_RVid; 2262 bool invert = rend & RS_RVid;
2266 2263
2267#ifndef NO_BOLD_UNDERLINE_REVERSE 2264#ifndef NO_BOLD_UNDERLINE_REVERSE
2268 if (rend & RS_Bold
2269 && fore == Color_fg) 2265 if (rend & RS_Bold && fore == Color_fg)
2270 { 2266 {
2271 if (ISSET_PIXCOLOR (Color_BD)) 2267 if (ISSET_PIXCOLOR (Color_BD))
2272 fore = Color_BD; 2268 fore = Color_BD;
2273# if !ENABLE_STYLES 2269# if !ENABLE_STYLES
2274 else 2270 else
2275 invert = !invert; 2271 invert = !invert;
2276# endif 2272# endif
2277 } 2273 }
2278 2274
2279 if (rend & RS_Italic 2275 if (rend & RS_Italic && fore == Color_fg)
2280 && fore == Color_fg)
2281 { 2276 {
2282 if (ISSET_PIXCOLOR (Color_IT)) 2277 if (ISSET_PIXCOLOR (Color_IT))
2283 fore = Color_IT; 2278 fore = Color_IT;
2284# if !ENABLE_STYLES 2279# if !ENABLE_STYLES
2285 else 2280 else
… …
2319 } 2314 }
2320 2315
2321#ifdef TEXT_BLINK 2316#ifdef TEXT_BLINK
2322 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2317 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2323 { 2318 {
2324 if (!ev_is_active (&text_blink_ev)) 2319 if (!text_blink_ev.is_active ())
2325 { 2320 {
2326 text_blink_ev.start (TEXT_BLINK_INTERVAL, TEXT_BLINK_INTERVAL); 2321 text_blink_ev.again ();
2327 hidden_text = 0; 2322 hidden_text = 0;
2328 } 2323 }
2329 else if (hidden_text) 2324 else if (hidden_text)
2330 fore = back; 2325 fore = back;
2331 } 2326 }
… …
2475rxvt_term::scr_recolour () NOTHROW 2470rxvt_term::scr_recolour () NOTHROW
2476{ 2471{
2477#ifdef HAVE_BG_PIXMAP 2472#ifdef HAVE_BG_PIXMAP
2478 bgPixmap.apply (); 2473 bgPixmap.apply ();
2479#else 2474#else
2475
2480 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2476 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2481 XClearWindow (dpy, parent[0]); 2477 XClearWindow (dpy, parent[0]);
2482 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2478 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2479
2483# if HAVE_SCROLLBARS 2480# if HAVE_SCROLLBARS
2484 if (scrollBar.win) 2481 if (scrollBar.win)
2485 { 2482 {
2486 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2483 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2487 scrollBar.setIdle (); 2484 scrollBar.setIdle ();
2488 scrollbar_show (0); 2485 scrollbar_show (0);
2489 } 2486 }
2490# endif 2487# endif
2488
2491 scr_clear (); 2489 scr_clear ();
2492 scr_touch (true); 2490 scr_touch (true);
2493 want_refresh = 1; 2491 want_refresh = 1;
2494#endif
2495 2492
2493#endif
2496} 2494}
2497 2495
2498/* ------------------------------------------------------------------------- */ 2496/* ------------------------------------------------------------------------- */
2499void 2497void
2500rxvt_term::scr_clear (bool really) NOTHROW 2498rxvt_term::scr_clear (bool really) NOTHROW

Diff Legend

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