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++; |
… | |
… | |
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; |
… | |
… | |
656 | } |
681 | } |
657 | else |
682 | else |
658 | scr_blank_screen_mem (l, rstyle); |
683 | scr_blank_screen_mem (l, rstyle); |
659 | } |
684 | } |
660 | |
685 | |
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 | } |
|
|
672 | |
|
|
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 | { |
676 | selection.beg.row -= count; |
689 | selection.beg.row -= count; |
677 | selection.end.row -= count; |
690 | selection.end.row -= count; |
678 | selection.mark.row -= count; |
691 | selection.mark.row -= count; |
679 | |
692 | |
680 | if (selection.beg.row < top_row |
693 | selection_check (0); |
681 | || selection.end.row < top_row |
|
|
682 | || selection.mark.row < top_row) |
|
|
683 | { |
|
|
684 | CLEAR_ALL_SELECTION (); |
|
|
685 | selection.op = SELECTION_CLEAR; |
|
|
686 | } |
|
|
687 | } |
694 | } |
688 | |
695 | |
689 | // finally move the view window, if desired |
696 | // finally move the view window, if desired |
690 | if (option (Opt_scrollWithBuffer) |
697 | if (option (Opt_scrollWithBuffer) |
691 | && view_start != 0 |
698 | && view_start != 0 |
… | |
… | |
721 | } |
728 | } |
722 | |
729 | |
723 | // use a simple and robust scrolling algorithm, this |
730 | // use a simple and robust scrolling algorithm, this |
724 | // part of scr_scroll_text is not time-critical. |
731 | // part of scr_scroll_text is not time-critical. |
725 | |
732 | |
|
|
733 | // sever line above scroll region |
|
|
734 | if (row1) |
|
|
735 | { |
|
|
736 | line_t &l = ROW(row1 - 1); |
|
|
737 | l.is_longer (0); |
|
|
738 | l.touch (); |
|
|
739 | } |
|
|
740 | |
726 | int rows = row2 - row1 + 1; |
741 | int rows = row2 - row1 + 1; |
727 | |
742 | |
728 | min_it (count, rows); |
743 | min_it (count, rows); |
729 | |
744 | |
730 | line_t *temp_buf = row_buf + total_rows; |
745 | line_t *temp_buf = rxvt_temp_buf<line_t> (rows); |
731 | |
746 | |
732 | for (int row = 0; row < rows; row++) |
747 | for (int row = 0; row < rows; row++) |
733 | { |
748 | { |
734 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
749 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
735 | |
750 | |
… | |
… | |
737 | scr_blank_screen_mem (temp_buf [row], rstyle); |
752 | scr_blank_screen_mem (temp_buf [row], rstyle); |
738 | } |
753 | } |
739 | |
754 | |
740 | for (int row = 0; row < rows; row++) |
755 | for (int row = 0; row < rows; row++) |
741 | ROW(row1 + row) = temp_buf [row]; |
756 | ROW(row1 + row) = temp_buf [row]; |
|
|
757 | |
|
|
758 | // sever bottommost line |
|
|
759 | { |
|
|
760 | line_t &l = ROW(row2); |
|
|
761 | l.is_longer (0); |
|
|
762 | l.touch (); |
|
|
763 | } |
742 | } |
764 | } |
743 | |
765 | |
744 | return count; |
766 | return count; |
745 | } |
767 | } |
746 | |
768 | |
… | |
… | |
775 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
797 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
776 | screen.cur.row -= minlines; |
798 | screen.cur.row -= minlines; |
777 | } |
799 | } |
778 | } |
800 | } |
779 | |
801 | |
780 | #ifdef DEBUG_STRICT |
|
|
781 | assert (screen.cur.col < ncol); |
802 | assert (screen.cur.col < ncol); |
782 | assert (screen.cur.row < nrow |
803 | assert (screen.cur.row < nrow |
783 | && screen.cur.row >= top_row); |
804 | && screen.cur.row >= top_row); |
784 | #endif |
|
|
785 | int row = screen.cur.row; |
805 | int row = screen.cur.row; |
786 | |
806 | |
787 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
807 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
788 | |
808 | |
789 | line_t *line = &ROW(row); |
809 | line_t *line = &ROW(row); |
790 | |
810 | |
791 | while (str < strend) |
811 | while (str < strend) |
792 | { |
812 | { |
793 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
813 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
794 | |
814 | |
795 | if (expect_false (c < 0x20)) |
815 | if (ecb_unlikely (c < 0x20)) |
796 | if (c == C0_LF) |
816 | if (c == C0_LF) |
797 | { |
817 | { |
798 | max_it (line->l, screen.cur.col); |
818 | max_it (line->l, screen.cur.col); |
799 | |
819 | |
800 | screen.flags &= ~Screen_WrapNext; |
820 | screen.flags &= ~Screen_WrapNext; |
… | |
… | |
819 | { |
839 | { |
820 | scr_tab (1, true); |
840 | scr_tab (1, true); |
821 | continue; |
841 | continue; |
822 | } |
842 | } |
823 | |
843 | |
824 | if (expect_false ( |
844 | if (ecb_unlikely ( |
825 | checksel /* see if we're writing within selection */ |
845 | checksel /* see if we're writing within selection */ |
826 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
846 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
827 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
847 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
828 | )) |
848 | )) |
829 | { |
849 | { |
… | |
… | |
834 | * should be a similar check. |
854 | * should be a similar check. |
835 | */ |
855 | */ |
836 | CLEAR_SELECTION (); |
856 | CLEAR_SELECTION (); |
837 | } |
857 | } |
838 | |
858 | |
839 | if (expect_false (screen.flags & Screen_WrapNext)) |
859 | if (ecb_unlikely (screen.flags & Screen_WrapNext)) |
840 | { |
860 | { |
841 | scr_do_wrap (); |
861 | scr_do_wrap (); |
842 | |
862 | |
843 | line->l = ncol; |
863 | line->l = ncol; |
844 | line->is_longer (1); |
864 | line->is_longer (1); |
… | |
… | |
846 | row = screen.cur.row; |
866 | row = screen.cur.row; |
847 | line = &ROW(row); /* _must_ refresh */ |
867 | line = &ROW(row); /* _must_ refresh */ |
848 | } |
868 | } |
849 | |
869 | |
850 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
870 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
851 | if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
871 | if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
852 | c = 0xfffd; |
872 | c = 0xfffd; |
853 | |
873 | |
854 | // rely on wcwidth to tell us the character width, do wcwidth before |
874 | // rely on wcwidth to tell us the character width, do wcwidth before |
855 | // further replacements, as wcwidth might return -1 for the line |
875 | // further replacements, as wcwidth might return -1 for the line |
856 | // drawing characters below as they might be invalid in the current |
876 | // drawing characters below as they might be invalid in the current |
857 | // locale. |
877 | // locale. |
858 | int width = WCWIDTH (c); |
878 | int width = WCWIDTH (c); |
859 | |
879 | |
860 | if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL |
880 | if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL |
861 | { |
881 | { |
862 | // vt100 special graphics and line drawing |
882 | // vt100 special graphics and line drawing |
863 | // 5f-7e standard vt100 |
883 | // 5f-7e standard vt100 |
864 | // 40-5e rxvt extension for extra curses acs chars |
884 | // 40-5e rxvt extension for extra curses acs chars |
865 | static uint16_t vt100_0[62] = { // 41 .. 7e |
885 | static uint16_t vt100_0[62] = { // 41 .. 7e |
… | |
… | |
878 | c = vt100_0[c - 0x41]; |
898 | c = vt100_0[c - 0x41]; |
879 | width = 1; // vt100 line drawing characters are always single-width |
899 | width = 1; // vt100 line drawing characters are always single-width |
880 | } |
900 | } |
881 | } |
901 | } |
882 | |
902 | |
883 | if (expect_false (screen.flags & Screen_Insert)) |
903 | if (ecb_unlikely (screen.flags & Screen_Insert)) |
884 | scr_insdel_chars (width, INSERT); |
904 | scr_insdel_chars (width, INSERT); |
885 | |
905 | |
886 | if (width != 0) |
906 | if (width != 0) |
887 | { |
907 | { |
888 | #if !UNICODE_3 |
908 | #if !UNICODE_3 |
… | |
… | |
893 | # else |
913 | # else |
894 | c = 0xfffd; |
914 | c = 0xfffd; |
895 | # endif |
915 | # endif |
896 | #endif |
916 | #endif |
897 | |
917 | |
|
|
918 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
919 | |
|
|
920 | // if the character doesn't fit into the remaining columns... |
|
|
921 | if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width)) |
|
|
922 | { |
|
|
923 | if (screen.flags & Screen_Autowrap) |
|
|
924 | { |
|
|
925 | // ... artificially enlargen the previous one |
|
|
926 | c = NOCHAR; |
|
|
927 | // and try the same character next loop iteration |
|
|
928 | --str; |
|
|
929 | } |
|
|
930 | else |
|
|
931 | screen.cur.col = ncol - width; |
|
|
932 | } |
|
|
933 | |
898 | // nuke the character at this position, if required |
934 | // nuke the character at this position, if required |
899 | if (expect_false ( |
935 | // due to wonderful coincidences everywhere else in this loop |
|
|
936 | // we never have to check for overwriting a wide char itself, |
|
|
937 | // only its tail. |
900 | line->t[screen.cur.col] == NOCHAR |
938 | 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); |
939 | 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 | |
940 | |
917 | line->touch (); |
941 | line->touch (); |
918 | |
942 | |
919 | do |
943 | do |
920 | { |
944 | { |
921 | line->t[screen.cur.col] = c; |
945 | line->t[screen.cur.col] = c; |
922 | line->r[screen.cur.col] = rend; |
946 | line->r[screen.cur.col] = rend; |
923 | |
947 | |
924 | if (expect_true (screen.cur.col < ncol - 1)) |
948 | if (ecb_likely (screen.cur.col < ncol - 1)) |
925 | screen.cur.col++; |
949 | screen.cur.col++; |
926 | else |
950 | else |
927 | { |
951 | { |
928 | line->l = ncol; |
952 | line->l = ncol; |
929 | if (screen.flags & Screen_Autowrap) |
953 | if (screen.flags & Screen_Autowrap) |
930 | screen.flags |= Screen_WrapNext; |
954 | screen.flags |= Screen_WrapNext; |
931 | break; |
955 | |
|
|
956 | goto end_of_line; |
932 | } |
957 | } |
933 | |
958 | |
934 | c = NOCHAR; |
959 | c = NOCHAR; |
935 | } |
960 | } |
936 | while (expect_false (--width > 0)); |
961 | while (ecb_unlikely (--width > 0)); |
937 | |
962 | |
938 | // pad with spaces when overwriting wide character with smaller one |
963 | // pad with spaces when overwriting wide character with smaller one |
939 | if (expect_false (!width)) |
964 | for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++) |
940 | { |
965 | { |
941 | line->touch (); |
|
|
942 | |
|
|
943 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
|
|
944 | { |
|
|
945 | line->t[c] = ' '; |
966 | line->t[c] = ' '; |
946 | line->r[c] = rend; |
967 | line->r[c] = rend; |
947 | } |
|
|
948 | } |
968 | } |
|
|
969 | |
|
|
970 | end_of_line: |
|
|
971 | ; |
949 | } |
972 | } |
950 | #if ENABLE_COMBINING |
973 | #if ENABLE_COMBINING |
951 | else // width == 0 |
974 | else // width == 0 |
952 | { |
975 | { |
953 | if (c != 0xfeff) // ignore BOM |
976 | if (c != 0xfeff) // ignore BOM |
… | |
… | |
993 | #endif |
1016 | #endif |
994 | } |
1017 | } |
995 | |
1018 | |
996 | max_it (line->l, screen.cur.col); |
1019 | max_it (line->l, screen.cur.col); |
997 | |
1020 | |
998 | #ifdef DEBUG_STRICT |
|
|
999 | assert (screen.cur.row >= 0); |
1021 | assert (screen.cur.row >= 0); |
1000 | #endif |
|
|
1001 | } |
1022 | } |
1002 | |
1023 | |
1003 | /* ------------------------------------------------------------------------- */ |
1024 | /* ------------------------------------------------------------------------- */ |
1004 | /* |
1025 | /* |
1005 | * Process Backspace. Move back the cursor back a position, wrap if have to |
1026 | * Process Backspace. Move back the cursor back a position, wrap if have to |
… | |
… | |
1018 | |
1039 | |
1019 | want_refresh = 1; |
1040 | want_refresh = 1; |
1020 | #endif |
1041 | #endif |
1021 | } |
1042 | } |
1022 | } |
1043 | } |
|
|
1044 | else if (screen.flags & Screen_WrapNext) |
|
|
1045 | screen.flags &= ~Screen_WrapNext; |
1023 | else |
1046 | else |
1024 | scr_gotorc (0, -1, RELATIVE); |
1047 | scr_gotorc (0, -1, RELATIVE); |
1025 | } |
1048 | } |
1026 | |
1049 | |
1027 | /* ------------------------------------------------------------------------- */ |
1050 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1333 | if (row >= nrow) /* Out Of Bounds */ |
1356 | if (row >= nrow) /* Out Of Bounds */ |
1334 | return; |
1357 | return; |
1335 | |
1358 | |
1336 | min_it (num, nrow - row); |
1359 | min_it (num, nrow - row); |
1337 | |
1360 | |
1338 | /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */ |
|
|
1339 | if (rstyle & (RS_RVid | RS_Uline)) |
1361 | if (rstyle & (RS_Blink | RS_RVid | RS_Uline)) |
1340 | ren = (rend_t) ~RS_None; |
1362 | ren = (rend_t) ~RS_None; |
1341 | else if (GET_BASEBG (rstyle) == Color_bg) |
1363 | else if (GET_BASEBG (rstyle) == Color_bg) |
1342 | { |
1364 | { |
1343 | ren = DEFAULT_RSTYLE; |
1365 | ren = DEFAULT_RSTYLE; |
1344 | |
1366 | |
1345 | if (mapped) |
1367 | if (mapped) |
1346 | XClearArea (dpy, vt, 0, |
1368 | XClearArea (dpy, vt, 0, |
1347 | Row2Pixel (row), (unsigned int)width, |
1369 | Row2Pixel (row - view_start), (unsigned int)width, |
1348 | (unsigned int)Height2Pixel (num), False); |
1370 | (unsigned int)Height2Pixel (num), False); |
1349 | } |
1371 | } |
1350 | else |
1372 | else |
1351 | { |
1373 | { |
1352 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1374 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1353 | |
1375 | |
|
|
1376 | if (mapped) |
|
|
1377 | { |
1354 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1378 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1355 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1379 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1356 | XFillRectangle (dpy, vt, gc, |
1380 | XFillRectangle (dpy, vt, gc, |
1357 | 0, Row2Pixel (row), |
1381 | 0, Row2Pixel (row - view_start), |
1358 | (unsigned int)width, |
1382 | (unsigned int)width, |
1359 | (unsigned int)Height2Pixel (num)); |
1383 | (unsigned int)Height2Pixel (num)); |
1360 | gcvalue.foreground = pix_colors[Color_fg]; |
1384 | gcvalue.foreground = pix_colors[Color_fg]; |
1361 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1385 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
|
|
1386 | } |
1362 | } |
1387 | } |
1363 | |
1388 | |
1364 | for (; num--; row++) |
1389 | for (; num--; row++) |
1365 | { |
1390 | { |
1366 | scr_blank_screen_mem (ROW(row), rstyle); |
1391 | scr_blank_screen_mem (ROW(row), rstyle); |
|
|
1392 | |
|
|
1393 | if (row - view_start < nrow) |
1367 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1394 | scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren); |
1368 | } |
1395 | } |
1369 | } |
1396 | } |
1370 | |
1397 | |
1371 | #if !ENABLE_MINIMAL |
1398 | #if !ENABLE_MINIMAL |
1372 | void |
1399 | void |
… | |
… | |
1525 | { |
1552 | { |
1526 | line->t[col] = line->t[col + count]; |
1553 | line->t[col] = line->t[col + count]; |
1527 | line->r[col] = line->r[col + count]; |
1554 | line->r[col] = line->r[col + count]; |
1528 | } |
1555 | } |
1529 | |
1556 | |
1530 | scr_blank_line (*line, ncol - count, count, |
1557 | scr_blank_line (*line, ncol - count, count, rstyle); |
1531 | line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask)); |
|
|
1532 | |
1558 | |
1533 | if (selection.op && current_screen == selection.screen |
1559 | if (selection.op && current_screen == selection.screen |
1534 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1560 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1535 | { |
1561 | { |
1536 | if (selection.end.row != screen.cur.row |
1562 | if (selection.end.row != screen.cur.row |
… | |
… | |
1672 | { |
1698 | { |
1673 | rvideo_state = on; |
1699 | rvideo_state = on; |
1674 | |
1700 | |
1675 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1701 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1676 | #ifdef HAVE_BG_PIXMAP |
1702 | #ifdef HAVE_BG_PIXMAP |
1677 | if (bgPixmap.pixmap == None) |
1703 | if (bg_pixmap == None) |
1678 | #endif |
1704 | #endif |
1679 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1705 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1680 | |
1706 | |
1681 | XGCValues gcvalue; |
1707 | XGCValues gcvalue; |
1682 | gcvalue.foreground = pix_colors[Color_fg]; |
1708 | gcvalue.foreground = pix_colors[Color_fg]; |
… | |
… | |
1826 | for (i = PART_BEG; i < RC_COUNT; i++) |
1852 | for (i = PART_BEG; i < RC_COUNT; i++) |
1827 | { |
1853 | { |
1828 | min_it (rc[i].col, ncol - 1); |
1854 | min_it (rc[i].col, ncol - 1); |
1829 | min_it (rc[i].row, nrow - 1); |
1855 | min_it (rc[i].row, nrow - 1); |
1830 | } |
1856 | } |
1831 | // TODO: this line somehow causes segfault if scr_expose() is called just after resize |
1857 | |
1832 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1858 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1833 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1859 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1834 | |
1860 | |
1835 | num_scr_allow = 0; |
1861 | num_scr_allow = 0; |
1836 | |
1862 | |
… | |
… | |
1909 | |
1935 | |
1910 | # ifndef NO_MAPALERT |
1936 | # ifndef NO_MAPALERT |
1911 | # ifdef MAPALERT_OPTION |
1937 | # ifdef MAPALERT_OPTION |
1912 | if (option (Opt_mapAlert)) |
1938 | if (option (Opt_mapAlert)) |
1913 | # endif |
1939 | # endif |
1914 | XMapWindow (dpy, parent[0]); |
1940 | XMapWindow (dpy, parent); |
1915 | # endif |
1941 | # endif |
1916 | |
1942 | |
1917 | # if ENABLE_FRILLS |
1943 | # if ENABLE_FRILLS |
1918 | if (option (Opt_urgentOnBell)) |
1944 | if (option (Opt_urgentOnBell)) |
1919 | set_urgency (1); |
1945 | set_urgency (1); |
… | |
… | |
1927 | |
1953 | |
1928 | bell_ev.start (VISUAL_BELL_DURATION); |
1954 | bell_ev.start (VISUAL_BELL_DURATION); |
1929 | } |
1955 | } |
1930 | else |
1956 | else |
1931 | XBell (dpy, 0); |
1957 | XBell (dpy, 0); |
|
|
1958 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1932 | #endif |
1959 | #endif |
1933 | } |
1960 | } |
1934 | |
1961 | |
1935 | /* ------------------------------------------------------------------------- */ |
1962 | /* ------------------------------------------------------------------------- */ |
1936 | /* ARGSUSED */ |
|
|
1937 | void |
1963 | void |
1938 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1964 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1939 | { |
1965 | { |
1940 | #ifdef PRINTPIPE |
1966 | #ifdef PRINTPIPE |
1941 | int nrows, row_start; |
1967 | int nrows, row_start; |
… | |
… | |
1955 | row_start = view_start; |
1981 | row_start = view_start; |
1956 | } |
1982 | } |
1957 | |
1983 | |
1958 | wctomb (0, 0); |
1984 | wctomb (0, 0); |
1959 | |
1985 | |
1960 | for (int r1 = 0; r1 < nrows; r1++) |
1986 | for (int r1 = row_start; r1 < row_start + nrows; r1++) |
1961 | { |
1987 | { |
1962 | text_t *tp = ROW(r1).t; |
1988 | text_t *tp = ROW(r1).t; |
1963 | int len = ROW(r1).l; |
1989 | int len = ROW(r1).l; |
1964 | |
1990 | |
1965 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
1991 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
… | |
… | |
1994 | * screen.text/screen.rend contain what the screen will change to. |
2020 | * screen.text/screen.rend contain what the screen will change to. |
1995 | */ |
2021 | */ |
1996 | void |
2022 | void |
1997 | rxvt_term::scr_refresh () NOTHROW |
2023 | rxvt_term::scr_refresh () NOTHROW |
1998 | { |
2024 | { |
1999 | unsigned char have_bg, |
|
|
2000 | showcursor; /* show the cursor */ |
|
|
2001 | int16_t col, row, /* column/row we're processing */ |
2025 | int16_t col, row, /* column/row we're processing */ |
2002 | ocrow; /* old cursor row */ |
2026 | ocrow; /* old cursor row */ |
2003 | int i; /* tmp */ |
2027 | int i; /* tmp */ |
2004 | #ifndef NO_CURSORCOLOR |
2028 | #ifndef NO_CURSORCOLOR |
2005 | rend_t cc1; /* store colours at cursor position (s) */ |
2029 | rend_t cc1; /* store colours at cursor position (s) */ |
… | |
… | |
2016 | /* |
2040 | /* |
2017 | * A: set up vars |
2041 | * A: set up vars |
2018 | */ |
2042 | */ |
2019 | refresh_count = 0; |
2043 | refresh_count = 0; |
2020 | |
2044 | |
|
|
2045 | unsigned int old_screen_flags = screen.flags; |
2021 | have_bg = 0; |
2046 | char have_bg = 0; |
2022 | #ifdef HAVE_BG_PIXMAP |
2047 | #ifdef HAVE_BG_PIXMAP |
2023 | have_bg = bgPixmap.pixmap != None; |
2048 | have_bg = bg_pixmap != None; |
2024 | #endif |
2049 | #endif |
2025 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2050 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2026 | |
2051 | |
2027 | /* |
2052 | /* |
2028 | * B: reverse any characters which are selected |
2053 | * B: reverse any characters which are selected |
2029 | */ |
2054 | */ |
2030 | scr_reverse_selection (); |
2055 | scr_reverse_selection (); |
|
|
2056 | |
|
|
2057 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
|
|
2058 | #if ENABLE_OVERLAY |
|
|
2059 | scr_swap_overlay (); |
|
|
2060 | #endif |
|
|
2061 | |
|
|
2062 | char showcursor = screen.flags & Screen_VisibleCursor; |
2031 | |
2063 | |
2032 | /* |
2064 | /* |
2033 | * C: set the cursor character (s) |
2065 | * C: set the cursor character (s) |
2034 | */ |
2066 | */ |
2035 | { |
2067 | { |
2036 | unsigned char setoldcursor; |
2068 | unsigned char setoldcursor; |
2037 | |
2069 | |
2038 | showcursor = (screen.flags & Screen_VisibleCursor); |
|
|
2039 | #ifdef CURSOR_BLINK |
2070 | #ifdef CURSOR_BLINK |
2040 | if (hidden_cursor) |
2071 | if (hidden_cursor) |
2041 | showcursor = 0; |
2072 | showcursor = 0; |
2042 | #endif |
2073 | #endif |
2043 | |
2074 | |
… | |
… | |
2071 | ccol2 = bgcolor_of (rstyle); |
2102 | ccol2 = bgcolor_of (rstyle); |
2072 | #else |
2103 | #else |
2073 | ccol2 = Color_bg; |
2104 | ccol2 = Color_bg; |
2074 | #endif |
2105 | #endif |
2075 | |
2106 | |
2076 | if (showcursor && focus) |
2107 | if (focus) |
2077 | { |
2108 | { |
2078 | if (option (Opt_cursorUnderline)) |
2109 | if (option (Opt_cursorUnderline)) |
2079 | *crp ^= RS_Uline; |
2110 | *crp ^= RS_Uline; |
2080 | else |
2111 | else |
2081 | { |
2112 | { |
… | |
… | |
2116 | oldcursor.col = screen.cur.col; |
2147 | oldcursor.col = screen.cur.col; |
2117 | } |
2148 | } |
2118 | } |
2149 | } |
2119 | } |
2150 | } |
2120 | |
2151 | |
2121 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
|
|
2122 | #if ENABLE_OVERLAY |
|
|
2123 | scr_swap_overlay (); |
|
|
2124 | #endif |
|
|
2125 | |
|
|
2126 | #ifndef NO_SLOW_LINK_SUPPORT |
2152 | #ifndef NO_SLOW_LINK_SUPPORT |
2127 | /* |
2153 | /* |
2128 | * D: CopyArea pass - very useful for slower links |
2154 | * D: CopyArea pass - very useful for slower links |
2129 | * This has been deliberately kept simple. |
2155 | * This has been deliberately kept simple. |
2130 | */ |
2156 | */ |
… | |
… | |
2219 | continue; |
2245 | continue; |
2220 | |
2246 | |
2221 | // redraw one or more characters |
2247 | // redraw one or more characters |
2222 | |
2248 | |
2223 | // seek to the beginning of wide characters |
2249 | // seek to the beginning of wide characters |
2224 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2250 | while (ecb_unlikely (stp[col] == NOCHAR && col > 0)) |
2225 | --col; |
2251 | --col; |
2226 | |
2252 | |
2227 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2253 | rend_t rend = srp[col]; /* screen rendition (target rendition) */ |
2228 | text_t *text = stp + col; |
2254 | text_t *text = stp + col; |
2229 | int count = 1; |
2255 | int count = 1; |
2230 | |
2256 | |
2231 | dtp[col] = stp[col]; |
2257 | dtp[col] = stp[col]; |
2232 | drp[col] = rend; |
2258 | drp[col] = rend; |
… | |
… | |
2236 | for (i = 0; ++col < ncol; ) |
2262 | for (i = 0; ++col < ncol; ) |
2237 | { |
2263 | { |
2238 | if (stp[col] == NOCHAR) |
2264 | if (stp[col] == NOCHAR) |
2239 | { |
2265 | { |
2240 | dtp[col] = stp[col]; |
2266 | dtp[col] = stp[col]; |
2241 | drp[col] = rend; |
2267 | drp[col] = srp[col]; |
|
|
2268 | |
2242 | count++; |
2269 | count++; |
2243 | i++; |
2270 | i++; |
2244 | |
2271 | |
2245 | continue; |
2272 | continue; |
2246 | } |
2273 | } |
… | |
… | |
2266 | |
2293 | |
2267 | col--; /* went one too far. move back */ |
2294 | col--; /* went one too far. move back */ |
2268 | count -= i; /* dump any matching trailing chars */ |
2295 | count -= i; /* dump any matching trailing chars */ |
2269 | |
2296 | |
2270 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2297 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2271 | while (expect_false (i && text[count] == NOCHAR)) |
2298 | while (ecb_unlikely (i && text[count] == NOCHAR)) |
2272 | count++, i--; |
2299 | count++, i--; |
2273 | |
2300 | |
2274 | /* |
2301 | /* |
2275 | * Determine the attributes for the string |
2302 | * Determine the attributes for the string |
2276 | */ |
2303 | */ |
2277 | int fore = fgcolor_of (rend); // desired foreground |
2304 | int fore = fgcolor_of (rend); // desired foreground |
2278 | int back = bgcolor_of (rend); // desired background |
2305 | int back = bgcolor_of (rend); // desired background |
2279 | |
2306 | |
2280 | // only do special processing if any attributes are set, which is unlikely |
2307 | // only do special processing if any attributes are set, which is unlikely |
2281 | if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) |
2308 | if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) |
2282 | { |
2309 | { |
2283 | bool invert = rend & RS_RVid; |
2310 | bool invert = rend & RS_RVid; |
2284 | |
2311 | |
2285 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2312 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2286 | if (rend & RS_Bold && fore == Color_fg) |
2313 | if (rend & RS_Bold && fore == Color_fg) |
… | |
… | |
2305 | |
2332 | |
2306 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2333 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2307 | fore = Color_UL; |
2334 | fore = Color_UL; |
2308 | #endif |
2335 | #endif |
2309 | |
2336 | |
|
|
2337 | #ifdef OPTION_HC |
|
|
2338 | if (rend & RS_Sel) |
|
|
2339 | { |
|
|
2340 | /* invert the column if no highlightColor is set or it is the |
|
|
2341 | * current cursor column */ |
|
|
2342 | if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2343 | && ISSET_PIXCOLOR (Color_HC)) |
|
|
2344 | { |
|
|
2345 | if (ISSET_PIXCOLOR (Color_HTC)) |
|
|
2346 | fore = Color_HTC; |
|
|
2347 | // if invert is 0 reverse video is set so we use bg color as fg color |
|
|
2348 | else if (!invert) |
|
|
2349 | fore = back; |
|
|
2350 | |
|
|
2351 | back = Color_HC; |
|
|
2352 | invert = 0; |
|
|
2353 | } |
|
|
2354 | } |
|
|
2355 | #endif |
|
|
2356 | |
2310 | if (invert) |
2357 | if (invert) |
2311 | { |
2358 | { |
2312 | #ifdef OPTION_HC |
|
|
2313 | if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2314 | || !ISSET_PIXCOLOR (Color_HC)) |
|
|
2315 | #endif |
|
|
2316 | /* invert the column if no highlightColor is set or it is the |
|
|
2317 | * current cursor column */ |
|
|
2318 | ::swap (fore, back); |
2359 | ::swap (fore, back); |
2319 | #ifdef OPTION_HC |
|
|
2320 | else if (ISSET_PIXCOLOR (Color_HC)) |
|
|
2321 | back = Color_HC; |
|
|
2322 | #endif |
|
|
2323 | |
2360 | |
2324 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2361 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2325 | # ifndef OPTION_HC |
|
|
2326 | if (ISSET_PIXCOLOR (Color_RV)) |
|
|
2327 | back = Color_RV; |
|
|
2328 | # endif |
|
|
2329 | if (fore == back) |
2362 | if (fore == back) |
2330 | { |
2363 | { |
2331 | fore = Color_bg; |
2364 | fore = Color_bg; |
2332 | back = Color_fg; |
2365 | back = Color_fg; |
2333 | } |
2366 | } |
… | |
… | |
2369 | /* |
2402 | /* |
2370 | * Actually do the drawing of the string here |
2403 | * Actually do the drawing of the string here |
2371 | */ |
2404 | */ |
2372 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2405 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2373 | |
2406 | |
2374 | if (expect_true (have_bg && back == Color_bg)) |
2407 | if (ecb_likely (have_bg && back == Color_bg)) |
2375 | { |
2408 | { |
2376 | // this is very ugly, maybe push it into ->draw? |
2409 | // this is very ugly, maybe push it into ->draw? |
2377 | |
2410 | |
2378 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2411 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2379 | if (text[i] != ' ') |
2412 | if (text[i] != ' ') |
… | |
… | |
2386 | did_clear: ; |
2419 | did_clear: ; |
2387 | } |
2420 | } |
2388 | else |
2421 | else |
2389 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2422 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2390 | |
2423 | |
2391 | if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) |
2424 | if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) |
2392 | { |
2425 | { |
2393 | #if ENABLE_FRILLS |
2426 | #if ENABLE_FRILLS |
2394 | if (ISSET_PIXCOLOR (Color_underline)) |
2427 | if (ISSET_PIXCOLOR (Color_underline)) |
2395 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2428 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2396 | else |
2429 | else |
… | |
… | |
2401 | xpixel, ypixel + font->ascent + 1, |
2434 | xpixel, ypixel + font->ascent + 1, |
2402 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2435 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2403 | } |
2436 | } |
2404 | } /* for (col....) */ |
2437 | } /* for (col....) */ |
2405 | } /* for (row....) */ |
2438 | } /* for (row....) */ |
2406 | |
|
|
2407 | #if ENABLE_OVERLAY |
|
|
2408 | scr_swap_overlay (); |
|
|
2409 | #endif |
|
|
2410 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2411 | |
2439 | |
2412 | /* |
2440 | /* |
2413 | * G: cleanup cursor and display outline cursor if necessary |
2441 | * G: cleanup cursor and display outline cursor if necessary |
2414 | */ |
2442 | */ |
2415 | if (showcursor) |
2443 | if (showcursor) |
… | |
… | |
2454 | } |
2482 | } |
2455 | |
2483 | |
2456 | /* |
2484 | /* |
2457 | * H: cleanup selection |
2485 | * H: cleanup selection |
2458 | */ |
2486 | */ |
|
|
2487 | #if ENABLE_OVERLAY |
|
|
2488 | scr_swap_overlay (); |
|
|
2489 | #endif |
|
|
2490 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2491 | |
2459 | scr_reverse_selection (); |
2492 | scr_reverse_selection (); |
2460 | |
2493 | |
|
|
2494 | screen.flags = old_screen_flags; |
2461 | num_scr = 0; |
2495 | num_scr = 0; |
2462 | num_scr_allow = 1; |
2496 | num_scr_allow = 1; |
2463 | } |
2497 | } |
2464 | |
2498 | |
2465 | void |
2499 | void |
… | |
… | |
2486 | scr_remap_chars (swap_buf [i]); |
2520 | scr_remap_chars (swap_buf [i]); |
2487 | } |
2521 | } |
2488 | } |
2522 | } |
2489 | |
2523 | |
2490 | void |
2524 | void |
2491 | rxvt_term::scr_recolour () NOTHROW |
2525 | rxvt_term::scr_recolour (bool refresh) NOTHROW |
2492 | { |
2526 | { |
|
|
2527 | bool transparent = false; |
|
|
2528 | |
2493 | #ifdef HAVE_BG_PIXMAP |
2529 | #ifdef HAVE_BG_PIXMAP |
2494 | bgPixmap.apply (); |
2530 | if (bg_pixmap != None) |
2495 | #else |
2531 | { |
|
|
2532 | # ifdef ENABLE_TRANSPARENCY |
|
|
2533 | if (bg_flags & BG_IS_TRANSPARENT) |
|
|
2534 | { |
|
|
2535 | XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); |
|
|
2536 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
2496 | |
2537 | |
|
|
2538 | transparent = true; |
|
|
2539 | } |
|
|
2540 | else |
|
|
2541 | # endif |
|
|
2542 | { |
|
|
2543 | XSetWindowBackground (dpy, parent, pix_colors[Color_border]); |
|
|
2544 | XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); |
|
|
2545 | } |
|
|
2546 | } |
|
|
2547 | else |
|
|
2548 | #endif |
|
|
2549 | { |
2497 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2550 | XSetWindowBackground (dpy, parent, pix_colors[Color_border]); |
2498 | XClearWindow (dpy, parent[0]); |
|
|
2499 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2551 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
|
|
2552 | } |
|
|
2553 | |
|
|
2554 | XClearWindow (dpy, parent); |
2500 | |
2555 | |
2501 | if (scrollBar.win) |
2556 | if (scrollBar.win) |
2502 | { |
2557 | { |
|
|
2558 | if (transparent) |
|
|
2559 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
|
|
2560 | else |
2503 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2561 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2504 | scrollBar.state = STATE_IDLE; |
2562 | scrollBar.state = SB_STATE_IDLE; |
2505 | scrollBar.show (0); |
2563 | scrollBar.show (0); |
2506 | } |
2564 | } |
2507 | |
2565 | |
2508 | #endif |
2566 | if (refresh) |
2509 | |
2567 | { |
2510 | /* bgPixmap.apply () does not do the following : */ |
|
|
2511 | scr_clear (); |
2568 | scr_clear (); |
2512 | scr_touch (true); |
2569 | scr_touch (true); |
|
|
2570 | } |
2513 | want_refresh = 1; |
2571 | want_refresh = 1; |
2514 | } |
2572 | } |
2515 | |
2573 | |
2516 | /* ------------------------------------------------------------------------- */ |
2574 | /* ------------------------------------------------------------------------- */ |
2517 | void |
2575 | void |
… | |
… | |
2585 | { |
2643 | { |
2586 | #if !ENABLE_MINIMAL |
2644 | #if !ENABLE_MINIMAL |
2587 | if (selection.rect) |
2645 | if (selection.rect) |
2588 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2646 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2589 | selection.end.row, selection.end.col, |
2647 | selection.end.row, selection.end.col, |
2590 | RS_RVid, RS_RVid | RS_Uline); |
2648 | RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline); |
2591 | else |
2649 | else |
2592 | #endif |
2650 | #endif |
2593 | scr_xor_span (selection.beg.row, selection.beg.col, |
2651 | scr_xor_span (selection.beg.row, selection.beg.col, |
2594 | selection.end.row, selection.end.col, |
2652 | selection.end.row, selection.end.col, |
2595 | RS_RVid); |
2653 | RS_Sel | RS_RVid); |
2596 | } |
2654 | } |
2597 | } |
2655 | } |
2598 | |
2656 | |
2599 | /* ------------------------------------------------------------------------- */ |
2657 | /* ------------------------------------------------------------------------- */ |
2600 | /* |
2658 | /* |
… | |
… | |
2605 | void |
2663 | void |
2606 | rxvt_term::scr_dump (int fd) NOTHROW |
2664 | rxvt_term::scr_dump (int fd) NOTHROW |
2607 | { |
2665 | { |
2608 | int row, wrote; |
2666 | int row, wrote; |
2609 | unsigned int width, towrite; |
2667 | unsigned int width, towrite; |
2610 | char r1[] = "\n"; |
2668 | const char r1[] = "\n"; |
2611 | |
2669 | |
2612 | for (row = saveLines + top_row; |
2670 | for (row = saveLines + top_row; |
2613 | row < saveLines + nrow - 1; row++) |
2671 | row < saveLines + nrow - 1; row++) |
2614 | { |
2672 | { |
2615 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2673 | width = row_buf[row].l >= 0 ? row_buf[row].l |
… | |
… | |
2632 | * CHARACTER SELECTION * |
2690 | * CHARACTER SELECTION * |
2633 | * ------------------------------------------------------------------------- */ |
2691 | * ------------------------------------------------------------------------- */ |
2634 | void |
2692 | void |
2635 | rxvt_term::selection_check (int check_more) NOTHROW |
2693 | rxvt_term::selection_check (int check_more) NOTHROW |
2636 | { |
2694 | { |
2637 | row_col_t pos; |
|
|
2638 | |
|
|
2639 | if (!selection.op) |
2695 | if (!selection.op) |
2640 | return; |
2696 | return; |
2641 | |
2697 | |
|
|
2698 | row_col_t pos; |
2642 | pos.row = pos.col = 0; |
2699 | pos.row = pos.col = 0; |
|
|
2700 | |
2643 | if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) |
2701 | if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) |
2644 | || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) |
2702 | || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) |
2645 | || !IN_RANGE_EXC (selection.end.row, top_row, nrow) |
2703 | || !IN_RANGE_EXC (selection.end.row, top_row, nrow) |
2646 | || (check_more == 1 |
2704 | || (check_more == 1 |
2647 | && current_screen == selection.screen |
2705 | && current_screen == selection.screen |
… | |
… | |
2649 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2707 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2650 | || (check_more == 2 |
2708 | || (check_more == 2 |
2651 | && ROWCOL_IS_BEFORE (selection.beg, pos) |
2709 | && ROWCOL_IS_BEFORE (selection.beg, pos) |
2652 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2710 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2653 | || (check_more == 3 |
2711 | || (check_more == 3 |
2654 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2712 | && ROWCOL_IS_AFTER (selection.end, pos))) |
2655 | || (check_more == 4 /* screen width change */ |
|
|
2656 | && (selection.beg.row != selection.end.row |
|
|
2657 | || selection.end.col > ncol))) |
|
|
2658 | CLEAR_SELECTION (); |
2713 | CLEAR_ALL_SELECTION (); |
2659 | } |
2714 | } |
2660 | |
2715 | |
2661 | /* ------------------------------------------------------------------------- */ |
2716 | /* ------------------------------------------------------------------------- */ |
2662 | /* |
2717 | /* |
2663 | * Paste a selection direct to the command fd |
2718 | * Paste a selection direct to the command fd |
2664 | */ |
2719 | */ |
2665 | void |
2720 | void |
2666 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2721 | rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW |
2667 | { |
2722 | { |
2668 | /* convert normal newline chars into common keyboard Return key sequence */ |
2723 | /* convert normal newline chars into common keyboard Return key sequence */ |
2669 | for (unsigned int i = 0; i < len; i++) |
2724 | for (unsigned int i = 0; i < len; i++) |
2670 | if (data[i] == C0_LF) |
2725 | if (data[i] == C0_LF) |
2671 | data[i] = C0_CR; |
2726 | data[i] = C0_CR; |
… | |
… | |
2677 | |
2732 | |
2678 | if (priv_modes & PrivMode_BracketPaste) |
2733 | if (priv_modes & PrivMode_BracketPaste) |
2679 | tt_printf ("\e[201~"); |
2734 | tt_printf ("\e[201~"); |
2680 | } |
2735 | } |
2681 | |
2736 | |
2682 | /* ------------------------------------------------------------------------- */ |
|
|
2683 | /* |
|
|
2684 | * Respond to a notification that a primary selection has been sent |
|
|
2685 | * EXT: SelectionNotify |
|
|
2686 | */ |
|
|
2687 | void |
2737 | void |
2688 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW |
2738 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2689 | { |
2739 | { |
2690 | if (prop == None) /* check for failed XConvertSelection */ |
2740 | if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END))) |
2691 | { |
|
|
2692 | if ((selection_type & Sel_CompoundText)) |
|
|
2693 | { |
|
|
2694 | int selnum = selection_type & Sel_whereMask; |
|
|
2695 | |
|
|
2696 | selection_type = 0; |
|
|
2697 | if (selnum != Sel_direct) |
|
|
2698 | selection_request_other (XA_STRING, selnum); |
|
|
2699 | } |
|
|
2700 | |
|
|
2701 | if ((selection_type & Sel_UTF8String)) |
|
|
2702 | { |
|
|
2703 | int selnum = selection_type & Sel_whereMask; |
|
|
2704 | |
|
|
2705 | selection_type = Sel_CompoundText; |
|
|
2706 | if (selnum != Sel_direct) |
|
|
2707 | selection_request_other (xa[XA_COMPOUND_TEXT], selnum); |
|
|
2708 | else |
|
|
2709 | selection_type = 0; |
|
|
2710 | } |
|
|
2711 | |
|
|
2712 | return; |
|
|
2713 | } |
|
|
2714 | |
|
|
2715 | unsigned long bytes_after; |
|
|
2716 | XTextProperty ct; |
|
|
2717 | |
|
|
2718 | if (XGetWindowProperty (dpy, win, prop, |
|
|
2719 | 0, PROP_SIZE / 4, |
|
|
2720 | delete_prop, AnyPropertyType, |
|
|
2721 | &ct.encoding, &ct.format, |
|
|
2722 | &ct.nitems, &bytes_after, |
|
|
2723 | &ct.value) != Success) |
|
|
2724 | { |
|
|
2725 | ct.value = 0; |
|
|
2726 | goto bailout; |
|
|
2727 | } |
|
|
2728 | |
|
|
2729 | if (ct.encoding == None) |
|
|
2730 | goto bailout; |
|
|
2731 | |
|
|
2732 | if (bytes_after) |
|
|
2733 | { |
|
|
2734 | // fetch and append remaining data |
|
|
2735 | XTextProperty ct2; |
|
|
2736 | |
|
|
2737 | if (XGetWindowProperty (dpy, win, prop, |
|
|
2738 | ct.nitems / 4, (bytes_after + 3) / 4, |
|
|
2739 | delete_prop, AnyPropertyType, |
|
|
2740 | &ct2.encoding, &ct2.format, |
|
|
2741 | &ct2.nitems, &bytes_after, |
|
|
2742 | &ct2.value) != Success) |
|
|
2743 | goto bailout; |
|
|
2744 | |
|
|
2745 | // realloc should be compatible to XFree, here, and elsewhere, too |
|
|
2746 | ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); |
|
|
2747 | memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); |
|
|
2748 | ct.nitems += ct2.nitems; |
|
|
2749 | |
|
|
2750 | XFree (ct2.value); |
|
|
2751 | } |
|
|
2752 | |
|
|
2753 | if (ct.value == 0) |
|
|
2754 | goto bailout; |
|
|
2755 | |
|
|
2756 | if (ct.encoding == xa[XA_INCR]) |
|
|
2757 | { |
|
|
2758 | // INCR selection, start handshake |
|
|
2759 | if (!delete_prop) |
|
|
2760 | XDeleteProperty (dpy, win, prop); |
|
|
2761 | |
|
|
2762 | selection_wait = Sel_incr; |
|
|
2763 | incr_buf_fill = 0; |
|
|
2764 | incr_ev.start (10); |
|
|
2765 | |
|
|
2766 | goto bailout; |
|
|
2767 | } |
|
|
2768 | |
|
|
2769 | if (ct.nitems == 0) |
|
|
2770 | { |
|
|
2771 | if (selection_wait == Sel_incr) |
|
|
2772 | { |
|
|
2773 | XFree (ct.value); |
|
|
2774 | |
|
|
2775 | // finally complete, now paste the whole thing |
|
|
2776 | selection_wait = Sel_normal; |
|
|
2777 | ct.value = (unsigned char *)incr_buf; |
|
|
2778 | ct.nitems = incr_buf_fill; |
|
|
2779 | incr_buf = 0; |
|
|
2780 | incr_buf_size = 0; |
|
|
2781 | incr_ev.stop (); |
|
|
2782 | } |
|
|
2783 | else |
|
|
2784 | { |
|
|
2785 | if (selection_wait == Sel_normal |
|
|
2786 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
|
|
2787 | { |
|
|
2788 | /* |
|
|
2789 | * pass through again trying CUT_BUFFER0 if we've come from |
|
|
2790 | * XConvertSelection () but nothing was presented |
|
|
2791 | */ |
|
|
2792 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
|
|
2793 | } |
|
|
2794 | |
|
|
2795 | goto bailout; |
|
|
2796 | } |
|
|
2797 | } |
|
|
2798 | else if (selection_wait == Sel_incr) |
|
|
2799 | { |
|
|
2800 | incr_ev.start (10); |
|
|
2801 | |
|
|
2802 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
|
|
2803 | { |
|
|
2804 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
|
|
2805 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
|
|
2806 | } |
|
|
2807 | |
|
|
2808 | memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); |
|
|
2809 | incr_buf_fill += ct.nitems; |
|
|
2810 | |
|
|
2811 | goto bailout; |
|
|
2812 | } |
|
|
2813 | |
|
|
2814 | char **cl; |
|
|
2815 | int cr; |
|
|
2816 | |
|
|
2817 | #if !ENABLE_MINIMAL |
|
|
2818 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
|
|
2819 | // so recode it manually |
|
|
2820 | if (ct.encoding == xa[XA_UTF8_STRING]) |
|
|
2821 | { |
|
|
2822 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
|
|
2823 | char *s = rxvt_wcstombs (w); |
|
|
2824 | free (w); |
|
|
2825 | // TODO: strlen == only the first element will be converted. well... |
|
|
2826 | paste (s, strlen (s)); |
|
|
2827 | free (s); |
|
|
2828 | } |
|
|
2829 | else |
|
|
2830 | #endif |
|
|
2831 | if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0 |
|
|
2832 | && cl) |
|
|
2833 | { |
|
|
2834 | for (int i = 0; i < cr; i++) |
|
|
2835 | paste (cl[i], strlen (cl[i])); |
|
|
2836 | |
|
|
2837 | XFreeStringList (cl); |
|
|
2838 | } |
|
|
2839 | else |
|
|
2840 | paste ((char *)ct.value, ct.nitems); // paste raw |
|
|
2841 | |
|
|
2842 | bailout: |
|
|
2843 | XFree (ct.value); |
|
|
2844 | |
|
|
2845 | if (selection_wait == Sel_normal) |
|
|
2846 | selection_wait = Sel_none; |
|
|
2847 | } |
|
|
2848 | |
|
|
2849 | void |
|
|
2850 | rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW |
|
|
2851 | { |
|
|
2852 | selection_wait = Sel_none; |
|
|
2853 | |
|
|
2854 | incr_buf_size = 0; |
|
|
2855 | free (incr_buf); |
|
|
2856 | |
|
|
2857 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
|
|
2858 | } |
|
|
2859 | |
|
|
2860 | void |
|
|
2861 | rxvt_term::selection_property (Window win, Atom prop) NOTHROW |
|
|
2862 | { |
|
|
2863 | if (prop == None || selection_wait != Sel_incr) |
|
|
2864 | return; |
2741 | return; |
2865 | |
2742 | |
2866 | selection_paste (win, prop, true); |
2743 | tt_paste (data, len); |
2867 | } |
2744 | } |
2868 | |
2745 | |
2869 | /* ------------------------------------------------------------------------- */ |
2746 | /* ------------------------------------------------------------------------- */ |
2870 | /* |
2747 | /* |
2871 | * Request the current selection: |
2748 | * Request PRIMARY, SECONDARY or CLIPBOARD selection. |
2872 | * Order: > internal selection if available |
2749 | * if the requested selection has no owner or is empty CUT_BUFFER0 is used |
2873 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2750 | * as fallback |
2874 | * > CUT_BUFFER0 |
|
|
2875 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
|
|
2876 | * will auto fallback to CUT_BUFFER0 |
|
|
2877 | * EXT: button 2 release |
2751 | * EXT: button 2 release |
2878 | */ |
2752 | */ |
2879 | void |
2753 | void |
2880 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2754 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2881 | { |
2755 | { |
2882 | if (selection.text && selnum == Sel_Primary) |
2756 | if (!selection_req) |
2883 | { |
|
|
2884 | /* internal selection */ |
|
|
2885 | char *str = rxvt_wcstombs (selection.text, selection.len); |
|
|
2886 | paste (str, strlen (str)); |
|
|
2887 | free (str); |
|
|
2888 | return; |
|
|
2889 | } |
2757 | { |
2890 | else |
2758 | selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this); |
|
|
2759 | selection_req->run (); |
2891 | { |
2760 | } |
2892 | selection_request_time = tm; |
|
|
2893 | selection_wait = Sel_normal; |
|
|
2894 | |
|
|
2895 | #if X_HAVE_UTF8_STRING |
|
|
2896 | selection_type = Sel_UTF8String; |
|
|
2897 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
|
|
2898 | return; |
|
|
2899 | #else |
|
|
2900 | selection_type = Sel_CompoundText; |
|
|
2901 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
|
|
2902 | return; |
|
|
2903 | #endif |
|
|
2904 | } |
|
|
2905 | |
|
|
2906 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
|
|
2907 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
|
|
2908 | } |
|
|
2909 | |
|
|
2910 | int |
|
|
2911 | rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW |
|
|
2912 | { |
|
|
2913 | Atom sel; |
|
|
2914 | |
|
|
2915 | selection_type |= selnum; |
|
|
2916 | |
|
|
2917 | if (selnum == Sel_Primary) |
|
|
2918 | sel = XA_PRIMARY; |
|
|
2919 | else if (selnum == Sel_Secondary) |
|
|
2920 | sel = XA_SECONDARY; |
|
|
2921 | else |
|
|
2922 | sel = xa[XA_CLIPBOARD]; |
|
|
2923 | |
|
|
2924 | if (XGetSelectionOwner (dpy, sel) != None) |
|
|
2925 | { |
|
|
2926 | XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION], |
|
|
2927 | vt, selection_request_time); |
|
|
2928 | return 1; |
|
|
2929 | } |
|
|
2930 | |
|
|
2931 | return 0; |
|
|
2932 | } |
2761 | } |
2933 | |
2762 | |
2934 | /* ------------------------------------------------------------------------- */ |
2763 | /* ------------------------------------------------------------------------- */ |
2935 | /* |
2764 | /* |
2936 | * Clear all selected text |
2765 | * Clear all selected text |
2937 | * EXT: SelectionClear |
2766 | * EXT: SelectionClear |
2938 | */ |
2767 | */ |
2939 | void |
2768 | void |
2940 | rxvt_term::selection_clear () NOTHROW |
2769 | rxvt_term::selection_clear (bool clipboard) NOTHROW |
2941 | { |
2770 | { |
|
|
2771 | if (!clipboard) |
|
|
2772 | { |
2942 | want_refresh = 1; |
2773 | want_refresh = 1; |
2943 | free (selection.text); |
2774 | free (selection.text); |
2944 | selection.text = NULL; |
2775 | selection.text = NULL; |
2945 | selection.len = 0; |
2776 | selection.len = 0; |
2946 | CLEAR_SELECTION (); |
2777 | CLEAR_SELECTION (); |
2947 | |
2778 | |
2948 | if (display->selection_owner == this) |
2779 | if (display->selection_owner == this) |
2949 | display->selection_owner = 0; |
2780 | display->selection_owner = 0; |
|
|
2781 | } |
|
|
2782 | else |
|
|
2783 | { |
|
|
2784 | free (selection.clip_text); |
|
|
2785 | selection.clip_text = NULL; |
|
|
2786 | selection.clip_len = 0; |
|
|
2787 | |
|
|
2788 | if (display->clipboard_owner == this) |
|
|
2789 | display->clipboard_owner = 0; |
|
|
2790 | } |
2950 | } |
2791 | } |
2951 | |
2792 | |
2952 | /* ------------------------------------------------------------------------- */ |
2793 | /* ------------------------------------------------------------------------- */ |
2953 | /* |
2794 | /* |
2954 | * Copy a selection into the cut buffer |
2795 | * Copy a selection into the cut buffer |
2955 | * EXT: button 1 or 3 release |
2796 | * EXT: button 1 or 3 release |
2956 | */ |
2797 | */ |
2957 | void |
2798 | void |
2958 | rxvt_term::selection_make (Time tm) |
2799 | rxvt_term::selection_make (Time tm) |
2959 | { |
2800 | { |
2960 | int i; |
2801 | int size; |
2961 | wchar_t *new_selection_text; |
2802 | wchar_t *new_selection_text; |
2962 | text_t *t; |
2803 | text_t *t; |
2963 | |
2804 | |
2964 | switch (selection.op) |
2805 | switch (selection.op) |
2965 | { |
2806 | { |
… | |
… | |
2981 | return; /* nothing selected, go away */ |
2822 | return; /* nothing selected, go away */ |
2982 | |
2823 | |
2983 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
2824 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
2984 | return; |
2825 | return; |
2985 | |
2826 | |
2986 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2827 | size = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2987 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2828 | new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t)); |
2988 | |
2829 | |
2989 | int ofs = 0; |
2830 | int ofs = 0; |
2990 | int extra = 0; |
2831 | int extra = 0; |
2991 | |
2832 | |
2992 | int col = selection.beg.col; |
2833 | int col = selection.beg.col; |
… | |
… | |
2998 | { |
2839 | { |
2999 | #if !ENABLE_MINIMAL |
2840 | #if !ENABLE_MINIMAL |
3000 | if (selection.rect) |
2841 | if (selection.rect) |
3001 | { |
2842 | { |
3002 | col = selection.beg.col; |
2843 | col = selection.beg.col; |
3003 | end_col = ncol + 1; |
2844 | end_col = selection.end.col; |
3004 | } |
2845 | } |
3005 | else |
2846 | else |
3006 | #endif |
2847 | #endif |
3007 | end_col = ROW(row).l; |
2848 | end_col = ROW(row).l; |
3008 | |
2849 | |
3009 | col = max (col, 0); |
2850 | col = max (col, 0); |
3010 | |
2851 | |
3011 | if (row == selection.end.row |
2852 | if (row == selection.end.row) |
3012 | #if !ENABLE_MINIMAL |
|
|
3013 | || selection.rect |
|
|
3014 | #endif |
|
|
3015 | ) |
|
|
3016 | min_it (end_col, selection.end.col); |
2853 | min_it (end_col, selection.end.col); |
3017 | |
2854 | |
3018 | t = ROW(row).t + col; |
2855 | t = ROW(row).t + col; |
3019 | |
2856 | |
3020 | for (; col < end_col; col++) |
2857 | for (; col < end_col; col++) |
… | |
… | |
3028 | |
2865 | |
3029 | extra -= (len - 1); |
2866 | extra -= (len - 1); |
3030 | |
2867 | |
3031 | if (extra < 0) |
2868 | if (extra < 0) |
3032 | { |
2869 | { |
3033 | extra += i; |
2870 | extra += size; |
3034 | i += i; |
2871 | size += size; |
3035 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); |
2872 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t)); |
3036 | } |
2873 | } |
3037 | |
2874 | |
3038 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
2875 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
3039 | } |
2876 | } |
3040 | #endif |
2877 | #endif |
… | |
… | |
3052 | |
2889 | |
3053 | new_selection_text[ofs++] = C0_LF; |
2890 | new_selection_text[ofs++] = C0_LF; |
3054 | } |
2891 | } |
3055 | else |
2892 | else |
3056 | #endif |
2893 | #endif |
3057 | if (!ROW(row).is_longer () && row != selection.end.row) |
2894 | if (!ROW(row).is_longer () |
|
|
2895 | && (row != selection.end.row || end_col != selection.end.col) |
|
|
2896 | && (row != selection.beg.row || selection.beg.col < ncol)) |
3058 | new_selection_text[ofs++] = C0_LF; |
2897 | new_selection_text[ofs++] = C0_LF; |
3059 | } |
2898 | } |
3060 | |
|
|
3061 | if (end_col != selection.end.col) |
|
|
3062 | new_selection_text[ofs++] = C0_LF; |
|
|
3063 | |
2899 | |
3064 | new_selection_text[ofs] = 0; |
2900 | new_selection_text[ofs] = 0; |
3065 | |
2901 | |
3066 | if (ofs == 0) |
2902 | if (ofs == 0) |
3067 | { |
2903 | { |
… | |
… | |
3080 | |
2916 | |
3081 | selection_grab (tm); |
2917 | selection_grab (tm); |
3082 | } |
2918 | } |
3083 | |
2919 | |
3084 | bool |
2920 | bool |
3085 | rxvt_term::selection_grab (Time tm) NOTHROW |
2921 | rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW |
3086 | { |
2922 | { |
|
|
2923 | Atom sel; |
|
|
2924 | |
|
|
2925 | if (!clipboard) |
|
|
2926 | { |
3087 | selection_time = tm; |
2927 | selection_time = tm; |
|
|
2928 | sel = XA_PRIMARY; |
|
|
2929 | } |
|
|
2930 | else |
|
|
2931 | { |
|
|
2932 | clipboard_time = tm; |
|
|
2933 | sel = xa[XA_CLIPBOARD]; |
|
|
2934 | } |
3088 | |
2935 | |
3089 | XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); |
2936 | XSetSelectionOwner (dpy, sel, vt, tm); |
3090 | if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) |
2937 | if (XGetSelectionOwner (dpy, sel) == vt) |
3091 | { |
2938 | { |
3092 | display->set_selection_owner (this); |
2939 | display->set_selection_owner (this, clipboard); |
3093 | return true; |
2940 | return true; |
3094 | } |
2941 | } |
3095 | else |
2942 | else |
3096 | { |
2943 | { |
3097 | selection_clear (); |
2944 | selection_clear (clipboard); |
3098 | return false; |
2945 | return false; |
3099 | } |
2946 | } |
3100 | |
2947 | |
3101 | #if 0 |
2948 | #if 0 |
3102 | XTextProperty ct; |
2949 | XTextProperty ct; |
… | |
… | |
3562 | * EXT: SelectionRequest |
3409 | * EXT: SelectionRequest |
3563 | */ |
3410 | */ |
3564 | void |
3411 | void |
3565 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3412 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3566 | { |
3413 | { |
|
|
3414 | Atom property = rq.property == None ? rq.target : rq.property; |
3567 | XSelectionEvent ev; |
3415 | XSelectionEvent ev; |
3568 | |
3416 | |
3569 | ev.type = SelectionNotify; |
3417 | ev.type = SelectionNotify; |
3570 | ev.property = None; |
3418 | ev.property = None; |
3571 | ev.display = rq.display; |
3419 | ev.display = rq.display; |
… | |
… | |
3586 | *target++ = xa[XA_COMPOUND_TEXT]; |
3434 | *target++ = xa[XA_COMPOUND_TEXT]; |
3587 | #if X_HAVE_UTF8_STRING |
3435 | #if X_HAVE_UTF8_STRING |
3588 | *target++ = xa[XA_UTF8_STRING]; |
3436 | *target++ = xa[XA_UTF8_STRING]; |
3589 | #endif |
3437 | #endif |
3590 | |
3438 | |
3591 | XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, |
3439 | XChangeProperty (dpy, rq.requestor, property, XA_ATOM, |
3592 | 32, PropModeReplace, |
3440 | 32, PropModeReplace, |
3593 | (unsigned char *)target_list, target - target_list); |
3441 | (unsigned char *)target_list, target - target_list); |
3594 | ev.property = rq.property; |
3442 | ev.property = property; |
3595 | } |
3443 | } |
3596 | #if TODO // TODO |
3444 | #if TODO // TODO |
3597 | else if (rq.target == xa[XA_MULTIPLE]) |
3445 | else if (rq.target == xa[XA_MULTIPLE]) |
3598 | { |
3446 | { |
3599 | /* TODO: Handle MULTIPLE */ |
3447 | /* TODO: Handle MULTIPLE */ |
3600 | } |
3448 | } |
3601 | #endif |
3449 | #endif |
3602 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3450 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) |
3603 | { |
3451 | { |
3604 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3452 | XChangeProperty (dpy, rq.requestor, property, rq.target, |
3605 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3453 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3606 | ev.property = rq.property; |
3454 | ev.property = property; |
|
|
3455 | } |
|
|
3456 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3457 | { |
|
|
3458 | XChangeProperty (dpy, rq.requestor, property, rq.target, |
|
|
3459 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
|
|
3460 | ev.property = property; |
3607 | } |
3461 | } |
3608 | else if (rq.target == XA_STRING |
3462 | else if (rq.target == XA_STRING |
3609 | || rq.target == xa[XA_TEXT] |
3463 | || rq.target == xa[XA_TEXT] |
3610 | || rq.target == xa[XA_COMPOUND_TEXT] |
3464 | || rq.target == xa[XA_COMPOUND_TEXT] |
3611 | || rq.target == xa[XA_UTF8_STRING] |
3465 | || rq.target == xa[XA_UTF8_STRING] |
… | |
… | |
3643 | { |
3497 | { |
3644 | target = xa[XA_COMPOUND_TEXT]; |
3498 | target = xa[XA_COMPOUND_TEXT]; |
3645 | style = enc_compound_text; |
3499 | style = enc_compound_text; |
3646 | } |
3500 | } |
3647 | |
3501 | |
3648 | if (selection.text) |
3502 | if (rq.selection == XA_PRIMARY && selection.text) |
3649 | { |
3503 | { |
3650 | cl = selection.text; |
3504 | cl = selection.text; |
3651 | selectlen = selection.len; |
3505 | selectlen = selection.len; |
|
|
3506 | } |
|
|
3507 | else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3508 | { |
|
|
3509 | cl = selection.clip_text; |
|
|
3510 | selectlen = selection.clip_len; |
3652 | } |
3511 | } |
3653 | else |
3512 | else |
3654 | { |
3513 | { |
3655 | cl = L""; |
3514 | cl = L""; |
3656 | selectlen = 0; |
3515 | selectlen = 0; |
… | |
… | |
3677 | ct.value = (unsigned char *)cl; |
3536 | ct.value = (unsigned char *)cl; |
3678 | ct.nitems = selectlen; |
3537 | ct.nitems = selectlen; |
3679 | ct.encoding = target; |
3538 | ct.encoding = target; |
3680 | } |
3539 | } |
3681 | |
3540 | |
3682 | XChangeProperty (dpy, rq.requestor, rq.property, |
3541 | XChangeProperty (dpy, rq.requestor, property, |
3683 | ct.encoding, 8, PropModeReplace, |
3542 | ct.encoding, 8, PropModeReplace, |
3684 | ct.value, (int)ct.nitems); |
3543 | ct.value, (int)ct.nitems); |
3685 | ev.property = rq.property; |
3544 | ev.property = property; |
3686 | |
3545 | |
3687 | if (freect) |
3546 | if (freect) |
3688 | XFree (ct.value); |
3547 | XFree (ct.value); |
3689 | } |
3548 | } |
3690 | |
3549 | |
… | |
… | |
3724 | h += 2; min_it (h, nrow); |
3583 | h += 2; min_it (h, nrow); |
3725 | |
3584 | |
3726 | x -= 1; clamp_it (x, 0, ncol - w); |
3585 | x -= 1; clamp_it (x, 0, ncol - w); |
3727 | y -= 1; clamp_it (y, 0, nrow - h); |
3586 | y -= 1; clamp_it (y, 0, nrow - h); |
3728 | |
3587 | |
3729 | ov_x = x; ov_y = y; |
3588 | ov.x = x; ov.y = y; |
3730 | ov_w = w; ov_h = h; |
3589 | ov.w = w; ov.h = h; |
3731 | |
3590 | |
3732 | ov_text = new text_t *[h]; |
3591 | ov.text = new text_t *[h]; |
3733 | ov_rend = new rend_t *[h]; |
3592 | ov.rend = new rend_t *[h]; |
3734 | |
3593 | |
3735 | for (y = 0; y < h; y++) |
3594 | for (y = 0; y < h; y++) |
3736 | { |
3595 | { |
3737 | text_t *tp = ov_text[y] = new text_t[w]; |
3596 | text_t *tp = ov.text[y] = new text_t[w]; |
3738 | rend_t *rp = ov_rend[y] = new rend_t[w]; |
3597 | rend_t *rp = ov.rend[y] = new rend_t[w]; |
3739 | |
3598 | |
3740 | text_t t0, t1, t2; |
3599 | text_t t0, t1, t2; |
3741 | rend_t r = OVERLAY_RSTYLE; |
3600 | rend_t r = OVERLAY_RSTYLE; |
3742 | |
3601 | |
3743 | if (y == 0) |
3602 | if (y == 0) |
… | |
… | |
3762 | } |
3621 | } |
3763 | |
3622 | |
3764 | void |
3623 | void |
3765 | rxvt_term::scr_overlay_off () NOTHROW |
3624 | rxvt_term::scr_overlay_off () NOTHROW |
3766 | { |
3625 | { |
3767 | if (!ov_text) |
3626 | if (!ov.text) |
3768 | return; |
3627 | return; |
3769 | |
3628 | |
3770 | want_refresh = 1; |
3629 | want_refresh = 1; |
3771 | |
3630 | |
3772 | for (int y = 0; y < ov_h; y++) |
3631 | for (int y = 0; y < ov.h; y++) |
3773 | { |
3632 | { |
3774 | delete [] ov_text[y]; |
3633 | delete [] ov.text[y]; |
3775 | delete [] ov_rend[y]; |
3634 | delete [] ov.rend[y]; |
3776 | } |
3635 | } |
3777 | |
3636 | |
3778 | delete [] ov_text; ov_text = 0; |
3637 | delete [] ov.text; ov.text = 0; |
3779 | delete [] ov_rend; ov_rend = 0; |
3638 | delete [] ov.rend; ov.rend = 0; |
3780 | } |
3639 | } |
3781 | |
3640 | |
3782 | void |
3641 | void |
3783 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3642 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3784 | { |
3643 | { |
3785 | if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) |
3644 | if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2) |
3786 | return; |
3645 | return; |
3787 | |
3646 | |
3788 | x++, y++; |
3647 | x++, y++; |
3789 | |
3648 | |
3790 | ov_text[y][x] = text; |
3649 | ov.text[y][x] = text; |
3791 | ov_rend[y][x] = rend; |
3650 | ov.rend[y][x] = rend; |
3792 | } |
3651 | } |
3793 | |
3652 | |
3794 | void |
3653 | void |
3795 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3654 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3796 | { |
3655 | { |
… | |
… | |
3815 | } |
3674 | } |
3816 | |
3675 | |
3817 | void |
3676 | void |
3818 | rxvt_term::scr_swap_overlay () NOTHROW |
3677 | rxvt_term::scr_swap_overlay () NOTHROW |
3819 | { |
3678 | { |
3820 | if (!ov_text) |
3679 | if (!ov.text) |
3821 | return; |
3680 | return; |
3822 | |
3681 | |
|
|
3682 | // hide cursor if it is within the overlay area |
|
|
3683 | if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w) |
|
|
3684 | && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h)) |
|
|
3685 | screen.flags &= ~Screen_VisibleCursor; |
|
|
3686 | |
3823 | // swap screen mem with overlay |
3687 | // swap screen mem with overlay |
3824 | for (int y = ov_h; y--; ) |
3688 | for (int y = ov.h; y--; ) |
3825 | { |
3689 | { |
3826 | text_t *t1 = ov_text[y]; |
3690 | text_t *t1 = ov.text[y]; |
3827 | rend_t *r1 = ov_rend[y]; |
3691 | rend_t *r1 = ov.rend[y]; |
3828 | |
3692 | |
3829 | text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; |
3693 | text_t *t2 = ROW(y + ov.y + view_start).t + ov.x; |
3830 | rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; |
3694 | rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x; |
3831 | |
3695 | |
3832 | for (int x = ov_w; x--; ) |
3696 | for (int x = ov.w; x--; ) |
3833 | { |
3697 | { |
3834 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3698 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3835 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3699 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3836 | } |
3700 | } |
3837 | } |
3701 | } |