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.298 by ayin, Sun Jan 20 14:12:39 2008 UTC vs.
Revision 1.312 by root, Tue Nov 4 13:30:41 2008 UTC

… …
83 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 83 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
84#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 84#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
85 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 85 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
86 86
87/* 87/*
88 * CLEAR_ROWS : clear <num> rows starting from row <row>
89 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 88 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
90 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
91 */ 89 */
92#define drawBuffer vt
93
94#define CLEAR_ROWS(row, num) \
95 if (mapped) \
96 XClearArea (dpy, drawBuffer, 0, \
97 Row2Pixel (row), (unsigned int)width, \
98 (unsigned int)Height2Pixel (num), False)
99
100#define CLEAR_CHARS(x, y, num) \ 90#define CLEAR_CHARS(x, y, num) \
101 if (mapped) \ 91 if (mapped) \
102 XClearArea (dpy, drawBuffer, x, y, \ 92 XClearArea (dpy, vt, x, y, \
103 (unsigned int)Width2Pixel (num), \ 93 (unsigned int)Width2Pixel (num), \
104 (unsigned int)Height2Pixel (1), False) 94 (unsigned int)Height2Pixel (1), False)
105
106#define ERASE_ROWS(row, num) \
107 XFillRectangle (dpy, drawBuffer, gc, \
108 0, Row2Pixel (row), \
109 (unsigned int)width, \
110 (unsigned int)Height2Pixel (num))
111 95
112/* ------------------------------------------------------------------------- * 96/* ------------------------------------------------------------------------- *
113 * SCREEN `COMMON' ROUTINES * 97 * SCREEN `COMMON' ROUTINES *
114 * ------------------------------------------------------------------------- */ 98 * ------------------------------------------------------------------------- */
115 99
… …
787 771
788 while (str < strend) 772 while (str < strend)
789 { 773 {
790 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 774 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
791 775
792 if (c < 0x20) 776 if (expect_false (c < 0x20))
793 if (c == C0_LF) 777 if (c == C0_LF)
794 { 778 {
795 max_it (line->l, screen.cur.col); 779 max_it (line->l, screen.cur.col);
796 780
797 screen.flags &= ~Screen_WrapNext; 781 screen.flags &= ~Screen_WrapNext;
… …
816 { 800 {
817 scr_tab (1, true); 801 scr_tab (1, true);
818 continue; 802 continue;
819 } 803 }
820 804
805 if (expect_false (
821 if (checksel /* see if we're writing within selection */ 806 checksel /* see if we're writing within selection */
822 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 807 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
823 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 808 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
809 ))
824 { 810 {
825 checksel = 0; 811 checksel = 0;
826 /* 812 /*
827 * If we wrote anywhere in the selected area, kill the selection 813 * If we wrote anywhere in the selected area, kill the selection
828 * XXX: should we kill the mark too? Possibly, but maybe that 814 * XXX: should we kill the mark too? Possibly, but maybe that
829 * should be a similar check. 815 * should be a similar check.
830 */ 816 */
831 CLEAR_SELECTION (); 817 CLEAR_SELECTION ();
832 } 818 }
833 819
834 if (screen.flags & Screen_WrapNext) 820 if (expect_false (screen.flags & Screen_WrapNext))
835 { 821 {
836 scr_do_wrap (); 822 scr_do_wrap ();
837 823
838 line->l = ncol; 824 line->l = ncol;
839 line->is_longer (1); 825 line->is_longer (1);
… …
841 row = screen.cur.row; 827 row = screen.cur.row;
842 line = &ROW(row); /* _must_ refresh */ 828 line = &ROW(row); /* _must_ refresh */
843 } 829 }
844 830
845 // some utf-8 decoders "decode" surrogate characters: let's fix this. 831 // some utf-8 decoders "decode" surrogate characters: let's fix this.
846 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 832 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
847 c = 0xfffd; 833 c = 0xfffd;
848 834
849 // rely on wcwidth to tell us the character width, do wcwidth before 835 // rely on wcwidth to tell us the character width, do wcwidth before
850 // further replacements, as wcwidth might return -1 for the line 836 // further replacements, as wcwidth might return -1 for the line
851 // drawing characters below as they might be invalid in the current 837 // drawing characters below as they might be invalid in the current
852 // locale. 838 // locale.
853 int width = WCWIDTH (c); 839 int width = WCWIDTH (c);
854 840
855 if (charsets [screen.charset] == '0') // DEC SPECIAL 841 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
856 { 842 {
857 // vt100 special graphics and line drawing 843 // vt100 special graphics and line drawing
858 // 5f-7e standard vt100 844 // 5f-7e standard vt100
859 // 40-5e rxvt extension for extra curses acs chars 845 // 40-5e rxvt extension for extra curses acs chars
860 static uint16_t vt100_0[62] = { // 41 .. 7e 846 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
873 c = vt100_0[c - 0x41]; 859 c = vt100_0[c - 0x41];
874 width = 1; // vt100 line drawing characters are always single-width 860 width = 1; // vt100 line drawing characters are always single-width
875 } 861 }
876 } 862 }
877 863
878 if (screen.flags & Screen_Insert) 864 if (expect_false (screen.flags & Screen_Insert))
879 scr_insdel_chars (width, INSERT); 865 scr_insdel_chars (width, INSERT);
880 866
881 if (width != 0) 867 if (width != 0)
882 { 868 {
883#if !UNICODE_3 869#if !UNICODE_3
… …
889 c = 0xfffd; 875 c = 0xfffd;
890# endif 876# endif
891#endif 877#endif
892 878
893 // nuke the character at this position, if required 879 // nuke the character at this position, if required
880 if (expect_false (
894 if (line->t[screen.cur.col] == NOCHAR 881 line->t[screen.cur.col] == NOCHAR
895 || (screen.cur.col < ncol - 1 882 || (screen.cur.col < ncol - 1
896 && line->t[screen.cur.col + 1] == NOCHAR)) 883 && line->t[screen.cur.col + 1] == NOCHAR)
884 ))
897 { 885 {
898 int col = screen.cur.col; 886 int col = screen.cur.col;
899 887
900 // find begin 888 // find begin
901 while (col > 0 && line->t[col] == NOCHAR) 889 while (col > 0 && line->t[col] == NOCHAR)
… …
912 } 900 }
913 901
914 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 902 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
915 903
916 // if the character doesn't fit into the remaining columns... 904 // if the character doesn't fit into the remaining columns...
917 if (screen.cur.col > ncol - width && ncol >= width) 905 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
918 { 906 {
919 // ...output spaces 907 // ...output spaces
920 c = ' '; 908 c = ' ';
921 // and try the same character next loop iteration 909 // and try the same character next loop iteration
922 --str; 910 --str;
… …
927 do 915 do
928 { 916 {
929 line->t[screen.cur.col] = c; 917 line->t[screen.cur.col] = c;
930 line->r[screen.cur.col] = rend; 918 line->r[screen.cur.col] = rend;
931 919
932 if (screen.cur.col < ncol - 1) 920 if (expect_true (screen.cur.col < ncol - 1))
933 screen.cur.col++; 921 screen.cur.col++;
934 else 922 else
935 { 923 {
936 line->l = ncol; 924 line->l = ncol;
937 if (screen.flags & Screen_Autowrap) 925 if (screen.flags & Screen_Autowrap)
… …
939 break; 927 break;
940 } 928 }
941 929
942 c = NOCHAR; 930 c = NOCHAR;
943 } 931 }
944 while (--width > 0); 932 while (expect_false (--width > 0));
945 933
946 // pad with spaces when overwriting wide character with smaller one 934 // pad with spaces when overwriting wide character with smaller one
947 if (!width) 935 if (expect_false (!width))
948 { 936 {
949 line->touch (); 937 line->touch ();
950 938
951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 939 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
952 { 940 {
953 line->t[c] = ' '; 941 line->t[c] = ' ';
954 line->r[c] = rend; 942 line->r[c] = rend;
955 } 943 }
956 } 944 }
957 } 945 }
946#if ENABLE_COMBINING
958 else // width == 0 947 else // width == 0
959 { 948 {
960#if ENABLE_COMBINING 949 if (c != 0xfeff) // ignore BOM
961 // handle combining characters
962 // we just tag the accent on the previous on-screen character.
963 // this is arguably not correct, but also arguably not wrong.
964 // we don't handle double-width characters nicely yet.
965 line_t *linep;
966 text_t *tp;
967 rend_t *rp;
968
969 if (screen.cur.col > 0)
970 { 950 {
951 // handle combining characters
952 // we just tag the accent on the previous on-screen character.
953 // this is arguably not correct, but also arguably not wrong.
954 // we don't handle double-width characters nicely yet.
955 line_t *linep;
956 text_t *tp;
957 rend_t *rp;
958
959 if (screen.cur.col > 0)
960 {
971 linep = line; 961 linep = line;
972 tp = line->t + screen.cur.col - 1; 962 tp = line->t + screen.cur.col - 1;
973 rp = line->r + screen.cur.col - 1; 963 rp = line->r + screen.cur.col - 1;
964 }
965 else if (screen.cur.row > 0
966 && ROW(screen.cur.row - 1).is_longer ())
967 {
968 linep = &ROW(screen.cur.row - 1);
969 tp = line->t + ncol - 1;
970 rp = line->r + ncol - 1;
971 }
972 else
973 continue;
974
975 linep->touch ();
976
977 while (*tp == NOCHAR && tp > linep->t)
978 tp--, rp--;
979
980 // first try to find a precomposed character
981 unicode_t n = rxvt_compose (*tp, c);
982 if (n == NOCHAR)
983 n = rxvt_composite.compose (*tp, c);
984
985 *tp = n;
986 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
974 } 987 }
975 else if (screen.cur.row > 0
976 && ROW(screen.cur.row - 1).is_longer ())
977 {
978 linep = &ROW(screen.cur.row - 1);
979 tp = line->t + ncol - 1;
980 rp = line->r + ncol - 1;
981 } 988 }
982 else
983 continue;
984
985 linep->touch ();
986
987 while (*tp == NOCHAR && tp > linep->t)
988 tp--, rp--;
989
990 // first try to find a precomposed character
991 unicode_t n = rxvt_compose (*tp, c);
992 if (n == NOCHAR)
993 n = rxvt_composite.compose (*tp, c);
994
995 *tp = n;
996 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
997#endif 989#endif
998 }
999 } 990 }
1000 991
1001 max_it (line->l, screen.cur.col); 992 max_it (line->l, screen.cur.col);
1002 993
1003#ifdef DEBUG_STRICT 994#ifdef DEBUG_STRICT
… …
1227/* 1218/*
1228 * Erase part or whole of a line 1219 * Erase part or whole of a line
1229 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1220 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1230 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1221 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1231 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1222 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1223 * extension: clear to right unless wrapped: ESC [ 3 K
1232 */ 1224 */
1233void 1225void
1234rxvt_term::scr_erase_line (int mode) NOTHROW 1226rxvt_term::scr_erase_line (int mode) NOTHROW
1235{ 1227{
1236 unsigned int col, num; 1228 unsigned int col, num;
… …
1245 line.touch (); 1237 line.touch ();
1246 line.is_longer (0); 1238 line.is_longer (0);
1247 1239
1248 switch (mode) 1240 switch (mode)
1249 { 1241 {
1242 case 3:
1243 if (screen.flags & Screen_WrapNext)
1244 return;
1245
1246 /* fall through */
1247
1250 case 0: /* erase to end of line */ 1248 case 0: /* erase to end of line */
1251 col = screen.cur.col; 1249 col = screen.cur.col;
1252 num = ncol - col; 1250 num = ncol - col;
1253 min_it (line.l, col); 1251 min_it (line.l, col);
1252
1254 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1253 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1255 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1254 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1256 CLEAR_SELECTION (); 1255 CLEAR_SELECTION ();
1257 break; 1256 break;
1257
1258 case 1: /* erase to beginning of line */ 1258 case 1: /* erase to beginning of line */
1259 col = 0; 1259 col = 0;
1260 num = screen.cur.col + 1; 1260 num = screen.cur.col + 1;
1261
1261 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1262 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1262 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1263 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1263 CLEAR_SELECTION (); 1264 CLEAR_SELECTION ();
1264 break; 1265 break;
1266
1265 case 2: /* erase whole line */ 1267 case 2: /* erase whole line */
1266 col = 0; 1268 col = 0;
1267 num = ncol; 1269 num = ncol;
1268 line.l = 0; 1270 line.l = 0;
1269 if (selection.beg.row <= screen.cur.row 1271 if (selection.beg.row <= screen.cur.row
… …
1327 if (row >= nrow) /* Out Of Bounds */ 1329 if (row >= nrow) /* Out Of Bounds */
1328 return; 1330 return;
1329 1331
1330 min_it (num, nrow - row); 1332 min_it (num, nrow - row);
1331 1333
1334 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1332 if (rstyle & (RS_RVid | RS_Uline)) 1335 if (rstyle & (RS_RVid | RS_Uline))
1333 ren = (rend_t) ~RS_None; 1336 ren = (rend_t) ~RS_None;
1334 else if (GET_BASEBG (rstyle) == Color_bg) 1337 else if (GET_BASEBG (rstyle) == Color_bg)
1335 { 1338 {
1336 ren = DEFAULT_RSTYLE; 1339 ren = DEFAULT_RSTYLE;
1337 CLEAR_ROWS (row, num); 1340
1341 if (mapped)
1342 XClearArea (dpy, vt, 0,
1343 Row2Pixel (row), (unsigned int)width,
1344 (unsigned int)Height2Pixel (num), False);
1338 } 1345 }
1339 else 1346 else
1340 { 1347 {
1341 ren = rstyle & (RS_fgMask | RS_bgMask); 1348 ren = rstyle & (RS_fgMask | RS_bgMask);
1349
1342 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1350 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1343 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1351 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1344 ERASE_ROWS (row, num); 1352 XFillRectangle (dpy, vt, gc,
1353 0, Row2Pixel (row),
1354 (unsigned int)width,
1355 (unsigned int)Height2Pixel (num));
1345 gcvalue.foreground = pix_colors[Color_fg]; 1356 gcvalue.foreground = pix_colors[Color_fg];
1346 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1357 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1347 } 1358 }
1348 1359
1349 for (; num--; row++) 1360 for (; num--; row++)
… …
1486 case ERASE: 1497 case ERASE:
1487 screen.cur.col += count; /* don't worry if > ncol */ 1498 screen.cur.col += count; /* don't worry if > ncol */
1488 selection_check (1); 1499 selection_check (1);
1489 screen.cur.col -= count; 1500 screen.cur.col -= count;
1490 1501
1491 line->l = max (line->l - count, 0);
1492 scr_blank_line (*line, screen.cur.col, count, rstyle); 1502 scr_blank_line (*line, screen.cur.col, count, rstyle);
1493 break; 1503 break;
1494 1504
1495 case DELETE: 1505 case DELETE:
1496 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1506 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1888 XMapWindow (dpy, parent[0]); 1898 XMapWindow (dpy, parent[0]);
1889# endif 1899# endif
1890 1900
1891# if ENABLE_FRILLS 1901# if ENABLE_FRILLS
1892 if (option (Opt_urgentOnBell)) 1902 if (option (Opt_urgentOnBell))
1893 { 1903 set_urgency (1);
1894 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1895 {
1896 h->flags |= XUrgencyHint;
1897 XSetWMHints (dpy, parent[0], h);
1898 }
1899 }
1900# endif 1904# endif
1901 1905
1902 if (option (Opt_visualBell)) 1906 if (option (Opt_visualBell))
1903 { 1907 {
1904 rvideo_bell = true; 1908 rvideo_bell = true;
… …
1917void 1921void
1918rxvt_term::scr_printscreen (int fullhist) NOTHROW 1922rxvt_term::scr_printscreen (int fullhist) NOTHROW
1919{ 1923{
1920#ifdef PRINTPIPE 1924#ifdef PRINTPIPE
1921 int nrows, row_start; 1925 int nrows, row_start;
1922 FILE *fd; 1926 FILE *fd = popen_printer ();
1923 1927
1924 if ((fd = popen_printer ()) == NULL) 1928 if (!fd)
1925 return; 1929 return;
1926 1930
1927 if (fullhist) 1931 if (fullhist)
1928 { 1932 {
1929 nrows = nrow - top_row; 1933 nrows = nrow - top_row;
… …
1994 return; 1998 return;
1995 1999
1996 /* 2000 /*
1997 * A: set up vars 2001 * A: set up vars
1998 */ 2002 */
2003 refresh_count = 0;
2004
1999 have_bg = 0; 2005 have_bg = 0;
2000 refresh_count = 0;
2001
2002#ifdef HAVE_BG_PIXMAP 2006#ifdef HAVE_BG_PIXMAP
2003 have_bg |= bgPixmap.pixmap != None; 2007 have_bg = bgPixmap.pixmap != None;
2004#endif 2008#endif
2005 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2009 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2006 2010
2007 /* 2011 /*
2008 * B: reverse any characters which are selected 2012 * B: reverse any characters which are selected
… …
2199 continue; 2203 continue;
2200 2204
2201 // redraw one or more characters 2205 // redraw one or more characters
2202 2206
2203 // seek to the beginning of wide characters 2207 // seek to the beginning of wide characters
2204 while (stp[col] == NOCHAR && col > 0) 2208 while (expect_false (stp[col] == NOCHAR && col > 0))
2205 --col; 2209 --col;
2206 2210
2207 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2211 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2208 text_t *text = stp + col; 2212 text_t *text = stp + col;
2209 int count = 1; 2213 int count = 1;
… …
2246 2250
2247 col--; /* went one too far. move back */ 2251 col--; /* went one too far. move back */
2248 count -= i; /* dump any matching trailing chars */ 2252 count -= i; /* dump any matching trailing chars */
2249 2253
2250 // sometimes we optimize away the trailing NOCHAR's, add them back 2254 // sometimes we optimize away the trailing NOCHAR's, add them back
2251 while (i && text[count] == NOCHAR) 2255 while (expect_false (i && text[count] == NOCHAR))
2252 count++, i--; 2256 count++, i--;
2253 2257
2254 /* 2258 /*
2255 * Determine the attributes for the string 2259 * Determine the attributes for the string
2256 */ 2260 */
2257 int fore = fgcolor_of (rend); // desired foreground 2261 int fore = fgcolor_of (rend); // desired foreground
2258 int back = bgcolor_of (rend); // desired background 2262 int back = bgcolor_of (rend); // desired background
2259 2263
2260 // only do special processing if any attributes are set, which is unlikely 2264 // only do special processing if any attributes are set, which is unlikely
2261 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2265 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2262 { 2266 {
2263 bool invert = rend & RS_RVid; 2267 bool invert = rend & RS_RVid;
2264 2268
2265#ifndef NO_BOLD_UNDERLINE_REVERSE 2269#ifndef NO_BOLD_UNDERLINE_REVERSE
2266 if (rend & RS_Bold && fore == Color_fg) 2270 if (rend & RS_Bold && fore == Color_fg)
… …
2349 /* 2353 /*
2350 * Actually do the drawing of the string here 2354 * Actually do the drawing of the string here
2351 */ 2355 */
2352 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2356 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2353 2357
2354 if (have_bg && back == Color_bg) 2358 if (expect_true (have_bg && back == Color_bg))
2355 { 2359 {
2356 // this is very ugly, maybe push it into ->draw? 2360 // this is very ugly, maybe push it into ->draw?
2357 2361
2358 for (i = 0; i < count; i++) /* don't draw empty strings */ 2362 for (i = 0; i < count; i++) /* don't draw empty strings */
2359 if (text[i] != ' ') 2363 if (text[i] != ' ')
… …
2366 did_clear: ; 2370 did_clear: ;
2367 } 2371 }
2368 else 2372 else
2369 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2373 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2370 2374
2371 if (rend & RS_Uline && font->descent > 1 && fore != back) 2375 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2372 { 2376 {
2373#if ENABLE_FRILLS 2377#if ENABLE_FRILLS
2374 if (ISSET_PIXCOLOR (Color_underline)) 2378 if (ISSET_PIXCOLOR (Color_underline))
2375 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2379 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2376 else 2380 else
2377#endif 2381#endif
2378 XSetForeground (dpy, gc, pix_colors[fore]); 2382 XSetForeground (dpy, gc, pix_colors[fore]);
2379 2383
2380 XDrawLine (dpy, drawBuffer, gc, 2384 XDrawLine (dpy, vt, gc,
2381 xpixel, ypixel + font->ascent + 1, 2385 xpixel, ypixel + font->ascent + 1,
2382 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2386 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2383 } 2387 }
2384 } /* for (col....) */ 2388 } /* for (col....) */
2385 } /* for (row....) */ 2389 } /* for (row....) */
… …
2423 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2427 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2424 else 2428 else
2425#endif 2429#endif
2426 XSetForeground (dpy, gc, pix_colors[ccol1]); 2430 XSetForeground (dpy, gc, pix_colors[ccol1]);
2427 2431
2428 XDrawRectangle (dpy, drawBuffer, gc, 2432 XDrawRectangle (dpy, vt, gc,
2429 Col2Pixel (col), 2433 Col2Pixel (col),
2430 Row2Pixel (oldcursor.row), 2434 Row2Pixel (oldcursor.row),
2431 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2435 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2432 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2436 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2433 } 2437 }
… …
2476 2480
2477 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2481 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2478 XClearWindow (dpy, parent[0]); 2482 XClearWindow (dpy, parent[0]);
2479 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2483 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2480 2484
2481# if HAVE_SCROLLBARS
2482 if (scrollBar.win) 2485 if (scrollBar.win)
2483 { 2486 {
2484 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2487 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2485 scrollBar.setIdle (); 2488 scrollBar.state = STATE_IDLE;
2486 scrollbar_show (0); 2489 scrollBar.show (0);
2487 } 2490 }
2491
2488# endif 2492#endif
2489 2493
2494 /* bgPixmap.apply () does not do the following : */
2490 scr_clear (); 2495 scr_clear ();
2491 scr_touch (true); 2496 scr_touch (true);
2492 want_refresh = 1; 2497 want_refresh = 1;
2493
2494#endif
2495} 2498}
2496 2499
2497/* ------------------------------------------------------------------------- */ 2500/* ------------------------------------------------------------------------- */
2498void 2501void
2499rxvt_term::scr_clear (bool really) NOTHROW 2502rxvt_term::scr_clear (bool really) NOTHROW
… …
2588{ 2591{
2589 int row, wrote; 2592 int row, wrote;
2590 unsigned int width, towrite; 2593 unsigned int width, towrite;
2591 char r1[] = "\n"; 2594 char r1[] = "\n";
2592 2595
2593 for (row = saveLines - nsaved; 2596 for (row = saveLines + top_row;
2594 row < saveLines + nrow - 1; row++) 2597 row < saveLines + nrow - 1; row++)
2595 { 2598 {
2596 width = row_buf[row].l >= 0 ? row_buf[row].l 2599 width = row_buf[row].l >= 0 ? row_buf[row].l
2597 : ncol; 2600 : ncol;
2598 for (towrite = width; towrite; towrite -= wrote) 2601 for (towrite = width; towrite; towrite -= wrote)

Diff Legend

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