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.302 by sasha, Wed Feb 6 16:44:47 2008 UTC vs.
Revision 1.326 by root, Wed Nov 5 13:04:51 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 CLEAR_ROWS(row, num) \
93 if (mapped) \
94 XClearArea (dpy, vt, 0, \
95 Row2Pixel (row), (unsigned int)width, \
96 (unsigned int)Height2Pixel (num), False)
97
98#define CLEAR_CHARS(x, y, num) \ 90#define CLEAR_CHARS(x, y, num) \
99 if (mapped) \ 91 if (mapped) \
100 XClearArea (dpy, vt, x, y, \ 92 XClearArea (dpy, vt, x, y, \
101 (unsigned int)Width2Pixel (num), \ 93 (unsigned int)Width2Pixel (num), \
102 (unsigned int)Height2Pixel (1), False) 94 (unsigned int)Height2Pixel (1), False)
103 95
104#define ERASE_ROWS(row, num) \
105 XFillRectangle (dpy, vt, gc, \
106 0, Row2Pixel (row), \
107 (unsigned int)width, \
108 (unsigned int)Height2Pixel (num))
109
110/* ------------------------------------------------------------------------- * 96/* ------------------------------------------------------------------------- *
111 * SCREEN `COMMON' ROUTINES * 97 * SCREEN `COMMON' ROUTINES *
112 * ------------------------------------------------------------------------- */ 98 * ------------------------------------------------------------------------- */
113 99
114/* Fill part/all of a line with blanks. */ 100/* Fill part/all of a line with blanks. */
… …
146 132
147 l.l = 0; 133 l.l = 0;
148 l.f = 0; 134 l.f = 0;
149} 135}
150 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 start, nuke
149 do {
150 l.t[col] = ' ';
151 l.r[col] = rend;
152 col++;
153 } while (col < ncol && l.t[col] == NOCHAR);
154}
155
151/* ------------------------------------------------------------------------- * 156/* ------------------------------------------------------------------------- *
152 * SCREEN INITIALISATION * 157 * SCREEN INITIALISATION *
153 * ------------------------------------------------------------------------- */ 158 * ------------------------------------------------------------------------- */
154 159
155void 160void
156rxvt_term::scr_reset () 161rxvt_term::scr_reset ()
157{ 162{
158#if ENABLE_OVERLAY
159 scr_overlay_off ();
160#endif
161
162 rvideo_mode = false;
163 view_start = 0; 163 view_start = 0;
164 num_scr = 0; 164 num_scr = 0;
165 165
166 if (ncol == 0) 166 if (ncol == 0)
167 ncol = 80; 167 ncol = 80;
… …
169 if (nrow == 0) 169 if (nrow == 0)
170 nrow = 24; 170 nrow = 24;
171 171
172 if (ncol == prev_ncol && nrow == prev_nrow) 172 if (ncol == prev_ncol && nrow == prev_nrow)
173 return; 173 return;
174
175 if (current_screen != PRIMARY)
176 scr_swap_screen ();
177 174
178 // we need at least two lines for wrapping to work correctly 175 // we need at least two lines for wrapping to work correctly
179 while (nrow + saveLines < 2) 176 while (nrow + saveLines < 2)
180 { 177 {
181 //TODO//FIXME 178 //TODO//FIXME
… …
281 278
282 if (top_row) 279 if (top_row)
283 { 280 {
284 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 281 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
285 // to come up with a lean and mean algorithm. 282 // to come up with a lean and mean algorithm.
283 // TODO: maybe optimise when width didn't change
286 284
287 row_col_t ocur = screen.cur; 285 row_col_t ocur = screen.cur;
288 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 286 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
289 287
290 do 288 do
… …
394 delete old_ta; 392 delete old_ta;
395 delete old_ra; 393 delete old_ra;
396 394
397 clamp_it (screen.cur.row, 0, nrow - 1); 395 clamp_it (screen.cur.row, 0, nrow - 1);
398 clamp_it (screen.cur.col, 0, ncol - 1); 396 clamp_it (screen.cur.col, 0, ncol - 1);
397 }
399 398
400 free (tabs); 399 free (tabs);
401 } 400 tabs = (char *)rxvt_malloc (ncol);
401
402 for (int col = ncol; --col; )
403 tabs [col] = col % TABSIZE == 0;
402 404
403 CLEAR_ALL_SELECTION (); 405 CLEAR_ALL_SELECTION ();
404 406
405 prev_nrow = nrow; 407 prev_nrow = nrow;
406 prev_ncol = ncol; 408 prev_ncol = ncol;
407
408 tabs = (char *)rxvt_malloc (ncol);
409
410 for (int col = ncol; --col; )
411 tabs [col] = col % TABSIZE == 0;
412
413 if (current_screen != PRIMARY)
414 scr_swap_screen ();
415 409
416 tt_winch (); 410 tt_winch ();
417 411
418 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 412 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
419} 413}
… …
431 delete ralloc; ralloc = 0; 425 delete ralloc; ralloc = 0;
432 426
433 free (row_buf); 427 free (row_buf);
434 free (swap_buf); 428 free (swap_buf);
435 free (drawn_buf); 429 free (drawn_buf);
430 row_buf = 0; // signal that we freed all the arrays above
431
436 free (tabs); 432 free (tabs);
437 433 tabs = 0;
438 row_buf = 0; // signal that we freed all the arrays
439 } 434 }
440} 435}
441 436
442/* ------------------------------------------------------------------------- */ 437/* ------------------------------------------------------------------------- */
443/* 438/*
444 * Hard reset 439 * Hard/Soft reset
445 */ 440 */
446void 441void
447rxvt_term::scr_poweron () 442rxvt_term::scr_poweron ()
448{ 443{
449 scr_release (); 444 scr_release ();
450 prev_nrow = prev_ncol = 0; 445 prev_nrow = prev_ncol = 0;
446 rvideo_mode = false;
447 scr_soft_reset ();
451 scr_reset (); 448 scr_reset ();
452 449
453 scr_clear (true); 450 scr_clear (true);
454 scr_refresh (); 451 scr_refresh ();
452}
453
454void
455rxvt_term::scr_soft_reset ()
456{
457 /* only affects modes, nothing drastic such as clearing the screen */
458#if ENABLE_OVERLAY
459 scr_overlay_off ();
460#endif
461
462 if (current_screen != PRIMARY)
463 scr_swap_screen ();
464
465 scr_scroll_region (0, MAX_ROWS - 1);
466 scr_rendition (0, ~RS_None);
467 scr_insert_mode (0);
455} 468}
456 469
457/* ------------------------------------------------------------------------- * 470/* ------------------------------------------------------------------------- *
458 * PROCESS SCREEN COMMANDS * 471 * PROCESS SCREEN COMMANDS *
459 * ------------------------------------------------------------------------- */ 472 * ------------------------------------------------------------------------- */
… …
785 798
786 while (str < strend) 799 while (str < strend)
787 { 800 {
788 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 801 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
789 802
790 if (c < 0x20) 803 if (expect_false (c < 0x20))
791 if (c == C0_LF) 804 if (c == C0_LF)
792 { 805 {
793 max_it (line->l, screen.cur.col); 806 max_it (line->l, screen.cur.col);
794 807
795 screen.flags &= ~Screen_WrapNext; 808 screen.flags &= ~Screen_WrapNext;
… …
814 { 827 {
815 scr_tab (1, true); 828 scr_tab (1, true);
816 continue; 829 continue;
817 } 830 }
818 831
832 if (expect_false (
819 if (checksel /* see if we're writing within selection */ 833 checksel /* see if we're writing within selection */
820 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 834 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
821 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 835 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
836 ))
822 { 837 {
823 checksel = 0; 838 checksel = 0;
824 /* 839 /*
825 * If we wrote anywhere in the selected area, kill the selection 840 * If we wrote anywhere in the selected area, kill the selection
826 * XXX: should we kill the mark too? Possibly, but maybe that 841 * XXX: should we kill the mark too? Possibly, but maybe that
827 * should be a similar check. 842 * should be a similar check.
828 */ 843 */
829 CLEAR_SELECTION (); 844 CLEAR_SELECTION ();
830 } 845 }
831 846
832 if (screen.flags & Screen_WrapNext) 847 if (expect_false (screen.flags & Screen_WrapNext))
833 { 848 {
834 scr_do_wrap (); 849 scr_do_wrap ();
835 850
836 line->l = ncol; 851 line->l = ncol;
837 line->is_longer (1); 852 line->is_longer (1);
… …
839 row = screen.cur.row; 854 row = screen.cur.row;
840 line = &ROW(row); /* _must_ refresh */ 855 line = &ROW(row); /* _must_ refresh */
841 } 856 }
842 857
843 // some utf-8 decoders "decode" surrogate characters: let's fix this. 858 // some utf-8 decoders "decode" surrogate characters: let's fix this.
844 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 859 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
845 c = 0xfffd; 860 c = 0xfffd;
846 861
847 // rely on wcwidth to tell us the character width, do wcwidth before 862 // rely on wcwidth to tell us the character width, do wcwidth before
848 // further replacements, as wcwidth might return -1 for the line 863 // further replacements, as wcwidth might return -1 for the line
849 // drawing characters below as they might be invalid in the current 864 // drawing characters below as they might be invalid in the current
850 // locale. 865 // locale.
851 int width = WCWIDTH (c); 866 int width = WCWIDTH (c);
852 867
853 if (charsets [screen.charset] == '0') // DEC SPECIAL 868 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
854 { 869 {
855 // vt100 special graphics and line drawing 870 // vt100 special graphics and line drawing
856 // 5f-7e standard vt100 871 // 5f-7e standard vt100
857 // 40-5e rxvt extension for extra curses acs chars 872 // 40-5e rxvt extension for extra curses acs chars
858 static uint16_t vt100_0[62] = { // 41 .. 7e 873 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
871 c = vt100_0[c - 0x41]; 886 c = vt100_0[c - 0x41];
872 width = 1; // vt100 line drawing characters are always single-width 887 width = 1; // vt100 line drawing characters are always single-width
873 } 888 }
874 } 889 }
875 890
876 if (screen.flags & Screen_Insert) 891 if (expect_false (screen.flags & Screen_Insert))
877 scr_insdel_chars (width, INSERT); 892 scr_insdel_chars (width, INSERT);
878 893
879 if (width != 0) 894 if (width != 0)
880 { 895 {
881#if !UNICODE_3 896#if !UNICODE_3
… …
887 c = 0xfffd; 902 c = 0xfffd;
888# endif 903# endif
889#endif 904#endif
890 905
891 // nuke the character at this position, if required 906 // nuke the character at this position, if required
907 if (expect_false (
892 if (line->t[screen.cur.col] == NOCHAR 908 line->t[screen.cur.col] == NOCHAR
893 || (screen.cur.col < ncol - 1 909 || (screen.cur.col < ncol - 1
894 && line->t[screen.cur.col + 1] == NOCHAR)) 910 && line->t[screen.cur.col + 1] == NOCHAR)
911 ))
912 scr_kill_char (*line, screen.cur.col);
913
914 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
915
916 // if the character doesn't fit into the remaining columns...
917 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
895 { 918 {
896 int col = screen.cur.col; 919 // ... artificially enlargen the previous one
897
898 // find begin
899 while (col > 0 && line->t[col] == NOCHAR)
900 col--;
901
902 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
903
904 // found begin, nuke
905 do {
906 line->t[col] = ' ';
907 line->r[col] = rend;
908 col++;
909 } while (col < ncol && line->t[col] == NOCHAR);
910 }
911
912 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
913
914 // if the character doesn't fit into the remaining columns...
915 if (screen.cur.col > ncol - width && ncol >= width)
916 {
917 // ...output spaces
918 c = ' '; 920 c = NOCHAR;
919 // and try the same character next loop iteration 921 // and try the same character next loop iteration
920 --str; 922 --str;
921 } 923 }
922 924
923 line->touch (); 925 line->touch ();
… …
925 do 927 do
926 { 928 {
927 line->t[screen.cur.col] = c; 929 line->t[screen.cur.col] = c;
928 line->r[screen.cur.col] = rend; 930 line->r[screen.cur.col] = rend;
929 931
930 if (screen.cur.col < ncol - 1) 932 if (expect_true (screen.cur.col < ncol - 1))
931 screen.cur.col++; 933 screen.cur.col++;
932 else 934 else
933 { 935 {
934 line->l = ncol; 936 line->l = ncol;
935 if (screen.flags & Screen_Autowrap) 937 if (screen.flags & Screen_Autowrap)
… …
937 break; 939 break;
938 } 940 }
939 941
940 c = NOCHAR; 942 c = NOCHAR;
941 } 943 }
942 while (--width > 0); 944 while (expect_false (--width > 0));
943 945
944 // pad with spaces when overwriting wide character with smaller one 946 // pad with spaces when overwriting wide character with smaller one
945 if (!width) 947 if (expect_false (!width))
946 { 948 {
947 line->touch (); 949 line->touch ();
948 950
949 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
950 { 952 {
951 line->t[c] = ' '; 953 line->t[c] = ' ';
952 line->r[c] = rend; 954 line->r[c] = rend;
953 } 955 }
954 } 956 }
955 } 957 }
958#if ENABLE_COMBINING
956 else // width == 0 959 else // width == 0
957 { 960 {
958#if ENABLE_COMBINING 961 if (c != 0xfeff) // ignore BOM
959 // handle combining characters
960 // we just tag the accent on the previous on-screen character.
961 // this is arguably not correct, but also arguably not wrong.
962 // we don't handle double-width characters nicely yet.
963 line_t *linep;
964 text_t *tp;
965 rend_t *rp;
966
967 if (screen.cur.col > 0)
968 { 962 {
963 // handle combining characters
964 // we just tag the accent on the previous on-screen character.
965 // this is arguably not correct, but also arguably not wrong.
966 // we don't handle double-width characters nicely yet.
967 line_t *linep;
968 text_t *tp;
969 rend_t *rp;
970
971 if (screen.cur.col > 0)
972 {
969 linep = line; 973 linep = line;
970 tp = line->t + screen.cur.col - 1; 974 tp = line->t + screen.cur.col - 1;
971 rp = line->r + screen.cur.col - 1; 975 rp = line->r + screen.cur.col - 1;
976 }
977 else if (screen.cur.row > 0
978 && ROW(screen.cur.row - 1).is_longer ())
979 {
980 linep = &ROW(screen.cur.row - 1);
981 tp = line->t + ncol - 1;
982 rp = line->r + ncol - 1;
983 }
984 else
985 continue;
986
987 linep->touch ();
988
989 while (*tp == NOCHAR && tp > linep->t)
990 tp--, rp--;
991
992 // first try to find a precomposed character
993 unicode_t n = rxvt_compose (*tp, c);
994 if (n == NOCHAR)
995 n = rxvt_composite.compose (*tp, c);
996
997 *tp = n;
998 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
972 } 999 }
973 else if (screen.cur.row > 0
974 && ROW(screen.cur.row - 1).is_longer ())
975 {
976 linep = &ROW(screen.cur.row - 1);
977 tp = line->t + ncol - 1;
978 rp = line->r + ncol - 1;
979 } 1000 }
980 else
981 continue;
982
983 linep->touch ();
984
985 while (*tp == NOCHAR && tp > linep->t)
986 tp--, rp--;
987
988 // first try to find a precomposed character
989 unicode_t n = rxvt_compose (*tp, c);
990 if (n == NOCHAR)
991 n = rxvt_composite.compose (*tp, c);
992
993 *tp = n;
994 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
995#endif 1001#endif
996 }
997 } 1002 }
998 1003
999 max_it (line->l, screen.cur.col); 1004 max_it (line->l, screen.cur.col);
1000 1005
1001#ifdef DEBUG_STRICT 1006#ifdef DEBUG_STRICT
… …
1225/* 1230/*
1226 * Erase part or whole of a line 1231 * Erase part or whole of a line
1227 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1232 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1228 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1233 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1229 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1234 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1235 * extension: clear to right unless wrapped: ESC [ 3 K
1230 */ 1236 */
1231void 1237void
1232rxvt_term::scr_erase_line (int mode) NOTHROW 1238rxvt_term::scr_erase_line (int mode) NOTHROW
1233{ 1239{
1234 unsigned int col, num; 1240 unsigned int col, num;
… …
1243 line.touch (); 1249 line.touch ();
1244 line.is_longer (0); 1250 line.is_longer (0);
1245 1251
1246 switch (mode) 1252 switch (mode)
1247 { 1253 {
1254 case 3:
1255 if (screen.flags & Screen_WrapNext)
1256 return;
1257
1258 /* fall through */
1259
1248 case 0: /* erase to end of line */ 1260 case 0: /* erase to end of line */
1249 col = screen.cur.col; 1261 col = screen.cur.col;
1250 num = ncol - col; 1262 num = ncol - col;
1251 min_it (line.l, col); 1263 min_it (line.l, col);
1264
1252 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1265 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1253 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1266 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1254 CLEAR_SELECTION (); 1267 CLEAR_SELECTION ();
1255 break; 1268 break;
1269
1256 case 1: /* erase to beginning of line */ 1270 case 1: /* erase to beginning of line */
1257 col = 0; 1271 col = 0;
1258 num = screen.cur.col + 1; 1272 num = screen.cur.col + 1;
1273
1259 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1274 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1260 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1275 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1261 CLEAR_SELECTION (); 1276 CLEAR_SELECTION ();
1262 break; 1277 break;
1278
1263 case 2: /* erase whole line */ 1279 case 2: /* erase whole line */
1264 col = 0; 1280 col = 0;
1265 num = ncol; 1281 num = ncol;
1266 line.l = 0; 1282 line.l = 0;
1267 if (selection.beg.row <= screen.cur.row 1283 if (selection.beg.row <= screen.cur.row
… …
1325 if (row >= nrow) /* Out Of Bounds */ 1341 if (row >= nrow) /* Out Of Bounds */
1326 return; 1342 return;
1327 1343
1328 min_it (num, nrow - row); 1344 min_it (num, nrow - row);
1329 1345
1346 // TODO: the code below does not work when view_start != 0
1347 // the workaround is to disable the clear and use a normal refresh
1348 // when view_start != 0. mysterious.
1330 if (rstyle & (RS_RVid | RS_Uline)) 1349 if (rstyle & (RS_RVid | RS_Uline))
1331 ren = (rend_t) ~RS_None; 1350 ren = (rend_t) ~RS_None;
1332 else if (GET_BASEBG (rstyle) == Color_bg) 1351 else if (GET_BASEBG (rstyle) == Color_bg)
1333 { 1352 {
1334 ren = DEFAULT_RSTYLE; 1353 ren = DEFAULT_RSTYLE;
1335 CLEAR_ROWS (row, num); 1354
1355 if (mapped && !view_start)
1356 XClearArea (dpy, vt, 0,
1357 Row2Pixel (row - view_start), (unsigned int)width,
1358 (unsigned int)Height2Pixel (num), False);
1336 } 1359 }
1337 else 1360 else
1338 { 1361 {
1339 ren = rstyle & (RS_fgMask | RS_bgMask); 1362 ren = rstyle & (RS_fgMask | RS_bgMask);
1363
1364 if (mapped && !view_start)
1365 {
1340 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1366 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1341 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1367 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1342 ERASE_ROWS (row, num); 1368 XFillRectangle (dpy, vt, gc,
1369 0, Row2Pixel (row - view_start),
1370 (unsigned int)width,
1371 (unsigned int)Height2Pixel (num));
1343 gcvalue.foreground = pix_colors[Color_fg]; 1372 gcvalue.foreground = pix_colors[Color_fg];
1344 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1373 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1374 }
1345 } 1375 }
1346 1376
1347 for (; num--; row++) 1377 for (; num--; row++)
1348 { 1378 {
1349 scr_blank_screen_mem (ROW(row), rstyle); 1379 scr_blank_screen_mem (ROW(row), rstyle);
1380
1381 if (!view_start)
1350 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1382 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1351 } 1383 }
1352} 1384}
1353 1385
1354#if !ENABLE_MINIMAL 1386#if !ENABLE_MINIMAL
1355void 1387void
… …
1429 * Insert/Delete <count> characters from the current position 1461 * Insert/Delete <count> characters from the current position
1430 */ 1462 */
1431void 1463void
1432rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1464rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1433{ 1465{
1434 int col, row;
1435 rend_t tr;
1436
1437 want_refresh = 1; 1466 want_refresh = 1;
1438 ZERO_SCROLLBACK (); 1467 ZERO_SCROLLBACK ();
1439 1468
1440 if (count <= 0) 1469 if (count <= 0)
1441 return; 1470 return;
… …
1443 scr_do_wrap (); 1472 scr_do_wrap ();
1444 1473
1445 selection_check (1); 1474 selection_check (1);
1446 min_it (count, ncol - screen.cur.col); 1475 min_it (count, ncol - screen.cur.col);
1447 1476
1448 row = screen.cur.row; 1477 int row = screen.cur.row;
1449 1478
1450 line_t *line = &ROW(row); 1479 line_t *line = &ROW(row);
1451 1480
1452 line->touch (); 1481 line->touch ();
1453 line->is_longer (0); 1482 line->is_longer (0);
1454 1483
1484 // nuke wide spanning the start
1485 if (line->t[screen.cur.col] == NOCHAR)
1486 scr_kill_char (*line, screen.cur.col);
1487
1455 switch (insdel) 1488 switch (insdel)
1456 { 1489 {
1457 case INSERT: 1490 case INSERT:
1458 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1491 line->l = min (line->l + count, ncol);
1492
1493 if (line->t[screen.cur.col] == NOCHAR)
1494 scr_kill_char (*line, screen.cur.col);
1495
1496 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1459 { 1497 {
1460 line->t[col] = line->t[col - count]; 1498 line->t[col] = line->t[col - count];
1461 line->r[col] = line->r[col - count]; 1499 line->r[col] = line->r[col - count];
1462 } 1500 }
1463
1464 line->l = min (line->l + count, ncol);
1465 1501
1466 if (selection.op && current_screen == selection.screen 1502 if (selection.op && current_screen == selection.screen
1467 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1503 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1468 { 1504 {
1469 if (selection.end.row != screen.cur.row 1505 if (selection.end.row != screen.cur.row
… …
1484 case ERASE: 1520 case ERASE:
1485 screen.cur.col += count; /* don't worry if > ncol */ 1521 screen.cur.col += count; /* don't worry if > ncol */
1486 selection_check (1); 1522 selection_check (1);
1487 screen.cur.col -= count; 1523 screen.cur.col -= count;
1488 1524
1489 line->l = max (line->l - count, 0); 1525 // nuke wide char after the end
1526 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1527 scr_kill_char (*line, screen.cur.col + count);
1528
1490 scr_blank_line (*line, screen.cur.col, count, rstyle); 1529 scr_blank_line (*line, screen.cur.col, count, rstyle);
1491 break; 1530 break;
1492 1531
1493 case DELETE: 1532 case DELETE:
1494 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1533 line->l = max (line->l - count, 0);
1495 1534
1535 // nuke wide char spanning the end
1536 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1537 scr_kill_char (*line, screen.cur.col + count);
1538
1496 for (col = screen.cur.col; (col + count) < ncol; col++) 1539 for (int col = screen.cur.col; (col + count) < ncol; col++)
1497 { 1540 {
1498 line->t[col] = line->t[col + count]; 1541 line->t[col] = line->t[col + count];
1499 line->r[col] = line->r[col + count]; 1542 line->r[col] = line->r[col + count];
1500 } 1543 }
1501 1544
1502 line->l = max (line->l - count, 0);
1503 scr_blank_line (*line, ncol - count, count, tr); 1545 scr_blank_line (*line, ncol - count, count, rstyle);
1504 1546
1505 if (selection.op && current_screen == selection.screen 1547 if (selection.op && current_screen == selection.screen
1506 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1548 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1507 { 1549 {
1508 if (selection.end.row != screen.cur.row 1550 if (selection.end.row != screen.cur.row
… …
1886 XMapWindow (dpy, parent[0]); 1928 XMapWindow (dpy, parent[0]);
1887# endif 1929# endif
1888 1930
1889# if ENABLE_FRILLS 1931# if ENABLE_FRILLS
1890 if (option (Opt_urgentOnBell)) 1932 if (option (Opt_urgentOnBell))
1891 { 1933 set_urgency (1);
1892 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1893 {
1894 h->flags |= XUrgencyHint;
1895 XSetWMHints (dpy, parent[0], h);
1896 }
1897 }
1898# endif 1934# endif
1899 1935
1900 if (option (Opt_visualBell)) 1936 if (option (Opt_visualBell))
1901 { 1937 {
1902 rvideo_bell = true; 1938 rvideo_bell = true;
… …
1915void 1951void
1916rxvt_term::scr_printscreen (int fullhist) NOTHROW 1952rxvt_term::scr_printscreen (int fullhist) NOTHROW
1917{ 1953{
1918#ifdef PRINTPIPE 1954#ifdef PRINTPIPE
1919 int nrows, row_start; 1955 int nrows, row_start;
1920 FILE *fd; 1956 FILE *fd = popen_printer ();
1921 1957
1922 if ((fd = popen_printer ()) == NULL) 1958 if (!fd)
1923 return; 1959 return;
1924 1960
1925 if (fullhist) 1961 if (fullhist)
1926 { 1962 {
1927 nrows = nrow - top_row; 1963 nrows = nrow - top_row;
… …
1992 return; 2028 return;
1993 2029
1994 /* 2030 /*
1995 * A: set up vars 2031 * A: set up vars
1996 */ 2032 */
2033 refresh_count = 0;
2034
1997 have_bg = 0; 2035 have_bg = 0;
1998 refresh_count = 0;
1999
2000#ifdef HAVE_BG_PIXMAP 2036#ifdef HAVE_BG_PIXMAP
2001 have_bg |= bgPixmap.pixmap != None; 2037 have_bg = bgPixmap.pixmap != None;
2002#endif 2038#endif
2003 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2039 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2004 2040
2005 /* 2041 /*
2006 * B: reverse any characters which are selected 2042 * B: reverse any characters which are selected
… …
2197 continue; 2233 continue;
2198 2234
2199 // redraw one or more characters 2235 // redraw one or more characters
2200 2236
2201 // seek to the beginning of wide characters 2237 // seek to the beginning of wide characters
2202 while (stp[col] == NOCHAR && col > 0) 2238 while (expect_false (stp[col] == NOCHAR && col > 0))
2203 --col; 2239 --col;
2204 2240
2205 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2241 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2206 text_t *text = stp + col; 2242 text_t *text = stp + col;
2207 int count = 1; 2243 int count = 1;
… …
2244 2280
2245 col--; /* went one too far. move back */ 2281 col--; /* went one too far. move back */
2246 count -= i; /* dump any matching trailing chars */ 2282 count -= i; /* dump any matching trailing chars */
2247 2283
2248 // sometimes we optimize away the trailing NOCHAR's, add them back 2284 // sometimes we optimize away the trailing NOCHAR's, add them back
2249 while (i && text[count] == NOCHAR) 2285 while (expect_false (i && text[count] == NOCHAR))
2250 count++, i--; 2286 count++, i--;
2251 2287
2252 /* 2288 /*
2253 * Determine the attributes for the string 2289 * Determine the attributes for the string
2254 */ 2290 */
2255 int fore = fgcolor_of (rend); // desired foreground 2291 int fore = fgcolor_of (rend); // desired foreground
2256 int back = bgcolor_of (rend); // desired background 2292 int back = bgcolor_of (rend); // desired background
2257 2293
2258 // only do special processing if any attributes are set, which is unlikely 2294 // only do special processing if any attributes are set, which is unlikely
2259 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2295 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2260 { 2296 {
2261 bool invert = rend & RS_RVid; 2297 bool invert = rend & RS_RVid;
2262 2298
2263#ifndef NO_BOLD_UNDERLINE_REVERSE 2299#ifndef NO_BOLD_UNDERLINE_REVERSE
2264 if (rend & RS_Bold && fore == Color_fg) 2300 if (rend & RS_Bold && fore == Color_fg)
… …
2347 /* 2383 /*
2348 * Actually do the drawing of the string here 2384 * Actually do the drawing of the string here
2349 */ 2385 */
2350 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2386 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2351 2387
2352 if (have_bg && back == Color_bg) 2388 if (expect_true (have_bg && back == Color_bg))
2353 { 2389 {
2354 // this is very ugly, maybe push it into ->draw? 2390 // this is very ugly, maybe push it into ->draw?
2355 2391
2356 for (i = 0; i < count; i++) /* don't draw empty strings */ 2392 for (i = 0; i < count; i++) /* don't draw empty strings */
2357 if (text[i] != ' ') 2393 if (text[i] != ' ')
… …
2364 did_clear: ; 2400 did_clear: ;
2365 } 2401 }
2366 else 2402 else
2367 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2403 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2368 2404
2369 if (rend & RS_Uline && font->descent > 1 && fore != back) 2405 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2370 { 2406 {
2371#if ENABLE_FRILLS 2407#if ENABLE_FRILLS
2372 if (ISSET_PIXCOLOR (Color_underline)) 2408 if (ISSET_PIXCOLOR (Color_underline))
2373 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2409 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2374 else 2410 else
… …
2478 2514
2479 if (scrollBar.win) 2515 if (scrollBar.win)
2480 { 2516 {
2481 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2517 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2482 scrollBar.state = STATE_IDLE; 2518 scrollBar.state = STATE_IDLE;
2483 scrollbar_show (0); 2519 scrollBar.show (0);
2484 } 2520 }
2485 2521
2486#endif 2522#endif
2487 2523
2488 /* bgPixmap.apply () does not do the following : */ 2524 /* bgPixmap.apply () does not do the following : */
… …
2585{ 2621{
2586 int row, wrote; 2622 int row, wrote;
2587 unsigned int width, towrite; 2623 unsigned int width, towrite;
2588 char r1[] = "\n"; 2624 char r1[] = "\n";
2589 2625
2590 for (row = saveLines - nsaved; 2626 for (row = saveLines + top_row;
2591 row < saveLines + nrow - 1; row++) 2627 row < saveLines + nrow - 1; row++)
2592 { 2628 {
2593 width = row_buf[row].l >= 0 ? row_buf[row].l 2629 width = row_buf[row].l >= 0 ? row_buf[row].l
2594 : ncol; 2630 : ncol;
2595 for (towrite = width; towrite; towrite -= wrote) 2631 for (towrite = width; towrite; towrite -= wrote)

Diff Legend

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