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.298 by ayin, Sun Jan 20 14:12:39 2008 UTC vs.
Revision 1.305 by ayin, Thu Feb 21 10:30:24 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 * ------------------------------------------------------------------------- */
… …
1994 return; 1992 return;
1995 1993
1996 /* 1994 /*
1997 * A: set up vars 1995 * A: set up vars
1998 */ 1996 */
1997 refresh_count = 0;
1998
1999 have_bg = 0; 1999 have_bg = 0;
2000 refresh_count = 0;
2001
2002#ifdef HAVE_BG_PIXMAP 2000#ifdef HAVE_BG_PIXMAP
2003 have_bg |= bgPixmap.pixmap != None; 2001 have_bg = bgPixmap.pixmap != None;
2004#endif 2002#endif
2005 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2003 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2006 2004
2007 /* 2005 /*
2008 * B: reverse any characters which are selected 2006 * B: reverse any characters which are selected
… …
2375 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2373 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2376 else 2374 else
2377#endif 2375#endif
2378 XSetForeground (dpy, gc, pix_colors[fore]); 2376 XSetForeground (dpy, gc, pix_colors[fore]);
2379 2377
2380 XDrawLine (dpy, drawBuffer, gc, 2378 XDrawLine (dpy, vt, gc,
2381 xpixel, ypixel + font->ascent + 1, 2379 xpixel, ypixel + font->ascent + 1,
2382 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2380 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2383 } 2381 }
2384 } /* for (col....) */ 2382 } /* for (col....) */
2385 } /* for (row....) */ 2383 } /* for (row....) */
… …
2423 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2421 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2424 else 2422 else
2425#endif 2423#endif
2426 XSetForeground (dpy, gc, pix_colors[ccol1]); 2424 XSetForeground (dpy, gc, pix_colors[ccol1]);
2427 2425
2428 XDrawRectangle (dpy, drawBuffer, gc, 2426 XDrawRectangle (dpy, vt, gc,
2429 Col2Pixel (col), 2427 Col2Pixel (col),
2430 Row2Pixel (oldcursor.row), 2428 Row2Pixel (oldcursor.row),
2431 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2429 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2432 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2430 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2433 } 2431 }
… …
2476 2474
2477 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2475 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2478 XClearWindow (dpy, parent[0]); 2476 XClearWindow (dpy, parent[0]);
2479 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2477 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2480 2478
2481# if HAVE_SCROLLBARS
2482 if (scrollBar.win) 2479 if (scrollBar.win)
2483 { 2480 {
2484 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2481 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2485 scrollBar.setIdle (); 2482 scrollBar.state = STATE_IDLE;
2486 scrollbar_show (0); 2483 scrollBar.show (0);
2487 } 2484 }
2485
2488# endif 2486#endif
2489 2487
2488 /* bgPixmap.apply () does not do the following : */
2490 scr_clear (); 2489 scr_clear ();
2491 scr_touch (true); 2490 scr_touch (true);
2492 want_refresh = 1; 2491 want_refresh = 1;
2493
2494#endif
2495} 2492}
2496 2493
2497/* ------------------------------------------------------------------------- */ 2494/* ------------------------------------------------------------------------- */
2498void 2495void
2499rxvt_term::scr_clear (bool really) NOTHROW 2496rxvt_term::scr_clear (bool really) NOTHROW
… …
2588{ 2585{
2589 int row, wrote; 2586 int row, wrote;
2590 unsigned int width, towrite; 2587 unsigned int width, towrite;
2591 char r1[] = "\n"; 2588 char r1[] = "\n";
2592 2589
2593 for (row = saveLines - nsaved; 2590 for (row = saveLines + top_row;
2594 row < saveLines + nrow - 1; row++) 2591 row < saveLines + nrow - 1; row++)
2595 { 2592 {
2596 width = row_buf[row].l >= 0 ? row_buf[row].l 2593 width = row_buf[row].l >= 0 ? row_buf[row].l
2597 : ncol; 2594 : ncol;
2598 for (towrite = width; towrite; towrite -= wrote) 2595 for (towrite = width; towrite; towrite -= wrote)

Diff Legend

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