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 begin, 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++; |
153 | } while (col < ncol && l.t[col] == NOCHAR); |
154 | } while (col < ncol && l.t[col] == NOCHAR); |
… | |
… | |
162 | { |
163 | { |
163 | #if ENABLE_OVERLAY |
164 | #if ENABLE_OVERLAY |
164 | scr_overlay_off (); |
165 | scr_overlay_off (); |
165 | #endif |
166 | #endif |
166 | |
167 | |
167 | rvideo_mode = false; |
|
|
168 | view_start = 0; |
168 | view_start = 0; |
169 | num_scr = 0; |
169 | num_scr = 0; |
170 | |
170 | |
171 | if (ncol == 0) |
171 | if (ncol == 0) |
172 | ncol = 80; |
172 | ncol = 80; |
… | |
… | |
174 | if (nrow == 0) |
174 | if (nrow == 0) |
175 | nrow = 24; |
175 | nrow = 24; |
176 | |
176 | |
177 | if (ncol == prev_ncol && nrow == prev_nrow) |
177 | if (ncol == prev_ncol && nrow == prev_nrow) |
178 | return; |
178 | return; |
179 | |
|
|
180 | if (current_screen != PRIMARY) |
|
|
181 | scr_swap_screen (); |
|
|
182 | |
179 | |
183 | // we need at least two lines for wrapping to work correctly |
180 | // we need at least two lines for wrapping to work correctly |
184 | while (nrow + saveLines < 2) |
181 | while (nrow + saveLines < 2) |
185 | { |
182 | { |
186 | //TODO//FIXME |
183 | //TODO//FIXME |
… | |
… | |
206 | term_start = 0; |
203 | term_start = 0; |
207 | |
204 | |
208 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
205 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
209 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
206 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
210 | |
207 | |
211 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
208 | row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t)); |
212 | drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
209 | drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
213 | swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
210 | swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
214 | |
211 | |
215 | for (int row = nrow; row--; ) |
212 | for (int row = nrow; row--; ) |
216 | { |
213 | { |
… | |
… | |
239 | selection.text = NULL; |
236 | selection.text = NULL; |
240 | selection.len = 0; |
237 | selection.len = 0; |
241 | selection.op = SELECTION_CLEAR; |
238 | selection.op = SELECTION_CLEAR; |
242 | selection.screen = PRIMARY; |
239 | selection.screen = PRIMARY; |
243 | selection.clicks = 0; |
240 | selection.clicks = 0; |
|
|
241 | selection.clip_text = NULL; |
|
|
242 | selection.clip_len = 0; |
244 | } |
243 | } |
245 | else |
244 | else |
246 | { |
245 | { |
247 | /* |
246 | /* |
248 | * add or delete rows as appropriate |
247 | * add or delete rows as appropriate |
… | |
… | |
276 | 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); |
277 | 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); |
278 | } |
277 | } |
279 | |
278 | |
280 | line_t *old_buf = row_buf; |
279 | line_t *old_buf = row_buf; |
281 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
280 | row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); |
282 | |
281 | |
283 | 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 |
284 | int pend = MOD (term_start + top_row , prev_total_rows); |
283 | int pend = MOD (term_start + top_row , prev_total_rows); |
285 | int q = total_rows; // rewrapped row |
284 | int q = total_rows; // rewrapped row |
286 | |
285 | |
287 | if (top_row) |
286 | if (top_row) |
288 | { |
287 | { |
289 | // 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 |
290 | // 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 |
291 | |
291 | |
292 | row_col_t ocur = screen.cur; |
292 | row_col_t ocur = screen.cur; |
293 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
293 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
294 | |
294 | |
295 | do |
295 | do |
296 | { |
296 | { |
297 | p = MOD (p - 1, prev_total_rows); |
297 | p = MOD (p - 1, prev_total_rows); |
298 | #ifdef DEBUG_STRICT |
|
|
299 | assert (old_buf [MOD (p, prev_total_rows)].t); |
298 | assert (old_buf [MOD (p, prev_total_rows)].t); |
300 | #endif |
|
|
301 | int plines = 1; |
299 | int plines = 1; |
302 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
300 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
303 | |
301 | |
304 | 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 ()) |
305 | { |
303 | { |
… | |
… | |
399 | delete old_ta; |
397 | delete old_ta; |
400 | delete old_ra; |
398 | delete old_ra; |
401 | |
399 | |
402 | clamp_it (screen.cur.row, 0, nrow - 1); |
400 | clamp_it (screen.cur.row, 0, nrow - 1); |
403 | clamp_it (screen.cur.col, 0, ncol - 1); |
401 | clamp_it (screen.cur.col, 0, ncol - 1); |
|
|
402 | } |
404 | |
403 | |
405 | free (tabs); |
404 | free (tabs); |
406 | } |
405 | tabs = (char *)rxvt_malloc (ncol); |
|
|
406 | |
|
|
407 | for (int col = ncol; col--; ) |
|
|
408 | tabs [col] = col % TABSIZE == 0; |
407 | |
409 | |
408 | CLEAR_ALL_SELECTION (); |
410 | CLEAR_ALL_SELECTION (); |
409 | |
411 | |
410 | prev_nrow = nrow; |
412 | prev_nrow = nrow; |
411 | prev_ncol = ncol; |
413 | prev_ncol = ncol; |
412 | |
|
|
413 | tabs = (char *)rxvt_malloc (ncol); |
|
|
414 | |
|
|
415 | for (int col = ncol; --col; ) |
|
|
416 | tabs [col] = col % TABSIZE == 0; |
|
|
417 | |
|
|
418 | if (current_screen != PRIMARY) |
|
|
419 | scr_swap_screen (); |
|
|
420 | |
414 | |
421 | tt_winch (); |
415 | tt_winch (); |
422 | |
416 | |
423 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
417 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
424 | } |
418 | } |
… | |
… | |
436 | delete ralloc; ralloc = 0; |
430 | delete ralloc; ralloc = 0; |
437 | |
431 | |
438 | free (row_buf); |
432 | free (row_buf); |
439 | free (swap_buf); |
433 | free (swap_buf); |
440 | free (drawn_buf); |
434 | free (drawn_buf); |
|
|
435 | row_buf = 0; // signal that we freed all the arrays above |
|
|
436 | |
441 | free (tabs); |
437 | free (tabs); |
442 | |
438 | tabs = 0; |
443 | row_buf = 0; // signal that we freed all the arrays |
|
|
444 | } |
439 | } |
445 | } |
440 | } |
446 | |
441 | |
447 | /* ------------------------------------------------------------------------- */ |
442 | /* ------------------------------------------------------------------------- */ |
448 | /* |
443 | /* |
449 | * Hard reset |
444 | * Hard/Soft reset |
450 | */ |
445 | */ |
451 | void |
446 | void |
452 | rxvt_term::scr_poweron () |
447 | rxvt_term::scr_poweron () |
453 | { |
448 | { |
454 | scr_release (); |
449 | scr_release (); |
455 | prev_nrow = prev_ncol = 0; |
450 | prev_nrow = prev_ncol = 0; |
|
|
451 | rvideo_mode = false; |
|
|
452 | scr_soft_reset (); |
456 | scr_reset (); |
453 | scr_reset (); |
457 | |
454 | |
458 | scr_clear (true); |
455 | scr_clear (true); |
459 | scr_refresh (); |
456 | scr_refresh (); |
|
|
457 | } |
|
|
458 | |
|
|
459 | void |
|
|
460 | rxvt_term::scr_soft_reset () |
|
|
461 | { |
|
|
462 | /* only affects modes, nothing drastic such as clearing the screen */ |
|
|
463 | #if ENABLE_OVERLAY |
|
|
464 | scr_overlay_off (); |
|
|
465 | #endif |
|
|
466 | |
|
|
467 | if (current_screen != PRIMARY) |
|
|
468 | scr_swap_screen (); |
|
|
469 | |
|
|
470 | scr_scroll_region (0, MAX_ROWS - 1); |
|
|
471 | scr_rendition (0, ~RS_None); |
|
|
472 | scr_insert_mode (0); |
460 | } |
473 | } |
461 | |
474 | |
462 | /* ------------------------------------------------------------------------- * |
475 | /* ------------------------------------------------------------------------- * |
463 | * PROCESS SCREEN COMMANDS * |
476 | * PROCESS SCREEN COMMANDS * |
464 | * ------------------------------------------------------------------------- */ |
477 | * ------------------------------------------------------------------------- */ |
… | |
… | |
502 | } |
515 | } |
503 | |
516 | |
504 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
517 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
505 | min_it (s->cur.row, nrow - 1); |
518 | min_it (s->cur.row, nrow - 1); |
506 | min_it (s->cur.col, ncol - 1); |
519 | min_it (s->cur.col, ncol - 1); |
507 | #ifdef DEBUG_STRICT |
|
|
508 | assert (s->cur.row >= 0); |
520 | assert (s->cur.row >= 0); |
509 | assert (s->cur.col >= 0); |
521 | assert (s->cur.col >= 0); |
510 | #endif |
|
|
511 | } |
522 | } |
512 | |
523 | |
513 | void |
524 | void |
514 | rxvt_term::scr_swap_screen () |
525 | rxvt_term::scr_swap_screen () |
515 | { |
526 | { |
… | |
… | |
540 | want_refresh = 1; |
551 | want_refresh = 1; |
541 | view_start = 0; |
552 | view_start = 0; |
542 | |
553 | |
543 | selection_check (2); /* check for boundary cross */ |
554 | selection_check (2); /* check for boundary cross */ |
544 | |
555 | |
545 | int i = current_screen; current_screen = scrn; scrn = i; |
556 | current_screen = scrn; |
546 | |
557 | |
547 | #if NSCREENS |
558 | #if NSCREENS |
548 | if (option (Opt_secondaryScreen)) |
559 | if (option (Opt_secondaryScreen)) |
549 | { |
560 | { |
550 | num_scr = 0; |
561 | num_scr = 0; |
… | |
… | |
627 | |
638 | |
628 | if (count > 0 |
639 | if (count > 0 |
629 | && row1 == 0 |
640 | && row1 == 0 |
630 | && (current_screen == PRIMARY || option (Opt_secondaryScroll))) |
641 | && (current_screen == PRIMARY || option (Opt_secondaryScroll))) |
631 | { |
642 | { |
|
|
643 | min_it (count, total_rows - (nrow - (row2 + 1))); |
|
|
644 | |
632 | top_row = max (top_row - count, -saveLines); |
645 | top_row = max (top_row - count, -saveLines); |
633 | |
|
|
634 | // scroll everything up 'count' lines |
|
|
635 | term_start = (term_start + count) % total_rows; |
|
|
636 | |
646 | |
637 | // sever bottommost line |
647 | // sever bottommost line |
638 | { |
648 | { |
639 | line_t &l = ROW(row2 - count); |
649 | line_t &l = ROW(row2); |
640 | l.is_longer (0); |
650 | l.is_longer (0); |
641 | l.touch (); |
651 | l.touch (); |
642 | } |
652 | } |
643 | |
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 | |
644 | // erase newly scrolled-in lines |
669 | // erase newly scrolled-in lines |
645 | for (int i = count; i--; ) |
670 | for (int i = count; i--; ) |
646 | { |
671 | { |
647 | line_t &l = ROW(nrow - 1 - i); |
672 | line_t &l = ROW(row2 - i); |
648 | |
673 | |
649 | // optimize if already cleared, can be significant on slow machines |
674 | // optimise if already cleared, can be significant on slow machines |
650 | // could be rolled into scr_blank_screen_mem |
675 | // could be rolled into scr_blank_screen_mem |
651 | 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))) |
652 | { |
677 | { |
653 | scr_blank_line (l, 0, l.l, rstyle); |
678 | scr_blank_line (l, 0, l.l, rstyle); |
654 | l.l = 0; |
679 | l.l = 0; |
655 | l.f = 0; |
680 | l.f = 0; |
656 | } |
681 | } |
657 | else |
682 | else |
658 | scr_blank_screen_mem (l, rstyle); |
683 | scr_blank_screen_mem (l, rstyle); |
659 | } |
|
|
660 | |
|
|
661 | // now copy lines below the scroll region bottom to the |
|
|
662 | // bottom of the screen again, so they look as if they |
|
|
663 | // hadn't moved. |
|
|
664 | for (int i = nrow; --i > row2; ) |
|
|
665 | { |
|
|
666 | line_t &l1 = ROW(i - count); |
|
|
667 | line_t &l2 = ROW(i); |
|
|
668 | |
|
|
669 | ::swap (l1, l2); |
|
|
670 | l2.touch (); |
|
|
671 | } |
684 | } |
672 | |
685 | |
673 | // move and/or clear selection, if any |
686 | // move and/or clear selection, if any |
674 | if (selection.op && current_screen == selection.screen) |
687 | if (selection.op && current_screen == selection.screen) |
675 | { |
688 | { |
… | |
… | |
721 | } |
734 | } |
722 | |
735 | |
723 | // use a simple and robust scrolling algorithm, this |
736 | // use a simple and robust scrolling algorithm, this |
724 | // part of scr_scroll_text is not time-critical. |
737 | // part of scr_scroll_text is not time-critical. |
725 | |
738 | |
|
|
739 | // sever line above scroll region |
|
|
740 | if (row1) |
|
|
741 | { |
|
|
742 | line_t &l = ROW(row1 - 1); |
|
|
743 | l.is_longer (0); |
|
|
744 | l.touch (); |
|
|
745 | } |
|
|
746 | |
726 | int rows = row2 - row1 + 1; |
747 | int rows = row2 - row1 + 1; |
727 | |
748 | |
728 | min_it (count, rows); |
749 | min_it (count, rows); |
729 | |
750 | |
730 | line_t *temp_buf = row_buf + total_rows; |
751 | line_t *temp_buf = rxvt_temp_buf<line_t> (rows); |
731 | |
752 | |
732 | for (int row = 0; row < rows; row++) |
753 | for (int row = 0; row < rows; row++) |
733 | { |
754 | { |
734 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
755 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
735 | |
756 | |
… | |
… | |
737 | scr_blank_screen_mem (temp_buf [row], rstyle); |
758 | scr_blank_screen_mem (temp_buf [row], rstyle); |
738 | } |
759 | } |
739 | |
760 | |
740 | for (int row = 0; row < rows; row++) |
761 | for (int row = 0; row < rows; row++) |
741 | ROW(row1 + row) = temp_buf [row]; |
762 | ROW(row1 + row) = temp_buf [row]; |
|
|
763 | |
|
|
764 | // sever bottommost line |
|
|
765 | { |
|
|
766 | line_t &l = ROW(row2); |
|
|
767 | l.is_longer (0); |
|
|
768 | l.touch (); |
|
|
769 | } |
742 | } |
770 | } |
743 | |
771 | |
744 | return count; |
772 | return count; |
745 | } |
773 | } |
746 | |
774 | |
… | |
… | |
775 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
803 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
776 | screen.cur.row -= minlines; |
804 | screen.cur.row -= minlines; |
777 | } |
805 | } |
778 | } |
806 | } |
779 | |
807 | |
780 | #ifdef DEBUG_STRICT |
|
|
781 | assert (screen.cur.col < ncol); |
808 | assert (screen.cur.col < ncol); |
782 | assert (screen.cur.row < nrow |
809 | assert (screen.cur.row < nrow |
783 | && screen.cur.row >= top_row); |
810 | && screen.cur.row >= top_row); |
784 | #endif |
|
|
785 | int row = screen.cur.row; |
811 | int row = screen.cur.row; |
786 | |
812 | |
787 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
813 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
788 | |
814 | |
789 | line_t *line = &ROW(row); |
815 | line_t *line = &ROW(row); |
790 | |
816 | |
791 | while (str < strend) |
817 | while (str < strend) |
792 | { |
818 | { |
793 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
819 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
794 | |
820 | |
795 | if (expect_false (c < 0x20)) |
821 | if (ecb_unlikely (c < 0x20)) |
796 | if (c == C0_LF) |
822 | if (c == C0_LF) |
797 | { |
823 | { |
798 | max_it (line->l, screen.cur.col); |
824 | max_it (line->l, screen.cur.col); |
799 | |
825 | |
800 | screen.flags &= ~Screen_WrapNext; |
826 | screen.flags &= ~Screen_WrapNext; |
… | |
… | |
819 | { |
845 | { |
820 | scr_tab (1, true); |
846 | scr_tab (1, true); |
821 | continue; |
847 | continue; |
822 | } |
848 | } |
823 | |
849 | |
824 | if (expect_false ( |
850 | if (ecb_unlikely ( |
825 | checksel /* see if we're writing within selection */ |
851 | checksel /* see if we're writing within selection */ |
826 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
852 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
827 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
853 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
828 | )) |
854 | )) |
829 | { |
855 | { |
… | |
… | |
834 | * should be a similar check. |
860 | * should be a similar check. |
835 | */ |
861 | */ |
836 | CLEAR_SELECTION (); |
862 | CLEAR_SELECTION (); |
837 | } |
863 | } |
838 | |
864 | |
839 | if (expect_false (screen.flags & Screen_WrapNext)) |
865 | if (ecb_unlikely (screen.flags & Screen_WrapNext)) |
840 | { |
866 | { |
841 | scr_do_wrap (); |
867 | scr_do_wrap (); |
842 | |
868 | |
843 | line->l = ncol; |
869 | line->l = ncol; |
844 | line->is_longer (1); |
870 | line->is_longer (1); |
… | |
… | |
846 | row = screen.cur.row; |
872 | row = screen.cur.row; |
847 | line = &ROW(row); /* _must_ refresh */ |
873 | line = &ROW(row); /* _must_ refresh */ |
848 | } |
874 | } |
849 | |
875 | |
850 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
876 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
851 | if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
877 | if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
852 | c = 0xfffd; |
878 | c = 0xfffd; |
853 | |
879 | |
854 | // rely on wcwidth to tell us the character width, do wcwidth before |
880 | // rely on wcwidth to tell us the character width, do wcwidth before |
855 | // further replacements, as wcwidth might return -1 for the line |
881 | // further replacements, as wcwidth might return -1 for the line |
856 | // drawing characters below as they might be invalid in the current |
882 | // drawing characters below as they might be invalid in the current |
857 | // locale. |
883 | // locale. |
858 | int width = WCWIDTH (c); |
884 | int width = WCWIDTH (c); |
859 | |
885 | |
860 | if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL |
886 | if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL |
861 | { |
887 | { |
862 | // vt100 special graphics and line drawing |
888 | // vt100 special graphics and line drawing |
863 | // 5f-7e standard vt100 |
889 | // 5f-7e standard vt100 |
864 | // 40-5e rxvt extension for extra curses acs chars |
890 | // 40-5e rxvt extension for extra curses acs chars |
865 | static uint16_t vt100_0[62] = { // 41 .. 7e |
891 | static uint16_t vt100_0[62] = { // 41 .. 7e |
… | |
… | |
878 | c = vt100_0[c - 0x41]; |
904 | c = vt100_0[c - 0x41]; |
879 | width = 1; // vt100 line drawing characters are always single-width |
905 | width = 1; // vt100 line drawing characters are always single-width |
880 | } |
906 | } |
881 | } |
907 | } |
882 | |
908 | |
883 | if (expect_false (screen.flags & Screen_Insert)) |
909 | if (ecb_unlikely (screen.flags & Screen_Insert)) |
884 | scr_insdel_chars (width, INSERT); |
910 | scr_insdel_chars (width, INSERT); |
885 | |
911 | |
886 | if (width != 0) |
912 | if (width != 0) |
887 | { |
913 | { |
888 | #if !UNICODE_3 |
914 | #if !UNICODE_3 |
… | |
… | |
893 | # else |
919 | # else |
894 | c = 0xfffd; |
920 | c = 0xfffd; |
895 | # endif |
921 | # endif |
896 | #endif |
922 | #endif |
897 | |
923 | |
|
|
924 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
925 | |
|
|
926 | // if the character doesn't fit into the remaining columns... |
|
|
927 | if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width)) |
|
|
928 | { |
|
|
929 | if (screen.flags & Screen_Autowrap) |
|
|
930 | { |
|
|
931 | // ... artificially enlargen the previous one |
|
|
932 | c = NOCHAR; |
|
|
933 | // and try the same character next loop iteration |
|
|
934 | --str; |
|
|
935 | } |
|
|
936 | else |
|
|
937 | screen.cur.col = ncol - width; |
|
|
938 | } |
|
|
939 | |
898 | // nuke the character at this position, if required |
940 | // nuke the character at this position, if required |
899 | if (expect_false ( |
941 | // due to wonderful coincidences everywhere else in this loop |
|
|
942 | // we never have to check for overwriting a wide char itself, |
|
|
943 | // only its tail. |
900 | line->t[screen.cur.col] == NOCHAR |
944 | if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR)) |
901 | || (screen.cur.col < ncol - 1 |
|
|
902 | && line->t[screen.cur.col + 1] == NOCHAR) |
|
|
903 | )) |
|
|
904 | scr_kill_char (*line, screen.cur.col); |
945 | scr_kill_char (*line, screen.cur.col); |
905 | |
|
|
906 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
907 | |
|
|
908 | // if the character doesn't fit into the remaining columns... |
|
|
909 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
|
|
910 | { |
|
|
911 | // ...output spaces |
|
|
912 | c = ' '; |
|
|
913 | // and try the same character next loop iteration |
|
|
914 | --str; |
|
|
915 | } |
|
|
916 | |
946 | |
917 | line->touch (); |
947 | line->touch (); |
918 | |
948 | |
919 | do |
949 | do |
920 | { |
950 | { |
921 | line->t[screen.cur.col] = c; |
951 | line->t[screen.cur.col] = c; |
922 | line->r[screen.cur.col] = rend; |
952 | line->r[screen.cur.col] = rend; |
923 | |
953 | |
924 | if (expect_true (screen.cur.col < ncol - 1)) |
954 | if (ecb_likely (screen.cur.col < ncol - 1)) |
925 | screen.cur.col++; |
955 | screen.cur.col++; |
926 | else |
956 | else |
927 | { |
957 | { |
928 | line->l = ncol; |
958 | line->l = ncol; |
929 | if (screen.flags & Screen_Autowrap) |
959 | if (screen.flags & Screen_Autowrap) |
930 | screen.flags |= Screen_WrapNext; |
960 | screen.flags |= Screen_WrapNext; |
931 | break; |
961 | |
|
|
962 | goto end_of_line; |
932 | } |
963 | } |
933 | |
964 | |
934 | c = NOCHAR; |
965 | c = NOCHAR; |
935 | } |
966 | } |
936 | while (expect_false (--width > 0)); |
967 | while (ecb_unlikely (--width > 0)); |
937 | |
968 | |
938 | // pad with spaces when overwriting wide character with smaller one |
969 | // pad with spaces when overwriting wide character with smaller one |
939 | if (expect_false (!width)) |
970 | for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++) |
940 | { |
971 | { |
941 | line->touch (); |
|
|
942 | |
|
|
943 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
|
|
944 | { |
|
|
945 | line->t[c] = ' '; |
972 | line->t[c] = ' '; |
946 | line->r[c] = rend; |
973 | line->r[c] = rend; |
947 | } |
|
|
948 | } |
974 | } |
|
|
975 | |
|
|
976 | end_of_line: |
|
|
977 | ; |
949 | } |
978 | } |
950 | #if ENABLE_COMBINING |
979 | #if ENABLE_COMBINING |
951 | else // width == 0 |
980 | else // width == 0 |
952 | { |
981 | { |
953 | if (c != 0xfeff) // ignore BOM |
982 | if (c != 0xfeff) // ignore BOM |
… | |
… | |
993 | #endif |
1022 | #endif |
994 | } |
1023 | } |
995 | |
1024 | |
996 | max_it (line->l, screen.cur.col); |
1025 | max_it (line->l, screen.cur.col); |
997 | |
1026 | |
998 | #ifdef DEBUG_STRICT |
|
|
999 | assert (screen.cur.row >= 0); |
1027 | assert (screen.cur.row >= 0); |
1000 | #endif |
|
|
1001 | } |
1028 | } |
1002 | |
1029 | |
1003 | /* ------------------------------------------------------------------------- */ |
1030 | /* ------------------------------------------------------------------------- */ |
1004 | /* |
1031 | /* |
1005 | * Process Backspace. Move back the cursor back a position, wrap if have to |
1032 | * Process Backspace. Move back the cursor back a position, wrap if have to |
… | |
… | |
1018 | |
1045 | |
1019 | want_refresh = 1; |
1046 | want_refresh = 1; |
1020 | #endif |
1047 | #endif |
1021 | } |
1048 | } |
1022 | } |
1049 | } |
|
|
1050 | else if (screen.flags & Screen_WrapNext) |
|
|
1051 | screen.flags &= ~Screen_WrapNext; |
1023 | else |
1052 | else |
1024 | scr_gotorc (0, -1, RELATIVE); |
1053 | scr_gotorc (0, -1, RELATIVE); |
1025 | } |
1054 | } |
1026 | |
1055 | |
1027 | /* ------------------------------------------------------------------------- */ |
1056 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1333 | if (row >= nrow) /* Out Of Bounds */ |
1362 | if (row >= nrow) /* Out Of Bounds */ |
1334 | return; |
1363 | return; |
1335 | |
1364 | |
1336 | min_it (num, nrow - row); |
1365 | min_it (num, nrow - row); |
1337 | |
1366 | |
1338 | /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */ |
|
|
1339 | if (rstyle & (RS_RVid | RS_Uline)) |
1367 | if (rstyle & (RS_Blink | RS_RVid | RS_Uline)) |
1340 | ren = (rend_t) ~RS_None; |
1368 | ren = (rend_t) ~RS_None; |
1341 | else if (GET_BASEBG (rstyle) == Color_bg) |
1369 | else if (GET_BASEBG (rstyle) == Color_bg) |
1342 | { |
1370 | { |
1343 | ren = DEFAULT_RSTYLE; |
1371 | ren = DEFAULT_RSTYLE; |
1344 | |
1372 | |
1345 | if (mapped) |
1373 | if (mapped) |
1346 | XClearArea (dpy, vt, 0, |
1374 | XClearArea (dpy, vt, 0, |
1347 | Row2Pixel (row), (unsigned int)width, |
1375 | Row2Pixel (row - view_start), (unsigned int)width, |
1348 | (unsigned int)Height2Pixel (num), False); |
1376 | (unsigned int)Height2Pixel (num), False); |
1349 | } |
1377 | } |
1350 | else |
1378 | else |
1351 | { |
1379 | { |
1352 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1380 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1353 | |
1381 | |
|
|
1382 | if (mapped) |
|
|
1383 | { |
1354 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1384 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1355 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1385 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1356 | XFillRectangle (dpy, vt, gc, |
1386 | XFillRectangle (dpy, vt, gc, |
1357 | 0, Row2Pixel (row), |
1387 | 0, Row2Pixel (row - view_start), |
1358 | (unsigned int)width, |
1388 | (unsigned int)width, |
1359 | (unsigned int)Height2Pixel (num)); |
1389 | (unsigned int)Height2Pixel (num)); |
1360 | gcvalue.foreground = pix_colors[Color_fg]; |
1390 | gcvalue.foreground = pix_colors[Color_fg]; |
1361 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1391 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
|
|
1392 | } |
1362 | } |
1393 | } |
1363 | |
1394 | |
1364 | for (; num--; row++) |
1395 | for (; num--; row++) |
1365 | { |
1396 | { |
1366 | scr_blank_screen_mem (ROW(row), rstyle); |
1397 | scr_blank_screen_mem (ROW(row), rstyle); |
|
|
1398 | |
|
|
1399 | if (row - view_start < nrow) |
1367 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1400 | scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren); |
1368 | } |
1401 | } |
1369 | } |
1402 | } |
1370 | |
1403 | |
1371 | #if !ENABLE_MINIMAL |
1404 | #if !ENABLE_MINIMAL |
1372 | void |
1405 | void |
… | |
… | |
1446 | * Insert/Delete <count> characters from the current position |
1479 | * Insert/Delete <count> characters from the current position |
1447 | */ |
1480 | */ |
1448 | void |
1481 | void |
1449 | rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW |
1482 | rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW |
1450 | { |
1483 | { |
1451 | int col, row; |
|
|
1452 | rend_t tr; |
|
|
1453 | |
|
|
1454 | want_refresh = 1; |
1484 | want_refresh = 1; |
1455 | ZERO_SCROLLBACK (); |
1485 | ZERO_SCROLLBACK (); |
1456 | |
1486 | |
1457 | if (count <= 0) |
1487 | if (count <= 0) |
1458 | return; |
1488 | return; |
… | |
… | |
1460 | scr_do_wrap (); |
1490 | scr_do_wrap (); |
1461 | |
1491 | |
1462 | selection_check (1); |
1492 | selection_check (1); |
1463 | min_it (count, ncol - screen.cur.col); |
1493 | min_it (count, ncol - screen.cur.col); |
1464 | |
1494 | |
1465 | row = screen.cur.row; |
1495 | int row = screen.cur.row; |
1466 | |
1496 | |
1467 | line_t *line = &ROW(row); |
1497 | line_t *line = &ROW(row); |
1468 | |
1498 | |
1469 | line->touch (); |
1499 | line->touch (); |
1470 | line->is_longer (0); |
1500 | line->is_longer (0); |
1471 | |
1501 | |
|
|
1502 | // nuke wide spanning the start |
|
|
1503 | if (line->t[screen.cur.col] == NOCHAR) |
|
|
1504 | scr_kill_char (*line, screen.cur.col); |
|
|
1505 | |
1472 | switch (insdel) |
1506 | switch (insdel) |
1473 | { |
1507 | { |
1474 | case INSERT: |
1508 | case INSERT: |
1475 | for (col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1509 | line->l = min (line->l + count, ncol); |
|
|
1510 | |
|
|
1511 | if (line->t[screen.cur.col] == NOCHAR) |
|
|
1512 | scr_kill_char (*line, screen.cur.col); |
|
|
1513 | |
|
|
1514 | for (int col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1476 | { |
1515 | { |
1477 | line->t[col] = line->t[col - count]; |
1516 | line->t[col] = line->t[col - count]; |
1478 | line->r[col] = line->r[col - count]; |
1517 | line->r[col] = line->r[col - count]; |
1479 | } |
1518 | } |
1480 | |
|
|
1481 | line->l = min (line->l + count, ncol); |
|
|
1482 | |
1519 | |
1483 | if (selection.op && current_screen == selection.screen |
1520 | if (selection.op && current_screen == selection.screen |
1484 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1521 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1485 | { |
1522 | { |
1486 | if (selection.end.row != screen.cur.row |
1523 | if (selection.end.row != screen.cur.row |
… | |
… | |
1501 | case ERASE: |
1538 | case ERASE: |
1502 | screen.cur.col += count; /* don't worry if > ncol */ |
1539 | screen.cur.col += count; /* don't worry if > ncol */ |
1503 | selection_check (1); |
1540 | selection_check (1); |
1504 | screen.cur.col -= count; |
1541 | screen.cur.col -= count; |
1505 | |
1542 | |
|
|
1543 | // nuke wide char after the end |
|
|
1544 | if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR) |
|
|
1545 | scr_kill_char (*line, screen.cur.col + count); |
|
|
1546 | |
1506 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1547 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1507 | break; |
1548 | break; |
1508 | |
1549 | |
1509 | case DELETE: |
1550 | case DELETE: |
1510 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1551 | line->l = max (line->l - count, 0); |
1511 | |
1552 | |
|
|
1553 | // nuke wide char spanning the end |
|
|
1554 | if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR) |
|
|
1555 | scr_kill_char (*line, screen.cur.col + count); |
|
|
1556 | |
1512 | for (col = screen.cur.col; (col + count) < ncol; col++) |
1557 | for (int col = screen.cur.col; (col + count) < ncol; col++) |
1513 | { |
1558 | { |
1514 | line->t[col] = line->t[col + count]; |
1559 | line->t[col] = line->t[col + count]; |
1515 | line->r[col] = line->r[col + count]; |
1560 | line->r[col] = line->r[col + count]; |
1516 | } |
1561 | } |
1517 | |
1562 | |
1518 | line->l = max (line->l - count, 0); |
|
|
1519 | scr_blank_line (*line, ncol - count, count, tr); |
1563 | scr_blank_line (*line, ncol - count, count, rstyle); |
1520 | |
1564 | |
1521 | if (selection.op && current_screen == selection.screen |
1565 | if (selection.op && current_screen == selection.screen |
1522 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1566 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1523 | { |
1567 | { |
1524 | if (selection.end.row != screen.cur.row |
1568 | if (selection.end.row != screen.cur.row |
… | |
… | |
1660 | { |
1704 | { |
1661 | rvideo_state = on; |
1705 | rvideo_state = on; |
1662 | |
1706 | |
1663 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1707 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1664 | #ifdef HAVE_BG_PIXMAP |
1708 | #ifdef HAVE_BG_PIXMAP |
1665 | if (bgPixmap.pixmap == None) |
1709 | if (bg_pixmap == None) |
1666 | #endif |
1710 | #endif |
1667 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1711 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1668 | |
1712 | |
1669 | XGCValues gcvalue; |
1713 | XGCValues gcvalue; |
1670 | gcvalue.foreground = pix_colors[Color_fg]; |
1714 | gcvalue.foreground = pix_colors[Color_fg]; |
… | |
… | |
1814 | for (i = PART_BEG; i < RC_COUNT; i++) |
1858 | for (i = PART_BEG; i < RC_COUNT; i++) |
1815 | { |
1859 | { |
1816 | min_it (rc[i].col, ncol - 1); |
1860 | min_it (rc[i].col, ncol - 1); |
1817 | min_it (rc[i].row, nrow - 1); |
1861 | min_it (rc[i].row, nrow - 1); |
1818 | } |
1862 | } |
1819 | // TODO: this line somehow causes segfault if scr_expose() is called just after resize |
1863 | |
1820 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1864 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1821 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1865 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1822 | |
1866 | |
1823 | num_scr_allow = 0; |
1867 | num_scr_allow = 0; |
1824 | |
1868 | |
… | |
… | |
1897 | |
1941 | |
1898 | # ifndef NO_MAPALERT |
1942 | # ifndef NO_MAPALERT |
1899 | # ifdef MAPALERT_OPTION |
1943 | # ifdef MAPALERT_OPTION |
1900 | if (option (Opt_mapAlert)) |
1944 | if (option (Opt_mapAlert)) |
1901 | # endif |
1945 | # endif |
1902 | XMapWindow (dpy, parent[0]); |
1946 | XMapWindow (dpy, parent); |
1903 | # endif |
1947 | # endif |
1904 | |
1948 | |
1905 | # if ENABLE_FRILLS |
1949 | # if ENABLE_FRILLS |
1906 | if (option (Opt_urgentOnBell)) |
1950 | if (option (Opt_urgentOnBell)) |
1907 | set_urgency (1); |
1951 | set_urgency (1); |
… | |
… | |
1915 | |
1959 | |
1916 | bell_ev.start (VISUAL_BELL_DURATION); |
1960 | bell_ev.start (VISUAL_BELL_DURATION); |
1917 | } |
1961 | } |
1918 | else |
1962 | else |
1919 | XBell (dpy, 0); |
1963 | XBell (dpy, 0); |
|
|
1964 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1920 | #endif |
1965 | #endif |
1921 | } |
1966 | } |
1922 | |
1967 | |
1923 | /* ------------------------------------------------------------------------- */ |
1968 | /* ------------------------------------------------------------------------- */ |
1924 | /* ARGSUSED */ |
|
|
1925 | void |
1969 | void |
1926 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1970 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1927 | { |
1971 | { |
1928 | #ifdef PRINTPIPE |
1972 | #ifdef PRINTPIPE |
1929 | int nrows, row_start; |
1973 | int nrows, row_start; |
… | |
… | |
1943 | row_start = view_start; |
1987 | row_start = view_start; |
1944 | } |
1988 | } |
1945 | |
1989 | |
1946 | wctomb (0, 0); |
1990 | wctomb (0, 0); |
1947 | |
1991 | |
1948 | for (int r1 = 0; r1 < nrows; r1++) |
1992 | for (int r1 = row_start; r1 < row_start + nrows; r1++) |
1949 | { |
1993 | { |
1950 | text_t *tp = ROW(r1).t; |
1994 | text_t *tp = ROW(r1).t; |
1951 | int len = ROW(r1).l; |
1995 | int len = ROW(r1).l; |
1952 | |
1996 | |
1953 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
1997 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
… | |
… | |
1982 | * screen.text/screen.rend contain what the screen will change to. |
2026 | * screen.text/screen.rend contain what the screen will change to. |
1983 | */ |
2027 | */ |
1984 | void |
2028 | void |
1985 | rxvt_term::scr_refresh () NOTHROW |
2029 | rxvt_term::scr_refresh () NOTHROW |
1986 | { |
2030 | { |
1987 | unsigned char have_bg, |
|
|
1988 | showcursor; /* show the cursor */ |
|
|
1989 | int16_t col, row, /* column/row we're processing */ |
2031 | int16_t col, row, /* column/row we're processing */ |
1990 | ocrow; /* old cursor row */ |
2032 | ocrow; /* old cursor row */ |
1991 | int i; /* tmp */ |
2033 | int i; /* tmp */ |
1992 | #ifndef NO_CURSORCOLOR |
2034 | #ifndef NO_CURSORCOLOR |
1993 | rend_t cc1; /* store colours at cursor position (s) */ |
2035 | rend_t cc1; /* store colours at cursor position (s) */ |
… | |
… | |
2004 | /* |
2046 | /* |
2005 | * A: set up vars |
2047 | * A: set up vars |
2006 | */ |
2048 | */ |
2007 | refresh_count = 0; |
2049 | refresh_count = 0; |
2008 | |
2050 | |
|
|
2051 | unsigned int old_screen_flags = screen.flags; |
2009 | have_bg = 0; |
2052 | char have_bg = 0; |
2010 | #ifdef HAVE_BG_PIXMAP |
2053 | #ifdef HAVE_BG_PIXMAP |
2011 | have_bg = bgPixmap.pixmap != None; |
2054 | have_bg = bg_pixmap != None; |
2012 | #endif |
2055 | #endif |
2013 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2056 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2014 | |
2057 | |
2015 | /* |
2058 | /* |
2016 | * B: reverse any characters which are selected |
2059 | * B: reverse any characters which are selected |
2017 | */ |
2060 | */ |
2018 | scr_reverse_selection (); |
2061 | scr_reverse_selection (); |
|
|
2062 | |
|
|
2063 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
|
|
2064 | #if ENABLE_OVERLAY |
|
|
2065 | scr_swap_overlay (); |
|
|
2066 | #endif |
|
|
2067 | |
|
|
2068 | char showcursor = screen.flags & Screen_VisibleCursor; |
2019 | |
2069 | |
2020 | /* |
2070 | /* |
2021 | * C: set the cursor character (s) |
2071 | * C: set the cursor character (s) |
2022 | */ |
2072 | */ |
2023 | { |
2073 | { |
2024 | unsigned char setoldcursor; |
2074 | unsigned char setoldcursor; |
2025 | |
2075 | |
2026 | showcursor = (screen.flags & Screen_VisibleCursor); |
|
|
2027 | #ifdef CURSOR_BLINK |
2076 | #ifdef CURSOR_BLINK |
2028 | if (hidden_cursor) |
2077 | if (hidden_cursor) |
2029 | showcursor = 0; |
2078 | showcursor = 0; |
2030 | #endif |
2079 | #endif |
2031 | |
2080 | |
… | |
… | |
2059 | ccol2 = bgcolor_of (rstyle); |
2108 | ccol2 = bgcolor_of (rstyle); |
2060 | #else |
2109 | #else |
2061 | ccol2 = Color_bg; |
2110 | ccol2 = Color_bg; |
2062 | #endif |
2111 | #endif |
2063 | |
2112 | |
2064 | if (showcursor && focus) |
2113 | if (focus) |
2065 | { |
2114 | { |
2066 | if (option (Opt_cursorUnderline)) |
2115 | if (option (Opt_cursorUnderline)) |
2067 | *crp ^= RS_Uline; |
2116 | *crp ^= RS_Uline; |
2068 | else |
2117 | else |
2069 | { |
2118 | { |
… | |
… | |
2104 | oldcursor.col = screen.cur.col; |
2153 | oldcursor.col = screen.cur.col; |
2105 | } |
2154 | } |
2106 | } |
2155 | } |
2107 | } |
2156 | } |
2108 | |
2157 | |
2109 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
|
|
2110 | #if ENABLE_OVERLAY |
|
|
2111 | scr_swap_overlay (); |
|
|
2112 | #endif |
|
|
2113 | |
|
|
2114 | #ifndef NO_SLOW_LINK_SUPPORT |
2158 | #ifndef NO_SLOW_LINK_SUPPORT |
2115 | /* |
2159 | /* |
2116 | * D: CopyArea pass - very useful for slower links |
2160 | * D: CopyArea pass - very useful for slower links |
2117 | * This has been deliberately kept simple. |
2161 | * This has been deliberately kept simple. |
2118 | */ |
2162 | */ |
… | |
… | |
2207 | continue; |
2251 | continue; |
2208 | |
2252 | |
2209 | // redraw one or more characters |
2253 | // redraw one or more characters |
2210 | |
2254 | |
2211 | // seek to the beginning of wide characters |
2255 | // seek to the beginning of wide characters |
2212 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2256 | while (ecb_unlikely (stp[col] == NOCHAR && col > 0)) |
2213 | --col; |
2257 | --col; |
2214 | |
2258 | |
2215 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2259 | rend_t rend = srp[col]; /* screen rendition (target rendition) */ |
2216 | text_t *text = stp + col; |
2260 | text_t *text = stp + col; |
2217 | int count = 1; |
2261 | int count = 1; |
2218 | |
2262 | |
2219 | dtp[col] = stp[col]; |
2263 | dtp[col] = stp[col]; |
2220 | drp[col] = rend; |
2264 | drp[col] = rend; |
… | |
… | |
2224 | for (i = 0; ++col < ncol; ) |
2268 | for (i = 0; ++col < ncol; ) |
2225 | { |
2269 | { |
2226 | if (stp[col] == NOCHAR) |
2270 | if (stp[col] == NOCHAR) |
2227 | { |
2271 | { |
2228 | dtp[col] = stp[col]; |
2272 | dtp[col] = stp[col]; |
2229 | drp[col] = rend; |
2273 | drp[col] = srp[col]; |
|
|
2274 | |
2230 | count++; |
2275 | count++; |
2231 | i++; |
2276 | i++; |
2232 | |
2277 | |
2233 | continue; |
2278 | continue; |
2234 | } |
2279 | } |
… | |
… | |
2254 | |
2299 | |
2255 | col--; /* went one too far. move back */ |
2300 | col--; /* went one too far. move back */ |
2256 | count -= i; /* dump any matching trailing chars */ |
2301 | count -= i; /* dump any matching trailing chars */ |
2257 | |
2302 | |
2258 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2303 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2259 | while (expect_false (i && text[count] == NOCHAR)) |
2304 | while (ecb_unlikely (i && text[count] == NOCHAR)) |
2260 | count++, i--; |
2305 | count++, i--; |
2261 | |
2306 | |
2262 | /* |
2307 | /* |
2263 | * Determine the attributes for the string |
2308 | * Determine the attributes for the string |
2264 | */ |
2309 | */ |
2265 | int fore = fgcolor_of (rend); // desired foreground |
2310 | int fore = fgcolor_of (rend); // desired foreground |
2266 | int back = bgcolor_of (rend); // desired background |
2311 | int back = bgcolor_of (rend); // desired background |
2267 | |
2312 | |
2268 | // only do special processing if any attributes are set, which is unlikely |
2313 | // only do special processing if any attributes are set, which is unlikely |
2269 | if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) |
2314 | if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) |
2270 | { |
2315 | { |
2271 | bool invert = rend & RS_RVid; |
2316 | bool invert = rend & RS_RVid; |
2272 | |
2317 | |
2273 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2318 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2274 | if (rend & RS_Bold && fore == Color_fg) |
2319 | if (rend & RS_Bold && fore == Color_fg) |
… | |
… | |
2293 | |
2338 | |
2294 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2339 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2295 | fore = Color_UL; |
2340 | fore = Color_UL; |
2296 | #endif |
2341 | #endif |
2297 | |
2342 | |
|
|
2343 | #ifdef OPTION_HC |
|
|
2344 | if (rend & RS_Sel) |
|
|
2345 | { |
|
|
2346 | /* invert the column if no highlightColor is set or it is the |
|
|
2347 | * current cursor column */ |
|
|
2348 | if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2349 | && ISSET_PIXCOLOR (Color_HC)) |
|
|
2350 | { |
|
|
2351 | if (ISSET_PIXCOLOR (Color_HTC)) |
|
|
2352 | fore = Color_HTC; |
|
|
2353 | // if invert is 0 reverse video is set so we use bg color as fg color |
|
|
2354 | else if (!invert) |
|
|
2355 | fore = back; |
|
|
2356 | |
|
|
2357 | back = Color_HC; |
|
|
2358 | invert = 0; |
|
|
2359 | } |
|
|
2360 | } |
|
|
2361 | #endif |
|
|
2362 | |
2298 | if (invert) |
2363 | if (invert) |
2299 | { |
2364 | { |
2300 | #ifdef OPTION_HC |
|
|
2301 | if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2302 | || !ISSET_PIXCOLOR (Color_HC)) |
|
|
2303 | #endif |
|
|
2304 | /* invert the column if no highlightColor is set or it is the |
|
|
2305 | * current cursor column */ |
|
|
2306 | ::swap (fore, back); |
2365 | ::swap (fore, back); |
2307 | #ifdef OPTION_HC |
|
|
2308 | else if (ISSET_PIXCOLOR (Color_HC)) |
|
|
2309 | back = Color_HC; |
|
|
2310 | #endif |
|
|
2311 | |
2366 | |
2312 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2367 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2313 | # ifndef OPTION_HC |
|
|
2314 | if (ISSET_PIXCOLOR (Color_RV)) |
|
|
2315 | back = Color_RV; |
|
|
2316 | # endif |
|
|
2317 | if (fore == back) |
2368 | if (fore == back) |
2318 | { |
2369 | { |
2319 | fore = Color_bg; |
2370 | fore = Color_bg; |
2320 | back = Color_fg; |
2371 | back = Color_fg; |
2321 | } |
2372 | } |
… | |
… | |
2357 | /* |
2408 | /* |
2358 | * Actually do the drawing of the string here |
2409 | * Actually do the drawing of the string here |
2359 | */ |
2410 | */ |
2360 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2411 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2361 | |
2412 | |
2362 | if (expect_true (have_bg && back == Color_bg)) |
2413 | if (ecb_likely (have_bg && back == Color_bg)) |
2363 | { |
2414 | { |
2364 | // this is very ugly, maybe push it into ->draw? |
2415 | // this is very ugly, maybe push it into ->draw? |
2365 | |
2416 | |
2366 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2417 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2367 | if (text[i] != ' ') |
2418 | if (text[i] != ' ') |
… | |
… | |
2374 | did_clear: ; |
2425 | did_clear: ; |
2375 | } |
2426 | } |
2376 | else |
2427 | else |
2377 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2428 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2378 | |
2429 | |
2379 | if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) |
2430 | if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) |
2380 | { |
2431 | { |
2381 | #if ENABLE_FRILLS |
2432 | #if ENABLE_FRILLS |
2382 | if (ISSET_PIXCOLOR (Color_underline)) |
2433 | if (ISSET_PIXCOLOR (Color_underline)) |
2383 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2434 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2384 | else |
2435 | else |
… | |
… | |
2389 | xpixel, ypixel + font->ascent + 1, |
2440 | xpixel, ypixel + font->ascent + 1, |
2390 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2441 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2391 | } |
2442 | } |
2392 | } /* for (col....) */ |
2443 | } /* for (col....) */ |
2393 | } /* for (row....) */ |
2444 | } /* for (row....) */ |
2394 | |
|
|
2395 | #if ENABLE_OVERLAY |
|
|
2396 | scr_swap_overlay (); |
|
|
2397 | #endif |
|
|
2398 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2399 | |
2445 | |
2400 | /* |
2446 | /* |
2401 | * G: cleanup cursor and display outline cursor if necessary |
2447 | * G: cleanup cursor and display outline cursor if necessary |
2402 | */ |
2448 | */ |
2403 | if (showcursor) |
2449 | if (showcursor) |
… | |
… | |
2442 | } |
2488 | } |
2443 | |
2489 | |
2444 | /* |
2490 | /* |
2445 | * H: cleanup selection |
2491 | * H: cleanup selection |
2446 | */ |
2492 | */ |
|
|
2493 | #if ENABLE_OVERLAY |
|
|
2494 | scr_swap_overlay (); |
|
|
2495 | #endif |
|
|
2496 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2497 | |
2447 | scr_reverse_selection (); |
2498 | scr_reverse_selection (); |
2448 | |
2499 | |
|
|
2500 | screen.flags = old_screen_flags; |
2449 | num_scr = 0; |
2501 | num_scr = 0; |
2450 | num_scr_allow = 1; |
2502 | num_scr_allow = 1; |
2451 | } |
2503 | } |
2452 | |
2504 | |
2453 | void |
2505 | void |
… | |
… | |
2474 | scr_remap_chars (swap_buf [i]); |
2526 | scr_remap_chars (swap_buf [i]); |
2475 | } |
2527 | } |
2476 | } |
2528 | } |
2477 | |
2529 | |
2478 | void |
2530 | void |
2479 | rxvt_term::scr_recolour () NOTHROW |
2531 | rxvt_term::scr_recolour (bool refresh) NOTHROW |
2480 | { |
2532 | { |
|
|
2533 | bool transparent = false; |
|
|
2534 | |
2481 | #ifdef HAVE_BG_PIXMAP |
2535 | #ifdef HAVE_BG_PIXMAP |
2482 | bgPixmap.apply (); |
2536 | if (bg_pixmap != None) |
2483 | #else |
2537 | { |
|
|
2538 | # ifdef ENABLE_TRANSPARENCY |
|
|
2539 | if (bg_flags & BG_IS_TRANSPARENT) |
|
|
2540 | { |
|
|
2541 | XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); |
|
|
2542 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
2484 | |
2543 | |
|
|
2544 | transparent = true; |
|
|
2545 | } |
|
|
2546 | else |
|
|
2547 | # endif |
|
|
2548 | { |
|
|
2549 | XSetWindowBackground (dpy, parent, pix_colors[Color_border]); |
|
|
2550 | XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); |
|
|
2551 | } |
|
|
2552 | } |
|
|
2553 | else |
|
|
2554 | #endif |
|
|
2555 | { |
2485 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2556 | XSetWindowBackground (dpy, parent, pix_colors[Color_border]); |
2486 | XClearWindow (dpy, parent[0]); |
|
|
2487 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2557 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
|
|
2558 | } |
|
|
2559 | |
|
|
2560 | XClearWindow (dpy, parent); |
2488 | |
2561 | |
2489 | if (scrollBar.win) |
2562 | if (scrollBar.win) |
2490 | { |
2563 | { |
|
|
2564 | if (transparent) |
|
|
2565 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
|
|
2566 | else |
2491 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2567 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2492 | scrollBar.state = STATE_IDLE; |
2568 | scrollBar.state = SB_STATE_IDLE; |
2493 | scrollBar.show (0); |
2569 | scrollBar.show (0); |
2494 | } |
2570 | } |
2495 | |
2571 | |
2496 | #endif |
2572 | if (refresh) |
2497 | |
2573 | { |
2498 | /* bgPixmap.apply () does not do the following : */ |
|
|
2499 | scr_clear (); |
2574 | scr_clear (); |
2500 | scr_touch (true); |
2575 | scr_touch (true); |
|
|
2576 | } |
2501 | want_refresh = 1; |
2577 | want_refresh = 1; |
2502 | } |
2578 | } |
2503 | |
2579 | |
2504 | /* ------------------------------------------------------------------------- */ |
2580 | /* ------------------------------------------------------------------------- */ |
2505 | void |
2581 | void |
… | |
… | |
2573 | { |
2649 | { |
2574 | #if !ENABLE_MINIMAL |
2650 | #if !ENABLE_MINIMAL |
2575 | if (selection.rect) |
2651 | if (selection.rect) |
2576 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2652 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2577 | selection.end.row, selection.end.col, |
2653 | selection.end.row, selection.end.col, |
2578 | RS_RVid, RS_RVid | RS_Uline); |
2654 | RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline); |
2579 | else |
2655 | else |
2580 | #endif |
2656 | #endif |
2581 | scr_xor_span (selection.beg.row, selection.beg.col, |
2657 | scr_xor_span (selection.beg.row, selection.beg.col, |
2582 | selection.end.row, selection.end.col, |
2658 | selection.end.row, selection.end.col, |
2583 | RS_RVid); |
2659 | RS_Sel | RS_RVid); |
2584 | } |
2660 | } |
2585 | } |
2661 | } |
2586 | |
2662 | |
2587 | /* ------------------------------------------------------------------------- */ |
2663 | /* ------------------------------------------------------------------------- */ |
2588 | /* |
2664 | /* |
… | |
… | |
2593 | void |
2669 | void |
2594 | rxvt_term::scr_dump (int fd) NOTHROW |
2670 | rxvt_term::scr_dump (int fd) NOTHROW |
2595 | { |
2671 | { |
2596 | int row, wrote; |
2672 | int row, wrote; |
2597 | unsigned int width, towrite; |
2673 | unsigned int width, towrite; |
2598 | char r1[] = "\n"; |
2674 | const char r1[] = "\n"; |
2599 | |
2675 | |
2600 | for (row = saveLines + top_row; |
2676 | for (row = saveLines + top_row; |
2601 | row < saveLines + nrow - 1; row++) |
2677 | row < saveLines + nrow - 1; row++) |
2602 | { |
2678 | { |
2603 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2679 | width = row_buf[row].l >= 0 ? row_buf[row].l |
… | |
… | |
2649 | /* ------------------------------------------------------------------------- */ |
2725 | /* ------------------------------------------------------------------------- */ |
2650 | /* |
2726 | /* |
2651 | * Paste a selection direct to the command fd |
2727 | * Paste a selection direct to the command fd |
2652 | */ |
2728 | */ |
2653 | void |
2729 | void |
2654 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2730 | rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW |
2655 | { |
2731 | { |
2656 | /* convert normal newline chars into common keyboard Return key sequence */ |
2732 | /* convert normal newline chars into common keyboard Return key sequence */ |
2657 | for (unsigned int i = 0; i < len; i++) |
2733 | for (unsigned int i = 0; i < len; i++) |
2658 | if (data[i] == C0_LF) |
2734 | if (data[i] == C0_LF) |
2659 | data[i] = C0_CR; |
2735 | data[i] = C0_CR; |
… | |
… | |
2665 | |
2741 | |
2666 | if (priv_modes & PrivMode_BracketPaste) |
2742 | if (priv_modes & PrivMode_BracketPaste) |
2667 | tt_printf ("\e[201~"); |
2743 | tt_printf ("\e[201~"); |
2668 | } |
2744 | } |
2669 | |
2745 | |
2670 | /* ------------------------------------------------------------------------- */ |
|
|
2671 | /* |
|
|
2672 | * Respond to a notification that a primary selection has been sent |
|
|
2673 | * EXT: SelectionNotify |
|
|
2674 | */ |
|
|
2675 | void |
2746 | void |
2676 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW |
2747 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2677 | { |
2748 | { |
2678 | if (prop == None) /* check for failed XConvertSelection */ |
2749 | if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END))) |
2679 | { |
|
|
2680 | if ((selection_type & Sel_CompoundText)) |
|
|
2681 | { |
|
|
2682 | int selnum = selection_type & Sel_whereMask; |
|
|
2683 | |
|
|
2684 | selection_type = 0; |
|
|
2685 | if (selnum != Sel_direct) |
|
|
2686 | selection_request_other (XA_STRING, selnum); |
|
|
2687 | } |
|
|
2688 | |
|
|
2689 | if ((selection_type & Sel_UTF8String)) |
|
|
2690 | { |
|
|
2691 | int selnum = selection_type & Sel_whereMask; |
|
|
2692 | |
|
|
2693 | selection_type = Sel_CompoundText; |
|
|
2694 | if (selnum != Sel_direct) |
|
|
2695 | selection_request_other (xa[XA_COMPOUND_TEXT], selnum); |
|
|
2696 | else |
|
|
2697 | selection_type = 0; |
|
|
2698 | } |
|
|
2699 | |
|
|
2700 | return; |
|
|
2701 | } |
|
|
2702 | |
|
|
2703 | unsigned long bytes_after; |
|
|
2704 | XTextProperty ct; |
|
|
2705 | |
|
|
2706 | if (XGetWindowProperty (dpy, win, prop, |
|
|
2707 | 0, PROP_SIZE / 4, |
|
|
2708 | delete_prop, AnyPropertyType, |
|
|
2709 | &ct.encoding, &ct.format, |
|
|
2710 | &ct.nitems, &bytes_after, |
|
|
2711 | &ct.value) != Success) |
|
|
2712 | { |
|
|
2713 | ct.value = 0; |
|
|
2714 | goto bailout; |
|
|
2715 | } |
|
|
2716 | |
|
|
2717 | if (ct.encoding == None) |
|
|
2718 | goto bailout; |
|
|
2719 | |
|
|
2720 | if (bytes_after) |
|
|
2721 | { |
|
|
2722 | // fetch and append remaining data |
|
|
2723 | XTextProperty ct2; |
|
|
2724 | |
|
|
2725 | if (XGetWindowProperty (dpy, win, prop, |
|
|
2726 | ct.nitems / 4, (bytes_after + 3) / 4, |
|
|
2727 | delete_prop, AnyPropertyType, |
|
|
2728 | &ct2.encoding, &ct2.format, |
|
|
2729 | &ct2.nitems, &bytes_after, |
|
|
2730 | &ct2.value) != Success) |
|
|
2731 | goto bailout; |
|
|
2732 | |
|
|
2733 | // realloc should be compatible to XFree, here, and elsewhere, too |
|
|
2734 | ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); |
|
|
2735 | memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); |
|
|
2736 | ct.nitems += ct2.nitems; |
|
|
2737 | |
|
|
2738 | XFree (ct2.value); |
|
|
2739 | } |
|
|
2740 | |
|
|
2741 | if (ct.value == 0) |
|
|
2742 | goto bailout; |
|
|
2743 | |
|
|
2744 | if (ct.encoding == xa[XA_INCR]) |
|
|
2745 | { |
|
|
2746 | // INCR selection, start handshake |
|
|
2747 | if (!delete_prop) |
|
|
2748 | XDeleteProperty (dpy, win, prop); |
|
|
2749 | |
|
|
2750 | selection_wait = Sel_incr; |
|
|
2751 | incr_buf_fill = 0; |
|
|
2752 | incr_ev.start (10); |
|
|
2753 | |
|
|
2754 | goto bailout; |
|
|
2755 | } |
|
|
2756 | |
|
|
2757 | if (ct.nitems == 0) |
|
|
2758 | { |
|
|
2759 | if (selection_wait == Sel_incr) |
|
|
2760 | { |
|
|
2761 | XFree (ct.value); |
|
|
2762 | |
|
|
2763 | // finally complete, now paste the whole thing |
|
|
2764 | selection_wait = Sel_normal; |
|
|
2765 | ct.value = (unsigned char *)incr_buf; |
|
|
2766 | ct.nitems = incr_buf_fill; |
|
|
2767 | incr_buf = 0; |
|
|
2768 | incr_buf_size = 0; |
|
|
2769 | incr_ev.stop (); |
|
|
2770 | } |
|
|
2771 | else |
|
|
2772 | { |
|
|
2773 | if (selection_wait == Sel_normal |
|
|
2774 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
|
|
2775 | { |
|
|
2776 | /* |
|
|
2777 | * pass through again trying CUT_BUFFER0 if we've come from |
|
|
2778 | * XConvertSelection () but nothing was presented |
|
|
2779 | */ |
|
|
2780 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
|
|
2781 | } |
|
|
2782 | |
|
|
2783 | goto bailout; |
|
|
2784 | } |
|
|
2785 | } |
|
|
2786 | else if (selection_wait == Sel_incr) |
|
|
2787 | { |
|
|
2788 | incr_ev.start (10); |
|
|
2789 | |
|
|
2790 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
|
|
2791 | { |
|
|
2792 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
|
|
2793 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
|
|
2794 | } |
|
|
2795 | |
|
|
2796 | memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); |
|
|
2797 | incr_buf_fill += ct.nitems; |
|
|
2798 | |
|
|
2799 | goto bailout; |
|
|
2800 | } |
|
|
2801 | |
|
|
2802 | char **cl; |
|
|
2803 | int cr; |
|
|
2804 | |
|
|
2805 | #if !ENABLE_MINIMAL |
|
|
2806 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
|
|
2807 | // so recode it manually |
|
|
2808 | if (ct.encoding == xa[XA_UTF8_STRING]) |
|
|
2809 | { |
|
|
2810 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
|
|
2811 | char *s = rxvt_wcstombs (w); |
|
|
2812 | free (w); |
|
|
2813 | // TODO: strlen == only the first element will be converted. well... |
|
|
2814 | paste (s, strlen (s)); |
|
|
2815 | free (s); |
|
|
2816 | } |
|
|
2817 | else |
|
|
2818 | #endif |
|
|
2819 | if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0 |
|
|
2820 | && cl) |
|
|
2821 | { |
|
|
2822 | for (int i = 0; i < cr; i++) |
|
|
2823 | paste (cl[i], strlen (cl[i])); |
|
|
2824 | |
|
|
2825 | XFreeStringList (cl); |
|
|
2826 | } |
|
|
2827 | else |
|
|
2828 | paste ((char *)ct.value, ct.nitems); // paste raw |
|
|
2829 | |
|
|
2830 | bailout: |
|
|
2831 | XFree (ct.value); |
|
|
2832 | |
|
|
2833 | if (selection_wait == Sel_normal) |
|
|
2834 | selection_wait = Sel_none; |
|
|
2835 | } |
|
|
2836 | |
|
|
2837 | void |
|
|
2838 | rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW |
|
|
2839 | { |
|
|
2840 | selection_wait = Sel_none; |
|
|
2841 | |
|
|
2842 | incr_buf_size = 0; |
|
|
2843 | free (incr_buf); |
|
|
2844 | |
|
|
2845 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
|
|
2846 | } |
|
|
2847 | |
|
|
2848 | void |
|
|
2849 | rxvt_term::selection_property (Window win, Atom prop) NOTHROW |
|
|
2850 | { |
|
|
2851 | if (prop == None || selection_wait != Sel_incr) |
|
|
2852 | return; |
2750 | return; |
2853 | |
2751 | |
2854 | selection_paste (win, prop, true); |
2752 | tt_paste (data, len); |
2855 | } |
2753 | } |
2856 | |
2754 | |
2857 | /* ------------------------------------------------------------------------- */ |
2755 | /* ------------------------------------------------------------------------- */ |
2858 | /* |
2756 | /* |
2859 | * Request the current selection: |
2757 | * Request PRIMARY, SECONDARY or CLIPBOARD selection. |
2860 | * Order: > internal selection if available |
2758 | * if the requested selection has no owner or is empty CUT_BUFFER0 is used |
2861 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2759 | * as fallback |
2862 | * > CUT_BUFFER0 |
|
|
2863 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
|
|
2864 | * will auto fallback to CUT_BUFFER0 |
|
|
2865 | * EXT: button 2 release |
2760 | * EXT: button 2 release |
2866 | */ |
2761 | */ |
2867 | void |
2762 | void |
2868 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2763 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2869 | { |
2764 | { |
2870 | if (selection.text && selnum == Sel_Primary) |
2765 | if (!selection_req) |
2871 | { |
|
|
2872 | /* internal selection */ |
|
|
2873 | char *str = rxvt_wcstombs (selection.text, selection.len); |
|
|
2874 | paste (str, strlen (str)); |
|
|
2875 | free (str); |
|
|
2876 | return; |
|
|
2877 | } |
2766 | { |
2878 | else |
2767 | selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this); |
|
|
2768 | selection_req->run (); |
2879 | { |
2769 | } |
2880 | selection_request_time = tm; |
|
|
2881 | selection_wait = Sel_normal; |
|
|
2882 | |
|
|
2883 | #if X_HAVE_UTF8_STRING |
|
|
2884 | selection_type = Sel_UTF8String; |
|
|
2885 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
|
|
2886 | return; |
|
|
2887 | #else |
|
|
2888 | selection_type = Sel_CompoundText; |
|
|
2889 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
|
|
2890 | return; |
|
|
2891 | #endif |
|
|
2892 | } |
|
|
2893 | |
|
|
2894 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
|
|
2895 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
|
|
2896 | } |
|
|
2897 | |
|
|
2898 | int |
|
|
2899 | rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW |
|
|
2900 | { |
|
|
2901 | Atom sel; |
|
|
2902 | |
|
|
2903 | selection_type |= selnum; |
|
|
2904 | |
|
|
2905 | if (selnum == Sel_Primary) |
|
|
2906 | sel = XA_PRIMARY; |
|
|
2907 | else if (selnum == Sel_Secondary) |
|
|
2908 | sel = XA_SECONDARY; |
|
|
2909 | else |
|
|
2910 | sel = xa[XA_CLIPBOARD]; |
|
|
2911 | |
|
|
2912 | if (XGetSelectionOwner (dpy, sel) != None) |
|
|
2913 | { |
|
|
2914 | XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION], |
|
|
2915 | vt, selection_request_time); |
|
|
2916 | return 1; |
|
|
2917 | } |
|
|
2918 | |
|
|
2919 | return 0; |
|
|
2920 | } |
2770 | } |
2921 | |
2771 | |
2922 | /* ------------------------------------------------------------------------- */ |
2772 | /* ------------------------------------------------------------------------- */ |
2923 | /* |
2773 | /* |
2924 | * Clear all selected text |
2774 | * Clear all selected text |
2925 | * EXT: SelectionClear |
2775 | * EXT: SelectionClear |
2926 | */ |
2776 | */ |
2927 | void |
2777 | void |
2928 | rxvt_term::selection_clear () NOTHROW |
2778 | rxvt_term::selection_clear (bool clipboard) NOTHROW |
2929 | { |
2779 | { |
|
|
2780 | if (!clipboard) |
|
|
2781 | { |
2930 | want_refresh = 1; |
2782 | want_refresh = 1; |
2931 | free (selection.text); |
2783 | free (selection.text); |
2932 | selection.text = NULL; |
2784 | selection.text = NULL; |
2933 | selection.len = 0; |
2785 | selection.len = 0; |
2934 | CLEAR_SELECTION (); |
2786 | CLEAR_SELECTION (); |
2935 | |
2787 | |
2936 | if (display->selection_owner == this) |
2788 | if (display->selection_owner == this) |
2937 | display->selection_owner = 0; |
2789 | display->selection_owner = 0; |
|
|
2790 | } |
|
|
2791 | else |
|
|
2792 | { |
|
|
2793 | free (selection.clip_text); |
|
|
2794 | selection.clip_text = NULL; |
|
|
2795 | selection.clip_len = 0; |
|
|
2796 | |
|
|
2797 | if (display->clipboard_owner == this) |
|
|
2798 | display->clipboard_owner = 0; |
|
|
2799 | } |
2938 | } |
2800 | } |
2939 | |
2801 | |
2940 | /* ------------------------------------------------------------------------- */ |
2802 | /* ------------------------------------------------------------------------- */ |
2941 | /* |
2803 | /* |
2942 | * Copy a selection into the cut buffer |
2804 | * Copy a selection into the cut buffer |
2943 | * EXT: button 1 or 3 release |
2805 | * EXT: button 1 or 3 release |
2944 | */ |
2806 | */ |
2945 | void |
2807 | void |
2946 | rxvt_term::selection_make (Time tm) |
2808 | rxvt_term::selection_make (Time tm) |
2947 | { |
2809 | { |
2948 | int i; |
2810 | int size; |
2949 | wchar_t *new_selection_text; |
2811 | wchar_t *new_selection_text; |
2950 | text_t *t; |
2812 | text_t *t; |
2951 | |
2813 | |
2952 | switch (selection.op) |
2814 | switch (selection.op) |
2953 | { |
2815 | { |
… | |
… | |
2969 | return; /* nothing selected, go away */ |
2831 | return; /* nothing selected, go away */ |
2970 | |
2832 | |
2971 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
2833 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
2972 | return; |
2834 | return; |
2973 | |
2835 | |
2974 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2836 | size = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2975 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2837 | new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t)); |
2976 | |
2838 | |
2977 | int ofs = 0; |
2839 | int ofs = 0; |
2978 | int extra = 0; |
2840 | int extra = 0; |
2979 | |
2841 | |
2980 | int col = selection.beg.col; |
2842 | int col = selection.beg.col; |
… | |
… | |
2986 | { |
2848 | { |
2987 | #if !ENABLE_MINIMAL |
2849 | #if !ENABLE_MINIMAL |
2988 | if (selection.rect) |
2850 | if (selection.rect) |
2989 | { |
2851 | { |
2990 | col = selection.beg.col; |
2852 | col = selection.beg.col; |
2991 | end_col = ncol + 1; |
2853 | end_col = selection.end.col; |
2992 | } |
2854 | } |
2993 | else |
2855 | else |
2994 | #endif |
2856 | #endif |
2995 | end_col = ROW(row).l; |
2857 | end_col = ROW(row).l; |
2996 | |
2858 | |
2997 | col = max (col, 0); |
2859 | col = max (col, 0); |
2998 | |
2860 | |
2999 | if (row == selection.end.row |
2861 | if (row == selection.end.row) |
3000 | #if !ENABLE_MINIMAL |
|
|
3001 | || selection.rect |
|
|
3002 | #endif |
|
|
3003 | ) |
|
|
3004 | min_it (end_col, selection.end.col); |
2862 | min_it (end_col, selection.end.col); |
3005 | |
2863 | |
3006 | t = ROW(row).t + col; |
2864 | t = ROW(row).t + col; |
3007 | |
2865 | |
3008 | for (; col < end_col; col++) |
2866 | for (; col < end_col; col++) |
… | |
… | |
3016 | |
2874 | |
3017 | extra -= (len - 1); |
2875 | extra -= (len - 1); |
3018 | |
2876 | |
3019 | if (extra < 0) |
2877 | if (extra < 0) |
3020 | { |
2878 | { |
3021 | extra += i; |
2879 | extra += size; |
3022 | i += i; |
2880 | size += size; |
3023 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); |
2881 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t)); |
3024 | } |
2882 | } |
3025 | |
2883 | |
3026 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
2884 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
3027 | } |
2885 | } |
3028 | #endif |
2886 | #endif |
… | |
… | |
3040 | |
2898 | |
3041 | new_selection_text[ofs++] = C0_LF; |
2899 | new_selection_text[ofs++] = C0_LF; |
3042 | } |
2900 | } |
3043 | else |
2901 | else |
3044 | #endif |
2902 | #endif |
3045 | if (!ROW(row).is_longer () && row != selection.end.row) |
2903 | if (!ROW(row).is_longer () |
|
|
2904 | && (row != selection.end.row || end_col != selection.end.col) |
|
|
2905 | && (row != selection.beg.row || selection.beg.col < ncol)) |
3046 | new_selection_text[ofs++] = C0_LF; |
2906 | new_selection_text[ofs++] = C0_LF; |
3047 | } |
2907 | } |
3048 | |
|
|
3049 | if (end_col != selection.end.col) |
|
|
3050 | new_selection_text[ofs++] = C0_LF; |
|
|
3051 | |
2908 | |
3052 | new_selection_text[ofs] = 0; |
2909 | new_selection_text[ofs] = 0; |
3053 | |
2910 | |
3054 | if (ofs == 0) |
2911 | if (ofs == 0) |
3055 | { |
2912 | { |
… | |
… | |
3068 | |
2925 | |
3069 | selection_grab (tm); |
2926 | selection_grab (tm); |
3070 | } |
2927 | } |
3071 | |
2928 | |
3072 | bool |
2929 | bool |
3073 | rxvt_term::selection_grab (Time tm) NOTHROW |
2930 | rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW |
3074 | { |
2931 | { |
|
|
2932 | Atom sel; |
|
|
2933 | |
|
|
2934 | if (!clipboard) |
|
|
2935 | { |
3075 | selection_time = tm; |
2936 | selection_time = tm; |
|
|
2937 | sel = XA_PRIMARY; |
|
|
2938 | } |
|
|
2939 | else |
|
|
2940 | { |
|
|
2941 | clipboard_time = tm; |
|
|
2942 | sel = xa[XA_CLIPBOARD]; |
|
|
2943 | } |
3076 | |
2944 | |
3077 | XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); |
2945 | XSetSelectionOwner (dpy, sel, vt, tm); |
3078 | if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) |
2946 | if (XGetSelectionOwner (dpy, sel) == vt) |
3079 | { |
2947 | { |
3080 | display->set_selection_owner (this); |
2948 | display->set_selection_owner (this, clipboard); |
3081 | return true; |
2949 | return true; |
3082 | } |
2950 | } |
3083 | else |
2951 | else |
3084 | { |
2952 | { |
3085 | selection_clear (); |
2953 | selection_clear (clipboard); |
3086 | return false; |
2954 | return false; |
3087 | } |
2955 | } |
3088 | |
2956 | |
3089 | #if 0 |
2957 | #if 0 |
3090 | XTextProperty ct; |
2958 | XTextProperty ct; |
… | |
… | |
3550 | * EXT: SelectionRequest |
3418 | * EXT: SelectionRequest |
3551 | */ |
3419 | */ |
3552 | void |
3420 | void |
3553 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3421 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3554 | { |
3422 | { |
|
|
3423 | Atom property = rq.property == None ? rq.target : rq.property; |
3555 | XSelectionEvent ev; |
3424 | XSelectionEvent ev; |
3556 | |
3425 | |
3557 | ev.type = SelectionNotify; |
3426 | ev.type = SelectionNotify; |
3558 | ev.property = None; |
3427 | ev.property = None; |
3559 | ev.display = rq.display; |
3428 | ev.display = rq.display; |
… | |
… | |
3574 | *target++ = xa[XA_COMPOUND_TEXT]; |
3443 | *target++ = xa[XA_COMPOUND_TEXT]; |
3575 | #if X_HAVE_UTF8_STRING |
3444 | #if X_HAVE_UTF8_STRING |
3576 | *target++ = xa[XA_UTF8_STRING]; |
3445 | *target++ = xa[XA_UTF8_STRING]; |
3577 | #endif |
3446 | #endif |
3578 | |
3447 | |
3579 | XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, |
3448 | XChangeProperty (dpy, rq.requestor, property, XA_ATOM, |
3580 | 32, PropModeReplace, |
3449 | 32, PropModeReplace, |
3581 | (unsigned char *)target_list, target - target_list); |
3450 | (unsigned char *)target_list, target - target_list); |
3582 | ev.property = rq.property; |
3451 | ev.property = property; |
3583 | } |
3452 | } |
3584 | #if TODO // TODO |
3453 | #if TODO // TODO |
3585 | else if (rq.target == xa[XA_MULTIPLE]) |
3454 | else if (rq.target == xa[XA_MULTIPLE]) |
3586 | { |
3455 | { |
3587 | /* TODO: Handle MULTIPLE */ |
3456 | /* TODO: Handle MULTIPLE */ |
3588 | } |
3457 | } |
3589 | #endif |
3458 | #endif |
3590 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3459 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) |
3591 | { |
3460 | { |
3592 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3461 | XChangeProperty (dpy, rq.requestor, property, rq.target, |
3593 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3462 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3594 | ev.property = rq.property; |
3463 | ev.property = property; |
|
|
3464 | } |
|
|
3465 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3466 | { |
|
|
3467 | XChangeProperty (dpy, rq.requestor, property, rq.target, |
|
|
3468 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
|
|
3469 | ev.property = property; |
3595 | } |
3470 | } |
3596 | else if (rq.target == XA_STRING |
3471 | else if (rq.target == XA_STRING |
3597 | || rq.target == xa[XA_TEXT] |
3472 | || rq.target == xa[XA_TEXT] |
3598 | || rq.target == xa[XA_COMPOUND_TEXT] |
3473 | || rq.target == xa[XA_COMPOUND_TEXT] |
3599 | || rq.target == xa[XA_UTF8_STRING] |
3474 | || rq.target == xa[XA_UTF8_STRING] |
… | |
… | |
3631 | { |
3506 | { |
3632 | target = xa[XA_COMPOUND_TEXT]; |
3507 | target = xa[XA_COMPOUND_TEXT]; |
3633 | style = enc_compound_text; |
3508 | style = enc_compound_text; |
3634 | } |
3509 | } |
3635 | |
3510 | |
3636 | if (selection.text) |
3511 | if (rq.selection == XA_PRIMARY && selection.text) |
3637 | { |
3512 | { |
3638 | cl = selection.text; |
3513 | cl = selection.text; |
3639 | selectlen = selection.len; |
3514 | selectlen = selection.len; |
|
|
3515 | } |
|
|
3516 | else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3517 | { |
|
|
3518 | cl = selection.clip_text; |
|
|
3519 | selectlen = selection.clip_len; |
3640 | } |
3520 | } |
3641 | else |
3521 | else |
3642 | { |
3522 | { |
3643 | cl = L""; |
3523 | cl = L""; |
3644 | selectlen = 0; |
3524 | selectlen = 0; |
… | |
… | |
3665 | ct.value = (unsigned char *)cl; |
3545 | ct.value = (unsigned char *)cl; |
3666 | ct.nitems = selectlen; |
3546 | ct.nitems = selectlen; |
3667 | ct.encoding = target; |
3547 | ct.encoding = target; |
3668 | } |
3548 | } |
3669 | |
3549 | |
3670 | XChangeProperty (dpy, rq.requestor, rq.property, |
3550 | XChangeProperty (dpy, rq.requestor, property, |
3671 | ct.encoding, 8, PropModeReplace, |
3551 | ct.encoding, 8, PropModeReplace, |
3672 | ct.value, (int)ct.nitems); |
3552 | ct.value, (int)ct.nitems); |
3673 | ev.property = rq.property; |
3553 | ev.property = property; |
3674 | |
3554 | |
3675 | if (freect) |
3555 | if (freect) |
3676 | XFree (ct.value); |
3556 | XFree (ct.value); |
3677 | } |
3557 | } |
3678 | |
3558 | |
… | |
… | |
3712 | h += 2; min_it (h, nrow); |
3592 | h += 2; min_it (h, nrow); |
3713 | |
3593 | |
3714 | x -= 1; clamp_it (x, 0, ncol - w); |
3594 | x -= 1; clamp_it (x, 0, ncol - w); |
3715 | y -= 1; clamp_it (y, 0, nrow - h); |
3595 | y -= 1; clamp_it (y, 0, nrow - h); |
3716 | |
3596 | |
3717 | ov_x = x; ov_y = y; |
3597 | ov.x = x; ov.y = y; |
3718 | ov_w = w; ov_h = h; |
3598 | ov.w = w; ov.h = h; |
3719 | |
3599 | |
3720 | ov_text = new text_t *[h]; |
3600 | ov.text = new text_t *[h]; |
3721 | ov_rend = new rend_t *[h]; |
3601 | ov.rend = new rend_t *[h]; |
3722 | |
3602 | |
3723 | for (y = 0; y < h; y++) |
3603 | for (y = 0; y < h; y++) |
3724 | { |
3604 | { |
3725 | text_t *tp = ov_text[y] = new text_t[w]; |
3605 | text_t *tp = ov.text[y] = new text_t[w]; |
3726 | rend_t *rp = ov_rend[y] = new rend_t[w]; |
3606 | rend_t *rp = ov.rend[y] = new rend_t[w]; |
3727 | |
3607 | |
3728 | text_t t0, t1, t2; |
3608 | text_t t0, t1, t2; |
3729 | rend_t r = OVERLAY_RSTYLE; |
3609 | rend_t r = OVERLAY_RSTYLE; |
3730 | |
3610 | |
3731 | if (y == 0) |
3611 | if (y == 0) |
… | |
… | |
3750 | } |
3630 | } |
3751 | |
3631 | |
3752 | void |
3632 | void |
3753 | rxvt_term::scr_overlay_off () NOTHROW |
3633 | rxvt_term::scr_overlay_off () NOTHROW |
3754 | { |
3634 | { |
3755 | if (!ov_text) |
3635 | if (!ov.text) |
3756 | return; |
3636 | return; |
3757 | |
3637 | |
3758 | want_refresh = 1; |
3638 | want_refresh = 1; |
3759 | |
3639 | |
3760 | for (int y = 0; y < ov_h; y++) |
3640 | for (int y = 0; y < ov.h; y++) |
3761 | { |
3641 | { |
3762 | delete [] ov_text[y]; |
3642 | delete [] ov.text[y]; |
3763 | delete [] ov_rend[y]; |
3643 | delete [] ov.rend[y]; |
3764 | } |
3644 | } |
3765 | |
3645 | |
3766 | delete [] ov_text; ov_text = 0; |
3646 | delete [] ov.text; ov.text = 0; |
3767 | delete [] ov_rend; ov_rend = 0; |
3647 | delete [] ov.rend; ov.rend = 0; |
3768 | } |
3648 | } |
3769 | |
3649 | |
3770 | void |
3650 | void |
3771 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3651 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3772 | { |
3652 | { |
3773 | if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) |
3653 | if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2) |
3774 | return; |
3654 | return; |
3775 | |
3655 | |
3776 | x++, y++; |
3656 | x++, y++; |
3777 | |
3657 | |
3778 | ov_text[y][x] = text; |
3658 | ov.text[y][x] = text; |
3779 | ov_rend[y][x] = rend; |
3659 | ov.rend[y][x] = rend; |
3780 | } |
3660 | } |
3781 | |
3661 | |
3782 | void |
3662 | void |
3783 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3663 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3784 | { |
3664 | { |
… | |
… | |
3803 | } |
3683 | } |
3804 | |
3684 | |
3805 | void |
3685 | void |
3806 | rxvt_term::scr_swap_overlay () NOTHROW |
3686 | rxvt_term::scr_swap_overlay () NOTHROW |
3807 | { |
3687 | { |
3808 | if (!ov_text) |
3688 | if (!ov.text) |
3809 | return; |
3689 | return; |
3810 | |
3690 | |
|
|
3691 | // hide cursor if it is within the overlay area |
|
|
3692 | if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w) |
|
|
3693 | && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h)) |
|
|
3694 | screen.flags &= ~Screen_VisibleCursor; |
|
|
3695 | |
3811 | // swap screen mem with overlay |
3696 | // swap screen mem with overlay |
3812 | for (int y = ov_h; y--; ) |
3697 | for (int y = ov.h; y--; ) |
3813 | { |
3698 | { |
3814 | text_t *t1 = ov_text[y]; |
3699 | text_t *t1 = ov.text[y]; |
3815 | rend_t *r1 = ov_rend[y]; |
3700 | rend_t *r1 = ov.rend[y]; |
3816 | |
3701 | |
3817 | text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; |
3702 | text_t *t2 = ROW(y + ov.y + view_start).t + ov.x; |
3818 | rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; |
3703 | rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x; |
3819 | |
3704 | |
3820 | for (int x = ov_w; x--; ) |
3705 | for (int x = ov.w; x--; ) |
3821 | { |
3706 | { |
3822 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3707 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3823 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3708 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3824 | } |
3709 | } |
3825 | } |
3710 | } |