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.321 by root, Tue Nov 4 23:21:00 2008 UTC vs.
Revision 1.332 by sf-exg, Mon Jan 18 10:05:55 2010 UTC

… …
158 * ------------------------------------------------------------------------- */ 158 * ------------------------------------------------------------------------- */
159 159
160void 160void
161rxvt_term::scr_reset () 161rxvt_term::scr_reset ()
162{ 162{
163 scr_soft_reset ();
164
165 view_start = 0; 163 view_start = 0;
166 num_scr = 0; 164 num_scr = 0;
167 165
168 if (ncol == 0) 166 if (ncol == 0)
169 ncol = 80; 167 ncol = 80;
… …
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
290 { 289 {
291 p = MOD (p - 1, prev_total_rows); 290 p = MOD (p - 1, prev_total_rows);
292#ifdef DEBUG_STRICT
293 assert (old_buf [MOD (p, prev_total_rows)].t); 291 assert (old_buf [MOD (p, prev_total_rows)].t);
294#endif
295 int plines = 1; 292 int plines = 1;
296 int llen = old_buf [MOD (p, prev_total_rows)].l; 293 int llen = old_buf [MOD (p, prev_total_rows)].l;
297 294
298 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 295 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
299 { 296 {
… …
395 392
396 clamp_it (screen.cur.row, 0, nrow - 1); 393 clamp_it (screen.cur.row, 0, nrow - 1);
397 clamp_it (screen.cur.col, 0, ncol - 1); 394 clamp_it (screen.cur.col, 0, ncol - 1);
398 } 395 }
399 396
397 free (tabs);
398 tabs = (char *)rxvt_malloc (ncol);
399
400 for (int col = ncol; --col; )
401 tabs [col] = col % TABSIZE == 0;
402
400 CLEAR_ALL_SELECTION (); 403 CLEAR_ALL_SELECTION ();
401 404
402 prev_nrow = nrow; 405 prev_nrow = nrow;
403 prev_ncol = ncol; 406 prev_ncol = ncol;
404 407
… …
436void 439void
437rxvt_term::scr_poweron () 440rxvt_term::scr_poweron ()
438{ 441{
439 scr_release (); 442 scr_release ();
440 prev_nrow = prev_ncol = 0; 443 prev_nrow = prev_ncol = 0;
444 rvideo_mode = false;
445 scr_soft_reset ();
441 scr_reset (); 446 scr_reset ();
442 447
443 scr_clear (true); 448 scr_clear (true);
444 scr_refresh (); 449 scr_refresh ();
445} 450}
… …
450 /* only affects modes, nothing drastic such as clearing the screen */ 455 /* only affects modes, nothing drastic such as clearing the screen */
451#if ENABLE_OVERLAY 456#if ENABLE_OVERLAY
452 scr_overlay_off (); 457 scr_overlay_off ();
453#endif 458#endif
454 459
455 rvideo_mode = false;
456
457 if (current_screen != PRIMARY) 460 if (current_screen != PRIMARY)
458 scr_swap_screen (); 461 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 462
466 scr_scroll_region (0, MAX_ROWS - 1); 463 scr_scroll_region (0, MAX_ROWS - 1);
467 scr_rendition (0, ~RS_None); 464 scr_rendition (0, ~RS_None);
468 scr_insert_mode (0); 465 scr_insert_mode (0);
469} 466}
… …
511 } 508 }
512 509
513 /* boundary check in case screen size changed between SAVE and RESTORE */ 510 /* boundary check in case screen size changed between SAVE and RESTORE */
514 min_it (s->cur.row, nrow - 1); 511 min_it (s->cur.row, nrow - 1);
515 min_it (s->cur.col, ncol - 1); 512 min_it (s->cur.col, ncol - 1);
516#ifdef DEBUG_STRICT
517 assert (s->cur.row >= 0); 513 assert (s->cur.row >= 0);
518 assert (s->cur.col >= 0); 514 assert (s->cur.col >= 0);
519#endif
520} 515}
521 516
522void 517void
523rxvt_term::scr_swap_screen () 518rxvt_term::scr_swap_screen ()
524{ 519{
… …
549 want_refresh = 1; 544 want_refresh = 1;
550 view_start = 0; 545 view_start = 0;
551 546
552 selection_check (2); /* check for boundary cross */ 547 selection_check (2); /* check for boundary cross */
553 548
554 int i = current_screen; current_screen = scrn; scrn = i; 549 current_screen = scrn;
555 550
556#if NSCREENS 551#if NSCREENS
557 if (option (Opt_secondaryScreen)) 552 if (option (Opt_secondaryScreen))
558 { 553 {
559 num_scr = 0; 554 num_scr = 0;
… …
784 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 779 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
785 screen.cur.row -= minlines; 780 screen.cur.row -= minlines;
786 } 781 }
787 } 782 }
788 783
789#ifdef DEBUG_STRICT
790 assert (screen.cur.col < ncol); 784 assert (screen.cur.col < ncol);
791 assert (screen.cur.row < nrow 785 assert (screen.cur.row < nrow
792 && screen.cur.row >= top_row); 786 && screen.cur.row >= top_row);
793#endif
794 int row = screen.cur.row; 787 int row = screen.cur.row;
795 788
796 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 789 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
797 790
798 line_t *line = &ROW(row); 791 line_t *line = &ROW(row);
… …
1002#endif 995#endif
1003 } 996 }
1004 997
1005 max_it (line->l, screen.cur.col); 998 max_it (line->l, screen.cur.col);
1006 999
1007#ifdef DEBUG_STRICT
1008 assert (screen.cur.row >= 0); 1000 assert (screen.cur.row >= 0);
1009#endif
1010} 1001}
1011 1002
1012/* ------------------------------------------------------------------------- */ 1003/* ------------------------------------------------------------------------- */
1013/* 1004/*
1014 * Process Backspace. Move back the cursor back a position, wrap if have to 1005 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1342 if (row >= nrow) /* Out Of Bounds */ 1333 if (row >= nrow) /* Out Of Bounds */
1343 return; 1334 return;
1344 1335
1345 min_it (num, nrow - row); 1336 min_it (num, nrow - row);
1346 1337
1347 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */ 1338 // TODO: the code below does not work when view_start != 0
1339 // the workaround is to disable the clear and use a normal refresh
1340 // when view_start != 0. mysterious.
1348 if (rstyle & (RS_RVid | RS_Uline)) 1341 if (rstyle & (RS_RVid | RS_Uline))
1349 ren = (rend_t) ~RS_None; 1342 ren = (rend_t) ~RS_None;
1350 else if (GET_BASEBG (rstyle) == Color_bg) 1343 else if (GET_BASEBG (rstyle) == Color_bg)
1351 { 1344 {
1352 ren = DEFAULT_RSTYLE; 1345 ren = DEFAULT_RSTYLE;
1353 1346
1354 if (mapped) 1347 if (mapped && !view_start)
1355 XClearArea (dpy, vt, 0, 1348 XClearArea (dpy, vt, 0,
1356 Row2Pixel (row), (unsigned int)width, 1349 Row2Pixel (row - view_start), (unsigned int)width,
1357 (unsigned int)Height2Pixel (num), False); 1350 (unsigned int)Height2Pixel (num), False);
1358 } 1351 }
1359 else 1352 else
1360 { 1353 {
1361 ren = rstyle & (RS_fgMask | RS_bgMask); 1354 ren = rstyle & (RS_fgMask | RS_bgMask);
1362 1355
1356 if (mapped && !view_start)
1357 {
1363 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1358 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1364 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1359 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1365 XFillRectangle (dpy, vt, gc, 1360 XFillRectangle (dpy, vt, gc,
1366 0, Row2Pixel (row), 1361 0, Row2Pixel (row - view_start),
1367 (unsigned int)width, 1362 (unsigned int)width,
1368 (unsigned int)Height2Pixel (num)); 1363 (unsigned int)Height2Pixel (num));
1369 gcvalue.foreground = pix_colors[Color_fg]; 1364 gcvalue.foreground = pix_colors[Color_fg];
1370 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1365 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1366 }
1371 } 1367 }
1372 1368
1373 for (; num--; row++) 1369 for (; num--; row++)
1374 { 1370 {
1375 scr_blank_screen_mem (ROW(row), rstyle); 1371 scr_blank_screen_mem (ROW(row), rstyle);
1372
1373 if (!view_start)
1376 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1374 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1377 } 1375 }
1378} 1376}
1379 1377
1380#if !ENABLE_MINIMAL 1378#if !ENABLE_MINIMAL
1381void 1379void
… …
1534 { 1532 {
1535 line->t[col] = line->t[col + count]; 1533 line->t[col] = line->t[col + count];
1536 line->r[col] = line->r[col + count]; 1534 line->r[col] = line->r[col + count];
1537 } 1535 }
1538 1536
1539 scr_blank_line (*line, ncol - count, count, 1537 scr_blank_line (*line, ncol - count, count, rstyle);
1540 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1541 1538
1542 if (selection.op && current_screen == selection.screen 1539 if (selection.op && current_screen == selection.screen
1543 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1540 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1544 { 1541 {
1545 if (selection.end.row != screen.cur.row 1542 if (selection.end.row != screen.cur.row
… …
1936 1933
1937 bell_ev.start (VISUAL_BELL_DURATION); 1934 bell_ev.start (VISUAL_BELL_DURATION);
1938 } 1935 }
1939 else 1936 else
1940 XBell (dpy, 0); 1937 XBell (dpy, 0);
1938 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1941#endif 1939#endif
1942} 1940}
1943 1941
1944/* ------------------------------------------------------------------------- */ 1942/* ------------------------------------------------------------------------- */
1945/* ARGSUSED */ 1943/* ARGSUSED */
… …
1964 row_start = view_start; 1962 row_start = view_start;
1965 } 1963 }
1966 1964
1967 wctomb (0, 0); 1965 wctomb (0, 0);
1968 1966
1969 for (int r1 = 0; r1 < nrows; r1++) 1967 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1970 { 1968 {
1971 text_t *tp = ROW(r1).t; 1969 text_t *tp = ROW(r1).t;
1972 int len = ROW(r1).l; 1970 int len = ROW(r1).l;
1973 1971
1974 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1972 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
2003 * screen.text/screen.rend contain what the screen will change to. 2001 * screen.text/screen.rend contain what the screen will change to.
2004 */ 2002 */
2005void 2003void
2006rxvt_term::scr_refresh () NOTHROW 2004rxvt_term::scr_refresh () NOTHROW
2007{ 2005{
2008 unsigned char have_bg,
2009 showcursor; /* show the cursor */
2010 int16_t col, row, /* column/row we're processing */ 2006 int16_t col, row, /* column/row we're processing */
2011 ocrow; /* old cursor row */ 2007 ocrow; /* old cursor row */
2012 int i; /* tmp */ 2008 int i; /* tmp */
2013#ifndef NO_CURSORCOLOR 2009#ifndef NO_CURSORCOLOR
2014 rend_t cc1; /* store colours at cursor position (s) */ 2010 rend_t cc1; /* store colours at cursor position (s) */
… …
2025 /* 2021 /*
2026 * A: set up vars 2022 * A: set up vars
2027 */ 2023 */
2028 refresh_count = 0; 2024 refresh_count = 0;
2029 2025
2026 unsigned int old_screen_flags = screen.flags;
2030 have_bg = 0; 2027 char have_bg = 0;
2031#ifdef HAVE_BG_PIXMAP 2028#ifdef HAVE_BG_PIXMAP
2032 have_bg = bgPixmap.pixmap != None; 2029 have_bg = bgPixmap.pixmap != None;
2033#endif 2030#endif
2034 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2031 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2035 2032
2036 /* 2033 /*
2037 * B: reverse any characters which are selected 2034 * B: reverse any characters which are selected
2038 */ 2035 */
2039 scr_reverse_selection (); 2036 scr_reverse_selection ();
2037
2038 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2039#if ENABLE_OVERLAY
2040 scr_swap_overlay ();
2041#endif
2042
2043 char showcursor = screen.flags & Screen_VisibleCursor;
2040 2044
2041 /* 2045 /*
2042 * C: set the cursor character (s) 2046 * C: set the cursor character (s)
2043 */ 2047 */
2044 { 2048 {
2045 unsigned char setoldcursor; 2049 unsigned char setoldcursor;
2046 2050
2047 showcursor = (screen.flags & Screen_VisibleCursor);
2048#ifdef CURSOR_BLINK 2051#ifdef CURSOR_BLINK
2049 if (hidden_cursor) 2052 if (hidden_cursor)
2050 showcursor = 0; 2053 showcursor = 0;
2051#endif 2054#endif
2052 2055
… …
2125 oldcursor.col = screen.cur.col; 2128 oldcursor.col = screen.cur.col;
2126 } 2129 }
2127 } 2130 }
2128 } 2131 }
2129 2132
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 2133#ifndef NO_SLOW_LINK_SUPPORT
2136 /* 2134 /*
2137 * D: CopyArea pass - very useful for slower links 2135 * D: CopyArea pass - very useful for slower links
2138 * This has been deliberately kept simple. 2136 * This has been deliberately kept simple.
2139 */ 2137 */
… …
2245 for (i = 0; ++col < ncol; ) 2243 for (i = 0; ++col < ncol; )
2246 { 2244 {
2247 if (stp[col] == NOCHAR) 2245 if (stp[col] == NOCHAR)
2248 { 2246 {
2249 dtp[col] = stp[col]; 2247 dtp[col] = stp[col];
2250 drp[col] = rend; 2248 drp[col] = srp[col];
2249
2251 count++; 2250 count++;
2252 i++; 2251 i++;
2253 2252
2254 continue; 2253 continue;
2255 } 2254 }
… …
2411 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2410 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2412 } 2411 }
2413 } /* for (col....) */ 2412 } /* for (col....) */
2414 } /* for (row....) */ 2413 } /* for (row....) */
2415 2414
2416#if ENABLE_OVERLAY
2417 scr_swap_overlay ();
2418#endif
2419 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2420
2421 /* 2415 /*
2422 * G: cleanup cursor and display outline cursor if necessary 2416 * G: cleanup cursor and display outline cursor if necessary
2423 */ 2417 */
2424 if (showcursor) 2418 if (showcursor)
2425 { 2419 {
… …
2463 } 2457 }
2464 2458
2465 /* 2459 /*
2466 * H: cleanup selection 2460 * H: cleanup selection
2467 */ 2461 */
2462#if ENABLE_OVERLAY
2463 scr_swap_overlay ();
2464#endif
2465 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2466
2468 scr_reverse_selection (); 2467 scr_reverse_selection ();
2469 2468
2469 screen.flags = old_screen_flags;
2470 num_scr = 0; 2470 num_scr = 0;
2471 num_scr_allow = 1; 2471 num_scr_allow = 1;
2472} 2472}
2473 2473
2474void 2474void
… …
3733 h += 2; min_it (h, nrow); 3733 h += 2; min_it (h, nrow);
3734 3734
3735 x -= 1; clamp_it (x, 0, ncol - w); 3735 x -= 1; clamp_it (x, 0, ncol - w);
3736 y -= 1; clamp_it (y, 0, nrow - h); 3736 y -= 1; clamp_it (y, 0, nrow - h);
3737 3737
3738 ov_x = x; ov_y = y; 3738 ov.x = x; ov.y = y;
3739 ov_w = w; ov_h = h; 3739 ov.w = w; ov.h = h;
3740 3740
3741 ov_text = new text_t *[h]; 3741 ov.text = new text_t *[h];
3742 ov_rend = new rend_t *[h]; 3742 ov.rend = new rend_t *[h];
3743 3743
3744 for (y = 0; y < h; y++) 3744 for (y = 0; y < h; y++)
3745 { 3745 {
3746 text_t *tp = ov_text[y] = new text_t[w]; 3746 text_t *tp = ov.text[y] = new text_t[w];
3747 rend_t *rp = ov_rend[y] = new rend_t[w]; 3747 rend_t *rp = ov.rend[y] = new rend_t[w];
3748 3748
3749 text_t t0, t1, t2; 3749 text_t t0, t1, t2;
3750 rend_t r = OVERLAY_RSTYLE; 3750 rend_t r = OVERLAY_RSTYLE;
3751 3751
3752 if (y == 0) 3752 if (y == 0)
… …
3771} 3771}
3772 3772
3773void 3773void
3774rxvt_term::scr_overlay_off () NOTHROW 3774rxvt_term::scr_overlay_off () NOTHROW
3775{ 3775{
3776 if (!ov_text) 3776 if (!ov.text)
3777 return; 3777 return;
3778 3778
3779 want_refresh = 1; 3779 want_refresh = 1;
3780 3780
3781 for (int y = 0; y < ov_h; y++) 3781 for (int y = 0; y < ov.h; y++)
3782 { 3782 {
3783 delete [] ov_text[y]; 3783 delete [] ov.text[y];
3784 delete [] ov_rend[y]; 3784 delete [] ov.rend[y];
3785 } 3785 }
3786 3786
3787 delete [] ov_text; ov_text = 0; 3787 delete [] ov.text; ov.text = 0;
3788 delete [] ov_rend; ov_rend = 0; 3788 delete [] ov.rend; ov.rend = 0;
3789} 3789}
3790 3790
3791void 3791void
3792rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3792rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3793{ 3793{
3794 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3794 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3795 return; 3795 return;
3796 3796
3797 x++, y++; 3797 x++, y++;
3798 3798
3799 ov_text[y][x] = text; 3799 ov.text[y][x] = text;
3800 ov_rend[y][x] = rend; 3800 ov.rend[y][x] = rend;
3801} 3801}
3802 3802
3803void 3803void
3804rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3804rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3805{ 3805{
… …
3824} 3824}
3825 3825
3826void 3826void
3827rxvt_term::scr_swap_overlay () NOTHROW 3827rxvt_term::scr_swap_overlay () NOTHROW
3828{ 3828{
3829 if (!ov_text) 3829 if (!ov.text)
3830 return; 3830 return;
3831 3831
3832 // hide cursor if it is within the overlay area
3833 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3834 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3835 screen.flags &= ~Screen_VisibleCursor;
3836
3832 // swap screen mem with overlay 3837 // swap screen mem with overlay
3833 for (int y = ov_h; y--; ) 3838 for (int y = ov.h; y--; )
3834 { 3839 {
3835 text_t *t1 = ov_text[y]; 3840 text_t *t1 = ov.text[y];
3836 rend_t *r1 = ov_rend[y]; 3841 rend_t *r1 = ov.rend[y];
3837 3842
3838 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3843 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; 3844 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3840 3845
3841 for (int x = ov_w; x--; ) 3846 for (int x = ov.w; x--; )
3842 { 3847 {
3843 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3848 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3844 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3849 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3845 } 3850 }
3846 } 3851 }

Diff Legend

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