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.297 by root, Wed Jan 9 01:14:29 2008 UTC vs.
Revision 1.322 by root, Tue Nov 4 23:35:50 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
… …
148 132
149 l.l = 0; 133 l.l = 0;
150 l.f = 0; 134 l.f = 0;
151} 135}
152 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
153/* ------------------------------------------------------------------------- * 156/* ------------------------------------------------------------------------- *
154 * SCREEN INITIALISATION * 157 * SCREEN INITIALISATION *
155 * ------------------------------------------------------------------------- */ 158 * ------------------------------------------------------------------------- */
156 159
157void 160void
158rxvt_term::scr_reset () 161rxvt_term::scr_reset ()
159{ 162{
160#if ENABLE_OVERLAY 163 scr_soft_reset ();
161 scr_overlay_off ();
162#endif
163 164
164 rvideo_mode = false;
165 view_start = 0; 165 view_start = 0;
166 num_scr = 0; 166 num_scr = 0;
167 167
168 if (ncol == 0) 168 if (ncol == 0)
169 ncol = 80; 169 ncol = 80;
… …
171 if (nrow == 0) 171 if (nrow == 0)
172 nrow = 24; 172 nrow = 24;
173 173
174 if (ncol == prev_ncol && nrow == prev_nrow) 174 if (ncol == prev_ncol && nrow == prev_nrow)
175 return; 175 return;
176
177 if (current_screen != PRIMARY)
178 scr_swap_screen ();
179 176
180 // we need at least two lines for wrapping to work correctly 177 // we need at least two lines for wrapping to work correctly
181 while (nrow + saveLines < 2) 178 while (nrow + saveLines < 2)
182 { 179 {
183 //TODO//FIXME 180 //TODO//FIXME
… …
396 delete old_ta; 393 delete old_ta;
397 delete old_ra; 394 delete old_ra;
398 395
399 clamp_it (screen.cur.row, 0, nrow - 1); 396 clamp_it (screen.cur.row, 0, nrow - 1);
400 clamp_it (screen.cur.col, 0, ncol - 1); 397 clamp_it (screen.cur.col, 0, ncol - 1);
401
402 free (tabs);
403 } 398 }
404 399
405 CLEAR_ALL_SELECTION (); 400 CLEAR_ALL_SELECTION ();
406 401
407 prev_nrow = nrow; 402 prev_nrow = nrow;
408 prev_ncol = ncol; 403 prev_ncol = ncol;
409
410 tabs = (char *)rxvt_malloc (ncol);
411
412 for (int col = ncol; --col; )
413 tabs [col] = col % TABSIZE == 0;
414
415 if (current_screen != PRIMARY)
416 scr_swap_screen ();
417 404
418 tt_winch (); 405 tt_winch ();
419 406
420 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 407 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
421} 408}
… …
433 delete ralloc; ralloc = 0; 420 delete ralloc; ralloc = 0;
434 421
435 free (row_buf); 422 free (row_buf);
436 free (swap_buf); 423 free (swap_buf);
437 free (drawn_buf); 424 free (drawn_buf);
425 row_buf = 0; // signal that we freed all the arrays above
426
438 free (tabs); 427 free (tabs);
439 428 tabs = 0;
440 row_buf = 0; // signal that we freed all the arrays
441 } 429 }
442} 430}
443 431
444/* ------------------------------------------------------------------------- */ 432/* ------------------------------------------------------------------------- */
445/* 433/*
446 * Hard reset 434 * Hard/Soft reset
447 */ 435 */
448void 436void
449rxvt_term::scr_poweron () 437rxvt_term::scr_poweron ()
450{ 438{
451 scr_release (); 439 scr_release ();
452 prev_nrow = prev_ncol = 0; 440 prev_nrow = prev_ncol = 0;
453 scr_reset (); 441 scr_reset ();
454 442
455 scr_clear (true); 443 scr_clear (true);
456 scr_refresh (); 444 scr_refresh ();
445}
446
447void
448rxvt_term::scr_soft_reset ()
449{
450 /* only affects modes, nothing drastic such as clearing the screen */
451#if ENABLE_OVERLAY
452 scr_overlay_off ();
453#endif
454
455 rvideo_mode = false;
456
457 if (current_screen != PRIMARY)
458 scr_swap_screen ();
459
460 free (tabs);
461 tabs = (char *)rxvt_malloc (ncol);
462
463 for (int col = ncol; --col; )
464 tabs [col] = col % TABSIZE == 0;
465
466 scr_scroll_region (0, MAX_ROWS - 1);
467 scr_rendition (0, ~RS_None);
468 scr_insert_mode (0);
457} 469}
458 470
459/* ------------------------------------------------------------------------- * 471/* ------------------------------------------------------------------------- *
460 * PROCESS SCREEN COMMANDS * 472 * PROCESS SCREEN COMMANDS *
461 * ------------------------------------------------------------------------- */ 473 * ------------------------------------------------------------------------- */
… …
787 799
788 while (str < strend) 800 while (str < strend)
789 { 801 {
790 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 802 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
791 803
792 if (c < 0x20) 804 if (expect_false (c < 0x20))
793 if (c == C0_LF) 805 if (c == C0_LF)
794 { 806 {
795 max_it (line->l, screen.cur.col); 807 max_it (line->l, screen.cur.col);
796 808
797 screen.flags &= ~Screen_WrapNext; 809 screen.flags &= ~Screen_WrapNext;
… …
816 { 828 {
817 scr_tab (1, true); 829 scr_tab (1, true);
818 continue; 830 continue;
819 } 831 }
820 832
833 if (expect_false (
821 if (checksel /* see if we're writing within selection */ 834 checksel /* see if we're writing within selection */
822 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 835 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
823 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 836 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
837 ))
824 { 838 {
825 checksel = 0; 839 checksel = 0;
826 /* 840 /*
827 * If we wrote anywhere in the selected area, kill the selection 841 * If we wrote anywhere in the selected area, kill the selection
828 * XXX: should we kill the mark too? Possibly, but maybe that 842 * XXX: should we kill the mark too? Possibly, but maybe that
829 * should be a similar check. 843 * should be a similar check.
830 */ 844 */
831 CLEAR_SELECTION (); 845 CLEAR_SELECTION ();
832 } 846 }
833 847
834 if (screen.flags & Screen_WrapNext) 848 if (expect_false (screen.flags & Screen_WrapNext))
835 { 849 {
836 scr_do_wrap (); 850 scr_do_wrap ();
837 851
838 line->l = ncol; 852 line->l = ncol;
839 line->is_longer (1); 853 line->is_longer (1);
… …
841 row = screen.cur.row; 855 row = screen.cur.row;
842 line = &ROW(row); /* _must_ refresh */ 856 line = &ROW(row); /* _must_ refresh */
843 } 857 }
844 858
845 // some utf-8 decoders "decode" surrogate characters: let's fix this. 859 // some utf-8 decoders "decode" surrogate characters: let's fix this.
846 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 860 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
847 c = 0xfffd; 861 c = 0xfffd;
848 862
849 // rely on wcwidth to tell us the character width, do wcwidth before 863 // rely on wcwidth to tell us the character width, do wcwidth before
850 // further replacements, as wcwidth might return -1 for the line 864 // further replacements, as wcwidth might return -1 for the line
851 // drawing characters below as they might be invalid in the current 865 // drawing characters below as they might be invalid in the current
852 // locale. 866 // locale.
853 int width = WCWIDTH (c); 867 int width = WCWIDTH (c);
854 868
855 if (charsets [screen.charset] == '0') // DEC SPECIAL 869 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
856 { 870 {
857 // vt100 special graphics and line drawing 871 // vt100 special graphics and line drawing
858 // 5f-7e standard vt100 872 // 5f-7e standard vt100
859 // 40-5e rxvt extension for extra curses acs chars 873 // 40-5e rxvt extension for extra curses acs chars
860 static uint16_t vt100_0[62] = { // 41 .. 7e 874 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
873 c = vt100_0[c - 0x41]; 887 c = vt100_0[c - 0x41];
874 width = 1; // vt100 line drawing characters are always single-width 888 width = 1; // vt100 line drawing characters are always single-width
875 } 889 }
876 } 890 }
877 891
878 if (screen.flags & Screen_Insert) 892 if (expect_false (screen.flags & Screen_Insert))
879 scr_insdel_chars (width, INSERT); 893 scr_insdel_chars (width, INSERT);
880 894
881 if (width != 0) 895 if (width != 0)
882 { 896 {
883#if !UNICODE_3 897#if !UNICODE_3
… …
889 c = 0xfffd; 903 c = 0xfffd;
890# endif 904# endif
891#endif 905#endif
892 906
893 // nuke the character at this position, if required 907 // nuke the character at this position, if required
908 if (expect_false (
894 if (line->t[screen.cur.col] == NOCHAR 909 line->t[screen.cur.col] == NOCHAR
895 || (screen.cur.col < ncol - 1 910 || (screen.cur.col < ncol - 1
896 && line->t[screen.cur.col + 1] == NOCHAR)) 911 && line->t[screen.cur.col + 1] == NOCHAR)
912 ))
913 scr_kill_char (*line, screen.cur.col);
914
915 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
916
917 // if the character doesn't fit into the remaining columns...
918 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
897 { 919 {
898 int col = screen.cur.col; 920 // ... artificially enlargen the previous one
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
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 (screen.cur.col > ncol - width && ncol >= width)
918 {
919 // ...output spaces
920 c = ' '; 921 c = NOCHAR;
921 // and try the same character next loop iteration 922 // and try the same character next loop iteration
922 --str; 923 --str;
923 } 924 }
924 925
925 line->touch (); 926 line->touch ();
… …
927 do 928 do
928 { 929 {
929 line->t[screen.cur.col] = c; 930 line->t[screen.cur.col] = c;
930 line->r[screen.cur.col] = rend; 931 line->r[screen.cur.col] = rend;
931 932
932 if (screen.cur.col < ncol - 1) 933 if (expect_true (screen.cur.col < ncol - 1))
933 screen.cur.col++; 934 screen.cur.col++;
934 else 935 else
935 { 936 {
936 line->l = ncol; 937 line->l = ncol;
937 if (screen.flags & Screen_Autowrap) 938 if (screen.flags & Screen_Autowrap)
… …
939 break; 940 break;
940 } 941 }
941 942
942 c = NOCHAR; 943 c = NOCHAR;
943 } 944 }
944 while (--width > 0); 945 while (expect_false (--width > 0));
945 946
946 // pad with spaces when overwriting wide character with smaller one 947 // pad with spaces when overwriting wide character with smaller one
947 if (!width) 948 if (expect_false (!width))
948 { 949 {
949 line->touch (); 950 line->touch ();
950 951
951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 952 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
952 { 953 {
953 line->t[c] = ' '; 954 line->t[c] = ' ';
954 line->r[c] = rend; 955 line->r[c] = rend;
955 } 956 }
956 } 957 }
957 } 958 }
959#if ENABLE_COMBINING
958 else // width == 0 960 else // width == 0
959 { 961 {
960#if ENABLE_COMBINING 962 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 { 963 {
964 // handle combining characters
965 // we just tag the accent on the previous on-screen character.
966 // this is arguably not correct, but also arguably not wrong.
967 // we don't handle double-width characters nicely yet.
968 line_t *linep;
969 text_t *tp;
970 rend_t *rp;
971
972 if (screen.cur.col > 0)
973 {
971 linep = line; 974 linep = line;
972 tp = line->t + screen.cur.col - 1; 975 tp = line->t + screen.cur.col - 1;
973 rp = line->r + screen.cur.col - 1; 976 rp = line->r + screen.cur.col - 1;
977 }
978 else if (screen.cur.row > 0
979 && ROW(screen.cur.row - 1).is_longer ())
980 {
981 linep = &ROW(screen.cur.row - 1);
982 tp = line->t + ncol - 1;
983 rp = line->r + ncol - 1;
984 }
985 else
986 continue;
987
988 linep->touch ();
989
990 while (*tp == NOCHAR && tp > linep->t)
991 tp--, rp--;
992
993 // first try to find a precomposed character
994 unicode_t n = rxvt_compose (*tp, c);
995 if (n == NOCHAR)
996 n = rxvt_composite.compose (*tp, c);
997
998 *tp = n;
999 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
974 } 1000 }
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 } 1001 }
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 1002#endif
998 }
999 } 1003 }
1000 1004
1001 max_it (line->l, screen.cur.col); 1005 max_it (line->l, screen.cur.col);
1002 1006
1003#ifdef DEBUG_STRICT 1007#ifdef DEBUG_STRICT
… …
1227/* 1231/*
1228 * Erase part or whole of a line 1232 * Erase part or whole of a line
1229 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1233 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1230 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1234 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1231 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1235 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1236 * extension: clear to right unless wrapped: ESC [ 3 K
1232 */ 1237 */
1233void 1238void
1234rxvt_term::scr_erase_line (int mode) NOTHROW 1239rxvt_term::scr_erase_line (int mode) NOTHROW
1235{ 1240{
1236 unsigned int col, num; 1241 unsigned int col, num;
… …
1245 line.touch (); 1250 line.touch ();
1246 line.is_longer (0); 1251 line.is_longer (0);
1247 1252
1248 switch (mode) 1253 switch (mode)
1249 { 1254 {
1255 case 3:
1256 if (screen.flags & Screen_WrapNext)
1257 return;
1258
1259 /* fall through */
1260
1250 case 0: /* erase to end of line */ 1261 case 0: /* erase to end of line */
1251 col = screen.cur.col; 1262 col = screen.cur.col;
1252 num = ncol - col; 1263 num = ncol - col;
1253 min_it (line.l, col); 1264 min_it (line.l, col);
1265
1254 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1266 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1255 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1267 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1256 CLEAR_SELECTION (); 1268 CLEAR_SELECTION ();
1257 break; 1269 break;
1270
1258 case 1: /* erase to beginning of line */ 1271 case 1: /* erase to beginning of line */
1259 col = 0; 1272 col = 0;
1260 num = screen.cur.col + 1; 1273 num = screen.cur.col + 1;
1274
1261 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1275 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1262 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1276 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1263 CLEAR_SELECTION (); 1277 CLEAR_SELECTION ();
1264 break; 1278 break;
1279
1265 case 2: /* erase whole line */ 1280 case 2: /* erase whole line */
1266 col = 0; 1281 col = 0;
1267 num = ncol; 1282 num = ncol;
1268 line.l = 0; 1283 line.l = 0;
1269 if (selection.beg.row <= screen.cur.row 1284 if (selection.beg.row <= screen.cur.row
… …
1327 if (row >= nrow) /* Out Of Bounds */ 1342 if (row >= nrow) /* Out Of Bounds */
1328 return; 1343 return;
1329 1344
1330 min_it (num, nrow - row); 1345 min_it (num, nrow - row);
1331 1346
1347 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1332 if (rstyle & (RS_RVid | RS_Uline)) 1348 if (rstyle & (RS_RVid | RS_Uline))
1333 ren = (rend_t) ~RS_None; 1349 ren = (rend_t) ~RS_None;
1334 else if (GET_BASEBG (rstyle) == Color_bg) 1350 else if (GET_BASEBG (rstyle) == Color_bg)
1335 { 1351 {
1336 ren = DEFAULT_RSTYLE; 1352 ren = DEFAULT_RSTYLE;
1337 CLEAR_ROWS (row, num); 1353
1354 if (mapped)
1355 XClearArea (dpy, vt, 0,
1356 Row2Pixel (row - view_start), (unsigned int)width,
1357 (unsigned int)Height2Pixel (num), False);
1338 } 1358 }
1339 else 1359 else
1340 { 1360 {
1341 ren = rstyle & (RS_fgMask | RS_bgMask); 1361 ren = rstyle & (RS_fgMask | RS_bgMask);
1362
1342 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1363 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1343 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1364 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1344 ERASE_ROWS (row, num); 1365 XFillRectangle (dpy, vt, gc,
1366 0, Row2Pixel (row - view_start),
1367 (unsigned int)width,
1368 (unsigned int)Height2Pixel (num));
1345 gcvalue.foreground = pix_colors[Color_fg]; 1369 gcvalue.foreground = pix_colors[Color_fg];
1346 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1370 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1347 } 1371 }
1348 1372
1349 for (; num--; row++) 1373 for (; num--; row++)
… …
1431 * Insert/Delete <count> characters from the current position 1455 * Insert/Delete <count> characters from the current position
1432 */ 1456 */
1433void 1457void
1434rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1458rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1435{ 1459{
1436 int col, row;
1437 rend_t tr;
1438
1439 want_refresh = 1; 1460 want_refresh = 1;
1440 ZERO_SCROLLBACK (); 1461 ZERO_SCROLLBACK ();
1441 1462
1442 if (count <= 0) 1463 if (count <= 0)
1443 return; 1464 return;
… …
1445 scr_do_wrap (); 1466 scr_do_wrap ();
1446 1467
1447 selection_check (1); 1468 selection_check (1);
1448 min_it (count, ncol - screen.cur.col); 1469 min_it (count, ncol - screen.cur.col);
1449 1470
1450 row = screen.cur.row; 1471 int row = screen.cur.row;
1451 1472
1452 line_t *line = &ROW(row); 1473 line_t *line = &ROW(row);
1453 1474
1454 line->touch (); 1475 line->touch ();
1455 line->is_longer (0); 1476 line->is_longer (0);
1456 1477
1478 // nuke wide spanning the start
1479 if (line->t[screen.cur.col] == NOCHAR)
1480 scr_kill_char (*line, screen.cur.col);
1481
1457 switch (insdel) 1482 switch (insdel)
1458 { 1483 {
1459 case INSERT: 1484 case INSERT:
1460 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1485 line->l = min (line->l + count, ncol);
1486
1487 if (line->t[screen.cur.col] == NOCHAR)
1488 scr_kill_char (*line, screen.cur.col);
1489
1490 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1461 { 1491 {
1462 line->t[col] = line->t[col - count]; 1492 line->t[col] = line->t[col - count];
1463 line->r[col] = line->r[col - count]; 1493 line->r[col] = line->r[col - count];
1464 } 1494 }
1465
1466 line->l = min (line->l + count, ncol);
1467 1495
1468 if (selection.op && current_screen == selection.screen 1496 if (selection.op && current_screen == selection.screen
1469 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1497 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1470 { 1498 {
1471 if (selection.end.row != screen.cur.row 1499 if (selection.end.row != screen.cur.row
… …
1486 case ERASE: 1514 case ERASE:
1487 screen.cur.col += count; /* don't worry if > ncol */ 1515 screen.cur.col += count; /* don't worry if > ncol */
1488 selection_check (1); 1516 selection_check (1);
1489 screen.cur.col -= count; 1517 screen.cur.col -= count;
1490 1518
1491 line->l = max (line->l - count, 0); 1519 // nuke wide char after the end
1520 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1521 scr_kill_char (*line, screen.cur.col + count);
1522
1492 scr_blank_line (*line, screen.cur.col, count, rstyle); 1523 scr_blank_line (*line, screen.cur.col, count, rstyle);
1493 break; 1524 break;
1494 1525
1495 case DELETE: 1526 case DELETE:
1496 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1527 line->l = max (line->l - count, 0);
1497 1528
1529 // nuke wide char spanning the end
1530 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1531 scr_kill_char (*line, screen.cur.col + count);
1532
1498 for (col = screen.cur.col; (col + count) < ncol; col++) 1533 for (int col = screen.cur.col; (col + count) < ncol; col++)
1499 { 1534 {
1500 line->t[col] = line->t[col + count]; 1535 line->t[col] = line->t[col + count];
1501 line->r[col] = line->r[col + count]; 1536 line->r[col] = line->r[col + count];
1502 } 1537 }
1503 1538
1504 line->l = max (line->l - count, 0);
1505 scr_blank_line (*line, ncol - count, count, tr); 1539 scr_blank_line (*line, ncol - count, count,
1540 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1506 1541
1507 if (selection.op && current_screen == selection.screen 1542 if (selection.op && current_screen == selection.screen
1508 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1543 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1509 { 1544 {
1510 if (selection.end.row != screen.cur.row 1545 if (selection.end.row != screen.cur.row
… …
1888 XMapWindow (dpy, parent[0]); 1923 XMapWindow (dpy, parent[0]);
1889# endif 1924# endif
1890 1925
1891# if ENABLE_FRILLS 1926# if ENABLE_FRILLS
1892 if (option (Opt_urgentOnBell)) 1927 if (option (Opt_urgentOnBell))
1893 { 1928 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 1929# endif
1901 1930
1902 if (option (Opt_visualBell)) 1931 if (option (Opt_visualBell))
1903 { 1932 {
1904 rvideo_bell = true; 1933 rvideo_bell = true;
… …
1917void 1946void
1918rxvt_term::scr_printscreen (int fullhist) NOTHROW 1947rxvt_term::scr_printscreen (int fullhist) NOTHROW
1919{ 1948{
1920#ifdef PRINTPIPE 1949#ifdef PRINTPIPE
1921 int nrows, row_start; 1950 int nrows, row_start;
1922 FILE *fd; 1951 FILE *fd = popen_printer ();
1923 1952
1924 if ((fd = popen_printer ()) == NULL) 1953 if (!fd)
1925 return; 1954 return;
1926 1955
1927 if (fullhist) 1956 if (fullhist)
1928 { 1957 {
1929 nrows = nrow - top_row; 1958 nrows = nrow - top_row;
… …
1994 return; 2023 return;
1995 2024
1996 /* 2025 /*
1997 * A: set up vars 2026 * A: set up vars
1998 */ 2027 */
2028 refresh_count = 0;
2029
1999 have_bg = 0; 2030 have_bg = 0;
2000 refresh_count = 0;
2001
2002#ifdef HAVE_BG_PIXMAP 2031#ifdef HAVE_BG_PIXMAP
2003 have_bg |= bgPixmap.pixmap != None; 2032 have_bg = bgPixmap.pixmap != None;
2004#endif 2033#endif
2005 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2034 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2006 2035
2007 /* 2036 /*
2008 * B: reverse any characters which are selected 2037 * B: reverse any characters which are selected
… …
2199 continue; 2228 continue;
2200 2229
2201 // redraw one or more characters 2230 // redraw one or more characters
2202 2231
2203 // seek to the beginning of wide characters 2232 // seek to the beginning of wide characters
2204 while (stp[col] == NOCHAR && col > 0) 2233 while (expect_false (stp[col] == NOCHAR && col > 0))
2205 --col; 2234 --col;
2206 2235
2207 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2236 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2208 text_t *text = stp + col; 2237 text_t *text = stp + col;
2209 int count = 1; 2238 int count = 1;
… …
2246 2275
2247 col--; /* went one too far. move back */ 2276 col--; /* went one too far. move back */
2248 count -= i; /* dump any matching trailing chars */ 2277 count -= i; /* dump any matching trailing chars */
2249 2278
2250 // sometimes we optimize away the trailing NOCHAR's, add them back 2279 // sometimes we optimize away the trailing NOCHAR's, add them back
2251 while (i && text[count] == NOCHAR) 2280 while (expect_false (i && text[count] == NOCHAR))
2252 count++, i--; 2281 count++, i--;
2253 2282
2254 /* 2283 /*
2255 * Determine the attributes for the string 2284 * Determine the attributes for the string
2256 */ 2285 */
2257 int fore = fgcolor_of (rend); // desired foreground 2286 int fore = fgcolor_of (rend); // desired foreground
2258 int back = bgcolor_of (rend); // desired background 2287 int back = bgcolor_of (rend); // desired background
2259 2288
2260 // only do special processing if any attributes are set, which is unlikely 2289 // 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)) 2290 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2262 { 2291 {
2263 bool invert = rend & RS_RVid; 2292 bool invert = rend & RS_RVid;
2264 2293
2265#ifndef NO_BOLD_UNDERLINE_REVERSE 2294#ifndef NO_BOLD_UNDERLINE_REVERSE
2266 if (rend & RS_Bold && fore == Color_fg) 2295 if (rend & RS_Bold && fore == Color_fg)
… …
2349 /* 2378 /*
2350 * Actually do the drawing of the string here 2379 * Actually do the drawing of the string here
2351 */ 2380 */
2352 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2381 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2353 2382
2354 if (have_bg && back == Color_bg) 2383 if (expect_true (have_bg && back == Color_bg))
2355 { 2384 {
2356 // this is very ugly, maybe push it into ->draw? 2385 // this is very ugly, maybe push it into ->draw?
2357 2386
2358 for (i = 0; i < count; i++) /* don't draw empty strings */ 2387 for (i = 0; i < count; i++) /* don't draw empty strings */
2359 if (text[i] != ' ') 2388 if (text[i] != ' ')
… …
2366 did_clear: ; 2395 did_clear: ;
2367 } 2396 }
2368 else 2397 else
2369 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2398 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2370 2399
2371 if (rend & RS_Uline && font->descent > 1 && fore != back) 2400 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2372 { 2401 {
2373#if ENABLE_FRILLS 2402#if ENABLE_FRILLS
2374 if (ISSET_PIXCOLOR (Color_underline)) 2403 if (ISSET_PIXCOLOR (Color_underline))
2375 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2404 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2376 else 2405 else
2377#endif 2406#endif
2378 XSetForeground (dpy, gc, pix_colors[fore]); 2407 XSetForeground (dpy, gc, pix_colors[fore]);
2379 2408
2380 XDrawLine (dpy, drawBuffer, gc, 2409 XDrawLine (dpy, vt, gc,
2381 xpixel, ypixel + font->ascent + 1, 2410 xpixel, ypixel + font->ascent + 1,
2382 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2411 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2383 } 2412 }
2384 } /* for (col....) */ 2413 } /* for (col....) */
2385 } /* for (row....) */ 2414 } /* for (row....) */
… …
2423 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2452 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2424 else 2453 else
2425#endif 2454#endif
2426 XSetForeground (dpy, gc, pix_colors[ccol1]); 2455 XSetForeground (dpy, gc, pix_colors[ccol1]);
2427 2456
2428 XDrawRectangle (dpy, drawBuffer, gc, 2457 XDrawRectangle (dpy, vt, gc,
2429 Col2Pixel (col), 2458 Col2Pixel (col),
2430 Row2Pixel (oldcursor.row), 2459 Row2Pixel (oldcursor.row),
2431 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2460 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2432 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2461 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2433 } 2462 }
… …
2476 2505
2477 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2506 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2478 XClearWindow (dpy, parent[0]); 2507 XClearWindow (dpy, parent[0]);
2479 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2508 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2480 2509
2481# if HAVE_SCROLLBARS
2482 if (scrollBar.win) 2510 if (scrollBar.win)
2483 { 2511 {
2484 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2512 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2485 scrollBar.setIdle (); 2513 scrollBar.state = STATE_IDLE;
2486 scrollbar_show (0); 2514 scrollBar.show (0);
2487 } 2515 }
2516
2488# endif 2517#endif
2489 2518
2519 /* bgPixmap.apply () does not do the following : */
2490 scr_clear (); 2520 scr_clear ();
2491 scr_touch (true); 2521 scr_touch (true);
2492 want_refresh = 1; 2522 want_refresh = 1;
2493
2494#endif
2495} 2523}
2496 2524
2497/* ------------------------------------------------------------------------- */ 2525/* ------------------------------------------------------------------------- */
2498void 2526void
2499rxvt_term::scr_clear (bool really) NOTHROW 2527rxvt_term::scr_clear (bool really) NOTHROW
… …
2588{ 2616{
2589 int row, wrote; 2617 int row, wrote;
2590 unsigned int width, towrite; 2618 unsigned int width, towrite;
2591 char r1[] = "\n"; 2619 char r1[] = "\n";
2592 2620
2593 for (row = saveLines - nsaved; 2621 for (row = saveLines + top_row;
2594 row < saveLines + nrow - 1; row++) 2622 row < saveLines + nrow - 1; row++)
2595 { 2623 {
2596 width = row_buf[row].l >= 0 ? row_buf[row].l 2624 width = row_buf[row].l >= 0 ? row_buf[row].l
2597 : ncol; 2625 : ncol;
2598 for (towrite = width; towrite; towrite -= wrote) 2626 for (towrite = width; towrite; towrite -= wrote)
… …
2649 /* convert normal newline chars into common keyboard Return key sequence */ 2677 /* convert normal newline chars into common keyboard Return key sequence */
2650 for (unsigned int i = 0; i < len; i++) 2678 for (unsigned int i = 0; i < len; i++)
2651 if (data[i] == C0_LF) 2679 if (data[i] == C0_LF)
2652 data[i] = C0_CR; 2680 data[i] = C0_CR;
2653 2681
2682 if (priv_modes & PrivMode_BracketPaste)
2683 tt_printf ("\e[200~");
2684
2654 tt_write (data, len); 2685 tt_write (data, len);
2686
2687 if (priv_modes & PrivMode_BracketPaste)
2688 tt_printf ("\e[201~");
2655} 2689}
2656 2690
2657/* ------------------------------------------------------------------------- */ 2691/* ------------------------------------------------------------------------- */
2658/* 2692/*
2659 * Respond to a notification that a primary selection has been sent 2693 * Respond to a notification that a primary selection has been sent

Diff Legend

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