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.212 by root, Fri Jan 6 05:37:59 2006 UTC vs.
Revision 1.215 by root, Sun Jan 8 06:35:23 2006 UTC

… …
145/* Fill a full line with blanks - make sure it is allocated first */ 145/* Fill a full line with blanks - make sure it is allocated first */
146void 146void
147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs)
148{ 148{
149 scr_blank_line (l, 0, ncol, efs); 149 scr_blank_line (l, 0, ncol, efs);
150
151 l.l = 0;
152 l.f = 0;
150} 153}
151 154
152/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
153 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
154 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
… …
638 selection.op = SELECTION_CLEAR; 641 selection.op = SELECTION_CLEAR;
639 } 642 }
640 } 643 }
641 644
642 for (int i = count; i--; ) 645 for (int i = count; i--; )
643 {
644 ROW(row2 - i).l = 0;
645 scr_blank_screen_mem (ROW(row2 - i), rstyle); 646 scr_blank_screen_mem (ROW(row2 - i), rstyle);
646 }
647 647
648 if (OPTION (Opt_scrollWithBuffer) 648 if (OPTION (Opt_scrollWithBuffer)
649 && view_start != 0 649 && view_start != 0
650 && view_start != saveLines) 650 && view_start != saveLines)
651 scr_page (UP, count); 651 scr_page (UP, count);
… …
700/* ------------------------------------------------------------------------- */ 700/* ------------------------------------------------------------------------- */
701/* 701/*
702 * Add text given in <str> of length <len> to screen struct 702 * Add text given in <str> of length <len> to screen struct
703 */ 703 */
704void 704void
705rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 705rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines)
706{ 706{
707 if (len <= 0) /* sanity */ 707 if (len <= 0) /* sanity */
708 return; 708 return;
709 709
710 unsigned char checksel; 710 unsigned char checksel;
711 unicode_t c; 711 unicode_t c;
712 int ncol = this->ncol; 712 int ncol = this->ncol;
713 const unicode_t *strend = str + len; 713 const wchar_t *strend = str + len;
714 714
715 want_refresh = 1; 715 want_refresh = 1;
716 ZERO_SCROLLBACK (); 716 ZERO_SCROLLBACK ();
717 717
718 if (nlines > 0) 718 if (minlines > 0)
719 { 719 {
720 nlines += screen.cur.row - screen.bscroll; 720 minlines += screen.cur.row - screen.bscroll;
721 721
722 if (nlines > 0 722 if (minlines > 0
723 && screen.tscroll == 0 723 && screen.tscroll == 0
724 && screen.bscroll == nrow - 1) 724 && screen.bscroll == nrow - 1)
725 { 725 {
726 /* _at least_ this many lines need to be scrolled */ 726 /* _at least_ this many lines need to be scrolled */
727 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 727 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
728 screen.cur.row -= nlines; 728 screen.cur.row -= minlines;
729 } 729 }
730 } 730 }
731 731
732#ifdef DEBUG_STRICT 732#ifdef DEBUG_STRICT
733 assert (screen.cur.col < ncol); 733 assert (screen.cur.col < ncol);
… …
740 740
741 line_t *line = &ROW(row); 741 line_t *line = &ROW(row);
742 742
743 while (str < strend) 743 while (str < strend)
744 { 744 {
745 c = *str++; 745 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
746 746
747 if (c < 0x20) 747 if (c < 0x20)
748 if (c == C0_LF) 748 if (c == C0_LF)
749 { 749 {
750 max_it (line->l, screen.cur.col); 750 max_it (line->l, screen.cur.col);
… …
1303 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1303 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1304 } 1304 }
1305 1305
1306 for (; num--; row++) 1306 for (; num--; row++)
1307 { 1307 {
1308 line_t &l = ROW(row);
1309 l.l = 0;
1310 l.is_longer (0);
1311 scr_blank_screen_mem (l, rstyle); 1308 scr_blank_screen_mem (ROW(row), rstyle);
1312 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1309 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1313 } 1310 }
1314} 1311}
1315 1312
1316#if ENABLE_FRILLS 1313#if ENABLE_FRILLS
… …
2388rxvt_term::scr_remap_chars (line_t &l) 2385rxvt_term::scr_remap_chars (line_t &l)
2389{ 2386{
2390 if (!l.t) 2387 if (!l.t)
2391 return; 2388 return;
2392 2389
2393 l.touch (); // maybe a bit of an overkill, but its not performance-relevant 2390 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2394 2391
2395 for (int i = ncol; i--; ) 2392 for (int i = ncol; i--; )
2396 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2393 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2397} 2394}
2398 2395

Diff Legend

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