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.284 by ayin, Mon Nov 26 11:20:16 2007 UTC vs.
Revision 1.306 by root, Sun Jun 15 10:15:39 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.
… …
87/* 87/*
88 * CLEAR_ROWS : clear <num> rows starting from row <row> 88 * CLEAR_ROWS : clear <num> rows starting from row <row>
89 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 89 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
90 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour 90 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
91 */ 91 */
92#define drawBuffer vt
93
94#define CLEAR_ROWS(row, num) \ 92#define CLEAR_ROWS(row, num) \
95 if (mapped) \ 93 if (mapped) \
96 XClearArea (dpy, drawBuffer, 0, \ 94 XClearArea (dpy, vt, 0, \
97 Row2Pixel (row), (unsigned int)width, \ 95 Row2Pixel (row), (unsigned int)width, \
98 (unsigned int)Height2Pixel (num), False) 96 (unsigned int)Height2Pixel (num), False)
99 97
100#define CLEAR_CHARS(x, y, num) \ 98#define CLEAR_CHARS(x, y, num) \
101 if (mapped) \ 99 if (mapped) \
102 XClearArea (dpy, drawBuffer, x, y, \ 100 XClearArea (dpy, vt, x, y, \
103 (unsigned int)Width2Pixel (num), \ 101 (unsigned int)Width2Pixel (num), \
104 (unsigned int)Height2Pixel (1), False) 102 (unsigned int)Height2Pixel (1), False)
105 103
106#define ERASE_ROWS(row, num) \ 104#define ERASE_ROWS(row, num) \
107 XFillRectangle (dpy, drawBuffer, gc, \ 105 XFillRectangle (dpy, vt, gc, \
108 0, Row2Pixel (row), \ 106 0, Row2Pixel (row), \
109 (unsigned int)width, \ 107 (unsigned int)width, \
110 (unsigned int)Height2Pixel (num)) 108 (unsigned int)Height2Pixel (num))
111 109
112/* ------------------------------------------------------------------------- * 110/* ------------------------------------------------------------------------- *
113 * SCREEN `COMMON' ROUTINES * 111 * SCREEN `COMMON' ROUTINES *
114 * ------------------------------------------------------------------------- */ 112 * ------------------------------------------------------------------------- */
… …
596/* 594/*
597 * Change the rendition style for following text 595 * Change the rendition style for following text
598 */ 596 */
599void 597void
600rxvt_term::scr_rendition (int set, int style) NOTHROW 598rxvt_term::scr_rendition (int set, int style) NOTHROW
601 { 599{
602 if (set) 600 if (set)
603 rstyle |= style; 601 rstyle |= style;
604 else if (style == ~RS_None) 602 else if (style == ~RS_None)
605 rstyle = DEFAULT_RSTYLE; 603 rstyle = DEFAULT_RSTYLE;
606 else 604 else
607 rstyle &= ~style; 605 rstyle &= ~style;
608 } 606}
609 607
610/* ------------------------------------------------------------------------- */ 608/* ------------------------------------------------------------------------- */
611/* 609/*
612 * Scroll text between <row1> and <row2> inclusive, by <count> lines 610 * Scroll text between <row1> and <row2> inclusive, by <count> lines
613 * count positive ==> scroll up 611 * count positive ==> scroll up
… …
1011 * XTERM_SEQ: CTRL-H 1009 * XTERM_SEQ: CTRL-H
1012 */ 1010 */
1013void 1011void
1014rxvt_term::scr_backspace () NOTHROW 1012rxvt_term::scr_backspace () NOTHROW
1015{ 1013{
1016 want_refresh = 1;
1017
1018 if (screen.cur.col == 0) 1014 if (screen.cur.col == 0)
1019 { 1015 {
1020 if (screen.cur.row > 0) 1016 if (screen.cur.row > 0)
1021 { 1017 {
1022#ifdef TERMCAP_HAS_BW 1018#ifdef TERMCAP_HAS_BW
1023 screen.cur.col = ncol - 1; 1019 screen.cur.col = ncol - 1;
1024 screen.cur.row--; 1020 --screen.cur.row;
1025 return; 1021
1022 want_refresh = 1;
1026#endif 1023#endif
1027 } 1024 }
1028 } 1025 }
1029 else if (!(screen.flags & Screen_WrapNext)) 1026 else
1030 scr_gotorc (0, -1, RELATIVE); 1027 scr_gotorc (0, -1, RELATIVE);
1031
1032 screen.flags &= ~Screen_WrapNext;
1033} 1028}
1034 1029
1035/* ------------------------------------------------------------------------- */ 1030/* ------------------------------------------------------------------------- */
1036/* 1031/*
1037 * Process Horizontal Tab 1032 * Process Horizontal Tab
… …
1230/* 1225/*
1231 * Erase part or whole of a line 1226 * Erase part or whole of a line
1232 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1227 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1233 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1228 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1234 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1229 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1230 * extension: clear to right unless wrapped: ESC [ 3 K
1235 */ 1231 */
1236void 1232void
1237rxvt_term::scr_erase_line (int mode) NOTHROW 1233rxvt_term::scr_erase_line (int mode) NOTHROW
1238{ 1234{
1239 unsigned int col, num; 1235 unsigned int col, num;
… …
1248 line.touch (); 1244 line.touch ();
1249 line.is_longer (0); 1245 line.is_longer (0);
1250 1246
1251 switch (mode) 1247 switch (mode)
1252 { 1248 {
1249 case 3:
1250 if (screen.flags & Screen_WrapNext)
1251 return;
1252
1253 /* fall through */
1254
1253 case 0: /* erase to end of line */ 1255 case 0: /* erase to end of line */
1254 col = screen.cur.col; 1256 col = screen.cur.col;
1255 num = ncol - col; 1257 num = ncol - col;
1256 min_it (line.l, col); 1258 min_it (line.l, col);
1259
1257 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1260 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1258 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1261 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1259 CLEAR_SELECTION (); 1262 CLEAR_SELECTION ();
1260 break; 1263 break;
1264
1261 case 1: /* erase to beginning of line */ 1265 case 1: /* erase to beginning of line */
1262 col = 0; 1266 col = 0;
1263 num = screen.cur.col + 1; 1267 num = screen.cur.col + 1;
1268
1264 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1269 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1265 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1270 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1266 CLEAR_SELECTION (); 1271 CLEAR_SELECTION ();
1267 break; 1272 break;
1273
1268 case 2: /* erase whole line */ 1274 case 2: /* erase whole line */
1269 col = 0; 1275 col = 0;
1270 num = ncol; 1276 num = ncol;
1271 line.l = 0; 1277 line.l = 0;
1272 if (selection.beg.row <= screen.cur.row 1278 if (selection.beg.row <= screen.cur.row
… …
1872void 1878void
1873rxvt_term::bell_cb (ev::timer &w, int revents) 1879rxvt_term::bell_cb (ev::timer &w, int revents)
1874{ 1880{
1875 rvideo_bell = false; 1881 rvideo_bell = false;
1876 scr_rvideo_mode (rvideo_mode); 1882 scr_rvideo_mode (rvideo_mode);
1883 refresh_check ();
1877} 1884}
1878#endif 1885#endif
1879 1886
1880/* ------------------------------------------------------------------------- */ 1887/* ------------------------------------------------------------------------- */
1881void 1888void
… …
1903 1910
1904 if (option (Opt_visualBell)) 1911 if (option (Opt_visualBell))
1905 { 1912 {
1906 rvideo_bell = true; 1913 rvideo_bell = true;
1907 scr_rvideo_mode (rvideo_mode); 1914 scr_rvideo_mode (rvideo_mode);
1908 display->flush (); 1915 flush ();
1909 1916
1910 bell_ev.start (VISUAL_BELL_DURATION); 1917 bell_ev.start (VISUAL_BELL_DURATION);
1911 } 1918 }
1912 else 1919 else
1913 XBell (dpy, 0); 1920 XBell (dpy, 0);
… …
1996 return; 2003 return;
1997 2004
1998 /* 2005 /*
1999 * A: set up vars 2006 * A: set up vars
2000 */ 2007 */
2008 refresh_count = 0;
2009
2001 have_bg = 0; 2010 have_bg = 0;
2002 refresh_count = 0;
2003
2004#ifdef HAVE_BG_PIXMAP 2011#ifdef HAVE_BG_PIXMAP
2005 have_bg |= bgPixmap.pixmap != None; 2012 have_bg = bgPixmap.pixmap != None;
2006#endif 2013#endif
2007 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2014 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2008 2015
2009 /* 2016 /*
2010 * B: reverse any characters which are selected 2017 * B: reverse any characters which are selected
… …
2263 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2270 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2264 { 2271 {
2265 bool invert = rend & RS_RVid; 2272 bool invert = rend & RS_RVid;
2266 2273
2267#ifndef NO_BOLD_UNDERLINE_REVERSE 2274#ifndef NO_BOLD_UNDERLINE_REVERSE
2268 if (rend & RS_Bold
2269 && fore == Color_fg) 2275 if (rend & RS_Bold && fore == Color_fg)
2270 { 2276 {
2271 if (ISSET_PIXCOLOR (Color_BD)) 2277 if (ISSET_PIXCOLOR (Color_BD))
2272 fore = Color_BD; 2278 fore = Color_BD;
2273# if !ENABLE_STYLES 2279# if !ENABLE_STYLES
2274 else 2280 else
2275 invert = !invert; 2281 invert = !invert;
2276# endif 2282# endif
2277 } 2283 }
2278 2284
2279 if (rend & RS_Italic 2285 if (rend & RS_Italic && fore == Color_fg)
2280 && fore == Color_fg)
2281 { 2286 {
2282 if (ISSET_PIXCOLOR (Color_IT)) 2287 if (ISSET_PIXCOLOR (Color_IT))
2283 fore = Color_IT; 2288 fore = Color_IT;
2284# if !ENABLE_STYLES 2289# if !ENABLE_STYLES
2285 else 2290 else
… …
2319 } 2324 }
2320 2325
2321#ifdef TEXT_BLINK 2326#ifdef TEXT_BLINK
2322 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2327 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2323 { 2328 {
2324 if (!text_blink_ev.active) 2329 if (!text_blink_ev.is_active ())
2325 { 2330 {
2326 text_blink_ev.start (TEXT_BLINK_INTERVAL, TEXT_BLINK_INTERVAL); 2331 text_blink_ev.again ();
2327 hidden_text = 0; 2332 hidden_text = 0;
2328 } 2333 }
2329 else if (hidden_text) 2334 else if (hidden_text)
2330 fore = back; 2335 fore = back;
2331 } 2336 }
… …
2379 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2384 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2380 else 2385 else
2381#endif 2386#endif
2382 XSetForeground (dpy, gc, pix_colors[fore]); 2387 XSetForeground (dpy, gc, pix_colors[fore]);
2383 2388
2384 XDrawLine (dpy, drawBuffer, gc, 2389 XDrawLine (dpy, vt, gc,
2385 xpixel, ypixel + font->ascent + 1, 2390 xpixel, ypixel + font->ascent + 1,
2386 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2391 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2387 } 2392 }
2388 } /* for (col....) */ 2393 } /* for (col....) */
2389 } /* for (row....) */ 2394 } /* for (row....) */
… …
2427 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2432 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2428 else 2433 else
2429#endif 2434#endif
2430 XSetForeground (dpy, gc, pix_colors[ccol1]); 2435 XSetForeground (dpy, gc, pix_colors[ccol1]);
2431 2436
2432 XDrawRectangle (dpy, drawBuffer, gc, 2437 XDrawRectangle (dpy, vt, gc,
2433 Col2Pixel (col), 2438 Col2Pixel (col),
2434 Row2Pixel (oldcursor.row), 2439 Row2Pixel (oldcursor.row),
2435 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2440 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2436 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2441 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2437 } 2442 }
… …
2475rxvt_term::scr_recolour () NOTHROW 2480rxvt_term::scr_recolour () NOTHROW
2476{ 2481{
2477#ifdef HAVE_BG_PIXMAP 2482#ifdef HAVE_BG_PIXMAP
2478 bgPixmap.apply (); 2483 bgPixmap.apply ();
2479#else 2484#else
2485
2480 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2486 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2481 XClearWindow (dpy, parent[0]); 2487 XClearWindow (dpy, parent[0]);
2482 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2488 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2483# if HAVE_SCROLLBARS 2489
2484 if (scrollBar.win) 2490 if (scrollBar.win)
2485 { 2491 {
2486 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2492 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2487 scrollBar.setIdle (); 2493 scrollBar.state = STATE_IDLE;
2488 scrollbar_show (0); 2494 scrollBar.show (0);
2489 } 2495 }
2496
2490# endif 2497#endif
2498
2499 /* bgPixmap.apply () does not do the following : */
2491 scr_clear (); 2500 scr_clear ();
2492 scr_touch (true); 2501 scr_touch (true);
2493 want_refresh = 1; 2502 want_refresh = 1;
2494#endif
2495
2496} 2503}
2497 2504
2498/* ------------------------------------------------------------------------- */ 2505/* ------------------------------------------------------------------------- */
2499void 2506void
2500rxvt_term::scr_clear (bool really) NOTHROW 2507rxvt_term::scr_clear (bool really) NOTHROW
… …
2589{ 2596{
2590 int row, wrote; 2597 int row, wrote;
2591 unsigned int width, towrite; 2598 unsigned int width, towrite;
2592 char r1[] = "\n"; 2599 char r1[] = "\n";
2593 2600
2594 for (row = saveLines - nsaved; 2601 for (row = saveLines + top_row;
2595 row < saveLines + nrow - 1; row++) 2602 row < saveLines + nrow - 1; row++)
2596 { 2603 {
2597 width = row_buf[row].l >= 0 ? row_buf[row].l 2604 width = row_buf[row].l >= 0 ? row_buf[row].l
2598 : ncol; 2605 : ncol;
2599 for (towrite = width; towrite; towrite -= wrote) 2606 for (towrite = width; towrite; towrite -= wrote)
… …
2650 /* convert normal newline chars into common keyboard Return key sequence */ 2657 /* convert normal newline chars into common keyboard Return key sequence */
2651 for (unsigned int i = 0; i < len; i++) 2658 for (unsigned int i = 0; i < len; i++)
2652 if (data[i] == C0_LF) 2659 if (data[i] == C0_LF)
2653 data[i] = C0_CR; 2660 data[i] = C0_CR;
2654 2661
2662 if (priv_modes & PrivMode_BracketPaste)
2663 tt_printf ("\e[200~");
2664
2655 tt_write (data, len); 2665 tt_write (data, len);
2666
2667 if (priv_modes & PrivMode_BracketPaste)
2668 tt_printf ("\e[201~");
2656} 2669}
2657 2670
2658/* ------------------------------------------------------------------------- */ 2671/* ------------------------------------------------------------------------- */
2659/* 2672/*
2660 * Respond to a notification that a primary selection has been sent 2673 * Respond to a notification that a primary selection has been sent

Diff Legend

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