1 | /*---------------------------------------------------------------------------* |
1 | /*---------------------------------------------------------------------------* |
2 | * File: screen.C |
2 | * File: screen.C |
3 | *---------------------------------------------------------------------------* |
3 | *---------------------------------------------------------------------------* |
4 | * |
4 | * |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
6 | * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> |
6 | * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de> |
7 | * |
7 | * |
8 | * This program is free software; you can redistribute it and/or modify |
8 | * This program is free software; you can redistribute it and/or modify |
9 | * it under the terms of the GNU General Public License as published by |
9 | * it under the terms of the GNU General Public License as published by |
10 | * the Free Software Foundation; either version 2 of the License, or |
10 | * the Free Software Foundation; either version 2 of the License, or |
11 | * (at your option) any later version. |
11 | * (at your option) any later version. |
… | |
… | |
28 | #include "rxvt.h" /* NECESSARY */ |
28 | #include "rxvt.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
30 | |
30 | |
31 | #include <inttypes.h> |
31 | #include <inttypes.h> |
32 | |
32 | |
33 | #include "salloc.C" // HACK, should be a seperate compile! |
33 | #include "salloc.C" // HACK, should be a separate compile! |
34 | |
34 | |
|
|
35 | static inline void |
35 | static inline void fill_text (text_t *start, text_t value, int len) |
36 | fill_text (text_t *start, text_t value, int len) |
36 | { |
37 | { |
37 | while (len--) |
38 | while (len--) |
38 | *start++ = value; |
39 | *start++ = value; |
39 | } |
40 | } |
40 | |
41 | |
41 | /* ------------------------------------------------------------------------- */ |
42 | /* ------------------------------------------------------------------------- */ |
42 | #define PROP_SIZE 256*1024 |
|
|
43 | #define PASTE_SIZE 32768 |
|
|
44 | #define TABSIZE 8 /* default tab size */ |
43 | #define TABSIZE 8 /* default tab size */ |
45 | |
44 | |
46 | /* ------------------------------------------------------------------------- * |
45 | /* ------------------------------------------------------------------------- * |
47 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
46 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
48 | * ------------------------------------------------------------------------- */ |
47 | * ------------------------------------------------------------------------- */ |
… | |
… | |
143 | col--; |
142 | col--; |
144 | |
143 | |
145 | rend_t rend = l.r[col] & ~RS_baseattrMask; |
144 | rend_t rend = l.r[col] & ~RS_baseattrMask; |
146 | rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); |
145 | rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); |
147 | |
146 | |
|
|
147 | l.touch (); |
|
|
148 | |
148 | // found start, nuke |
149 | // found start, nuke |
149 | do { |
150 | do { |
150 | l.t[col] = ' '; |
151 | l.t[col] = ' '; |
151 | l.r[col] = rend; |
152 | l.r[col] = rend; |
152 | col++; |
153 | col++; |
… | |
… | |
158 | * ------------------------------------------------------------------------- */ |
159 | * ------------------------------------------------------------------------- */ |
159 | |
160 | |
160 | void |
161 | void |
161 | rxvt_term::scr_reset () |
162 | rxvt_term::scr_reset () |
162 | { |
163 | { |
163 | scr_soft_reset (); |
164 | #if ENABLE_OVERLAY |
|
|
165 | scr_overlay_off (); |
|
|
166 | #endif |
164 | |
167 | |
165 | view_start = 0; |
168 | view_start = 0; |
166 | num_scr = 0; |
169 | num_scr = 0; |
167 | |
170 | |
168 | if (ncol == 0) |
171 | if (ncol == 0) |
… | |
… | |
200 | term_start = 0; |
203 | term_start = 0; |
201 | |
204 | |
202 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
205 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
203 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
206 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
204 | |
207 | |
205 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
208 | row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t)); |
206 | drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
209 | drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
207 | swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
210 | swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
208 | |
211 | |
209 | for (int row = nrow; row--; ) |
212 | for (int row = nrow; row--; ) |
210 | { |
213 | { |
… | |
… | |
233 | selection.text = NULL; |
236 | selection.text = NULL; |
234 | selection.len = 0; |
237 | selection.len = 0; |
235 | selection.op = SELECTION_CLEAR; |
238 | selection.op = SELECTION_CLEAR; |
236 | selection.screen = PRIMARY; |
239 | selection.screen = PRIMARY; |
237 | selection.clicks = 0; |
240 | selection.clicks = 0; |
|
|
241 | selection.clip_text = NULL; |
|
|
242 | selection.clip_len = 0; |
238 | } |
243 | } |
239 | else |
244 | else |
240 | { |
245 | { |
241 | /* |
246 | /* |
242 | * add or delete rows as appropriate |
247 | * add or delete rows as appropriate |
… | |
… | |
270 | swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
275 | swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
271 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
276 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
272 | } |
277 | } |
273 | |
278 | |
274 | line_t *old_buf = row_buf; |
279 | line_t *old_buf = row_buf; |
275 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
280 | row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); |
276 | |
281 | |
277 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
282 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
278 | int pend = MOD (term_start + top_row , prev_total_rows); |
283 | int pend = MOD (term_start + top_row , prev_total_rows); |
279 | int q = total_rows; // rewrapped row |
284 | int q = total_rows; // rewrapped row |
280 | |
285 | |
281 | if (top_row) |
286 | if (top_row) |
282 | { |
287 | { |
283 | // Re-wrap lines. This is rather ugly, possibly because I am too dumb |
288 | // Re-wrap lines. This is rather ugly, possibly because I am too dumb |
284 | // to come up with a lean and mean algorithm. |
289 | // to come up with a lean and mean algorithm. |
|
|
290 | // TODO: maybe optimise when width didn't change |
285 | |
291 | |
286 | row_col_t ocur = screen.cur; |
292 | row_col_t ocur = screen.cur; |
287 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
293 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
288 | |
294 | |
289 | do |
295 | do |
290 | { |
296 | { |
291 | p = MOD (p - 1, prev_total_rows); |
297 | p = MOD (p - 1, prev_total_rows); |
292 | #ifdef DEBUG_STRICT |
|
|
293 | assert (old_buf [MOD (p, prev_total_rows)].t); |
298 | assert (old_buf [MOD (p, prev_total_rows)].t); |
294 | #endif |
|
|
295 | int plines = 1; |
299 | int plines = 1; |
296 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
300 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
297 | |
301 | |
298 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
302 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
299 | { |
303 | { |
… | |
… | |
395 | |
399 | |
396 | clamp_it (screen.cur.row, 0, nrow - 1); |
400 | clamp_it (screen.cur.row, 0, nrow - 1); |
397 | clamp_it (screen.cur.col, 0, ncol - 1); |
401 | clamp_it (screen.cur.col, 0, ncol - 1); |
398 | } |
402 | } |
399 | |
403 | |
|
|
404 | free (tabs); |
|
|
405 | tabs = (char *)rxvt_malloc (ncol); |
|
|
406 | |
|
|
407 | for (int col = ncol; col--; ) |
|
|
408 | tabs [col] = col % TABSIZE == 0; |
|
|
409 | |
400 | CLEAR_ALL_SELECTION (); |
410 | CLEAR_ALL_SELECTION (); |
401 | |
411 | |
402 | prev_nrow = nrow; |
412 | prev_nrow = nrow; |
403 | prev_ncol = ncol; |
413 | prev_ncol = ncol; |
404 | |
414 | |
… | |
… | |
436 | void |
446 | void |
437 | rxvt_term::scr_poweron () |
447 | rxvt_term::scr_poweron () |
438 | { |
448 | { |
439 | scr_release (); |
449 | scr_release (); |
440 | prev_nrow = prev_ncol = 0; |
450 | prev_nrow = prev_ncol = 0; |
|
|
451 | rvideo_mode = false; |
|
|
452 | scr_soft_reset (); |
441 | scr_reset (); |
453 | scr_reset (); |
442 | |
454 | |
443 | scr_clear (true); |
455 | scr_clear (true); |
444 | scr_refresh (); |
456 | scr_refresh (); |
445 | } |
457 | } |
… | |
… | |
450 | /* only affects modes, nothing drastic such as clearing the screen */ |
462 | /* only affects modes, nothing drastic such as clearing the screen */ |
451 | #if ENABLE_OVERLAY |
463 | #if ENABLE_OVERLAY |
452 | scr_overlay_off (); |
464 | scr_overlay_off (); |
453 | #endif |
465 | #endif |
454 | |
466 | |
455 | rvideo_mode = false; |
|
|
456 | |
|
|
457 | if (current_screen != PRIMARY) |
467 | if (current_screen != PRIMARY) |
458 | scr_swap_screen (); |
468 | scr_swap_screen (); |
459 | |
|
|
460 | free (tabs); |
|
|
461 | tabs = (char *)rxvt_malloc (ncol); |
|
|
462 | |
|
|
463 | for (int col = ncol; --col; ) |
|
|
464 | tabs [col] = col % TABSIZE == 0; |
|
|
465 | |
469 | |
466 | scr_scroll_region (0, MAX_ROWS - 1); |
470 | scr_scroll_region (0, MAX_ROWS - 1); |
467 | scr_rendition (0, ~RS_None); |
471 | scr_rendition (0, ~RS_None); |
468 | scr_insert_mode (0); |
472 | scr_insert_mode (0); |
469 | } |
473 | } |
… | |
… | |
511 | } |
515 | } |
512 | |
516 | |
513 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
517 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
514 | min_it (s->cur.row, nrow - 1); |
518 | min_it (s->cur.row, nrow - 1); |
515 | min_it (s->cur.col, ncol - 1); |
519 | min_it (s->cur.col, ncol - 1); |
516 | #ifdef DEBUG_STRICT |
|
|
517 | assert (s->cur.row >= 0); |
520 | assert (s->cur.row >= 0); |
518 | assert (s->cur.col >= 0); |
521 | assert (s->cur.col >= 0); |
519 | #endif |
|
|
520 | } |
522 | } |
521 | |
523 | |
522 | void |
524 | void |
523 | rxvt_term::scr_swap_screen () |
525 | rxvt_term::scr_swap_screen () |
524 | { |
526 | { |
… | |
… | |
549 | want_refresh = 1; |
551 | want_refresh = 1; |
550 | view_start = 0; |
552 | view_start = 0; |
551 | |
553 | |
552 | selection_check (2); /* check for boundary cross */ |
554 | selection_check (2); /* check for boundary cross */ |
553 | |
555 | |
554 | int i = current_screen; current_screen = scrn; scrn = i; |
556 | current_screen = scrn; |
555 | |
557 | |
556 | #if NSCREENS |
558 | #if NSCREENS |
557 | if (option (Opt_secondaryScreen)) |
559 | if (option (Opt_secondaryScreen)) |
558 | { |
560 | { |
559 | num_scr = 0; |
561 | num_scr = 0; |
… | |
… | |
636 | |
638 | |
637 | if (count > 0 |
639 | if (count > 0 |
638 | && row1 == 0 |
640 | && row1 == 0 |
639 | && (current_screen == PRIMARY || option (Opt_secondaryScroll))) |
641 | && (current_screen == PRIMARY || option (Opt_secondaryScroll))) |
640 | { |
642 | { |
|
|
643 | min_it (count, total_rows - (nrow - (row2 + 1))); |
|
|
644 | |
641 | top_row = max (top_row - count, -saveLines); |
645 | top_row = max (top_row - count, -saveLines); |
642 | |
|
|
643 | // scroll everything up 'count' lines |
|
|
644 | term_start = (term_start + count) % total_rows; |
|
|
645 | |
646 | |
646 | // sever bottommost line |
647 | // sever bottommost line |
647 | { |
648 | { |
648 | line_t &l = ROW(row2 - count); |
649 | line_t &l = ROW(row2); |
649 | l.is_longer (0); |
650 | l.is_longer (0); |
650 | l.touch (); |
651 | l.touch (); |
651 | } |
652 | } |
652 | |
653 | |
|
|
654 | // scroll everything up 'count' lines |
|
|
655 | term_start = (term_start + count) % total_rows; |
|
|
656 | |
|
|
657 | // now copy lines below the scroll region bottom to the |
|
|
658 | // bottom of the screen again, so they look as if they |
|
|
659 | // hadn't moved. |
|
|
660 | for (int i = nrow; --i > row2; ) |
|
|
661 | { |
|
|
662 | line_t &l1 = ROW(i - count); |
|
|
663 | line_t &l2 = ROW(i); |
|
|
664 | |
|
|
665 | ::swap (l1, l2); |
|
|
666 | l2.touch (); |
|
|
667 | } |
|
|
668 | |
653 | // erase newly scrolled-in lines |
669 | // erase newly scrolled-in lines |
654 | for (int i = count; i--; ) |
670 | for (int i = count; i--; ) |
655 | { |
671 | { |
656 | line_t &l = ROW(nrow - 1 - i); |
672 | line_t &l = ROW(row2 - i); |
657 | |
673 | |
658 | // optimize if already cleared, can be significant on slow machines |
674 | // optimise if already cleared, can be significant on slow machines |
659 | // could be rolled into scr_blank_screen_mem |
675 | // could be rolled into scr_blank_screen_mem |
660 | if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) |
676 | if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) |
661 | { |
677 | { |
662 | scr_blank_line (l, 0, l.l, rstyle); |
678 | scr_blank_line (l, 0, l.l, rstyle); |
663 | l.l = 0; |
679 | l.l = 0; |
… | |
… | |
665 | } |
681 | } |
666 | else |
682 | else |
667 | scr_blank_screen_mem (l, rstyle); |
683 | scr_blank_screen_mem (l, rstyle); |
668 | } |
684 | } |
669 | |
685 | |
670 | // now copy lines below the scroll region bottom to the |
|
|
671 | // bottom of the screen again, so they look as if they |
|
|
672 | // hadn't moved. |
|
|
673 | for (int i = nrow; --i > row2; ) |
|
|
674 | { |
|
|
675 | line_t &l1 = ROW(i - count); |
|
|
676 | line_t &l2 = ROW(i); |
|
|
677 | |
|
|
678 | ::swap (l1, l2); |
|
|
679 | l2.touch (); |
|
|
680 | } |
|
|
681 | |
|
|
682 | // move and/or clear selection, if any |
686 | // move and/or clear selection, if any |
683 | if (selection.op && current_screen == selection.screen) |
687 | if (selection.op && current_screen == selection.screen |
|
|
688 | && selection.beg.row <= row2) |
684 | { |
689 | { |
685 | selection.beg.row -= count; |
690 | selection.beg.row -= count; |
686 | selection.end.row -= count; |
691 | selection.end.row -= count; |
687 | selection.mark.row -= count; |
692 | selection.mark.row -= count; |
688 | |
693 | |
689 | if (selection.beg.row < top_row |
694 | selection_check (0); |
690 | || selection.end.row < top_row |
|
|
691 | || selection.mark.row < top_row) |
|
|
692 | { |
|
|
693 | CLEAR_ALL_SELECTION (); |
|
|
694 | selection.op = SELECTION_CLEAR; |
|
|
695 | } |
|
|
696 | } |
695 | } |
697 | |
696 | |
698 | // finally move the view window, if desired |
697 | // finally move the view window, if desired |
699 | if (option (Opt_scrollWithBuffer) |
698 | if (option (Opt_scrollWithBuffer) |
700 | && view_start != 0 |
699 | && view_start != 0 |
… | |
… | |
730 | } |
729 | } |
731 | |
730 | |
732 | // use a simple and robust scrolling algorithm, this |
731 | // use a simple and robust scrolling algorithm, this |
733 | // part of scr_scroll_text is not time-critical. |
732 | // part of scr_scroll_text is not time-critical. |
734 | |
733 | |
|
|
734 | // sever line above scroll region |
|
|
735 | if (row1) |
|
|
736 | { |
|
|
737 | line_t &l = ROW(row1 - 1); |
|
|
738 | l.is_longer (0); |
|
|
739 | l.touch (); |
|
|
740 | } |
|
|
741 | |
735 | int rows = row2 - row1 + 1; |
742 | int rows = row2 - row1 + 1; |
736 | |
743 | |
737 | min_it (count, rows); |
744 | min_it (count, rows); |
738 | |
745 | |
739 | line_t *temp_buf = row_buf + total_rows; |
746 | line_t *temp_buf = rxvt_temp_buf<line_t> (rows); |
740 | |
747 | |
741 | for (int row = 0; row < rows; row++) |
748 | for (int row = 0; row < rows; row++) |
742 | { |
749 | { |
743 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
750 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
744 | |
751 | |
… | |
… | |
746 | scr_blank_screen_mem (temp_buf [row], rstyle); |
753 | scr_blank_screen_mem (temp_buf [row], rstyle); |
747 | } |
754 | } |
748 | |
755 | |
749 | for (int row = 0; row < rows; row++) |
756 | for (int row = 0; row < rows; row++) |
750 | ROW(row1 + row) = temp_buf [row]; |
757 | ROW(row1 + row) = temp_buf [row]; |
|
|
758 | |
|
|
759 | // sever bottommost line |
|
|
760 | { |
|
|
761 | line_t &l = ROW(row2); |
|
|
762 | l.is_longer (0); |
|
|
763 | l.touch (); |
|
|
764 | } |
751 | } |
765 | } |
752 | |
766 | |
753 | return count; |
767 | return count; |
754 | } |
768 | } |
755 | |
769 | |
… | |
… | |
784 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
798 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
785 | screen.cur.row -= minlines; |
799 | screen.cur.row -= minlines; |
786 | } |
800 | } |
787 | } |
801 | } |
788 | |
802 | |
789 | #ifdef DEBUG_STRICT |
|
|
790 | assert (screen.cur.col < ncol); |
803 | assert (screen.cur.col < ncol); |
791 | assert (screen.cur.row < nrow |
804 | assert (screen.cur.row < nrow |
792 | && screen.cur.row >= top_row); |
805 | && screen.cur.row >= top_row); |
793 | #endif |
|
|
794 | int row = screen.cur.row; |
806 | int row = screen.cur.row; |
795 | |
807 | |
796 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
808 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
797 | |
809 | |
798 | line_t *line = &ROW(row); |
810 | line_t *line = &ROW(row); |
799 | |
811 | |
800 | while (str < strend) |
812 | while (str < strend) |
801 | { |
813 | { |
802 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
814 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
803 | |
815 | |
804 | if (expect_false (c < 0x20)) |
816 | if (ecb_unlikely (c < 0x20)) |
805 | if (c == C0_LF) |
817 | if (c == C0_LF) |
806 | { |
818 | { |
807 | max_it (line->l, screen.cur.col); |
819 | max_it (line->l, screen.cur.col); |
808 | |
820 | |
809 | screen.flags &= ~Screen_WrapNext; |
821 | screen.flags &= ~Screen_WrapNext; |
… | |
… | |
828 | { |
840 | { |
829 | scr_tab (1, true); |
841 | scr_tab (1, true); |
830 | continue; |
842 | continue; |
831 | } |
843 | } |
832 | |
844 | |
833 | if (expect_false ( |
845 | if (ecb_unlikely ( |
834 | checksel /* see if we're writing within selection */ |
846 | checksel /* see if we're writing within selection */ |
835 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
847 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
836 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
848 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
837 | )) |
849 | )) |
838 | { |
850 | { |
… | |
… | |
843 | * should be a similar check. |
855 | * should be a similar check. |
844 | */ |
856 | */ |
845 | CLEAR_SELECTION (); |
857 | CLEAR_SELECTION (); |
846 | } |
858 | } |
847 | |
859 | |
848 | if (expect_false (screen.flags & Screen_WrapNext)) |
860 | if (ecb_unlikely (screen.flags & Screen_WrapNext)) |
849 | { |
861 | { |
850 | scr_do_wrap (); |
862 | scr_do_wrap (); |
851 | |
863 | |
852 | line->l = ncol; |
864 | line->l = ncol; |
853 | line->is_longer (1); |
865 | line->is_longer (1); |
… | |
… | |
855 | row = screen.cur.row; |
867 | row = screen.cur.row; |
856 | line = &ROW(row); /* _must_ refresh */ |
868 | line = &ROW(row); /* _must_ refresh */ |
857 | } |
869 | } |
858 | |
870 | |
859 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
871 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
860 | if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
872 | if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
861 | c = 0xfffd; |
873 | c = 0xfffd; |
862 | |
874 | |
863 | // rely on wcwidth to tell us the character width, do wcwidth before |
875 | // rely on wcwidth to tell us the character width, do wcwidth before |
864 | // further replacements, as wcwidth might return -1 for the line |
876 | // further replacements, as wcwidth might return -1 for the line |
865 | // drawing characters below as they might be invalid in the current |
877 | // drawing characters below as they might be invalid in the current |
866 | // locale. |
878 | // locale. |
867 | int width = WCWIDTH (c); |
879 | int width = WCWIDTH (c); |
868 | |
880 | |
869 | if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL |
881 | if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL |
870 | { |
882 | { |
871 | // vt100 special graphics and line drawing |
883 | // vt100 special graphics and line drawing |
872 | // 5f-7e standard vt100 |
884 | // 5f-7e standard vt100 |
873 | // 40-5e rxvt extension for extra curses acs chars |
885 | // 40-5e rxvt extension for extra curses acs chars |
874 | static uint16_t vt100_0[62] = { // 41 .. 7e |
886 | static uint16_t vt100_0[62] = { // 41 .. 7e |
… | |
… | |
887 | c = vt100_0[c - 0x41]; |
899 | c = vt100_0[c - 0x41]; |
888 | width = 1; // vt100 line drawing characters are always single-width |
900 | width = 1; // vt100 line drawing characters are always single-width |
889 | } |
901 | } |
890 | } |
902 | } |
891 | |
903 | |
892 | if (expect_false (screen.flags & Screen_Insert)) |
904 | if (ecb_unlikely (screen.flags & Screen_Insert)) |
893 | scr_insdel_chars (width, INSERT); |
905 | scr_insdel_chars (width, INSERT); |
894 | |
906 | |
895 | if (width != 0) |
907 | if (width != 0) |
896 | { |
908 | { |
897 | #if !UNICODE_3 |
909 | #if !UNICODE_3 |
… | |
… | |
902 | # else |
914 | # else |
903 | c = 0xfffd; |
915 | c = 0xfffd; |
904 | # endif |
916 | # endif |
905 | #endif |
917 | #endif |
906 | |
918 | |
|
|
919 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
920 | |
|
|
921 | // if the character doesn't fit into the remaining columns... |
|
|
922 | if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width)) |
|
|
923 | { |
|
|
924 | if (screen.flags & Screen_Autowrap) |
|
|
925 | { |
|
|
926 | // ... artificially enlargen the previous one |
|
|
927 | c = NOCHAR; |
|
|
928 | // and try the same character next loop iteration |
|
|
929 | --str; |
|
|
930 | } |
|
|
931 | else |
|
|
932 | screen.cur.col = ncol - width; |
|
|
933 | } |
|
|
934 | |
907 | // nuke the character at this position, if required |
935 | // nuke the character at this position, if required |
908 | if (expect_false ( |
936 | // due to wonderful coincidences everywhere else in this loop |
|
|
937 | // we never have to check for overwriting a wide char itself, |
|
|
938 | // only its tail. |
909 | line->t[screen.cur.col] == NOCHAR |
939 | if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR)) |
910 | || (screen.cur.col < ncol - 1 |
|
|
911 | && line->t[screen.cur.col + 1] == NOCHAR) |
|
|
912 | )) |
|
|
913 | scr_kill_char (*line, screen.cur.col); |
940 | scr_kill_char (*line, screen.cur.col); |
914 | |
|
|
915 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
916 | |
|
|
917 | // if the character doesn't fit into the remaining columns... |
|
|
918 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
|
|
919 | { |
|
|
920 | // ... artificially enlargen the previous one |
|
|
921 | c = NOCHAR; |
|
|
922 | // and try the same character next loop iteration |
|
|
923 | --str; |
|
|
924 | } |
|
|
925 | |
941 | |
926 | line->touch (); |
942 | line->touch (); |
927 | |
943 | |
928 | do |
944 | do |
929 | { |
945 | { |
930 | line->t[screen.cur.col] = c; |
946 | line->t[screen.cur.col] = c; |
931 | line->r[screen.cur.col] = rend; |
947 | line->r[screen.cur.col] = rend; |
932 | |
948 | |
933 | if (expect_true (screen.cur.col < ncol - 1)) |
949 | if (ecb_likely (screen.cur.col < ncol - 1)) |
934 | screen.cur.col++; |
950 | screen.cur.col++; |
935 | else |
951 | else |
936 | { |
952 | { |
937 | line->l = ncol; |
953 | line->l = ncol; |
938 | if (screen.flags & Screen_Autowrap) |
954 | if (screen.flags & Screen_Autowrap) |
939 | screen.flags |= Screen_WrapNext; |
955 | screen.flags |= Screen_WrapNext; |
940 | break; |
956 | |
|
|
957 | goto end_of_line; |
941 | } |
958 | } |
942 | |
959 | |
943 | c = NOCHAR; |
960 | c = NOCHAR; |
944 | } |
961 | } |
945 | while (expect_false (--width > 0)); |
962 | while (ecb_unlikely (--width > 0)); |
946 | |
963 | |
947 | // pad with spaces when overwriting wide character with smaller one |
964 | // pad with spaces when overwriting wide character with smaller one |
948 | if (expect_false (!width)) |
965 | for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++) |
949 | { |
966 | { |
950 | line->touch (); |
|
|
951 | |
|
|
952 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
|
|
953 | { |
|
|
954 | line->t[c] = ' '; |
967 | line->t[c] = ' '; |
955 | line->r[c] = rend; |
968 | line->r[c] = rend; |
956 | } |
|
|
957 | } |
969 | } |
|
|
970 | |
|
|
971 | end_of_line: |
|
|
972 | ; |
958 | } |
973 | } |
959 | #if ENABLE_COMBINING |
974 | #if ENABLE_COMBINING |
960 | else // width == 0 |
975 | else // width == 0 |
961 | { |
976 | { |
962 | if (c != 0xfeff) // ignore BOM |
977 | if (c != 0xfeff) // ignore BOM |
… | |
… | |
1002 | #endif |
1017 | #endif |
1003 | } |
1018 | } |
1004 | |
1019 | |
1005 | max_it (line->l, screen.cur.col); |
1020 | max_it (line->l, screen.cur.col); |
1006 | |
1021 | |
1007 | #ifdef DEBUG_STRICT |
|
|
1008 | assert (screen.cur.row >= 0); |
1022 | assert (screen.cur.row >= 0); |
1009 | #endif |
|
|
1010 | } |
1023 | } |
1011 | |
1024 | |
1012 | /* ------------------------------------------------------------------------- */ |
1025 | /* ------------------------------------------------------------------------- */ |
1013 | /* |
1026 | /* |
1014 | * Process Backspace. Move back the cursor back a position, wrap if have to |
1027 | * Process Backspace. Move back the cursor back a position, wrap if have to |
… | |
… | |
1027 | |
1040 | |
1028 | want_refresh = 1; |
1041 | want_refresh = 1; |
1029 | #endif |
1042 | #endif |
1030 | } |
1043 | } |
1031 | } |
1044 | } |
|
|
1045 | else if (screen.flags & Screen_WrapNext) |
|
|
1046 | screen.flags &= ~Screen_WrapNext; |
1032 | else |
1047 | else |
1033 | scr_gotorc (0, -1, RELATIVE); |
1048 | scr_gotorc (0, -1, RELATIVE); |
1034 | } |
1049 | } |
1035 | |
1050 | |
1036 | /* ------------------------------------------------------------------------- */ |
1051 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1342 | if (row >= nrow) /* Out Of Bounds */ |
1357 | if (row >= nrow) /* Out Of Bounds */ |
1343 | return; |
1358 | return; |
1344 | |
1359 | |
1345 | min_it (num, nrow - row); |
1360 | min_it (num, nrow - row); |
1346 | |
1361 | |
1347 | /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */ |
|
|
1348 | if (rstyle & (RS_RVid | RS_Uline)) |
1362 | if (rstyle & (RS_Blink | RS_RVid | RS_Uline)) |
1349 | ren = (rend_t) ~RS_None; |
1363 | ren = (rend_t) ~RS_None; |
1350 | else if (GET_BASEBG (rstyle) == Color_bg) |
1364 | else if (GET_BASEBG (rstyle) == Color_bg) |
1351 | { |
1365 | { |
1352 | ren = DEFAULT_RSTYLE; |
1366 | ren = DEFAULT_RSTYLE; |
1353 | |
1367 | |
… | |
… | |
1358 | } |
1372 | } |
1359 | else |
1373 | else |
1360 | { |
1374 | { |
1361 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1375 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1362 | |
1376 | |
|
|
1377 | if (mapped) |
|
|
1378 | { |
1363 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1379 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1364 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1380 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1365 | XFillRectangle (dpy, vt, gc, |
1381 | XFillRectangle (dpy, vt, gc, |
1366 | 0, Row2Pixel (row - view_start), |
1382 | 0, Row2Pixel (row - view_start), |
1367 | (unsigned int)width, |
1383 | (unsigned int)width, |
1368 | (unsigned int)Height2Pixel (num)); |
1384 | (unsigned int)Height2Pixel (num)); |
1369 | gcvalue.foreground = pix_colors[Color_fg]; |
1385 | gcvalue.foreground = pix_colors[Color_fg]; |
1370 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1386 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
|
|
1387 | } |
1371 | } |
1388 | } |
1372 | |
1389 | |
1373 | for (; num--; row++) |
1390 | for (; num--; row++) |
1374 | { |
1391 | { |
1375 | scr_blank_screen_mem (ROW(row), rstyle); |
1392 | scr_blank_screen_mem (ROW(row), rstyle); |
|
|
1393 | |
|
|
1394 | if (row - view_start < nrow) |
1376 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1395 | scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren); |
1377 | } |
1396 | } |
1378 | } |
1397 | } |
1379 | |
1398 | |
1380 | #if !ENABLE_MINIMAL |
1399 | #if !ENABLE_MINIMAL |
1381 | void |
1400 | void |
… | |
… | |
1534 | { |
1553 | { |
1535 | line->t[col] = line->t[col + count]; |
1554 | line->t[col] = line->t[col + count]; |
1536 | line->r[col] = line->r[col + count]; |
1555 | line->r[col] = line->r[col + count]; |
1537 | } |
1556 | } |
1538 | |
1557 | |
1539 | scr_blank_line (*line, ncol - count, count, |
1558 | scr_blank_line (*line, ncol - count, count, rstyle); |
1540 | line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask)); |
|
|
1541 | |
1559 | |
1542 | if (selection.op && current_screen == selection.screen |
1560 | if (selection.op && current_screen == selection.screen |
1543 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1561 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1544 | { |
1562 | { |
1545 | if (selection.end.row != screen.cur.row |
1563 | if (selection.end.row != screen.cur.row |
… | |
… | |
1681 | { |
1699 | { |
1682 | rvideo_state = on; |
1700 | rvideo_state = on; |
1683 | |
1701 | |
1684 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1702 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1685 | #ifdef HAVE_BG_PIXMAP |
1703 | #ifdef HAVE_BG_PIXMAP |
1686 | if (bgPixmap.pixmap == None) |
1704 | if (bg_pixmap == None) |
1687 | #endif |
1705 | #endif |
1688 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1706 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1689 | |
1707 | |
1690 | XGCValues gcvalue; |
1708 | XGCValues gcvalue; |
1691 | gcvalue.foreground = pix_colors[Color_fg]; |
1709 | gcvalue.foreground = pix_colors[Color_fg]; |
… | |
… | |
1835 | for (i = PART_BEG; i < RC_COUNT; i++) |
1853 | for (i = PART_BEG; i < RC_COUNT; i++) |
1836 | { |
1854 | { |
1837 | min_it (rc[i].col, ncol - 1); |
1855 | min_it (rc[i].col, ncol - 1); |
1838 | min_it (rc[i].row, nrow - 1); |
1856 | min_it (rc[i].row, nrow - 1); |
1839 | } |
1857 | } |
1840 | // TODO: this line somehow causes segfault if scr_expose() is called just after resize |
1858 | |
1841 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1859 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1842 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1860 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1843 | |
1861 | |
1844 | num_scr_allow = 0; |
1862 | num_scr_allow = 0; |
1845 | |
1863 | |
… | |
… | |
1918 | |
1936 | |
1919 | # ifndef NO_MAPALERT |
1937 | # ifndef NO_MAPALERT |
1920 | # ifdef MAPALERT_OPTION |
1938 | # ifdef MAPALERT_OPTION |
1921 | if (option (Opt_mapAlert)) |
1939 | if (option (Opt_mapAlert)) |
1922 | # endif |
1940 | # endif |
1923 | XMapWindow (dpy, parent[0]); |
1941 | XMapWindow (dpy, parent); |
1924 | # endif |
1942 | # endif |
1925 | |
1943 | |
1926 | # if ENABLE_FRILLS |
1944 | # if ENABLE_FRILLS |
1927 | if (option (Opt_urgentOnBell)) |
1945 | if (option (Opt_urgentOnBell)) |
1928 | set_urgency (1); |
1946 | set_urgency (1); |
… | |
… | |
1936 | |
1954 | |
1937 | bell_ev.start (VISUAL_BELL_DURATION); |
1955 | bell_ev.start (VISUAL_BELL_DURATION); |
1938 | } |
1956 | } |
1939 | else |
1957 | else |
1940 | XBell (dpy, 0); |
1958 | XBell (dpy, 0); |
|
|
1959 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1941 | #endif |
1960 | #endif |
1942 | } |
1961 | } |
1943 | |
1962 | |
1944 | /* ------------------------------------------------------------------------- */ |
1963 | /* ------------------------------------------------------------------------- */ |
1945 | /* ARGSUSED */ |
|
|
1946 | void |
1964 | void |
1947 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1965 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1948 | { |
1966 | { |
1949 | #ifdef PRINTPIPE |
1967 | #ifdef PRINTPIPE |
1950 | int nrows, row_start; |
1968 | int nrows, row_start; |
… | |
… | |
1964 | row_start = view_start; |
1982 | row_start = view_start; |
1965 | } |
1983 | } |
1966 | |
1984 | |
1967 | wctomb (0, 0); |
1985 | wctomb (0, 0); |
1968 | |
1986 | |
1969 | for (int r1 = 0; r1 < nrows; r1++) |
1987 | for (int r1 = row_start; r1 < row_start + nrows; r1++) |
1970 | { |
1988 | { |
1971 | text_t *tp = ROW(r1).t; |
1989 | text_t *tp = ROW(r1).t; |
1972 | int len = ROW(r1).l; |
1990 | int len = ROW(r1).l; |
1973 | |
1991 | |
1974 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
1992 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
… | |
… | |
2003 | * screen.text/screen.rend contain what the screen will change to. |
2021 | * screen.text/screen.rend contain what the screen will change to. |
2004 | */ |
2022 | */ |
2005 | void |
2023 | void |
2006 | rxvt_term::scr_refresh () NOTHROW |
2024 | rxvt_term::scr_refresh () NOTHROW |
2007 | { |
2025 | { |
2008 | unsigned char have_bg, |
|
|
2009 | showcursor; /* show the cursor */ |
|
|
2010 | int16_t col, row, /* column/row we're processing */ |
2026 | int16_t col, row, /* column/row we're processing */ |
2011 | ocrow; /* old cursor row */ |
2027 | ocrow; /* old cursor row */ |
2012 | int i; /* tmp */ |
2028 | int i; /* tmp */ |
2013 | #ifndef NO_CURSORCOLOR |
2029 | #ifndef NO_CURSORCOLOR |
2014 | rend_t cc1; /* store colours at cursor position (s) */ |
2030 | rend_t cc1; /* store colours at cursor position (s) */ |
… | |
… | |
2025 | /* |
2041 | /* |
2026 | * A: set up vars |
2042 | * A: set up vars |
2027 | */ |
2043 | */ |
2028 | refresh_count = 0; |
2044 | refresh_count = 0; |
2029 | |
2045 | |
|
|
2046 | unsigned int old_screen_flags = screen.flags; |
2030 | have_bg = 0; |
2047 | char have_bg = 0; |
2031 | #ifdef HAVE_BG_PIXMAP |
2048 | #ifdef HAVE_BG_PIXMAP |
2032 | have_bg = bgPixmap.pixmap != None; |
2049 | have_bg = bg_pixmap != None; |
2033 | #endif |
2050 | #endif |
2034 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2051 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2035 | |
2052 | |
2036 | /* |
2053 | /* |
2037 | * B: reverse any characters which are selected |
2054 | * B: reverse any characters which are selected |
2038 | */ |
2055 | */ |
2039 | scr_reverse_selection (); |
2056 | scr_reverse_selection (); |
|
|
2057 | |
|
|
2058 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
|
|
2059 | #if ENABLE_OVERLAY |
|
|
2060 | scr_swap_overlay (); |
|
|
2061 | #endif |
|
|
2062 | |
|
|
2063 | char showcursor = screen.flags & Screen_VisibleCursor; |
2040 | |
2064 | |
2041 | /* |
2065 | /* |
2042 | * C: set the cursor character (s) |
2066 | * C: set the cursor character (s) |
2043 | */ |
2067 | */ |
2044 | { |
2068 | { |
2045 | unsigned char setoldcursor; |
2069 | unsigned char setoldcursor; |
2046 | |
2070 | |
2047 | showcursor = (screen.flags & Screen_VisibleCursor); |
|
|
2048 | #ifdef CURSOR_BLINK |
2071 | #ifdef CURSOR_BLINK |
2049 | if (hidden_cursor) |
2072 | if (hidden_cursor) |
2050 | showcursor = 0; |
2073 | showcursor = 0; |
2051 | #endif |
2074 | #endif |
2052 | |
2075 | |
… | |
… | |
2080 | ccol2 = bgcolor_of (rstyle); |
2103 | ccol2 = bgcolor_of (rstyle); |
2081 | #else |
2104 | #else |
2082 | ccol2 = Color_bg; |
2105 | ccol2 = Color_bg; |
2083 | #endif |
2106 | #endif |
2084 | |
2107 | |
2085 | if (showcursor && focus) |
2108 | if (focus) |
2086 | { |
2109 | { |
2087 | if (option (Opt_cursorUnderline)) |
2110 | if (option (Opt_cursorUnderline)) |
2088 | *crp ^= RS_Uline; |
2111 | *crp ^= RS_Uline; |
2089 | else |
2112 | else |
2090 | { |
2113 | { |
… | |
… | |
2125 | oldcursor.col = screen.cur.col; |
2148 | oldcursor.col = screen.cur.col; |
2126 | } |
2149 | } |
2127 | } |
2150 | } |
2128 | } |
2151 | } |
2129 | |
2152 | |
2130 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
|
|
2131 | #if ENABLE_OVERLAY |
|
|
2132 | scr_swap_overlay (); |
|
|
2133 | #endif |
|
|
2134 | |
|
|
2135 | #ifndef NO_SLOW_LINK_SUPPORT |
2153 | #ifndef NO_SLOW_LINK_SUPPORT |
2136 | /* |
2154 | /* |
2137 | * D: CopyArea pass - very useful for slower links |
2155 | * D: CopyArea pass - very useful for slower links |
2138 | * This has been deliberately kept simple. |
2156 | * This has been deliberately kept simple. |
2139 | */ |
2157 | */ |
… | |
… | |
2228 | continue; |
2246 | continue; |
2229 | |
2247 | |
2230 | // redraw one or more characters |
2248 | // redraw one or more characters |
2231 | |
2249 | |
2232 | // seek to the beginning of wide characters |
2250 | // seek to the beginning of wide characters |
2233 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2251 | while (ecb_unlikely (stp[col] == NOCHAR && col > 0)) |
2234 | --col; |
2252 | --col; |
2235 | |
2253 | |
2236 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2254 | rend_t rend = srp[col]; /* screen rendition (target rendition) */ |
2237 | text_t *text = stp + col; |
2255 | text_t *text = stp + col; |
2238 | int count = 1; |
2256 | int count = 1; |
2239 | |
2257 | |
2240 | dtp[col] = stp[col]; |
2258 | dtp[col] = stp[col]; |
2241 | drp[col] = rend; |
2259 | drp[col] = rend; |
… | |
… | |
2245 | for (i = 0; ++col < ncol; ) |
2263 | for (i = 0; ++col < ncol; ) |
2246 | { |
2264 | { |
2247 | if (stp[col] == NOCHAR) |
2265 | if (stp[col] == NOCHAR) |
2248 | { |
2266 | { |
2249 | dtp[col] = stp[col]; |
2267 | dtp[col] = stp[col]; |
2250 | drp[col] = rend; |
2268 | drp[col] = srp[col]; |
|
|
2269 | |
2251 | count++; |
2270 | count++; |
2252 | i++; |
2271 | i++; |
2253 | |
2272 | |
2254 | continue; |
2273 | continue; |
2255 | } |
2274 | } |
… | |
… | |
2275 | |
2294 | |
2276 | col--; /* went one too far. move back */ |
2295 | col--; /* went one too far. move back */ |
2277 | count -= i; /* dump any matching trailing chars */ |
2296 | count -= i; /* dump any matching trailing chars */ |
2278 | |
2297 | |
2279 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2298 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2280 | while (expect_false (i && text[count] == NOCHAR)) |
2299 | while (ecb_unlikely (i && text[count] == NOCHAR)) |
2281 | count++, i--; |
2300 | count++, i--; |
2282 | |
2301 | |
2283 | /* |
2302 | /* |
2284 | * Determine the attributes for the string |
2303 | * Determine the attributes for the string |
2285 | */ |
2304 | */ |
2286 | int fore = fgcolor_of (rend); // desired foreground |
2305 | int fore = fgcolor_of (rend); // desired foreground |
2287 | int back = bgcolor_of (rend); // desired background |
2306 | int back = bgcolor_of (rend); // desired background |
2288 | |
2307 | |
2289 | // only do special processing if any attributes are set, which is unlikely |
2308 | // only do special processing if any attributes are set, which is unlikely |
2290 | if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) |
2309 | if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) |
2291 | { |
2310 | { |
2292 | bool invert = rend & RS_RVid; |
2311 | bool invert = rend & RS_RVid; |
2293 | |
2312 | |
2294 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2313 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2295 | if (rend & RS_Bold && fore == Color_fg) |
2314 | if (rend & RS_Bold && fore == Color_fg) |
… | |
… | |
2314 | |
2333 | |
2315 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2334 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2316 | fore = Color_UL; |
2335 | fore = Color_UL; |
2317 | #endif |
2336 | #endif |
2318 | |
2337 | |
|
|
2338 | #ifdef OPTION_HC |
|
|
2339 | if (rend & RS_Sel) |
|
|
2340 | { |
|
|
2341 | /* invert the column if no highlightColor is set or it is the |
|
|
2342 | * current cursor column */ |
|
|
2343 | if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2344 | && ISSET_PIXCOLOR (Color_HC)) |
|
|
2345 | { |
|
|
2346 | if (ISSET_PIXCOLOR (Color_HTC)) |
|
|
2347 | fore = Color_HTC; |
|
|
2348 | // if invert is 0 reverse video is set so we use bg color as fg color |
|
|
2349 | else if (!invert) |
|
|
2350 | fore = back; |
|
|
2351 | |
|
|
2352 | back = Color_HC; |
|
|
2353 | invert = 0; |
|
|
2354 | } |
|
|
2355 | } |
|
|
2356 | #endif |
|
|
2357 | |
2319 | if (invert) |
2358 | if (invert) |
2320 | { |
2359 | { |
2321 | #ifdef OPTION_HC |
|
|
2322 | if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2323 | || !ISSET_PIXCOLOR (Color_HC)) |
|
|
2324 | #endif |
|
|
2325 | /* invert the column if no highlightColor is set or it is the |
|
|
2326 | * current cursor column */ |
|
|
2327 | ::swap (fore, back); |
2360 | ::swap (fore, back); |
2328 | #ifdef OPTION_HC |
|
|
2329 | else if (ISSET_PIXCOLOR (Color_HC)) |
|
|
2330 | back = Color_HC; |
|
|
2331 | #endif |
|
|
2332 | |
2361 | |
2333 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2362 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2334 | # ifndef OPTION_HC |
|
|
2335 | if (ISSET_PIXCOLOR (Color_RV)) |
|
|
2336 | back = Color_RV; |
|
|
2337 | # endif |
|
|
2338 | if (fore == back) |
2363 | if (fore == back) |
2339 | { |
2364 | { |
2340 | fore = Color_bg; |
2365 | fore = Color_bg; |
2341 | back = Color_fg; |
2366 | back = Color_fg; |
2342 | } |
2367 | } |
… | |
… | |
2378 | /* |
2403 | /* |
2379 | * Actually do the drawing of the string here |
2404 | * Actually do the drawing of the string here |
2380 | */ |
2405 | */ |
2381 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2406 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2382 | |
2407 | |
2383 | if (expect_true (have_bg && back == Color_bg)) |
2408 | if (ecb_likely (have_bg && back == Color_bg)) |
2384 | { |
2409 | { |
2385 | // this is very ugly, maybe push it into ->draw? |
2410 | // this is very ugly, maybe push it into ->draw? |
2386 | |
2411 | |
2387 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2412 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2388 | if (text[i] != ' ') |
2413 | if (text[i] != ' ') |
… | |
… | |
2395 | did_clear: ; |
2420 | did_clear: ; |
2396 | } |
2421 | } |
2397 | else |
2422 | else |
2398 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2423 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2399 | |
2424 | |
2400 | if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) |
2425 | if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) |
2401 | { |
2426 | { |
2402 | #if ENABLE_FRILLS |
2427 | #if ENABLE_FRILLS |
2403 | if (ISSET_PIXCOLOR (Color_underline)) |
2428 | if (ISSET_PIXCOLOR (Color_underline)) |
2404 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2429 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2405 | else |
2430 | else |
… | |
… | |
2410 | xpixel, ypixel + font->ascent + 1, |
2435 | xpixel, ypixel + font->ascent + 1, |
2411 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2436 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2412 | } |
2437 | } |
2413 | } /* for (col....) */ |
2438 | } /* for (col....) */ |
2414 | } /* for (row....) */ |
2439 | } /* for (row....) */ |
2415 | |
|
|
2416 | #if ENABLE_OVERLAY |
|
|
2417 | scr_swap_overlay (); |
|
|
2418 | #endif |
|
|
2419 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2420 | |
2440 | |
2421 | /* |
2441 | /* |
2422 | * G: cleanup cursor and display outline cursor if necessary |
2442 | * G: cleanup cursor and display outline cursor if necessary |
2423 | */ |
2443 | */ |
2424 | if (showcursor) |
2444 | if (showcursor) |
… | |
… | |
2463 | } |
2483 | } |
2464 | |
2484 | |
2465 | /* |
2485 | /* |
2466 | * H: cleanup selection |
2486 | * H: cleanup selection |
2467 | */ |
2487 | */ |
|
|
2488 | #if ENABLE_OVERLAY |
|
|
2489 | scr_swap_overlay (); |
|
|
2490 | #endif |
|
|
2491 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2492 | |
2468 | scr_reverse_selection (); |
2493 | scr_reverse_selection (); |
2469 | |
2494 | |
|
|
2495 | screen.flags = old_screen_flags; |
2470 | num_scr = 0; |
2496 | num_scr = 0; |
2471 | num_scr_allow = 1; |
2497 | num_scr_allow = 1; |
2472 | } |
2498 | } |
2473 | |
2499 | |
2474 | void |
2500 | void |
… | |
… | |
2495 | scr_remap_chars (swap_buf [i]); |
2521 | scr_remap_chars (swap_buf [i]); |
2496 | } |
2522 | } |
2497 | } |
2523 | } |
2498 | |
2524 | |
2499 | void |
2525 | void |
2500 | rxvt_term::scr_recolour () NOTHROW |
2526 | rxvt_term::scr_recolour (bool refresh) NOTHROW |
2501 | { |
2527 | { |
|
|
2528 | bool transparent = false; |
|
|
2529 | |
2502 | #ifdef HAVE_BG_PIXMAP |
2530 | #ifdef HAVE_BG_PIXMAP |
2503 | bgPixmap.apply (); |
2531 | if (bg_pixmap != None) |
2504 | #else |
2532 | { |
|
|
2533 | # ifdef ENABLE_TRANSPARENCY |
|
|
2534 | if (bg_flags & BG_IS_TRANSPARENT) |
|
|
2535 | { |
|
|
2536 | XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); |
|
|
2537 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
2505 | |
2538 | |
|
|
2539 | transparent = true; |
|
|
2540 | } |
|
|
2541 | else |
|
|
2542 | # endif |
|
|
2543 | { |
|
|
2544 | XSetWindowBackground (dpy, parent, pix_colors[Color_border]); |
|
|
2545 | XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); |
|
|
2546 | } |
|
|
2547 | } |
|
|
2548 | else |
|
|
2549 | #endif |
|
|
2550 | { |
2506 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2551 | XSetWindowBackground (dpy, parent, pix_colors[Color_border]); |
2507 | XClearWindow (dpy, parent[0]); |
|
|
2508 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2552 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
|
|
2553 | } |
|
|
2554 | |
|
|
2555 | XClearWindow (dpy, parent); |
2509 | |
2556 | |
2510 | if (scrollBar.win) |
2557 | if (scrollBar.win) |
2511 | { |
2558 | { |
|
|
2559 | if (transparent) |
|
|
2560 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
|
|
2561 | else |
2512 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2562 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2513 | scrollBar.state = STATE_IDLE; |
2563 | scrollBar.state = SB_STATE_IDLE; |
2514 | scrollBar.show (0); |
2564 | scrollBar.show (0); |
2515 | } |
2565 | } |
2516 | |
2566 | |
2517 | #endif |
2567 | if (refresh) |
2518 | |
2568 | { |
2519 | /* bgPixmap.apply () does not do the following : */ |
|
|
2520 | scr_clear (); |
2569 | scr_clear (); |
2521 | scr_touch (true); |
2570 | scr_touch (true); |
|
|
2571 | } |
2522 | want_refresh = 1; |
2572 | want_refresh = 1; |
2523 | } |
2573 | } |
2524 | |
2574 | |
2525 | /* ------------------------------------------------------------------------- */ |
2575 | /* ------------------------------------------------------------------------- */ |
2526 | void |
2576 | void |
… | |
… | |
2594 | { |
2644 | { |
2595 | #if !ENABLE_MINIMAL |
2645 | #if !ENABLE_MINIMAL |
2596 | if (selection.rect) |
2646 | if (selection.rect) |
2597 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2647 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2598 | selection.end.row, selection.end.col, |
2648 | selection.end.row, selection.end.col, |
2599 | RS_RVid, RS_RVid | RS_Uline); |
2649 | RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline); |
2600 | else |
2650 | else |
2601 | #endif |
2651 | #endif |
2602 | scr_xor_span (selection.beg.row, selection.beg.col, |
2652 | scr_xor_span (selection.beg.row, selection.beg.col, |
2603 | selection.end.row, selection.end.col, |
2653 | selection.end.row, selection.end.col, |
2604 | RS_RVid); |
2654 | RS_Sel | RS_RVid); |
2605 | } |
2655 | } |
2606 | } |
2656 | } |
2607 | |
2657 | |
2608 | /* ------------------------------------------------------------------------- */ |
2658 | /* ------------------------------------------------------------------------- */ |
2609 | /* |
2659 | /* |
… | |
… | |
2614 | void |
2664 | void |
2615 | rxvt_term::scr_dump (int fd) NOTHROW |
2665 | rxvt_term::scr_dump (int fd) NOTHROW |
2616 | { |
2666 | { |
2617 | int row, wrote; |
2667 | int row, wrote; |
2618 | unsigned int width, towrite; |
2668 | unsigned int width, towrite; |
2619 | char r1[] = "\n"; |
2669 | const char r1[] = "\n"; |
2620 | |
2670 | |
2621 | for (row = saveLines + top_row; |
2671 | for (row = saveLines + top_row; |
2622 | row < saveLines + nrow - 1; row++) |
2672 | row < saveLines + nrow - 1; row++) |
2623 | { |
2673 | { |
2624 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2674 | width = row_buf[row].l >= 0 ? row_buf[row].l |
… | |
… | |
2641 | * CHARACTER SELECTION * |
2691 | * CHARACTER SELECTION * |
2642 | * ------------------------------------------------------------------------- */ |
2692 | * ------------------------------------------------------------------------- */ |
2643 | void |
2693 | void |
2644 | rxvt_term::selection_check (int check_more) NOTHROW |
2694 | rxvt_term::selection_check (int check_more) NOTHROW |
2645 | { |
2695 | { |
2646 | row_col_t pos; |
|
|
2647 | |
|
|
2648 | if (!selection.op) |
2696 | if (!selection.op) |
2649 | return; |
2697 | return; |
2650 | |
2698 | |
|
|
2699 | row_col_t pos; |
2651 | pos.row = pos.col = 0; |
2700 | pos.row = pos.col = 0; |
|
|
2701 | |
2652 | if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) |
2702 | if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) |
2653 | || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) |
2703 | || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) |
2654 | || !IN_RANGE_EXC (selection.end.row, top_row, nrow) |
2704 | || !IN_RANGE_EXC (selection.end.row, top_row, nrow) |
2655 | || (check_more == 1 |
2705 | || (check_more == 1 |
2656 | && current_screen == selection.screen |
2706 | && current_screen == selection.screen |
… | |
… | |
2658 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2708 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2659 | || (check_more == 2 |
2709 | || (check_more == 2 |
2660 | && ROWCOL_IS_BEFORE (selection.beg, pos) |
2710 | && ROWCOL_IS_BEFORE (selection.beg, pos) |
2661 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2711 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2662 | || (check_more == 3 |
2712 | || (check_more == 3 |
2663 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2713 | && ROWCOL_IS_AFTER (selection.end, pos))) |
2664 | || (check_more == 4 /* screen width change */ |
|
|
2665 | && (selection.beg.row != selection.end.row |
|
|
2666 | || selection.end.col > ncol))) |
|
|
2667 | CLEAR_SELECTION (); |
2714 | CLEAR_ALL_SELECTION (); |
2668 | } |
2715 | } |
2669 | |
2716 | |
2670 | /* ------------------------------------------------------------------------- */ |
2717 | /* ------------------------------------------------------------------------- */ |
2671 | /* |
2718 | /* |
2672 | * Paste a selection direct to the command fd |
2719 | * Paste a selection direct to the command fd |
2673 | */ |
2720 | */ |
2674 | void |
2721 | void |
2675 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2722 | rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW |
2676 | { |
2723 | { |
2677 | /* convert normal newline chars into common keyboard Return key sequence */ |
2724 | /* convert normal newline chars into common keyboard Return key sequence */ |
2678 | for (unsigned int i = 0; i < len; i++) |
2725 | for (unsigned int i = 0; i < len; i++) |
2679 | if (data[i] == C0_LF) |
2726 | if (data[i] == C0_LF) |
2680 | data[i] = C0_CR; |
2727 | data[i] = C0_CR; |
… | |
… | |
2686 | |
2733 | |
2687 | if (priv_modes & PrivMode_BracketPaste) |
2734 | if (priv_modes & PrivMode_BracketPaste) |
2688 | tt_printf ("\e[201~"); |
2735 | tt_printf ("\e[201~"); |
2689 | } |
2736 | } |
2690 | |
2737 | |
2691 | /* ------------------------------------------------------------------------- */ |
|
|
2692 | /* |
|
|
2693 | * Respond to a notification that a primary selection has been sent |
|
|
2694 | * EXT: SelectionNotify |
|
|
2695 | */ |
|
|
2696 | void |
2738 | void |
2697 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW |
2739 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2698 | { |
2740 | { |
2699 | if (prop == None) /* check for failed XConvertSelection */ |
2741 | if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END))) |
2700 | { |
|
|
2701 | if ((selection_type & Sel_CompoundText)) |
|
|
2702 | { |
|
|
2703 | int selnum = selection_type & Sel_whereMask; |
|
|
2704 | |
|
|
2705 | selection_type = 0; |
|
|
2706 | if (selnum != Sel_direct) |
|
|
2707 | selection_request_other (XA_STRING, selnum); |
|
|
2708 | } |
|
|
2709 | |
|
|
2710 | if ((selection_type & Sel_UTF8String)) |
|
|
2711 | { |
|
|
2712 | int selnum = selection_type & Sel_whereMask; |
|
|
2713 | |
|
|
2714 | selection_type = Sel_CompoundText; |
|
|
2715 | if (selnum != Sel_direct) |
|
|
2716 | selection_request_other (xa[XA_COMPOUND_TEXT], selnum); |
|
|
2717 | else |
|
|
2718 | selection_type = 0; |
|
|
2719 | } |
|
|
2720 | |
|
|
2721 | return; |
|
|
2722 | } |
|
|
2723 | |
|
|
2724 | unsigned long bytes_after; |
|
|
2725 | XTextProperty ct; |
|
|
2726 | |
|
|
2727 | if (XGetWindowProperty (dpy, win, prop, |
|
|
2728 | 0, PROP_SIZE / 4, |
|
|
2729 | delete_prop, AnyPropertyType, |
|
|
2730 | &ct.encoding, &ct.format, |
|
|
2731 | &ct.nitems, &bytes_after, |
|
|
2732 | &ct.value) != Success) |
|
|
2733 | { |
|
|
2734 | ct.value = 0; |
|
|
2735 | goto bailout; |
|
|
2736 | } |
|
|
2737 | |
|
|
2738 | if (ct.encoding == None) |
|
|
2739 | goto bailout; |
|
|
2740 | |
|
|
2741 | if (bytes_after) |
|
|
2742 | { |
|
|
2743 | // fetch and append remaining data |
|
|
2744 | XTextProperty ct2; |
|
|
2745 | |
|
|
2746 | if (XGetWindowProperty (dpy, win, prop, |
|
|
2747 | ct.nitems / 4, (bytes_after + 3) / 4, |
|
|
2748 | delete_prop, AnyPropertyType, |
|
|
2749 | &ct2.encoding, &ct2.format, |
|
|
2750 | &ct2.nitems, &bytes_after, |
|
|
2751 | &ct2.value) != Success) |
|
|
2752 | goto bailout; |
|
|
2753 | |
|
|
2754 | // realloc should be compatible to XFree, here, and elsewhere, too |
|
|
2755 | ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); |
|
|
2756 | memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); |
|
|
2757 | ct.nitems += ct2.nitems; |
|
|
2758 | |
|
|
2759 | XFree (ct2.value); |
|
|
2760 | } |
|
|
2761 | |
|
|
2762 | if (ct.value == 0) |
|
|
2763 | goto bailout; |
|
|
2764 | |
|
|
2765 | if (ct.encoding == xa[XA_INCR]) |
|
|
2766 | { |
|
|
2767 | // INCR selection, start handshake |
|
|
2768 | if (!delete_prop) |
|
|
2769 | XDeleteProperty (dpy, win, prop); |
|
|
2770 | |
|
|
2771 | selection_wait = Sel_incr; |
|
|
2772 | incr_buf_fill = 0; |
|
|
2773 | incr_ev.start (10); |
|
|
2774 | |
|
|
2775 | goto bailout; |
|
|
2776 | } |
|
|
2777 | |
|
|
2778 | if (ct.nitems == 0) |
|
|
2779 | { |
|
|
2780 | if (selection_wait == Sel_incr) |
|
|
2781 | { |
|
|
2782 | XFree (ct.value); |
|
|
2783 | |
|
|
2784 | // finally complete, now paste the whole thing |
|
|
2785 | selection_wait = Sel_normal; |
|
|
2786 | ct.value = (unsigned char *)incr_buf; |
|
|
2787 | ct.nitems = incr_buf_fill; |
|
|
2788 | incr_buf = 0; |
|
|
2789 | incr_buf_size = 0; |
|
|
2790 | incr_ev.stop (); |
|
|
2791 | } |
|
|
2792 | else |
|
|
2793 | { |
|
|
2794 | if (selection_wait == Sel_normal |
|
|
2795 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
|
|
2796 | { |
|
|
2797 | /* |
|
|
2798 | * pass through again trying CUT_BUFFER0 if we've come from |
|
|
2799 | * XConvertSelection () but nothing was presented |
|
|
2800 | */ |
|
|
2801 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
|
|
2802 | } |
|
|
2803 | |
|
|
2804 | goto bailout; |
|
|
2805 | } |
|
|
2806 | } |
|
|
2807 | else if (selection_wait == Sel_incr) |
|
|
2808 | { |
|
|
2809 | incr_ev.start (10); |
|
|
2810 | |
|
|
2811 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
|
|
2812 | { |
|
|
2813 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
|
|
2814 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
|
|
2815 | } |
|
|
2816 | |
|
|
2817 | memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); |
|
|
2818 | incr_buf_fill += ct.nitems; |
|
|
2819 | |
|
|
2820 | goto bailout; |
|
|
2821 | } |
|
|
2822 | |
|
|
2823 | char **cl; |
|
|
2824 | int cr; |
|
|
2825 | |
|
|
2826 | #if !ENABLE_MINIMAL |
|
|
2827 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
|
|
2828 | // so recode it manually |
|
|
2829 | if (ct.encoding == xa[XA_UTF8_STRING]) |
|
|
2830 | { |
|
|
2831 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
|
|
2832 | char *s = rxvt_wcstombs (w); |
|
|
2833 | free (w); |
|
|
2834 | // TODO: strlen == only the first element will be converted. well... |
|
|
2835 | paste (s, strlen (s)); |
|
|
2836 | free (s); |
|
|
2837 | } |
|
|
2838 | else |
|
|
2839 | #endif |
|
|
2840 | if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0 |
|
|
2841 | && cl) |
|
|
2842 | { |
|
|
2843 | for (int i = 0; i < cr; i++) |
|
|
2844 | paste (cl[i], strlen (cl[i])); |
|
|
2845 | |
|
|
2846 | XFreeStringList (cl); |
|
|
2847 | } |
|
|
2848 | else |
|
|
2849 | paste ((char *)ct.value, ct.nitems); // paste raw |
|
|
2850 | |
|
|
2851 | bailout: |
|
|
2852 | XFree (ct.value); |
|
|
2853 | |
|
|
2854 | if (selection_wait == Sel_normal) |
|
|
2855 | selection_wait = Sel_none; |
|
|
2856 | } |
|
|
2857 | |
|
|
2858 | void |
|
|
2859 | rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW |
|
|
2860 | { |
|
|
2861 | selection_wait = Sel_none; |
|
|
2862 | |
|
|
2863 | incr_buf_size = 0; |
|
|
2864 | free (incr_buf); |
|
|
2865 | |
|
|
2866 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
|
|
2867 | } |
|
|
2868 | |
|
|
2869 | void |
|
|
2870 | rxvt_term::selection_property (Window win, Atom prop) NOTHROW |
|
|
2871 | { |
|
|
2872 | if (prop == None || selection_wait != Sel_incr) |
|
|
2873 | return; |
2742 | return; |
2874 | |
2743 | |
2875 | selection_paste (win, prop, true); |
2744 | tt_paste (data, len); |
2876 | } |
2745 | } |
2877 | |
2746 | |
2878 | /* ------------------------------------------------------------------------- */ |
2747 | /* ------------------------------------------------------------------------- */ |
2879 | /* |
2748 | /* |
2880 | * Request the current selection: |
2749 | * Request PRIMARY, SECONDARY or CLIPBOARD selection. |
2881 | * Order: > internal selection if available |
2750 | * if the requested selection has no owner or is empty CUT_BUFFER0 is used |
2882 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2751 | * as fallback |
2883 | * > CUT_BUFFER0 |
|
|
2884 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
|
|
2885 | * will auto fallback to CUT_BUFFER0 |
|
|
2886 | * EXT: button 2 release |
2752 | * EXT: button 2 release |
2887 | */ |
2753 | */ |
2888 | void |
2754 | void |
2889 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2755 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2890 | { |
2756 | { |
2891 | if (selection.text && selnum == Sel_Primary) |
2757 | if (!selection_req) |
2892 | { |
|
|
2893 | /* internal selection */ |
|
|
2894 | char *str = rxvt_wcstombs (selection.text, selection.len); |
|
|
2895 | paste (str, strlen (str)); |
|
|
2896 | free (str); |
|
|
2897 | return; |
|
|
2898 | } |
2758 | { |
2899 | else |
2759 | selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this); |
|
|
2760 | selection_req->run (); |
2900 | { |
2761 | } |
2901 | selection_request_time = tm; |
|
|
2902 | selection_wait = Sel_normal; |
|
|
2903 | |
|
|
2904 | #if X_HAVE_UTF8_STRING |
|
|
2905 | selection_type = Sel_UTF8String; |
|
|
2906 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
|
|
2907 | return; |
|
|
2908 | #else |
|
|
2909 | selection_type = Sel_CompoundText; |
|
|
2910 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
|
|
2911 | return; |
|
|
2912 | #endif |
|
|
2913 | } |
|
|
2914 | |
|
|
2915 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
|
|
2916 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
|
|
2917 | } |
|
|
2918 | |
|
|
2919 | int |
|
|
2920 | rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW |
|
|
2921 | { |
|
|
2922 | Atom sel; |
|
|
2923 | |
|
|
2924 | selection_type |= selnum; |
|
|
2925 | |
|
|
2926 | if (selnum == Sel_Primary) |
|
|
2927 | sel = XA_PRIMARY; |
|
|
2928 | else if (selnum == Sel_Secondary) |
|
|
2929 | sel = XA_SECONDARY; |
|
|
2930 | else |
|
|
2931 | sel = xa[XA_CLIPBOARD]; |
|
|
2932 | |
|
|
2933 | if (XGetSelectionOwner (dpy, sel) != None) |
|
|
2934 | { |
|
|
2935 | XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION], |
|
|
2936 | vt, selection_request_time); |
|
|
2937 | return 1; |
|
|
2938 | } |
|
|
2939 | |
|
|
2940 | return 0; |
|
|
2941 | } |
2762 | } |
2942 | |
2763 | |
2943 | /* ------------------------------------------------------------------------- */ |
2764 | /* ------------------------------------------------------------------------- */ |
2944 | /* |
2765 | /* |
2945 | * Clear all selected text |
2766 | * Clear all selected text |
2946 | * EXT: SelectionClear |
2767 | * EXT: SelectionClear |
2947 | */ |
2768 | */ |
2948 | void |
2769 | void |
2949 | rxvt_term::selection_clear () NOTHROW |
2770 | rxvt_term::selection_clear (bool clipboard) NOTHROW |
2950 | { |
2771 | { |
|
|
2772 | if (!clipboard) |
|
|
2773 | { |
2951 | want_refresh = 1; |
2774 | want_refresh = 1; |
2952 | free (selection.text); |
2775 | free (selection.text); |
2953 | selection.text = NULL; |
2776 | selection.text = NULL; |
2954 | selection.len = 0; |
2777 | selection.len = 0; |
2955 | CLEAR_SELECTION (); |
2778 | CLEAR_SELECTION (); |
2956 | |
2779 | |
2957 | if (display->selection_owner == this) |
2780 | if (display->selection_owner == this) |
2958 | display->selection_owner = 0; |
2781 | display->selection_owner = 0; |
|
|
2782 | } |
|
|
2783 | else |
|
|
2784 | { |
|
|
2785 | free (selection.clip_text); |
|
|
2786 | selection.clip_text = NULL; |
|
|
2787 | selection.clip_len = 0; |
|
|
2788 | |
|
|
2789 | if (display->clipboard_owner == this) |
|
|
2790 | display->clipboard_owner = 0; |
|
|
2791 | } |
2959 | } |
2792 | } |
2960 | |
2793 | |
2961 | /* ------------------------------------------------------------------------- */ |
2794 | /* ------------------------------------------------------------------------- */ |
2962 | /* |
2795 | /* |
2963 | * Copy a selection into the cut buffer |
2796 | * Copy a selection into the cut buffer |
2964 | * EXT: button 1 or 3 release |
2797 | * EXT: button 1 or 3 release |
2965 | */ |
2798 | */ |
2966 | void |
2799 | void |
2967 | rxvt_term::selection_make (Time tm) |
2800 | rxvt_term::selection_make (Time tm) |
2968 | { |
2801 | { |
2969 | int i; |
2802 | int size; |
2970 | wchar_t *new_selection_text; |
2803 | wchar_t *new_selection_text; |
2971 | text_t *t; |
2804 | text_t *t; |
2972 | |
2805 | |
2973 | switch (selection.op) |
2806 | switch (selection.op) |
2974 | { |
2807 | { |
… | |
… | |
2990 | return; /* nothing selected, go away */ |
2823 | return; /* nothing selected, go away */ |
2991 | |
2824 | |
2992 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
2825 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
2993 | return; |
2826 | return; |
2994 | |
2827 | |
2995 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2828 | size = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2996 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2829 | new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t)); |
2997 | |
2830 | |
2998 | int ofs = 0; |
2831 | int ofs = 0; |
2999 | int extra = 0; |
2832 | int extra = 0; |
3000 | |
2833 | |
3001 | int col = selection.beg.col; |
2834 | int col = selection.beg.col; |
… | |
… | |
3007 | { |
2840 | { |
3008 | #if !ENABLE_MINIMAL |
2841 | #if !ENABLE_MINIMAL |
3009 | if (selection.rect) |
2842 | if (selection.rect) |
3010 | { |
2843 | { |
3011 | col = selection.beg.col; |
2844 | col = selection.beg.col; |
3012 | end_col = ncol + 1; |
2845 | end_col = selection.end.col; |
3013 | } |
2846 | } |
3014 | else |
2847 | else |
3015 | #endif |
2848 | #endif |
3016 | end_col = ROW(row).l; |
2849 | end_col = ROW(row).l; |
3017 | |
2850 | |
3018 | col = max (col, 0); |
2851 | col = max (col, 0); |
3019 | |
2852 | |
3020 | if (row == selection.end.row |
2853 | if (row == selection.end.row) |
3021 | #if !ENABLE_MINIMAL |
|
|
3022 | || selection.rect |
|
|
3023 | #endif |
|
|
3024 | ) |
|
|
3025 | min_it (end_col, selection.end.col); |
2854 | min_it (end_col, selection.end.col); |
3026 | |
2855 | |
3027 | t = ROW(row).t + col; |
2856 | t = ROW(row).t + col; |
3028 | |
2857 | |
3029 | for (; col < end_col; col++) |
2858 | for (; col < end_col; col++) |
… | |
… | |
3037 | |
2866 | |
3038 | extra -= (len - 1); |
2867 | extra -= (len - 1); |
3039 | |
2868 | |
3040 | if (extra < 0) |
2869 | if (extra < 0) |
3041 | { |
2870 | { |
3042 | extra += i; |
2871 | extra += size; |
3043 | i += i; |
2872 | size += size; |
3044 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); |
2873 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t)); |
3045 | } |
2874 | } |
3046 | |
2875 | |
3047 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
2876 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
3048 | } |
2877 | } |
3049 | #endif |
2878 | #endif |
… | |
… | |
3061 | |
2890 | |
3062 | new_selection_text[ofs++] = C0_LF; |
2891 | new_selection_text[ofs++] = C0_LF; |
3063 | } |
2892 | } |
3064 | else |
2893 | else |
3065 | #endif |
2894 | #endif |
3066 | if (!ROW(row).is_longer () && row != selection.end.row) |
2895 | if (!ROW(row).is_longer () |
|
|
2896 | && (row != selection.end.row || end_col != selection.end.col) |
|
|
2897 | && (row != selection.beg.row || selection.beg.col < ncol)) |
3067 | new_selection_text[ofs++] = C0_LF; |
2898 | new_selection_text[ofs++] = C0_LF; |
3068 | } |
2899 | } |
3069 | |
|
|
3070 | if (end_col != selection.end.col) |
|
|
3071 | new_selection_text[ofs++] = C0_LF; |
|
|
3072 | |
2900 | |
3073 | new_selection_text[ofs] = 0; |
2901 | new_selection_text[ofs] = 0; |
3074 | |
2902 | |
3075 | if (ofs == 0) |
2903 | if (ofs == 0) |
3076 | { |
2904 | { |
… | |
… | |
3089 | |
2917 | |
3090 | selection_grab (tm); |
2918 | selection_grab (tm); |
3091 | } |
2919 | } |
3092 | |
2920 | |
3093 | bool |
2921 | bool |
3094 | rxvt_term::selection_grab (Time tm) NOTHROW |
2922 | rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW |
3095 | { |
2923 | { |
|
|
2924 | Atom sel; |
|
|
2925 | |
|
|
2926 | if (!clipboard) |
|
|
2927 | { |
3096 | selection_time = tm; |
2928 | selection_time = tm; |
|
|
2929 | sel = XA_PRIMARY; |
|
|
2930 | } |
|
|
2931 | else |
|
|
2932 | { |
|
|
2933 | clipboard_time = tm; |
|
|
2934 | sel = xa[XA_CLIPBOARD]; |
|
|
2935 | } |
3097 | |
2936 | |
3098 | XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); |
2937 | XSetSelectionOwner (dpy, sel, vt, tm); |
3099 | if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) |
2938 | if (XGetSelectionOwner (dpy, sel) == vt) |
3100 | { |
2939 | { |
3101 | display->set_selection_owner (this); |
2940 | display->set_selection_owner (this, clipboard); |
3102 | return true; |
2941 | return true; |
3103 | } |
2942 | } |
3104 | else |
2943 | else |
3105 | { |
2944 | { |
3106 | selection_clear (); |
2945 | selection_clear (clipboard); |
3107 | return false; |
2946 | return false; |
3108 | } |
2947 | } |
3109 | |
2948 | |
3110 | #if 0 |
2949 | #if 0 |
3111 | XTextProperty ct; |
2950 | XTextProperty ct; |
… | |
… | |
3571 | * EXT: SelectionRequest |
3410 | * EXT: SelectionRequest |
3572 | */ |
3411 | */ |
3573 | void |
3412 | void |
3574 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3413 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3575 | { |
3414 | { |
|
|
3415 | Atom property = rq.property == None ? rq.target : rq.property; |
3576 | XSelectionEvent ev; |
3416 | XSelectionEvent ev; |
3577 | |
3417 | |
3578 | ev.type = SelectionNotify; |
3418 | ev.type = SelectionNotify; |
3579 | ev.property = None; |
3419 | ev.property = None; |
3580 | ev.display = rq.display; |
3420 | ev.display = rq.display; |
… | |
… | |
3595 | *target++ = xa[XA_COMPOUND_TEXT]; |
3435 | *target++ = xa[XA_COMPOUND_TEXT]; |
3596 | #if X_HAVE_UTF8_STRING |
3436 | #if X_HAVE_UTF8_STRING |
3597 | *target++ = xa[XA_UTF8_STRING]; |
3437 | *target++ = xa[XA_UTF8_STRING]; |
3598 | #endif |
3438 | #endif |
3599 | |
3439 | |
3600 | XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, |
3440 | XChangeProperty (dpy, rq.requestor, property, XA_ATOM, |
3601 | 32, PropModeReplace, |
3441 | 32, PropModeReplace, |
3602 | (unsigned char *)target_list, target - target_list); |
3442 | (unsigned char *)target_list, target - target_list); |
3603 | ev.property = rq.property; |
3443 | ev.property = property; |
3604 | } |
3444 | } |
3605 | #if TODO // TODO |
3445 | #if TODO // TODO |
3606 | else if (rq.target == xa[XA_MULTIPLE]) |
3446 | else if (rq.target == xa[XA_MULTIPLE]) |
3607 | { |
3447 | { |
3608 | /* TODO: Handle MULTIPLE */ |
3448 | /* TODO: Handle MULTIPLE */ |
3609 | } |
3449 | } |
3610 | #endif |
3450 | #endif |
3611 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3451 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) |
3612 | { |
3452 | { |
3613 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3453 | XChangeProperty (dpy, rq.requestor, property, rq.target, |
3614 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3454 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3615 | ev.property = rq.property; |
3455 | ev.property = property; |
|
|
3456 | } |
|
|
3457 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3458 | { |
|
|
3459 | XChangeProperty (dpy, rq.requestor, property, rq.target, |
|
|
3460 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
|
|
3461 | ev.property = property; |
3616 | } |
3462 | } |
3617 | else if (rq.target == XA_STRING |
3463 | else if (rq.target == XA_STRING |
3618 | || rq.target == xa[XA_TEXT] |
3464 | || rq.target == xa[XA_TEXT] |
3619 | || rq.target == xa[XA_COMPOUND_TEXT] |
3465 | || rq.target == xa[XA_COMPOUND_TEXT] |
3620 | || rq.target == xa[XA_UTF8_STRING] |
3466 | || rq.target == xa[XA_UTF8_STRING] |
… | |
… | |
3652 | { |
3498 | { |
3653 | target = xa[XA_COMPOUND_TEXT]; |
3499 | target = xa[XA_COMPOUND_TEXT]; |
3654 | style = enc_compound_text; |
3500 | style = enc_compound_text; |
3655 | } |
3501 | } |
3656 | |
3502 | |
3657 | if (selection.text) |
3503 | if (rq.selection == XA_PRIMARY && selection.text) |
3658 | { |
3504 | { |
3659 | cl = selection.text; |
3505 | cl = selection.text; |
3660 | selectlen = selection.len; |
3506 | selectlen = selection.len; |
|
|
3507 | } |
|
|
3508 | else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3509 | { |
|
|
3510 | cl = selection.clip_text; |
|
|
3511 | selectlen = selection.clip_len; |
3661 | } |
3512 | } |
3662 | else |
3513 | else |
3663 | { |
3514 | { |
3664 | cl = L""; |
3515 | cl = L""; |
3665 | selectlen = 0; |
3516 | selectlen = 0; |
… | |
… | |
3686 | ct.value = (unsigned char *)cl; |
3537 | ct.value = (unsigned char *)cl; |
3687 | ct.nitems = selectlen; |
3538 | ct.nitems = selectlen; |
3688 | ct.encoding = target; |
3539 | ct.encoding = target; |
3689 | } |
3540 | } |
3690 | |
3541 | |
3691 | XChangeProperty (dpy, rq.requestor, rq.property, |
3542 | XChangeProperty (dpy, rq.requestor, property, |
3692 | ct.encoding, 8, PropModeReplace, |
3543 | ct.encoding, 8, PropModeReplace, |
3693 | ct.value, (int)ct.nitems); |
3544 | ct.value, (int)ct.nitems); |
3694 | ev.property = rq.property; |
3545 | ev.property = property; |
3695 | |
3546 | |
3696 | if (freect) |
3547 | if (freect) |
3697 | XFree (ct.value); |
3548 | XFree (ct.value); |
3698 | } |
3549 | } |
3699 | |
3550 | |
… | |
… | |
3733 | h += 2; min_it (h, nrow); |
3584 | h += 2; min_it (h, nrow); |
3734 | |
3585 | |
3735 | x -= 1; clamp_it (x, 0, ncol - w); |
3586 | x -= 1; clamp_it (x, 0, ncol - w); |
3736 | y -= 1; clamp_it (y, 0, nrow - h); |
3587 | y -= 1; clamp_it (y, 0, nrow - h); |
3737 | |
3588 | |
3738 | ov_x = x; ov_y = y; |
3589 | ov.x = x; ov.y = y; |
3739 | ov_w = w; ov_h = h; |
3590 | ov.w = w; ov.h = h; |
3740 | |
3591 | |
3741 | ov_text = new text_t *[h]; |
3592 | ov.text = new text_t *[h]; |
3742 | ov_rend = new rend_t *[h]; |
3593 | ov.rend = new rend_t *[h]; |
3743 | |
3594 | |
3744 | for (y = 0; y < h; y++) |
3595 | for (y = 0; y < h; y++) |
3745 | { |
3596 | { |
3746 | text_t *tp = ov_text[y] = new text_t[w]; |
3597 | text_t *tp = ov.text[y] = new text_t[w]; |
3747 | rend_t *rp = ov_rend[y] = new rend_t[w]; |
3598 | rend_t *rp = ov.rend[y] = new rend_t[w]; |
3748 | |
3599 | |
3749 | text_t t0, t1, t2; |
3600 | text_t t0, t1, t2; |
3750 | rend_t r = OVERLAY_RSTYLE; |
3601 | rend_t r = OVERLAY_RSTYLE; |
3751 | |
3602 | |
3752 | if (y == 0) |
3603 | if (y == 0) |
… | |
… | |
3771 | } |
3622 | } |
3772 | |
3623 | |
3773 | void |
3624 | void |
3774 | rxvt_term::scr_overlay_off () NOTHROW |
3625 | rxvt_term::scr_overlay_off () NOTHROW |
3775 | { |
3626 | { |
3776 | if (!ov_text) |
3627 | if (!ov.text) |
3777 | return; |
3628 | return; |
3778 | |
3629 | |
3779 | want_refresh = 1; |
3630 | want_refresh = 1; |
3780 | |
3631 | |
3781 | for (int y = 0; y < ov_h; y++) |
3632 | for (int y = 0; y < ov.h; y++) |
3782 | { |
3633 | { |
3783 | delete [] ov_text[y]; |
3634 | delete [] ov.text[y]; |
3784 | delete [] ov_rend[y]; |
3635 | delete [] ov.rend[y]; |
3785 | } |
3636 | } |
3786 | |
3637 | |
3787 | delete [] ov_text; ov_text = 0; |
3638 | delete [] ov.text; ov.text = 0; |
3788 | delete [] ov_rend; ov_rend = 0; |
3639 | delete [] ov.rend; ov.rend = 0; |
3789 | } |
3640 | } |
3790 | |
3641 | |
3791 | void |
3642 | void |
3792 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3643 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3793 | { |
3644 | { |
3794 | if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) |
3645 | if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2) |
3795 | return; |
3646 | return; |
3796 | |
3647 | |
3797 | x++, y++; |
3648 | x++, y++; |
3798 | |
3649 | |
3799 | ov_text[y][x] = text; |
3650 | ov.text[y][x] = text; |
3800 | ov_rend[y][x] = rend; |
3651 | ov.rend[y][x] = rend; |
3801 | } |
3652 | } |
3802 | |
3653 | |
3803 | void |
3654 | void |
3804 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3655 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3805 | { |
3656 | { |
… | |
… | |
3824 | } |
3675 | } |
3825 | |
3676 | |
3826 | void |
3677 | void |
3827 | rxvt_term::scr_swap_overlay () NOTHROW |
3678 | rxvt_term::scr_swap_overlay () NOTHROW |
3828 | { |
3679 | { |
3829 | if (!ov_text) |
3680 | if (!ov.text) |
3830 | return; |
3681 | return; |
3831 | |
3682 | |
|
|
3683 | // hide cursor if it is within the overlay area |
|
|
3684 | if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w) |
|
|
3685 | && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h)) |
|
|
3686 | screen.flags &= ~Screen_VisibleCursor; |
|
|
3687 | |
3832 | // swap screen mem with overlay |
3688 | // swap screen mem with overlay |
3833 | for (int y = ov_h; y--; ) |
3689 | for (int y = ov.h; y--; ) |
3834 | { |
3690 | { |
3835 | text_t *t1 = ov_text[y]; |
3691 | text_t *t1 = ov.text[y]; |
3836 | rend_t *r1 = ov_rend[y]; |
3692 | rend_t *r1 = ov.rend[y]; |
3837 | |
3693 | |
3838 | text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; |
3694 | text_t *t2 = ROW(y + ov.y + view_start).t + ov.x; |
3839 | rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; |
3695 | rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x; |
3840 | |
3696 | |
3841 | for (int x = ov_w; x--; ) |
3697 | for (int x = ov.w; x--; ) |
3842 | { |
3698 | { |
3843 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3699 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3844 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3700 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3845 | } |
3701 | } |
3846 | } |
3702 | } |