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

Diff Legend

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