… | |
… | |
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 | |
… | |
… | |
83 | ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) |
84 | 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) \ |
85 | #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) |
86 | ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) |
86 | |
87 | |
87 | /* |
88 | /* |
88 | * CLEAR_ROWS : clear <num> rows starting from row <row> |
|
|
89 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
89 | * 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 | */ |
90 | */ |
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) \ |
91 | #define CLEAR_CHARS(x, y, num) \ |
99 | if (mapped) \ |
92 | if (mapped) \ |
100 | XClearArea (dpy, vt, x, y, \ |
93 | XClearArea (dpy, vt, x, y, \ |
101 | (unsigned int)Width2Pixel (num), \ |
94 | (unsigned int)Width2Pixel (num), \ |
102 | (unsigned int)Height2Pixel (1), False) |
95 | (unsigned int)Height2Pixel (1), False) |
103 | |
96 | |
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 | /* ------------------------------------------------------------------------- * |
97 | /* ------------------------------------------------------------------------- * |
111 | * SCREEN `COMMON' ROUTINES * |
98 | * SCREEN `COMMON' ROUTINES * |
112 | * ------------------------------------------------------------------------- */ |
99 | * ------------------------------------------------------------------------- */ |
113 | |
100 | |
114 | /* Fill part/all of a line with blanks. */ |
101 | /* Fill part/all of a line with blanks. */ |
… | |
… | |
146 | |
133 | |
147 | l.l = 0; |
134 | l.l = 0; |
148 | l.f = 0; |
135 | l.f = 0; |
149 | } |
136 | } |
150 | |
137 | |
|
|
138 | // nuke a single wide character at the given column |
|
|
139 | void |
|
|
140 | rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW |
|
|
141 | { |
|
|
142 | // find begin |
|
|
143 | while (col > 0 && l.t[col] == NOCHAR) |
|
|
144 | col--; |
|
|
145 | |
|
|
146 | rend_t rend = l.r[col] & ~RS_baseattrMask; |
|
|
147 | rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); |
|
|
148 | |
|
|
149 | l.touch (); |
|
|
150 | |
|
|
151 | // found start, nuke |
|
|
152 | do { |
|
|
153 | l.t[col] = ' '; |
|
|
154 | l.r[col] = rend; |
|
|
155 | col++; |
|
|
156 | } while (col < ncol && l.t[col] == NOCHAR); |
|
|
157 | } |
|
|
158 | |
151 | /* ------------------------------------------------------------------------- * |
159 | /* ------------------------------------------------------------------------- * |
152 | * SCREEN INITIALISATION * |
160 | * SCREEN INITIALISATION * |
153 | * ------------------------------------------------------------------------- */ |
161 | * ------------------------------------------------------------------------- */ |
154 | |
162 | |
155 | void |
163 | void |
156 | rxvt_term::scr_reset () |
164 | rxvt_term::scr_reset () |
157 | { |
165 | { |
158 | #if ENABLE_OVERLAY |
|
|
159 | scr_overlay_off (); |
|
|
160 | #endif |
|
|
161 | |
|
|
162 | rvideo_mode = false; |
|
|
163 | view_start = 0; |
166 | view_start = 0; |
164 | num_scr = 0; |
167 | num_scr = 0; |
165 | |
168 | |
166 | if (ncol == 0) |
169 | if (ncol == 0) |
167 | ncol = 80; |
170 | ncol = 80; |
… | |
… | |
169 | if (nrow == 0) |
172 | if (nrow == 0) |
170 | nrow = 24; |
173 | nrow = 24; |
171 | |
174 | |
172 | if (ncol == prev_ncol && nrow == prev_nrow) |
175 | if (ncol == prev_ncol && nrow == prev_nrow) |
173 | return; |
176 | return; |
174 | |
|
|
175 | if (current_screen != PRIMARY) |
|
|
176 | scr_swap_screen (); |
|
|
177 | |
177 | |
178 | // we need at least two lines for wrapping to work correctly |
178 | // we need at least two lines for wrapping to work correctly |
179 | while (nrow + saveLines < 2) |
179 | while (nrow + saveLines < 2) |
180 | { |
180 | { |
181 | //TODO//FIXME |
181 | //TODO//FIXME |
… | |
… | |
234 | selection.text = NULL; |
234 | selection.text = NULL; |
235 | selection.len = 0; |
235 | selection.len = 0; |
236 | selection.op = SELECTION_CLEAR; |
236 | selection.op = SELECTION_CLEAR; |
237 | selection.screen = PRIMARY; |
237 | selection.screen = PRIMARY; |
238 | selection.clicks = 0; |
238 | selection.clicks = 0; |
|
|
239 | selection.clip_text = NULL; |
|
|
240 | selection.clip_len = 0; |
239 | } |
241 | } |
240 | else |
242 | else |
241 | { |
243 | { |
242 | /* |
244 | /* |
243 | * add or delete rows as appropriate |
245 | * add or delete rows as appropriate |
… | |
… | |
281 | |
283 | |
282 | if (top_row) |
284 | if (top_row) |
283 | { |
285 | { |
284 | // Re-wrap lines. This is rather ugly, possibly because I am too dumb |
286 | // Re-wrap lines. This is rather ugly, possibly because I am too dumb |
285 | // to come up with a lean and mean algorithm. |
287 | // to come up with a lean and mean algorithm. |
|
|
288 | // TODO: maybe optimise when width didn't change |
286 | |
289 | |
287 | row_col_t ocur = screen.cur; |
290 | row_col_t ocur = screen.cur; |
288 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
291 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
289 | |
292 | |
290 | do |
293 | do |
291 | { |
294 | { |
292 | p = MOD (p - 1, prev_total_rows); |
295 | p = MOD (p - 1, prev_total_rows); |
293 | #ifdef DEBUG_STRICT |
|
|
294 | assert (old_buf [MOD (p, prev_total_rows)].t); |
296 | assert (old_buf [MOD (p, prev_total_rows)].t); |
295 | #endif |
|
|
296 | int plines = 1; |
297 | int plines = 1; |
297 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
298 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
298 | |
299 | |
299 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
300 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
300 | { |
301 | { |
… | |
… | |
394 | delete old_ta; |
395 | delete old_ta; |
395 | delete old_ra; |
396 | delete old_ra; |
396 | |
397 | |
397 | clamp_it (screen.cur.row, 0, nrow - 1); |
398 | clamp_it (screen.cur.row, 0, nrow - 1); |
398 | clamp_it (screen.cur.col, 0, ncol - 1); |
399 | clamp_it (screen.cur.col, 0, ncol - 1); |
|
|
400 | } |
399 | |
401 | |
400 | free (tabs); |
402 | free (tabs); |
401 | } |
403 | tabs = (char *)rxvt_malloc (ncol); |
|
|
404 | |
|
|
405 | for (int col = ncol; --col; ) |
|
|
406 | tabs [col] = col % TABSIZE == 0; |
402 | |
407 | |
403 | CLEAR_ALL_SELECTION (); |
408 | CLEAR_ALL_SELECTION (); |
404 | |
409 | |
405 | prev_nrow = nrow; |
410 | prev_nrow = nrow; |
406 | prev_ncol = ncol; |
411 | 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 | |
412 | |
416 | tt_winch (); |
413 | tt_winch (); |
417 | |
414 | |
418 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
415 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
419 | } |
416 | } |
… | |
… | |
431 | delete ralloc; ralloc = 0; |
428 | delete ralloc; ralloc = 0; |
432 | |
429 | |
433 | free (row_buf); |
430 | free (row_buf); |
434 | free (swap_buf); |
431 | free (swap_buf); |
435 | free (drawn_buf); |
432 | free (drawn_buf); |
|
|
433 | row_buf = 0; // signal that we freed all the arrays above |
|
|
434 | |
436 | free (tabs); |
435 | free (tabs); |
437 | |
436 | tabs = 0; |
438 | row_buf = 0; // signal that we freed all the arrays |
|
|
439 | } |
437 | } |
440 | } |
438 | } |
441 | |
439 | |
442 | /* ------------------------------------------------------------------------- */ |
440 | /* ------------------------------------------------------------------------- */ |
443 | /* |
441 | /* |
444 | * Hard reset |
442 | * Hard/Soft reset |
445 | */ |
443 | */ |
446 | void |
444 | void |
447 | rxvt_term::scr_poweron () |
445 | rxvt_term::scr_poweron () |
448 | { |
446 | { |
449 | scr_release (); |
447 | scr_release (); |
450 | prev_nrow = prev_ncol = 0; |
448 | prev_nrow = prev_ncol = 0; |
|
|
449 | rvideo_mode = false; |
|
|
450 | scr_soft_reset (); |
451 | scr_reset (); |
451 | scr_reset (); |
452 | |
452 | |
453 | scr_clear (true); |
453 | scr_clear (true); |
454 | scr_refresh (); |
454 | scr_refresh (); |
|
|
455 | } |
|
|
456 | |
|
|
457 | void |
|
|
458 | rxvt_term::scr_soft_reset () |
|
|
459 | { |
|
|
460 | /* only affects modes, nothing drastic such as clearing the screen */ |
|
|
461 | #if ENABLE_OVERLAY |
|
|
462 | scr_overlay_off (); |
|
|
463 | #endif |
|
|
464 | |
|
|
465 | if (current_screen != PRIMARY) |
|
|
466 | scr_swap_screen (); |
|
|
467 | |
|
|
468 | scr_scroll_region (0, MAX_ROWS - 1); |
|
|
469 | scr_rendition (0, ~RS_None); |
|
|
470 | scr_insert_mode (0); |
455 | } |
471 | } |
456 | |
472 | |
457 | /* ------------------------------------------------------------------------- * |
473 | /* ------------------------------------------------------------------------- * |
458 | * PROCESS SCREEN COMMANDS * |
474 | * PROCESS SCREEN COMMANDS * |
459 | * ------------------------------------------------------------------------- */ |
475 | * ------------------------------------------------------------------------- */ |
… | |
… | |
497 | } |
513 | } |
498 | |
514 | |
499 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
515 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
500 | min_it (s->cur.row, nrow - 1); |
516 | min_it (s->cur.row, nrow - 1); |
501 | min_it (s->cur.col, ncol - 1); |
517 | min_it (s->cur.col, ncol - 1); |
502 | #ifdef DEBUG_STRICT |
|
|
503 | assert (s->cur.row >= 0); |
518 | assert (s->cur.row >= 0); |
504 | assert (s->cur.col >= 0); |
519 | assert (s->cur.col >= 0); |
505 | #endif |
|
|
506 | } |
520 | } |
507 | |
521 | |
508 | void |
522 | void |
509 | rxvt_term::scr_swap_screen () |
523 | rxvt_term::scr_swap_screen () |
510 | { |
524 | { |
… | |
… | |
535 | want_refresh = 1; |
549 | want_refresh = 1; |
536 | view_start = 0; |
550 | view_start = 0; |
537 | |
551 | |
538 | selection_check (2); /* check for boundary cross */ |
552 | selection_check (2); /* check for boundary cross */ |
539 | |
553 | |
540 | int i = current_screen; current_screen = scrn; scrn = i; |
554 | current_screen = scrn; |
541 | |
555 | |
542 | #if NSCREENS |
556 | #if NSCREENS |
543 | if (option (Opt_secondaryScreen)) |
557 | if (option (Opt_secondaryScreen)) |
544 | { |
558 | { |
545 | num_scr = 0; |
559 | num_scr = 0; |
… | |
… | |
770 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
784 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
771 | screen.cur.row -= minlines; |
785 | screen.cur.row -= minlines; |
772 | } |
786 | } |
773 | } |
787 | } |
774 | |
788 | |
775 | #ifdef DEBUG_STRICT |
|
|
776 | assert (screen.cur.col < ncol); |
789 | assert (screen.cur.col < ncol); |
777 | assert (screen.cur.row < nrow |
790 | assert (screen.cur.row < nrow |
778 | && screen.cur.row >= top_row); |
791 | && screen.cur.row >= top_row); |
779 | #endif |
|
|
780 | int row = screen.cur.row; |
792 | int row = screen.cur.row; |
781 | |
793 | |
782 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
794 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
783 | |
795 | |
784 | line_t *line = &ROW(row); |
796 | line_t *line = &ROW(row); |
785 | |
797 | |
786 | while (str < strend) |
798 | while (str < strend) |
787 | { |
799 | { |
788 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
800 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
789 | |
801 | |
790 | if (c < 0x20) |
802 | if (expect_false (c < 0x20)) |
791 | if (c == C0_LF) |
803 | if (c == C0_LF) |
792 | { |
804 | { |
793 | max_it (line->l, screen.cur.col); |
805 | max_it (line->l, screen.cur.col); |
794 | |
806 | |
795 | screen.flags &= ~Screen_WrapNext; |
807 | screen.flags &= ~Screen_WrapNext; |
… | |
… | |
814 | { |
826 | { |
815 | scr_tab (1, true); |
827 | scr_tab (1, true); |
816 | continue; |
828 | continue; |
817 | } |
829 | } |
818 | |
830 | |
|
|
831 | if (expect_false ( |
819 | if (checksel /* see if we're writing within selection */ |
832 | checksel /* see if we're writing within selection */ |
820 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
833 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
821 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
834 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
|
|
835 | )) |
822 | { |
836 | { |
823 | checksel = 0; |
837 | checksel = 0; |
824 | /* |
838 | /* |
825 | * If we wrote anywhere in the selected area, kill the selection |
839 | * If we wrote anywhere in the selected area, kill the selection |
826 | * XXX: should we kill the mark too? Possibly, but maybe that |
840 | * XXX: should we kill the mark too? Possibly, but maybe that |
827 | * should be a similar check. |
841 | * should be a similar check. |
828 | */ |
842 | */ |
829 | CLEAR_SELECTION (); |
843 | CLEAR_SELECTION (); |
830 | } |
844 | } |
831 | |
845 | |
832 | if (screen.flags & Screen_WrapNext) |
846 | if (expect_false (screen.flags & Screen_WrapNext)) |
833 | { |
847 | { |
834 | scr_do_wrap (); |
848 | scr_do_wrap (); |
835 | |
849 | |
836 | line->l = ncol; |
850 | line->l = ncol; |
837 | line->is_longer (1); |
851 | line->is_longer (1); |
… | |
… | |
839 | row = screen.cur.row; |
853 | row = screen.cur.row; |
840 | line = &ROW(row); /* _must_ refresh */ |
854 | line = &ROW(row); /* _must_ refresh */ |
841 | } |
855 | } |
842 | |
856 | |
843 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
857 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
844 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
858 | if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
845 | c = 0xfffd; |
859 | c = 0xfffd; |
846 | |
860 | |
847 | // rely on wcwidth to tell us the character width, do wcwidth before |
861 | // rely on wcwidth to tell us the character width, do wcwidth before |
848 | // further replacements, as wcwidth might return -1 for the line |
862 | // further replacements, as wcwidth might return -1 for the line |
849 | // drawing characters below as they might be invalid in the current |
863 | // drawing characters below as they might be invalid in the current |
850 | // locale. |
864 | // locale. |
851 | int width = WCWIDTH (c); |
865 | int width = WCWIDTH (c); |
852 | |
866 | |
853 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
867 | if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL |
854 | { |
868 | { |
855 | // vt100 special graphics and line drawing |
869 | // vt100 special graphics and line drawing |
856 | // 5f-7e standard vt100 |
870 | // 5f-7e standard vt100 |
857 | // 40-5e rxvt extension for extra curses acs chars |
871 | // 40-5e rxvt extension for extra curses acs chars |
858 | static uint16_t vt100_0[62] = { // 41 .. 7e |
872 | static uint16_t vt100_0[62] = { // 41 .. 7e |
… | |
… | |
871 | c = vt100_0[c - 0x41]; |
885 | c = vt100_0[c - 0x41]; |
872 | width = 1; // vt100 line drawing characters are always single-width |
886 | width = 1; // vt100 line drawing characters are always single-width |
873 | } |
887 | } |
874 | } |
888 | } |
875 | |
889 | |
876 | if (screen.flags & Screen_Insert) |
890 | if (expect_false (screen.flags & Screen_Insert)) |
877 | scr_insdel_chars (width, INSERT); |
891 | scr_insdel_chars (width, INSERT); |
878 | |
892 | |
879 | if (width != 0) |
893 | if (width != 0) |
880 | { |
894 | { |
881 | #if !UNICODE_3 |
895 | #if !UNICODE_3 |
… | |
… | |
886 | # else |
900 | # else |
887 | c = 0xfffd; |
901 | c = 0xfffd; |
888 | # endif |
902 | # endif |
889 | #endif |
903 | #endif |
890 | |
904 | |
|
|
905 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
906 | |
|
|
907 | // if the character doesn't fit into the remaining columns... |
|
|
908 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
|
|
909 | { |
|
|
910 | if (screen.flags & Screen_Autowrap) |
|
|
911 | { |
|
|
912 | // ... artificially enlargen the previous one |
|
|
913 | c = NOCHAR; |
|
|
914 | // and try the same character next loop iteration |
|
|
915 | --str; |
|
|
916 | } |
|
|
917 | else |
|
|
918 | screen.cur.col = ncol - width; |
|
|
919 | } |
|
|
920 | |
891 | // nuke the character at this position, if required |
921 | // nuke the character at this position, if required |
|
|
922 | if (expect_false ( |
892 | if (line->t[screen.cur.col] == NOCHAR |
923 | line->t[screen.cur.col] == NOCHAR |
893 | || (screen.cur.col < ncol - 1 |
924 | || (screen.cur.col < ncol - 1 |
894 | && line->t[screen.cur.col + 1] == NOCHAR)) |
925 | && line->t[screen.cur.col + 1] == NOCHAR) |
895 | { |
926 | )) |
896 | int col = screen.cur.col; |
927 | scr_kill_char (*line, 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 | |
928 | |
923 | line->touch (); |
929 | line->touch (); |
924 | |
930 | |
925 | do |
931 | do |
926 | { |
932 | { |
927 | line->t[screen.cur.col] = c; |
933 | line->t[screen.cur.col] = c; |
928 | line->r[screen.cur.col] = rend; |
934 | line->r[screen.cur.col] = rend; |
929 | |
935 | |
930 | if (screen.cur.col < ncol - 1) |
936 | if (expect_true (screen.cur.col < ncol - 1)) |
931 | screen.cur.col++; |
937 | screen.cur.col++; |
932 | else |
938 | else |
933 | { |
939 | { |
934 | line->l = ncol; |
940 | line->l = ncol; |
935 | if (screen.flags & Screen_Autowrap) |
941 | if (screen.flags & Screen_Autowrap) |
936 | screen.flags |= Screen_WrapNext; |
942 | screen.flags |= Screen_WrapNext; |
937 | break; |
943 | |
|
|
944 | goto end_of_line; |
938 | } |
945 | } |
939 | |
946 | |
940 | c = NOCHAR; |
947 | c = NOCHAR; |
941 | } |
948 | } |
942 | while (--width > 0); |
949 | while (expect_false (--width > 0)); |
943 | |
950 | |
944 | // pad with spaces when overwriting wide character with smaller one |
951 | // pad with spaces when overwriting wide character with smaller one |
945 | if (!width) |
952 | for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++) |
946 | { |
953 | { |
947 | line->touch (); |
954 | line->t[c] = ' '; |
|
|
955 | line->r[c] = rend; |
|
|
956 | } |
948 | |
957 | |
949 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
958 | end_of_line: |
|
|
959 | ; |
|
|
960 | } |
|
|
961 | #if ENABLE_COMBINING |
|
|
962 | else // width == 0 |
|
|
963 | { |
|
|
964 | if (c != 0xfeff) // ignore BOM |
|
|
965 | { |
|
|
966 | // handle combining characters |
|
|
967 | // we just tag the accent on the previous on-screen character. |
|
|
968 | // this is arguably not correct, but also arguably not wrong. |
|
|
969 | // we don't handle double-width characters nicely yet. |
|
|
970 | line_t *linep; |
|
|
971 | text_t *tp; |
|
|
972 | rend_t *rp; |
|
|
973 | |
|
|
974 | if (screen.cur.col > 0) |
950 | { |
975 | { |
951 | line->t[c] = ' '; |
|
|
952 | line->r[c] = rend; |
976 | linep = line; |
|
|
977 | tp = line->t + screen.cur.col - 1; |
|
|
978 | rp = line->r + screen.cur.col - 1; |
953 | } |
979 | } |
|
|
980 | else if (screen.cur.row > 0 |
|
|
981 | && ROW(screen.cur.row - 1).is_longer ()) |
|
|
982 | { |
|
|
983 | linep = &ROW(screen.cur.row - 1); |
|
|
984 | tp = line->t + ncol - 1; |
|
|
985 | rp = line->r + ncol - 1; |
|
|
986 | } |
|
|
987 | else |
|
|
988 | continue; |
|
|
989 | |
|
|
990 | linep->touch (); |
|
|
991 | |
|
|
992 | while (*tp == NOCHAR && tp > linep->t) |
|
|
993 | tp--, rp--; |
|
|
994 | |
|
|
995 | // first try to find a precomposed character |
|
|
996 | unicode_t n = rxvt_compose (*tp, c); |
|
|
997 | if (n == NOCHAR) |
|
|
998 | n = rxvt_composite.compose (*tp, c); |
|
|
999 | |
|
|
1000 | *tp = n; |
|
|
1001 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
954 | } |
1002 | } |
955 | } |
1003 | } |
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 |
1004 | #endif |
996 | } |
|
|
997 | } |
1005 | } |
998 | |
1006 | |
999 | max_it (line->l, screen.cur.col); |
1007 | max_it (line->l, screen.cur.col); |
1000 | |
1008 | |
1001 | #ifdef DEBUG_STRICT |
|
|
1002 | assert (screen.cur.row >= 0); |
1009 | assert (screen.cur.row >= 0); |
1003 | #endif |
|
|
1004 | } |
1010 | } |
1005 | |
1011 | |
1006 | /* ------------------------------------------------------------------------- */ |
1012 | /* ------------------------------------------------------------------------- */ |
1007 | /* |
1013 | /* |
1008 | * Process Backspace. Move back the cursor back a position, wrap if have to |
1014 | * Process Backspace. Move back the cursor back a position, wrap if have to |
… | |
… | |
1021 | |
1027 | |
1022 | want_refresh = 1; |
1028 | want_refresh = 1; |
1023 | #endif |
1029 | #endif |
1024 | } |
1030 | } |
1025 | } |
1031 | } |
|
|
1032 | else if (screen.flags & Screen_WrapNext) |
|
|
1033 | screen.flags &= ~Screen_WrapNext; |
1026 | else |
1034 | else |
1027 | scr_gotorc (0, -1, RELATIVE); |
1035 | scr_gotorc (0, -1, RELATIVE); |
1028 | } |
1036 | } |
1029 | |
1037 | |
1030 | /* ------------------------------------------------------------------------- */ |
1038 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1225 | /* |
1233 | /* |
1226 | * Erase part or whole of a line |
1234 | * Erase part or whole of a line |
1227 | * XTERM_SEQ: Clear line to right: ESC [ 0 K |
1235 | * XTERM_SEQ: Clear line to right: ESC [ 0 K |
1228 | * XTERM_SEQ: Clear line to left : ESC [ 1 K |
1236 | * XTERM_SEQ: Clear line to left : ESC [ 1 K |
1229 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
1237 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
|
|
1238 | * extension: clear to right unless wrapped: ESC [ 3 K |
1230 | */ |
1239 | */ |
1231 | void |
1240 | void |
1232 | rxvt_term::scr_erase_line (int mode) NOTHROW |
1241 | rxvt_term::scr_erase_line (int mode) NOTHROW |
1233 | { |
1242 | { |
1234 | unsigned int col, num; |
1243 | unsigned int col, num; |
… | |
… | |
1243 | line.touch (); |
1252 | line.touch (); |
1244 | line.is_longer (0); |
1253 | line.is_longer (0); |
1245 | |
1254 | |
1246 | switch (mode) |
1255 | switch (mode) |
1247 | { |
1256 | { |
|
|
1257 | case 3: |
|
|
1258 | if (screen.flags & Screen_WrapNext) |
|
|
1259 | return; |
|
|
1260 | |
|
|
1261 | /* fall through */ |
|
|
1262 | |
1248 | case 0: /* erase to end of line */ |
1263 | case 0: /* erase to end of line */ |
1249 | col = screen.cur.col; |
1264 | col = screen.cur.col; |
1250 | num = ncol - col; |
1265 | num = ncol - col; |
1251 | min_it (line.l, col); |
1266 | min_it (line.l, col); |
|
|
1267 | |
1252 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1268 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1253 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1269 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1254 | CLEAR_SELECTION (); |
1270 | CLEAR_SELECTION (); |
1255 | break; |
1271 | break; |
|
|
1272 | |
1256 | case 1: /* erase to beginning of line */ |
1273 | case 1: /* erase to beginning of line */ |
1257 | col = 0; |
1274 | col = 0; |
1258 | num = screen.cur.col + 1; |
1275 | num = screen.cur.col + 1; |
|
|
1276 | |
1259 | if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) |
1277 | if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) |
1260 | || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) |
1278 | || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) |
1261 | CLEAR_SELECTION (); |
1279 | CLEAR_SELECTION (); |
1262 | break; |
1280 | break; |
|
|
1281 | |
1263 | case 2: /* erase whole line */ |
1282 | case 2: /* erase whole line */ |
1264 | col = 0; |
1283 | col = 0; |
1265 | num = ncol; |
1284 | num = ncol; |
1266 | line.l = 0; |
1285 | line.l = 0; |
1267 | if (selection.beg.row <= screen.cur.row |
1286 | if (selection.beg.row <= screen.cur.row |
… | |
… | |
1325 | if (row >= nrow) /* Out Of Bounds */ |
1344 | if (row >= nrow) /* Out Of Bounds */ |
1326 | return; |
1345 | return; |
1327 | |
1346 | |
1328 | min_it (num, nrow - row); |
1347 | min_it (num, nrow - row); |
1329 | |
1348 | |
1330 | if (rstyle & (RS_RVid | RS_Uline)) |
1349 | if (rstyle & (RS_Blink | RS_RVid | RS_Uline)) |
1331 | ren = (rend_t) ~RS_None; |
1350 | ren = (rend_t) ~RS_None; |
1332 | else if (GET_BASEBG (rstyle) == Color_bg) |
1351 | else if (GET_BASEBG (rstyle) == Color_bg) |
1333 | { |
1352 | { |
1334 | ren = DEFAULT_RSTYLE; |
1353 | ren = DEFAULT_RSTYLE; |
1335 | CLEAR_ROWS (row, num); |
1354 | |
|
|
1355 | if (mapped) |
|
|
1356 | XClearArea (dpy, vt, 0, |
|
|
1357 | Row2Pixel (row - view_start), (unsigned int)width, |
|
|
1358 | (unsigned int)Height2Pixel (num), False); |
1336 | } |
1359 | } |
1337 | else |
1360 | else |
1338 | { |
1361 | { |
1339 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1362 | ren = rstyle & (RS_fgMask | RS_bgMask); |
|
|
1363 | |
|
|
1364 | if (mapped) |
|
|
1365 | { |
1340 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1366 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1341 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1367 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1342 | ERASE_ROWS (row, num); |
1368 | XFillRectangle (dpy, vt, gc, |
|
|
1369 | 0, Row2Pixel (row - view_start), |
|
|
1370 | (unsigned int)width, |
|
|
1371 | (unsigned int)Height2Pixel (num)); |
1343 | gcvalue.foreground = pix_colors[Color_fg]; |
1372 | gcvalue.foreground = pix_colors[Color_fg]; |
1344 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1373 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
|
|
1374 | } |
1345 | } |
1375 | } |
1346 | |
1376 | |
1347 | for (; num--; row++) |
1377 | for (; num--; row++) |
1348 | { |
1378 | { |
1349 | scr_blank_screen_mem (ROW(row), rstyle); |
1379 | scr_blank_screen_mem (ROW(row), rstyle); |
|
|
1380 | |
|
|
1381 | if (row - view_start < nrow) |
1350 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1382 | scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren); |
1351 | } |
1383 | } |
1352 | } |
1384 | } |
1353 | |
1385 | |
1354 | #if !ENABLE_MINIMAL |
1386 | #if !ENABLE_MINIMAL |
1355 | void |
1387 | void |
… | |
… | |
1429 | * Insert/Delete <count> characters from the current position |
1461 | * Insert/Delete <count> characters from the current position |
1430 | */ |
1462 | */ |
1431 | void |
1463 | void |
1432 | rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW |
1464 | rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW |
1433 | { |
1465 | { |
1434 | int col, row; |
|
|
1435 | rend_t tr; |
|
|
1436 | |
|
|
1437 | want_refresh = 1; |
1466 | want_refresh = 1; |
1438 | ZERO_SCROLLBACK (); |
1467 | ZERO_SCROLLBACK (); |
1439 | |
1468 | |
1440 | if (count <= 0) |
1469 | if (count <= 0) |
1441 | return; |
1470 | return; |
… | |
… | |
1443 | scr_do_wrap (); |
1472 | scr_do_wrap (); |
1444 | |
1473 | |
1445 | selection_check (1); |
1474 | selection_check (1); |
1446 | min_it (count, ncol - screen.cur.col); |
1475 | min_it (count, ncol - screen.cur.col); |
1447 | |
1476 | |
1448 | row = screen.cur.row; |
1477 | int row = screen.cur.row; |
1449 | |
1478 | |
1450 | line_t *line = &ROW(row); |
1479 | line_t *line = &ROW(row); |
1451 | |
1480 | |
1452 | line->touch (); |
1481 | line->touch (); |
1453 | line->is_longer (0); |
1482 | line->is_longer (0); |
1454 | |
1483 | |
|
|
1484 | // nuke wide spanning the start |
|
|
1485 | if (line->t[screen.cur.col] == NOCHAR) |
|
|
1486 | scr_kill_char (*line, screen.cur.col); |
|
|
1487 | |
1455 | switch (insdel) |
1488 | switch (insdel) |
1456 | { |
1489 | { |
1457 | case INSERT: |
1490 | case INSERT: |
1458 | for (col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1491 | line->l = min (line->l + count, ncol); |
|
|
1492 | |
|
|
1493 | if (line->t[screen.cur.col] == NOCHAR) |
|
|
1494 | scr_kill_char (*line, screen.cur.col); |
|
|
1495 | |
|
|
1496 | for (int col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1459 | { |
1497 | { |
1460 | line->t[col] = line->t[col - count]; |
1498 | line->t[col] = line->t[col - count]; |
1461 | line->r[col] = line->r[col - count]; |
1499 | line->r[col] = line->r[col - count]; |
1462 | } |
1500 | } |
1463 | |
|
|
1464 | line->l = min (line->l + count, ncol); |
|
|
1465 | |
1501 | |
1466 | if (selection.op && current_screen == selection.screen |
1502 | if (selection.op && current_screen == selection.screen |
1467 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1503 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1468 | { |
1504 | { |
1469 | if (selection.end.row != screen.cur.row |
1505 | if (selection.end.row != screen.cur.row |
… | |
… | |
1484 | case ERASE: |
1520 | case ERASE: |
1485 | screen.cur.col += count; /* don't worry if > ncol */ |
1521 | screen.cur.col += count; /* don't worry if > ncol */ |
1486 | selection_check (1); |
1522 | selection_check (1); |
1487 | screen.cur.col -= count; |
1523 | screen.cur.col -= count; |
1488 | |
1524 | |
1489 | line->l = max (line->l - count, 0); |
1525 | // nuke wide char after the end |
|
|
1526 | if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR) |
|
|
1527 | scr_kill_char (*line, screen.cur.col + count); |
|
|
1528 | |
1490 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1529 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1491 | break; |
1530 | break; |
1492 | |
1531 | |
1493 | case DELETE: |
1532 | case DELETE: |
1494 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1533 | line->l = max (line->l - count, 0); |
1495 | |
1534 | |
|
|
1535 | // nuke wide char spanning the end |
|
|
1536 | if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR) |
|
|
1537 | scr_kill_char (*line, screen.cur.col + count); |
|
|
1538 | |
1496 | for (col = screen.cur.col; (col + count) < ncol; col++) |
1539 | for (int col = screen.cur.col; (col + count) < ncol; col++) |
1497 | { |
1540 | { |
1498 | line->t[col] = line->t[col + count]; |
1541 | line->t[col] = line->t[col + count]; |
1499 | line->r[col] = line->r[col + count]; |
1542 | line->r[col] = line->r[col + count]; |
1500 | } |
1543 | } |
1501 | |
1544 | |
1502 | line->l = max (line->l - count, 0); |
|
|
1503 | scr_blank_line (*line, ncol - count, count, tr); |
1545 | scr_blank_line (*line, ncol - count, count, rstyle); |
1504 | |
1546 | |
1505 | if (selection.op && current_screen == selection.screen |
1547 | if (selection.op && current_screen == selection.screen |
1506 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1548 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1507 | { |
1549 | { |
1508 | if (selection.end.row != screen.cur.row |
1550 | if (selection.end.row != screen.cur.row |
… | |
… | |
1798 | for (i = PART_BEG; i < RC_COUNT; i++) |
1840 | for (i = PART_BEG; i < RC_COUNT; i++) |
1799 | { |
1841 | { |
1800 | min_it (rc[i].col, ncol - 1); |
1842 | min_it (rc[i].col, ncol - 1); |
1801 | min_it (rc[i].row, nrow - 1); |
1843 | min_it (rc[i].row, nrow - 1); |
1802 | } |
1844 | } |
1803 | // TODO: this line somehow causes segfault if scr_expose() is called just after resize |
1845 | |
1804 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1846 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1805 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1847 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1806 | |
1848 | |
1807 | num_scr_allow = 0; |
1849 | num_scr_allow = 0; |
1808 | |
1850 | |
… | |
… | |
1886 | XMapWindow (dpy, parent[0]); |
1928 | XMapWindow (dpy, parent[0]); |
1887 | # endif |
1929 | # endif |
1888 | |
1930 | |
1889 | # if ENABLE_FRILLS |
1931 | # if ENABLE_FRILLS |
1890 | if (option (Opt_urgentOnBell)) |
1932 | if (option (Opt_urgentOnBell)) |
1891 | { |
1933 | set_urgency (1); |
1892 | if (XWMHints *h = XGetWMHints(dpy, parent[0])) |
|
|
1893 | { |
|
|
1894 | h->flags |= XUrgencyHint; |
|
|
1895 | XSetWMHints (dpy, parent[0], h); |
|
|
1896 | } |
|
|
1897 | } |
|
|
1898 | # endif |
1934 | # endif |
1899 | |
1935 | |
1900 | if (option (Opt_visualBell)) |
1936 | if (option (Opt_visualBell)) |
1901 | { |
1937 | { |
1902 | rvideo_bell = true; |
1938 | rvideo_bell = true; |
… | |
… | |
1905 | |
1941 | |
1906 | bell_ev.start (VISUAL_BELL_DURATION); |
1942 | bell_ev.start (VISUAL_BELL_DURATION); |
1907 | } |
1943 | } |
1908 | else |
1944 | else |
1909 | XBell (dpy, 0); |
1945 | XBell (dpy, 0); |
|
|
1946 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1910 | #endif |
1947 | #endif |
1911 | } |
1948 | } |
1912 | |
1949 | |
1913 | /* ------------------------------------------------------------------------- */ |
1950 | /* ------------------------------------------------------------------------- */ |
1914 | /* ARGSUSED */ |
1951 | /* ARGSUSED */ |
1915 | void |
1952 | void |
1916 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1953 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1917 | { |
1954 | { |
1918 | #ifdef PRINTPIPE |
1955 | #ifdef PRINTPIPE |
1919 | int nrows, row_start; |
1956 | int nrows, row_start; |
1920 | FILE *fd; |
1957 | FILE *fd = popen_printer (); |
1921 | |
1958 | |
1922 | if ((fd = popen_printer ()) == NULL) |
1959 | if (!fd) |
1923 | return; |
1960 | return; |
1924 | |
1961 | |
1925 | if (fullhist) |
1962 | if (fullhist) |
1926 | { |
1963 | { |
1927 | nrows = nrow - top_row; |
1964 | nrows = nrow - top_row; |
… | |
… | |
1933 | row_start = view_start; |
1970 | row_start = view_start; |
1934 | } |
1971 | } |
1935 | |
1972 | |
1936 | wctomb (0, 0); |
1973 | wctomb (0, 0); |
1937 | |
1974 | |
1938 | for (int r1 = 0; r1 < nrows; r1++) |
1975 | for (int r1 = row_start; r1 < row_start + nrows; r1++) |
1939 | { |
1976 | { |
1940 | text_t *tp = ROW(r1).t; |
1977 | text_t *tp = ROW(r1).t; |
1941 | int len = ROW(r1).l; |
1978 | int len = ROW(r1).l; |
1942 | |
1979 | |
1943 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
1980 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
… | |
… | |
1972 | * screen.text/screen.rend contain what the screen will change to. |
2009 | * screen.text/screen.rend contain what the screen will change to. |
1973 | */ |
2010 | */ |
1974 | void |
2011 | void |
1975 | rxvt_term::scr_refresh () NOTHROW |
2012 | rxvt_term::scr_refresh () NOTHROW |
1976 | { |
2013 | { |
1977 | unsigned char have_bg, |
|
|
1978 | showcursor; /* show the cursor */ |
|
|
1979 | int16_t col, row, /* column/row we're processing */ |
2014 | int16_t col, row, /* column/row we're processing */ |
1980 | ocrow; /* old cursor row */ |
2015 | ocrow; /* old cursor row */ |
1981 | int i; /* tmp */ |
2016 | int i; /* tmp */ |
1982 | #ifndef NO_CURSORCOLOR |
2017 | #ifndef NO_CURSORCOLOR |
1983 | rend_t cc1; /* store colours at cursor position (s) */ |
2018 | rend_t cc1; /* store colours at cursor position (s) */ |
… | |
… | |
1994 | /* |
2029 | /* |
1995 | * A: set up vars |
2030 | * A: set up vars |
1996 | */ |
2031 | */ |
1997 | refresh_count = 0; |
2032 | refresh_count = 0; |
1998 | |
2033 | |
|
|
2034 | unsigned int old_screen_flags = screen.flags; |
1999 | have_bg = 0; |
2035 | char have_bg = 0; |
2000 | #ifdef HAVE_BG_PIXMAP |
2036 | #ifdef HAVE_BG_PIXMAP |
2001 | have_bg = bgPixmap.pixmap != None; |
2037 | have_bg = bgPixmap.pixmap != None; |
2002 | #endif |
2038 | #endif |
2003 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2039 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2004 | |
2040 | |
2005 | /* |
2041 | /* |
2006 | * B: reverse any characters which are selected |
2042 | * B: reverse any characters which are selected |
2007 | */ |
2043 | */ |
2008 | scr_reverse_selection (); |
2044 | scr_reverse_selection (); |
|
|
2045 | |
|
|
2046 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
|
|
2047 | #if ENABLE_OVERLAY |
|
|
2048 | scr_swap_overlay (); |
|
|
2049 | #endif |
|
|
2050 | |
|
|
2051 | char showcursor = screen.flags & Screen_VisibleCursor; |
2009 | |
2052 | |
2010 | /* |
2053 | /* |
2011 | * C: set the cursor character (s) |
2054 | * C: set the cursor character (s) |
2012 | */ |
2055 | */ |
2013 | { |
2056 | { |
2014 | unsigned char setoldcursor; |
2057 | unsigned char setoldcursor; |
2015 | |
2058 | |
2016 | showcursor = (screen.flags & Screen_VisibleCursor); |
|
|
2017 | #ifdef CURSOR_BLINK |
2059 | #ifdef CURSOR_BLINK |
2018 | if (hidden_cursor) |
2060 | if (hidden_cursor) |
2019 | showcursor = 0; |
2061 | showcursor = 0; |
2020 | #endif |
2062 | #endif |
2021 | |
2063 | |
… | |
… | |
2049 | ccol2 = bgcolor_of (rstyle); |
2091 | ccol2 = bgcolor_of (rstyle); |
2050 | #else |
2092 | #else |
2051 | ccol2 = Color_bg; |
2093 | ccol2 = Color_bg; |
2052 | #endif |
2094 | #endif |
2053 | |
2095 | |
2054 | if (showcursor && focus) |
2096 | if (focus) |
2055 | { |
2097 | { |
2056 | if (option (Opt_cursorUnderline)) |
2098 | if (option (Opt_cursorUnderline)) |
2057 | *crp ^= RS_Uline; |
2099 | *crp ^= RS_Uline; |
2058 | else |
2100 | else |
2059 | { |
2101 | { |
… | |
… | |
2094 | oldcursor.col = screen.cur.col; |
2136 | oldcursor.col = screen.cur.col; |
2095 | } |
2137 | } |
2096 | } |
2138 | } |
2097 | } |
2139 | } |
2098 | |
2140 | |
2099 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
|
|
2100 | #if ENABLE_OVERLAY |
|
|
2101 | scr_swap_overlay (); |
|
|
2102 | #endif |
|
|
2103 | |
|
|
2104 | #ifndef NO_SLOW_LINK_SUPPORT |
2141 | #ifndef NO_SLOW_LINK_SUPPORT |
2105 | /* |
2142 | /* |
2106 | * D: CopyArea pass - very useful for slower links |
2143 | * D: CopyArea pass - very useful for slower links |
2107 | * This has been deliberately kept simple. |
2144 | * This has been deliberately kept simple. |
2108 | */ |
2145 | */ |
… | |
… | |
2197 | continue; |
2234 | continue; |
2198 | |
2235 | |
2199 | // redraw one or more characters |
2236 | // redraw one or more characters |
2200 | |
2237 | |
2201 | // seek to the beginning of wide characters |
2238 | // seek to the beginning of wide characters |
2202 | while (stp[col] == NOCHAR && col > 0) |
2239 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2203 | --col; |
2240 | --col; |
2204 | |
2241 | |
2205 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2242 | rend_t rend = srp[col]; /* screen rendition (target rendition) */ |
2206 | text_t *text = stp + col; |
2243 | text_t *text = stp + col; |
2207 | int count = 1; |
2244 | int count = 1; |
2208 | |
2245 | |
2209 | dtp[col] = stp[col]; |
2246 | dtp[col] = stp[col]; |
2210 | drp[col] = rend; |
2247 | drp[col] = rend; |
… | |
… | |
2214 | for (i = 0; ++col < ncol; ) |
2251 | for (i = 0; ++col < ncol; ) |
2215 | { |
2252 | { |
2216 | if (stp[col] == NOCHAR) |
2253 | if (stp[col] == NOCHAR) |
2217 | { |
2254 | { |
2218 | dtp[col] = stp[col]; |
2255 | dtp[col] = stp[col]; |
2219 | drp[col] = rend; |
2256 | drp[col] = srp[col]; |
|
|
2257 | |
2220 | count++; |
2258 | count++; |
2221 | i++; |
2259 | i++; |
2222 | |
2260 | |
2223 | continue; |
2261 | continue; |
2224 | } |
2262 | } |
… | |
… | |
2244 | |
2282 | |
2245 | col--; /* went one too far. move back */ |
2283 | col--; /* went one too far. move back */ |
2246 | count -= i; /* dump any matching trailing chars */ |
2284 | count -= i; /* dump any matching trailing chars */ |
2247 | |
2285 | |
2248 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2286 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2249 | while (i && text[count] == NOCHAR) |
2287 | while (expect_false (i && text[count] == NOCHAR)) |
2250 | count++, i--; |
2288 | count++, i--; |
2251 | |
2289 | |
2252 | /* |
2290 | /* |
2253 | * Determine the attributes for the string |
2291 | * Determine the attributes for the string |
2254 | */ |
2292 | */ |
2255 | int fore = fgcolor_of (rend); // desired foreground |
2293 | int fore = fgcolor_of (rend); // desired foreground |
2256 | int back = bgcolor_of (rend); // desired background |
2294 | int back = bgcolor_of (rend); // desired background |
2257 | |
2295 | |
2258 | // only do special processing if any attributes are set, which is unlikely |
2296 | // only do special processing if any attributes are set, which is unlikely |
2259 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2297 | if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) |
2260 | { |
2298 | { |
2261 | bool invert = rend & RS_RVid; |
2299 | bool invert = rend & RS_RVid; |
2262 | |
2300 | |
2263 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2301 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2264 | if (rend & RS_Bold && fore == Color_fg) |
2302 | if (rend & RS_Bold && fore == Color_fg) |
… | |
… | |
2283 | |
2321 | |
2284 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2322 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2285 | fore = Color_UL; |
2323 | fore = Color_UL; |
2286 | #endif |
2324 | #endif |
2287 | |
2325 | |
|
|
2326 | #ifdef OPTION_HC |
|
|
2327 | if (rend & RS_Sel) |
|
|
2328 | { |
|
|
2329 | /* invert the column if no highlightColor is set or it is the |
|
|
2330 | * current cursor column */ |
|
|
2331 | if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2332 | && ISSET_PIXCOLOR (Color_HC)) |
|
|
2333 | { |
|
|
2334 | if (ISSET_PIXCOLOR (Color_HTC)) |
|
|
2335 | fore = Color_HTC; |
|
|
2336 | // if invert is 0 reverse video is set so we use bg color as fg color |
|
|
2337 | else if (!invert) |
|
|
2338 | fore = back; |
|
|
2339 | |
|
|
2340 | back = Color_HC; |
|
|
2341 | invert = 0; |
|
|
2342 | } |
|
|
2343 | } |
|
|
2344 | #endif |
|
|
2345 | |
2288 | if (invert) |
2346 | if (invert) |
2289 | { |
2347 | { |
2290 | #ifdef OPTION_HC |
|
|
2291 | if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2292 | || !ISSET_PIXCOLOR (Color_HC)) |
|
|
2293 | #endif |
|
|
2294 | /* invert the column if no highlightColor is set or it is the |
|
|
2295 | * current cursor column */ |
|
|
2296 | ::swap (fore, back); |
2348 | ::swap (fore, back); |
2297 | #ifdef OPTION_HC |
|
|
2298 | else if (ISSET_PIXCOLOR (Color_HC)) |
|
|
2299 | back = Color_HC; |
|
|
2300 | #endif |
|
|
2301 | |
2349 | |
2302 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2350 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2303 | # ifndef OPTION_HC |
|
|
2304 | if (ISSET_PIXCOLOR (Color_RV)) |
|
|
2305 | back = Color_RV; |
|
|
2306 | # endif |
|
|
2307 | if (fore == back) |
2351 | if (fore == back) |
2308 | { |
2352 | { |
2309 | fore = Color_bg; |
2353 | fore = Color_bg; |
2310 | back = Color_fg; |
2354 | back = Color_fg; |
2311 | } |
2355 | } |
… | |
… | |
2347 | /* |
2391 | /* |
2348 | * Actually do the drawing of the string here |
2392 | * Actually do the drawing of the string here |
2349 | */ |
2393 | */ |
2350 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2394 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2351 | |
2395 | |
2352 | if (have_bg && back == Color_bg) |
2396 | if (expect_true (have_bg && back == Color_bg)) |
2353 | { |
2397 | { |
2354 | // this is very ugly, maybe push it into ->draw? |
2398 | // this is very ugly, maybe push it into ->draw? |
2355 | |
2399 | |
2356 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2400 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2357 | if (text[i] != ' ') |
2401 | if (text[i] != ' ') |
… | |
… | |
2364 | did_clear: ; |
2408 | did_clear: ; |
2365 | } |
2409 | } |
2366 | else |
2410 | else |
2367 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2411 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2368 | |
2412 | |
2369 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2413 | if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) |
2370 | { |
2414 | { |
2371 | #if ENABLE_FRILLS |
2415 | #if ENABLE_FRILLS |
2372 | if (ISSET_PIXCOLOR (Color_underline)) |
2416 | if (ISSET_PIXCOLOR (Color_underline)) |
2373 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2417 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2374 | else |
2418 | else |
… | |
… | |
2379 | xpixel, ypixel + font->ascent + 1, |
2423 | xpixel, ypixel + font->ascent + 1, |
2380 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2424 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2381 | } |
2425 | } |
2382 | } /* for (col....) */ |
2426 | } /* for (col....) */ |
2383 | } /* for (row....) */ |
2427 | } /* for (row....) */ |
2384 | |
|
|
2385 | #if ENABLE_OVERLAY |
|
|
2386 | scr_swap_overlay (); |
|
|
2387 | #endif |
|
|
2388 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2389 | |
2428 | |
2390 | /* |
2429 | /* |
2391 | * G: cleanup cursor and display outline cursor if necessary |
2430 | * G: cleanup cursor and display outline cursor if necessary |
2392 | */ |
2431 | */ |
2393 | if (showcursor) |
2432 | if (showcursor) |
… | |
… | |
2432 | } |
2471 | } |
2433 | |
2472 | |
2434 | /* |
2473 | /* |
2435 | * H: cleanup selection |
2474 | * H: cleanup selection |
2436 | */ |
2475 | */ |
|
|
2476 | #if ENABLE_OVERLAY |
|
|
2477 | scr_swap_overlay (); |
|
|
2478 | #endif |
|
|
2479 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2480 | |
2437 | scr_reverse_selection (); |
2481 | scr_reverse_selection (); |
2438 | |
2482 | |
|
|
2483 | screen.flags = old_screen_flags; |
2439 | num_scr = 0; |
2484 | num_scr = 0; |
2440 | num_scr_allow = 1; |
2485 | num_scr_allow = 1; |
2441 | } |
2486 | } |
2442 | |
2487 | |
2443 | void |
2488 | void |
… | |
… | |
2563 | { |
2608 | { |
2564 | #if !ENABLE_MINIMAL |
2609 | #if !ENABLE_MINIMAL |
2565 | if (selection.rect) |
2610 | if (selection.rect) |
2566 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2611 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2567 | selection.end.row, selection.end.col, |
2612 | selection.end.row, selection.end.col, |
2568 | RS_RVid, RS_RVid | RS_Uline); |
2613 | RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline); |
2569 | else |
2614 | else |
2570 | #endif |
2615 | #endif |
2571 | scr_xor_span (selection.beg.row, selection.beg.col, |
2616 | scr_xor_span (selection.beg.row, selection.beg.col, |
2572 | selection.end.row, selection.end.col, |
2617 | selection.end.row, selection.end.col, |
2573 | RS_RVid); |
2618 | RS_Sel | RS_RVid); |
2574 | } |
2619 | } |
2575 | } |
2620 | } |
2576 | |
2621 | |
2577 | /* ------------------------------------------------------------------------- */ |
2622 | /* ------------------------------------------------------------------------- */ |
2578 | /* |
2623 | /* |
… | |
… | |
2639 | /* ------------------------------------------------------------------------- */ |
2684 | /* ------------------------------------------------------------------------- */ |
2640 | /* |
2685 | /* |
2641 | * Paste a selection direct to the command fd |
2686 | * Paste a selection direct to the command fd |
2642 | */ |
2687 | */ |
2643 | void |
2688 | void |
2644 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2689 | rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW |
2645 | { |
2690 | { |
2646 | /* convert normal newline chars into common keyboard Return key sequence */ |
2691 | /* convert normal newline chars into common keyboard Return key sequence */ |
2647 | for (unsigned int i = 0; i < len; i++) |
2692 | for (unsigned int i = 0; i < len; i++) |
2648 | if (data[i] == C0_LF) |
2693 | if (data[i] == C0_LF) |
2649 | data[i] = C0_CR; |
2694 | data[i] = C0_CR; |
… | |
… | |
2653 | |
2698 | |
2654 | tt_write (data, len); |
2699 | tt_write (data, len); |
2655 | |
2700 | |
2656 | if (priv_modes & PrivMode_BracketPaste) |
2701 | if (priv_modes & PrivMode_BracketPaste) |
2657 | tt_printf ("\e[201~"); |
2702 | tt_printf ("\e[201~"); |
|
|
2703 | } |
|
|
2704 | |
|
|
2705 | void |
|
|
2706 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
|
|
2707 | { |
|
|
2708 | if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END))) |
|
|
2709 | return; |
|
|
2710 | |
|
|
2711 | tt_paste (data, len); |
2658 | } |
2712 | } |
2659 | |
2713 | |
2660 | /* ------------------------------------------------------------------------- */ |
2714 | /* ------------------------------------------------------------------------- */ |
2661 | /* |
2715 | /* |
2662 | * Respond to a notification that a primary selection has been sent |
2716 | * Respond to a notification that a primary selection has been sent |
… | |
… | |
2871 | selection_wait = Sel_normal; |
2925 | selection_wait = Sel_normal; |
2872 | |
2926 | |
2873 | #if X_HAVE_UTF8_STRING |
2927 | #if X_HAVE_UTF8_STRING |
2874 | selection_type = Sel_UTF8String; |
2928 | selection_type = Sel_UTF8String; |
2875 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
2929 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
2876 | return; |
2930 | return; |
2877 | #else |
2931 | #else |
2878 | selection_type = Sel_CompoundText; |
2932 | selection_type = Sel_CompoundText; |
2879 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
2933 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
2880 | return; |
2934 | return; |
2881 | #endif |
2935 | #endif |
2882 | } |
2936 | } |
2883 | |
2937 | |
2884 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2938 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2885 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
2939 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
… | |
… | |
2913 | /* |
2967 | /* |
2914 | * Clear all selected text |
2968 | * Clear all selected text |
2915 | * EXT: SelectionClear |
2969 | * EXT: SelectionClear |
2916 | */ |
2970 | */ |
2917 | void |
2971 | void |
2918 | rxvt_term::selection_clear () NOTHROW |
2972 | rxvt_term::selection_clear (bool clipboard) NOTHROW |
2919 | { |
2973 | { |
|
|
2974 | if (!clipboard) |
|
|
2975 | { |
2920 | want_refresh = 1; |
2976 | want_refresh = 1; |
2921 | free (selection.text); |
2977 | free (selection.text); |
2922 | selection.text = NULL; |
2978 | selection.text = NULL; |
2923 | selection.len = 0; |
2979 | selection.len = 0; |
2924 | CLEAR_SELECTION (); |
2980 | CLEAR_SELECTION (); |
2925 | |
2981 | |
2926 | if (display->selection_owner == this) |
2982 | if (display->selection_owner == this) |
2927 | display->selection_owner = 0; |
2983 | display->selection_owner = 0; |
|
|
2984 | } |
|
|
2985 | else |
|
|
2986 | { |
|
|
2987 | free (selection.clip_text); |
|
|
2988 | selection.clip_text = NULL; |
|
|
2989 | selection.clip_len = 0; |
|
|
2990 | |
|
|
2991 | if (display->clipboard_owner == this) |
|
|
2992 | display->clipboard_owner = 0; |
|
|
2993 | } |
2928 | } |
2994 | } |
2929 | |
2995 | |
2930 | /* ------------------------------------------------------------------------- */ |
2996 | /* ------------------------------------------------------------------------- */ |
2931 | /* |
2997 | /* |
2932 | * Copy a selection into the cut buffer |
2998 | * Copy a selection into the cut buffer |
… | |
… | |
3058 | |
3124 | |
3059 | selection_grab (tm); |
3125 | selection_grab (tm); |
3060 | } |
3126 | } |
3061 | |
3127 | |
3062 | bool |
3128 | bool |
3063 | rxvt_term::selection_grab (Time tm) NOTHROW |
3129 | rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW |
3064 | { |
3130 | { |
|
|
3131 | Atom sel; |
|
|
3132 | |
|
|
3133 | if (!clipboard) |
|
|
3134 | { |
3065 | selection_time = tm; |
3135 | selection_time = tm; |
|
|
3136 | sel = XA_PRIMARY; |
|
|
3137 | } |
|
|
3138 | else |
|
|
3139 | { |
|
|
3140 | clipboard_time = tm; |
|
|
3141 | sel = xa[XA_CLIPBOARD]; |
|
|
3142 | } |
3066 | |
3143 | |
3067 | XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); |
3144 | XSetSelectionOwner (dpy, sel, vt, tm); |
3068 | if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) |
3145 | if (XGetSelectionOwner (dpy, sel) == vt) |
3069 | { |
3146 | { |
3070 | display->set_selection_owner (this); |
3147 | display->set_selection_owner (this, clipboard); |
3071 | return true; |
3148 | return true; |
3072 | } |
3149 | } |
3073 | else |
3150 | else |
3074 | { |
3151 | { |
3075 | selection_clear (); |
3152 | selection_clear (clipboard); |
3076 | return false; |
3153 | return false; |
3077 | } |
3154 | } |
3078 | |
3155 | |
3079 | #if 0 |
3156 | #if 0 |
3080 | XTextProperty ct; |
3157 | XTextProperty ct; |
… | |
… | |
3575 | else if (rq.target == xa[XA_MULTIPLE]) |
3652 | else if (rq.target == xa[XA_MULTIPLE]) |
3576 | { |
3653 | { |
3577 | /* TODO: Handle MULTIPLE */ |
3654 | /* TODO: Handle MULTIPLE */ |
3578 | } |
3655 | } |
3579 | #endif |
3656 | #endif |
3580 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3657 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) |
3581 | { |
3658 | { |
3582 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3659 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3583 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3660 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
|
|
3661 | ev.property = rq.property; |
|
|
3662 | } |
|
|
3663 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3664 | { |
|
|
3665 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
|
|
3666 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
3584 | ev.property = rq.property; |
3667 | ev.property = rq.property; |
3585 | } |
3668 | } |
3586 | else if (rq.target == XA_STRING |
3669 | else if (rq.target == XA_STRING |
3587 | || rq.target == xa[XA_TEXT] |
3670 | || rq.target == xa[XA_TEXT] |
3588 | || rq.target == xa[XA_COMPOUND_TEXT] |
3671 | || rq.target == xa[XA_COMPOUND_TEXT] |
… | |
… | |
3621 | { |
3704 | { |
3622 | target = xa[XA_COMPOUND_TEXT]; |
3705 | target = xa[XA_COMPOUND_TEXT]; |
3623 | style = enc_compound_text; |
3706 | style = enc_compound_text; |
3624 | } |
3707 | } |
3625 | |
3708 | |
3626 | if (selection.text) |
3709 | if (rq.selection == XA_PRIMARY && selection.text) |
3627 | { |
3710 | { |
3628 | cl = selection.text; |
3711 | cl = selection.text; |
3629 | selectlen = selection.len; |
3712 | selectlen = selection.len; |
|
|
3713 | } |
|
|
3714 | else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3715 | { |
|
|
3716 | cl = selection.clip_text; |
|
|
3717 | selectlen = selection.clip_len; |
3630 | } |
3718 | } |
3631 | else |
3719 | else |
3632 | { |
3720 | { |
3633 | cl = L""; |
3721 | cl = L""; |
3634 | selectlen = 0; |
3722 | selectlen = 0; |
… | |
… | |
3702 | h += 2; min_it (h, nrow); |
3790 | h += 2; min_it (h, nrow); |
3703 | |
3791 | |
3704 | x -= 1; clamp_it (x, 0, ncol - w); |
3792 | x -= 1; clamp_it (x, 0, ncol - w); |
3705 | y -= 1; clamp_it (y, 0, nrow - h); |
3793 | y -= 1; clamp_it (y, 0, nrow - h); |
3706 | |
3794 | |
3707 | ov_x = x; ov_y = y; |
3795 | ov.x = x; ov.y = y; |
3708 | ov_w = w; ov_h = h; |
3796 | ov.w = w; ov.h = h; |
3709 | |
3797 | |
3710 | ov_text = new text_t *[h]; |
3798 | ov.text = new text_t *[h]; |
3711 | ov_rend = new rend_t *[h]; |
3799 | ov.rend = new rend_t *[h]; |
3712 | |
3800 | |
3713 | for (y = 0; y < h; y++) |
3801 | for (y = 0; y < h; y++) |
3714 | { |
3802 | { |
3715 | text_t *tp = ov_text[y] = new text_t[w]; |
3803 | text_t *tp = ov.text[y] = new text_t[w]; |
3716 | rend_t *rp = ov_rend[y] = new rend_t[w]; |
3804 | rend_t *rp = ov.rend[y] = new rend_t[w]; |
3717 | |
3805 | |
3718 | text_t t0, t1, t2; |
3806 | text_t t0, t1, t2; |
3719 | rend_t r = OVERLAY_RSTYLE; |
3807 | rend_t r = OVERLAY_RSTYLE; |
3720 | |
3808 | |
3721 | if (y == 0) |
3809 | if (y == 0) |
… | |
… | |
3740 | } |
3828 | } |
3741 | |
3829 | |
3742 | void |
3830 | void |
3743 | rxvt_term::scr_overlay_off () NOTHROW |
3831 | rxvt_term::scr_overlay_off () NOTHROW |
3744 | { |
3832 | { |
3745 | if (!ov_text) |
3833 | if (!ov.text) |
3746 | return; |
3834 | return; |
3747 | |
3835 | |
3748 | want_refresh = 1; |
3836 | want_refresh = 1; |
3749 | |
3837 | |
3750 | for (int y = 0; y < ov_h; y++) |
3838 | for (int y = 0; y < ov.h; y++) |
3751 | { |
3839 | { |
3752 | delete [] ov_text[y]; |
3840 | delete [] ov.text[y]; |
3753 | delete [] ov_rend[y]; |
3841 | delete [] ov.rend[y]; |
3754 | } |
3842 | } |
3755 | |
3843 | |
3756 | delete [] ov_text; ov_text = 0; |
3844 | delete [] ov.text; ov.text = 0; |
3757 | delete [] ov_rend; ov_rend = 0; |
3845 | delete [] ov.rend; ov.rend = 0; |
3758 | } |
3846 | } |
3759 | |
3847 | |
3760 | void |
3848 | void |
3761 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3849 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3762 | { |
3850 | { |
3763 | if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) |
3851 | if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2) |
3764 | return; |
3852 | return; |
3765 | |
3853 | |
3766 | x++, y++; |
3854 | x++, y++; |
3767 | |
3855 | |
3768 | ov_text[y][x] = text; |
3856 | ov.text[y][x] = text; |
3769 | ov_rend[y][x] = rend; |
3857 | ov.rend[y][x] = rend; |
3770 | } |
3858 | } |
3771 | |
3859 | |
3772 | void |
3860 | void |
3773 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3861 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3774 | { |
3862 | { |
… | |
… | |
3793 | } |
3881 | } |
3794 | |
3882 | |
3795 | void |
3883 | void |
3796 | rxvt_term::scr_swap_overlay () NOTHROW |
3884 | rxvt_term::scr_swap_overlay () NOTHROW |
3797 | { |
3885 | { |
3798 | if (!ov_text) |
3886 | if (!ov.text) |
3799 | return; |
3887 | return; |
3800 | |
3888 | |
|
|
3889 | // hide cursor if it is within the overlay area |
|
|
3890 | if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w) |
|
|
3891 | && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h)) |
|
|
3892 | screen.flags &= ~Screen_VisibleCursor; |
|
|
3893 | |
3801 | // swap screen mem with overlay |
3894 | // swap screen mem with overlay |
3802 | for (int y = ov_h; y--; ) |
3895 | for (int y = ov.h; y--; ) |
3803 | { |
3896 | { |
3804 | text_t *t1 = ov_text[y]; |
3897 | text_t *t1 = ov.text[y]; |
3805 | rend_t *r1 = ov_rend[y]; |
3898 | rend_t *r1 = ov.rend[y]; |
3806 | |
3899 | |
3807 | text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; |
3900 | text_t *t2 = ROW(y + ov.y + view_start).t + ov.x; |
3808 | rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; |
3901 | rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x; |
3809 | |
3902 | |
3810 | for (int x = ov_w; x--; ) |
3903 | for (int x = ov.w; x--; ) |
3811 | { |
3904 | { |
3812 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3905 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3813 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3906 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3814 | } |
3907 | } |
3815 | } |
3908 | } |