… | |
… | |
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 |
|
|
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 | |
153 | /* ------------------------------------------------------------------------- * |
156 | /* ------------------------------------------------------------------------- * |
154 | * SCREEN INITIALISATION * |
157 | * SCREEN INITIALISATION * |
155 | * ------------------------------------------------------------------------- */ |
158 | * ------------------------------------------------------------------------- */ |
156 | |
159 | |
157 | void |
160 | void |
158 | rxvt_term::scr_reset () |
161 | rxvt_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 |
… | |
… | |
236 | selection.text = NULL; |
231 | selection.text = NULL; |
237 | selection.len = 0; |
232 | selection.len = 0; |
238 | selection.op = SELECTION_CLEAR; |
233 | selection.op = SELECTION_CLEAR; |
239 | selection.screen = PRIMARY; |
234 | selection.screen = PRIMARY; |
240 | selection.clicks = 0; |
235 | selection.clicks = 0; |
|
|
236 | selection.clip_text = NULL; |
|
|
237 | selection.clip_len = 0; |
241 | } |
238 | } |
242 | else |
239 | else |
243 | { |
240 | { |
244 | /* |
241 | /* |
245 | * add or delete rows as appropriate |
242 | * add or delete rows as appropriate |
… | |
… | |
283 | |
280 | |
284 | if (top_row) |
281 | if (top_row) |
285 | { |
282 | { |
286 | // Re-wrap lines. This is rather ugly, possibly because I am too dumb |
283 | // Re-wrap lines. This is rather ugly, possibly because I am too dumb |
287 | // to come up with a lean and mean algorithm. |
284 | // to come up with a lean and mean algorithm. |
|
|
285 | // TODO: maybe optimise when width didn't change |
288 | |
286 | |
289 | row_col_t ocur = screen.cur; |
287 | row_col_t ocur = screen.cur; |
290 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
288 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
291 | |
289 | |
292 | do |
290 | do |
293 | { |
291 | { |
294 | p = MOD (p - 1, prev_total_rows); |
292 | p = MOD (p - 1, prev_total_rows); |
295 | #ifdef DEBUG_STRICT |
|
|
296 | assert (old_buf [MOD (p, prev_total_rows)].t); |
293 | assert (old_buf [MOD (p, prev_total_rows)].t); |
297 | #endif |
|
|
298 | int plines = 1; |
294 | int plines = 1; |
299 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
295 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
300 | |
296 | |
301 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
297 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
302 | { |
298 | { |
… | |
… | |
396 | delete old_ta; |
392 | delete old_ta; |
397 | delete old_ra; |
393 | delete old_ra; |
398 | |
394 | |
399 | clamp_it (screen.cur.row, 0, nrow - 1); |
395 | clamp_it (screen.cur.row, 0, nrow - 1); |
400 | clamp_it (screen.cur.col, 0, ncol - 1); |
396 | clamp_it (screen.cur.col, 0, ncol - 1); |
|
|
397 | } |
401 | |
398 | |
402 | free (tabs); |
399 | free (tabs); |
403 | } |
400 | tabs = (char *)rxvt_malloc (ncol); |
|
|
401 | |
|
|
402 | for (int col = ncol; --col; ) |
|
|
403 | tabs [col] = col % TABSIZE == 0; |
404 | |
404 | |
405 | CLEAR_ALL_SELECTION (); |
405 | CLEAR_ALL_SELECTION (); |
406 | |
406 | |
407 | prev_nrow = nrow; |
407 | prev_nrow = nrow; |
408 | prev_ncol = ncol; |
408 | 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 | |
409 | |
418 | tt_winch (); |
410 | tt_winch (); |
419 | |
411 | |
420 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
412 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
421 | } |
413 | } |
… | |
… | |
433 | delete ralloc; ralloc = 0; |
425 | delete ralloc; ralloc = 0; |
434 | |
426 | |
435 | free (row_buf); |
427 | free (row_buf); |
436 | free (swap_buf); |
428 | free (swap_buf); |
437 | free (drawn_buf); |
429 | free (drawn_buf); |
|
|
430 | row_buf = 0; // signal that we freed all the arrays above |
|
|
431 | |
438 | free (tabs); |
432 | free (tabs); |
439 | |
433 | tabs = 0; |
440 | row_buf = 0; // signal that we freed all the arrays |
|
|
441 | } |
434 | } |
442 | } |
435 | } |
443 | |
436 | |
444 | /* ------------------------------------------------------------------------- */ |
437 | /* ------------------------------------------------------------------------- */ |
445 | /* |
438 | /* |
446 | * Hard reset |
439 | * Hard/Soft reset |
447 | */ |
440 | */ |
448 | void |
441 | void |
449 | rxvt_term::scr_poweron () |
442 | rxvt_term::scr_poweron () |
450 | { |
443 | { |
451 | scr_release (); |
444 | scr_release (); |
452 | prev_nrow = prev_ncol = 0; |
445 | prev_nrow = prev_ncol = 0; |
|
|
446 | rvideo_mode = false; |
|
|
447 | scr_soft_reset (); |
453 | scr_reset (); |
448 | scr_reset (); |
454 | |
449 | |
455 | scr_clear (true); |
450 | scr_clear (true); |
456 | scr_refresh (); |
451 | scr_refresh (); |
|
|
452 | } |
|
|
453 | |
|
|
454 | void |
|
|
455 | rxvt_term::scr_soft_reset () |
|
|
456 | { |
|
|
457 | /* only affects modes, nothing drastic such as clearing the screen */ |
|
|
458 | #if ENABLE_OVERLAY |
|
|
459 | scr_overlay_off (); |
|
|
460 | #endif |
|
|
461 | |
|
|
462 | if (current_screen != PRIMARY) |
|
|
463 | scr_swap_screen (); |
|
|
464 | |
|
|
465 | scr_scroll_region (0, MAX_ROWS - 1); |
|
|
466 | scr_rendition (0, ~RS_None); |
|
|
467 | scr_insert_mode (0); |
457 | } |
468 | } |
458 | |
469 | |
459 | /* ------------------------------------------------------------------------- * |
470 | /* ------------------------------------------------------------------------- * |
460 | * PROCESS SCREEN COMMANDS * |
471 | * PROCESS SCREEN COMMANDS * |
461 | * ------------------------------------------------------------------------- */ |
472 | * ------------------------------------------------------------------------- */ |
… | |
… | |
499 | } |
510 | } |
500 | |
511 | |
501 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
512 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
502 | min_it (s->cur.row, nrow - 1); |
513 | min_it (s->cur.row, nrow - 1); |
503 | min_it (s->cur.col, ncol - 1); |
514 | min_it (s->cur.col, ncol - 1); |
504 | #ifdef DEBUG_STRICT |
|
|
505 | assert (s->cur.row >= 0); |
515 | assert (s->cur.row >= 0); |
506 | assert (s->cur.col >= 0); |
516 | assert (s->cur.col >= 0); |
507 | #endif |
|
|
508 | } |
517 | } |
509 | |
518 | |
510 | void |
519 | void |
511 | rxvt_term::scr_swap_screen () |
520 | rxvt_term::scr_swap_screen () |
512 | { |
521 | { |
… | |
… | |
537 | want_refresh = 1; |
546 | want_refresh = 1; |
538 | view_start = 0; |
547 | view_start = 0; |
539 | |
548 | |
540 | selection_check (2); /* check for boundary cross */ |
549 | selection_check (2); /* check for boundary cross */ |
541 | |
550 | |
542 | int i = current_screen; current_screen = scrn; scrn = i; |
551 | current_screen = scrn; |
543 | |
552 | |
544 | #if NSCREENS |
553 | #if NSCREENS |
545 | if (option (Opt_secondaryScreen)) |
554 | if (option (Opt_secondaryScreen)) |
546 | { |
555 | { |
547 | num_scr = 0; |
556 | num_scr = 0; |
… | |
… | |
772 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
781 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
773 | screen.cur.row -= minlines; |
782 | screen.cur.row -= minlines; |
774 | } |
783 | } |
775 | } |
784 | } |
776 | |
785 | |
777 | #ifdef DEBUG_STRICT |
|
|
778 | assert (screen.cur.col < ncol); |
786 | assert (screen.cur.col < ncol); |
779 | assert (screen.cur.row < nrow |
787 | assert (screen.cur.row < nrow |
780 | && screen.cur.row >= top_row); |
788 | && screen.cur.row >= top_row); |
781 | #endif |
|
|
782 | int row = screen.cur.row; |
789 | int row = screen.cur.row; |
783 | |
790 | |
784 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
791 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
785 | |
792 | |
786 | line_t *line = &ROW(row); |
793 | line_t *line = &ROW(row); |
787 | |
794 | |
788 | while (str < strend) |
795 | while (str < strend) |
789 | { |
796 | { |
790 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
797 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
791 | |
798 | |
792 | if (c < 0x20) |
799 | if (expect_false (c < 0x20)) |
793 | if (c == C0_LF) |
800 | if (c == C0_LF) |
794 | { |
801 | { |
795 | max_it (line->l, screen.cur.col); |
802 | max_it (line->l, screen.cur.col); |
796 | |
803 | |
797 | screen.flags &= ~Screen_WrapNext; |
804 | screen.flags &= ~Screen_WrapNext; |
… | |
… | |
816 | { |
823 | { |
817 | scr_tab (1, true); |
824 | scr_tab (1, true); |
818 | continue; |
825 | continue; |
819 | } |
826 | } |
820 | |
827 | |
|
|
828 | if (expect_false ( |
821 | if (checksel /* see if we're writing within selection */ |
829 | checksel /* see if we're writing within selection */ |
822 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
830 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
823 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
831 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
|
|
832 | )) |
824 | { |
833 | { |
825 | checksel = 0; |
834 | checksel = 0; |
826 | /* |
835 | /* |
827 | * If we wrote anywhere in the selected area, kill the selection |
836 | * If we wrote anywhere in the selected area, kill the selection |
828 | * XXX: should we kill the mark too? Possibly, but maybe that |
837 | * XXX: should we kill the mark too? Possibly, but maybe that |
829 | * should be a similar check. |
838 | * should be a similar check. |
830 | */ |
839 | */ |
831 | CLEAR_SELECTION (); |
840 | CLEAR_SELECTION (); |
832 | } |
841 | } |
833 | |
842 | |
834 | if (screen.flags & Screen_WrapNext) |
843 | if (expect_false (screen.flags & Screen_WrapNext)) |
835 | { |
844 | { |
836 | scr_do_wrap (); |
845 | scr_do_wrap (); |
837 | |
846 | |
838 | line->l = ncol; |
847 | line->l = ncol; |
839 | line->is_longer (1); |
848 | line->is_longer (1); |
… | |
… | |
841 | row = screen.cur.row; |
850 | row = screen.cur.row; |
842 | line = &ROW(row); /* _must_ refresh */ |
851 | line = &ROW(row); /* _must_ refresh */ |
843 | } |
852 | } |
844 | |
853 | |
845 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
854 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
846 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
855 | if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
847 | c = 0xfffd; |
856 | c = 0xfffd; |
848 | |
857 | |
849 | // rely on wcwidth to tell us the character width, do wcwidth before |
858 | // rely on wcwidth to tell us the character width, do wcwidth before |
850 | // further replacements, as wcwidth might return -1 for the line |
859 | // further replacements, as wcwidth might return -1 for the line |
851 | // drawing characters below as they might be invalid in the current |
860 | // drawing characters below as they might be invalid in the current |
852 | // locale. |
861 | // locale. |
853 | int width = WCWIDTH (c); |
862 | int width = WCWIDTH (c); |
854 | |
863 | |
855 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
864 | if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL |
856 | { |
865 | { |
857 | // vt100 special graphics and line drawing |
866 | // vt100 special graphics and line drawing |
858 | // 5f-7e standard vt100 |
867 | // 5f-7e standard vt100 |
859 | // 40-5e rxvt extension for extra curses acs chars |
868 | // 40-5e rxvt extension for extra curses acs chars |
860 | static uint16_t vt100_0[62] = { // 41 .. 7e |
869 | static uint16_t vt100_0[62] = { // 41 .. 7e |
… | |
… | |
873 | c = vt100_0[c - 0x41]; |
882 | c = vt100_0[c - 0x41]; |
874 | width = 1; // vt100 line drawing characters are always single-width |
883 | width = 1; // vt100 line drawing characters are always single-width |
875 | } |
884 | } |
876 | } |
885 | } |
877 | |
886 | |
878 | if (screen.flags & Screen_Insert) |
887 | if (expect_false (screen.flags & Screen_Insert)) |
879 | scr_insdel_chars (width, INSERT); |
888 | scr_insdel_chars (width, INSERT); |
880 | |
889 | |
881 | if (width != 0) |
890 | if (width != 0) |
882 | { |
891 | { |
883 | #if !UNICODE_3 |
892 | #if !UNICODE_3 |
… | |
… | |
889 | c = 0xfffd; |
898 | c = 0xfffd; |
890 | # endif |
899 | # endif |
891 | #endif |
900 | #endif |
892 | |
901 | |
893 | // nuke the character at this position, if required |
902 | // nuke the character at this position, if required |
|
|
903 | if (expect_false ( |
894 | if (line->t[screen.cur.col] == NOCHAR |
904 | line->t[screen.cur.col] == NOCHAR |
895 | || (screen.cur.col < ncol - 1 |
905 | || (screen.cur.col < ncol - 1 |
896 | && line->t[screen.cur.col + 1] == NOCHAR)) |
906 | && line->t[screen.cur.col + 1] == NOCHAR) |
|
|
907 | )) |
|
|
908 | scr_kill_char (*line, screen.cur.col); |
|
|
909 | |
|
|
910 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
911 | |
|
|
912 | // if the character doesn't fit into the remaining columns... |
|
|
913 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
897 | { |
914 | { |
898 | int col = screen.cur.col; |
915 | // ... 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 = ' '; |
916 | c = NOCHAR; |
921 | // and try the same character next loop iteration |
917 | // and try the same character next loop iteration |
922 | --str; |
918 | --str; |
923 | } |
919 | } |
924 | |
920 | |
925 | line->touch (); |
921 | line->touch (); |
… | |
… | |
927 | do |
923 | do |
928 | { |
924 | { |
929 | line->t[screen.cur.col] = c; |
925 | line->t[screen.cur.col] = c; |
930 | line->r[screen.cur.col] = rend; |
926 | line->r[screen.cur.col] = rend; |
931 | |
927 | |
932 | if (screen.cur.col < ncol - 1) |
928 | if (expect_true (screen.cur.col < ncol - 1)) |
933 | screen.cur.col++; |
929 | screen.cur.col++; |
934 | else |
930 | else |
935 | { |
931 | { |
936 | line->l = ncol; |
932 | line->l = ncol; |
937 | if (screen.flags & Screen_Autowrap) |
933 | if (screen.flags & Screen_Autowrap) |
… | |
… | |
939 | break; |
935 | break; |
940 | } |
936 | } |
941 | |
937 | |
942 | c = NOCHAR; |
938 | c = NOCHAR; |
943 | } |
939 | } |
944 | while (--width > 0); |
940 | while (expect_false (--width > 0)); |
945 | |
941 | |
946 | // pad with spaces when overwriting wide character with smaller one |
942 | // pad with spaces when overwriting wide character with smaller one |
947 | if (!width) |
943 | if (expect_false (!width)) |
948 | { |
944 | { |
949 | line->touch (); |
945 | line->touch (); |
950 | |
946 | |
951 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
947 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
952 | { |
948 | { |
953 | line->t[c] = ' '; |
949 | line->t[c] = ' '; |
954 | line->r[c] = rend; |
950 | line->r[c] = rend; |
955 | } |
951 | } |
956 | } |
952 | } |
957 | } |
953 | } |
|
|
954 | #if ENABLE_COMBINING |
958 | else // width == 0 |
955 | else // width == 0 |
959 | { |
956 | { |
960 | #if ENABLE_COMBINING |
957 | 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 | { |
958 | { |
|
|
959 | // handle combining characters |
|
|
960 | // we just tag the accent on the previous on-screen character. |
|
|
961 | // this is arguably not correct, but also arguably not wrong. |
|
|
962 | // we don't handle double-width characters nicely yet. |
|
|
963 | line_t *linep; |
|
|
964 | text_t *tp; |
|
|
965 | rend_t *rp; |
|
|
966 | |
|
|
967 | if (screen.cur.col > 0) |
|
|
968 | { |
971 | linep = line; |
969 | linep = line; |
972 | tp = line->t + screen.cur.col - 1; |
970 | tp = line->t + screen.cur.col - 1; |
973 | rp = line->r + screen.cur.col - 1; |
971 | rp = line->r + screen.cur.col - 1; |
|
|
972 | } |
|
|
973 | else if (screen.cur.row > 0 |
|
|
974 | && ROW(screen.cur.row - 1).is_longer ()) |
|
|
975 | { |
|
|
976 | linep = &ROW(screen.cur.row - 1); |
|
|
977 | tp = line->t + ncol - 1; |
|
|
978 | rp = line->r + ncol - 1; |
|
|
979 | } |
|
|
980 | else |
|
|
981 | continue; |
|
|
982 | |
|
|
983 | linep->touch (); |
|
|
984 | |
|
|
985 | while (*tp == NOCHAR && tp > linep->t) |
|
|
986 | tp--, rp--; |
|
|
987 | |
|
|
988 | // first try to find a precomposed character |
|
|
989 | unicode_t n = rxvt_compose (*tp, c); |
|
|
990 | if (n == NOCHAR) |
|
|
991 | n = rxvt_composite.compose (*tp, c); |
|
|
992 | |
|
|
993 | *tp = n; |
|
|
994 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
974 | } |
995 | } |
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 | } |
996 | } |
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 |
997 | #endif |
998 | } |
|
|
999 | } |
998 | } |
1000 | |
999 | |
1001 | max_it (line->l, screen.cur.col); |
1000 | max_it (line->l, screen.cur.col); |
1002 | |
1001 | |
1003 | #ifdef DEBUG_STRICT |
|
|
1004 | assert (screen.cur.row >= 0); |
1002 | assert (screen.cur.row >= 0); |
1005 | #endif |
|
|
1006 | } |
1003 | } |
1007 | |
1004 | |
1008 | /* ------------------------------------------------------------------------- */ |
1005 | /* ------------------------------------------------------------------------- */ |
1009 | /* |
1006 | /* |
1010 | * Process Backspace. Move back the cursor back a position, wrap if have to |
1007 | * Process Backspace. Move back the cursor back a position, wrap if have to |
… | |
… | |
1227 | /* |
1224 | /* |
1228 | * Erase part or whole of a line |
1225 | * Erase part or whole of a line |
1229 | * XTERM_SEQ: Clear line to right: ESC [ 0 K |
1226 | * XTERM_SEQ: Clear line to right: ESC [ 0 K |
1230 | * XTERM_SEQ: Clear line to left : ESC [ 1 K |
1227 | * XTERM_SEQ: Clear line to left : ESC [ 1 K |
1231 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
1228 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
|
|
1229 | * extension: clear to right unless wrapped: ESC [ 3 K |
1232 | */ |
1230 | */ |
1233 | void |
1231 | void |
1234 | rxvt_term::scr_erase_line (int mode) NOTHROW |
1232 | rxvt_term::scr_erase_line (int mode) NOTHROW |
1235 | { |
1233 | { |
1236 | unsigned int col, num; |
1234 | unsigned int col, num; |
… | |
… | |
1245 | line.touch (); |
1243 | line.touch (); |
1246 | line.is_longer (0); |
1244 | line.is_longer (0); |
1247 | |
1245 | |
1248 | switch (mode) |
1246 | switch (mode) |
1249 | { |
1247 | { |
|
|
1248 | case 3: |
|
|
1249 | if (screen.flags & Screen_WrapNext) |
|
|
1250 | return; |
|
|
1251 | |
|
|
1252 | /* fall through */ |
|
|
1253 | |
1250 | case 0: /* erase to end of line */ |
1254 | case 0: /* erase to end of line */ |
1251 | col = screen.cur.col; |
1255 | col = screen.cur.col; |
1252 | num = ncol - col; |
1256 | num = ncol - col; |
1253 | min_it (line.l, col); |
1257 | min_it (line.l, col); |
|
|
1258 | |
1254 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1259 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1255 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1260 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1256 | CLEAR_SELECTION (); |
1261 | CLEAR_SELECTION (); |
1257 | break; |
1262 | break; |
|
|
1263 | |
1258 | case 1: /* erase to beginning of line */ |
1264 | case 1: /* erase to beginning of line */ |
1259 | col = 0; |
1265 | col = 0; |
1260 | num = screen.cur.col + 1; |
1266 | num = screen.cur.col + 1; |
|
|
1267 | |
1261 | if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) |
1268 | if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) |
1262 | || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) |
1269 | || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) |
1263 | CLEAR_SELECTION (); |
1270 | CLEAR_SELECTION (); |
1264 | break; |
1271 | break; |
|
|
1272 | |
1265 | case 2: /* erase whole line */ |
1273 | case 2: /* erase whole line */ |
1266 | col = 0; |
1274 | col = 0; |
1267 | num = ncol; |
1275 | num = ncol; |
1268 | line.l = 0; |
1276 | line.l = 0; |
1269 | if (selection.beg.row <= screen.cur.row |
1277 | if (selection.beg.row <= screen.cur.row |
… | |
… | |
1327 | if (row >= nrow) /* Out Of Bounds */ |
1335 | if (row >= nrow) /* Out Of Bounds */ |
1328 | return; |
1336 | return; |
1329 | |
1337 | |
1330 | min_it (num, nrow - row); |
1338 | min_it (num, nrow - row); |
1331 | |
1339 | |
|
|
1340 | // TODO: the code below does not work when view_start != 0 |
|
|
1341 | // the workaround is to disable the clear and use a normal refresh |
|
|
1342 | // when view_start != 0. mysterious. |
1332 | if (rstyle & (RS_RVid | RS_Uline)) |
1343 | if (rstyle & (RS_RVid | RS_Uline)) |
1333 | ren = (rend_t) ~RS_None; |
1344 | ren = (rend_t) ~RS_None; |
1334 | else if (GET_BASEBG (rstyle) == Color_bg) |
1345 | else if (GET_BASEBG (rstyle) == Color_bg) |
1335 | { |
1346 | { |
1336 | ren = DEFAULT_RSTYLE; |
1347 | ren = DEFAULT_RSTYLE; |
1337 | CLEAR_ROWS (row, num); |
1348 | |
|
|
1349 | if (mapped && !view_start) |
|
|
1350 | XClearArea (dpy, vt, 0, |
|
|
1351 | Row2Pixel (row - view_start), (unsigned int)width, |
|
|
1352 | (unsigned int)Height2Pixel (num), False); |
1338 | } |
1353 | } |
1339 | else |
1354 | else |
1340 | { |
1355 | { |
1341 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1356 | ren = rstyle & (RS_fgMask | RS_bgMask); |
|
|
1357 | |
|
|
1358 | if (mapped && !view_start) |
|
|
1359 | { |
1342 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1360 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1343 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1361 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1344 | ERASE_ROWS (row, num); |
1362 | XFillRectangle (dpy, vt, gc, |
|
|
1363 | 0, Row2Pixel (row - view_start), |
|
|
1364 | (unsigned int)width, |
|
|
1365 | (unsigned int)Height2Pixel (num)); |
1345 | gcvalue.foreground = pix_colors[Color_fg]; |
1366 | gcvalue.foreground = pix_colors[Color_fg]; |
1346 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1367 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
|
|
1368 | } |
1347 | } |
1369 | } |
1348 | |
1370 | |
1349 | for (; num--; row++) |
1371 | for (; num--; row++) |
1350 | { |
1372 | { |
1351 | scr_blank_screen_mem (ROW(row), rstyle); |
1373 | scr_blank_screen_mem (ROW(row), rstyle); |
|
|
1374 | |
|
|
1375 | if (!view_start) |
1352 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1376 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1353 | } |
1377 | } |
1354 | } |
1378 | } |
1355 | |
1379 | |
1356 | #if !ENABLE_MINIMAL |
1380 | #if !ENABLE_MINIMAL |
1357 | void |
1381 | void |
… | |
… | |
1431 | * Insert/Delete <count> characters from the current position |
1455 | * Insert/Delete <count> characters from the current position |
1432 | */ |
1456 | */ |
1433 | void |
1457 | void |
1434 | rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW |
1458 | rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW |
1435 | { |
1459 | { |
1436 | int col, row; |
|
|
1437 | rend_t tr; |
|
|
1438 | |
|
|
1439 | want_refresh = 1; |
1460 | want_refresh = 1; |
1440 | ZERO_SCROLLBACK (); |
1461 | ZERO_SCROLLBACK (); |
1441 | |
1462 | |
1442 | if (count <= 0) |
1463 | if (count <= 0) |
1443 | return; |
1464 | return; |
… | |
… | |
1445 | scr_do_wrap (); |
1466 | scr_do_wrap (); |
1446 | |
1467 | |
1447 | selection_check (1); |
1468 | selection_check (1); |
1448 | min_it (count, ncol - screen.cur.col); |
1469 | min_it (count, ncol - screen.cur.col); |
1449 | |
1470 | |
1450 | row = screen.cur.row; |
1471 | int row = screen.cur.row; |
1451 | |
1472 | |
1452 | line_t *line = &ROW(row); |
1473 | line_t *line = &ROW(row); |
1453 | |
1474 | |
1454 | line->touch (); |
1475 | line->touch (); |
1455 | line->is_longer (0); |
1476 | line->is_longer (0); |
1456 | |
1477 | |
|
|
1478 | // nuke wide spanning the start |
|
|
1479 | if (line->t[screen.cur.col] == NOCHAR) |
|
|
1480 | scr_kill_char (*line, screen.cur.col); |
|
|
1481 | |
1457 | switch (insdel) |
1482 | switch (insdel) |
1458 | { |
1483 | { |
1459 | case INSERT: |
1484 | case INSERT: |
1460 | for (col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1485 | line->l = min (line->l + count, ncol); |
|
|
1486 | |
|
|
1487 | if (line->t[screen.cur.col] == NOCHAR) |
|
|
1488 | scr_kill_char (*line, screen.cur.col); |
|
|
1489 | |
|
|
1490 | for (int col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1461 | { |
1491 | { |
1462 | line->t[col] = line->t[col - count]; |
1492 | line->t[col] = line->t[col - count]; |
1463 | line->r[col] = line->r[col - count]; |
1493 | line->r[col] = line->r[col - count]; |
1464 | } |
1494 | } |
1465 | |
|
|
1466 | line->l = min (line->l + count, ncol); |
|
|
1467 | |
1495 | |
1468 | if (selection.op && current_screen == selection.screen |
1496 | if (selection.op && current_screen == selection.screen |
1469 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1497 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1470 | { |
1498 | { |
1471 | if (selection.end.row != screen.cur.row |
1499 | if (selection.end.row != screen.cur.row |
… | |
… | |
1486 | case ERASE: |
1514 | case ERASE: |
1487 | screen.cur.col += count; /* don't worry if > ncol */ |
1515 | screen.cur.col += count; /* don't worry if > ncol */ |
1488 | selection_check (1); |
1516 | selection_check (1); |
1489 | screen.cur.col -= count; |
1517 | screen.cur.col -= count; |
1490 | |
1518 | |
1491 | line->l = max (line->l - count, 0); |
1519 | // nuke wide char after the end |
|
|
1520 | if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR) |
|
|
1521 | scr_kill_char (*line, screen.cur.col + count); |
|
|
1522 | |
1492 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1523 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1493 | break; |
1524 | break; |
1494 | |
1525 | |
1495 | case DELETE: |
1526 | case DELETE: |
1496 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1527 | line->l = max (line->l - count, 0); |
1497 | |
1528 | |
|
|
1529 | // nuke wide char spanning the end |
|
|
1530 | if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR) |
|
|
1531 | scr_kill_char (*line, screen.cur.col + count); |
|
|
1532 | |
1498 | for (col = screen.cur.col; (col + count) < ncol; col++) |
1533 | for (int col = screen.cur.col; (col + count) < ncol; col++) |
1499 | { |
1534 | { |
1500 | line->t[col] = line->t[col + count]; |
1535 | line->t[col] = line->t[col + count]; |
1501 | line->r[col] = line->r[col + count]; |
1536 | line->r[col] = line->r[col + count]; |
1502 | } |
1537 | } |
1503 | |
1538 | |
1504 | line->l = max (line->l - count, 0); |
|
|
1505 | scr_blank_line (*line, ncol - count, count, tr); |
1539 | scr_blank_line (*line, ncol - count, count, rstyle); |
1506 | |
1540 | |
1507 | if (selection.op && current_screen == selection.screen |
1541 | if (selection.op && current_screen == selection.screen |
1508 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1542 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1509 | { |
1543 | { |
1510 | if (selection.end.row != screen.cur.row |
1544 | if (selection.end.row != screen.cur.row |
… | |
… | |
1888 | XMapWindow (dpy, parent[0]); |
1922 | XMapWindow (dpy, parent[0]); |
1889 | # endif |
1923 | # endif |
1890 | |
1924 | |
1891 | # if ENABLE_FRILLS |
1925 | # if ENABLE_FRILLS |
1892 | if (option (Opt_urgentOnBell)) |
1926 | if (option (Opt_urgentOnBell)) |
1893 | { |
1927 | 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 |
1928 | # endif |
1901 | |
1929 | |
1902 | if (option (Opt_visualBell)) |
1930 | if (option (Opt_visualBell)) |
1903 | { |
1931 | { |
1904 | rvideo_bell = true; |
1932 | rvideo_bell = true; |
… | |
… | |
1907 | |
1935 | |
1908 | bell_ev.start (VISUAL_BELL_DURATION); |
1936 | bell_ev.start (VISUAL_BELL_DURATION); |
1909 | } |
1937 | } |
1910 | else |
1938 | else |
1911 | XBell (dpy, 0); |
1939 | XBell (dpy, 0); |
|
|
1940 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1912 | #endif |
1941 | #endif |
1913 | } |
1942 | } |
1914 | |
1943 | |
1915 | /* ------------------------------------------------------------------------- */ |
1944 | /* ------------------------------------------------------------------------- */ |
1916 | /* ARGSUSED */ |
1945 | /* ARGSUSED */ |
1917 | void |
1946 | void |
1918 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1947 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1919 | { |
1948 | { |
1920 | #ifdef PRINTPIPE |
1949 | #ifdef PRINTPIPE |
1921 | int nrows, row_start; |
1950 | int nrows, row_start; |
1922 | FILE *fd; |
1951 | FILE *fd = popen_printer (); |
1923 | |
1952 | |
1924 | if ((fd = popen_printer ()) == NULL) |
1953 | if (!fd) |
1925 | return; |
1954 | return; |
1926 | |
1955 | |
1927 | if (fullhist) |
1956 | if (fullhist) |
1928 | { |
1957 | { |
1929 | nrows = nrow - top_row; |
1958 | nrows = nrow - top_row; |
… | |
… | |
1935 | row_start = view_start; |
1964 | row_start = view_start; |
1936 | } |
1965 | } |
1937 | |
1966 | |
1938 | wctomb (0, 0); |
1967 | wctomb (0, 0); |
1939 | |
1968 | |
1940 | for (int r1 = 0; r1 < nrows; r1++) |
1969 | for (int r1 = row_start; r1 < row_start + nrows; r1++) |
1941 | { |
1970 | { |
1942 | text_t *tp = ROW(r1).t; |
1971 | text_t *tp = ROW(r1).t; |
1943 | int len = ROW(r1).l; |
1972 | int len = ROW(r1).l; |
1944 | |
1973 | |
1945 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
1974 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
… | |
… | |
1974 | * screen.text/screen.rend contain what the screen will change to. |
2003 | * screen.text/screen.rend contain what the screen will change to. |
1975 | */ |
2004 | */ |
1976 | void |
2005 | void |
1977 | rxvt_term::scr_refresh () NOTHROW |
2006 | rxvt_term::scr_refresh () NOTHROW |
1978 | { |
2007 | { |
1979 | unsigned char have_bg, |
|
|
1980 | showcursor; /* show the cursor */ |
|
|
1981 | int16_t col, row, /* column/row we're processing */ |
2008 | int16_t col, row, /* column/row we're processing */ |
1982 | ocrow; /* old cursor row */ |
2009 | ocrow; /* old cursor row */ |
1983 | int i; /* tmp */ |
2010 | int i; /* tmp */ |
1984 | #ifndef NO_CURSORCOLOR |
2011 | #ifndef NO_CURSORCOLOR |
1985 | rend_t cc1; /* store colours at cursor position (s) */ |
2012 | rend_t cc1; /* store colours at cursor position (s) */ |
… | |
… | |
1994 | return; |
2021 | return; |
1995 | |
2022 | |
1996 | /* |
2023 | /* |
1997 | * A: set up vars |
2024 | * A: set up vars |
1998 | */ |
2025 | */ |
1999 | have_bg = 0; |
|
|
2000 | refresh_count = 0; |
2026 | refresh_count = 0; |
2001 | |
2027 | |
|
|
2028 | unsigned int old_screen_flags = screen.flags; |
|
|
2029 | char have_bg = 0; |
2002 | #ifdef HAVE_BG_PIXMAP |
2030 | #ifdef HAVE_BG_PIXMAP |
2003 | have_bg |= bgPixmap.pixmap != None; |
2031 | have_bg = bgPixmap.pixmap != None; |
2004 | #endif |
2032 | #endif |
2005 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2033 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2006 | |
2034 | |
2007 | /* |
2035 | /* |
2008 | * B: reverse any characters which are selected |
2036 | * B: reverse any characters which are selected |
2009 | */ |
2037 | */ |
2010 | scr_reverse_selection (); |
2038 | scr_reverse_selection (); |
|
|
2039 | |
|
|
2040 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
|
|
2041 | #if ENABLE_OVERLAY |
|
|
2042 | scr_swap_overlay (); |
|
|
2043 | #endif |
|
|
2044 | |
|
|
2045 | char showcursor = screen.flags & Screen_VisibleCursor; |
2011 | |
2046 | |
2012 | /* |
2047 | /* |
2013 | * C: set the cursor character (s) |
2048 | * C: set the cursor character (s) |
2014 | */ |
2049 | */ |
2015 | { |
2050 | { |
2016 | unsigned char setoldcursor; |
2051 | unsigned char setoldcursor; |
2017 | |
2052 | |
2018 | showcursor = (screen.flags & Screen_VisibleCursor); |
|
|
2019 | #ifdef CURSOR_BLINK |
2053 | #ifdef CURSOR_BLINK |
2020 | if (hidden_cursor) |
2054 | if (hidden_cursor) |
2021 | showcursor = 0; |
2055 | showcursor = 0; |
2022 | #endif |
2056 | #endif |
2023 | |
2057 | |
… | |
… | |
2096 | oldcursor.col = screen.cur.col; |
2130 | oldcursor.col = screen.cur.col; |
2097 | } |
2131 | } |
2098 | } |
2132 | } |
2099 | } |
2133 | } |
2100 | |
2134 | |
2101 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
|
|
2102 | #if ENABLE_OVERLAY |
|
|
2103 | scr_swap_overlay (); |
|
|
2104 | #endif |
|
|
2105 | |
|
|
2106 | #ifndef NO_SLOW_LINK_SUPPORT |
2135 | #ifndef NO_SLOW_LINK_SUPPORT |
2107 | /* |
2136 | /* |
2108 | * D: CopyArea pass - very useful for slower links |
2137 | * D: CopyArea pass - very useful for slower links |
2109 | * This has been deliberately kept simple. |
2138 | * This has been deliberately kept simple. |
2110 | */ |
2139 | */ |
… | |
… | |
2199 | continue; |
2228 | continue; |
2200 | |
2229 | |
2201 | // redraw one or more characters |
2230 | // redraw one or more characters |
2202 | |
2231 | |
2203 | // seek to the beginning of wide characters |
2232 | // seek to the beginning of wide characters |
2204 | while (stp[col] == NOCHAR && col > 0) |
2233 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2205 | --col; |
2234 | --col; |
2206 | |
2235 | |
2207 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2236 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2208 | text_t *text = stp + col; |
2237 | text_t *text = stp + col; |
2209 | int count = 1; |
2238 | int count = 1; |
… | |
… | |
2216 | for (i = 0; ++col < ncol; ) |
2245 | for (i = 0; ++col < ncol; ) |
2217 | { |
2246 | { |
2218 | if (stp[col] == NOCHAR) |
2247 | if (stp[col] == NOCHAR) |
2219 | { |
2248 | { |
2220 | dtp[col] = stp[col]; |
2249 | dtp[col] = stp[col]; |
2221 | drp[col] = rend; |
2250 | drp[col] = srp[col]; |
|
|
2251 | |
2222 | count++; |
2252 | count++; |
2223 | i++; |
2253 | i++; |
2224 | |
2254 | |
2225 | continue; |
2255 | continue; |
2226 | } |
2256 | } |
… | |
… | |
2246 | |
2276 | |
2247 | col--; /* went one too far. move back */ |
2277 | col--; /* went one too far. move back */ |
2248 | count -= i; /* dump any matching trailing chars */ |
2278 | count -= i; /* dump any matching trailing chars */ |
2249 | |
2279 | |
2250 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2280 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2251 | while (i && text[count] == NOCHAR) |
2281 | while (expect_false (i && text[count] == NOCHAR)) |
2252 | count++, i--; |
2282 | count++, i--; |
2253 | |
2283 | |
2254 | /* |
2284 | /* |
2255 | * Determine the attributes for the string |
2285 | * Determine the attributes for the string |
2256 | */ |
2286 | */ |
2257 | int fore = fgcolor_of (rend); // desired foreground |
2287 | int fore = fgcolor_of (rend); // desired foreground |
2258 | int back = bgcolor_of (rend); // desired background |
2288 | int back = bgcolor_of (rend); // desired background |
2259 | |
2289 | |
2260 | // only do special processing if any attributes are set, which is unlikely |
2290 | // 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)) |
2291 | if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) |
2262 | { |
2292 | { |
2263 | bool invert = rend & RS_RVid; |
2293 | bool invert = rend & RS_RVid; |
2264 | |
2294 | |
2265 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2295 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2266 | if (rend & RS_Bold && fore == Color_fg) |
2296 | if (rend & RS_Bold && fore == Color_fg) |
… | |
… | |
2349 | /* |
2379 | /* |
2350 | * Actually do the drawing of the string here |
2380 | * Actually do the drawing of the string here |
2351 | */ |
2381 | */ |
2352 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2382 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2353 | |
2383 | |
2354 | if (have_bg && back == Color_bg) |
2384 | if (expect_true (have_bg && back == Color_bg)) |
2355 | { |
2385 | { |
2356 | // this is very ugly, maybe push it into ->draw? |
2386 | // this is very ugly, maybe push it into ->draw? |
2357 | |
2387 | |
2358 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2388 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2359 | if (text[i] != ' ') |
2389 | if (text[i] != ' ') |
… | |
… | |
2366 | did_clear: ; |
2396 | did_clear: ; |
2367 | } |
2397 | } |
2368 | else |
2398 | else |
2369 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2399 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2370 | |
2400 | |
2371 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2401 | if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) |
2372 | { |
2402 | { |
2373 | #if ENABLE_FRILLS |
2403 | #if ENABLE_FRILLS |
2374 | if (ISSET_PIXCOLOR (Color_underline)) |
2404 | if (ISSET_PIXCOLOR (Color_underline)) |
2375 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2405 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2376 | else |
2406 | else |
2377 | #endif |
2407 | #endif |
2378 | XSetForeground (dpy, gc, pix_colors[fore]); |
2408 | XSetForeground (dpy, gc, pix_colors[fore]); |
2379 | |
2409 | |
2380 | XDrawLine (dpy, drawBuffer, gc, |
2410 | XDrawLine (dpy, vt, gc, |
2381 | xpixel, ypixel + font->ascent + 1, |
2411 | xpixel, ypixel + font->ascent + 1, |
2382 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2412 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2383 | } |
2413 | } |
2384 | } /* for (col....) */ |
2414 | } /* for (col....) */ |
2385 | } /* for (row....) */ |
2415 | } /* for (row....) */ |
2386 | |
|
|
2387 | #if ENABLE_OVERLAY |
|
|
2388 | scr_swap_overlay (); |
|
|
2389 | #endif |
|
|
2390 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2391 | |
2416 | |
2392 | /* |
2417 | /* |
2393 | * G: cleanup cursor and display outline cursor if necessary |
2418 | * G: cleanup cursor and display outline cursor if necessary |
2394 | */ |
2419 | */ |
2395 | if (showcursor) |
2420 | if (showcursor) |
… | |
… | |
2423 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
2448 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
2424 | else |
2449 | else |
2425 | #endif |
2450 | #endif |
2426 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2451 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2427 | |
2452 | |
2428 | XDrawRectangle (dpy, drawBuffer, gc, |
2453 | XDrawRectangle (dpy, vt, gc, |
2429 | Col2Pixel (col), |
2454 | Col2Pixel (col), |
2430 | Row2Pixel (oldcursor.row), |
2455 | Row2Pixel (oldcursor.row), |
2431 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2456 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2432 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2457 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2433 | } |
2458 | } |
2434 | } |
2459 | } |
2435 | |
2460 | |
2436 | /* |
2461 | /* |
2437 | * H: cleanup selection |
2462 | * H: cleanup selection |
2438 | */ |
2463 | */ |
|
|
2464 | #if ENABLE_OVERLAY |
|
|
2465 | scr_swap_overlay (); |
|
|
2466 | #endif |
|
|
2467 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2468 | |
2439 | scr_reverse_selection (); |
2469 | scr_reverse_selection (); |
2440 | |
2470 | |
|
|
2471 | screen.flags = old_screen_flags; |
2441 | num_scr = 0; |
2472 | num_scr = 0; |
2442 | num_scr_allow = 1; |
2473 | num_scr_allow = 1; |
2443 | } |
2474 | } |
2444 | |
2475 | |
2445 | void |
2476 | void |
… | |
… | |
2476 | |
2507 | |
2477 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2508 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2478 | XClearWindow (dpy, parent[0]); |
2509 | XClearWindow (dpy, parent[0]); |
2479 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2510 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2480 | |
2511 | |
2481 | # if HAVE_SCROLLBARS |
|
|
2482 | if (scrollBar.win) |
2512 | if (scrollBar.win) |
2483 | { |
2513 | { |
2484 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2514 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2485 | scrollBar.setIdle (); |
2515 | scrollBar.state = STATE_IDLE; |
2486 | scrollbar_show (0); |
2516 | scrollBar.show (0); |
2487 | } |
2517 | } |
|
|
2518 | |
2488 | # endif |
2519 | #endif |
2489 | |
2520 | |
|
|
2521 | /* bgPixmap.apply () does not do the following : */ |
2490 | scr_clear (); |
2522 | scr_clear (); |
2491 | scr_touch (true); |
2523 | scr_touch (true); |
2492 | want_refresh = 1; |
2524 | want_refresh = 1; |
2493 | |
|
|
2494 | #endif |
|
|
2495 | } |
2525 | } |
2496 | |
2526 | |
2497 | /* ------------------------------------------------------------------------- */ |
2527 | /* ------------------------------------------------------------------------- */ |
2498 | void |
2528 | void |
2499 | rxvt_term::scr_clear (bool really) NOTHROW |
2529 | rxvt_term::scr_clear (bool really) NOTHROW |
… | |
… | |
2588 | { |
2618 | { |
2589 | int row, wrote; |
2619 | int row, wrote; |
2590 | unsigned int width, towrite; |
2620 | unsigned int width, towrite; |
2591 | char r1[] = "\n"; |
2621 | char r1[] = "\n"; |
2592 | |
2622 | |
2593 | for (row = saveLines - nsaved; |
2623 | for (row = saveLines + top_row; |
2594 | row < saveLines + nrow - 1; row++) |
2624 | row < saveLines + nrow - 1; row++) |
2595 | { |
2625 | { |
2596 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2626 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2597 | : ncol; |
2627 | : ncol; |
2598 | for (towrite = width; towrite; towrite -= wrote) |
2628 | for (towrite = width; towrite; towrite -= wrote) |
… | |
… | |
2649 | /* convert normal newline chars into common keyboard Return key sequence */ |
2679 | /* convert normal newline chars into common keyboard Return key sequence */ |
2650 | for (unsigned int i = 0; i < len; i++) |
2680 | for (unsigned int i = 0; i < len; i++) |
2651 | if (data[i] == C0_LF) |
2681 | if (data[i] == C0_LF) |
2652 | data[i] = C0_CR; |
2682 | data[i] = C0_CR; |
2653 | |
2683 | |
|
|
2684 | if (priv_modes & PrivMode_BracketPaste) |
|
|
2685 | tt_printf ("\e[200~"); |
|
|
2686 | |
2654 | tt_write (data, len); |
2687 | tt_write (data, len); |
|
|
2688 | |
|
|
2689 | if (priv_modes & PrivMode_BracketPaste) |
|
|
2690 | tt_printf ("\e[201~"); |
2655 | } |
2691 | } |
2656 | |
2692 | |
2657 | /* ------------------------------------------------------------------------- */ |
2693 | /* ------------------------------------------------------------------------- */ |
2658 | /* |
2694 | /* |
2659 | * Respond to a notification that a primary selection has been sent |
2695 | * Respond to a notification that a primary selection has been sent |
… | |
… | |
2910 | /* |
2946 | /* |
2911 | * Clear all selected text |
2947 | * Clear all selected text |
2912 | * EXT: SelectionClear |
2948 | * EXT: SelectionClear |
2913 | */ |
2949 | */ |
2914 | void |
2950 | void |
2915 | rxvt_term::selection_clear () NOTHROW |
2951 | rxvt_term::selection_clear (bool clipboard) NOTHROW |
2916 | { |
2952 | { |
|
|
2953 | if (!clipboard) |
|
|
2954 | { |
2917 | want_refresh = 1; |
2955 | want_refresh = 1; |
2918 | free (selection.text); |
2956 | free (selection.text); |
2919 | selection.text = NULL; |
2957 | selection.text = NULL; |
2920 | selection.len = 0; |
2958 | selection.len = 0; |
2921 | CLEAR_SELECTION (); |
2959 | CLEAR_SELECTION (); |
2922 | |
2960 | |
2923 | if (display->selection_owner == this) |
2961 | if (display->selection_owner == this) |
2924 | display->selection_owner = 0; |
2962 | display->selection_owner = 0; |
|
|
2963 | } |
|
|
2964 | else |
|
|
2965 | { |
|
|
2966 | free (selection.clip_text); |
|
|
2967 | selection.clip_text = NULL; |
|
|
2968 | selection.clip_len = 0; |
|
|
2969 | |
|
|
2970 | if (display->clipboard_owner == this) |
|
|
2971 | display->clipboard_owner = 0; |
|
|
2972 | } |
|
|
2973 | } |
|
|
2974 | |
|
|
2975 | void |
|
|
2976 | rxvt_term::clipboard_copy (Time tm) |
|
|
2977 | { |
|
|
2978 | if (selection.len > 0) |
|
|
2979 | { |
|
|
2980 | free (selection.clip_text); |
|
|
2981 | selection.clip_len = selection.len; |
|
|
2982 | selection.clip_text = (wchar_t *) malloc (sizeof (wchar_t) * selection.clip_len); |
|
|
2983 | memcpy (selection.clip_text, selection.text, |
|
|
2984 | sizeof (wchar_t) * selection.clip_len); |
|
|
2985 | selection_grab (tm, true); |
|
|
2986 | } |
2925 | } |
2987 | } |
2926 | |
2988 | |
2927 | /* ------------------------------------------------------------------------- */ |
2989 | /* ------------------------------------------------------------------------- */ |
2928 | /* |
2990 | /* |
2929 | * Copy a selection into the cut buffer |
2991 | * Copy a selection into the cut buffer |
… | |
… | |
3055 | |
3117 | |
3056 | selection_grab (tm); |
3118 | selection_grab (tm); |
3057 | } |
3119 | } |
3058 | |
3120 | |
3059 | bool |
3121 | bool |
3060 | rxvt_term::selection_grab (Time tm) NOTHROW |
3122 | rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW |
3061 | { |
3123 | { |
|
|
3124 | Atom sel; |
|
|
3125 | |
|
|
3126 | if (!clipboard) |
|
|
3127 | { |
3062 | selection_time = tm; |
3128 | selection_time = tm; |
|
|
3129 | sel = XA_PRIMARY; |
|
|
3130 | } |
|
|
3131 | else |
|
|
3132 | { |
|
|
3133 | clipboard_time = tm; |
|
|
3134 | sel = xa[XA_CLIPBOARD]; |
|
|
3135 | } |
3063 | |
3136 | |
3064 | XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); |
3137 | XSetSelectionOwner (dpy, sel, vt, tm); |
3065 | if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) |
3138 | if (XGetSelectionOwner (dpy, sel) == vt) |
3066 | { |
3139 | { |
3067 | display->set_selection_owner (this); |
3140 | display->set_selection_owner (this, clipboard); |
3068 | return true; |
3141 | return true; |
3069 | } |
3142 | } |
3070 | else |
3143 | else |
3071 | { |
3144 | { |
3072 | selection_clear (); |
3145 | selection_clear (clipboard); |
3073 | return false; |
3146 | return false; |
3074 | } |
3147 | } |
3075 | |
3148 | |
3076 | #if 0 |
3149 | #if 0 |
3077 | XTextProperty ct; |
3150 | XTextProperty ct; |
… | |
… | |
3572 | else if (rq.target == xa[XA_MULTIPLE]) |
3645 | else if (rq.target == xa[XA_MULTIPLE]) |
3573 | { |
3646 | { |
3574 | /* TODO: Handle MULTIPLE */ |
3647 | /* TODO: Handle MULTIPLE */ |
3575 | } |
3648 | } |
3576 | #endif |
3649 | #endif |
3577 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3650 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) |
3578 | { |
3651 | { |
3579 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3652 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3580 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3653 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
|
|
3654 | ev.property = rq.property; |
|
|
3655 | } |
|
|
3656 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3657 | { |
|
|
3658 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
|
|
3659 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
3581 | ev.property = rq.property; |
3660 | ev.property = rq.property; |
3582 | } |
3661 | } |
3583 | else if (rq.target == XA_STRING |
3662 | else if (rq.target == XA_STRING |
3584 | || rq.target == xa[XA_TEXT] |
3663 | || rq.target == xa[XA_TEXT] |
3585 | || rq.target == xa[XA_COMPOUND_TEXT] |
3664 | || rq.target == xa[XA_COMPOUND_TEXT] |
… | |
… | |
3618 | { |
3697 | { |
3619 | target = xa[XA_COMPOUND_TEXT]; |
3698 | target = xa[XA_COMPOUND_TEXT]; |
3620 | style = enc_compound_text; |
3699 | style = enc_compound_text; |
3621 | } |
3700 | } |
3622 | |
3701 | |
3623 | if (selection.text) |
3702 | if (rq.selection == XA_PRIMARY && selection.text) |
3624 | { |
3703 | { |
3625 | cl = selection.text; |
3704 | cl = selection.text; |
3626 | selectlen = selection.len; |
3705 | selectlen = selection.len; |
|
|
3706 | } |
|
|
3707 | else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3708 | { |
|
|
3709 | cl = selection.clip_text; |
|
|
3710 | selectlen = selection.clip_len; |
3627 | } |
3711 | } |
3628 | else |
3712 | else |
3629 | { |
3713 | { |
3630 | cl = L""; |
3714 | cl = L""; |
3631 | selectlen = 0; |
3715 | selectlen = 0; |
… | |
… | |
3699 | h += 2; min_it (h, nrow); |
3783 | h += 2; min_it (h, nrow); |
3700 | |
3784 | |
3701 | x -= 1; clamp_it (x, 0, ncol - w); |
3785 | x -= 1; clamp_it (x, 0, ncol - w); |
3702 | y -= 1; clamp_it (y, 0, nrow - h); |
3786 | y -= 1; clamp_it (y, 0, nrow - h); |
3703 | |
3787 | |
3704 | ov_x = x; ov_y = y; |
3788 | ov.x = x; ov.y = y; |
3705 | ov_w = w; ov_h = h; |
3789 | ov.w = w; ov.h = h; |
3706 | |
3790 | |
3707 | ov_text = new text_t *[h]; |
3791 | ov.text = new text_t *[h]; |
3708 | ov_rend = new rend_t *[h]; |
3792 | ov.rend = new rend_t *[h]; |
3709 | |
3793 | |
3710 | for (y = 0; y < h; y++) |
3794 | for (y = 0; y < h; y++) |
3711 | { |
3795 | { |
3712 | text_t *tp = ov_text[y] = new text_t[w]; |
3796 | text_t *tp = ov.text[y] = new text_t[w]; |
3713 | rend_t *rp = ov_rend[y] = new rend_t[w]; |
3797 | rend_t *rp = ov.rend[y] = new rend_t[w]; |
3714 | |
3798 | |
3715 | text_t t0, t1, t2; |
3799 | text_t t0, t1, t2; |
3716 | rend_t r = OVERLAY_RSTYLE; |
3800 | rend_t r = OVERLAY_RSTYLE; |
3717 | |
3801 | |
3718 | if (y == 0) |
3802 | if (y == 0) |
… | |
… | |
3737 | } |
3821 | } |
3738 | |
3822 | |
3739 | void |
3823 | void |
3740 | rxvt_term::scr_overlay_off () NOTHROW |
3824 | rxvt_term::scr_overlay_off () NOTHROW |
3741 | { |
3825 | { |
3742 | if (!ov_text) |
3826 | if (!ov.text) |
3743 | return; |
3827 | return; |
3744 | |
3828 | |
3745 | want_refresh = 1; |
3829 | want_refresh = 1; |
3746 | |
3830 | |
3747 | for (int y = 0; y < ov_h; y++) |
3831 | for (int y = 0; y < ov.h; y++) |
3748 | { |
3832 | { |
3749 | delete [] ov_text[y]; |
3833 | delete [] ov.text[y]; |
3750 | delete [] ov_rend[y]; |
3834 | delete [] ov.rend[y]; |
3751 | } |
3835 | } |
3752 | |
3836 | |
3753 | delete [] ov_text; ov_text = 0; |
3837 | delete [] ov.text; ov.text = 0; |
3754 | delete [] ov_rend; ov_rend = 0; |
3838 | delete [] ov.rend; ov.rend = 0; |
3755 | } |
3839 | } |
3756 | |
3840 | |
3757 | void |
3841 | void |
3758 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3842 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3759 | { |
3843 | { |
3760 | if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) |
3844 | if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2) |
3761 | return; |
3845 | return; |
3762 | |
3846 | |
3763 | x++, y++; |
3847 | x++, y++; |
3764 | |
3848 | |
3765 | ov_text[y][x] = text; |
3849 | ov.text[y][x] = text; |
3766 | ov_rend[y][x] = rend; |
3850 | ov.rend[y][x] = rend; |
3767 | } |
3851 | } |
3768 | |
3852 | |
3769 | void |
3853 | void |
3770 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3854 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3771 | { |
3855 | { |
… | |
… | |
3790 | } |
3874 | } |
3791 | |
3875 | |
3792 | void |
3876 | void |
3793 | rxvt_term::scr_swap_overlay () NOTHROW |
3877 | rxvt_term::scr_swap_overlay () NOTHROW |
3794 | { |
3878 | { |
3795 | if (!ov_text) |
3879 | if (!ov.text) |
3796 | return; |
3880 | return; |
3797 | |
3881 | |
|
|
3882 | // hide cursor if it is within the overlay area |
|
|
3883 | if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w) |
|
|
3884 | && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h)) |
|
|
3885 | screen.flags &= ~Screen_VisibleCursor; |
|
|
3886 | |
3798 | // swap screen mem with overlay |
3887 | // swap screen mem with overlay |
3799 | for (int y = ov_h; y--; ) |
3888 | for (int y = ov.h; y--; ) |
3800 | { |
3889 | { |
3801 | text_t *t1 = ov_text[y]; |
3890 | text_t *t1 = ov.text[y]; |
3802 | rend_t *r1 = ov_rend[y]; |
3891 | rend_t *r1 = ov.rend[y]; |
3803 | |
3892 | |
3804 | text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; |
3893 | text_t *t2 = ROW(y + ov.y + view_start).t + ov.x; |
3805 | rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; |
3894 | rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x; |
3806 | |
3895 | |
3807 | for (int x = ov_w; x--; ) |
3896 | for (int x = ov.w; x--; ) |
3808 | { |
3897 | { |
3809 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3898 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3810 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3899 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3811 | } |
3900 | } |
3812 | } |
3901 | } |