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.315 by root, Tue Nov 4 14:38:29 2008 UTC vs.
Revision 1.327 by root, Wed Nov 5 14:43:54 2008 UTC

… …
143 col--; 143 col--;
144 144
145 rend_t rend = l.r[col] & ~RS_baseattrMask; 145 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147 147
148 // found begin, nuke 148 // found start, nuke
149 do { 149 do {
150 l.t[col] = ' '; 150 l.t[col] = ' ';
151 l.r[col] = rend; 151 l.r[col] = rend;
152 col++; 152 col++;
153 } while (col < ncol && l.t[col] == NOCHAR); 153 } while (col < ncol && l.t[col] == NOCHAR);
… …
158 * ------------------------------------------------------------------------- */ 158 * ------------------------------------------------------------------------- */
159 159
160void 160void
161rxvt_term::scr_reset () 161rxvt_term::scr_reset ()
162{ 162{
163#if ENABLE_OVERLAY
164 scr_overlay_off ();
165#endif
166
167 rvideo_mode = false;
168 view_start = 0; 163 view_start = 0;
169 num_scr = 0; 164 num_scr = 0;
170 165
171 if (ncol == 0) 166 if (ncol == 0)
172 ncol = 80; 167 ncol = 80;
… …
174 if (nrow == 0) 169 if (nrow == 0)
175 nrow = 24; 170 nrow = 24;
176 171
177 if (ncol == prev_ncol && nrow == prev_nrow) 172 if (ncol == prev_ncol && nrow == prev_nrow)
178 return; 173 return;
179
180 if (current_screen != PRIMARY)
181 scr_swap_screen ();
182 174
183 // we need at least two lines for wrapping to work correctly 175 // we need at least two lines for wrapping to work correctly
184 while (nrow + saveLines < 2) 176 while (nrow + saveLines < 2)
185 { 177 {
186 //TODO//FIXME 178 //TODO//FIXME
… …
286 278
287 if (top_row) 279 if (top_row)
288 { 280 {
289 // 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
290 // 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
291 284
292 row_col_t ocur = screen.cur; 285 row_col_t ocur = screen.cur;
293 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 286 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
294 287
295 do 288 do
… …
399 delete old_ta; 392 delete old_ta;
400 delete old_ra; 393 delete old_ra;
401 394
402 clamp_it (screen.cur.row, 0, nrow - 1); 395 clamp_it (screen.cur.row, 0, nrow - 1);
403 clamp_it (screen.cur.col, 0, ncol - 1); 396 clamp_it (screen.cur.col, 0, ncol - 1);
397 }
404 398
405 free (tabs); 399 free (tabs);
406 } 400 tabs = (char *)rxvt_malloc (ncol);
401
402 for (int col = ncol; --col; )
403 tabs [col] = col % TABSIZE == 0;
407 404
408 CLEAR_ALL_SELECTION (); 405 CLEAR_ALL_SELECTION ();
409 406
410 prev_nrow = nrow; 407 prev_nrow = nrow;
411 prev_ncol = ncol; 408 prev_ncol = ncol;
412
413 tabs = (char *)rxvt_malloc (ncol);
414
415 for (int col = ncol; --col; )
416 tabs [col] = col % TABSIZE == 0;
417
418 if (current_screen != PRIMARY)
419 scr_swap_screen ();
420 409
421 tt_winch (); 410 tt_winch ();
422 411
423 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 412 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
424} 413}
… …
436 delete ralloc; ralloc = 0; 425 delete ralloc; ralloc = 0;
437 426
438 free (row_buf); 427 free (row_buf);
439 free (swap_buf); 428 free (swap_buf);
440 free (drawn_buf); 429 free (drawn_buf);
430 row_buf = 0; // signal that we freed all the arrays above
431
441 free (tabs); 432 free (tabs);
442 433 tabs = 0;
443 row_buf = 0; // signal that we freed all the arrays
444 } 434 }
445} 435}
446 436
447/* ------------------------------------------------------------------------- */ 437/* ------------------------------------------------------------------------- */
448/* 438/*
449 * Hard reset 439 * Hard/Soft reset
450 */ 440 */
451void 441void
452rxvt_term::scr_poweron () 442rxvt_term::scr_poweron ()
453{ 443{
454 scr_release (); 444 scr_release ();
455 prev_nrow = prev_ncol = 0; 445 prev_nrow = prev_ncol = 0;
446 rvideo_mode = false;
447 scr_soft_reset ();
456 scr_reset (); 448 scr_reset ();
457 449
458 scr_clear (true); 450 scr_clear (true);
459 scr_refresh (); 451 scr_refresh ();
452}
453
454void
455rxvt_term::scr_soft_reset ()
456{
457 /* only affects modes, nothing drastic such as clearing the screen */
458#if ENABLE_OVERLAY
459 scr_overlay_off ();
460#endif
461
462 if (current_screen != PRIMARY)
463 scr_swap_screen ();
464
465 scr_scroll_region (0, MAX_ROWS - 1);
466 scr_rendition (0, ~RS_None);
467 scr_insert_mode (0);
460} 468}
461 469
462/* ------------------------------------------------------------------------- * 470/* ------------------------------------------------------------------------- *
463 * PROCESS SCREEN COMMANDS * 471 * PROCESS SCREEN COMMANDS *
464 * ------------------------------------------------------------------------- */ 472 * ------------------------------------------------------------------------- */
… …
906 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 914 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
907 915
908 // if the character doesn't fit into the remaining columns... 916 // if the character doesn't fit into the remaining columns...
909 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 917 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
910 { 918 {
911 // ...output spaces 919 // ... artificially enlargen the previous one
912 c = ' '; 920 c = NOCHAR;
913 // and try the same character next loop iteration 921 // and try the same character next loop iteration
914 --str; 922 --str;
915 } 923 }
916 924
917 line->touch (); 925 line->touch ();
… …
1333 if (row >= nrow) /* Out Of Bounds */ 1341 if (row >= nrow) /* Out Of Bounds */
1334 return; 1342 return;
1335 1343
1336 min_it (num, nrow - row); 1344 min_it (num, nrow - row);
1337 1345
1338 /*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.
1339 if (rstyle & (RS_RVid | RS_Uline)) 1349 if (rstyle & (RS_RVid | RS_Uline))
1340 ren = (rend_t) ~RS_None; 1350 ren = (rend_t) ~RS_None;
1341 else if (GET_BASEBG (rstyle) == Color_bg) 1351 else if (GET_BASEBG (rstyle) == Color_bg)
1342 { 1352 {
1343 ren = DEFAULT_RSTYLE; 1353 ren = DEFAULT_RSTYLE;
1344 1354
1345 if (mapped) 1355 if (mapped && !view_start)
1346 XClearArea (dpy, vt, 0, 1356 XClearArea (dpy, vt, 0,
1347 Row2Pixel (row), (unsigned int)width, 1357 Row2Pixel (row - view_start), (unsigned int)width,
1348 (unsigned int)Height2Pixel (num), False); 1358 (unsigned int)Height2Pixel (num), False);
1349 } 1359 }
1350 else 1360 else
1351 { 1361 {
1352 ren = rstyle & (RS_fgMask | RS_bgMask); 1362 ren = rstyle & (RS_fgMask | RS_bgMask);
1353 1363
1364 if (mapped && !view_start)
1365 {
1354 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1366 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1355 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1367 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1356 XFillRectangle (dpy, vt, gc, 1368 XFillRectangle (dpy, vt, gc,
1357 0, Row2Pixel (row), 1369 0, Row2Pixel (row - view_start),
1358 (unsigned int)width, 1370 (unsigned int)width,
1359 (unsigned int)Height2Pixel (num)); 1371 (unsigned int)Height2Pixel (num));
1360 gcvalue.foreground = pix_colors[Color_fg]; 1372 gcvalue.foreground = pix_colors[Color_fg];
1361 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1373 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1374 }
1362 } 1375 }
1363 1376
1364 for (; num--; row++) 1377 for (; num--; row++)
1365 { 1378 {
1366 scr_blank_screen_mem (ROW(row), rstyle); 1379 scr_blank_screen_mem (ROW(row), rstyle);
1380
1381 if (!view_start)
1367 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1382 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1368 } 1383 }
1369} 1384}
1370 1385
1371#if !ENABLE_MINIMAL 1386#if !ENABLE_MINIMAL
1372void 1387void
… …
1464 line_t *line = &ROW(row); 1479 line_t *line = &ROW(row);
1465 1480
1466 line->touch (); 1481 line->touch ();
1467 line->is_longer (0); 1482 line->is_longer (0);
1468 1483
1469 // nuke wide char at beginning 1484 // nuke wide spanning the start
1470 if (line->t[screen.cur.col] == NOCHAR) 1485 if (line->t[screen.cur.col] == NOCHAR)
1471 scr_kill_char (*line, screen.cur.col); 1486 scr_kill_char (*line, screen.cur.col);
1472 1487
1473 switch (insdel) 1488 switch (insdel)
1474 { 1489 {
… …
1513 1528
1514 scr_blank_line (*line, screen.cur.col, count, rstyle); 1529 scr_blank_line (*line, screen.cur.col, count, rstyle);
1515 break; 1530 break;
1516 1531
1517 case DELETE: 1532 case DELETE:
1518 {
1519 line->l = max (line->l - count, 0); 1533 line->l = max (line->l - count, 0);
1520 1534
1521 rend_t tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1535 // nuke wide char spanning the end
1536 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1537 scr_kill_char (*line, screen.cur.col + count);
1522 1538
1523 for (int col = screen.cur.col; (col + count) < ncol; col++) 1539 for (int col = screen.cur.col; (col + count) < ncol; col++)
1524 { 1540 {
1525 line->t[col] = line->t[col + count]; 1541 line->t[col] = line->t[col + count];
1526 line->r[col] = line->r[col + count]; 1542 line->r[col] = line->r[col + count];
1527 } 1543 }
1528 1544
1529 // nuke wide char at the end
1530 if (line->t[screen.cur.col] == NOCHAR)
1531 scr_kill_char (*line, screen.cur.col);
1532
1533 scr_blank_line (*line, ncol - count, count, tr); 1545 scr_blank_line (*line, ncol - count, count, rstyle);
1534 1546
1535 if (selection.op && current_screen == selection.screen 1547 if (selection.op && current_screen == selection.screen
1536 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1548 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1537 { 1549 {
1538 if (selection.end.row != screen.cur.row 1550 if (selection.end.row != screen.cur.row
1539 || (screen.cur.col >= selection.beg.col - count) 1551 || (screen.cur.col >= selection.beg.col - count)
1540 || selection.end.col >= ncol) 1552 || selection.end.col >= ncol)
1541 CLEAR_SELECTION (); 1553 CLEAR_SELECTION ();
1542 else 1554 else
1543 { 1555 {
1544 /* shift selection */ 1556 /* shift selection */
1545 selection.beg.col -= count; 1557 selection.beg.col -= count;
1546 selection.mark.col -= count; /* XXX: yes? */ 1558 selection.mark.col -= count; /* XXX: yes? */
1547 selection.end.col -= count; 1559 selection.end.col -= count;
1548 } 1560 }
1549 }
1550 } 1561 }
1551 1562
1552 break; 1563 break;
1553 } 1564 }
1554} 1565}
… …
1997 * screen.text/screen.rend contain what the screen will change to. 2008 * screen.text/screen.rend contain what the screen will change to.
1998 */ 2009 */
1999void 2010void
2000rxvt_term::scr_refresh () NOTHROW 2011rxvt_term::scr_refresh () NOTHROW
2001{ 2012{
2002 unsigned char have_bg,
2003 showcursor; /* show the cursor */
2004 int16_t col, row, /* column/row we're processing */ 2013 int16_t col, row, /* column/row we're processing */
2005 ocrow; /* old cursor row */ 2014 ocrow; /* old cursor row */
2006 int i; /* tmp */ 2015 int i; /* tmp */
2007#ifndef NO_CURSORCOLOR 2016#ifndef NO_CURSORCOLOR
2008 rend_t cc1; /* store colours at cursor position (s) */ 2017 rend_t cc1; /* store colours at cursor position (s) */
… …
2019 /* 2028 /*
2020 * A: set up vars 2029 * A: set up vars
2021 */ 2030 */
2022 refresh_count = 0; 2031 refresh_count = 0;
2023 2032
2033 unsigned int old_screen_flags = screen.flags;
2024 have_bg = 0; 2034 char have_bg = 0;
2025#ifdef HAVE_BG_PIXMAP 2035#ifdef HAVE_BG_PIXMAP
2026 have_bg = bgPixmap.pixmap != None; 2036 have_bg = bgPixmap.pixmap != None;
2027#endif 2037#endif
2028 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2029 2039
2030 /* 2040 /*
2031 * B: reverse any characters which are selected 2041 * B: reverse any characters which are selected
2032 */ 2042 */
2033 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;
2034 2051
2035 /* 2052 /*
2036 * C: set the cursor character (s) 2053 * C: set the cursor character (s)
2037 */ 2054 */
2038 { 2055 {
2039 unsigned char setoldcursor; 2056 unsigned char setoldcursor;
2040 2057
2041 showcursor = (screen.flags & Screen_VisibleCursor);
2042#ifdef CURSOR_BLINK 2058#ifdef CURSOR_BLINK
2043 if (hidden_cursor) 2059 if (hidden_cursor)
2044 showcursor = 0; 2060 showcursor = 0;
2045#endif 2061#endif
2046 2062
… …
2119 oldcursor.col = screen.cur.col; 2135 oldcursor.col = screen.cur.col;
2120 } 2136 }
2121 } 2137 }
2122 } 2138 }
2123 2139
2124 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2125#if ENABLE_OVERLAY
2126 scr_swap_overlay ();
2127#endif
2128
2129#ifndef NO_SLOW_LINK_SUPPORT 2140#ifndef NO_SLOW_LINK_SUPPORT
2130 /* 2141 /*
2131 * D: CopyArea pass - very useful for slower links 2142 * D: CopyArea pass - very useful for slower links
2132 * This has been deliberately kept simple. 2143 * This has been deliberately kept simple.
2133 */ 2144 */
… …
2405 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2416 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2406 } 2417 }
2407 } /* for (col....) */ 2418 } /* for (col....) */
2408 } /* for (row....) */ 2419 } /* for (row....) */
2409 2420
2410#if ENABLE_OVERLAY
2411 scr_swap_overlay ();
2412#endif
2413 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2414
2415 /* 2421 /*
2416 * G: cleanup cursor and display outline cursor if necessary 2422 * G: cleanup cursor and display outline cursor if necessary
2417 */ 2423 */
2418 if (showcursor) 2424 if (showcursor)
2419 { 2425 {
… …
2457 } 2463 }
2458 2464
2459 /* 2465 /*
2460 * H: cleanup selection 2466 * H: cleanup selection
2461 */ 2467 */
2468#if ENABLE_OVERLAY
2469 scr_swap_overlay ();
2470#endif
2471 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2472
2462 scr_reverse_selection (); 2473 scr_reverse_selection ();
2463 2474
2475 screen.flags = old_screen_flags;
2464 num_scr = 0; 2476 num_scr = 0;
2465 num_scr_allow = 1; 2477 num_scr_allow = 1;
2466} 2478}
2467 2479
2468void 2480void
… …
3727 h += 2; min_it (h, nrow); 3739 h += 2; min_it (h, nrow);
3728 3740
3729 x -= 1; clamp_it (x, 0, ncol - w); 3741 x -= 1; clamp_it (x, 0, ncol - w);
3730 y -= 1; clamp_it (y, 0, nrow - h); 3742 y -= 1; clamp_it (y, 0, nrow - h);
3731 3743
3732 ov_x = x; ov_y = y; 3744 ov.x = x; ov.y = y;
3733 ov_w = w; ov_h = h; 3745 ov.w = w; ov.h = h;
3734 3746
3735 ov_text = new text_t *[h]; 3747 ov.text = new text_t *[h];
3736 ov_rend = new rend_t *[h]; 3748 ov.rend = new rend_t *[h];
3737 3749
3738 for (y = 0; y < h; y++) 3750 for (y = 0; y < h; y++)
3739 { 3751 {
3740 text_t *tp = ov_text[y] = new text_t[w]; 3752 text_t *tp = ov.text[y] = new text_t[w];
3741 rend_t *rp = ov_rend[y] = new rend_t[w]; 3753 rend_t *rp = ov.rend[y] = new rend_t[w];
3742 3754
3743 text_t t0, t1, t2; 3755 text_t t0, t1, t2;
3744 rend_t r = OVERLAY_RSTYLE; 3756 rend_t r = OVERLAY_RSTYLE;
3745 3757
3746 if (y == 0) 3758 if (y == 0)
… …
3765} 3777}
3766 3778
3767void 3779void
3768rxvt_term::scr_overlay_off () NOTHROW 3780rxvt_term::scr_overlay_off () NOTHROW
3769{ 3781{
3770 if (!ov_text) 3782 if (!ov.text)
3771 return; 3783 return;
3772 3784
3773 want_refresh = 1; 3785 want_refresh = 1;
3774 3786
3775 for (int y = 0; y < ov_h; y++) 3787 for (int y = 0; y < ov.h; y++)
3776 { 3788 {
3777 delete [] ov_text[y]; 3789 delete [] ov.text[y];
3778 delete [] ov_rend[y]; 3790 delete [] ov.rend[y];
3779 } 3791 }
3780 3792
3781 delete [] ov_text; ov_text = 0; 3793 delete [] ov.text; ov.text = 0;
3782 delete [] ov_rend; ov_rend = 0; 3794 delete [] ov.rend; ov.rend = 0;
3783} 3795}
3784 3796
3785void 3797void
3786rxvt_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
3787{ 3799{
3788 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3800 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3789 return; 3801 return;
3790 3802
3791 x++, y++; 3803 x++, y++;
3792 3804
3793 ov_text[y][x] = text; 3805 ov.text[y][x] = text;
3794 ov_rend[y][x] = rend; 3806 ov.rend[y][x] = rend;
3795} 3807}
3796 3808
3797void 3809void
3798rxvt_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
3799{ 3811{
… …
3818} 3830}
3819 3831
3820void 3832void
3821rxvt_term::scr_swap_overlay () NOTHROW 3833rxvt_term::scr_swap_overlay () NOTHROW
3822{ 3834{
3823 if (!ov_text) 3835 if (!ov.text)
3824 return; 3836 return;
3825 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
3826 // swap screen mem with overlay 3843 // swap screen mem with overlay
3827 for (int y = ov_h; y--; ) 3844 for (int y = ov.h; y--; )
3828 { 3845 {
3829 text_t *t1 = ov_text[y]; 3846 text_t *t1 = ov.text[y];
3830 rend_t *r1 = ov_rend[y]; 3847 rend_t *r1 = ov.rend[y];
3831 3848
3832 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;
3833 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;
3834 3851
3835 for (int x = ov_w; x--; ) 3852 for (int x = ov.w; x--; )
3836 { 3853 {
3837 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3854 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3838 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));
3839 } 3856 }
3840 } 3857 }

Diff Legend

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