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.217 by root, Mon Jan 9 19:01:56 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 * ------------------------------------------------------------------------- */
… …
191 194
192 if (!row_buf) 195 if (!row_buf)
193 { 196 {
194 /* 197 /*
195 * first time called so just malloc everything: don't rely on realloc 198 * first time called so just malloc everything: don't rely on realloc
196 * Note: this is still needed so that all the scrollback lines are NULL
197 */ 199 */
198 nsaved = 0; /* no saved lines */ 200 nsaved = 0; /* no saved lines */
199 term_start = 0; 201 term_start = 0;
200 202
201 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
202 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
203 205
204 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 206 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
205 temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
206 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 207 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
207 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 208 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
208 209
209 for (int row = nrow; row--; ) 210 for (int row = nrow; row--; )
210 { 211 {
211 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 212 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
212 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 213 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
… …
257 } 258 }
258 } 259 }
259#endif 260#endif
260 261
261 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); 262 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
262 temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
263 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); 263 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
264 264
265 for (int row = min (nrow, prev_nrow); row--; ) 265 for (int row = min (nrow, prev_nrow); row--; )
266 { 266 {
267 lresize (drawn_buf[row]); 267 lresize (drawn_buf[row]);
… …
272 { 272 {
273 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 273 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
275 } 275 }
276 276
277 line_t *old_buf = row_buf;
277 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
278 279
279 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
280 int pend = MOD (term_start - nsaved , prev_total_rows); 281 int pend = MOD (term_start - nsaved , prev_total_rows);
281 int q = total_rows; // rewrapped row 282 int q = total_rows; // rewrapped row
282 283
… …
414 for (int col = ncol; col--; ) 415 for (int col = ncol; col--; )
415 tabs [col] = col % TABSIZE == 0; 416 tabs [col] = col % TABSIZE == 0;
416 417
417 tt_winch (); 418 tt_winch ();
418 419
419 PERL_INVOKE ((this, HOOK_RESET, DT_END)); 420 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
420} 421}
421 422
422/* ------------------------------------------------------------------------- */ 423/* ------------------------------------------------------------------------- */
423/* 424/*
424 * Free everything. That way malloc debugging can find leakage. 425 * Free everything. That way malloc debugging can find leakage.
… …
430 delete ralloc; ralloc = 0; 431 delete ralloc; ralloc = 0;
431 432
432 free (row_buf); 433 free (row_buf);
433 free (swap_buf); 434 free (swap_buf);
434 free (drawn_buf); 435 free (drawn_buf);
435 free (temp_buf);
436 free (tabs); 436 free (tabs);
437 437
438 row_buf = 0; // signal that we freed all the arrays 438 row_buf = 0; // signal that we freed all the arrays
439} 439}
440 440
… …
618 && row2 == nrow - 1 618 && row2 == nrow - 1
619 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 619 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
620 { 620 {
621 nsaved = min (nsaved + count, saveLines); 621 nsaved = min (nsaved + count, saveLines);
622 622
623 PERL_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END)); 623 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));
624 624
625 term_start = (term_start + count) % total_rows; 625 term_start = (term_start + count) % total_rows;
626 626
627 if (selection.op && current_screen == selection.screen) 627 if (selection.op && current_screen == selection.screen)
628 { 628 {
… …
639 } 639 }
640 } 640 }
641 641
642 for (int i = count; i--; ) 642 for (int i = count; i--; )
643 { 643 {
644 ROW(row2 - i).l = 0; 644 // basically thi is a slightly optimized scr_blank_screen_mem
645 scr_blank_screen_mem (ROW(row2 - i), rstyle); 645 // it is worth the effort on slower machines
646 line_t &l = ROW(row2 - i);
647
648 scr_blank_line (l, 0, l.l, rstyle);
649
650 l.l = 0;
651 l.f = 0;
646 } 652 }
647 653
648 if (OPTION (Opt_scrollWithBuffer) 654 if (OPTION (Opt_scrollWithBuffer)
649 && view_start != 0 655 && view_start != 0
650 && view_start != saveLines) 656 && view_start != saveLines)
… …
680 686
681 int rows = row2 - row1 + 1; 687 int rows = row2 - row1 + 1;
682 688
683 min_it (count, rows); 689 min_it (count, rows);
684 690
691 line_t *temp_buf = row_buf + total_rows;
692
685 for (int row = 0; row < rows; row++) 693 for (int row = 0; row < rows; row++)
686 { 694 {
687 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 695 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
688 696
689 if (!IN_RANGE_EXC (row + count, 0, rows)) 697 if (!IN_RANGE_EXC (row + count, 0, rows))
… …
700/* ------------------------------------------------------------------------- */ 708/* ------------------------------------------------------------------------- */
701/* 709/*
702 * Add text given in <str> of length <len> to screen struct 710 * Add text given in <str> of length <len> to screen struct
703 */ 711 */
704void 712void
705rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 713rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines)
706{ 714{
707 if (len <= 0) /* sanity */ 715 if (len <= 0) /* sanity */
708 return; 716 return;
709 717
710 unsigned char checksel; 718 unsigned char checksel;
711 unicode_t c; 719 unicode_t c;
712 int ncol = this->ncol; 720 int ncol = this->ncol;
713 const unicode_t *strend = str + len; 721 const wchar_t *strend = str + len;
714 722
715 want_refresh = 1; 723 want_refresh = 1;
716 ZERO_SCROLLBACK (); 724 ZERO_SCROLLBACK ();
717 725
718 if (nlines > 0) 726 if (minlines > 0)
719 { 727 {
720 nlines += screen.cur.row - screen.bscroll; 728 minlines += screen.cur.row - screen.bscroll;
721 729
722 if (nlines > 0 730 if (minlines > 0
723 && screen.tscroll == 0 731 && screen.tscroll == 0
724 && screen.bscroll == nrow - 1) 732 && screen.bscroll == nrow - 1)
725 { 733 {
726 /* _at least_ this many lines need to be scrolled */ 734 /* _at least_ this many lines need to be scrolled */
727 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 735 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
728 screen.cur.row -= nlines; 736 screen.cur.row -= minlines;
729 } 737 }
730 } 738 }
731 739
732#ifdef DEBUG_STRICT 740#ifdef DEBUG_STRICT
733 assert (screen.cur.col < ncol); 741 assert (screen.cur.col < ncol);
… …
740 748
741 line_t *line = &ROW(row); 749 line_t *line = &ROW(row);
742 750
743 while (str < strend) 751 while (str < strend)
744 { 752 {
745 c = *str++; 753 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
746 754
747 if (c < 0x20) 755 if (c < 0x20)
748 if (c == C0_LF) 756 if (c == C0_LF)
749 { 757 {
750 max_it (line->l, screen.cur.col); 758 max_it (line->l, screen.cur.col);
… …
1303 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1311 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1304 } 1312 }
1305 1313
1306 for (; num--; row++) 1314 for (; num--; row++)
1307 { 1315 {
1308 line_t &l = ROW(row);
1309 l.l = 0;
1310 l.is_longer (0);
1311 scr_blank_screen_mem (l, rstyle); 1316 scr_blank_screen_mem (ROW(row), rstyle);
1312 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1317 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1313 } 1318 }
1314} 1319}
1315 1320
1316#if ENABLE_FRILLS 1321#if ENABLE_FRILLS
… …
1833int 1838int
1834rxvt_term::scr_changeview (unsigned int oldviewstart) 1839rxvt_term::scr_changeview (unsigned int oldviewstart)
1835{ 1840{
1836 if (view_start != oldviewstart) 1841 if (view_start != oldviewstart)
1837 { 1842 {
1838 PERL_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1843 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1839 1844
1840 want_refresh = 1; 1845 want_refresh = 1;
1841 num_scr -= (view_start - oldviewstart); 1846 num_scr -= (view_start - oldviewstart);
1842 } 1847 }
1843 1848
… …
2053 oldcursor.col = screen.cur.col; 2058 oldcursor.col = screen.cur.col;
2054 } 2059 }
2055 } 2060 }
2056 } 2061 }
2057 2062
2058 PERL_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2063 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2059#if ENABLE_OVERLAY 2064#if ENABLE_OVERLAY
2060 scr_swap_overlay (); 2065 scr_swap_overlay ();
2061#endif 2066#endif
2062 2067
2063#ifndef NO_SLOW_LINK_SUPPORT 2068#ifndef NO_SLOW_LINK_SUPPORT
… …
2326 } /* for (row....) */ 2331 } /* for (row....) */
2327 2332
2328#if ENABLE_OVERLAY 2333#if ENABLE_OVERLAY
2329 scr_swap_overlay (); 2334 scr_swap_overlay ();
2330#endif 2335#endif
2331 PERL_INVOKE ((this, HOOK_REFRESH_END, DT_END)); 2336 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2332 2337
2333 /* 2338 /*
2334 * G: cleanup cursor and display outline cursor if necessary 2339 * G: cleanup cursor and display outline cursor if necessary
2335 */ 2340 */
2336 if (showcursor) 2341 if (showcursor)
… …
2388rxvt_term::scr_remap_chars (line_t &l) 2393rxvt_term::scr_remap_chars (line_t &l)
2389{ 2394{
2390 if (!l.t) 2395 if (!l.t)
2391 return; 2396 return;
2392 2397
2393 l.touch (); // maybe a bit of an overkill, but its not performance-relevant 2398 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2394 2399
2395 for (int i = ncol; i--; ) 2400 for (int i = ncol; i--; )
2396 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2401 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2397} 2402}
2398 2403
… …
2890 selection.op = SELECTION_DONE; 2895 selection.op = SELECTION_DONE;
2891 2896
2892 if (selection.clicks == 4) 2897 if (selection.clicks == 4)
2893 return; /* nothing selected, go away */ 2898 return; /* nothing selected, go away */
2894 2899
2895 if (PERL_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2900 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2896 return; 2901 return;
2897 2902
2898 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2903 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2899 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2904 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2900 2905
… …
2985 2990
2986 // we usually allocate much more than necessary, so realloc it smaller again 2991 // we usually allocate much more than necessary, so realloc it smaller again
2987 selection.len = ofs; 2992 selection.len = ofs;
2988 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 2993 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2989 2994
2990 if (PERL_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END))) 2995 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
2991 return; 2996 return;
2992 2997
2993 selection_grab (tm); 2998 selection_grab (tm);
2994} 2999}
2995 3000
… …
3331 else if (selection.clicks == 2) 3336 else if (selection.clicks == 2)
3332 { 3337 {
3333 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3338 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3334 selection.end.col--; 3339 selection.end.col--;
3335 3340
3336 if (!PERL_INVOKE ((this, HOOK_SEL_EXTEND, DT_END))) 3341 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3337 { 3342 {
3338 selection_delimit_word (UP, &selection.beg, &selection.beg); 3343 selection_delimit_word (UP, &selection.beg, &selection.beg);
3339 selection_delimit_word (DN, &selection.end, &selection.end); 3344 selection_delimit_word (DN, &selection.end, &selection.end);
3340 } 3345 }
3341 } 3346 }

Diff Legend

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