… | |
… | |
132 | |
132 | |
133 | l.l = 0; |
133 | l.l = 0; |
134 | l.f = 0; |
134 | l.f = 0; |
135 | } |
135 | } |
136 | |
136 | |
|
|
137 | // nuke a single wide character at the given column |
|
|
138 | void |
|
|
139 | rxvt_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 | |
137 | /* ------------------------------------------------------------------------- * |
156 | /* ------------------------------------------------------------------------- * |
138 | * SCREEN INITIALISATION * |
157 | * SCREEN INITIALISATION * |
139 | * ------------------------------------------------------------------------- */ |
158 | * ------------------------------------------------------------------------- */ |
140 | |
159 | |
141 | void |
160 | void |
142 | rxvt_term::scr_reset () |
161 | rxvt_term::scr_reset () |
143 | { |
162 | { |
144 | #if ENABLE_OVERLAY |
|
|
145 | scr_overlay_off (); |
|
|
146 | #endif |
|
|
147 | |
|
|
148 | rvideo_mode = false; |
|
|
149 | view_start = 0; |
163 | view_start = 0; |
150 | num_scr = 0; |
164 | num_scr = 0; |
151 | |
165 | |
152 | if (ncol == 0) |
166 | if (ncol == 0) |
153 | ncol = 80; |
167 | ncol = 80; |
… | |
… | |
155 | if (nrow == 0) |
169 | if (nrow == 0) |
156 | nrow = 24; |
170 | nrow = 24; |
157 | |
171 | |
158 | if (ncol == prev_ncol && nrow == prev_nrow) |
172 | if (ncol == prev_ncol && nrow == prev_nrow) |
159 | return; |
173 | return; |
160 | |
|
|
161 | if (current_screen != PRIMARY) |
|
|
162 | scr_swap_screen (); |
|
|
163 | |
174 | |
164 | // we need at least two lines for wrapping to work correctly |
175 | // we need at least two lines for wrapping to work correctly |
165 | while (nrow + saveLines < 2) |
176 | while (nrow + saveLines < 2) |
166 | { |
177 | { |
167 | //TODO//FIXME |
178 | //TODO//FIXME |
… | |
… | |
267 | |
278 | |
268 | if (top_row) |
279 | if (top_row) |
269 | { |
280 | { |
270 | // Re-wrap lines. This is rather ugly, possibly because I am too dumb |
281 | // Re-wrap lines. This is rather ugly, possibly because I am too dumb |
271 | // to come up with a lean and mean algorithm. |
282 | // to come up with a lean and mean algorithm. |
|
|
283 | // TODO: maybe optimise when width didn't change |
272 | |
284 | |
273 | row_col_t ocur = screen.cur; |
285 | row_col_t ocur = screen.cur; |
274 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
286 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
275 | |
287 | |
276 | do |
288 | do |
277 | { |
289 | { |
278 | p = MOD (p - 1, prev_total_rows); |
290 | p = MOD (p - 1, prev_total_rows); |
279 | #ifdef DEBUG_STRICT |
|
|
280 | assert (old_buf [MOD (p, prev_total_rows)].t); |
291 | assert (old_buf [MOD (p, prev_total_rows)].t); |
281 | #endif |
|
|
282 | int plines = 1; |
292 | int plines = 1; |
283 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
293 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
284 | |
294 | |
285 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
295 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
286 | { |
296 | { |
… | |
… | |
380 | delete old_ta; |
390 | delete old_ta; |
381 | delete old_ra; |
391 | delete old_ra; |
382 | |
392 | |
383 | clamp_it (screen.cur.row, 0, nrow - 1); |
393 | clamp_it (screen.cur.row, 0, nrow - 1); |
384 | clamp_it (screen.cur.col, 0, ncol - 1); |
394 | clamp_it (screen.cur.col, 0, ncol - 1); |
|
|
395 | } |
385 | |
396 | |
386 | free (tabs); |
397 | free (tabs); |
387 | } |
398 | tabs = (char *)rxvt_malloc (ncol); |
|
|
399 | |
|
|
400 | for (int col = ncol; --col; ) |
|
|
401 | tabs [col] = col % TABSIZE == 0; |
388 | |
402 | |
389 | CLEAR_ALL_SELECTION (); |
403 | CLEAR_ALL_SELECTION (); |
390 | |
404 | |
391 | prev_nrow = nrow; |
405 | prev_nrow = nrow; |
392 | prev_ncol = ncol; |
406 | prev_ncol = ncol; |
393 | |
|
|
394 | tabs = (char *)rxvt_malloc (ncol); |
|
|
395 | |
|
|
396 | for (int col = ncol; --col; ) |
|
|
397 | tabs [col] = col % TABSIZE == 0; |
|
|
398 | |
|
|
399 | if (current_screen != PRIMARY) |
|
|
400 | scr_swap_screen (); |
|
|
401 | |
407 | |
402 | tt_winch (); |
408 | tt_winch (); |
403 | |
409 | |
404 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
410 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
405 | } |
411 | } |
… | |
… | |
417 | delete ralloc; ralloc = 0; |
423 | delete ralloc; ralloc = 0; |
418 | |
424 | |
419 | free (row_buf); |
425 | free (row_buf); |
420 | free (swap_buf); |
426 | free (swap_buf); |
421 | free (drawn_buf); |
427 | free (drawn_buf); |
|
|
428 | row_buf = 0; // signal that we freed all the arrays above |
|
|
429 | |
422 | free (tabs); |
430 | free (tabs); |
423 | |
431 | tabs = 0; |
424 | row_buf = 0; // signal that we freed all the arrays |
|
|
425 | } |
432 | } |
426 | } |
433 | } |
427 | |
434 | |
428 | /* ------------------------------------------------------------------------- */ |
435 | /* ------------------------------------------------------------------------- */ |
429 | /* |
436 | /* |
430 | * Hard reset |
437 | * Hard/Soft reset |
431 | */ |
438 | */ |
432 | void |
439 | void |
433 | rxvt_term::scr_poweron () |
440 | rxvt_term::scr_poweron () |
434 | { |
441 | { |
435 | scr_release (); |
442 | scr_release (); |
436 | prev_nrow = prev_ncol = 0; |
443 | prev_nrow = prev_ncol = 0; |
|
|
444 | rvideo_mode = false; |
|
|
445 | scr_soft_reset (); |
437 | scr_reset (); |
446 | scr_reset (); |
438 | |
447 | |
439 | scr_clear (true); |
448 | scr_clear (true); |
440 | scr_refresh (); |
449 | scr_refresh (); |
|
|
450 | } |
|
|
451 | |
|
|
452 | void |
|
|
453 | rxvt_term::scr_soft_reset () |
|
|
454 | { |
|
|
455 | /* only affects modes, nothing drastic such as clearing the screen */ |
|
|
456 | #if ENABLE_OVERLAY |
|
|
457 | scr_overlay_off (); |
|
|
458 | #endif |
|
|
459 | |
|
|
460 | if (current_screen != PRIMARY) |
|
|
461 | scr_swap_screen (); |
|
|
462 | |
|
|
463 | scr_scroll_region (0, MAX_ROWS - 1); |
|
|
464 | scr_rendition (0, ~RS_None); |
|
|
465 | scr_insert_mode (0); |
441 | } |
466 | } |
442 | |
467 | |
443 | /* ------------------------------------------------------------------------- * |
468 | /* ------------------------------------------------------------------------- * |
444 | * PROCESS SCREEN COMMANDS * |
469 | * PROCESS SCREEN COMMANDS * |
445 | * ------------------------------------------------------------------------- */ |
470 | * ------------------------------------------------------------------------- */ |
… | |
… | |
483 | } |
508 | } |
484 | |
509 | |
485 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
510 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
486 | min_it (s->cur.row, nrow - 1); |
511 | min_it (s->cur.row, nrow - 1); |
487 | min_it (s->cur.col, ncol - 1); |
512 | min_it (s->cur.col, ncol - 1); |
488 | #ifdef DEBUG_STRICT |
|
|
489 | assert (s->cur.row >= 0); |
513 | assert (s->cur.row >= 0); |
490 | assert (s->cur.col >= 0); |
514 | assert (s->cur.col >= 0); |
491 | #endif |
|
|
492 | } |
515 | } |
493 | |
516 | |
494 | void |
517 | void |
495 | rxvt_term::scr_swap_screen () |
518 | rxvt_term::scr_swap_screen () |
496 | { |
519 | { |
… | |
… | |
521 | want_refresh = 1; |
544 | want_refresh = 1; |
522 | view_start = 0; |
545 | view_start = 0; |
523 | |
546 | |
524 | selection_check (2); /* check for boundary cross */ |
547 | selection_check (2); /* check for boundary cross */ |
525 | |
548 | |
526 | int i = current_screen; current_screen = scrn; scrn = i; |
549 | current_screen = scrn; |
527 | |
550 | |
528 | #if NSCREENS |
551 | #if NSCREENS |
529 | if (option (Opt_secondaryScreen)) |
552 | if (option (Opt_secondaryScreen)) |
530 | { |
553 | { |
531 | num_scr = 0; |
554 | num_scr = 0; |
… | |
… | |
756 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
779 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
757 | screen.cur.row -= minlines; |
780 | screen.cur.row -= minlines; |
758 | } |
781 | } |
759 | } |
782 | } |
760 | |
783 | |
761 | #ifdef DEBUG_STRICT |
|
|
762 | assert (screen.cur.col < ncol); |
784 | assert (screen.cur.col < ncol); |
763 | assert (screen.cur.row < nrow |
785 | assert (screen.cur.row < nrow |
764 | && screen.cur.row >= top_row); |
786 | && screen.cur.row >= top_row); |
765 | #endif |
|
|
766 | int row = screen.cur.row; |
787 | int row = screen.cur.row; |
767 | |
788 | |
768 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
789 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
769 | |
790 | |
770 | line_t *line = &ROW(row); |
791 | line_t *line = &ROW(row); |
771 | |
792 | |
772 | while (str < strend) |
793 | while (str < strend) |
773 | { |
794 | { |
774 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
795 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
775 | |
796 | |
776 | if (c < 0x20) |
797 | if (expect_false (c < 0x20)) |
777 | if (c == C0_LF) |
798 | if (c == C0_LF) |
778 | { |
799 | { |
779 | max_it (line->l, screen.cur.col); |
800 | max_it (line->l, screen.cur.col); |
780 | |
801 | |
781 | screen.flags &= ~Screen_WrapNext; |
802 | screen.flags &= ~Screen_WrapNext; |
… | |
… | |
800 | { |
821 | { |
801 | scr_tab (1, true); |
822 | scr_tab (1, true); |
802 | continue; |
823 | continue; |
803 | } |
824 | } |
804 | |
825 | |
|
|
826 | if (expect_false ( |
805 | if (checksel /* see if we're writing within selection */ |
827 | checksel /* see if we're writing within selection */ |
806 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
828 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
807 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
829 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
|
|
830 | )) |
808 | { |
831 | { |
809 | checksel = 0; |
832 | checksel = 0; |
810 | /* |
833 | /* |
811 | * If we wrote anywhere in the selected area, kill the selection |
834 | * If we wrote anywhere in the selected area, kill the selection |
812 | * XXX: should we kill the mark too? Possibly, but maybe that |
835 | * XXX: should we kill the mark too? Possibly, but maybe that |
813 | * should be a similar check. |
836 | * should be a similar check. |
814 | */ |
837 | */ |
815 | CLEAR_SELECTION (); |
838 | CLEAR_SELECTION (); |
816 | } |
839 | } |
817 | |
840 | |
818 | if (screen.flags & Screen_WrapNext) |
841 | if (expect_false (screen.flags & Screen_WrapNext)) |
819 | { |
842 | { |
820 | scr_do_wrap (); |
843 | scr_do_wrap (); |
821 | |
844 | |
822 | line->l = ncol; |
845 | line->l = ncol; |
823 | line->is_longer (1); |
846 | line->is_longer (1); |
… | |
… | |
825 | row = screen.cur.row; |
848 | row = screen.cur.row; |
826 | line = &ROW(row); /* _must_ refresh */ |
849 | line = &ROW(row); /* _must_ refresh */ |
827 | } |
850 | } |
828 | |
851 | |
829 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
852 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
830 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
853 | if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
831 | c = 0xfffd; |
854 | c = 0xfffd; |
832 | |
855 | |
833 | // rely on wcwidth to tell us the character width, do wcwidth before |
856 | // rely on wcwidth to tell us the character width, do wcwidth before |
834 | // further replacements, as wcwidth might return -1 for the line |
857 | // further replacements, as wcwidth might return -1 for the line |
835 | // drawing characters below as they might be invalid in the current |
858 | // drawing characters below as they might be invalid in the current |
836 | // locale. |
859 | // locale. |
837 | int width = WCWIDTH (c); |
860 | int width = WCWIDTH (c); |
838 | |
861 | |
839 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
862 | if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL |
840 | { |
863 | { |
841 | // vt100 special graphics and line drawing |
864 | // vt100 special graphics and line drawing |
842 | // 5f-7e standard vt100 |
865 | // 5f-7e standard vt100 |
843 | // 40-5e rxvt extension for extra curses acs chars |
866 | // 40-5e rxvt extension for extra curses acs chars |
844 | static uint16_t vt100_0[62] = { // 41 .. 7e |
867 | static uint16_t vt100_0[62] = { // 41 .. 7e |
… | |
… | |
857 | c = vt100_0[c - 0x41]; |
880 | c = vt100_0[c - 0x41]; |
858 | width = 1; // vt100 line drawing characters are always single-width |
881 | width = 1; // vt100 line drawing characters are always single-width |
859 | } |
882 | } |
860 | } |
883 | } |
861 | |
884 | |
862 | if (screen.flags & Screen_Insert) |
885 | if (expect_false (screen.flags & Screen_Insert)) |
863 | scr_insdel_chars (width, INSERT); |
886 | scr_insdel_chars (width, INSERT); |
864 | |
887 | |
865 | if (width != 0) |
888 | if (width != 0) |
866 | { |
889 | { |
867 | #if !UNICODE_3 |
890 | #if !UNICODE_3 |
… | |
… | |
873 | c = 0xfffd; |
896 | c = 0xfffd; |
874 | # endif |
897 | # endif |
875 | #endif |
898 | #endif |
876 | |
899 | |
877 | // nuke the character at this position, if required |
900 | // nuke the character at this position, if required |
|
|
901 | if (expect_false ( |
878 | if (line->t[screen.cur.col] == NOCHAR |
902 | line->t[screen.cur.col] == NOCHAR |
879 | || (screen.cur.col < ncol - 1 |
903 | || (screen.cur.col < ncol - 1 |
880 | && line->t[screen.cur.col + 1] == NOCHAR)) |
904 | && line->t[screen.cur.col + 1] == NOCHAR) |
|
|
905 | )) |
|
|
906 | scr_kill_char (*line, screen.cur.col); |
|
|
907 | |
|
|
908 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
909 | |
|
|
910 | // if the character doesn't fit into the remaining columns... |
|
|
911 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
881 | { |
912 | { |
882 | int col = screen.cur.col; |
913 | // ... artificially enlargen the previous one |
883 | |
|
|
884 | // find begin |
|
|
885 | while (col > 0 && line->t[col] == NOCHAR) |
|
|
886 | col--; |
|
|
887 | |
|
|
888 | rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' ')); |
|
|
889 | |
|
|
890 | // found begin, nuke |
|
|
891 | do { |
|
|
892 | line->t[col] = ' '; |
|
|
893 | line->r[col] = rend; |
|
|
894 | col++; |
|
|
895 | } while (col < ncol && line->t[col] == NOCHAR); |
|
|
896 | } |
|
|
897 | |
|
|
898 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
899 | |
|
|
900 | // if the character doesn't fit into the remaining columns... |
|
|
901 | if (screen.cur.col > ncol - width && ncol >= width) |
|
|
902 | { |
|
|
903 | // ...output spaces |
|
|
904 | c = ' '; |
914 | c = NOCHAR; |
905 | // and try the same character next loop iteration |
915 | // and try the same character next loop iteration |
906 | --str; |
916 | --str; |
907 | } |
917 | } |
908 | |
918 | |
909 | line->touch (); |
919 | line->touch (); |
… | |
… | |
911 | do |
921 | do |
912 | { |
922 | { |
913 | line->t[screen.cur.col] = c; |
923 | line->t[screen.cur.col] = c; |
914 | line->r[screen.cur.col] = rend; |
924 | line->r[screen.cur.col] = rend; |
915 | |
925 | |
916 | if (screen.cur.col < ncol - 1) |
926 | if (expect_true (screen.cur.col < ncol - 1)) |
917 | screen.cur.col++; |
927 | screen.cur.col++; |
918 | else |
928 | else |
919 | { |
929 | { |
920 | line->l = ncol; |
930 | line->l = ncol; |
921 | if (screen.flags & Screen_Autowrap) |
931 | if (screen.flags & Screen_Autowrap) |
… | |
… | |
923 | break; |
933 | break; |
924 | } |
934 | } |
925 | |
935 | |
926 | c = NOCHAR; |
936 | c = NOCHAR; |
927 | } |
937 | } |
928 | while (--width > 0); |
938 | while (expect_false (--width > 0)); |
929 | |
939 | |
930 | // pad with spaces when overwriting wide character with smaller one |
940 | // pad with spaces when overwriting wide character with smaller one |
931 | if (!width) |
941 | if (expect_false (!width)) |
932 | { |
942 | { |
933 | line->touch (); |
943 | line->touch (); |
934 | |
944 | |
935 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
945 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
936 | { |
946 | { |
937 | line->t[c] = ' '; |
947 | line->t[c] = ' '; |
938 | line->r[c] = rend; |
948 | line->r[c] = rend; |
939 | } |
949 | } |
940 | } |
950 | } |
941 | } |
951 | } |
|
|
952 | #if ENABLE_COMBINING |
942 | else // width == 0 |
953 | else // width == 0 |
943 | { |
954 | { |
944 | #if ENABLE_COMBINING |
955 | if (c != 0xfeff) // ignore BOM |
945 | // handle combining characters |
|
|
946 | // we just tag the accent on the previous on-screen character. |
|
|
947 | // this is arguably not correct, but also arguably not wrong. |
|
|
948 | // we don't handle double-width characters nicely yet. |
|
|
949 | line_t *linep; |
|
|
950 | text_t *tp; |
|
|
951 | rend_t *rp; |
|
|
952 | |
|
|
953 | if (screen.cur.col > 0) |
|
|
954 | { |
956 | { |
|
|
957 | // handle combining characters |
|
|
958 | // we just tag the accent on the previous on-screen character. |
|
|
959 | // this is arguably not correct, but also arguably not wrong. |
|
|
960 | // we don't handle double-width characters nicely yet. |
|
|
961 | line_t *linep; |
|
|
962 | text_t *tp; |
|
|
963 | rend_t *rp; |
|
|
964 | |
|
|
965 | if (screen.cur.col > 0) |
|
|
966 | { |
955 | linep = line; |
967 | linep = line; |
956 | tp = line->t + screen.cur.col - 1; |
968 | tp = line->t + screen.cur.col - 1; |
957 | rp = line->r + screen.cur.col - 1; |
969 | rp = line->r + screen.cur.col - 1; |
|
|
970 | } |
|
|
971 | else if (screen.cur.row > 0 |
|
|
972 | && ROW(screen.cur.row - 1).is_longer ()) |
|
|
973 | { |
|
|
974 | linep = &ROW(screen.cur.row - 1); |
|
|
975 | tp = line->t + ncol - 1; |
|
|
976 | rp = line->r + ncol - 1; |
|
|
977 | } |
|
|
978 | else |
|
|
979 | continue; |
|
|
980 | |
|
|
981 | linep->touch (); |
|
|
982 | |
|
|
983 | while (*tp == NOCHAR && tp > linep->t) |
|
|
984 | tp--, rp--; |
|
|
985 | |
|
|
986 | // first try to find a precomposed character |
|
|
987 | unicode_t n = rxvt_compose (*tp, c); |
|
|
988 | if (n == NOCHAR) |
|
|
989 | n = rxvt_composite.compose (*tp, c); |
|
|
990 | |
|
|
991 | *tp = n; |
|
|
992 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
958 | } |
993 | } |
959 | else if (screen.cur.row > 0 |
|
|
960 | && ROW(screen.cur.row - 1).is_longer ()) |
|
|
961 | { |
|
|
962 | linep = &ROW(screen.cur.row - 1); |
|
|
963 | tp = line->t + ncol - 1; |
|
|
964 | rp = line->r + ncol - 1; |
|
|
965 | } |
994 | } |
966 | else |
|
|
967 | continue; |
|
|
968 | |
|
|
969 | linep->touch (); |
|
|
970 | |
|
|
971 | while (*tp == NOCHAR && tp > linep->t) |
|
|
972 | tp--, rp--; |
|
|
973 | |
|
|
974 | // first try to find a precomposed character |
|
|
975 | unicode_t n = rxvt_compose (*tp, c); |
|
|
976 | if (n == NOCHAR) |
|
|
977 | n = rxvt_composite.compose (*tp, c); |
|
|
978 | |
|
|
979 | *tp = n; |
|
|
980 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
|
|
981 | #endif |
995 | #endif |
982 | } |
|
|
983 | } |
996 | } |
984 | |
997 | |
985 | max_it (line->l, screen.cur.col); |
998 | max_it (line->l, screen.cur.col); |
986 | |
999 | |
987 | #ifdef DEBUG_STRICT |
|
|
988 | assert (screen.cur.row >= 0); |
1000 | assert (screen.cur.row >= 0); |
989 | #endif |
|
|
990 | } |
1001 | } |
991 | |
1002 | |
992 | /* ------------------------------------------------------------------------- */ |
1003 | /* ------------------------------------------------------------------------- */ |
993 | /* |
1004 | /* |
994 | * Process Backspace. Move back the cursor back a position, wrap if have to |
1005 | * Process Backspace. Move back the cursor back a position, wrap if have to |
… | |
… | |
1322 | if (row >= nrow) /* Out Of Bounds */ |
1333 | if (row >= nrow) /* Out Of Bounds */ |
1323 | return; |
1334 | return; |
1324 | |
1335 | |
1325 | min_it (num, nrow - row); |
1336 | min_it (num, nrow - row); |
1326 | |
1337 | |
1327 | /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */ |
1338 | // TODO: the code below does not work when view_start != 0 |
|
|
1339 | // the workaround is to disable the clear and use a normal refresh |
|
|
1340 | // when view_start != 0. mysterious. |
1328 | if (rstyle & (RS_RVid | RS_Uline)) |
1341 | if (rstyle & (RS_RVid | RS_Uline)) |
1329 | ren = (rend_t) ~RS_None; |
1342 | ren = (rend_t) ~RS_None; |
1330 | else if (GET_BASEBG (rstyle) == Color_bg) |
1343 | else if (GET_BASEBG (rstyle) == Color_bg) |
1331 | { |
1344 | { |
1332 | ren = DEFAULT_RSTYLE; |
1345 | ren = DEFAULT_RSTYLE; |
1333 | |
1346 | |
1334 | if (mapped) |
1347 | if (mapped && !view_start) |
1335 | XClearArea (dpy, vt, 0, |
1348 | XClearArea (dpy, vt, 0, |
1336 | Row2Pixel (row), (unsigned int)width, |
1349 | Row2Pixel (row - view_start), (unsigned int)width, |
1337 | (unsigned int)Height2Pixel (num), False); |
1350 | (unsigned int)Height2Pixel (num), False); |
1338 | } |
1351 | } |
1339 | else |
1352 | else |
1340 | { |
1353 | { |
1341 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1354 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1342 | |
1355 | |
|
|
1356 | if (mapped && !view_start) |
|
|
1357 | { |
1343 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1358 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1344 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1359 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1345 | XFillRectangle (dpy, vt, gc, |
1360 | XFillRectangle (dpy, vt, gc, |
1346 | 0, Row2Pixel (row), |
1361 | 0, Row2Pixel (row - view_start), |
1347 | (unsigned int)width, |
1362 | (unsigned int)width, |
1348 | (unsigned int)Height2Pixel (num)); |
1363 | (unsigned int)Height2Pixel (num)); |
1349 | gcvalue.foreground = pix_colors[Color_fg]; |
1364 | gcvalue.foreground = pix_colors[Color_fg]; |
1350 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1365 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
|
|
1366 | } |
1351 | } |
1367 | } |
1352 | |
1368 | |
1353 | for (; num--; row++) |
1369 | for (; num--; row++) |
1354 | { |
1370 | { |
1355 | scr_blank_screen_mem (ROW(row), rstyle); |
1371 | scr_blank_screen_mem (ROW(row), rstyle); |
|
|
1372 | |
|
|
1373 | if (!view_start) |
1356 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1374 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1357 | } |
1375 | } |
1358 | } |
1376 | } |
1359 | |
1377 | |
1360 | #if !ENABLE_MINIMAL |
1378 | #if !ENABLE_MINIMAL |
1361 | void |
1379 | void |
… | |
… | |
1435 | * Insert/Delete <count> characters from the current position |
1453 | * Insert/Delete <count> characters from the current position |
1436 | */ |
1454 | */ |
1437 | void |
1455 | void |
1438 | rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW |
1456 | rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW |
1439 | { |
1457 | { |
1440 | int col, row; |
|
|
1441 | rend_t tr; |
|
|
1442 | |
|
|
1443 | want_refresh = 1; |
1458 | want_refresh = 1; |
1444 | ZERO_SCROLLBACK (); |
1459 | ZERO_SCROLLBACK (); |
1445 | |
1460 | |
1446 | if (count <= 0) |
1461 | if (count <= 0) |
1447 | return; |
1462 | return; |
… | |
… | |
1449 | scr_do_wrap (); |
1464 | scr_do_wrap (); |
1450 | |
1465 | |
1451 | selection_check (1); |
1466 | selection_check (1); |
1452 | min_it (count, ncol - screen.cur.col); |
1467 | min_it (count, ncol - screen.cur.col); |
1453 | |
1468 | |
1454 | row = screen.cur.row; |
1469 | int row = screen.cur.row; |
1455 | |
1470 | |
1456 | line_t *line = &ROW(row); |
1471 | line_t *line = &ROW(row); |
1457 | |
1472 | |
1458 | line->touch (); |
1473 | line->touch (); |
1459 | line->is_longer (0); |
1474 | line->is_longer (0); |
1460 | |
1475 | |
|
|
1476 | // nuke wide spanning the start |
|
|
1477 | if (line->t[screen.cur.col] == NOCHAR) |
|
|
1478 | scr_kill_char (*line, screen.cur.col); |
|
|
1479 | |
1461 | switch (insdel) |
1480 | switch (insdel) |
1462 | { |
1481 | { |
1463 | case INSERT: |
1482 | case INSERT: |
1464 | for (col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1483 | line->l = min (line->l + count, ncol); |
|
|
1484 | |
|
|
1485 | if (line->t[screen.cur.col] == NOCHAR) |
|
|
1486 | scr_kill_char (*line, screen.cur.col); |
|
|
1487 | |
|
|
1488 | for (int col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1465 | { |
1489 | { |
1466 | line->t[col] = line->t[col - count]; |
1490 | line->t[col] = line->t[col - count]; |
1467 | line->r[col] = line->r[col - count]; |
1491 | line->r[col] = line->r[col - count]; |
1468 | } |
1492 | } |
1469 | |
|
|
1470 | line->l = min (line->l + count, ncol); |
|
|
1471 | |
1493 | |
1472 | if (selection.op && current_screen == selection.screen |
1494 | if (selection.op && current_screen == selection.screen |
1473 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1495 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1474 | { |
1496 | { |
1475 | if (selection.end.row != screen.cur.row |
1497 | if (selection.end.row != screen.cur.row |
… | |
… | |
1490 | case ERASE: |
1512 | case ERASE: |
1491 | screen.cur.col += count; /* don't worry if > ncol */ |
1513 | screen.cur.col += count; /* don't worry if > ncol */ |
1492 | selection_check (1); |
1514 | selection_check (1); |
1493 | screen.cur.col -= count; |
1515 | screen.cur.col -= count; |
1494 | |
1516 | |
1495 | line->l = max (line->l - count, 0); |
1517 | // nuke wide char after the end |
|
|
1518 | if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR) |
|
|
1519 | scr_kill_char (*line, screen.cur.col + count); |
|
|
1520 | |
1496 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1521 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1497 | break; |
1522 | break; |
1498 | |
1523 | |
1499 | case DELETE: |
1524 | case DELETE: |
1500 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1525 | line->l = max (line->l - count, 0); |
1501 | |
1526 | |
|
|
1527 | // nuke wide char spanning the end |
|
|
1528 | if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR) |
|
|
1529 | scr_kill_char (*line, screen.cur.col + count); |
|
|
1530 | |
1502 | for (col = screen.cur.col; (col + count) < ncol; col++) |
1531 | for (int col = screen.cur.col; (col + count) < ncol; col++) |
1503 | { |
1532 | { |
1504 | line->t[col] = line->t[col + count]; |
1533 | line->t[col] = line->t[col + count]; |
1505 | line->r[col] = line->r[col + count]; |
1534 | line->r[col] = line->r[col + count]; |
1506 | } |
1535 | } |
1507 | |
1536 | |
1508 | line->l = max (line->l - count, 0); |
|
|
1509 | scr_blank_line (*line, ncol - count, count, tr); |
1537 | scr_blank_line (*line, ncol - count, count, rstyle); |
1510 | |
1538 | |
1511 | if (selection.op && current_screen == selection.screen |
1539 | if (selection.op && current_screen == selection.screen |
1512 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1540 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1513 | { |
1541 | { |
1514 | if (selection.end.row != screen.cur.row |
1542 | if (selection.end.row != screen.cur.row |
… | |
… | |
1892 | XMapWindow (dpy, parent[0]); |
1920 | XMapWindow (dpy, parent[0]); |
1893 | # endif |
1921 | # endif |
1894 | |
1922 | |
1895 | # if ENABLE_FRILLS |
1923 | # if ENABLE_FRILLS |
1896 | if (option (Opt_urgentOnBell)) |
1924 | if (option (Opt_urgentOnBell)) |
1897 | { |
1925 | set_urgency (1); |
1898 | if (XWMHints *h = XGetWMHints(dpy, parent[0])) |
|
|
1899 | { |
|
|
1900 | h->flags |= XUrgencyHint; |
|
|
1901 | XSetWMHints (dpy, parent[0], h); |
|
|
1902 | } |
|
|
1903 | } |
|
|
1904 | # endif |
1926 | # endif |
1905 | |
1927 | |
1906 | if (option (Opt_visualBell)) |
1928 | if (option (Opt_visualBell)) |
1907 | { |
1929 | { |
1908 | rvideo_bell = true; |
1930 | rvideo_bell = true; |
… | |
… | |
1911 | |
1933 | |
1912 | bell_ev.start (VISUAL_BELL_DURATION); |
1934 | bell_ev.start (VISUAL_BELL_DURATION); |
1913 | } |
1935 | } |
1914 | else |
1936 | else |
1915 | XBell (dpy, 0); |
1937 | XBell (dpy, 0); |
|
|
1938 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1916 | #endif |
1939 | #endif |
1917 | } |
1940 | } |
1918 | |
1941 | |
1919 | /* ------------------------------------------------------------------------- */ |
1942 | /* ------------------------------------------------------------------------- */ |
1920 | /* ARGSUSED */ |
1943 | /* ARGSUSED */ |
… | |
… | |
1939 | row_start = view_start; |
1962 | row_start = view_start; |
1940 | } |
1963 | } |
1941 | |
1964 | |
1942 | wctomb (0, 0); |
1965 | wctomb (0, 0); |
1943 | |
1966 | |
1944 | for (int r1 = 0; r1 < nrows; r1++) |
1967 | for (int r1 = row_start; r1 < row_start + nrows; r1++) |
1945 | { |
1968 | { |
1946 | text_t *tp = ROW(r1).t; |
1969 | text_t *tp = ROW(r1).t; |
1947 | int len = ROW(r1).l; |
1970 | int len = ROW(r1).l; |
1948 | |
1971 | |
1949 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
1972 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
… | |
… | |
1978 | * screen.text/screen.rend contain what the screen will change to. |
2001 | * screen.text/screen.rend contain what the screen will change to. |
1979 | */ |
2002 | */ |
1980 | void |
2003 | void |
1981 | rxvt_term::scr_refresh () NOTHROW |
2004 | rxvt_term::scr_refresh () NOTHROW |
1982 | { |
2005 | { |
1983 | unsigned char have_bg, |
|
|
1984 | showcursor; /* show the cursor */ |
|
|
1985 | int16_t col, row, /* column/row we're processing */ |
2006 | int16_t col, row, /* column/row we're processing */ |
1986 | ocrow; /* old cursor row */ |
2007 | ocrow; /* old cursor row */ |
1987 | int i; /* tmp */ |
2008 | int i; /* tmp */ |
1988 | #ifndef NO_CURSORCOLOR |
2009 | #ifndef NO_CURSORCOLOR |
1989 | rend_t cc1; /* store colours at cursor position (s) */ |
2010 | rend_t cc1; /* store colours at cursor position (s) */ |
… | |
… | |
2000 | /* |
2021 | /* |
2001 | * A: set up vars |
2022 | * A: set up vars |
2002 | */ |
2023 | */ |
2003 | refresh_count = 0; |
2024 | refresh_count = 0; |
2004 | |
2025 | |
|
|
2026 | unsigned int old_screen_flags = screen.flags; |
2005 | have_bg = 0; |
2027 | char have_bg = 0; |
2006 | #ifdef HAVE_BG_PIXMAP |
2028 | #ifdef HAVE_BG_PIXMAP |
2007 | have_bg = bgPixmap.pixmap != None; |
2029 | have_bg = bgPixmap.pixmap != None; |
2008 | #endif |
2030 | #endif |
2009 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2031 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2010 | |
2032 | |
2011 | /* |
2033 | /* |
2012 | * B: reverse any characters which are selected |
2034 | * B: reverse any characters which are selected |
2013 | */ |
2035 | */ |
2014 | scr_reverse_selection (); |
2036 | scr_reverse_selection (); |
|
|
2037 | |
|
|
2038 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
|
|
2039 | #if ENABLE_OVERLAY |
|
|
2040 | scr_swap_overlay (); |
|
|
2041 | #endif |
|
|
2042 | |
|
|
2043 | char showcursor = screen.flags & Screen_VisibleCursor; |
2015 | |
2044 | |
2016 | /* |
2045 | /* |
2017 | * C: set the cursor character (s) |
2046 | * C: set the cursor character (s) |
2018 | */ |
2047 | */ |
2019 | { |
2048 | { |
2020 | unsigned char setoldcursor; |
2049 | unsigned char setoldcursor; |
2021 | |
2050 | |
2022 | showcursor = (screen.flags & Screen_VisibleCursor); |
|
|
2023 | #ifdef CURSOR_BLINK |
2051 | #ifdef CURSOR_BLINK |
2024 | if (hidden_cursor) |
2052 | if (hidden_cursor) |
2025 | showcursor = 0; |
2053 | showcursor = 0; |
2026 | #endif |
2054 | #endif |
2027 | |
2055 | |
… | |
… | |
2100 | oldcursor.col = screen.cur.col; |
2128 | oldcursor.col = screen.cur.col; |
2101 | } |
2129 | } |
2102 | } |
2130 | } |
2103 | } |
2131 | } |
2104 | |
2132 | |
2105 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
|
|
2106 | #if ENABLE_OVERLAY |
|
|
2107 | scr_swap_overlay (); |
|
|
2108 | #endif |
|
|
2109 | |
|
|
2110 | #ifndef NO_SLOW_LINK_SUPPORT |
2133 | #ifndef NO_SLOW_LINK_SUPPORT |
2111 | /* |
2134 | /* |
2112 | * D: CopyArea pass - very useful for slower links |
2135 | * D: CopyArea pass - very useful for slower links |
2113 | * This has been deliberately kept simple. |
2136 | * This has been deliberately kept simple. |
2114 | */ |
2137 | */ |
… | |
… | |
2203 | continue; |
2226 | continue; |
2204 | |
2227 | |
2205 | // redraw one or more characters |
2228 | // redraw one or more characters |
2206 | |
2229 | |
2207 | // seek to the beginning of wide characters |
2230 | // seek to the beginning of wide characters |
2208 | while (stp[col] == NOCHAR && col > 0) |
2231 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2209 | --col; |
2232 | --col; |
2210 | |
2233 | |
2211 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2234 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2212 | text_t *text = stp + col; |
2235 | text_t *text = stp + col; |
2213 | int count = 1; |
2236 | int count = 1; |
… | |
… | |
2220 | for (i = 0; ++col < ncol; ) |
2243 | for (i = 0; ++col < ncol; ) |
2221 | { |
2244 | { |
2222 | if (stp[col] == NOCHAR) |
2245 | if (stp[col] == NOCHAR) |
2223 | { |
2246 | { |
2224 | dtp[col] = stp[col]; |
2247 | dtp[col] = stp[col]; |
2225 | drp[col] = rend; |
2248 | drp[col] = srp[col]; |
|
|
2249 | |
2226 | count++; |
2250 | count++; |
2227 | i++; |
2251 | i++; |
2228 | |
2252 | |
2229 | continue; |
2253 | continue; |
2230 | } |
2254 | } |
… | |
… | |
2250 | |
2274 | |
2251 | col--; /* went one too far. move back */ |
2275 | col--; /* went one too far. move back */ |
2252 | count -= i; /* dump any matching trailing chars */ |
2276 | count -= i; /* dump any matching trailing chars */ |
2253 | |
2277 | |
2254 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2278 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2255 | while (i && text[count] == NOCHAR) |
2279 | while (expect_false (i && text[count] == NOCHAR)) |
2256 | count++, i--; |
2280 | count++, i--; |
2257 | |
2281 | |
2258 | /* |
2282 | /* |
2259 | * Determine the attributes for the string |
2283 | * Determine the attributes for the string |
2260 | */ |
2284 | */ |
2261 | int fore = fgcolor_of (rend); // desired foreground |
2285 | int fore = fgcolor_of (rend); // desired foreground |
2262 | int back = bgcolor_of (rend); // desired background |
2286 | int back = bgcolor_of (rend); // desired background |
2263 | |
2287 | |
2264 | // only do special processing if any attributes are set, which is unlikely |
2288 | // only do special processing if any attributes are set, which is unlikely |
2265 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2289 | if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) |
2266 | { |
2290 | { |
2267 | bool invert = rend & RS_RVid; |
2291 | bool invert = rend & RS_RVid; |
2268 | |
2292 | |
2269 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2293 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2270 | if (rend & RS_Bold && fore == Color_fg) |
2294 | if (rend & RS_Bold && fore == Color_fg) |
… | |
… | |
2353 | /* |
2377 | /* |
2354 | * Actually do the drawing of the string here |
2378 | * Actually do the drawing of the string here |
2355 | */ |
2379 | */ |
2356 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2380 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2357 | |
2381 | |
2358 | if (have_bg && back == Color_bg) |
2382 | if (expect_true (have_bg && back == Color_bg)) |
2359 | { |
2383 | { |
2360 | // this is very ugly, maybe push it into ->draw? |
2384 | // this is very ugly, maybe push it into ->draw? |
2361 | |
2385 | |
2362 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2386 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2363 | if (text[i] != ' ') |
2387 | if (text[i] != ' ') |
… | |
… | |
2370 | did_clear: ; |
2394 | did_clear: ; |
2371 | } |
2395 | } |
2372 | else |
2396 | else |
2373 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2397 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2374 | |
2398 | |
2375 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2399 | if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) |
2376 | { |
2400 | { |
2377 | #if ENABLE_FRILLS |
2401 | #if ENABLE_FRILLS |
2378 | if (ISSET_PIXCOLOR (Color_underline)) |
2402 | if (ISSET_PIXCOLOR (Color_underline)) |
2379 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2403 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2380 | else |
2404 | else |
… | |
… | |
2385 | xpixel, ypixel + font->ascent + 1, |
2409 | xpixel, ypixel + font->ascent + 1, |
2386 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2410 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2387 | } |
2411 | } |
2388 | } /* for (col....) */ |
2412 | } /* for (col....) */ |
2389 | } /* for (row....) */ |
2413 | } /* for (row....) */ |
2390 | |
|
|
2391 | #if ENABLE_OVERLAY |
|
|
2392 | scr_swap_overlay (); |
|
|
2393 | #endif |
|
|
2394 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2395 | |
2414 | |
2396 | /* |
2415 | /* |
2397 | * G: cleanup cursor and display outline cursor if necessary |
2416 | * G: cleanup cursor and display outline cursor if necessary |
2398 | */ |
2417 | */ |
2399 | if (showcursor) |
2418 | if (showcursor) |
… | |
… | |
2438 | } |
2457 | } |
2439 | |
2458 | |
2440 | /* |
2459 | /* |
2441 | * H: cleanup selection |
2460 | * H: cleanup selection |
2442 | */ |
2461 | */ |
|
|
2462 | #if ENABLE_OVERLAY |
|
|
2463 | scr_swap_overlay (); |
|
|
2464 | #endif |
|
|
2465 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2466 | |
2443 | scr_reverse_selection (); |
2467 | scr_reverse_selection (); |
2444 | |
2468 | |
|
|
2469 | screen.flags = old_screen_flags; |
2445 | num_scr = 0; |
2470 | num_scr = 0; |
2446 | num_scr_allow = 1; |
2471 | num_scr_allow = 1; |
2447 | } |
2472 | } |
2448 | |
2473 | |
2449 | void |
2474 | void |
… | |
… | |
3708 | h += 2; min_it (h, nrow); |
3733 | h += 2; min_it (h, nrow); |
3709 | |
3734 | |
3710 | x -= 1; clamp_it (x, 0, ncol - w); |
3735 | x -= 1; clamp_it (x, 0, ncol - w); |
3711 | y -= 1; clamp_it (y, 0, nrow - h); |
3736 | y -= 1; clamp_it (y, 0, nrow - h); |
3712 | |
3737 | |
3713 | ov_x = x; ov_y = y; |
3738 | ov.x = x; ov.y = y; |
3714 | ov_w = w; ov_h = h; |
3739 | ov.w = w; ov.h = h; |
3715 | |
3740 | |
3716 | ov_text = new text_t *[h]; |
3741 | ov.text = new text_t *[h]; |
3717 | ov_rend = new rend_t *[h]; |
3742 | ov.rend = new rend_t *[h]; |
3718 | |
3743 | |
3719 | for (y = 0; y < h; y++) |
3744 | for (y = 0; y < h; y++) |
3720 | { |
3745 | { |
3721 | text_t *tp = ov_text[y] = new text_t[w]; |
3746 | text_t *tp = ov.text[y] = new text_t[w]; |
3722 | rend_t *rp = ov_rend[y] = new rend_t[w]; |
3747 | rend_t *rp = ov.rend[y] = new rend_t[w]; |
3723 | |
3748 | |
3724 | text_t t0, t1, t2; |
3749 | text_t t0, t1, t2; |
3725 | rend_t r = OVERLAY_RSTYLE; |
3750 | rend_t r = OVERLAY_RSTYLE; |
3726 | |
3751 | |
3727 | if (y == 0) |
3752 | if (y == 0) |
… | |
… | |
3746 | } |
3771 | } |
3747 | |
3772 | |
3748 | void |
3773 | void |
3749 | rxvt_term::scr_overlay_off () NOTHROW |
3774 | rxvt_term::scr_overlay_off () NOTHROW |
3750 | { |
3775 | { |
3751 | if (!ov_text) |
3776 | if (!ov.text) |
3752 | return; |
3777 | return; |
3753 | |
3778 | |
3754 | want_refresh = 1; |
3779 | want_refresh = 1; |
3755 | |
3780 | |
3756 | for (int y = 0; y < ov_h; y++) |
3781 | for (int y = 0; y < ov.h; y++) |
3757 | { |
3782 | { |
3758 | delete [] ov_text[y]; |
3783 | delete [] ov.text[y]; |
3759 | delete [] ov_rend[y]; |
3784 | delete [] ov.rend[y]; |
3760 | } |
3785 | } |
3761 | |
3786 | |
3762 | delete [] ov_text; ov_text = 0; |
3787 | delete [] ov.text; ov.text = 0; |
3763 | delete [] ov_rend; ov_rend = 0; |
3788 | delete [] ov.rend; ov.rend = 0; |
3764 | } |
3789 | } |
3765 | |
3790 | |
3766 | void |
3791 | void |
3767 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3792 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3768 | { |
3793 | { |
3769 | if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) |
3794 | if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2) |
3770 | return; |
3795 | return; |
3771 | |
3796 | |
3772 | x++, y++; |
3797 | x++, y++; |
3773 | |
3798 | |
3774 | ov_text[y][x] = text; |
3799 | ov.text[y][x] = text; |
3775 | ov_rend[y][x] = rend; |
3800 | ov.rend[y][x] = rend; |
3776 | } |
3801 | } |
3777 | |
3802 | |
3778 | void |
3803 | void |
3779 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3804 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3780 | { |
3805 | { |
… | |
… | |
3799 | } |
3824 | } |
3800 | |
3825 | |
3801 | void |
3826 | void |
3802 | rxvt_term::scr_swap_overlay () NOTHROW |
3827 | rxvt_term::scr_swap_overlay () NOTHROW |
3803 | { |
3828 | { |
3804 | if (!ov_text) |
3829 | if (!ov.text) |
3805 | return; |
3830 | return; |
3806 | |
3831 | |
|
|
3832 | // hide cursor if it is within the overlay area |
|
|
3833 | if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w) |
|
|
3834 | && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h)) |
|
|
3835 | screen.flags &= ~Screen_VisibleCursor; |
|
|
3836 | |
3807 | // swap screen mem with overlay |
3837 | // swap screen mem with overlay |
3808 | for (int y = ov_h; y--; ) |
3838 | for (int y = ov.h; y--; ) |
3809 | { |
3839 | { |
3810 | text_t *t1 = ov_text[y]; |
3840 | text_t *t1 = ov.text[y]; |
3811 | rend_t *r1 = ov_rend[y]; |
3841 | rend_t *r1 = ov.rend[y]; |
3812 | |
3842 | |
3813 | text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; |
3843 | text_t *t2 = ROW(y + ov.y + view_start).t + ov.x; |
3814 | rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; |
3844 | rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x; |
3815 | |
3845 | |
3816 | for (int x = ov_w; x--; ) |
3846 | for (int x = ov.w; x--; ) |
3817 | { |
3847 | { |
3818 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3848 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3819 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3849 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3820 | } |
3850 | } |
3821 | } |
3851 | } |