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.320 by root, Tue Nov 4 23:20:17 2008 UTC vs.
Revision 1.327 by root, Wed Nov 5 14:43:54 2008 UTC

… …
158 * ------------------------------------------------------------------------- */ 158 * ------------------------------------------------------------------------- */
159 159
160void 160void
161rxvt_term::scr_reset () 161rxvt_term::scr_reset ()
162{ 162{
163 scr_soft_reset ();
164 view_start = 0; 163 view_start = 0;
165
166 num_scr = 0; 164 num_scr = 0;
167 165
168 if (ncol == 0) 166 if (ncol == 0)
169 ncol = 80; 167 ncol = 80;
170 168
… …
280 278
281 if (top_row) 279 if (top_row)
282 { 280 {
283 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 281 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
284 // to come up with a lean and mean algorithm. 282 // to come up with a lean and mean algorithm.
283 // TODO: maybe optimise when width didn't change
285 284
286 row_col_t ocur = screen.cur; 285 row_col_t ocur = screen.cur;
287 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 286 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
288 287
289 do 288 do
… …
395 394
396 clamp_it (screen.cur.row, 0, nrow - 1); 395 clamp_it (screen.cur.row, 0, nrow - 1);
397 clamp_it (screen.cur.col, 0, ncol - 1); 396 clamp_it (screen.cur.col, 0, ncol - 1);
398 } 397 }
399 398
399 free (tabs);
400 tabs = (char *)rxvt_malloc (ncol);
401
402 for (int col = ncol; --col; )
403 tabs [col] = col % TABSIZE == 0;
404
400 CLEAR_ALL_SELECTION (); 405 CLEAR_ALL_SELECTION ();
401 406
402 prev_nrow = nrow; 407 prev_nrow = nrow;
403 prev_ncol = ncol; 408 prev_ncol = ncol;
404 409
… …
436void 441void
437rxvt_term::scr_poweron () 442rxvt_term::scr_poweron ()
438{ 443{
439 scr_release (); 444 scr_release ();
440 prev_nrow = prev_ncol = 0; 445 prev_nrow = prev_ncol = 0;
446 rvideo_mode = false;
447 scr_soft_reset ();
441 scr_reset (); 448 scr_reset ();
442 449
443 scr_clear (true); 450 scr_clear (true);
444 scr_refresh (); 451 scr_refresh ();
445} 452}
… …
450 /* only affects modes, nothing drastic such as clearing the screen */ 457 /* only affects modes, nothing drastic such as clearing the screen */
451#if ENABLE_OVERLAY 458#if ENABLE_OVERLAY
452 scr_overlay_off (); 459 scr_overlay_off ();
453#endif 460#endif
454 461
455 rvideo_mode = false;
456
457 if (current_screen != PRIMARY) 462 if (current_screen != PRIMARY)
458 scr_swap_screen (); 463 scr_swap_screen ();
459
460 free (tabs);
461 tabs = (char *)rxvt_malloc (ncol);
462
463 for (int col = ncol; --col; )
464 tabs [col] = col % TABSIZE == 0;
465 464
466 scr_scroll_region (0, MAX_ROWS - 1); 465 scr_scroll_region (0, MAX_ROWS - 1);
467 scr_rendition (0, ~RS_None); 466 scr_rendition (0, ~RS_None);
468 scr_insert_mode (0); 467 scr_insert_mode (0);
469} 468}
… …
1342 if (row >= nrow) /* Out Of Bounds */ 1341 if (row >= nrow) /* Out Of Bounds */
1343 return; 1342 return;
1344 1343
1345 min_it (num, nrow - row); 1344 min_it (num, nrow - row);
1346 1345
1347 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */ 1346 // TODO: the code below does not work when view_start != 0
1347 // the workaround is to disable the clear and use a normal refresh
1348 // when view_start != 0. mysterious.
1348 if (rstyle & (RS_RVid | RS_Uline)) 1349 if (rstyle & (RS_RVid | RS_Uline))
1349 ren = (rend_t) ~RS_None; 1350 ren = (rend_t) ~RS_None;
1350 else if (GET_BASEBG (rstyle) == Color_bg) 1351 else if (GET_BASEBG (rstyle) == Color_bg)
1351 { 1352 {
1352 ren = DEFAULT_RSTYLE; 1353 ren = DEFAULT_RSTYLE;
1353 1354
1354 if (mapped) 1355 if (mapped && !view_start)
1355 XClearArea (dpy, vt, 0, 1356 XClearArea (dpy, vt, 0,
1356 Row2Pixel (row), (unsigned int)width, 1357 Row2Pixel (row - view_start), (unsigned int)width,
1357 (unsigned int)Height2Pixel (num), False); 1358 (unsigned int)Height2Pixel (num), False);
1358 } 1359 }
1359 else 1360 else
1360 { 1361 {
1361 ren = rstyle & (RS_fgMask | RS_bgMask); 1362 ren = rstyle & (RS_fgMask | RS_bgMask);
1362 1363
1364 if (mapped && !view_start)
1365 {
1363 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1366 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1364 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1367 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1365 XFillRectangle (dpy, vt, gc, 1368 XFillRectangle (dpy, vt, gc,
1366 0, Row2Pixel (row), 1369 0, Row2Pixel (row - view_start),
1367 (unsigned int)width, 1370 (unsigned int)width,
1368 (unsigned int)Height2Pixel (num)); 1371 (unsigned int)Height2Pixel (num));
1369 gcvalue.foreground = pix_colors[Color_fg]; 1372 gcvalue.foreground = pix_colors[Color_fg];
1370 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1373 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1374 }
1371 } 1375 }
1372 1376
1373 for (; num--; row++) 1377 for (; num--; row++)
1374 { 1378 {
1375 scr_blank_screen_mem (ROW(row), rstyle); 1379 scr_blank_screen_mem (ROW(row), rstyle);
1380
1381 if (!view_start)
1376 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1382 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1377 } 1383 }
1378} 1384}
1379 1385
1380#if !ENABLE_MINIMAL 1386#if !ENABLE_MINIMAL
1381void 1387void
… …
1534 { 1540 {
1535 line->t[col] = line->t[col + count]; 1541 line->t[col] = line->t[col + count];
1536 line->r[col] = line->r[col + count]; 1542 line->r[col] = line->r[col + count];
1537 } 1543 }
1538 1544
1539 scr_blank_line (*line, ncol - count, count, 1545 scr_blank_line (*line, ncol - count, count, rstyle);
1540 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1541 1546
1542 if (selection.op && current_screen == selection.screen 1547 if (selection.op && current_screen == selection.screen
1543 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1548 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1544 { 1549 {
1545 if (selection.end.row != screen.cur.row 1550 if (selection.end.row != screen.cur.row
… …
2003 * screen.text/screen.rend contain what the screen will change to. 2008 * screen.text/screen.rend contain what the screen will change to.
2004 */ 2009 */
2005void 2010void
2006rxvt_term::scr_refresh () NOTHROW 2011rxvt_term::scr_refresh () NOTHROW
2007{ 2012{
2008 unsigned char have_bg,
2009 showcursor; /* show the cursor */
2010 int16_t col, row, /* column/row we're processing */ 2013 int16_t col, row, /* column/row we're processing */
2011 ocrow; /* old cursor row */ 2014 ocrow; /* old cursor row */
2012 int i; /* tmp */ 2015 int i; /* tmp */
2013#ifndef NO_CURSORCOLOR 2016#ifndef NO_CURSORCOLOR
2014 rend_t cc1; /* store colours at cursor position (s) */ 2017 rend_t cc1; /* store colours at cursor position (s) */
… …
2025 /* 2028 /*
2026 * A: set up vars 2029 * A: set up vars
2027 */ 2030 */
2028 refresh_count = 0; 2031 refresh_count = 0;
2029 2032
2033 unsigned int old_screen_flags = screen.flags;
2030 have_bg = 0; 2034 char have_bg = 0;
2031#ifdef HAVE_BG_PIXMAP 2035#ifdef HAVE_BG_PIXMAP
2032 have_bg = bgPixmap.pixmap != None; 2036 have_bg = bgPixmap.pixmap != None;
2033#endif 2037#endif
2034 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2035 2039
2036 /* 2040 /*
2037 * B: reverse any characters which are selected 2041 * B: reverse any characters which are selected
2038 */ 2042 */
2039 scr_reverse_selection (); 2043 scr_reverse_selection ();
2044
2045 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2046#if ENABLE_OVERLAY
2047 scr_swap_overlay ();
2048#endif
2049
2050 char showcursor = screen.flags & Screen_VisibleCursor;
2040 2051
2041 /* 2052 /*
2042 * C: set the cursor character (s) 2053 * C: set the cursor character (s)
2043 */ 2054 */
2044 { 2055 {
2045 unsigned char setoldcursor; 2056 unsigned char setoldcursor;
2046 2057
2047 showcursor = (screen.flags & Screen_VisibleCursor);
2048#ifdef CURSOR_BLINK 2058#ifdef CURSOR_BLINK
2049 if (hidden_cursor) 2059 if (hidden_cursor)
2050 showcursor = 0; 2060 showcursor = 0;
2051#endif 2061#endif
2052 2062
… …
2125 oldcursor.col = screen.cur.col; 2135 oldcursor.col = screen.cur.col;
2126 } 2136 }
2127 } 2137 }
2128 } 2138 }
2129 2139
2130 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2131#if ENABLE_OVERLAY
2132 scr_swap_overlay ();
2133#endif
2134
2135#ifndef NO_SLOW_LINK_SUPPORT 2140#ifndef NO_SLOW_LINK_SUPPORT
2136 /* 2141 /*
2137 * D: CopyArea pass - very useful for slower links 2142 * D: CopyArea pass - very useful for slower links
2138 * This has been deliberately kept simple. 2143 * This has been deliberately kept simple.
2139 */ 2144 */
… …
2411 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2416 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2412 } 2417 }
2413 } /* for (col....) */ 2418 } /* for (col....) */
2414 } /* for (row....) */ 2419 } /* for (row....) */
2415 2420
2416#if ENABLE_OVERLAY
2417 scr_swap_overlay ();
2418#endif
2419 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2420
2421 /* 2421 /*
2422 * G: cleanup cursor and display outline cursor if necessary 2422 * G: cleanup cursor and display outline cursor if necessary
2423 */ 2423 */
2424 if (showcursor) 2424 if (showcursor)
2425 { 2425 {
… …
2463 } 2463 }
2464 2464
2465 /* 2465 /*
2466 * H: cleanup selection 2466 * H: cleanup selection
2467 */ 2467 */
2468#if ENABLE_OVERLAY
2469 scr_swap_overlay ();
2470#endif
2471 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2472
2468 scr_reverse_selection (); 2473 scr_reverse_selection ();
2469 2474
2475 screen.flags = old_screen_flags;
2470 num_scr = 0; 2476 num_scr = 0;
2471 num_scr_allow = 1; 2477 num_scr_allow = 1;
2472} 2478}
2473 2479
2474void 2480void
… …
3733 h += 2; min_it (h, nrow); 3739 h += 2; min_it (h, nrow);
3734 3740
3735 x -= 1; clamp_it (x, 0, ncol - w); 3741 x -= 1; clamp_it (x, 0, ncol - w);
3736 y -= 1; clamp_it (y, 0, nrow - h); 3742 y -= 1; clamp_it (y, 0, nrow - h);
3737 3743
3738 ov_x = x; ov_y = y; 3744 ov.x = x; ov.y = y;
3739 ov_w = w; ov_h = h; 3745 ov.w = w; ov.h = h;
3740 3746
3741 ov_text = new text_t *[h]; 3747 ov.text = new text_t *[h];
3742 ov_rend = new rend_t *[h]; 3748 ov.rend = new rend_t *[h];
3743 3749
3744 for (y = 0; y < h; y++) 3750 for (y = 0; y < h; y++)
3745 { 3751 {
3746 text_t *tp = ov_text[y] = new text_t[w]; 3752 text_t *tp = ov.text[y] = new text_t[w];
3747 rend_t *rp = ov_rend[y] = new rend_t[w]; 3753 rend_t *rp = ov.rend[y] = new rend_t[w];
3748 3754
3749 text_t t0, t1, t2; 3755 text_t t0, t1, t2;
3750 rend_t r = OVERLAY_RSTYLE; 3756 rend_t r = OVERLAY_RSTYLE;
3751 3757
3752 if (y == 0) 3758 if (y == 0)
… …
3771} 3777}
3772 3778
3773void 3779void
3774rxvt_term::scr_overlay_off () NOTHROW 3780rxvt_term::scr_overlay_off () NOTHROW
3775{ 3781{
3776 if (!ov_text) 3782 if (!ov.text)
3777 return; 3783 return;
3778 3784
3779 want_refresh = 1; 3785 want_refresh = 1;
3780 3786
3781 for (int y = 0; y < ov_h; y++) 3787 for (int y = 0; y < ov.h; y++)
3782 { 3788 {
3783 delete [] ov_text[y]; 3789 delete [] ov.text[y];
3784 delete [] ov_rend[y]; 3790 delete [] ov.rend[y];
3785 } 3791 }
3786 3792
3787 delete [] ov_text; ov_text = 0; 3793 delete [] ov.text; ov.text = 0;
3788 delete [] ov_rend; ov_rend = 0; 3794 delete [] ov.rend; ov.rend = 0;
3789} 3795}
3790 3796
3791void 3797void
3792rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3798rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3793{ 3799{
3794 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3800 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3795 return; 3801 return;
3796 3802
3797 x++, y++; 3803 x++, y++;
3798 3804
3799 ov_text[y][x] = text; 3805 ov.text[y][x] = text;
3800 ov_rend[y][x] = rend; 3806 ov.rend[y][x] = rend;
3801} 3807}
3802 3808
3803void 3809void
3804rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3810rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3805{ 3811{
… …
3824} 3830}
3825 3831
3826void 3832void
3827rxvt_term::scr_swap_overlay () NOTHROW 3833rxvt_term::scr_swap_overlay () NOTHROW
3828{ 3834{
3829 if (!ov_text) 3835 if (!ov.text)
3830 return; 3836 return;
3831 3837
3838 // hide cursor if it is within the overlay area
3839 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3840 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3841 screen.flags &= ~Screen_VisibleCursor;
3842
3832 // swap screen mem with overlay 3843 // swap screen mem with overlay
3833 for (int y = ov_h; y--; ) 3844 for (int y = ov.h; y--; )
3834 { 3845 {
3835 text_t *t1 = ov_text[y]; 3846 text_t *t1 = ov.text[y];
3836 rend_t *r1 = ov_rend[y]; 3847 rend_t *r1 = ov.rend[y];
3837 3848
3838 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3849 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3839 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3850 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3840 3851
3841 for (int x = ov_w; x--; ) 3852 for (int x = ov.w; x--; )
3842 { 3853 {
3843 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3854 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3844 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3855 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3845 } 3856 }
3846 } 3857 }

Diff Legend

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