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.215 by root, Sun Jan 8 06:35:23 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 {
… …
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
… …
1833int 1830int
1834rxvt_term::scr_changeview (unsigned int oldviewstart) 1831rxvt_term::scr_changeview (unsigned int oldviewstart)
1835{ 1832{
1836 if (view_start != oldviewstart) 1833 if (view_start != oldviewstart)
1837 { 1834 {
1838 PERL_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1835 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1839 1836
1840 want_refresh = 1; 1837 want_refresh = 1;
1841 num_scr -= (view_start - oldviewstart); 1838 num_scr -= (view_start - oldviewstart);
1842 } 1839 }
1843 1840
… …
2053 oldcursor.col = screen.cur.col; 2050 oldcursor.col = screen.cur.col;
2054 } 2051 }
2055 } 2052 }
2056 } 2053 }
2057 2054
2058 PERL_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2055 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2059#if ENABLE_OVERLAY 2056#if ENABLE_OVERLAY
2060 scr_swap_overlay (); 2057 scr_swap_overlay ();
2061#endif 2058#endif
2062 2059
2063#ifndef NO_SLOW_LINK_SUPPORT 2060#ifndef NO_SLOW_LINK_SUPPORT
… …
2326 } /* for (row....) */ 2323 } /* for (row....) */
2327 2324
2328#if ENABLE_OVERLAY 2325#if ENABLE_OVERLAY
2329 scr_swap_overlay (); 2326 scr_swap_overlay ();
2330#endif 2327#endif
2331 PERL_INVOKE ((this, HOOK_REFRESH_END, DT_END)); 2328 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2332 2329
2333 /* 2330 /*
2334 * G: cleanup cursor and display outline cursor if necessary 2331 * G: cleanup cursor and display outline cursor if necessary
2335 */ 2332 */
2336 if (showcursor) 2333 if (showcursor)
… …
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
… …
2890 selection.op = SELECTION_DONE; 2887 selection.op = SELECTION_DONE;
2891 2888
2892 if (selection.clicks == 4) 2889 if (selection.clicks == 4)
2893 return; /* nothing selected, go away */ 2890 return; /* nothing selected, go away */
2894 2891
2895 if (PERL_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2892 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2896 return; 2893 return;
2897 2894
2898 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2895 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2899 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2896 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2900 2897
… …
2985 2982
2986 // we usually allocate much more than necessary, so realloc it smaller again 2983 // we usually allocate much more than necessary, so realloc it smaller again
2987 selection.len = ofs; 2984 selection.len = ofs;
2988 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 2985 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2989 2986
2990 if (PERL_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END))) 2987 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
2991 return; 2988 return;
2992 2989
2993 selection_grab (tm); 2990 selection_grab (tm);
2994} 2991}
2995 2992
… …
3331 else if (selection.clicks == 2) 3328 else if (selection.clicks == 2)
3332 { 3329 {
3333 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3330 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3334 selection.end.col--; 3331 selection.end.col--;
3335 3332
3336 if (!PERL_INVOKE ((this, HOOK_SEL_EXTEND, DT_END))) 3333 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3337 { 3334 {
3338 selection_delimit_word (UP, &selection.beg, &selection.beg); 3335 selection_delimit_word (UP, &selection.beg, &selection.beg);
3339 selection_delimit_word (DN, &selection.end, &selection.end); 3336 selection_delimit_word (DN, &selection.end, &selection.end);
3340 } 3337 }
3341 } 3338 }

Diff Legend

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