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.210 by root, Thu Jan 5 21:21:49 2006 UTC vs.
Revision 1.216 by root, Mon Jan 9 18:51:19 2006 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*--------------------------------*-C-*--------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
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 * ------------------------------------------------------------------------- */
… …
414 for (int col = ncol; col--; ) 417 for (int col = ncol; col--; )
415 tabs [col] = col % TABSIZE == 0; 418 tabs [col] = col % TABSIZE == 0;
416 419
417 tt_winch (); 420 tt_winch ();
418 421
419 PERL_INVOKE ((this, HOOK_RESET, DT_END)); 422 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
420} 423}
421 424
422/* ------------------------------------------------------------------------- */ 425/* ------------------------------------------------------------------------- */
423/* 426/*
424 * Free everything. That way malloc debugging can find leakage. 427 * Free everything. That way malloc debugging can find leakage.
… …
618 && row2 == nrow - 1 621 && row2 == nrow - 1
619 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 622 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
620 { 623 {
621 nsaved = min (nsaved + count, saveLines); 624 nsaved = min (nsaved + count, saveLines);
622 625
623 PERL_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END)); 626 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));
624 627
625 term_start = (term_start + count) % total_rows; 628 term_start = (term_start + count) % total_rows;
626 629
627 if (selection.op && current_screen == selection.screen) 630 if (selection.op && current_screen == selection.screen)
628 { 631 {
… …
639 } 642 }
640 } 643 }
641 644
642 for (int i = count; i--; ) 645 for (int i = count; i--; )
643 { 646 {
644 ROW(row2 - i).l = 0; 647 // basically thi is a slightly optimized scr_blank_screen_mem
645 scr_blank_screen_mem (ROW(row2 - i), rstyle); 648 // it is worth the effort on slower machines
649 line_t &l = ROW(row2 - i);
650
651 scr_blank_line (l, 0, l.l, rstyle);
652
653 l.l = 0;
654 l.f = 0;
646 } 655 }
647 656
648 if (OPTION (Opt_scrollWithBuffer) 657 if (OPTION (Opt_scrollWithBuffer)
649 && view_start != 0 658 && view_start != 0
650 && view_start != saveLines) 659 && view_start != saveLines)
… …
700/* ------------------------------------------------------------------------- */ 709/* ------------------------------------------------------------------------- */
701/* 710/*
702 * Add text given in <str> of length <len> to screen struct 711 * Add text given in <str> of length <len> to screen struct
703 */ 712 */
704void 713void
705rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 714rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines)
706{ 715{
707 if (len <= 0) /* sanity */ 716 if (len <= 0) /* sanity */
708 return; 717 return;
709 718
710 unsigned char checksel; 719 unsigned char checksel;
711 unicode_t c; 720 unicode_t c;
712 int ncol = this->ncol; 721 int ncol = this->ncol;
713 const unicode_t *strend = str + len; 722 const wchar_t *strend = str + len;
714 723
715 want_refresh = 1; 724 want_refresh = 1;
716 ZERO_SCROLLBACK (); 725 ZERO_SCROLLBACK ();
717 726
718 if (nlines > 0) 727 if (minlines > 0)
719 { 728 {
720 nlines += screen.cur.row - screen.bscroll; 729 minlines += screen.cur.row - screen.bscroll;
721 730
722 if (nlines > 0 731 if (minlines > 0
723 && screen.tscroll == 0 732 && screen.tscroll == 0
724 && screen.bscroll == nrow - 1) 733 && screen.bscroll == nrow - 1)
725 { 734 {
726 /* _at least_ this many lines need to be scrolled */ 735 /* _at least_ this many lines need to be scrolled */
727 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 736 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
728 screen.cur.row -= nlines; 737 screen.cur.row -= minlines;
729 } 738 }
730 } 739 }
731 740
732#ifdef DEBUG_STRICT 741#ifdef DEBUG_STRICT
733 assert (screen.cur.col < ncol); 742 assert (screen.cur.col < ncol);
… …
740 749
741 line_t *line = &ROW(row); 750 line_t *line = &ROW(row);
742 751
743 while (str < strend) 752 while (str < strend)
744 { 753 {
745 c = *str++; 754 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
746 755
747 if (c < 0x20) 756 if (c < 0x20)
748 if (c == C0_LF) 757 if (c == C0_LF)
749 { 758 {
750 max_it (line->l, screen.cur.col); 759 max_it (line->l, screen.cur.col);
… …
1303 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1312 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1304 } 1313 }
1305 1314
1306 for (; num--; row++) 1315 for (; num--; row++)
1307 { 1316 {
1308 line_t &l = ROW(row);
1309 l.l = 0;
1310 l.is_longer (0);
1311 scr_blank_screen_mem (l, rstyle); 1317 scr_blank_screen_mem (ROW(row), rstyle);
1312 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1318 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1313 } 1319 }
1314} 1320}
1315 1321
1316#if ENABLE_FRILLS 1322#if ENABLE_FRILLS
… …
1833int 1839int
1834rxvt_term::scr_changeview (unsigned int oldviewstart) 1840rxvt_term::scr_changeview (unsigned int oldviewstart)
1835{ 1841{
1836 if (view_start != oldviewstart) 1842 if (view_start != oldviewstart)
1837 { 1843 {
1838 PERL_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1844 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1839 1845
1840 want_refresh = 1; 1846 want_refresh = 1;
1841 num_scr -= (view_start - oldviewstart); 1847 num_scr -= (view_start - oldviewstart);
1842 } 1848 }
1843 1849
… …
2053 oldcursor.col = screen.cur.col; 2059 oldcursor.col = screen.cur.col;
2054 } 2060 }
2055 } 2061 }
2056 } 2062 }
2057 2063
2058 PERL_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2064 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2059#if ENABLE_OVERLAY 2065#if ENABLE_OVERLAY
2060 scr_swap_overlay (); 2066 scr_swap_overlay ();
2061#endif 2067#endif
2062 2068
2063#ifndef NO_SLOW_LINK_SUPPORT 2069#ifndef NO_SLOW_LINK_SUPPORT
… …
2326 } /* for (row....) */ 2332 } /* for (row....) */
2327 2333
2328#if ENABLE_OVERLAY 2334#if ENABLE_OVERLAY
2329 scr_swap_overlay (); 2335 scr_swap_overlay ();
2330#endif 2336#endif
2331 PERL_INVOKE ((this, HOOK_REFRESH_END, DT_END)); 2337 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2332 2338
2333 /* 2339 /*
2334 * G: cleanup cursor and display outline cursor if necessary 2340 * G: cleanup cursor and display outline cursor if necessary
2335 */ 2341 */
2336 if (showcursor) 2342 if (showcursor)
… …
2388rxvt_term::scr_remap_chars (line_t &l) 2394rxvt_term::scr_remap_chars (line_t &l)
2389{ 2395{
2390 if (!l.t) 2396 if (!l.t)
2391 return; 2397 return;
2392 2398
2393 l.touch (); // maybe a bit of an overkill, but its not performance-relevant 2399 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2394 2400
2395 for (int i = ncol; i--; ) 2401 for (int i = ncol; i--; )
2396 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2402 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2397} 2403}
2398 2404
… …
2890 selection.op = SELECTION_DONE; 2896 selection.op = SELECTION_DONE;
2891 2897
2892 if (selection.clicks == 4) 2898 if (selection.clicks == 4)
2893 return; /* nothing selected, go away */ 2899 return; /* nothing selected, go away */
2894 2900
2895 if (PERL_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2901 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2896 return; 2902 return;
2897 2903
2898 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2904 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2899 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2905 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2900 2906
… …
2985 2991
2986 // we usually allocate much more than necessary, so realloc it smaller again 2992 // we usually allocate much more than necessary, so realloc it smaller again
2987 selection.len = ofs; 2993 selection.len = ofs;
2988 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 2994 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2989 2995
2990 if (PERL_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END))) 2996 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
2991 return; 2997 return;
2992 2998
2993 selection_grab (tm); 2999 selection_grab (tm);
2994} 3000}
2995 3001
… …
3331 else if (selection.clicks == 2) 3337 else if (selection.clicks == 2)
3332 { 3338 {
3333 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3339 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3334 selection.end.col--; 3340 selection.end.col--;
3335 3341
3336 if (!PERL_INVOKE ((this, HOOK_SEL_EXTEND, DT_END))) 3342 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3337 { 3343 {
3338 selection_delimit_word (UP, &selection.beg, &selection.beg); 3344 selection_delimit_word (UP, &selection.beg, &selection.beg);
3339 selection_delimit_word (DN, &selection.end, &selection.end); 3345 selection_delimit_word (DN, &selection.end, &selection.end);
3340 } 3346 }
3341 } 3347 }

Diff Legend

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