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 | * ------------------------------------------------------------------------- */ |
… | |
… | |
83 | ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) |
82 | ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) |
84 | #define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ |
83 | #define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ |
85 | ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) |
84 | ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) |
86 | |
85 | |
87 | /* |
86 | /* |
88 | * CLEAR_ROWS : clear <num> rows starting from row <row> |
|
|
89 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
87 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
90 | * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour |
|
|
91 | */ |
88 | */ |
92 | #define CLEAR_ROWS(row, num) \ |
|
|
93 | if (mapped) \ |
|
|
94 | XClearArea (dpy, vt, 0, \ |
|
|
95 | Row2Pixel (row), (unsigned int)width, \ |
|
|
96 | (unsigned int)Height2Pixel (num), False) |
|
|
97 | |
|
|
98 | #define CLEAR_CHARS(x, y, num) \ |
89 | #define CLEAR_CHARS(x, y, num) \ |
99 | if (mapped) \ |
90 | if (mapped) \ |
100 | XClearArea (dpy, vt, x, y, \ |
91 | XClearArea (dpy, vt, x, y, \ |
101 | (unsigned int)Width2Pixel (num), \ |
92 | (unsigned int)Width2Pixel (num), \ |
102 | (unsigned int)Height2Pixel (1), False) |
93 | (unsigned int)Height2Pixel (1), False) |
103 | |
94 | |
104 | #define ERASE_ROWS(row, num) \ |
|
|
105 | XFillRectangle (dpy, vt, gc, \ |
|
|
106 | 0, Row2Pixel (row), \ |
|
|
107 | (unsigned int)width, \ |
|
|
108 | (unsigned int)Height2Pixel (num)) |
|
|
109 | |
|
|
110 | /* ------------------------------------------------------------------------- * |
95 | /* ------------------------------------------------------------------------- * |
111 | * SCREEN `COMMON' ROUTINES * |
96 | * SCREEN `COMMON' ROUTINES * |
112 | * ------------------------------------------------------------------------- */ |
97 | * ------------------------------------------------------------------------- */ |
113 | |
98 | |
114 | /* Fill part/all of a line with blanks. */ |
99 | /* Fill part/all of a line with blanks. */ |
… | |
… | |
146 | |
131 | |
147 | l.l = 0; |
132 | l.l = 0; |
148 | l.f = 0; |
133 | l.f = 0; |
149 | } |
134 | } |
150 | |
135 | |
|
|
136 | // nuke a single wide character at the given column |
|
|
137 | void |
|
|
138 | rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW |
|
|
139 | { |
|
|
140 | // find begin |
|
|
141 | while (col > 0 && l.t[col] == NOCHAR) |
|
|
142 | col--; |
|
|
143 | |
|
|
144 | rend_t rend = l.r[col] & ~RS_baseattrMask; |
|
|
145 | rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); |
|
|
146 | |
|
|
147 | l.touch (); |
|
|
148 | |
|
|
149 | // found start, nuke |
|
|
150 | do { |
|
|
151 | l.t[col] = ' '; |
|
|
152 | l.r[col] = rend; |
|
|
153 | col++; |
|
|
154 | } while (col < ncol && l.t[col] == NOCHAR); |
|
|
155 | } |
|
|
156 | |
151 | /* ------------------------------------------------------------------------- * |
157 | /* ------------------------------------------------------------------------- * |
152 | * SCREEN INITIALISATION * |
158 | * SCREEN INITIALISATION * |
153 | * ------------------------------------------------------------------------- */ |
159 | * ------------------------------------------------------------------------- */ |
154 | |
160 | |
155 | void |
161 | void |
… | |
… | |
157 | { |
163 | { |
158 | #if ENABLE_OVERLAY |
164 | #if ENABLE_OVERLAY |
159 | scr_overlay_off (); |
165 | scr_overlay_off (); |
160 | #endif |
166 | #endif |
161 | |
167 | |
162 | rvideo_mode = false; |
|
|
163 | view_start = 0; |
168 | view_start = 0; |
164 | num_scr = 0; |
169 | num_scr = 0; |
165 | |
170 | |
166 | if (ncol == 0) |
171 | if (ncol == 0) |
167 | ncol = 80; |
172 | ncol = 80; |
… | |
… | |
169 | if (nrow == 0) |
174 | if (nrow == 0) |
170 | nrow = 24; |
175 | nrow = 24; |
171 | |
176 | |
172 | if (ncol == prev_ncol && nrow == prev_nrow) |
177 | if (ncol == prev_ncol && nrow == prev_nrow) |
173 | return; |
178 | return; |
174 | |
|
|
175 | if (current_screen != PRIMARY) |
|
|
176 | scr_swap_screen (); |
|
|
177 | |
179 | |
178 | // we need at least two lines for wrapping to work correctly |
180 | // we need at least two lines for wrapping to work correctly |
179 | while (nrow + saveLines < 2) |
181 | while (nrow + saveLines < 2) |
180 | { |
182 | { |
181 | //TODO//FIXME |
183 | //TODO//FIXME |
… | |
… | |
234 | selection.text = NULL; |
236 | selection.text = NULL; |
235 | selection.len = 0; |
237 | selection.len = 0; |
236 | selection.op = SELECTION_CLEAR; |
238 | selection.op = SELECTION_CLEAR; |
237 | selection.screen = PRIMARY; |
239 | selection.screen = PRIMARY; |
238 | selection.clicks = 0; |
240 | selection.clicks = 0; |
|
|
241 | selection.clip_text = NULL; |
|
|
242 | selection.clip_len = 0; |
239 | } |
243 | } |
240 | else |
244 | else |
241 | { |
245 | { |
242 | /* |
246 | /* |
243 | * add or delete rows as appropriate |
247 | * add or delete rows as appropriate |
… | |
… | |
281 | |
285 | |
282 | if (top_row) |
286 | if (top_row) |
283 | { |
287 | { |
284 | // 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 |
285 | // 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 |
286 | |
291 | |
287 | row_col_t ocur = screen.cur; |
292 | row_col_t ocur = screen.cur; |
288 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
293 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
289 | |
294 | |
290 | do |
295 | do |
291 | { |
296 | { |
292 | p = MOD (p - 1, prev_total_rows); |
297 | p = MOD (p - 1, prev_total_rows); |
293 | #ifdef DEBUG_STRICT |
|
|
294 | assert (old_buf [MOD (p, prev_total_rows)].t); |
298 | assert (old_buf [MOD (p, prev_total_rows)].t); |
295 | #endif |
|
|
296 | int plines = 1; |
299 | int plines = 1; |
297 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
300 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
298 | |
301 | |
299 | 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 ()) |
300 | { |
303 | { |
… | |
… | |
394 | delete old_ta; |
397 | delete old_ta; |
395 | delete old_ra; |
398 | delete old_ra; |
396 | |
399 | |
397 | clamp_it (screen.cur.row, 0, nrow - 1); |
400 | clamp_it (screen.cur.row, 0, nrow - 1); |
398 | clamp_it (screen.cur.col, 0, ncol - 1); |
401 | clamp_it (screen.cur.col, 0, ncol - 1); |
|
|
402 | } |
399 | |
403 | |
400 | free (tabs); |
404 | free (tabs); |
401 | } |
405 | tabs = (char *)rxvt_malloc (ncol); |
|
|
406 | |
|
|
407 | for (int col = ncol; col--; ) |
|
|
408 | tabs [col] = col % TABSIZE == 0; |
402 | |
409 | |
403 | CLEAR_ALL_SELECTION (); |
410 | CLEAR_ALL_SELECTION (); |
404 | |
411 | |
405 | prev_nrow = nrow; |
412 | prev_nrow = nrow; |
406 | prev_ncol = ncol; |
413 | prev_ncol = ncol; |
407 | |
|
|
408 | tabs = (char *)rxvt_malloc (ncol); |
|
|
409 | |
|
|
410 | for (int col = ncol; --col; ) |
|
|
411 | tabs [col] = col % TABSIZE == 0; |
|
|
412 | |
|
|
413 | if (current_screen != PRIMARY) |
|
|
414 | scr_swap_screen (); |
|
|
415 | |
414 | |
416 | tt_winch (); |
415 | tt_winch (); |
417 | |
416 | |
418 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
417 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
419 | } |
418 | } |
… | |
… | |
431 | delete ralloc; ralloc = 0; |
430 | delete ralloc; ralloc = 0; |
432 | |
431 | |
433 | free (row_buf); |
432 | free (row_buf); |
434 | free (swap_buf); |
433 | free (swap_buf); |
435 | free (drawn_buf); |
434 | free (drawn_buf); |
|
|
435 | row_buf = 0; // signal that we freed all the arrays above |
|
|
436 | |
436 | free (tabs); |
437 | free (tabs); |
437 | |
438 | tabs = 0; |
438 | row_buf = 0; // signal that we freed all the arrays |
|
|
439 | } |
439 | } |
440 | } |
440 | } |
441 | |
441 | |
442 | /* ------------------------------------------------------------------------- */ |
442 | /* ------------------------------------------------------------------------- */ |
443 | /* |
443 | /* |
444 | * Hard reset |
444 | * Hard/Soft reset |
445 | */ |
445 | */ |
446 | void |
446 | void |
447 | rxvt_term::scr_poweron () |
447 | rxvt_term::scr_poweron () |
448 | { |
448 | { |
449 | scr_release (); |
449 | scr_release (); |
450 | prev_nrow = prev_ncol = 0; |
450 | prev_nrow = prev_ncol = 0; |
|
|
451 | rvideo_mode = false; |
|
|
452 | scr_soft_reset (); |
451 | scr_reset (); |
453 | scr_reset (); |
452 | |
454 | |
453 | scr_clear (true); |
455 | scr_clear (true); |
454 | 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); |
455 | } |
473 | } |
456 | |
474 | |
457 | /* ------------------------------------------------------------------------- * |
475 | /* ------------------------------------------------------------------------- * |
458 | * PROCESS SCREEN COMMANDS * |
476 | * PROCESS SCREEN COMMANDS * |
459 | * ------------------------------------------------------------------------- */ |
477 | * ------------------------------------------------------------------------- */ |
… | |
… | |
497 | } |
515 | } |
498 | |
516 | |
499 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
517 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
500 | min_it (s->cur.row, nrow - 1); |
518 | min_it (s->cur.row, nrow - 1); |
501 | min_it (s->cur.col, ncol - 1); |
519 | min_it (s->cur.col, ncol - 1); |
502 | #ifdef DEBUG_STRICT |
|
|
503 | assert (s->cur.row >= 0); |
520 | assert (s->cur.row >= 0); |
504 | assert (s->cur.col >= 0); |
521 | assert (s->cur.col >= 0); |
505 | #endif |
|
|
506 | } |
522 | } |
507 | |
523 | |
508 | void |
524 | void |
509 | rxvt_term::scr_swap_screen () |
525 | rxvt_term::scr_swap_screen () |
510 | { |
526 | { |
… | |
… | |
535 | want_refresh = 1; |
551 | want_refresh = 1; |
536 | view_start = 0; |
552 | view_start = 0; |
537 | |
553 | |
538 | selection_check (2); /* check for boundary cross */ |
554 | selection_check (2); /* check for boundary cross */ |
539 | |
555 | |
540 | int i = current_screen; current_screen = scrn; scrn = i; |
556 | current_screen = scrn; |
541 | |
557 | |
542 | #if NSCREENS |
558 | #if NSCREENS |
543 | if (option (Opt_secondaryScreen)) |
559 | if (option (Opt_secondaryScreen)) |
544 | { |
560 | { |
545 | num_scr = 0; |
561 | num_scr = 0; |
… | |
… | |
770 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
786 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
771 | screen.cur.row -= minlines; |
787 | screen.cur.row -= minlines; |
772 | } |
788 | } |
773 | } |
789 | } |
774 | |
790 | |
775 | #ifdef DEBUG_STRICT |
|
|
776 | assert (screen.cur.col < ncol); |
791 | assert (screen.cur.col < ncol); |
777 | assert (screen.cur.row < nrow |
792 | assert (screen.cur.row < nrow |
778 | && screen.cur.row >= top_row); |
793 | && screen.cur.row >= top_row); |
779 | #endif |
|
|
780 | int row = screen.cur.row; |
794 | int row = screen.cur.row; |
781 | |
795 | |
782 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
796 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
783 | |
797 | |
784 | line_t *line = &ROW(row); |
798 | line_t *line = &ROW(row); |
785 | |
799 | |
786 | while (str < strend) |
800 | while (str < strend) |
787 | { |
801 | { |
788 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
802 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
789 | |
803 | |
790 | if (c < 0x20) |
804 | if (expect_false (c < 0x20)) |
791 | if (c == C0_LF) |
805 | if (c == C0_LF) |
792 | { |
806 | { |
793 | max_it (line->l, screen.cur.col); |
807 | max_it (line->l, screen.cur.col); |
794 | |
808 | |
795 | screen.flags &= ~Screen_WrapNext; |
809 | screen.flags &= ~Screen_WrapNext; |
… | |
… | |
814 | { |
828 | { |
815 | scr_tab (1, true); |
829 | scr_tab (1, true); |
816 | continue; |
830 | continue; |
817 | } |
831 | } |
818 | |
832 | |
|
|
833 | if (expect_false ( |
819 | if (checksel /* see if we're writing within selection */ |
834 | checksel /* see if we're writing within selection */ |
820 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
835 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
821 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
836 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
|
|
837 | )) |
822 | { |
838 | { |
823 | checksel = 0; |
839 | checksel = 0; |
824 | /* |
840 | /* |
825 | * If we wrote anywhere in the selected area, kill the selection |
841 | * If we wrote anywhere in the selected area, kill the selection |
826 | * XXX: should we kill the mark too? Possibly, but maybe that |
842 | * XXX: should we kill the mark too? Possibly, but maybe that |
827 | * should be a similar check. |
843 | * should be a similar check. |
828 | */ |
844 | */ |
829 | CLEAR_SELECTION (); |
845 | CLEAR_SELECTION (); |
830 | } |
846 | } |
831 | |
847 | |
832 | if (screen.flags & Screen_WrapNext) |
848 | if (expect_false (screen.flags & Screen_WrapNext)) |
833 | { |
849 | { |
834 | scr_do_wrap (); |
850 | scr_do_wrap (); |
835 | |
851 | |
836 | line->l = ncol; |
852 | line->l = ncol; |
837 | line->is_longer (1); |
853 | line->is_longer (1); |
… | |
… | |
839 | row = screen.cur.row; |
855 | row = screen.cur.row; |
840 | line = &ROW(row); /* _must_ refresh */ |
856 | line = &ROW(row); /* _must_ refresh */ |
841 | } |
857 | } |
842 | |
858 | |
843 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
859 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
844 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
860 | if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
845 | c = 0xfffd; |
861 | c = 0xfffd; |
846 | |
862 | |
847 | // rely on wcwidth to tell us the character width, do wcwidth before |
863 | // rely on wcwidth to tell us the character width, do wcwidth before |
848 | // further replacements, as wcwidth might return -1 for the line |
864 | // further replacements, as wcwidth might return -1 for the line |
849 | // drawing characters below as they might be invalid in the current |
865 | // drawing characters below as they might be invalid in the current |
850 | // locale. |
866 | // locale. |
851 | int width = WCWIDTH (c); |
867 | int width = WCWIDTH (c); |
852 | |
868 | |
853 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
869 | if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL |
854 | { |
870 | { |
855 | // vt100 special graphics and line drawing |
871 | // vt100 special graphics and line drawing |
856 | // 5f-7e standard vt100 |
872 | // 5f-7e standard vt100 |
857 | // 40-5e rxvt extension for extra curses acs chars |
873 | // 40-5e rxvt extension for extra curses acs chars |
858 | static uint16_t vt100_0[62] = { // 41 .. 7e |
874 | static uint16_t vt100_0[62] = { // 41 .. 7e |
… | |
… | |
871 | c = vt100_0[c - 0x41]; |
887 | c = vt100_0[c - 0x41]; |
872 | width = 1; // vt100 line drawing characters are always single-width |
888 | width = 1; // vt100 line drawing characters are always single-width |
873 | } |
889 | } |
874 | } |
890 | } |
875 | |
891 | |
876 | if (screen.flags & Screen_Insert) |
892 | if (expect_false (screen.flags & Screen_Insert)) |
877 | scr_insdel_chars (width, INSERT); |
893 | scr_insdel_chars (width, INSERT); |
878 | |
894 | |
879 | if (width != 0) |
895 | if (width != 0) |
880 | { |
896 | { |
881 | #if !UNICODE_3 |
897 | #if !UNICODE_3 |
… | |
… | |
886 | # else |
902 | # else |
887 | c = 0xfffd; |
903 | c = 0xfffd; |
888 | # endif |
904 | # endif |
889 | #endif |
905 | #endif |
890 | |
906 | |
|
|
907 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
908 | |
|
|
909 | // if the character doesn't fit into the remaining columns... |
|
|
910 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
|
|
911 | { |
|
|
912 | if (screen.flags & Screen_Autowrap) |
|
|
913 | { |
|
|
914 | // ... artificially enlargen the previous one |
|
|
915 | c = NOCHAR; |
|
|
916 | // and try the same character next loop iteration |
|
|
917 | --str; |
|
|
918 | } |
|
|
919 | else |
|
|
920 | screen.cur.col = ncol - width; |
|
|
921 | } |
|
|
922 | |
891 | // nuke the character at this position, if required |
923 | // nuke the character at this position, if required |
|
|
924 | // due to wonderful coincidences everywhere else in this loop |
|
|
925 | // we never have to check for overwriting a wide char itself, |
|
|
926 | // only its tail. |
892 | if (line->t[screen.cur.col] == NOCHAR |
927 | if (expect_false (line->t[screen.cur.col] == NOCHAR)) |
893 | || (screen.cur.col < ncol - 1 |
928 | scr_kill_char (*line, screen.cur.col); |
894 | && line->t[screen.cur.col + 1] == NOCHAR)) |
|
|
895 | { |
|
|
896 | int col = screen.cur.col; |
|
|
897 | |
|
|
898 | // find begin |
|
|
899 | while (col > 0 && line->t[col] == NOCHAR) |
|
|
900 | col--; |
|
|
901 | |
|
|
902 | rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' ')); |
|
|
903 | |
|
|
904 | // found begin, nuke |
|
|
905 | do { |
|
|
906 | line->t[col] = ' '; |
|
|
907 | line->r[col] = rend; |
|
|
908 | col++; |
|
|
909 | } while (col < ncol && line->t[col] == NOCHAR); |
|
|
910 | } |
|
|
911 | |
|
|
912 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
913 | |
|
|
914 | // if the character doesn't fit into the remaining columns... |
|
|
915 | if (screen.cur.col > ncol - width && ncol >= width) |
|
|
916 | { |
|
|
917 | // ...output spaces |
|
|
918 | c = ' '; |
|
|
919 | // and try the same character next loop iteration |
|
|
920 | --str; |
|
|
921 | } |
|
|
922 | |
929 | |
923 | line->touch (); |
930 | line->touch (); |
924 | |
931 | |
925 | do |
932 | do |
926 | { |
933 | { |
927 | line->t[screen.cur.col] = c; |
934 | line->t[screen.cur.col] = c; |
928 | line->r[screen.cur.col] = rend; |
935 | line->r[screen.cur.col] = rend; |
929 | |
936 | |
930 | if (screen.cur.col < ncol - 1) |
937 | if (expect_true (screen.cur.col < ncol - 1)) |
931 | screen.cur.col++; |
938 | screen.cur.col++; |
932 | else |
939 | else |
933 | { |
940 | { |
934 | line->l = ncol; |
941 | line->l = ncol; |
935 | if (screen.flags & Screen_Autowrap) |
942 | if (screen.flags & Screen_Autowrap) |
936 | screen.flags |= Screen_WrapNext; |
943 | screen.flags |= Screen_WrapNext; |
937 | break; |
944 | |
|
|
945 | goto end_of_line; |
938 | } |
946 | } |
939 | |
947 | |
940 | c = NOCHAR; |
948 | c = NOCHAR; |
941 | } |
949 | } |
942 | while (--width > 0); |
950 | while (expect_false (--width > 0)); |
943 | |
951 | |
944 | // pad with spaces when overwriting wide character with smaller one |
952 | // pad with spaces when overwriting wide character with smaller one |
945 | if (!width) |
953 | for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++) |
946 | { |
954 | { |
947 | line->touch (); |
955 | line->t[c] = ' '; |
|
|
956 | line->r[c] = rend; |
|
|
957 | } |
948 | |
958 | |
949 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
959 | end_of_line: |
|
|
960 | ; |
|
|
961 | } |
|
|
962 | #if ENABLE_COMBINING |
|
|
963 | else // width == 0 |
|
|
964 | { |
|
|
965 | if (c != 0xfeff) // ignore BOM |
|
|
966 | { |
|
|
967 | // handle combining characters |
|
|
968 | // we just tag the accent on the previous on-screen character. |
|
|
969 | // this is arguably not correct, but also arguably not wrong. |
|
|
970 | // we don't handle double-width characters nicely yet. |
|
|
971 | line_t *linep; |
|
|
972 | text_t *tp; |
|
|
973 | rend_t *rp; |
|
|
974 | |
|
|
975 | if (screen.cur.col > 0) |
950 | { |
976 | { |
951 | line->t[c] = ' '; |
|
|
952 | line->r[c] = rend; |
977 | linep = line; |
|
|
978 | tp = line->t + screen.cur.col - 1; |
|
|
979 | rp = line->r + screen.cur.col - 1; |
953 | } |
980 | } |
|
|
981 | else if (screen.cur.row > 0 |
|
|
982 | && ROW(screen.cur.row - 1).is_longer ()) |
|
|
983 | { |
|
|
984 | linep = &ROW(screen.cur.row - 1); |
|
|
985 | tp = line->t + ncol - 1; |
|
|
986 | rp = line->r + ncol - 1; |
|
|
987 | } |
|
|
988 | else |
|
|
989 | continue; |
|
|
990 | |
|
|
991 | linep->touch (); |
|
|
992 | |
|
|
993 | while (*tp == NOCHAR && tp > linep->t) |
|
|
994 | tp--, rp--; |
|
|
995 | |
|
|
996 | // first try to find a precomposed character |
|
|
997 | unicode_t n = rxvt_compose (*tp, c); |
|
|
998 | if (n == NOCHAR) |
|
|
999 | n = rxvt_composite.compose (*tp, c); |
|
|
1000 | |
|
|
1001 | *tp = n; |
|
|
1002 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
954 | } |
1003 | } |
955 | } |
1004 | } |
956 | else // width == 0 |
|
|
957 | { |
|
|
958 | #if ENABLE_COMBINING |
|
|
959 | // handle combining characters |
|
|
960 | // we just tag the accent on the previous on-screen character. |
|
|
961 | // this is arguably not correct, but also arguably not wrong. |
|
|
962 | // we don't handle double-width characters nicely yet. |
|
|
963 | line_t *linep; |
|
|
964 | text_t *tp; |
|
|
965 | rend_t *rp; |
|
|
966 | |
|
|
967 | if (screen.cur.col > 0) |
|
|
968 | { |
|
|
969 | linep = line; |
|
|
970 | tp = line->t + screen.cur.col - 1; |
|
|
971 | rp = line->r + screen.cur.col - 1; |
|
|
972 | } |
|
|
973 | else if (screen.cur.row > 0 |
|
|
974 | && ROW(screen.cur.row - 1).is_longer ()) |
|
|
975 | { |
|
|
976 | linep = &ROW(screen.cur.row - 1); |
|
|
977 | tp = line->t + ncol - 1; |
|
|
978 | rp = line->r + ncol - 1; |
|
|
979 | } |
|
|
980 | else |
|
|
981 | continue; |
|
|
982 | |
|
|
983 | linep->touch (); |
|
|
984 | |
|
|
985 | while (*tp == NOCHAR && tp > linep->t) |
|
|
986 | tp--, rp--; |
|
|
987 | |
|
|
988 | // first try to find a precomposed character |
|
|
989 | unicode_t n = rxvt_compose (*tp, c); |
|
|
990 | if (n == NOCHAR) |
|
|
991 | n = rxvt_composite.compose (*tp, c); |
|
|
992 | |
|
|
993 | *tp = n; |
|
|
994 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
|
|
995 | #endif |
1005 | #endif |
996 | } |
|
|
997 | } |
1006 | } |
998 | |
1007 | |
999 | max_it (line->l, screen.cur.col); |
1008 | max_it (line->l, screen.cur.col); |
1000 | |
1009 | |
1001 | #ifdef DEBUG_STRICT |
|
|
1002 | assert (screen.cur.row >= 0); |
1010 | assert (screen.cur.row >= 0); |
1003 | #endif |
|
|
1004 | } |
1011 | } |
1005 | |
1012 | |
1006 | /* ------------------------------------------------------------------------- */ |
1013 | /* ------------------------------------------------------------------------- */ |
1007 | /* |
1014 | /* |
1008 | * Process Backspace. Move back the cursor back a position, wrap if have to |
1015 | * Process Backspace. Move back the cursor back a position, wrap if have to |
… | |
… | |
1021 | |
1028 | |
1022 | want_refresh = 1; |
1029 | want_refresh = 1; |
1023 | #endif |
1030 | #endif |
1024 | } |
1031 | } |
1025 | } |
1032 | } |
|
|
1033 | else if (screen.flags & Screen_WrapNext) |
|
|
1034 | screen.flags &= ~Screen_WrapNext; |
1026 | else |
1035 | else |
1027 | scr_gotorc (0, -1, RELATIVE); |
1036 | scr_gotorc (0, -1, RELATIVE); |
1028 | } |
1037 | } |
1029 | |
1038 | |
1030 | /* ------------------------------------------------------------------------- */ |
1039 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1336 | if (row >= nrow) /* Out Of Bounds */ |
1345 | if (row >= nrow) /* Out Of Bounds */ |
1337 | return; |
1346 | return; |
1338 | |
1347 | |
1339 | min_it (num, nrow - row); |
1348 | min_it (num, nrow - row); |
1340 | |
1349 | |
1341 | if (rstyle & (RS_RVid | RS_Uline)) |
1350 | if (rstyle & (RS_Blink | RS_RVid | RS_Uline)) |
1342 | ren = (rend_t) ~RS_None; |
1351 | ren = (rend_t) ~RS_None; |
1343 | else if (GET_BASEBG (rstyle) == Color_bg) |
1352 | else if (GET_BASEBG (rstyle) == Color_bg) |
1344 | { |
1353 | { |
1345 | ren = DEFAULT_RSTYLE; |
1354 | ren = DEFAULT_RSTYLE; |
1346 | CLEAR_ROWS (row, num); |
1355 | |
|
|
1356 | if (mapped) |
|
|
1357 | XClearArea (dpy, vt, 0, |
|
|
1358 | Row2Pixel (row - view_start), (unsigned int)width, |
|
|
1359 | (unsigned int)Height2Pixel (num), False); |
1347 | } |
1360 | } |
1348 | else |
1361 | else |
1349 | { |
1362 | { |
1350 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1363 | ren = rstyle & (RS_fgMask | RS_bgMask); |
|
|
1364 | |
|
|
1365 | if (mapped) |
|
|
1366 | { |
1351 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1367 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1352 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1368 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1353 | ERASE_ROWS (row, num); |
1369 | XFillRectangle (dpy, vt, gc, |
|
|
1370 | 0, Row2Pixel (row - view_start), |
|
|
1371 | (unsigned int)width, |
|
|
1372 | (unsigned int)Height2Pixel (num)); |
1354 | gcvalue.foreground = pix_colors[Color_fg]; |
1373 | gcvalue.foreground = pix_colors[Color_fg]; |
1355 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1374 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
|
|
1375 | } |
1356 | } |
1376 | } |
1357 | |
1377 | |
1358 | for (; num--; row++) |
1378 | for (; num--; row++) |
1359 | { |
1379 | { |
1360 | scr_blank_screen_mem (ROW(row), rstyle); |
1380 | scr_blank_screen_mem (ROW(row), rstyle); |
|
|
1381 | |
|
|
1382 | if (row - view_start < nrow) |
1361 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1383 | scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren); |
1362 | } |
1384 | } |
1363 | } |
1385 | } |
1364 | |
1386 | |
1365 | #if !ENABLE_MINIMAL |
1387 | #if !ENABLE_MINIMAL |
1366 | void |
1388 | void |
… | |
… | |
1440 | * Insert/Delete <count> characters from the current position |
1462 | * Insert/Delete <count> characters from the current position |
1441 | */ |
1463 | */ |
1442 | void |
1464 | void |
1443 | rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW |
1465 | rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW |
1444 | { |
1466 | { |
1445 | int col, row; |
|
|
1446 | rend_t tr; |
|
|
1447 | |
|
|
1448 | want_refresh = 1; |
1467 | want_refresh = 1; |
1449 | ZERO_SCROLLBACK (); |
1468 | ZERO_SCROLLBACK (); |
1450 | |
1469 | |
1451 | if (count <= 0) |
1470 | if (count <= 0) |
1452 | return; |
1471 | return; |
… | |
… | |
1454 | scr_do_wrap (); |
1473 | scr_do_wrap (); |
1455 | |
1474 | |
1456 | selection_check (1); |
1475 | selection_check (1); |
1457 | min_it (count, ncol - screen.cur.col); |
1476 | min_it (count, ncol - screen.cur.col); |
1458 | |
1477 | |
1459 | row = screen.cur.row; |
1478 | int row = screen.cur.row; |
1460 | |
1479 | |
1461 | line_t *line = &ROW(row); |
1480 | line_t *line = &ROW(row); |
1462 | |
1481 | |
1463 | line->touch (); |
1482 | line->touch (); |
1464 | line->is_longer (0); |
1483 | line->is_longer (0); |
1465 | |
1484 | |
|
|
1485 | // nuke wide spanning the start |
|
|
1486 | if (line->t[screen.cur.col] == NOCHAR) |
|
|
1487 | scr_kill_char (*line, screen.cur.col); |
|
|
1488 | |
1466 | switch (insdel) |
1489 | switch (insdel) |
1467 | { |
1490 | { |
1468 | case INSERT: |
1491 | case INSERT: |
1469 | for (col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1492 | line->l = min (line->l + count, ncol); |
|
|
1493 | |
|
|
1494 | if (line->t[screen.cur.col] == NOCHAR) |
|
|
1495 | scr_kill_char (*line, screen.cur.col); |
|
|
1496 | |
|
|
1497 | for (int col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1470 | { |
1498 | { |
1471 | line->t[col] = line->t[col - count]; |
1499 | line->t[col] = line->t[col - count]; |
1472 | line->r[col] = line->r[col - count]; |
1500 | line->r[col] = line->r[col - count]; |
1473 | } |
1501 | } |
1474 | |
|
|
1475 | line->l = min (line->l + count, ncol); |
|
|
1476 | |
1502 | |
1477 | if (selection.op && current_screen == selection.screen |
1503 | if (selection.op && current_screen == selection.screen |
1478 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1504 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1479 | { |
1505 | { |
1480 | if (selection.end.row != screen.cur.row |
1506 | if (selection.end.row != screen.cur.row |
… | |
… | |
1495 | case ERASE: |
1521 | case ERASE: |
1496 | screen.cur.col += count; /* don't worry if > ncol */ |
1522 | screen.cur.col += count; /* don't worry if > ncol */ |
1497 | selection_check (1); |
1523 | selection_check (1); |
1498 | screen.cur.col -= count; |
1524 | screen.cur.col -= count; |
1499 | |
1525 | |
1500 | line->l = max (line->l - count, 0); |
1526 | // nuke wide char after the end |
|
|
1527 | if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR) |
|
|
1528 | scr_kill_char (*line, screen.cur.col + count); |
|
|
1529 | |
1501 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1530 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1502 | break; |
1531 | break; |
1503 | |
1532 | |
1504 | case DELETE: |
1533 | case DELETE: |
1505 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1534 | line->l = max (line->l - count, 0); |
1506 | |
1535 | |
|
|
1536 | // nuke wide char spanning the end |
|
|
1537 | if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR) |
|
|
1538 | scr_kill_char (*line, screen.cur.col + count); |
|
|
1539 | |
1507 | for (col = screen.cur.col; (col + count) < ncol; col++) |
1540 | for (int col = screen.cur.col; (col + count) < ncol; col++) |
1508 | { |
1541 | { |
1509 | line->t[col] = line->t[col + count]; |
1542 | line->t[col] = line->t[col + count]; |
1510 | line->r[col] = line->r[col + count]; |
1543 | line->r[col] = line->r[col + count]; |
1511 | } |
1544 | } |
1512 | |
1545 | |
1513 | line->l = max (line->l - count, 0); |
|
|
1514 | scr_blank_line (*line, ncol - count, count, tr); |
1546 | scr_blank_line (*line, ncol - count, count, rstyle); |
1515 | |
1547 | |
1516 | if (selection.op && current_screen == selection.screen |
1548 | if (selection.op && current_screen == selection.screen |
1517 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1549 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1518 | { |
1550 | { |
1519 | if (selection.end.row != screen.cur.row |
1551 | if (selection.end.row != screen.cur.row |
… | |
… | |
1655 | { |
1687 | { |
1656 | rvideo_state = on; |
1688 | rvideo_state = on; |
1657 | |
1689 | |
1658 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1690 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1659 | #ifdef HAVE_BG_PIXMAP |
1691 | #ifdef HAVE_BG_PIXMAP |
1660 | if (bgPixmap.pixmap == None) |
1692 | if (bg_pixmap == None) |
1661 | #endif |
1693 | #endif |
1662 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1694 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1663 | |
1695 | |
1664 | XGCValues gcvalue; |
1696 | XGCValues gcvalue; |
1665 | gcvalue.foreground = pix_colors[Color_fg]; |
1697 | gcvalue.foreground = pix_colors[Color_fg]; |
… | |
… | |
1809 | for (i = PART_BEG; i < RC_COUNT; i++) |
1841 | for (i = PART_BEG; i < RC_COUNT; i++) |
1810 | { |
1842 | { |
1811 | min_it (rc[i].col, ncol - 1); |
1843 | min_it (rc[i].col, ncol - 1); |
1812 | min_it (rc[i].row, nrow - 1); |
1844 | min_it (rc[i].row, nrow - 1); |
1813 | } |
1845 | } |
1814 | // TODO: this line somehow causes segfault if scr_expose() is called just after resize |
1846 | |
1815 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1847 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1816 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1848 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1817 | |
1849 | |
1818 | num_scr_allow = 0; |
1850 | num_scr_allow = 0; |
1819 | |
1851 | |
… | |
… | |
1892 | |
1924 | |
1893 | # ifndef NO_MAPALERT |
1925 | # ifndef NO_MAPALERT |
1894 | # ifdef MAPALERT_OPTION |
1926 | # ifdef MAPALERT_OPTION |
1895 | if (option (Opt_mapAlert)) |
1927 | if (option (Opt_mapAlert)) |
1896 | # endif |
1928 | # endif |
1897 | XMapWindow (dpy, parent[0]); |
1929 | XMapWindow (dpy, parent); |
1898 | # endif |
1930 | # endif |
1899 | |
1931 | |
1900 | # if ENABLE_FRILLS |
1932 | # if ENABLE_FRILLS |
1901 | if (option (Opt_urgentOnBell)) |
1933 | if (option (Opt_urgentOnBell)) |
1902 | { |
1934 | set_urgency (1); |
1903 | if (XWMHints *h = XGetWMHints(dpy, parent[0])) |
|
|
1904 | { |
|
|
1905 | h->flags |= XUrgencyHint; |
|
|
1906 | XSetWMHints (dpy, parent[0], h); |
|
|
1907 | } |
|
|
1908 | } |
|
|
1909 | # endif |
1935 | # endif |
1910 | |
1936 | |
1911 | if (option (Opt_visualBell)) |
1937 | if (option (Opt_visualBell)) |
1912 | { |
1938 | { |
1913 | rvideo_bell = true; |
1939 | rvideo_bell = true; |
… | |
… | |
1916 | |
1942 | |
1917 | bell_ev.start (VISUAL_BELL_DURATION); |
1943 | bell_ev.start (VISUAL_BELL_DURATION); |
1918 | } |
1944 | } |
1919 | else |
1945 | else |
1920 | XBell (dpy, 0); |
1946 | XBell (dpy, 0); |
|
|
1947 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1921 | #endif |
1948 | #endif |
1922 | } |
1949 | } |
1923 | |
1950 | |
1924 | /* ------------------------------------------------------------------------- */ |
1951 | /* ------------------------------------------------------------------------- */ |
1925 | /* ARGSUSED */ |
1952 | /* ARGSUSED */ |
1926 | void |
1953 | void |
1927 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1954 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1928 | { |
1955 | { |
1929 | #ifdef PRINTPIPE |
1956 | #ifdef PRINTPIPE |
1930 | int nrows, row_start; |
1957 | int nrows, row_start; |
1931 | FILE *fd; |
1958 | FILE *fd = popen_printer (); |
1932 | |
1959 | |
1933 | if ((fd = popen_printer ()) == NULL) |
1960 | if (!fd) |
1934 | return; |
1961 | return; |
1935 | |
1962 | |
1936 | if (fullhist) |
1963 | if (fullhist) |
1937 | { |
1964 | { |
1938 | nrows = nrow - top_row; |
1965 | nrows = nrow - top_row; |
… | |
… | |
1944 | row_start = view_start; |
1971 | row_start = view_start; |
1945 | } |
1972 | } |
1946 | |
1973 | |
1947 | wctomb (0, 0); |
1974 | wctomb (0, 0); |
1948 | |
1975 | |
1949 | for (int r1 = 0; r1 < nrows; r1++) |
1976 | for (int r1 = row_start; r1 < row_start + nrows; r1++) |
1950 | { |
1977 | { |
1951 | text_t *tp = ROW(r1).t; |
1978 | text_t *tp = ROW(r1).t; |
1952 | int len = ROW(r1).l; |
1979 | int len = ROW(r1).l; |
1953 | |
1980 | |
1954 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
1981 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
… | |
… | |
1983 | * screen.text/screen.rend contain what the screen will change to. |
2010 | * screen.text/screen.rend contain what the screen will change to. |
1984 | */ |
2011 | */ |
1985 | void |
2012 | void |
1986 | rxvt_term::scr_refresh () NOTHROW |
2013 | rxvt_term::scr_refresh () NOTHROW |
1987 | { |
2014 | { |
1988 | unsigned char have_bg, |
|
|
1989 | showcursor; /* show the cursor */ |
|
|
1990 | int16_t col, row, /* column/row we're processing */ |
2015 | int16_t col, row, /* column/row we're processing */ |
1991 | ocrow; /* old cursor row */ |
2016 | ocrow; /* old cursor row */ |
1992 | int i; /* tmp */ |
2017 | int i; /* tmp */ |
1993 | #ifndef NO_CURSORCOLOR |
2018 | #ifndef NO_CURSORCOLOR |
1994 | rend_t cc1; /* store colours at cursor position (s) */ |
2019 | rend_t cc1; /* store colours at cursor position (s) */ |
… | |
… | |
2005 | /* |
2030 | /* |
2006 | * A: set up vars |
2031 | * A: set up vars |
2007 | */ |
2032 | */ |
2008 | refresh_count = 0; |
2033 | refresh_count = 0; |
2009 | |
2034 | |
|
|
2035 | unsigned int old_screen_flags = screen.flags; |
2010 | have_bg = 0; |
2036 | char have_bg = 0; |
2011 | #ifdef HAVE_BG_PIXMAP |
2037 | #ifdef HAVE_BG_PIXMAP |
2012 | have_bg = bgPixmap.pixmap != None; |
2038 | have_bg = bg_pixmap != None; |
2013 | #endif |
2039 | #endif |
2014 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2040 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2015 | |
2041 | |
2016 | /* |
2042 | /* |
2017 | * B: reverse any characters which are selected |
2043 | * B: reverse any characters which are selected |
2018 | */ |
2044 | */ |
2019 | scr_reverse_selection (); |
2045 | scr_reverse_selection (); |
|
|
2046 | |
|
|
2047 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
|
|
2048 | #if ENABLE_OVERLAY |
|
|
2049 | scr_swap_overlay (); |
|
|
2050 | #endif |
|
|
2051 | |
|
|
2052 | char showcursor = screen.flags & Screen_VisibleCursor; |
2020 | |
2053 | |
2021 | /* |
2054 | /* |
2022 | * C: set the cursor character (s) |
2055 | * C: set the cursor character (s) |
2023 | */ |
2056 | */ |
2024 | { |
2057 | { |
2025 | unsigned char setoldcursor; |
2058 | unsigned char setoldcursor; |
2026 | |
2059 | |
2027 | showcursor = (screen.flags & Screen_VisibleCursor); |
|
|
2028 | #ifdef CURSOR_BLINK |
2060 | #ifdef CURSOR_BLINK |
2029 | if (hidden_cursor) |
2061 | if (hidden_cursor) |
2030 | showcursor = 0; |
2062 | showcursor = 0; |
2031 | #endif |
2063 | #endif |
2032 | |
2064 | |
… | |
… | |
2060 | ccol2 = bgcolor_of (rstyle); |
2092 | ccol2 = bgcolor_of (rstyle); |
2061 | #else |
2093 | #else |
2062 | ccol2 = Color_bg; |
2094 | ccol2 = Color_bg; |
2063 | #endif |
2095 | #endif |
2064 | |
2096 | |
2065 | if (showcursor && focus) |
2097 | if (focus) |
2066 | { |
2098 | { |
2067 | if (option (Opt_cursorUnderline)) |
2099 | if (option (Opt_cursorUnderline)) |
2068 | *crp ^= RS_Uline; |
2100 | *crp ^= RS_Uline; |
2069 | else |
2101 | else |
2070 | { |
2102 | { |
… | |
… | |
2105 | oldcursor.col = screen.cur.col; |
2137 | oldcursor.col = screen.cur.col; |
2106 | } |
2138 | } |
2107 | } |
2139 | } |
2108 | } |
2140 | } |
2109 | |
2141 | |
2110 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
|
|
2111 | #if ENABLE_OVERLAY |
|
|
2112 | scr_swap_overlay (); |
|
|
2113 | #endif |
|
|
2114 | |
|
|
2115 | #ifndef NO_SLOW_LINK_SUPPORT |
2142 | #ifndef NO_SLOW_LINK_SUPPORT |
2116 | /* |
2143 | /* |
2117 | * D: CopyArea pass - very useful for slower links |
2144 | * D: CopyArea pass - very useful for slower links |
2118 | * This has been deliberately kept simple. |
2145 | * This has been deliberately kept simple. |
2119 | */ |
2146 | */ |
… | |
… | |
2208 | continue; |
2235 | continue; |
2209 | |
2236 | |
2210 | // redraw one or more characters |
2237 | // redraw one or more characters |
2211 | |
2238 | |
2212 | // seek to the beginning of wide characters |
2239 | // seek to the beginning of wide characters |
2213 | while (stp[col] == NOCHAR && col > 0) |
2240 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2214 | --col; |
2241 | --col; |
2215 | |
2242 | |
2216 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2243 | rend_t rend = srp[col]; /* screen rendition (target rendition) */ |
2217 | text_t *text = stp + col; |
2244 | text_t *text = stp + col; |
2218 | int count = 1; |
2245 | int count = 1; |
2219 | |
2246 | |
2220 | dtp[col] = stp[col]; |
2247 | dtp[col] = stp[col]; |
2221 | drp[col] = rend; |
2248 | drp[col] = rend; |
… | |
… | |
2225 | for (i = 0; ++col < ncol; ) |
2252 | for (i = 0; ++col < ncol; ) |
2226 | { |
2253 | { |
2227 | if (stp[col] == NOCHAR) |
2254 | if (stp[col] == NOCHAR) |
2228 | { |
2255 | { |
2229 | dtp[col] = stp[col]; |
2256 | dtp[col] = stp[col]; |
2230 | drp[col] = rend; |
2257 | drp[col] = srp[col]; |
|
|
2258 | |
2231 | count++; |
2259 | count++; |
2232 | i++; |
2260 | i++; |
2233 | |
2261 | |
2234 | continue; |
2262 | continue; |
2235 | } |
2263 | } |
… | |
… | |
2255 | |
2283 | |
2256 | col--; /* went one too far. move back */ |
2284 | col--; /* went one too far. move back */ |
2257 | count -= i; /* dump any matching trailing chars */ |
2285 | count -= i; /* dump any matching trailing chars */ |
2258 | |
2286 | |
2259 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2287 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2260 | while (i && text[count] == NOCHAR) |
2288 | while (expect_false (i && text[count] == NOCHAR)) |
2261 | count++, i--; |
2289 | count++, i--; |
2262 | |
2290 | |
2263 | /* |
2291 | /* |
2264 | * Determine the attributes for the string |
2292 | * Determine the attributes for the string |
2265 | */ |
2293 | */ |
2266 | int fore = fgcolor_of (rend); // desired foreground |
2294 | int fore = fgcolor_of (rend); // desired foreground |
2267 | int back = bgcolor_of (rend); // desired background |
2295 | int back = bgcolor_of (rend); // desired background |
2268 | |
2296 | |
2269 | // only do special processing if any attributes are set, which is unlikely |
2297 | // only do special processing if any attributes are set, which is unlikely |
2270 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2298 | if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) |
2271 | { |
2299 | { |
2272 | bool invert = rend & RS_RVid; |
2300 | bool invert = rend & RS_RVid; |
2273 | |
2301 | |
2274 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2302 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2275 | if (rend & RS_Bold && fore == Color_fg) |
2303 | if (rend & RS_Bold && fore == Color_fg) |
… | |
… | |
2294 | |
2322 | |
2295 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2323 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2296 | fore = Color_UL; |
2324 | fore = Color_UL; |
2297 | #endif |
2325 | #endif |
2298 | |
2326 | |
|
|
2327 | #ifdef OPTION_HC |
|
|
2328 | if (rend & RS_Sel) |
|
|
2329 | { |
|
|
2330 | /* invert the column if no highlightColor is set or it is the |
|
|
2331 | * current cursor column */ |
|
|
2332 | if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2333 | && ISSET_PIXCOLOR (Color_HC)) |
|
|
2334 | { |
|
|
2335 | if (ISSET_PIXCOLOR (Color_HTC)) |
|
|
2336 | fore = Color_HTC; |
|
|
2337 | // if invert is 0 reverse video is set so we use bg color as fg color |
|
|
2338 | else if (!invert) |
|
|
2339 | fore = back; |
|
|
2340 | |
|
|
2341 | back = Color_HC; |
|
|
2342 | invert = 0; |
|
|
2343 | } |
|
|
2344 | } |
|
|
2345 | #endif |
|
|
2346 | |
2299 | if (invert) |
2347 | if (invert) |
2300 | { |
2348 | { |
2301 | #ifdef OPTION_HC |
|
|
2302 | if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2303 | || !ISSET_PIXCOLOR (Color_HC)) |
|
|
2304 | #endif |
|
|
2305 | /* invert the column if no highlightColor is set or it is the |
|
|
2306 | * current cursor column */ |
|
|
2307 | ::swap (fore, back); |
2349 | ::swap (fore, back); |
2308 | #ifdef OPTION_HC |
|
|
2309 | else if (ISSET_PIXCOLOR (Color_HC)) |
|
|
2310 | back = Color_HC; |
|
|
2311 | #endif |
|
|
2312 | |
2350 | |
2313 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2351 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2314 | # ifndef OPTION_HC |
|
|
2315 | if (ISSET_PIXCOLOR (Color_RV)) |
|
|
2316 | back = Color_RV; |
|
|
2317 | # endif |
|
|
2318 | if (fore == back) |
2352 | if (fore == back) |
2319 | { |
2353 | { |
2320 | fore = Color_bg; |
2354 | fore = Color_bg; |
2321 | back = Color_fg; |
2355 | back = Color_fg; |
2322 | } |
2356 | } |
… | |
… | |
2358 | /* |
2392 | /* |
2359 | * Actually do the drawing of the string here |
2393 | * Actually do the drawing of the string here |
2360 | */ |
2394 | */ |
2361 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2395 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2362 | |
2396 | |
2363 | if (have_bg && back == Color_bg) |
2397 | if (expect_true (have_bg && back == Color_bg)) |
2364 | { |
2398 | { |
2365 | // this is very ugly, maybe push it into ->draw? |
2399 | // this is very ugly, maybe push it into ->draw? |
2366 | |
2400 | |
2367 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2401 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2368 | if (text[i] != ' ') |
2402 | if (text[i] != ' ') |
… | |
… | |
2375 | did_clear: ; |
2409 | did_clear: ; |
2376 | } |
2410 | } |
2377 | else |
2411 | else |
2378 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2412 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2379 | |
2413 | |
2380 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2414 | if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) |
2381 | { |
2415 | { |
2382 | #if ENABLE_FRILLS |
2416 | #if ENABLE_FRILLS |
2383 | if (ISSET_PIXCOLOR (Color_underline)) |
2417 | if (ISSET_PIXCOLOR (Color_underline)) |
2384 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2418 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2385 | else |
2419 | else |
… | |
… | |
2390 | xpixel, ypixel + font->ascent + 1, |
2424 | xpixel, ypixel + font->ascent + 1, |
2391 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2425 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2392 | } |
2426 | } |
2393 | } /* for (col....) */ |
2427 | } /* for (col....) */ |
2394 | } /* for (row....) */ |
2428 | } /* for (row....) */ |
2395 | |
|
|
2396 | #if ENABLE_OVERLAY |
|
|
2397 | scr_swap_overlay (); |
|
|
2398 | #endif |
|
|
2399 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2400 | |
2429 | |
2401 | /* |
2430 | /* |
2402 | * G: cleanup cursor and display outline cursor if necessary |
2431 | * G: cleanup cursor and display outline cursor if necessary |
2403 | */ |
2432 | */ |
2404 | if (showcursor) |
2433 | if (showcursor) |
… | |
… | |
2443 | } |
2472 | } |
2444 | |
2473 | |
2445 | /* |
2474 | /* |
2446 | * H: cleanup selection |
2475 | * H: cleanup selection |
2447 | */ |
2476 | */ |
|
|
2477 | #if ENABLE_OVERLAY |
|
|
2478 | scr_swap_overlay (); |
|
|
2479 | #endif |
|
|
2480 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2481 | |
2448 | scr_reverse_selection (); |
2482 | scr_reverse_selection (); |
2449 | |
2483 | |
|
|
2484 | screen.flags = old_screen_flags; |
2450 | num_scr = 0; |
2485 | num_scr = 0; |
2451 | num_scr_allow = 1; |
2486 | num_scr_allow = 1; |
2452 | } |
2487 | } |
2453 | |
2488 | |
2454 | void |
2489 | void |
… | |
… | |
2475 | scr_remap_chars (swap_buf [i]); |
2510 | scr_remap_chars (swap_buf [i]); |
2476 | } |
2511 | } |
2477 | } |
2512 | } |
2478 | |
2513 | |
2479 | void |
2514 | void |
2480 | rxvt_term::scr_recolour () NOTHROW |
2515 | rxvt_term::scr_recolour (bool refresh) NOTHROW |
2481 | { |
2516 | { |
|
|
2517 | bool transparent = false; |
|
|
2518 | |
2482 | #ifdef HAVE_BG_PIXMAP |
2519 | #ifdef HAVE_BG_PIXMAP |
2483 | bgPixmap.apply (); |
2520 | if (bg_pixmap != None) |
2484 | #else |
2521 | { |
|
|
2522 | # ifdef ENABLE_TRANSPARENCY |
|
|
2523 | if (bg_flags & BG_IS_TRANSPARENT) |
|
|
2524 | { |
|
|
2525 | XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); |
|
|
2526 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
2485 | |
2527 | |
|
|
2528 | transparent = true; |
|
|
2529 | } |
|
|
2530 | else |
|
|
2531 | # endif |
|
|
2532 | { |
|
|
2533 | XSetWindowBackground (dpy, parent, pix_colors[Color_border]); |
|
|
2534 | XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); |
|
|
2535 | } |
|
|
2536 | } |
|
|
2537 | else |
|
|
2538 | #endif |
|
|
2539 | { |
2486 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2540 | XSetWindowBackground (dpy, parent, pix_colors[Color_border]); |
2487 | XClearWindow (dpy, parent[0]); |
|
|
2488 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2541 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
|
|
2542 | } |
|
|
2543 | |
|
|
2544 | XClearWindow (dpy, parent); |
2489 | |
2545 | |
2490 | if (scrollBar.win) |
2546 | if (scrollBar.win) |
2491 | { |
2547 | { |
|
|
2548 | if (transparent) |
|
|
2549 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
|
|
2550 | else |
2492 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2551 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2493 | scrollBar.state = STATE_IDLE; |
2552 | scrollBar.state = STATE_IDLE; |
2494 | scrollBar.show (0); |
2553 | scrollBar.show (0); |
2495 | } |
2554 | } |
2496 | |
2555 | |
2497 | #endif |
2556 | if (refresh) |
2498 | |
2557 | { |
2499 | /* bgPixmap.apply () does not do the following : */ |
|
|
2500 | scr_clear (); |
2558 | scr_clear (); |
2501 | scr_touch (true); |
2559 | scr_touch (true); |
|
|
2560 | } |
2502 | want_refresh = 1; |
2561 | want_refresh = 1; |
2503 | } |
2562 | } |
2504 | |
2563 | |
2505 | /* ------------------------------------------------------------------------- */ |
2564 | /* ------------------------------------------------------------------------- */ |
2506 | void |
2565 | void |
… | |
… | |
2574 | { |
2633 | { |
2575 | #if !ENABLE_MINIMAL |
2634 | #if !ENABLE_MINIMAL |
2576 | if (selection.rect) |
2635 | if (selection.rect) |
2577 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2636 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2578 | selection.end.row, selection.end.col, |
2637 | selection.end.row, selection.end.col, |
2579 | RS_RVid, RS_RVid | RS_Uline); |
2638 | RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline); |
2580 | else |
2639 | else |
2581 | #endif |
2640 | #endif |
2582 | scr_xor_span (selection.beg.row, selection.beg.col, |
2641 | scr_xor_span (selection.beg.row, selection.beg.col, |
2583 | selection.end.row, selection.end.col, |
2642 | selection.end.row, selection.end.col, |
2584 | RS_RVid); |
2643 | RS_Sel | RS_RVid); |
2585 | } |
2644 | } |
2586 | } |
2645 | } |
2587 | |
2646 | |
2588 | /* ------------------------------------------------------------------------- */ |
2647 | /* ------------------------------------------------------------------------- */ |
2589 | /* |
2648 | /* |
… | |
… | |
2594 | void |
2653 | void |
2595 | rxvt_term::scr_dump (int fd) NOTHROW |
2654 | rxvt_term::scr_dump (int fd) NOTHROW |
2596 | { |
2655 | { |
2597 | int row, wrote; |
2656 | int row, wrote; |
2598 | unsigned int width, towrite; |
2657 | unsigned int width, towrite; |
2599 | char r1[] = "\n"; |
2658 | const char r1[] = "\n"; |
2600 | |
2659 | |
2601 | for (row = saveLines + top_row; |
2660 | for (row = saveLines + top_row; |
2602 | row < saveLines + nrow - 1; row++) |
2661 | row < saveLines + nrow - 1; row++) |
2603 | { |
2662 | { |
2604 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2663 | width = row_buf[row].l >= 0 ? row_buf[row].l |
… | |
… | |
2650 | /* ------------------------------------------------------------------------- */ |
2709 | /* ------------------------------------------------------------------------- */ |
2651 | /* |
2710 | /* |
2652 | * Paste a selection direct to the command fd |
2711 | * Paste a selection direct to the command fd |
2653 | */ |
2712 | */ |
2654 | void |
2713 | void |
2655 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2714 | rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW |
2656 | { |
2715 | { |
2657 | /* convert normal newline chars into common keyboard Return key sequence */ |
2716 | /* convert normal newline chars into common keyboard Return key sequence */ |
2658 | for (unsigned int i = 0; i < len; i++) |
2717 | for (unsigned int i = 0; i < len; i++) |
2659 | if (data[i] == C0_LF) |
2718 | if (data[i] == C0_LF) |
2660 | data[i] = C0_CR; |
2719 | data[i] = C0_CR; |
… | |
… | |
2666 | |
2725 | |
2667 | if (priv_modes & PrivMode_BracketPaste) |
2726 | if (priv_modes & PrivMode_BracketPaste) |
2668 | tt_printf ("\e[201~"); |
2727 | tt_printf ("\e[201~"); |
2669 | } |
2728 | } |
2670 | |
2729 | |
2671 | /* ------------------------------------------------------------------------- */ |
|
|
2672 | /* |
|
|
2673 | * Respond to a notification that a primary selection has been sent |
|
|
2674 | * EXT: SelectionNotify |
|
|
2675 | */ |
|
|
2676 | void |
2730 | void |
2677 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW |
2731 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2678 | { |
2732 | { |
2679 | if (prop == None) /* check for failed XConvertSelection */ |
2733 | if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END))) |
2680 | { |
|
|
2681 | if ((selection_type & Sel_CompoundText)) |
|
|
2682 | { |
|
|
2683 | int selnum = selection_type & Sel_whereMask; |
|
|
2684 | |
|
|
2685 | selection_type = 0; |
|
|
2686 | if (selnum != Sel_direct) |
|
|
2687 | selection_request_other (XA_STRING, selnum); |
|
|
2688 | } |
|
|
2689 | |
|
|
2690 | if ((selection_type & Sel_UTF8String)) |
|
|
2691 | { |
|
|
2692 | int selnum = selection_type & Sel_whereMask; |
|
|
2693 | |
|
|
2694 | selection_type = Sel_CompoundText; |
|
|
2695 | if (selnum != Sel_direct) |
|
|
2696 | selection_request_other (xa[XA_COMPOUND_TEXT], selnum); |
|
|
2697 | else |
|
|
2698 | selection_type = 0; |
|
|
2699 | } |
|
|
2700 | |
|
|
2701 | return; |
|
|
2702 | } |
|
|
2703 | |
|
|
2704 | unsigned long bytes_after; |
|
|
2705 | XTextProperty ct; |
|
|
2706 | |
|
|
2707 | if (XGetWindowProperty (dpy, win, prop, |
|
|
2708 | 0, PROP_SIZE / 4, |
|
|
2709 | delete_prop, AnyPropertyType, |
|
|
2710 | &ct.encoding, &ct.format, |
|
|
2711 | &ct.nitems, &bytes_after, |
|
|
2712 | &ct.value) != Success) |
|
|
2713 | { |
|
|
2714 | ct.value = 0; |
|
|
2715 | goto bailout; |
|
|
2716 | } |
|
|
2717 | |
|
|
2718 | if (ct.encoding == None) |
|
|
2719 | goto bailout; |
|
|
2720 | |
|
|
2721 | if (bytes_after) |
|
|
2722 | { |
|
|
2723 | // fetch and append remaining data |
|
|
2724 | XTextProperty ct2; |
|
|
2725 | |
|
|
2726 | if (XGetWindowProperty (dpy, win, prop, |
|
|
2727 | ct.nitems / 4, (bytes_after + 3) / 4, |
|
|
2728 | delete_prop, AnyPropertyType, |
|
|
2729 | &ct2.encoding, &ct2.format, |
|
|
2730 | &ct2.nitems, &bytes_after, |
|
|
2731 | &ct2.value) != Success) |
|
|
2732 | goto bailout; |
|
|
2733 | |
|
|
2734 | // realloc should be compatible to XFree, here, and elsewhere, too |
|
|
2735 | ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); |
|
|
2736 | memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); |
|
|
2737 | ct.nitems += ct2.nitems; |
|
|
2738 | |
|
|
2739 | XFree (ct2.value); |
|
|
2740 | } |
|
|
2741 | |
|
|
2742 | if (ct.value == 0) |
|
|
2743 | goto bailout; |
|
|
2744 | |
|
|
2745 | if (ct.encoding == xa[XA_INCR]) |
|
|
2746 | { |
|
|
2747 | // INCR selection, start handshake |
|
|
2748 | if (!delete_prop) |
|
|
2749 | XDeleteProperty (dpy, win, prop); |
|
|
2750 | |
|
|
2751 | selection_wait = Sel_incr; |
|
|
2752 | incr_buf_fill = 0; |
|
|
2753 | incr_ev.start (10); |
|
|
2754 | |
|
|
2755 | goto bailout; |
|
|
2756 | } |
|
|
2757 | |
|
|
2758 | if (ct.nitems == 0) |
|
|
2759 | { |
|
|
2760 | if (selection_wait == Sel_incr) |
|
|
2761 | { |
|
|
2762 | XFree (ct.value); |
|
|
2763 | |
|
|
2764 | // finally complete, now paste the whole thing |
|
|
2765 | selection_wait = Sel_normal; |
|
|
2766 | ct.value = (unsigned char *)incr_buf; |
|
|
2767 | ct.nitems = incr_buf_fill; |
|
|
2768 | incr_buf = 0; |
|
|
2769 | incr_buf_size = 0; |
|
|
2770 | incr_ev.stop (); |
|
|
2771 | } |
|
|
2772 | else |
|
|
2773 | { |
|
|
2774 | if (selection_wait == Sel_normal |
|
|
2775 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
|
|
2776 | { |
|
|
2777 | /* |
|
|
2778 | * pass through again trying CUT_BUFFER0 if we've come from |
|
|
2779 | * XConvertSelection () but nothing was presented |
|
|
2780 | */ |
|
|
2781 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
|
|
2782 | } |
|
|
2783 | |
|
|
2784 | goto bailout; |
|
|
2785 | } |
|
|
2786 | } |
|
|
2787 | else if (selection_wait == Sel_incr) |
|
|
2788 | { |
|
|
2789 | incr_ev.start (10); |
|
|
2790 | |
|
|
2791 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
|
|
2792 | { |
|
|
2793 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
|
|
2794 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
|
|
2795 | } |
|
|
2796 | |
|
|
2797 | memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); |
|
|
2798 | incr_buf_fill += ct.nitems; |
|
|
2799 | |
|
|
2800 | goto bailout; |
|
|
2801 | } |
|
|
2802 | |
|
|
2803 | char **cl; |
|
|
2804 | int cr; |
|
|
2805 | |
|
|
2806 | #if !ENABLE_MINIMAL |
|
|
2807 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
|
|
2808 | // so recode it manually |
|
|
2809 | if (ct.encoding == xa[XA_UTF8_STRING]) |
|
|
2810 | { |
|
|
2811 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
|
|
2812 | char *s = rxvt_wcstombs (w); |
|
|
2813 | free (w); |
|
|
2814 | // TODO: strlen == only the first element will be converted. well... |
|
|
2815 | paste (s, strlen (s)); |
|
|
2816 | free (s); |
|
|
2817 | } |
|
|
2818 | else |
|
|
2819 | #endif |
|
|
2820 | if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0 |
|
|
2821 | && cl) |
|
|
2822 | { |
|
|
2823 | for (int i = 0; i < cr; i++) |
|
|
2824 | paste (cl[i], strlen (cl[i])); |
|
|
2825 | |
|
|
2826 | XFreeStringList (cl); |
|
|
2827 | } |
|
|
2828 | else |
|
|
2829 | paste ((char *)ct.value, ct.nitems); // paste raw |
|
|
2830 | |
|
|
2831 | bailout: |
|
|
2832 | XFree (ct.value); |
|
|
2833 | |
|
|
2834 | if (selection_wait == Sel_normal) |
|
|
2835 | selection_wait = Sel_none; |
|
|
2836 | } |
|
|
2837 | |
|
|
2838 | void |
|
|
2839 | rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW |
|
|
2840 | { |
|
|
2841 | selection_wait = Sel_none; |
|
|
2842 | |
|
|
2843 | incr_buf_size = 0; |
|
|
2844 | free (incr_buf); |
|
|
2845 | |
|
|
2846 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
|
|
2847 | } |
|
|
2848 | |
|
|
2849 | void |
|
|
2850 | rxvt_term::selection_property (Window win, Atom prop) NOTHROW |
|
|
2851 | { |
|
|
2852 | if (prop == None || selection_wait != Sel_incr) |
|
|
2853 | return; |
2734 | return; |
2854 | |
2735 | |
2855 | selection_paste (win, prop, true); |
2736 | tt_paste (data, len); |
2856 | } |
2737 | } |
2857 | |
2738 | |
2858 | /* ------------------------------------------------------------------------- */ |
2739 | /* ------------------------------------------------------------------------- */ |
2859 | /* |
2740 | /* |
2860 | * Request the current selection: |
2741 | * Request PRIMARY, SECONDARY or CLIPBOARD selection. |
2861 | * Order: > internal selection if available |
2742 | * if the requested selection has no owner or is empty CUT_BUFFER0 is used |
2862 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2743 | * as fallback |
2863 | * > CUT_BUFFER0 |
|
|
2864 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
|
|
2865 | * will auto fallback to CUT_BUFFER0 |
|
|
2866 | * EXT: button 2 release |
2744 | * EXT: button 2 release |
2867 | */ |
2745 | */ |
2868 | void |
2746 | void |
2869 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2747 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2870 | { |
2748 | { |
2871 | if (selection.text && selnum == Sel_Primary) |
2749 | if (!selection_req) |
2872 | { |
|
|
2873 | /* internal selection */ |
|
|
2874 | char *str = rxvt_wcstombs (selection.text, selection.len); |
|
|
2875 | paste (str, strlen (str)); |
|
|
2876 | free (str); |
|
|
2877 | return; |
|
|
2878 | } |
2750 | { |
2879 | else |
2751 | selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this); |
|
|
2752 | selection_req->run (); |
2880 | { |
2753 | } |
2881 | selection_request_time = tm; |
|
|
2882 | selection_wait = Sel_normal; |
|
|
2883 | |
|
|
2884 | #if X_HAVE_UTF8_STRING |
|
|
2885 | selection_type = Sel_UTF8String; |
|
|
2886 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
|
|
2887 | return; |
|
|
2888 | #else |
|
|
2889 | selection_type = Sel_CompoundText; |
|
|
2890 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
|
|
2891 | return; |
|
|
2892 | #endif |
|
|
2893 | } |
|
|
2894 | |
|
|
2895 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
|
|
2896 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
|
|
2897 | } |
|
|
2898 | |
|
|
2899 | int |
|
|
2900 | rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW |
|
|
2901 | { |
|
|
2902 | Atom sel; |
|
|
2903 | |
|
|
2904 | selection_type |= selnum; |
|
|
2905 | |
|
|
2906 | if (selnum == Sel_Primary) |
|
|
2907 | sel = XA_PRIMARY; |
|
|
2908 | else if (selnum == Sel_Secondary) |
|
|
2909 | sel = XA_SECONDARY; |
|
|
2910 | else |
|
|
2911 | sel = xa[XA_CLIPBOARD]; |
|
|
2912 | |
|
|
2913 | if (XGetSelectionOwner (dpy, sel) != None) |
|
|
2914 | { |
|
|
2915 | XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION], |
|
|
2916 | vt, selection_request_time); |
|
|
2917 | return 1; |
|
|
2918 | } |
|
|
2919 | |
|
|
2920 | return 0; |
|
|
2921 | } |
2754 | } |
2922 | |
2755 | |
2923 | /* ------------------------------------------------------------------------- */ |
2756 | /* ------------------------------------------------------------------------- */ |
2924 | /* |
2757 | /* |
2925 | * Clear all selected text |
2758 | * Clear all selected text |
2926 | * EXT: SelectionClear |
2759 | * EXT: SelectionClear |
2927 | */ |
2760 | */ |
2928 | void |
2761 | void |
2929 | rxvt_term::selection_clear () NOTHROW |
2762 | rxvt_term::selection_clear (bool clipboard) NOTHROW |
2930 | { |
2763 | { |
|
|
2764 | if (!clipboard) |
|
|
2765 | { |
2931 | want_refresh = 1; |
2766 | want_refresh = 1; |
2932 | free (selection.text); |
2767 | free (selection.text); |
2933 | selection.text = NULL; |
2768 | selection.text = NULL; |
2934 | selection.len = 0; |
2769 | selection.len = 0; |
2935 | CLEAR_SELECTION (); |
2770 | CLEAR_SELECTION (); |
2936 | |
2771 | |
2937 | if (display->selection_owner == this) |
2772 | if (display->selection_owner == this) |
2938 | display->selection_owner = 0; |
2773 | display->selection_owner = 0; |
|
|
2774 | } |
|
|
2775 | else |
|
|
2776 | { |
|
|
2777 | free (selection.clip_text); |
|
|
2778 | selection.clip_text = NULL; |
|
|
2779 | selection.clip_len = 0; |
|
|
2780 | |
|
|
2781 | if (display->clipboard_owner == this) |
|
|
2782 | display->clipboard_owner = 0; |
|
|
2783 | } |
2939 | } |
2784 | } |
2940 | |
2785 | |
2941 | /* ------------------------------------------------------------------------- */ |
2786 | /* ------------------------------------------------------------------------- */ |
2942 | /* |
2787 | /* |
2943 | * Copy a selection into the cut buffer |
2788 | * Copy a selection into the cut buffer |
2944 | * EXT: button 1 or 3 release |
2789 | * EXT: button 1 or 3 release |
2945 | */ |
2790 | */ |
2946 | void |
2791 | void |
2947 | rxvt_term::selection_make (Time tm) |
2792 | rxvt_term::selection_make (Time tm) |
2948 | { |
2793 | { |
2949 | int i; |
2794 | int size; |
2950 | wchar_t *new_selection_text; |
2795 | wchar_t *new_selection_text; |
2951 | text_t *t; |
2796 | text_t *t; |
2952 | |
2797 | |
2953 | switch (selection.op) |
2798 | switch (selection.op) |
2954 | { |
2799 | { |
… | |
… | |
2970 | return; /* nothing selected, go away */ |
2815 | return; /* nothing selected, go away */ |
2971 | |
2816 | |
2972 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
2817 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
2973 | return; |
2818 | return; |
2974 | |
2819 | |
2975 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2820 | size = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2976 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2821 | new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t)); |
2977 | |
2822 | |
2978 | int ofs = 0; |
2823 | int ofs = 0; |
2979 | int extra = 0; |
2824 | int extra = 0; |
2980 | |
2825 | |
2981 | int col = selection.beg.col; |
2826 | int col = selection.beg.col; |
… | |
… | |
2987 | { |
2832 | { |
2988 | #if !ENABLE_MINIMAL |
2833 | #if !ENABLE_MINIMAL |
2989 | if (selection.rect) |
2834 | if (selection.rect) |
2990 | { |
2835 | { |
2991 | col = selection.beg.col; |
2836 | col = selection.beg.col; |
2992 | end_col = ncol + 1; |
2837 | end_col = selection.end.col; |
2993 | } |
2838 | } |
2994 | else |
2839 | else |
2995 | #endif |
2840 | #endif |
2996 | end_col = ROW(row).l; |
2841 | end_col = ROW(row).l; |
2997 | |
2842 | |
2998 | col = max (col, 0); |
2843 | col = max (col, 0); |
2999 | |
2844 | |
3000 | if (row == selection.end.row |
2845 | if (row == selection.end.row) |
3001 | #if !ENABLE_MINIMAL |
|
|
3002 | || selection.rect |
|
|
3003 | #endif |
|
|
3004 | ) |
|
|
3005 | min_it (end_col, selection.end.col); |
2846 | min_it (end_col, selection.end.col); |
3006 | |
2847 | |
3007 | t = ROW(row).t + col; |
2848 | t = ROW(row).t + col; |
3008 | |
2849 | |
3009 | for (; col < end_col; col++) |
2850 | for (; col < end_col; col++) |
… | |
… | |
3017 | |
2858 | |
3018 | extra -= (len - 1); |
2859 | extra -= (len - 1); |
3019 | |
2860 | |
3020 | if (extra < 0) |
2861 | if (extra < 0) |
3021 | { |
2862 | { |
3022 | extra += i; |
2863 | extra += size; |
3023 | i += i; |
2864 | size += size; |
3024 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); |
2865 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t)); |
3025 | } |
2866 | } |
3026 | |
2867 | |
3027 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
2868 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
3028 | } |
2869 | } |
3029 | #endif |
2870 | #endif |
… | |
… | |
3041 | |
2882 | |
3042 | new_selection_text[ofs++] = C0_LF; |
2883 | new_selection_text[ofs++] = C0_LF; |
3043 | } |
2884 | } |
3044 | else |
2885 | else |
3045 | #endif |
2886 | #endif |
3046 | if (!ROW(row).is_longer () && row != selection.end.row) |
2887 | if (!ROW(row).is_longer () |
|
|
2888 | && (row != selection.end.row || end_col != selection.end.col) |
|
|
2889 | && (row != selection.beg.row || selection.beg.col < ncol)) |
3047 | new_selection_text[ofs++] = C0_LF; |
2890 | new_selection_text[ofs++] = C0_LF; |
3048 | } |
2891 | } |
3049 | |
|
|
3050 | if (end_col != selection.end.col) |
|
|
3051 | new_selection_text[ofs++] = C0_LF; |
|
|
3052 | |
2892 | |
3053 | new_selection_text[ofs] = 0; |
2893 | new_selection_text[ofs] = 0; |
3054 | |
2894 | |
3055 | if (ofs == 0) |
2895 | if (ofs == 0) |
3056 | { |
2896 | { |
… | |
… | |
3069 | |
2909 | |
3070 | selection_grab (tm); |
2910 | selection_grab (tm); |
3071 | } |
2911 | } |
3072 | |
2912 | |
3073 | bool |
2913 | bool |
3074 | rxvt_term::selection_grab (Time tm) NOTHROW |
2914 | rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW |
3075 | { |
2915 | { |
|
|
2916 | Atom sel; |
|
|
2917 | |
|
|
2918 | if (!clipboard) |
|
|
2919 | { |
3076 | selection_time = tm; |
2920 | selection_time = tm; |
|
|
2921 | sel = XA_PRIMARY; |
|
|
2922 | } |
|
|
2923 | else |
|
|
2924 | { |
|
|
2925 | clipboard_time = tm; |
|
|
2926 | sel = xa[XA_CLIPBOARD]; |
|
|
2927 | } |
3077 | |
2928 | |
3078 | XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); |
2929 | XSetSelectionOwner (dpy, sel, vt, tm); |
3079 | if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) |
2930 | if (XGetSelectionOwner (dpy, sel) == vt) |
3080 | { |
2931 | { |
3081 | display->set_selection_owner (this); |
2932 | display->set_selection_owner (this, clipboard); |
3082 | return true; |
2933 | return true; |
3083 | } |
2934 | } |
3084 | else |
2935 | else |
3085 | { |
2936 | { |
3086 | selection_clear (); |
2937 | selection_clear (clipboard); |
3087 | return false; |
2938 | return false; |
3088 | } |
2939 | } |
3089 | |
2940 | |
3090 | #if 0 |
2941 | #if 0 |
3091 | XTextProperty ct; |
2942 | XTextProperty ct; |
… | |
… | |
3551 | * EXT: SelectionRequest |
3402 | * EXT: SelectionRequest |
3552 | */ |
3403 | */ |
3553 | void |
3404 | void |
3554 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3405 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3555 | { |
3406 | { |
|
|
3407 | Atom property = rq.property == None ? rq.target : rq.property; |
3556 | XSelectionEvent ev; |
3408 | XSelectionEvent ev; |
3557 | |
3409 | |
3558 | ev.type = SelectionNotify; |
3410 | ev.type = SelectionNotify; |
3559 | ev.property = None; |
3411 | ev.property = None; |
3560 | ev.display = rq.display; |
3412 | ev.display = rq.display; |
… | |
… | |
3575 | *target++ = xa[XA_COMPOUND_TEXT]; |
3427 | *target++ = xa[XA_COMPOUND_TEXT]; |
3576 | #if X_HAVE_UTF8_STRING |
3428 | #if X_HAVE_UTF8_STRING |
3577 | *target++ = xa[XA_UTF8_STRING]; |
3429 | *target++ = xa[XA_UTF8_STRING]; |
3578 | #endif |
3430 | #endif |
3579 | |
3431 | |
3580 | XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, |
3432 | XChangeProperty (dpy, rq.requestor, property, XA_ATOM, |
3581 | 32, PropModeReplace, |
3433 | 32, PropModeReplace, |
3582 | (unsigned char *)target_list, target - target_list); |
3434 | (unsigned char *)target_list, target - target_list); |
3583 | ev.property = rq.property; |
3435 | ev.property = property; |
3584 | } |
3436 | } |
3585 | #if TODO // TODO |
3437 | #if TODO // TODO |
3586 | else if (rq.target == xa[XA_MULTIPLE]) |
3438 | else if (rq.target == xa[XA_MULTIPLE]) |
3587 | { |
3439 | { |
3588 | /* TODO: Handle MULTIPLE */ |
3440 | /* TODO: Handle MULTIPLE */ |
3589 | } |
3441 | } |
3590 | #endif |
3442 | #endif |
3591 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3443 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) |
3592 | { |
3444 | { |
3593 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3445 | XChangeProperty (dpy, rq.requestor, property, rq.target, |
3594 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3446 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3595 | ev.property = rq.property; |
3447 | ev.property = property; |
|
|
3448 | } |
|
|
3449 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3450 | { |
|
|
3451 | XChangeProperty (dpy, rq.requestor, property, rq.target, |
|
|
3452 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
|
|
3453 | ev.property = property; |
3596 | } |
3454 | } |
3597 | else if (rq.target == XA_STRING |
3455 | else if (rq.target == XA_STRING |
3598 | || rq.target == xa[XA_TEXT] |
3456 | || rq.target == xa[XA_TEXT] |
3599 | || rq.target == xa[XA_COMPOUND_TEXT] |
3457 | || rq.target == xa[XA_COMPOUND_TEXT] |
3600 | || rq.target == xa[XA_UTF8_STRING] |
3458 | || rq.target == xa[XA_UTF8_STRING] |
… | |
… | |
3632 | { |
3490 | { |
3633 | target = xa[XA_COMPOUND_TEXT]; |
3491 | target = xa[XA_COMPOUND_TEXT]; |
3634 | style = enc_compound_text; |
3492 | style = enc_compound_text; |
3635 | } |
3493 | } |
3636 | |
3494 | |
3637 | if (selection.text) |
3495 | if (rq.selection == XA_PRIMARY && selection.text) |
3638 | { |
3496 | { |
3639 | cl = selection.text; |
3497 | cl = selection.text; |
3640 | selectlen = selection.len; |
3498 | selectlen = selection.len; |
|
|
3499 | } |
|
|
3500 | else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3501 | { |
|
|
3502 | cl = selection.clip_text; |
|
|
3503 | selectlen = selection.clip_len; |
3641 | } |
3504 | } |
3642 | else |
3505 | else |
3643 | { |
3506 | { |
3644 | cl = L""; |
3507 | cl = L""; |
3645 | selectlen = 0; |
3508 | selectlen = 0; |
… | |
… | |
3666 | ct.value = (unsigned char *)cl; |
3529 | ct.value = (unsigned char *)cl; |
3667 | ct.nitems = selectlen; |
3530 | ct.nitems = selectlen; |
3668 | ct.encoding = target; |
3531 | ct.encoding = target; |
3669 | } |
3532 | } |
3670 | |
3533 | |
3671 | XChangeProperty (dpy, rq.requestor, rq.property, |
3534 | XChangeProperty (dpy, rq.requestor, property, |
3672 | ct.encoding, 8, PropModeReplace, |
3535 | ct.encoding, 8, PropModeReplace, |
3673 | ct.value, (int)ct.nitems); |
3536 | ct.value, (int)ct.nitems); |
3674 | ev.property = rq.property; |
3537 | ev.property = property; |
3675 | |
3538 | |
3676 | if (freect) |
3539 | if (freect) |
3677 | XFree (ct.value); |
3540 | XFree (ct.value); |
3678 | } |
3541 | } |
3679 | |
3542 | |
… | |
… | |
3713 | h += 2; min_it (h, nrow); |
3576 | h += 2; min_it (h, nrow); |
3714 | |
3577 | |
3715 | x -= 1; clamp_it (x, 0, ncol - w); |
3578 | x -= 1; clamp_it (x, 0, ncol - w); |
3716 | y -= 1; clamp_it (y, 0, nrow - h); |
3579 | y -= 1; clamp_it (y, 0, nrow - h); |
3717 | |
3580 | |
3718 | ov_x = x; ov_y = y; |
3581 | ov.x = x; ov.y = y; |
3719 | ov_w = w; ov_h = h; |
3582 | ov.w = w; ov.h = h; |
3720 | |
3583 | |
3721 | ov_text = new text_t *[h]; |
3584 | ov.text = new text_t *[h]; |
3722 | ov_rend = new rend_t *[h]; |
3585 | ov.rend = new rend_t *[h]; |
3723 | |
3586 | |
3724 | for (y = 0; y < h; y++) |
3587 | for (y = 0; y < h; y++) |
3725 | { |
3588 | { |
3726 | text_t *tp = ov_text[y] = new text_t[w]; |
3589 | text_t *tp = ov.text[y] = new text_t[w]; |
3727 | rend_t *rp = ov_rend[y] = new rend_t[w]; |
3590 | rend_t *rp = ov.rend[y] = new rend_t[w]; |
3728 | |
3591 | |
3729 | text_t t0, t1, t2; |
3592 | text_t t0, t1, t2; |
3730 | rend_t r = OVERLAY_RSTYLE; |
3593 | rend_t r = OVERLAY_RSTYLE; |
3731 | |
3594 | |
3732 | if (y == 0) |
3595 | if (y == 0) |
… | |
… | |
3751 | } |
3614 | } |
3752 | |
3615 | |
3753 | void |
3616 | void |
3754 | rxvt_term::scr_overlay_off () NOTHROW |
3617 | rxvt_term::scr_overlay_off () NOTHROW |
3755 | { |
3618 | { |
3756 | if (!ov_text) |
3619 | if (!ov.text) |
3757 | return; |
3620 | return; |
3758 | |
3621 | |
3759 | want_refresh = 1; |
3622 | want_refresh = 1; |
3760 | |
3623 | |
3761 | for (int y = 0; y < ov_h; y++) |
3624 | for (int y = 0; y < ov.h; y++) |
3762 | { |
3625 | { |
3763 | delete [] ov_text[y]; |
3626 | delete [] ov.text[y]; |
3764 | delete [] ov_rend[y]; |
3627 | delete [] ov.rend[y]; |
3765 | } |
3628 | } |
3766 | |
3629 | |
3767 | delete [] ov_text; ov_text = 0; |
3630 | delete [] ov.text; ov.text = 0; |
3768 | delete [] ov_rend; ov_rend = 0; |
3631 | delete [] ov.rend; ov.rend = 0; |
3769 | } |
3632 | } |
3770 | |
3633 | |
3771 | void |
3634 | void |
3772 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3635 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3773 | { |
3636 | { |
3774 | if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) |
3637 | if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2) |
3775 | return; |
3638 | return; |
3776 | |
3639 | |
3777 | x++, y++; |
3640 | x++, y++; |
3778 | |
3641 | |
3779 | ov_text[y][x] = text; |
3642 | ov.text[y][x] = text; |
3780 | ov_rend[y][x] = rend; |
3643 | ov.rend[y][x] = rend; |
3781 | } |
3644 | } |
3782 | |
3645 | |
3783 | void |
3646 | void |
3784 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3647 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3785 | { |
3648 | { |
… | |
… | |
3804 | } |
3667 | } |
3805 | |
3668 | |
3806 | void |
3669 | void |
3807 | rxvt_term::scr_swap_overlay () NOTHROW |
3670 | rxvt_term::scr_swap_overlay () NOTHROW |
3808 | { |
3671 | { |
3809 | if (!ov_text) |
3672 | if (!ov.text) |
3810 | return; |
3673 | return; |
3811 | |
3674 | |
|
|
3675 | // hide cursor if it is within the overlay area |
|
|
3676 | if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w) |
|
|
3677 | && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h)) |
|
|
3678 | screen.flags &= ~Screen_VisibleCursor; |
|
|
3679 | |
3812 | // swap screen mem with overlay |
3680 | // swap screen mem with overlay |
3813 | for (int y = ov_h; y--; ) |
3681 | for (int y = ov.h; y--; ) |
3814 | { |
3682 | { |
3815 | text_t *t1 = ov_text[y]; |
3683 | text_t *t1 = ov.text[y]; |
3816 | rend_t *r1 = ov_rend[y]; |
3684 | rend_t *r1 = ov.rend[y]; |
3817 | |
3685 | |
3818 | text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; |
3686 | text_t *t2 = ROW(y + ov.y + view_start).t + ov.x; |
3819 | rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; |
3687 | rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x; |
3820 | |
3688 | |
3821 | for (int x = ov_w; x--; ) |
3689 | for (int x = ov.w; x--; ) |
3822 | { |
3690 | { |
3823 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3691 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3824 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3692 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3825 | } |
3693 | } |
3826 | } |
3694 | } |