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.283 by root, Sun Nov 11 04:08:00 2007 UTC vs.
Revision 1.315 by root, Tue Nov 4 14:38:29 2008 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
83 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 83 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
84#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 84#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
85 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 85 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
86 86
87/* 87/*
88 * CLEAR_ROWS : clear <num> rows starting from row <row>
89 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 88 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
90 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
91 */ 89 */
92#define drawBuffer vt
93
94#define CLEAR_ROWS(row, num) \
95 if (mapped) \
96 XClearArea (dpy, drawBuffer, 0, \
97 Row2Pixel (row), (unsigned int)width, \
98 (unsigned int)Height2Pixel (num), False)
99
100#define CLEAR_CHARS(x, y, num) \ 90#define CLEAR_CHARS(x, y, num) \
101 if (mapped) \ 91 if (mapped) \
102 XClearArea (dpy, drawBuffer, x, y, \ 92 XClearArea (dpy, vt, x, y, \
103 (unsigned int)Width2Pixel (num), \ 93 (unsigned int)Width2Pixel (num), \
104 (unsigned int)Height2Pixel (1), False) 94 (unsigned int)Height2Pixel (1), False)
105
106#define ERASE_ROWS(row, num) \
107 XFillRectangle (dpy, drawBuffer, gc, \
108 0, Row2Pixel (row), \
109 (unsigned int)width, \
110 (unsigned int)Height2Pixel (num))
111 95
112/* ------------------------------------------------------------------------- * 96/* ------------------------------------------------------------------------- *
113 * SCREEN `COMMON' ROUTINES * 97 * SCREEN `COMMON' ROUTINES *
114 * ------------------------------------------------------------------------- */ 98 * ------------------------------------------------------------------------- */
115 99
… …
146{ 130{
147 scr_blank_line (l, 0, ncol, efs); 131 scr_blank_line (l, 0, ncol, efs);
148 132
149 l.l = 0; 133 l.l = 0;
150 l.f = 0; 134 l.f = 0;
135}
136
137// nuke a single wide character at the given column
138void
139rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
140{
141 // find begin
142 while (col > 0 && l.t[col] == NOCHAR)
143 col--;
144
145 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147
148 // found begin, nuke
149 do {
150 l.t[col] = ' ';
151 l.r[col] = rend;
152 col++;
153 } while (col < ncol && l.t[col] == NOCHAR);
151} 154}
152 155
153/* ------------------------------------------------------------------------- * 156/* ------------------------------------------------------------------------- *
154 * SCREEN INITIALISATION * 157 * SCREEN INITIALISATION *
155 * ------------------------------------------------------------------------- */ 158 * ------------------------------------------------------------------------- */
… …
596/* 599/*
597 * Change the rendition style for following text 600 * Change the rendition style for following text
598 */ 601 */
599void 602void
600rxvt_term::scr_rendition (int set, int style) NOTHROW 603rxvt_term::scr_rendition (int set, int style) NOTHROW
601 { 604{
602 if (set) 605 if (set)
603 rstyle |= style; 606 rstyle |= style;
604 else if (style == ~RS_None) 607 else if (style == ~RS_None)
605 rstyle = DEFAULT_RSTYLE; 608 rstyle = DEFAULT_RSTYLE;
606 else 609 else
607 rstyle &= ~style; 610 rstyle &= ~style;
608 } 611}
609 612
610/* ------------------------------------------------------------------------- */ 613/* ------------------------------------------------------------------------- */
611/* 614/*
612 * Scroll text between <row1> and <row2> inclusive, by <count> lines 615 * Scroll text between <row1> and <row2> inclusive, by <count> lines
613 * count positive ==> scroll up 616 * count positive ==> scroll up
… …
787 790
788 while (str < strend) 791 while (str < strend)
789 { 792 {
790 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 793 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
791 794
792 if (c < 0x20) 795 if (expect_false (c < 0x20))
793 if (c == C0_LF) 796 if (c == C0_LF)
794 { 797 {
795 max_it (line->l, screen.cur.col); 798 max_it (line->l, screen.cur.col);
796 799
797 screen.flags &= ~Screen_WrapNext; 800 screen.flags &= ~Screen_WrapNext;
… …
816 { 819 {
817 scr_tab (1, true); 820 scr_tab (1, true);
818 continue; 821 continue;
819 } 822 }
820 823
824 if (expect_false (
821 if (checksel /* see if we're writing within selection */ 825 checksel /* see if we're writing within selection */
822 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 826 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
823 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 827 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
828 ))
824 { 829 {
825 checksel = 0; 830 checksel = 0;
826 /* 831 /*
827 * If we wrote anywhere in the selected area, kill the selection 832 * If we wrote anywhere in the selected area, kill the selection
828 * XXX: should we kill the mark too? Possibly, but maybe that 833 * XXX: should we kill the mark too? Possibly, but maybe that
829 * should be a similar check. 834 * should be a similar check.
830 */ 835 */
831 CLEAR_SELECTION (); 836 CLEAR_SELECTION ();
832 } 837 }
833 838
834 if (screen.flags & Screen_WrapNext) 839 if (expect_false (screen.flags & Screen_WrapNext))
835 { 840 {
836 scr_do_wrap (); 841 scr_do_wrap ();
837 842
838 line->l = ncol; 843 line->l = ncol;
839 line->is_longer (1); 844 line->is_longer (1);
… …
841 row = screen.cur.row; 846 row = screen.cur.row;
842 line = &ROW(row); /* _must_ refresh */ 847 line = &ROW(row); /* _must_ refresh */
843 } 848 }
844 849
845 // some utf-8 decoders "decode" surrogate characters: let's fix this. 850 // some utf-8 decoders "decode" surrogate characters: let's fix this.
846 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 851 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
847 c = 0xfffd; 852 c = 0xfffd;
848 853
849 // rely on wcwidth to tell us the character width, do wcwidth before 854 // rely on wcwidth to tell us the character width, do wcwidth before
850 // further replacements, as wcwidth might return -1 for the line 855 // further replacements, as wcwidth might return -1 for the line
851 // drawing characters below as they might be invalid in the current 856 // drawing characters below as they might be invalid in the current
852 // locale. 857 // locale.
853 int width = WCWIDTH (c); 858 int width = WCWIDTH (c);
854 859
855 if (charsets [screen.charset] == '0') // DEC SPECIAL 860 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
856 { 861 {
857 // vt100 special graphics and line drawing 862 // vt100 special graphics and line drawing
858 // 5f-7e standard vt100 863 // 5f-7e standard vt100
859 // 40-5e rxvt extension for extra curses acs chars 864 // 40-5e rxvt extension for extra curses acs chars
860 static uint16_t vt100_0[62] = { // 41 .. 7e 865 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
873 c = vt100_0[c - 0x41]; 878 c = vt100_0[c - 0x41];
874 width = 1; // vt100 line drawing characters are always single-width 879 width = 1; // vt100 line drawing characters are always single-width
875 } 880 }
876 } 881 }
877 882
878 if (screen.flags & Screen_Insert) 883 if (expect_false (screen.flags & Screen_Insert))
879 scr_insdel_chars (width, INSERT); 884 scr_insdel_chars (width, INSERT);
880 885
881 if (width != 0) 886 if (width != 0)
882 { 887 {
883#if !UNICODE_3 888#if !UNICODE_3
… …
889 c = 0xfffd; 894 c = 0xfffd;
890# endif 895# endif
891#endif 896#endif
892 897
893 // nuke the character at this position, if required 898 // nuke the character at this position, if required
899 if (expect_false (
894 if (line->t[screen.cur.col] == NOCHAR 900 line->t[screen.cur.col] == NOCHAR
895 || (screen.cur.col < ncol - 1 901 || (screen.cur.col < ncol - 1
896 && line->t[screen.cur.col + 1] == NOCHAR)) 902 && line->t[screen.cur.col + 1] == NOCHAR)
897 { 903 ))
898 int col = screen.cur.col; 904 scr_kill_char (*line, screen.cur.col);
899
900 // find begin
901 while (col > 0 && line->t[col] == NOCHAR)
902 col--;
903
904 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
905
906 // found begin, nuke
907 do {
908 line->t[col] = ' ';
909 line->r[col] = rend;
910 col++;
911 } while (col < ncol && line->t[col] == NOCHAR);
912 }
913 905
914 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 906 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
915 907
916 // if the character doesn't fit into the remaining columns... 908 // if the character doesn't fit into the remaining columns...
917 if (screen.cur.col > ncol - width && ncol >= width) 909 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
918 { 910 {
919 // ...output spaces 911 // ...output spaces
920 c = ' '; 912 c = ' ';
921 // and try the same character next loop iteration 913 // and try the same character next loop iteration
922 --str; 914 --str;
… …
927 do 919 do
928 { 920 {
929 line->t[screen.cur.col] = c; 921 line->t[screen.cur.col] = c;
930 line->r[screen.cur.col] = rend; 922 line->r[screen.cur.col] = rend;
931 923
932 if (screen.cur.col < ncol - 1) 924 if (expect_true (screen.cur.col < ncol - 1))
933 screen.cur.col++; 925 screen.cur.col++;
934 else 926 else
935 { 927 {
936 line->l = ncol; 928 line->l = ncol;
937 if (screen.flags & Screen_Autowrap) 929 if (screen.flags & Screen_Autowrap)
… …
939 break; 931 break;
940 } 932 }
941 933
942 c = NOCHAR; 934 c = NOCHAR;
943 } 935 }
944 while (--width > 0); 936 while (expect_false (--width > 0));
945 937
946 // pad with spaces when overwriting wide character with smaller one 938 // pad with spaces when overwriting wide character with smaller one
947 if (!width) 939 if (expect_false (!width))
948 { 940 {
949 line->touch (); 941 line->touch ();
950 942
951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 943 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
952 { 944 {
953 line->t[c] = ' '; 945 line->t[c] = ' ';
954 line->r[c] = rend; 946 line->r[c] = rend;
955 } 947 }
956 } 948 }
957 } 949 }
950#if ENABLE_COMBINING
958 else // width == 0 951 else // width == 0
959 { 952 {
960#if ENABLE_COMBINING 953 if (c != 0xfeff) // ignore BOM
961 // handle combining characters
962 // we just tag the accent on the previous on-screen character.
963 // this is arguably not correct, but also arguably not wrong.
964 // we don't handle double-width characters nicely yet.
965 line_t *linep;
966 text_t *tp;
967 rend_t *rp;
968
969 if (screen.cur.col > 0)
970 { 954 {
955 // handle combining characters
956 // we just tag the accent on the previous on-screen character.
957 // this is arguably not correct, but also arguably not wrong.
958 // we don't handle double-width characters nicely yet.
959 line_t *linep;
960 text_t *tp;
961 rend_t *rp;
962
963 if (screen.cur.col > 0)
964 {
971 linep = line; 965 linep = line;
972 tp = line->t + screen.cur.col - 1; 966 tp = line->t + screen.cur.col - 1;
973 rp = line->r + screen.cur.col - 1; 967 rp = line->r + screen.cur.col - 1;
968 }
969 else if (screen.cur.row > 0
970 && ROW(screen.cur.row - 1).is_longer ())
971 {
972 linep = &ROW(screen.cur.row - 1);
973 tp = line->t + ncol - 1;
974 rp = line->r + ncol - 1;
975 }
976 else
977 continue;
978
979 linep->touch ();
980
981 while (*tp == NOCHAR && tp > linep->t)
982 tp--, rp--;
983
984 // first try to find a precomposed character
985 unicode_t n = rxvt_compose (*tp, c);
986 if (n == NOCHAR)
987 n = rxvt_composite.compose (*tp, c);
988
989 *tp = n;
990 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
974 } 991 }
975 else if (screen.cur.row > 0
976 && ROW(screen.cur.row - 1).is_longer ())
977 {
978 linep = &ROW(screen.cur.row - 1);
979 tp = line->t + ncol - 1;
980 rp = line->r + ncol - 1;
981 } 992 }
982 else
983 continue;
984
985 linep->touch ();
986
987 while (*tp == NOCHAR && tp > linep->t)
988 tp--, rp--;
989
990 // first try to find a precomposed character
991 unicode_t n = rxvt_compose (*tp, c);
992 if (n == NOCHAR)
993 n = rxvt_composite.compose (*tp, c);
994
995 *tp = n;
996 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
997#endif 993#endif
998 }
999 } 994 }
1000 995
1001 max_it (line->l, screen.cur.col); 996 max_it (line->l, screen.cur.col);
1002 997
1003#ifdef DEBUG_STRICT 998#ifdef DEBUG_STRICT
… …
1011 * XTERM_SEQ: CTRL-H 1006 * XTERM_SEQ: CTRL-H
1012 */ 1007 */
1013void 1008void
1014rxvt_term::scr_backspace () NOTHROW 1009rxvt_term::scr_backspace () NOTHROW
1015{ 1010{
1016 want_refresh = 1;
1017
1018 if (screen.cur.col == 0) 1011 if (screen.cur.col == 0)
1019 { 1012 {
1020 if (screen.cur.row > 0) 1013 if (screen.cur.row > 0)
1021 { 1014 {
1022#ifdef TERMCAP_HAS_BW 1015#ifdef TERMCAP_HAS_BW
1023 screen.cur.col = ncol - 1; 1016 screen.cur.col = ncol - 1;
1024 screen.cur.row--; 1017 --screen.cur.row;
1025 return; 1018
1019 want_refresh = 1;
1026#endif 1020#endif
1027 } 1021 }
1028 } 1022 }
1029 else if (!(screen.flags & Screen_WrapNext)) 1023 else
1030 scr_gotorc (0, -1, RELATIVE); 1024 scr_gotorc (0, -1, RELATIVE);
1031
1032 screen.flags &= ~Screen_WrapNext;
1033} 1025}
1034 1026
1035/* ------------------------------------------------------------------------- */ 1027/* ------------------------------------------------------------------------- */
1036/* 1028/*
1037 * Process Horizontal Tab 1029 * Process Horizontal Tab
… …
1186 } 1178 }
1187 } 1179 }
1188 else 1180 else
1189 { 1181 {
1190 if (screen.flags & Screen_Relative) 1182 if (screen.flags & Screen_Relative)
1183 {
1191 { /* relative origin mode */ 1184 /* relative origin mode */
1192 screen.cur.row = row + screen.tscroll; 1185 screen.cur.row = row + screen.tscroll;
1193 min_it (screen.cur.row, screen.bscroll); 1186 min_it (screen.cur.row, screen.bscroll);
1194 } 1187 }
1195 else 1188 else
1196 screen.cur.row = row; 1189 screen.cur.row = row;
… …
1229/* 1222/*
1230 * Erase part or whole of a line 1223 * Erase part or whole of a line
1231 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1224 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1232 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1225 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1233 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1226 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1227 * extension: clear to right unless wrapped: ESC [ 3 K
1234 */ 1228 */
1235void 1229void
1236rxvt_term::scr_erase_line (int mode) NOTHROW 1230rxvt_term::scr_erase_line (int mode) NOTHROW
1237{ 1231{
1238 unsigned int col, num; 1232 unsigned int col, num;
… …
1247 line.touch (); 1241 line.touch ();
1248 line.is_longer (0); 1242 line.is_longer (0);
1249 1243
1250 switch (mode) 1244 switch (mode)
1251 { 1245 {
1246 case 3:
1247 if (screen.flags & Screen_WrapNext)
1248 return;
1249
1250 /* fall through */
1251
1252 case 0: /* erase to end of line */ 1252 case 0: /* erase to end of line */
1253 col = screen.cur.col; 1253 col = screen.cur.col;
1254 num = ncol - col; 1254 num = ncol - col;
1255 min_it (line.l, col); 1255 min_it (line.l, col);
1256
1256 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1257 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1257 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1258 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1258 CLEAR_SELECTION (); 1259 CLEAR_SELECTION ();
1259 break; 1260 break;
1261
1260 case 1: /* erase to beginning of line */ 1262 case 1: /* erase to beginning of line */
1261 col = 0; 1263 col = 0;
1262 num = screen.cur.col + 1; 1264 num = screen.cur.col + 1;
1265
1263 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1266 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1264 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1267 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1265 CLEAR_SELECTION (); 1268 CLEAR_SELECTION ();
1266 break; 1269 break;
1270
1267 case 2: /* erase whole line */ 1271 case 2: /* erase whole line */
1268 col = 0; 1272 col = 0;
1269 num = ncol; 1273 num = ncol;
1270 line.l = 0; 1274 line.l = 0;
1271 if (selection.beg.row <= screen.cur.row 1275 if (selection.beg.row <= screen.cur.row
… …
1329 if (row >= nrow) /* Out Of Bounds */ 1333 if (row >= nrow) /* Out Of Bounds */
1330 return; 1334 return;
1331 1335
1332 min_it (num, nrow - row); 1336 min_it (num, nrow - row);
1333 1337
1338 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1334 if (rstyle & (RS_RVid | RS_Uline)) 1339 if (rstyle & (RS_RVid | RS_Uline))
1335 ren = (rend_t) ~RS_None; 1340 ren = (rend_t) ~RS_None;
1336 else if (GET_BASEBG (rstyle) == Color_bg) 1341 else if (GET_BASEBG (rstyle) == Color_bg)
1337 { 1342 {
1338 ren = DEFAULT_RSTYLE; 1343 ren = DEFAULT_RSTYLE;
1339 CLEAR_ROWS (row, num); 1344
1345 if (mapped)
1346 XClearArea (dpy, vt, 0,
1347 Row2Pixel (row), (unsigned int)width,
1348 (unsigned int)Height2Pixel (num), False);
1340 } 1349 }
1341 else 1350 else
1342 { 1351 {
1343 ren = rstyle & (RS_fgMask | RS_bgMask); 1352 ren = rstyle & (RS_fgMask | RS_bgMask);
1353
1344 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1354 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1345 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1355 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1346 ERASE_ROWS (row, num); 1356 XFillRectangle (dpy, vt, gc,
1357 0, Row2Pixel (row),
1358 (unsigned int)width,
1359 (unsigned int)Height2Pixel (num));
1347 gcvalue.foreground = pix_colors[Color_fg]; 1360 gcvalue.foreground = pix_colors[Color_fg];
1348 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1361 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1349 } 1362 }
1350 1363
1351 for (; num--; row++) 1364 for (; num--; row++)
… …
1433 * Insert/Delete <count> characters from the current position 1446 * Insert/Delete <count> characters from the current position
1434 */ 1447 */
1435void 1448void
1436rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1449rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1437{ 1450{
1438 int col, row;
1439 rend_t tr;
1440
1441 want_refresh = 1; 1451 want_refresh = 1;
1442 ZERO_SCROLLBACK (); 1452 ZERO_SCROLLBACK ();
1443 1453
1444 if (count <= 0) 1454 if (count <= 0)
1445 return; 1455 return;
… …
1447 scr_do_wrap (); 1457 scr_do_wrap ();
1448 1458
1449 selection_check (1); 1459 selection_check (1);
1450 min_it (count, ncol - screen.cur.col); 1460 min_it (count, ncol - screen.cur.col);
1451 1461
1452 row = screen.cur.row; 1462 int row = screen.cur.row;
1453 1463
1454 line_t *line = &ROW(row); 1464 line_t *line = &ROW(row);
1455 1465
1456 line->touch (); 1466 line->touch ();
1457 line->is_longer (0); 1467 line->is_longer (0);
1458 1468
1469 // nuke wide char at beginning
1470 if (line->t[screen.cur.col] == NOCHAR)
1471 scr_kill_char (*line, screen.cur.col);
1472
1459 switch (insdel) 1473 switch (insdel)
1460 { 1474 {
1461 case INSERT: 1475 case INSERT:
1462 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1476 line->l = min (line->l + count, ncol);
1477
1478 if (line->t[screen.cur.col] == NOCHAR)
1479 scr_kill_char (*line, screen.cur.col);
1480
1481 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1463 { 1482 {
1464 line->t[col] = line->t[col - count]; 1483 line->t[col] = line->t[col - count];
1465 line->r[col] = line->r[col - count]; 1484 line->r[col] = line->r[col - count];
1466 } 1485 }
1467
1468 line->l = min (line->l + count, ncol);
1469 1486
1470 if (selection.op && current_screen == selection.screen 1487 if (selection.op && current_screen == selection.screen
1471 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1488 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1472 { 1489 {
1473 if (selection.end.row != screen.cur.row 1490 if (selection.end.row != screen.cur.row
1474 || (selection.end.col + count >= ncol)) 1491 || (selection.end.col + count >= ncol))
1475 CLEAR_SELECTION (); 1492 CLEAR_SELECTION ();
1476 else 1493 else
1494 {
1477 { /* shift selection */ 1495 /* shift selection */
1478 selection.beg.col += count; 1496 selection.beg.col += count;
1479 selection.mark.col += count; /* XXX: yes? */ 1497 selection.mark.col += count; /* XXX: yes? */
1480 selection.end.col += count; 1498 selection.end.col += count;
1481 } 1499 }
1482 } 1500 }
… …
1487 case ERASE: 1505 case ERASE:
1488 screen.cur.col += count; /* don't worry if > ncol */ 1506 screen.cur.col += count; /* don't worry if > ncol */
1489 selection_check (1); 1507 selection_check (1);
1490 screen.cur.col -= count; 1508 screen.cur.col -= count;
1491 1509
1492 line->l = max (line->l - count, 0); 1510 // nuke wide char after the end
1511 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1512 scr_kill_char (*line, screen.cur.col + count);
1513
1493 scr_blank_line (*line, screen.cur.col, count, rstyle); 1514 scr_blank_line (*line, screen.cur.col, count, rstyle);
1494 break; 1515 break;
1495 1516
1496 case DELETE: 1517 case DELETE:
1518 {
1519 line->l = max (line->l - count, 0);
1520
1497 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1521 rend_t tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1498 1522
1499 for (col = screen.cur.col; (col + count) < ncol; col++) 1523 for (int col = screen.cur.col; (col + count) < ncol; col++)
1500 { 1524 {
1501 line->t[col] = line->t[col + count]; 1525 line->t[col] = line->t[col + count];
1502 line->r[col] = line->r[col + count]; 1526 line->r[col] = line->r[col + count];
1503 } 1527 }
1504 1528
1505 line->l = max (line->l - count, 0); 1529 // nuke wide char at the end
1530 if (line->t[screen.cur.col] == NOCHAR)
1531 scr_kill_char (*line, screen.cur.col);
1532
1506 scr_blank_line (*line, ncol - count, count, tr); 1533 scr_blank_line (*line, ncol - count, count, tr);
1507 1534
1508 if (selection.op && current_screen == selection.screen 1535 if (selection.op && current_screen == selection.screen
1509 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1536 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1510 { 1537 {
1511 if (selection.end.row != screen.cur.row 1538 if (selection.end.row != screen.cur.row
1512 || (screen.cur.col >= selection.beg.col - count) 1539 || (screen.cur.col >= selection.beg.col - count)
1513 || selection.end.col >= ncol) 1540 || selection.end.col >= ncol)
1514 CLEAR_SELECTION (); 1541 CLEAR_SELECTION ();
1515 else 1542 else
1516 { 1543 {
1517 /* shift selection */ 1544 /* shift selection */
1518 selection.beg.col -= count; 1545 selection.beg.col -= count;
1519 selection.mark.col -= count; /* XXX: yes? */ 1546 selection.mark.col -= count; /* XXX: yes? */
1520 selection.end.col -= count; 1547 selection.end.col -= count;
1521 } 1548 }
1549 }
1522 } 1550 }
1523 1551
1524 break; 1552 break;
1525 } 1553 }
1526} 1554}
… …
1870void 1898void
1871rxvt_term::bell_cb (ev::timer &w, int revents) 1899rxvt_term::bell_cb (ev::timer &w, int revents)
1872{ 1900{
1873 rvideo_bell = false; 1901 rvideo_bell = false;
1874 scr_rvideo_mode (rvideo_mode); 1902 scr_rvideo_mode (rvideo_mode);
1903 refresh_check ();
1875} 1904}
1876#endif 1905#endif
1877 1906
1878/* ------------------------------------------------------------------------- */ 1907/* ------------------------------------------------------------------------- */
1879void 1908void
… …
1888 XMapWindow (dpy, parent[0]); 1917 XMapWindow (dpy, parent[0]);
1889# endif 1918# endif
1890 1919
1891# if ENABLE_FRILLS 1920# if ENABLE_FRILLS
1892 if (option (Opt_urgentOnBell)) 1921 if (option (Opt_urgentOnBell))
1893 { 1922 set_urgency (1);
1894 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1895 {
1896 h->flags |= XUrgencyHint;
1897 XSetWMHints (dpy, parent[0], h);
1898 }
1899 }
1900# endif 1923# endif
1901 1924
1902 if (option (Opt_visualBell)) 1925 if (option (Opt_visualBell))
1903 { 1926 {
1904 rvideo_bell = true; 1927 rvideo_bell = true;
1905 scr_rvideo_mode (rvideo_mode); 1928 scr_rvideo_mode (rvideo_mode);
1906 display->flush (); 1929 flush ();
1907 1930
1908 bell_ev.start (VISUAL_BELL_DURATION); 1931 bell_ev.start (VISUAL_BELL_DURATION);
1909 } 1932 }
1910 else 1933 else
1911 XBell (dpy, 0); 1934 XBell (dpy, 0);
… …
1917void 1940void
1918rxvt_term::scr_printscreen (int fullhist) NOTHROW 1941rxvt_term::scr_printscreen (int fullhist) NOTHROW
1919{ 1942{
1920#ifdef PRINTPIPE 1943#ifdef PRINTPIPE
1921 int nrows, row_start; 1944 int nrows, row_start;
1922 FILE *fd; 1945 FILE *fd = popen_printer ();
1923 1946
1924 if ((fd = popen_printer ()) == NULL) 1947 if (!fd)
1925 return; 1948 return;
1926 1949
1927 if (fullhist) 1950 if (fullhist)
1928 { 1951 {
1929 nrows = nrow - top_row; 1952 nrows = nrow - top_row;
… …
1994 return; 2017 return;
1995 2018
1996 /* 2019 /*
1997 * A: set up vars 2020 * A: set up vars
1998 */ 2021 */
2022 refresh_count = 0;
2023
1999 have_bg = 0; 2024 have_bg = 0;
2000 refresh_count = 0;
2001
2002#ifdef HAVE_BG_PIXMAP 2025#ifdef HAVE_BG_PIXMAP
2003 have_bg |= bgPixmap.pixmap != None; 2026 have_bg = bgPixmap.pixmap != None;
2004#endif 2027#endif
2005 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2028 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2006 2029
2007 /* 2030 /*
2008 * B: reverse any characters which are selected 2031 * B: reverse any characters which are selected
… …
2199 continue; 2222 continue;
2200 2223
2201 // redraw one or more characters 2224 // redraw one or more characters
2202 2225
2203 // seek to the beginning of wide characters 2226 // seek to the beginning of wide characters
2204 while (stp[col] == NOCHAR && col > 0) 2227 while (expect_false (stp[col] == NOCHAR && col > 0))
2205 --col; 2228 --col;
2206 2229
2207 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2230 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2208 text_t *text = stp + col; 2231 text_t *text = stp + col;
2209 int count = 1; 2232 int count = 1;
… …
2246 2269
2247 col--; /* went one too far. move back */ 2270 col--; /* went one too far. move back */
2248 count -= i; /* dump any matching trailing chars */ 2271 count -= i; /* dump any matching trailing chars */
2249 2272
2250 // sometimes we optimize away the trailing NOCHAR's, add them back 2273 // sometimes we optimize away the trailing NOCHAR's, add them back
2251 while (i && text[count] == NOCHAR) 2274 while (expect_false (i && text[count] == NOCHAR))
2252 count++, i--; 2275 count++, i--;
2253 2276
2254 /* 2277 /*
2255 * Determine the attributes for the string 2278 * Determine the attributes for the string
2256 */ 2279 */
2257 int fore = fgcolor_of (rend); // desired foreground 2280 int fore = fgcolor_of (rend); // desired foreground
2258 int back = bgcolor_of (rend); // desired background 2281 int back = bgcolor_of (rend); // desired background
2259 2282
2260 // only do special processing if any attributes are set, which is unlikely 2283 // only do special processing if any attributes are set, which is unlikely
2261 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2284 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2262 { 2285 {
2263 bool invert = rend & RS_RVid; 2286 bool invert = rend & RS_RVid;
2264 2287
2265#ifndef NO_BOLD_UNDERLINE_REVERSE 2288#ifndef NO_BOLD_UNDERLINE_REVERSE
2266 if (rend & RS_Bold
2267 && fore == Color_fg) 2289 if (rend & RS_Bold && fore == Color_fg)
2268 { 2290 {
2269 if (ISSET_PIXCOLOR (Color_BD)) 2291 if (ISSET_PIXCOLOR (Color_BD))
2270 fore = Color_BD; 2292 fore = Color_BD;
2271# if !ENABLE_STYLES 2293# if !ENABLE_STYLES
2272 else 2294 else
2273 invert = !invert; 2295 invert = !invert;
2274# endif 2296# endif
2275 } 2297 }
2276 2298
2277 if (rend & RS_Italic 2299 if (rend & RS_Italic && fore == Color_fg)
2278 && fore == Color_fg)
2279 { 2300 {
2280 if (ISSET_PIXCOLOR (Color_IT)) 2301 if (ISSET_PIXCOLOR (Color_IT))
2281 fore = Color_IT; 2302 fore = Color_IT;
2282# if !ENABLE_STYLES 2303# if !ENABLE_STYLES
2283 else 2304 else
… …
2317 } 2338 }
2318 2339
2319#ifdef TEXT_BLINK 2340#ifdef TEXT_BLINK
2320 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2341 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2321 { 2342 {
2322 if (!text_blink_ev.active) 2343 if (!text_blink_ev.is_active ())
2323 { 2344 {
2324 text_blink_ev.start (TEXT_BLINK_INTERVAL, TEXT_BLINK_INTERVAL); 2345 text_blink_ev.again ();
2325 hidden_text = 0; 2346 hidden_text = 0;
2326 } 2347 }
2327 else if (hidden_text) 2348 else if (hidden_text)
2328 fore = back; 2349 fore = back;
2329 } 2350 }
… …
2351 /* 2372 /*
2352 * Actually do the drawing of the string here 2373 * Actually do the drawing of the string here
2353 */ 2374 */
2354 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2375 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2355 2376
2356 if (have_bg && back == Color_bg) 2377 if (expect_true (have_bg && back == Color_bg))
2357 { 2378 {
2358 // this is very ugly, maybe push it into ->draw? 2379 // this is very ugly, maybe push it into ->draw?
2359 2380
2360 for (i = 0; i < count; i++) /* don't draw empty strings */ 2381 for (i = 0; i < count; i++) /* don't draw empty strings */
2361 if (text[i] != ' ') 2382 if (text[i] != ' ')
… …
2368 did_clear: ; 2389 did_clear: ;
2369 } 2390 }
2370 else 2391 else
2371 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2392 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2372 2393
2373 if (rend & RS_Uline && font->descent > 1 && fore != back) 2394 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2374 { 2395 {
2375#if ENABLE_FRILLS 2396#if ENABLE_FRILLS
2376 if (ISSET_PIXCOLOR (Color_underline)) 2397 if (ISSET_PIXCOLOR (Color_underline))
2377 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2398 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2378 else 2399 else
2379#endif 2400#endif
2380 XSetForeground (dpy, gc, pix_colors[fore]); 2401 XSetForeground (dpy, gc, pix_colors[fore]);
2381 2402
2382 XDrawLine (dpy, drawBuffer, gc, 2403 XDrawLine (dpy, vt, gc,
2383 xpixel, ypixel + font->ascent + 1, 2404 xpixel, ypixel + font->ascent + 1,
2384 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2405 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2385 } 2406 }
2386 } /* for (col....) */ 2407 } /* for (col....) */
2387 } /* for (row....) */ 2408 } /* for (row....) */
… …
2425 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2446 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2426 else 2447 else
2427#endif 2448#endif
2428 XSetForeground (dpy, gc, pix_colors[ccol1]); 2449 XSetForeground (dpy, gc, pix_colors[ccol1]);
2429 2450
2430 XDrawRectangle (dpy, drawBuffer, gc, 2451 XDrawRectangle (dpy, vt, gc,
2431 Col2Pixel (col), 2452 Col2Pixel (col),
2432 Row2Pixel (oldcursor.row), 2453 Row2Pixel (oldcursor.row),
2433 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2454 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2434 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2455 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2435 } 2456 }
… …
2473rxvt_term::scr_recolour () NOTHROW 2494rxvt_term::scr_recolour () NOTHROW
2474{ 2495{
2475#ifdef HAVE_BG_PIXMAP 2496#ifdef HAVE_BG_PIXMAP
2476 bgPixmap.apply (); 2497 bgPixmap.apply ();
2477#else 2498#else
2499
2478 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2500 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2479 XClearWindow (dpy, parent[0]); 2501 XClearWindow (dpy, parent[0]);
2480 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2502 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2481# if HAVE_SCROLLBARS 2503
2482 if (scrollBar.win) 2504 if (scrollBar.win)
2483 { 2505 {
2484 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2506 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2485 scrollBar.setIdle (); 2507 scrollBar.state = STATE_IDLE;
2486 scrollbar_show (0); 2508 scrollBar.show (0);
2487 } 2509 }
2510
2488# endif 2511#endif
2512
2513 /* bgPixmap.apply () does not do the following : */
2489 scr_clear (); 2514 scr_clear ();
2490 scr_touch (true); 2515 scr_touch (true);
2491 want_refresh = 1; 2516 want_refresh = 1;
2492#endif
2493
2494} 2517}
2495 2518
2496/* ------------------------------------------------------------------------- */ 2519/* ------------------------------------------------------------------------- */
2497void 2520void
2498rxvt_term::scr_clear (bool really) NOTHROW 2521rxvt_term::scr_clear (bool really) NOTHROW
… …
2587{ 2610{
2588 int row, wrote; 2611 int row, wrote;
2589 unsigned int width, towrite; 2612 unsigned int width, towrite;
2590 char r1[] = "\n"; 2613 char r1[] = "\n";
2591 2614
2592 for (row = saveLines - nsaved; 2615 for (row = saveLines + top_row;
2593 row < saveLines + nrow - 1; row++) 2616 row < saveLines + nrow - 1; row++)
2594 { 2617 {
2595 width = row_buf[row].l >= 0 ? row_buf[row].l 2618 width = row_buf[row].l >= 0 ? row_buf[row].l
2596 : ncol; 2619 : ncol;
2597 for (towrite = width; towrite; towrite -= wrote) 2620 for (towrite = width; towrite; towrite -= wrote)
… …
2648 /* convert normal newline chars into common keyboard Return key sequence */ 2671 /* convert normal newline chars into common keyboard Return key sequence */
2649 for (unsigned int i = 0; i < len; i++) 2672 for (unsigned int i = 0; i < len; i++)
2650 if (data[i] == C0_LF) 2673 if (data[i] == C0_LF)
2651 data[i] = C0_CR; 2674 data[i] = C0_CR;
2652 2675
2676 if (priv_modes & PrivMode_BracketPaste)
2677 tt_printf ("\e[200~");
2678
2653 tt_write (data, len); 2679 tt_write (data, len);
2680
2681 if (priv_modes & PrivMode_BracketPaste)
2682 tt_printf ("\e[201~");
2654} 2683}
2655 2684
2656/* ------------------------------------------------------------------------- */ 2685/* ------------------------------------------------------------------------- */
2657/* 2686/*
2658 * Respond to a notification that a primary selection has been sent 2687 * Respond to a notification that a primary selection has been sent
… …
2852 */ 2881 */
2853void 2882void
2854rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2883rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2855{ 2884{
2856 if (selection.text && selnum == Sel_Primary) 2885 if (selection.text && selnum == Sel_Primary)
2886 {
2857 { /* internal selection */ 2887 /* internal selection */
2858 char *str = rxvt_wcstombs (selection.text, selection.len); 2888 char *str = rxvt_wcstombs (selection.text, selection.len);
2859 paste (str, strlen (str)); 2889 paste (str, strlen (str));
2860 free (str); 2890 free (str);
2861 return; 2891 return;
2862 } 2892 }
… …
3130 while (selection.mark.col > 0 3160 while (selection.mark.col > 0
3131 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3161 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3132 --selection.mark.col; 3162 --selection.mark.col;
3133 3163
3134 if (selection.op) 3164 if (selection.op)
3165 {
3135 { /* clear the old selection */ 3166 /* clear the old selection */
3136 selection.beg.row = selection.end.row = selection.mark.row; 3167 selection.beg.row = selection.end.row = selection.mark.row;
3137 selection.beg.col = selection.end.col = selection.mark.col; 3168 selection.beg.col = selection.end.col = selection.mark.col;
3138 } 3169 }
3139 3170
3140 selection.op = SELECTION_INIT; 3171 selection.op = SELECTION_INIT;
… …
3329 * a point/word/line which is either the start or end of the selection 3360 * a point/word/line which is either the start or end of the selection
3330 * and it was decided by whichever point/word/line was `fixed' at the 3361 * and it was decided by whichever point/word/line was `fixed' at the
3331 * time of the most recent button3 press 3362 * time of the most recent button3 press
3332 */ 3363 */
3333 if (button3 && buttonpress) 3364 if (button3 && buttonpress)
3365 {
3334 { /* button3 press */ 3366 /* button3 press */
3335 /* 3367 /*
3336 * first determine which edge of the selection we are closest to 3368 * first determine which edge of the selection we are closest to
3337 */ 3369 */
3338 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3370 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3339 || (!ROWCOL_IS_AFTER (pos, selection.end) 3371 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3357 selection.mark.row = selection.beg.row; 3389 selection.mark.row = selection.beg.row;
3358 selection.mark.col = selection.beg.col; 3390 selection.mark.col = selection.beg.col;
3359 } 3391 }
3360 } 3392 }
3361 else 3393 else
3394 {
3362 { /* button1 drag or button3 drag */ 3395 /* button1 drag or button3 drag */
3363 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3396 if (ROWCOL_IS_AFTER (selection.mark, pos))
3364 { 3397 {
3365 if (selection.mark.row == selection.end.row 3398 if (selection.mark.row == selection.end.row
3366 && selection.mark.col == selection.end.col 3399 && selection.mark.col == selection.end.col
3367 && clickchange 3400 && clickchange
… …
3448 selection.end.row++; 3481 selection.end.row++;
3449 } 3482 }
3450 } 3483 }
3451 3484
3452 if (button3 && buttonpress) 3485 if (button3 && buttonpress)
3486 {
3453 { /* mark may need to be changed */ 3487 /* mark may need to be changed */
3454 if (closeto == LEFT) 3488 if (closeto == LEFT)
3455 { 3489 {
3456 selection.mark.row = selection.end.row; 3490 selection.mark.row = selection.end.row;
3457 selection.mark.col = selection.end.col - (selection.clicks == 2); 3491 selection.mark.col = selection.end.col - (selection.clicks == 2);
3458 } 3492 }

Diff Legend

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