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.297 by root, Wed Jan 9 01:14:29 2008 UTC vs.
Revision 1.306 by root, Sun Jun 15 10:15:39 2008 UTC

… …
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 * ------------------------------------------------------------------------- */
… …
1227/* 1225/*
1228 * Erase part or whole of a line 1226 * Erase part or whole of a line
1229 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1227 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1230 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1228 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1231 * 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
1232 */ 1231 */
1233void 1232void
1234rxvt_term::scr_erase_line (int mode) NOTHROW 1233rxvt_term::scr_erase_line (int mode) NOTHROW
1235{ 1234{
1236 unsigned int col, num; 1235 unsigned int col, num;
… …
1245 line.touch (); 1244 line.touch ();
1246 line.is_longer (0); 1245 line.is_longer (0);
1247 1246
1248 switch (mode) 1247 switch (mode)
1249 { 1248 {
1249 case 3:
1250 if (screen.flags & Screen_WrapNext)
1251 return;
1252
1253 /* fall through */
1254
1250 case 0: /* erase to end of line */ 1255 case 0: /* erase to end of line */
1251 col = screen.cur.col; 1256 col = screen.cur.col;
1252 num = ncol - col; 1257 num = ncol - col;
1253 min_it (line.l, col); 1258 min_it (line.l, col);
1259
1254 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1260 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1255 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1261 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1256 CLEAR_SELECTION (); 1262 CLEAR_SELECTION ();
1257 break; 1263 break;
1264
1258 case 1: /* erase to beginning of line */ 1265 case 1: /* erase to beginning of line */
1259 col = 0; 1266 col = 0;
1260 num = screen.cur.col + 1; 1267 num = screen.cur.col + 1;
1268
1261 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1269 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1262 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1270 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1263 CLEAR_SELECTION (); 1271 CLEAR_SELECTION ();
1264 break; 1272 break;
1273
1265 case 2: /* erase whole line */ 1274 case 2: /* erase whole line */
1266 col = 0; 1275 col = 0;
1267 num = ncol; 1276 num = ncol;
1268 line.l = 0; 1277 line.l = 0;
1269 if (selection.beg.row <= screen.cur.row 1278 if (selection.beg.row <= screen.cur.row
… …
1994 return; 2003 return;
1995 2004
1996 /* 2005 /*
1997 * A: set up vars 2006 * A: set up vars
1998 */ 2007 */
2008 refresh_count = 0;
2009
1999 have_bg = 0; 2010 have_bg = 0;
2000 refresh_count = 0;
2001
2002#ifdef HAVE_BG_PIXMAP 2011#ifdef HAVE_BG_PIXMAP
2003 have_bg |= bgPixmap.pixmap != None; 2012 have_bg = bgPixmap.pixmap != None;
2004#endif 2013#endif
2005 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2014 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2006 2015
2007 /* 2016 /*
2008 * B: reverse any characters which are selected 2017 * B: reverse any characters which are selected
… …
2375 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2384 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2376 else 2385 else
2377#endif 2386#endif
2378 XSetForeground (dpy, gc, pix_colors[fore]); 2387 XSetForeground (dpy, gc, pix_colors[fore]);
2379 2388
2380 XDrawLine (dpy, drawBuffer, gc, 2389 XDrawLine (dpy, vt, gc,
2381 xpixel, ypixel + font->ascent + 1, 2390 xpixel, ypixel + font->ascent + 1,
2382 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2391 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2383 } 2392 }
2384 } /* for (col....) */ 2393 } /* for (col....) */
2385 } /* for (row....) */ 2394 } /* for (row....) */
… …
2423 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2432 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2424 else 2433 else
2425#endif 2434#endif
2426 XSetForeground (dpy, gc, pix_colors[ccol1]); 2435 XSetForeground (dpy, gc, pix_colors[ccol1]);
2427 2436
2428 XDrawRectangle (dpy, drawBuffer, gc, 2437 XDrawRectangle (dpy, vt, gc,
2429 Col2Pixel (col), 2438 Col2Pixel (col),
2430 Row2Pixel (oldcursor.row), 2439 Row2Pixel (oldcursor.row),
2431 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2440 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2432 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2441 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2433 } 2442 }
… …
2476 2485
2477 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2486 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2478 XClearWindow (dpy, parent[0]); 2487 XClearWindow (dpy, parent[0]);
2479 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2488 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2480 2489
2481# if HAVE_SCROLLBARS
2482 if (scrollBar.win) 2490 if (scrollBar.win)
2483 { 2491 {
2484 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2492 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2485 scrollBar.setIdle (); 2493 scrollBar.state = STATE_IDLE;
2486 scrollbar_show (0); 2494 scrollBar.show (0);
2487 } 2495 }
2496
2488# endif 2497#endif
2489 2498
2499 /* bgPixmap.apply () does not do the following : */
2490 scr_clear (); 2500 scr_clear ();
2491 scr_touch (true); 2501 scr_touch (true);
2492 want_refresh = 1; 2502 want_refresh = 1;
2493
2494#endif
2495} 2503}
2496 2504
2497/* ------------------------------------------------------------------------- */ 2505/* ------------------------------------------------------------------------- */
2498void 2506void
2499rxvt_term::scr_clear (bool really) NOTHROW 2507rxvt_term::scr_clear (bool really) NOTHROW
… …
2588{ 2596{
2589 int row, wrote; 2597 int row, wrote;
2590 unsigned int width, towrite; 2598 unsigned int width, towrite;
2591 char r1[] = "\n"; 2599 char r1[] = "\n";
2592 2600
2593 for (row = saveLines - nsaved; 2601 for (row = saveLines + top_row;
2594 row < saveLines + nrow - 1; row++) 2602 row < saveLines + nrow - 1; row++)
2595 { 2603 {
2596 width = row_buf[row].l >= 0 ? row_buf[row].l 2604 width = row_buf[row].l >= 0 ? row_buf[row].l
2597 : ncol; 2605 : ncol;
2598 for (towrite = width; towrite; towrite -= wrote) 2606 for (towrite = width; towrite; towrite -= wrote)
… …
2649 /* convert normal newline chars into common keyboard Return key sequence */ 2657 /* convert normal newline chars into common keyboard Return key sequence */
2650 for (unsigned int i = 0; i < len; i++) 2658 for (unsigned int i = 0; i < len; i++)
2651 if (data[i] == C0_LF) 2659 if (data[i] == C0_LF)
2652 data[i] = C0_CR; 2660 data[i] = C0_CR;
2653 2661
2662 if (priv_modes & PrivMode_BracketPaste)
2663 tt_printf ("\e[200~");
2664
2654 tt_write (data, len); 2665 tt_write (data, len);
2666
2667 if (priv_modes & PrivMode_BracketPaste)
2668 tt_printf ("\e[201~");
2655} 2669}
2656 2670
2657/* ------------------------------------------------------------------------- */ 2671/* ------------------------------------------------------------------------- */
2658/* 2672/*
2659 * 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