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.158 by root, Sat Feb 19 19:37:34 2005 UTC vs.
Revision 1.163 by root, Sat Jun 18 09:02:37 2005 UTC

… …
202 /* 202 /*
203 * first time called so just malloc everything: don't rely on realloc 203 * first time called so just malloc everything: don't rely on realloc
204 * Note: this is still needed so that all the scrollback lines are NULL 204 * Note: this is still needed so that all the scrollback lines are NULL
205 */ 205 */
206 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 206 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
207 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 207 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
208 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); 208 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
209 swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); 209 swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
210 210
211 screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t)); 211 screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t));
212 swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t)); 212 swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t));
213 213
214 screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); 214 screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
215 buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); 215 buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
216 drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *)); 216 drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
217 swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *)); 217 swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
218 218
219 for (p = 0; p < nrow; p++) 219 for (p = 0; p < nrow; p++)
220 { 220 {
221 q = p + TermWin.saveLines; 221 q = p + TermWin.saveLines;
222 scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE); 222 scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE);
… …
699 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 699 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */
700 } 700 }
701 else if (j >= row1 && j <= row2) 701 else if (j >= row1 && j <= row2)
702 { 702 {
703 /* move selected region too */ 703 /* move selected region too */
704 selection.beg.row -= count; 704 selection.beg.row -= count;
705 selection.end.row -= count; 705 selection.end.row -= count;
706 selection.mark.row -= count; 706 selection.mark.row -= count;
707 } 707 }
708 } 708 }
709 709
710 selection_check (0); /* _after_ TermWin.nscrolled update */ 710 selection_check (0); /* _after_ TermWin.nscrolled update */
… …
718 i = row2 - row1 + 1; 718 i = row2 - row1 + 1;
719 MIN_IT (count, i); 719 MIN_IT (count, i);
720 720
721 if (j > 0) 721 if (j > 0)
722 { 722 {
723 /* A: scroll up */ 723 /* scroll up */
724 724
725 /* A1: Copy lines that will get clobbered by the rotation */ 725 /* Copy lines that will get clobbered by the rotation */
726 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *)); 726 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));
727 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *)); 727 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
728 728
729 /* A2: Rotate lines */ 729 /* Rotate lines */
730 i = row2 - row1 - count + 1; 730 i = row2 - row1 - count + 1;
731 memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t)); 731 memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t));
732 memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *)); 732 memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *));
733 memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *)); 733 memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *));
734 734
735 j = row2 - count + 1, i = count; 735 j = row2 - count + 1, i = count;
736 } 736 }
737 else /* if (j < 0) */ 737 else /* if (j < 0) */
738 { 738 {
739 /* B: scroll down */ 739 /* scroll down */
740 740
741 /* B1: Copy lines that will get clobbered by the rotation */ 741 /* Copy lines that will get clobbered by the rotation */
742 for (i = 0, j = row2; i < count; i++, j--) 742 for (i = 0, j = row2; i < count; i++, j--)
743 { 743 {
744 buf_text[i] = screen.text[j]; 744 buf_text[i] = screen.text[j];
745 buf_rend[i] = screen.rend[j]; 745 buf_rend[i] = screen.rend[j];
746 } 746 }
747 747
748 /* B2: Rotate lines */ 748 /* Rotate lines */
749 for (j = row2, i = j - count; i >= row1; i--, j--) 749 for (j = row2, i = j - count; i >= row1; i--, j--)
750 { 750 {
751 screen.tlen[j] = screen.tlen[i]; 751 screen.tlen[j] = screen.tlen[i];
752 screen.text[j] = screen.text[i]; 752 screen.text[j] = screen.text[i];
753 screen.rend[j] = screen.rend[i]; 753 screen.rend[j] = screen.rend[i];
… …
755 755
756 j = row1, i = count; 756 j = row1, i = count;
757 count = -count; 757 count = -count;
758 } 758 }
759 759
760 /* C: Resurrect lines */ 760 /* Resurrect lines */
761 memset (screen.tlen + j, 0, i * sizeof (int16_t)); 761 memset (screen.tlen + j, 0, i * sizeof (int16_t));
762 memcpy (screen.text + j, buf_text, i * sizeof (text_t *)); 762 memcpy (screen.text + j, buf_text, i * sizeof (text_t *));
763 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *)); 763 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));
764 if (!spec) /* line length may not equal TermWin.ncol */ 764 if (!spec) /* line length may not equal TermWin.ncol */
765 for (; i--; j++) 765 for (; i--; j++)
… …
1161 */ 1161 */
1162#if ENABLE_FRILLS 1162#if ENABLE_FRILLS
1163void 1163void
1164rxvt_term::scr_forwardindex () 1164rxvt_term::scr_forwardindex ()
1165{ 1165{
1166 int row; 1166 int row;
1167 1167
1168 if (screen.cur.col < TermWin.ncol - 1) 1168 if (screen.cur.col < TermWin.ncol - 1)
1169 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1169 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1170 else 1170 else
1171 { 1171 {
… …
1390 screen.tlen[row + row_offset] = 0; 1390 screen.tlen[row + row_offset] = 0;
1391 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren); 1391 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);
1392 } 1392 }
1393} 1393}
1394 1394
1395#if ENABLE_FRILLS
1396void
1397rxvt_term::scr_erase_savelines ()
1398{
1399 want_refresh = 1;
1400 ZERO_SCROLLBACK ();
1401
1402 TermWin.nscrolled = 0;
1403}
1404#endif
1405
1395/* ------------------------------------------------------------------------- */ 1406/* ------------------------------------------------------------------------- */
1396/* 1407/*
1397 * Fill the screen with `E's 1408 * Fill the screen with `E's
1398 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1409 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1399 */ 1410 */
1400void 1411void
1401rxvt_term::scr_E () 1412rxvt_term::scr_E ()
1402{ 1413{
1403 int i, j, k; 1414 int i, j, k;
1404 rend_t *r1, fs; 1415 rend_t *r1, fs;
1405 1416
1406 want_refresh = 1; 1417 want_refresh = 1;
1407 ZERO_SCROLLBACK (); 1418 ZERO_SCROLLBACK ();
1408 1419
1409 num_scr_allow = 0; 1420 num_scr_allow = 0;
… …
2002/* 2013/*
2003 * Refresh the screen 2014 * Refresh the screen
2004 * drawn_text/drawn_rend contain the screen information before the update. 2015 * drawn_text/drawn_rend contain the screen information before the update.
2005 * screen.text/screen.rend contain what the screen will change to. 2016 * screen.text/screen.rend contain what the screen will change to.
2006 */ 2017 */
2007
2008#define FONT_WIDTH(X, Y) \
2009 (X)->per_char[ (Y) - (X)->min_char_or_byte2].width
2010#define FONT_RBEAR(X, Y) \
2011 (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
2012#define FONT_LBEAR(X, Y) \
2013 (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
2014#define IS_FONT_CHAR(X, Y) \
2015 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
2016
2017void 2018void
2018rxvt_term::scr_refresh (unsigned char refresh_type) 2019rxvt_term::scr_refresh (unsigned char refresh_type)
2019{ 2020{
2020 unsigned char must_clear, /* use draw_string not draw_image_string */ 2021 unsigned char must_clear, /* use draw_string not draw_image_string */
2021 showcursor; /* show the cursor */ 2022 showcursor; /* show the cursor */
… …
2040 refresh_count = 0; 2041 refresh_count = 0;
2041 2042
2042 row_offset = TermWin.saveLines - TermWin.view_start; 2043 row_offset = TermWin.saveLines - TermWin.view_start;
2043 2044
2044#if XPM_BACKGROUND 2045#if XPM_BACKGROUND
2045 must_clear |= (bgPixmap.pixmap != None); 2046 must_clear |= bgPixmap.pixmap != None;
2046#endif 2047#endif
2047#if TRANSPARENT 2048#if TRANSPARENT
2048 must_clear |= ((options & Opt_transparent) && am_transparent); 2049 must_clear |= (options & Opt_transparent) && am_transparent;
2049#endif 2050#endif
2050 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2051 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2051 2052
2052 /* 2053 /*
2053 * B: reverse any characters which are selected 2054 * B: reverse any characters which are selected
… …
2077 2078
2078 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; 2079 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];
2079 2080
2080 if (showcursor && TermWin.focus) 2081 if (showcursor && TermWin.focus)
2081 { 2082 {
2083 if (options & Opt_cursorUnderline)
2084 *crp ^= RS_Uline;
2085 else
2086 {
2082 *crp ^= RS_RVid; 2087 *crp ^= RS_RVid;
2088
2083#ifndef NO_CURSORCOLOR 2089#ifndef NO_CURSORCOLOR
2084 cc1 = *crp & (RS_fgMask | RS_bgMask); 2090 cc1 = *crp & (RS_fgMask | RS_bgMask);
2085 if (ISSET_PIXCOLOR (Color_cursor)) 2091 if (ISSET_PIXCOLOR (Color_cursor))
2086 ccol1 = Color_cursor; 2092 ccol1 = Color_cursor;
2087 else 2093 else
2088#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2094#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2089 ccol1 = GET_FGCOLOR (rstyle); 2095 ccol1 = GET_FGCOLOR (rstyle);
2090#else 2096#else
2091 ccol1 = Color_fg; 2097 ccol1 = Color_fg;
2092#endif 2098#endif
2093 if (ISSET_PIXCOLOR (Color_cursor2)) 2099 if (ISSET_PIXCOLOR (Color_cursor2))
2094 ccol2 = Color_cursor2; 2100 ccol2 = Color_cursor2;
2095 else 2101 else
2096#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2102#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2097 ccol2 = GET_BGCOLOR (rstyle); 2103 ccol2 = GET_BGCOLOR (rstyle);
2098#else 2104#else
2099 ccol2 = Color_bg; 2105 ccol2 = Color_bg;
2100#endif 2106#endif
2101 *crp = SET_FGCOLOR (*crp, ccol1); 2107 *crp = SET_FGCOLOR (*crp, ccol1);
2102 *crp = SET_BGCOLOR (*crp, ccol2); 2108 *crp = SET_BGCOLOR (*crp, ccol2);
2103#endif 2109#endif
2110 }
2104 } 2111 }
2105 } 2112 }
2106 2113
2107 /* make sure no outline cursor is left around */ 2114 /* make sure no outline cursor is left around */
2108 setoldcursor = 0; 2115 setoldcursor = 0;
… …
2414 */ 2421 */
2415 if (showcursor) 2422 if (showcursor)
2416 { 2423 {
2417 if (TermWin.focus) 2424 if (TermWin.focus)
2418 { 2425 {
2426 if (options & Opt_cursorUnderline)
2427 *crp ^= RS_Uline;
2428 else
2429 {
2419 *crp ^= RS_RVid; 2430 *crp ^= RS_RVid;
2420#ifndef NO_CURSORCOLOR 2431#ifndef NO_CURSORCOLOR
2421 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2432 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2422#endif 2433#endif
2434 }
2423 } 2435 }
2424 else if (oldcursor.row >= 0) 2436 else if (oldcursor.row >= 0)
2425 { 2437 {
2426#ifndef NO_CURSORCOLOR 2438#ifndef NO_CURSORCOLOR
2427 if (ISSET_PIXCOLOR (Color_cursor)) 2439 if (ISSET_PIXCOLOR (Color_cursor))
… …
2900 2912
2901int 2913int
2902rxvt_term::selection_request_other (Atom target, int selnum) 2914rxvt_term::selection_request_other (Atom target, int selnum)
2903{ 2915{
2904 Atom sel; 2916 Atom sel;
2905#ifdef DEBUG_SELECT
2906 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2907#endif
2908 2917
2909 selection_type |= selnum; 2918 selection_type |= selnum;
2910 2919
2911 if (selnum == Sel_Primary) 2920 if (selnum == Sel_Primary)
2912 sel = XA_PRIMARY; 2921 sel = XA_PRIMARY;
… …
3787 while (*s) 3796 while (*s)
3788 scr_overlay_set (x++, y, *s++); 3797 scr_overlay_set (x++, y, *s++);
3789} 3798}
3790 3799
3791void 3800void
3801rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s)
3802{
3803 while (*s)
3804 {
3805 text_t t = *s++;
3806 int width = wcwidth (t);
3807
3808 while (width--)
3809 {
3810 scr_overlay_set (x++, y, t);
3811 t = NOCHAR;
3812 }
3813 }
3814}
3815
3816void
3792rxvt_term::scr_swap_overlay () 3817rxvt_term::scr_swap_overlay ()
3793{ 3818{
3794 if (!ov_text) 3819 if (!ov_text)
3795 return; 3820 return;
3796 3821

Diff Legend

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