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.315 by root, Tue Nov 4 14:38:29 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
… …
146{ 130{
147 scr_blank_line (l, 0, ncol, efs); 131 scr_blank_line (l, 0, ncol, efs);
148 132
149 l.l = 0; 133 l.l = 0;
150 l.f = 0; 134 l.f = 0;
135}
136
137// nuke a single wide character at the given column
138void
139rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
140{
141 // find begin
142 while (col > 0 && l.t[col] == NOCHAR)
143 col--;
144
145 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147
148 // found begin, nuke
149 do {
150 l.t[col] = ' ';
151 l.r[col] = rend;
152 col++;
153 } while (col < ncol && l.t[col] == NOCHAR);
151} 154}
152 155
153/* ------------------------------------------------------------------------- * 156/* ------------------------------------------------------------------------- *
154 * SCREEN INITIALISATION * 157 * SCREEN INITIALISATION *
155 * ------------------------------------------------------------------------- */ 158 * ------------------------------------------------------------------------- */
… …
787 790
788 while (str < strend) 791 while (str < strend)
789 { 792 {
790 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 793 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
791 794
792 if (c < 0x20) 795 if (expect_false (c < 0x20))
793 if (c == C0_LF) 796 if (c == C0_LF)
794 { 797 {
795 max_it (line->l, screen.cur.col); 798 max_it (line->l, screen.cur.col);
796 799
797 screen.flags &= ~Screen_WrapNext; 800 screen.flags &= ~Screen_WrapNext;
… …
816 { 819 {
817 scr_tab (1, true); 820 scr_tab (1, true);
818 continue; 821 continue;
819 } 822 }
820 823
824 if (expect_false (
821 if (checksel /* see if we're writing within selection */ 825 checksel /* see if we're writing within selection */
822 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 826 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
823 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 827 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
828 ))
824 { 829 {
825 checksel = 0; 830 checksel = 0;
826 /* 831 /*
827 * If we wrote anywhere in the selected area, kill the selection 832 * If we wrote anywhere in the selected area, kill the selection
828 * XXX: should we kill the mark too? Possibly, but maybe that 833 * XXX: should we kill the mark too? Possibly, but maybe that
829 * should be a similar check. 834 * should be a similar check.
830 */ 835 */
831 CLEAR_SELECTION (); 836 CLEAR_SELECTION ();
832 } 837 }
833 838
834 if (screen.flags & Screen_WrapNext) 839 if (expect_false (screen.flags & Screen_WrapNext))
835 { 840 {
836 scr_do_wrap (); 841 scr_do_wrap ();
837 842
838 line->l = ncol; 843 line->l = ncol;
839 line->is_longer (1); 844 line->is_longer (1);
… …
841 row = screen.cur.row; 846 row = screen.cur.row;
842 line = &ROW(row); /* _must_ refresh */ 847 line = &ROW(row); /* _must_ refresh */
843 } 848 }
844 849
845 // some utf-8 decoders "decode" surrogate characters: let's fix this. 850 // some utf-8 decoders "decode" surrogate characters: let's fix this.
846 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 851 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
847 c = 0xfffd; 852 c = 0xfffd;
848 853
849 // rely on wcwidth to tell us the character width, do wcwidth before 854 // rely on wcwidth to tell us the character width, do wcwidth before
850 // further replacements, as wcwidth might return -1 for the line 855 // further replacements, as wcwidth might return -1 for the line
851 // drawing characters below as they might be invalid in the current 856 // drawing characters below as they might be invalid in the current
852 // locale. 857 // locale.
853 int width = WCWIDTH (c); 858 int width = WCWIDTH (c);
854 859
855 if (charsets [screen.charset] == '0') // DEC SPECIAL 860 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
856 { 861 {
857 // vt100 special graphics and line drawing 862 // vt100 special graphics and line drawing
858 // 5f-7e standard vt100 863 // 5f-7e standard vt100
859 // 40-5e rxvt extension for extra curses acs chars 864 // 40-5e rxvt extension for extra curses acs chars
860 static uint16_t vt100_0[62] = { // 41 .. 7e 865 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
873 c = vt100_0[c - 0x41]; 878 c = vt100_0[c - 0x41];
874 width = 1; // vt100 line drawing characters are always single-width 879 width = 1; // vt100 line drawing characters are always single-width
875 } 880 }
876 } 881 }
877 882
878 if (screen.flags & Screen_Insert) 883 if (expect_false (screen.flags & Screen_Insert))
879 scr_insdel_chars (width, INSERT); 884 scr_insdel_chars (width, INSERT);
880 885
881 if (width != 0) 886 if (width != 0)
882 { 887 {
883#if !UNICODE_3 888#if !UNICODE_3
… …
889 c = 0xfffd; 894 c = 0xfffd;
890# endif 895# endif
891#endif 896#endif
892 897
893 // nuke the character at this position, if required 898 // nuke the character at this position, if required
899 if (expect_false (
894 if (line->t[screen.cur.col] == NOCHAR 900 line->t[screen.cur.col] == NOCHAR
895 || (screen.cur.col < ncol - 1 901 || (screen.cur.col < ncol - 1
896 && line->t[screen.cur.col + 1] == NOCHAR)) 902 && line->t[screen.cur.col + 1] == NOCHAR)
897 { 903 ))
898 int col = screen.cur.col; 904 scr_kill_char (*line, screen.cur.col);
899
900 // find begin
901 while (col > 0 && line->t[col] == NOCHAR)
902 col--;
903
904 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
905
906 // found begin, nuke
907 do {
908 line->t[col] = ' ';
909 line->r[col] = rend;
910 col++;
911 } while (col < ncol && line->t[col] == NOCHAR);
912 }
913 905
914 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 906 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
915 907
916 // if the character doesn't fit into the remaining columns... 908 // if the character doesn't fit into the remaining columns...
917 if (screen.cur.col > ncol - width && ncol >= width) 909 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
918 { 910 {
919 // ...output spaces 911 // ...output spaces
920 c = ' '; 912 c = ' ';
921 // and try the same character next loop iteration 913 // and try the same character next loop iteration
922 --str; 914 --str;
… …
927 do 919 do
928 { 920 {
929 line->t[screen.cur.col] = c; 921 line->t[screen.cur.col] = c;
930 line->r[screen.cur.col] = rend; 922 line->r[screen.cur.col] = rend;
931 923
932 if (screen.cur.col < ncol - 1) 924 if (expect_true (screen.cur.col < ncol - 1))
933 screen.cur.col++; 925 screen.cur.col++;
934 else 926 else
935 { 927 {
936 line->l = ncol; 928 line->l = ncol;
937 if (screen.flags & Screen_Autowrap) 929 if (screen.flags & Screen_Autowrap)
… …
939 break; 931 break;
940 } 932 }
941 933
942 c = NOCHAR; 934 c = NOCHAR;
943 } 935 }
944 while (--width > 0); 936 while (expect_false (--width > 0));
945 937
946 // pad with spaces when overwriting wide character with smaller one 938 // pad with spaces when overwriting wide character with smaller one
947 if (!width) 939 if (expect_false (!width))
948 { 940 {
949 line->touch (); 941 line->touch ();
950 942
951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 943 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
952 { 944 {
953 line->t[c] = ' '; 945 line->t[c] = ' ';
954 line->r[c] = rend; 946 line->r[c] = rend;
955 } 947 }
956 } 948 }
957 } 949 }
950#if ENABLE_COMBINING
958 else // width == 0 951 else // width == 0
959 { 952 {
960#if ENABLE_COMBINING 953 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 { 954 {
955 // handle combining characters
956 // we just tag the accent on the previous on-screen character.
957 // this is arguably not correct, but also arguably not wrong.
958 // we don't handle double-width characters nicely yet.
959 line_t *linep;
960 text_t *tp;
961 rend_t *rp;
962
963 if (screen.cur.col > 0)
964 {
971 linep = line; 965 linep = line;
972 tp = line->t + screen.cur.col - 1; 966 tp = line->t + screen.cur.col - 1;
973 rp = line->r + screen.cur.col - 1; 967 rp = line->r + screen.cur.col - 1;
968 }
969 else if (screen.cur.row > 0
970 && ROW(screen.cur.row - 1).is_longer ())
971 {
972 linep = &ROW(screen.cur.row - 1);
973 tp = line->t + ncol - 1;
974 rp = line->r + ncol - 1;
975 }
976 else
977 continue;
978
979 linep->touch ();
980
981 while (*tp == NOCHAR && tp > linep->t)
982 tp--, rp--;
983
984 // first try to find a precomposed character
985 unicode_t n = rxvt_compose (*tp, c);
986 if (n == NOCHAR)
987 n = rxvt_composite.compose (*tp, c);
988
989 *tp = n;
990 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
974 } 991 }
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 } 992 }
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 993#endif
998 }
999 } 994 }
1000 995
1001 max_it (line->l, screen.cur.col); 996 max_it (line->l, screen.cur.col);
1002 997
1003#ifdef DEBUG_STRICT 998#ifdef DEBUG_STRICT
… …
1227/* 1222/*
1228 * Erase part or whole of a line 1223 * Erase part or whole of a line
1229 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1224 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1230 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1225 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1231 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1226 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1227 * extension: clear to right unless wrapped: ESC [ 3 K
1232 */ 1228 */
1233void 1229void
1234rxvt_term::scr_erase_line (int mode) NOTHROW 1230rxvt_term::scr_erase_line (int mode) NOTHROW
1235{ 1231{
1236 unsigned int col, num; 1232 unsigned int col, num;
… …
1245 line.touch (); 1241 line.touch ();
1246 line.is_longer (0); 1242 line.is_longer (0);
1247 1243
1248 switch (mode) 1244 switch (mode)
1249 { 1245 {
1246 case 3:
1247 if (screen.flags & Screen_WrapNext)
1248 return;
1249
1250 /* fall through */
1251
1250 case 0: /* erase to end of line */ 1252 case 0: /* erase to end of line */
1251 col = screen.cur.col; 1253 col = screen.cur.col;
1252 num = ncol - col; 1254 num = ncol - col;
1253 min_it (line.l, col); 1255 min_it (line.l, col);
1256
1254 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1257 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1255 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1258 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1256 CLEAR_SELECTION (); 1259 CLEAR_SELECTION ();
1257 break; 1260 break;
1261
1258 case 1: /* erase to beginning of line */ 1262 case 1: /* erase to beginning of line */
1259 col = 0; 1263 col = 0;
1260 num = screen.cur.col + 1; 1264 num = screen.cur.col + 1;
1265
1261 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1266 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1262 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1267 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1263 CLEAR_SELECTION (); 1268 CLEAR_SELECTION ();
1264 break; 1269 break;
1270
1265 case 2: /* erase whole line */ 1271 case 2: /* erase whole line */
1266 col = 0; 1272 col = 0;
1267 num = ncol; 1273 num = ncol;
1268 line.l = 0; 1274 line.l = 0;
1269 if (selection.beg.row <= screen.cur.row 1275 if (selection.beg.row <= screen.cur.row
… …
1327 if (row >= nrow) /* Out Of Bounds */ 1333 if (row >= nrow) /* Out Of Bounds */
1328 return; 1334 return;
1329 1335
1330 min_it (num, nrow - row); 1336 min_it (num, nrow - row);
1331 1337
1338 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1332 if (rstyle & (RS_RVid | RS_Uline)) 1339 if (rstyle & (RS_RVid | RS_Uline))
1333 ren = (rend_t) ~RS_None; 1340 ren = (rend_t) ~RS_None;
1334 else if (GET_BASEBG (rstyle) == Color_bg) 1341 else if (GET_BASEBG (rstyle) == Color_bg)
1335 { 1342 {
1336 ren = DEFAULT_RSTYLE; 1343 ren = DEFAULT_RSTYLE;
1337 CLEAR_ROWS (row, num); 1344
1345 if (mapped)
1346 XClearArea (dpy, vt, 0,
1347 Row2Pixel (row), (unsigned int)width,
1348 (unsigned int)Height2Pixel (num), False);
1338 } 1349 }
1339 else 1350 else
1340 { 1351 {
1341 ren = rstyle & (RS_fgMask | RS_bgMask); 1352 ren = rstyle & (RS_fgMask | RS_bgMask);
1353
1342 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1354 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1343 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1355 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1344 ERASE_ROWS (row, num); 1356 XFillRectangle (dpy, vt, gc,
1357 0, Row2Pixel (row),
1358 (unsigned int)width,
1359 (unsigned int)Height2Pixel (num));
1345 gcvalue.foreground = pix_colors[Color_fg]; 1360 gcvalue.foreground = pix_colors[Color_fg];
1346 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1361 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1347 } 1362 }
1348 1363
1349 for (; num--; row++) 1364 for (; num--; row++)
… …
1431 * Insert/Delete <count> characters from the current position 1446 * Insert/Delete <count> characters from the current position
1432 */ 1447 */
1433void 1448void
1434rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1449rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1435{ 1450{
1436 int col, row;
1437 rend_t tr;
1438
1439 want_refresh = 1; 1451 want_refresh = 1;
1440 ZERO_SCROLLBACK (); 1452 ZERO_SCROLLBACK ();
1441 1453
1442 if (count <= 0) 1454 if (count <= 0)
1443 return; 1455 return;
… …
1445 scr_do_wrap (); 1457 scr_do_wrap ();
1446 1458
1447 selection_check (1); 1459 selection_check (1);
1448 min_it (count, ncol - screen.cur.col); 1460 min_it (count, ncol - screen.cur.col);
1449 1461
1450 row = screen.cur.row; 1462 int row = screen.cur.row;
1451 1463
1452 line_t *line = &ROW(row); 1464 line_t *line = &ROW(row);
1453 1465
1454 line->touch (); 1466 line->touch ();
1455 line->is_longer (0); 1467 line->is_longer (0);
1456 1468
1469 // nuke wide char at beginning
1470 if (line->t[screen.cur.col] == NOCHAR)
1471 scr_kill_char (*line, screen.cur.col);
1472
1457 switch (insdel) 1473 switch (insdel)
1458 { 1474 {
1459 case INSERT: 1475 case INSERT:
1460 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1476 line->l = min (line->l + count, ncol);
1477
1478 if (line->t[screen.cur.col] == NOCHAR)
1479 scr_kill_char (*line, screen.cur.col);
1480
1481 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1461 { 1482 {
1462 line->t[col] = line->t[col - count]; 1483 line->t[col] = line->t[col - count];
1463 line->r[col] = line->r[col - count]; 1484 line->r[col] = line->r[col - count];
1464 } 1485 }
1465
1466 line->l = min (line->l + count, ncol);
1467 1486
1468 if (selection.op && current_screen == selection.screen 1487 if (selection.op && current_screen == selection.screen
1469 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1488 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1470 { 1489 {
1471 if (selection.end.row != screen.cur.row 1490 if (selection.end.row != screen.cur.row
… …
1486 case ERASE: 1505 case ERASE:
1487 screen.cur.col += count; /* don't worry if > ncol */ 1506 screen.cur.col += count; /* don't worry if > ncol */
1488 selection_check (1); 1507 selection_check (1);
1489 screen.cur.col -= count; 1508 screen.cur.col -= count;
1490 1509
1491 line->l = max (line->l - count, 0); 1510 // nuke wide char after the end
1511 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1512 scr_kill_char (*line, screen.cur.col + count);
1513
1492 scr_blank_line (*line, screen.cur.col, count, rstyle); 1514 scr_blank_line (*line, screen.cur.col, count, rstyle);
1493 break; 1515 break;
1494 1516
1495 case DELETE: 1517 case DELETE:
1518 {
1519 line->l = max (line->l - count, 0);
1520
1496 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1521 rend_t tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1497 1522
1498 for (col = screen.cur.col; (col + count) < ncol; col++) 1523 for (int col = screen.cur.col; (col + count) < ncol; col++)
1499 { 1524 {
1500 line->t[col] = line->t[col + count]; 1525 line->t[col] = line->t[col + count];
1501 line->r[col] = line->r[col + count]; 1526 line->r[col] = line->r[col + count];
1502 } 1527 }
1503 1528
1504 line->l = max (line->l - count, 0); 1529 // nuke wide char at the end
1530 if (line->t[screen.cur.col] == NOCHAR)
1531 scr_kill_char (*line, screen.cur.col);
1532
1505 scr_blank_line (*line, ncol - count, count, tr); 1533 scr_blank_line (*line, ncol - count, count, tr);
1506 1534
1507 if (selection.op && current_screen == selection.screen 1535 if (selection.op && current_screen == selection.screen
1508 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1536 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1509 { 1537 {
1510 if (selection.end.row != screen.cur.row 1538 if (selection.end.row != screen.cur.row
1511 || (screen.cur.col >= selection.beg.col - count) 1539 || (screen.cur.col >= selection.beg.col - count)
1512 || selection.end.col >= ncol) 1540 || selection.end.col >= ncol)
1513 CLEAR_SELECTION (); 1541 CLEAR_SELECTION ();
1514 else 1542 else
1515 { 1543 {
1516 /* shift selection */ 1544 /* shift selection */
1517 selection.beg.col -= count; 1545 selection.beg.col -= count;
1518 selection.mark.col -= count; /* XXX: yes? */ 1546 selection.mark.col -= count; /* XXX: yes? */
1519 selection.end.col -= count; 1547 selection.end.col -= count;
1520 } 1548 }
1549 }
1521 } 1550 }
1522 1551
1523 break; 1552 break;
1524 } 1553 }
1525} 1554}
… …
1888 XMapWindow (dpy, parent[0]); 1917 XMapWindow (dpy, parent[0]);
1889# endif 1918# endif
1890 1919
1891# if ENABLE_FRILLS 1920# if ENABLE_FRILLS
1892 if (option (Opt_urgentOnBell)) 1921 if (option (Opt_urgentOnBell))
1893 { 1922 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 1923# endif
1901 1924
1902 if (option (Opt_visualBell)) 1925 if (option (Opt_visualBell))
1903 { 1926 {
1904 rvideo_bell = true; 1927 rvideo_bell = true;
… …
1917void 1940void
1918rxvt_term::scr_printscreen (int fullhist) NOTHROW 1941rxvt_term::scr_printscreen (int fullhist) NOTHROW
1919{ 1942{
1920#ifdef PRINTPIPE 1943#ifdef PRINTPIPE
1921 int nrows, row_start; 1944 int nrows, row_start;
1922 FILE *fd; 1945 FILE *fd = popen_printer ();
1923 1946
1924 if ((fd = popen_printer ()) == NULL) 1947 if (!fd)
1925 return; 1948 return;
1926 1949
1927 if (fullhist) 1950 if (fullhist)
1928 { 1951 {
1929 nrows = nrow - top_row; 1952 nrows = nrow - top_row;
… …
1994 return; 2017 return;
1995 2018
1996 /* 2019 /*
1997 * A: set up vars 2020 * A: set up vars
1998 */ 2021 */
2022 refresh_count = 0;
2023
1999 have_bg = 0; 2024 have_bg = 0;
2000 refresh_count = 0;
2001
2002#ifdef HAVE_BG_PIXMAP 2025#ifdef HAVE_BG_PIXMAP
2003 have_bg |= bgPixmap.pixmap != None; 2026 have_bg = bgPixmap.pixmap != None;
2004#endif 2027#endif
2005 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2028 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2006 2029
2007 /* 2030 /*
2008 * B: reverse any characters which are selected 2031 * B: reverse any characters which are selected
… …
2199 continue; 2222 continue;
2200 2223
2201 // redraw one or more characters 2224 // redraw one or more characters
2202 2225
2203 // seek to the beginning of wide characters 2226 // seek to the beginning of wide characters
2204 while (stp[col] == NOCHAR && col > 0) 2227 while (expect_false (stp[col] == NOCHAR && col > 0))
2205 --col; 2228 --col;
2206 2229
2207 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2230 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2208 text_t *text = stp + col; 2231 text_t *text = stp + col;
2209 int count = 1; 2232 int count = 1;
… …
2246 2269
2247 col--; /* went one too far. move back */ 2270 col--; /* went one too far. move back */
2248 count -= i; /* dump any matching trailing chars */ 2271 count -= i; /* dump any matching trailing chars */
2249 2272
2250 // sometimes we optimize away the trailing NOCHAR's, add them back 2273 // sometimes we optimize away the trailing NOCHAR's, add them back
2251 while (i && text[count] == NOCHAR) 2274 while (expect_false (i && text[count] == NOCHAR))
2252 count++, i--; 2275 count++, i--;
2253 2276
2254 /* 2277 /*
2255 * Determine the attributes for the string 2278 * Determine the attributes for the string
2256 */ 2279 */
2257 int fore = fgcolor_of (rend); // desired foreground 2280 int fore = fgcolor_of (rend); // desired foreground
2258 int back = bgcolor_of (rend); // desired background 2281 int back = bgcolor_of (rend); // desired background
2259 2282
2260 // only do special processing if any attributes are set, which is unlikely 2283 // 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)) 2284 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2262 { 2285 {
2263 bool invert = rend & RS_RVid; 2286 bool invert = rend & RS_RVid;
2264 2287
2265#ifndef NO_BOLD_UNDERLINE_REVERSE 2288#ifndef NO_BOLD_UNDERLINE_REVERSE
2266 if (rend & RS_Bold && fore == Color_fg) 2289 if (rend & RS_Bold && fore == Color_fg)
… …
2349 /* 2372 /*
2350 * Actually do the drawing of the string here 2373 * Actually do the drawing of the string here
2351 */ 2374 */
2352 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2375 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2353 2376
2354 if (have_bg && back == Color_bg) 2377 if (expect_true (have_bg && back == Color_bg))
2355 { 2378 {
2356 // this is very ugly, maybe push it into ->draw? 2379 // this is very ugly, maybe push it into ->draw?
2357 2380
2358 for (i = 0; i < count; i++) /* don't draw empty strings */ 2381 for (i = 0; i < count; i++) /* don't draw empty strings */
2359 if (text[i] != ' ') 2382 if (text[i] != ' ')
… …
2366 did_clear: ; 2389 did_clear: ;
2367 } 2390 }
2368 else 2391 else
2369 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2392 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2370 2393
2371 if (rend & RS_Uline && font->descent > 1 && fore != back) 2394 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2372 { 2395 {
2373#if ENABLE_FRILLS 2396#if ENABLE_FRILLS
2374 if (ISSET_PIXCOLOR (Color_underline)) 2397 if (ISSET_PIXCOLOR (Color_underline))
2375 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2398 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2376 else 2399 else
2377#endif 2400#endif
2378 XSetForeground (dpy, gc, pix_colors[fore]); 2401 XSetForeground (dpy, gc, pix_colors[fore]);
2379 2402
2380 XDrawLine (dpy, drawBuffer, gc, 2403 XDrawLine (dpy, vt, gc,
2381 xpixel, ypixel + font->ascent + 1, 2404 xpixel, ypixel + font->ascent + 1,
2382 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2405 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2383 } 2406 }
2384 } /* for (col....) */ 2407 } /* for (col....) */
2385 } /* for (row....) */ 2408 } /* for (row....) */
… …
2423 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2446 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2424 else 2447 else
2425#endif 2448#endif
2426 XSetForeground (dpy, gc, pix_colors[ccol1]); 2449 XSetForeground (dpy, gc, pix_colors[ccol1]);
2427 2450
2428 XDrawRectangle (dpy, drawBuffer, gc, 2451 XDrawRectangle (dpy, vt, gc,
2429 Col2Pixel (col), 2452 Col2Pixel (col),
2430 Row2Pixel (oldcursor.row), 2453 Row2Pixel (oldcursor.row),
2431 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2454 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2432 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2455 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2433 } 2456 }
… …
2476 2499
2477 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2500 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2478 XClearWindow (dpy, parent[0]); 2501 XClearWindow (dpy, parent[0]);
2479 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2502 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2480 2503
2481# if HAVE_SCROLLBARS
2482 if (scrollBar.win) 2504 if (scrollBar.win)
2483 { 2505 {
2484 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2506 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2485 scrollBar.setIdle (); 2507 scrollBar.state = STATE_IDLE;
2486 scrollbar_show (0); 2508 scrollBar.show (0);
2487 } 2509 }
2510
2488# endif 2511#endif
2489 2512
2513 /* bgPixmap.apply () does not do the following : */
2490 scr_clear (); 2514 scr_clear ();
2491 scr_touch (true); 2515 scr_touch (true);
2492 want_refresh = 1; 2516 want_refresh = 1;
2493
2494#endif
2495} 2517}
2496 2518
2497/* ------------------------------------------------------------------------- */ 2519/* ------------------------------------------------------------------------- */
2498void 2520void
2499rxvt_term::scr_clear (bool really) NOTHROW 2521rxvt_term::scr_clear (bool really) NOTHROW
… …
2588{ 2610{
2589 int row, wrote; 2611 int row, wrote;
2590 unsigned int width, towrite; 2612 unsigned int width, towrite;
2591 char r1[] = "\n"; 2613 char r1[] = "\n";
2592 2614
2593 for (row = saveLines - nsaved; 2615 for (row = saveLines + top_row;
2594 row < saveLines + nrow - 1; row++) 2616 row < saveLines + nrow - 1; row++)
2595 { 2617 {
2596 width = row_buf[row].l >= 0 ? row_buf[row].l 2618 width = row_buf[row].l >= 0 ? row_buf[row].l
2597 : ncol; 2619 : ncol;
2598 for (towrite = width; towrite; towrite -= wrote) 2620 for (towrite = width; towrite; towrite -= wrote)

Diff Legend

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