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.156 by root, Fri Feb 4 11:41:23 2005 UTC vs.
Revision 1.162 by root, Sun Apr 17 22:36:13 2005 UTC

28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29 29
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 30#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 31
32#include <inttypes.h> 32#include <inttypes.h>
33#include <wchar.h>
34 33
35#include "salloc.C" // HACK, should be a seperate compile! 34#include "salloc.C" // HACK, should be a seperate compile!
36 35
37inline void fill_text (text_t *start, text_t value, int len) 36inline void fill_text (text_t *start, text_t value, int len)
38{ 37{
203 /* 202 /*
204 * 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
205 * 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
206 */ 205 */
207 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 206 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
208 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 207 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
209 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); 208 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
210 swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); 209 swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
211 210
212 screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t)); 211 screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t));
213 swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t)); 212 swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t));
214 213
215 screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); 214 screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
216 buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); 215 buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
217 drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *)); 216 drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
218 swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *)); 217 swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
219 218
220 for (p = 0; p < nrow; p++) 219 for (p = 0; p < nrow; p++)
221 { 220 {
222 q = p + TermWin.saveLines; 221 q = p + TermWin.saveLines;
223 scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE); 222 scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE);
700 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 699 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */
701 } 700 }
702 else if (j >= row1 && j <= row2) 701 else if (j >= row1 && j <= row2)
703 { 702 {
704 /* move selected region too */ 703 /* move selected region too */
705 selection.beg.row -= count; 704 selection.beg.row -= count;
706 selection.end.row -= count; 705 selection.end.row -= count;
707 selection.mark.row -= count; 706 selection.mark.row -= count;
708 } 707 }
709 } 708 }
710 709
711 selection_check (0); /* _after_ TermWin.nscrolled update */ 710 selection_check (0); /* _after_ TermWin.nscrolled update */
719 i = row2 - row1 + 1; 718 i = row2 - row1 + 1;
720 MIN_IT (count, i); 719 MIN_IT (count, i);
721 720
722 if (j > 0) 721 if (j > 0)
723 { 722 {
724 /* A: scroll up */ 723 /* scroll up */
725 724
726 /* A1: Copy lines that will get clobbered by the rotation */ 725 /* Copy lines that will get clobbered by the rotation */
727 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *)); 726 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));
728 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *)); 727 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
729 728
730 /* A2: Rotate lines */ 729 /* Rotate lines */
731 i = row2 - row1 - count + 1; 730 i = row2 - row1 - count + 1;
732 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));
733 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 *));
734 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 *));
735 734
736 j = row2 - count + 1, i = count; 735 j = row2 - count + 1, i = count;
737 } 736 }
738 else /* if (j < 0) */ 737 else /* if (j < 0) */
739 { 738 {
740 /* B: scroll down */ 739 /* scroll down */
741 740
742 /* B1: Copy lines that will get clobbered by the rotation */ 741 /* Copy lines that will get clobbered by the rotation */
743 for (i = 0, j = row2; i < count; i++, j--) 742 for (i = 0, j = row2; i < count; i++, j--)
744 { 743 {
745 buf_text[i] = screen.text[j]; 744 buf_text[i] = screen.text[j];
746 buf_rend[i] = screen.rend[j]; 745 buf_rend[i] = screen.rend[j];
747 } 746 }
748 747
749 /* B2: Rotate lines */ 748 /* Rotate lines */
750 for (j = row2, i = j - count; i >= row1; i--, j--) 749 for (j = row2, i = j - count; i >= row1; i--, j--)
751 { 750 {
752 screen.tlen[j] = screen.tlen[i]; 751 screen.tlen[j] = screen.tlen[i];
753 screen.text[j] = screen.text[i]; 752 screen.text[j] = screen.text[i];
754 screen.rend[j] = screen.rend[i]; 753 screen.rend[j] = screen.rend[i];
756 755
757 j = row1, i = count; 756 j = row1, i = count;
758 count = -count; 757 count = -count;
759 } 758 }
760 759
761 /* C: Resurrect lines */ 760 /* Resurrect lines */
762 memset (screen.tlen + j, 0, i * sizeof (int16_t)); 761 memset (screen.tlen + j, 0, i * sizeof (int16_t));
763 memcpy (screen.text + j, buf_text, i * sizeof (text_t *)); 762 memcpy (screen.text + j, buf_text, i * sizeof (text_t *));
764 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *)); 763 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));
765 if (!spec) /* line length may not equal TermWin.ncol */ 764 if (!spec) /* line length may not equal TermWin.ncol */
766 for (; i--; j++) 765 for (; i--; j++)
1162 */ 1161 */
1163#if ENABLE_FRILLS 1162#if ENABLE_FRILLS
1164void 1163void
1165rxvt_term::scr_forwardindex () 1164rxvt_term::scr_forwardindex ()
1166{ 1165{
1167 int row; 1166 int row;
1168 1167
1169 if (screen.cur.col < TermWin.ncol - 1) 1168 if (screen.cur.col < TermWin.ncol - 1)
1170 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1169 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1171 else 1170 else
1172 { 1171 {
1391 screen.tlen[row + row_offset] = 0; 1390 screen.tlen[row + row_offset] = 0;
1392 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);
1393 } 1392 }
1394} 1393}
1395 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
1396/* ------------------------------------------------------------------------- */ 1406/* ------------------------------------------------------------------------- */
1397/* 1407/*
1398 * Fill the screen with `E's 1408 * Fill the screen with `E's
1399 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1409 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1400 */ 1410 */
1401void 1411void
1402rxvt_term::scr_E () 1412rxvt_term::scr_E ()
1403{ 1413{
1404 int i, j, k; 1414 int i, j, k;
1405 rend_t *r1, fs; 1415 rend_t *r1, fs;
1406 1416
1407 want_refresh = 1; 1417 want_refresh = 1;
1408 ZERO_SCROLLBACK (); 1418 ZERO_SCROLLBACK ();
1409 1419
1410 num_scr_allow = 0; 1420 num_scr_allow = 0;
1893rxvt_term::scr_page (enum page_dirn direction, int nlines) 1903rxvt_term::scr_page (enum page_dirn direction, int nlines)
1894{ 1904{
1895 int n; 1905 int n;
1896 unsigned int oldviewstart; 1906 unsigned int oldviewstart;
1897 1907
1898#ifdef DEBUG_STRICT
1899 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1900#endif
1901 oldviewstart = TermWin.view_start; 1908 oldviewstart = TermWin.view_start;
1909
1902 if (direction == UP) 1910 if (direction == UP)
1903 { 1911 {
1904 n = TermWin.view_start + nlines; 1912 n = TermWin.view_start + nlines;
1905 TermWin.view_start = min (n, TermWin.nscrolled); 1913 TermWin.view_start = min (n, TermWin.nscrolled);
1906 } 1914 }
1907 else 1915 else
1908 { 1916 {
1909 n = TermWin.view_start - nlines; 1917 n = TermWin.view_start - nlines;
1910 TermWin.view_start = max (n, 0); 1918 TermWin.view_start = max (n, 0);
1911 } 1919 }
1920
1912 return scr_changeview (oldviewstart); 1921 return scr_changeview (oldviewstart);
1913} 1922}
1914 1923
1915int 1924int
1916rxvt_term::scr_changeview (unsigned int oldviewstart) 1925rxvt_term::scr_changeview (unsigned int oldviewstart)
2004/* 2013/*
2005 * Refresh the screen 2014 * Refresh the screen
2006 * drawn_text/drawn_rend contain the screen information before the update. 2015 * drawn_text/drawn_rend contain the screen information before the update.
2007 * screen.text/screen.rend contain what the screen will change to. 2016 * screen.text/screen.rend contain what the screen will change to.
2008 */ 2017 */
2009
2010#define FONT_WIDTH(X, Y) \
2011 (X)->per_char[ (Y) - (X)->min_char_or_byte2].width
2012#define FONT_RBEAR(X, Y) \
2013 (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
2014#define FONT_LBEAR(X, Y) \
2015 (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
2016#define IS_FONT_CHAR(X, Y) \
2017 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
2018
2019void 2018void
2020rxvt_term::scr_refresh (unsigned char refresh_type) 2019rxvt_term::scr_refresh (unsigned char refresh_type)
2021{ 2020{
2022 unsigned char must_clear, /* use draw_string not draw_image_string */ 2021 unsigned char must_clear, /* use draw_string not draw_image_string */
2023 showcursor; /* show the cursor */ 2022 showcursor; /* show the cursor */
2042 refresh_count = 0; 2041 refresh_count = 0;
2043 2042
2044 row_offset = TermWin.saveLines - TermWin.view_start; 2043 row_offset = TermWin.saveLines - TermWin.view_start;
2045 2044
2046#if XPM_BACKGROUND 2045#if XPM_BACKGROUND
2047 must_clear |= (bgPixmap.pixmap != None); 2046 must_clear |= bgPixmap.pixmap != None;
2048#endif 2047#endif
2049#if TRANSPARENT 2048#if TRANSPARENT
2050 must_clear |= ((options & Opt_transparent) && am_transparent); 2049 must_clear |= (options & Opt_transparent) && am_transparent;
2051#endif 2050#endif
2052 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2051 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2053 2052
2054 /* 2053 /*
2055 * B: reverse any characters which are selected 2054 * B: reverse any characters which are selected
2079 2078
2080 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; 2079 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];
2081 2080
2082 if (showcursor && TermWin.focus) 2081 if (showcursor && TermWin.focus)
2083 { 2082 {
2083 if (options & Opt_cursorUnderline)
2084 *crp ^= RS_Uline;
2085 else
2086 {
2084 *crp ^= RS_RVid; 2087 *crp ^= RS_RVid;
2088
2085#ifndef NO_CURSORCOLOR 2089#ifndef NO_CURSORCOLOR
2086 cc1 = *crp & (RS_fgMask | RS_bgMask); 2090 cc1 = *crp & (RS_fgMask | RS_bgMask);
2087 if (ISSET_PIXCOLOR (Color_cursor)) 2091 if (ISSET_PIXCOLOR (Color_cursor))
2088 ccol1 = Color_cursor; 2092 ccol1 = Color_cursor;
2089 else 2093 else
2090#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2094#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2091 ccol1 = GET_FGCOLOR (rstyle); 2095 ccol1 = GET_FGCOLOR (rstyle);
2092#else 2096#else
2093 ccol1 = Color_fg; 2097 ccol1 = Color_fg;
2094#endif 2098#endif
2095 if (ISSET_PIXCOLOR (Color_cursor2)) 2099 if (ISSET_PIXCOLOR (Color_cursor2))
2096 ccol2 = Color_cursor2; 2100 ccol2 = Color_cursor2;
2097 else 2101 else
2098#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2102#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2099 ccol2 = GET_BGCOLOR (rstyle); 2103 ccol2 = GET_BGCOLOR (rstyle);
2100#else 2104#else
2101 ccol2 = Color_bg; 2105 ccol2 = Color_bg;
2102#endif 2106#endif
2103 *crp = SET_FGCOLOR (*crp, ccol1); 2107 *crp = SET_FGCOLOR (*crp, ccol1);
2104 *crp = SET_BGCOLOR (*crp, ccol2); 2108 *crp = SET_BGCOLOR (*crp, ccol2);
2105#endif 2109#endif
2110 }
2106 } 2111 }
2107 } 2112 }
2108 2113
2109 /* make sure no outline cursor is left around */ 2114 /* make sure no outline cursor is left around */
2110 setoldcursor = 0; 2115 setoldcursor = 0;
2416 */ 2421 */
2417 if (showcursor) 2422 if (showcursor)
2418 { 2423 {
2419 if (TermWin.focus) 2424 if (TermWin.focus)
2420 { 2425 {
2426 if (options & Opt_cursorUnderline)
2427 *crp ^= RS_Uline;
2428 else
2429 {
2421 *crp ^= RS_RVid; 2430 *crp ^= RS_RVid;
2422#ifndef NO_CURSORCOLOR 2431#ifndef NO_CURSORCOLOR
2423 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2432 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2424#endif 2433#endif
2434 }
2425 } 2435 }
2426 else if (oldcursor.row >= 0) 2436 else if (oldcursor.row >= 0)
2427 { 2437 {
2428#ifndef NO_CURSORCOLOR 2438#ifndef NO_CURSORCOLOR
2429 if (ISSET_PIXCOLOR (Color_cursor)) 2439 if (ISSET_PIXCOLOR (Color_cursor))
2902 2912
2903int 2913int
2904rxvt_term::selection_request_other (Atom target, int selnum) 2914rxvt_term::selection_request_other (Atom target, int selnum)
2905{ 2915{
2906 Atom sel; 2916 Atom sel;
2907#ifdef DEBUG_SELECT
2908 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2909#endif
2910 2917
2911 selection_type |= selnum; 2918 selection_type |= selnum;
2912 2919
2913 if (selnum == Sel_Primary) 2920 if (selnum == Sel_Primary)
2914 sel = XA_PRIMARY; 2921 sel = XA_PRIMARY;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines