… | |
… | |
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 | * ------------------------------------------------------------------------- */ |
… | |
… | |
132 | |
131 | |
133 | l.l = 0; |
132 | l.l = 0; |
134 | l.f = 0; |
133 | l.f = 0; |
135 | } |
134 | } |
136 | |
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 | |
137 | /* ------------------------------------------------------------------------- * |
157 | /* ------------------------------------------------------------------------- * |
138 | * SCREEN INITIALISATION * |
158 | * SCREEN INITIALISATION * |
139 | * ------------------------------------------------------------------------- */ |
159 | * ------------------------------------------------------------------------- */ |
140 | |
160 | |
141 | void |
161 | void |
142 | rxvt_term::scr_reset () |
162 | rxvt_term::scr_reset () |
143 | { |
163 | { |
144 | #if ENABLE_OVERLAY |
|
|
145 | scr_overlay_off (); |
|
|
146 | #endif |
|
|
147 | |
|
|
148 | rvideo_mode = false; |
|
|
149 | view_start = 0; |
164 | view_start = 0; |
150 | num_scr = 0; |
165 | num_scr = 0; |
151 | |
166 | |
152 | if (ncol == 0) |
167 | if (ncol == 0) |
153 | ncol = 80; |
168 | ncol = 80; |
… | |
… | |
155 | if (nrow == 0) |
170 | if (nrow == 0) |
156 | nrow = 24; |
171 | nrow = 24; |
157 | |
172 | |
158 | if (ncol == prev_ncol && nrow == prev_nrow) |
173 | if (ncol == prev_ncol && nrow == prev_nrow) |
159 | return; |
174 | return; |
160 | |
|
|
161 | if (current_screen != PRIMARY) |
|
|
162 | scr_swap_screen (); |
|
|
163 | |
175 | |
164 | // we need at least two lines for wrapping to work correctly |
176 | // we need at least two lines for wrapping to work correctly |
165 | while (nrow + saveLines < 2) |
177 | while (nrow + saveLines < 2) |
166 | { |
178 | { |
167 | //TODO//FIXME |
179 | //TODO//FIXME |
… | |
… | |
220 | selection.text = NULL; |
232 | selection.text = NULL; |
221 | selection.len = 0; |
233 | selection.len = 0; |
222 | selection.op = SELECTION_CLEAR; |
234 | selection.op = SELECTION_CLEAR; |
223 | selection.screen = PRIMARY; |
235 | selection.screen = PRIMARY; |
224 | selection.clicks = 0; |
236 | selection.clicks = 0; |
|
|
237 | selection.clip_text = NULL; |
|
|
238 | selection.clip_len = 0; |
225 | } |
239 | } |
226 | else |
240 | else |
227 | { |
241 | { |
228 | /* |
242 | /* |
229 | * add or delete rows as appropriate |
243 | * add or delete rows as appropriate |
… | |
… | |
267 | |
281 | |
268 | if (top_row) |
282 | if (top_row) |
269 | { |
283 | { |
270 | // Re-wrap lines. This is rather ugly, possibly because I am too dumb |
284 | // Re-wrap lines. This is rather ugly, possibly because I am too dumb |
271 | // to come up with a lean and mean algorithm. |
285 | // to come up with a lean and mean algorithm. |
|
|
286 | // TODO: maybe optimise when width didn't change |
272 | |
287 | |
273 | row_col_t ocur = screen.cur; |
288 | row_col_t ocur = screen.cur; |
274 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
289 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
275 | |
290 | |
276 | do |
291 | do |
277 | { |
292 | { |
278 | p = MOD (p - 1, prev_total_rows); |
293 | p = MOD (p - 1, prev_total_rows); |
279 | #ifdef DEBUG_STRICT |
|
|
280 | assert (old_buf [MOD (p, prev_total_rows)].t); |
294 | assert (old_buf [MOD (p, prev_total_rows)].t); |
281 | #endif |
|
|
282 | int plines = 1; |
295 | int plines = 1; |
283 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
296 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
284 | |
297 | |
285 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
298 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
286 | { |
299 | { |
… | |
… | |
380 | delete old_ta; |
393 | delete old_ta; |
381 | delete old_ra; |
394 | delete old_ra; |
382 | |
395 | |
383 | clamp_it (screen.cur.row, 0, nrow - 1); |
396 | clamp_it (screen.cur.row, 0, nrow - 1); |
384 | clamp_it (screen.cur.col, 0, ncol - 1); |
397 | clamp_it (screen.cur.col, 0, ncol - 1); |
|
|
398 | } |
385 | |
399 | |
386 | free (tabs); |
400 | free (tabs); |
387 | } |
401 | tabs = (char *)rxvt_malloc (ncol); |
|
|
402 | |
|
|
403 | for (int col = ncol; col--; ) |
|
|
404 | tabs [col] = col % TABSIZE == 0; |
388 | |
405 | |
389 | CLEAR_ALL_SELECTION (); |
406 | CLEAR_ALL_SELECTION (); |
390 | |
407 | |
391 | prev_nrow = nrow; |
408 | prev_nrow = nrow; |
392 | prev_ncol = ncol; |
409 | prev_ncol = ncol; |
393 | |
|
|
394 | tabs = (char *)rxvt_malloc (ncol); |
|
|
395 | |
|
|
396 | for (int col = ncol; --col; ) |
|
|
397 | tabs [col] = col % TABSIZE == 0; |
|
|
398 | |
|
|
399 | if (current_screen != PRIMARY) |
|
|
400 | scr_swap_screen (); |
|
|
401 | |
410 | |
402 | tt_winch (); |
411 | tt_winch (); |
403 | |
412 | |
404 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
413 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
405 | } |
414 | } |
… | |
… | |
417 | delete ralloc; ralloc = 0; |
426 | delete ralloc; ralloc = 0; |
418 | |
427 | |
419 | free (row_buf); |
428 | free (row_buf); |
420 | free (swap_buf); |
429 | free (swap_buf); |
421 | free (drawn_buf); |
430 | free (drawn_buf); |
|
|
431 | row_buf = 0; // signal that we freed all the arrays above |
|
|
432 | |
422 | free (tabs); |
433 | free (tabs); |
423 | |
434 | tabs = 0; |
424 | row_buf = 0; // signal that we freed all the arrays |
|
|
425 | } |
435 | } |
426 | } |
436 | } |
427 | |
437 | |
428 | /* ------------------------------------------------------------------------- */ |
438 | /* ------------------------------------------------------------------------- */ |
429 | /* |
439 | /* |
430 | * Hard reset |
440 | * Hard/Soft reset |
431 | */ |
441 | */ |
432 | void |
442 | void |
433 | rxvt_term::scr_poweron () |
443 | rxvt_term::scr_poweron () |
434 | { |
444 | { |
435 | scr_release (); |
445 | scr_release (); |
436 | prev_nrow = prev_ncol = 0; |
446 | prev_nrow = prev_ncol = 0; |
|
|
447 | rvideo_mode = false; |
|
|
448 | scr_soft_reset (); |
437 | scr_reset (); |
449 | scr_reset (); |
438 | |
450 | |
439 | scr_clear (true); |
451 | scr_clear (true); |
440 | scr_refresh (); |
452 | scr_refresh (); |
|
|
453 | } |
|
|
454 | |
|
|
455 | void |
|
|
456 | rxvt_term::scr_soft_reset () |
|
|
457 | { |
|
|
458 | /* only affects modes, nothing drastic such as clearing the screen */ |
|
|
459 | #if ENABLE_OVERLAY |
|
|
460 | scr_overlay_off (); |
|
|
461 | #endif |
|
|
462 | |
|
|
463 | if (current_screen != PRIMARY) |
|
|
464 | scr_swap_screen (); |
|
|
465 | |
|
|
466 | scr_scroll_region (0, MAX_ROWS - 1); |
|
|
467 | scr_rendition (0, ~RS_None); |
|
|
468 | scr_insert_mode (0); |
441 | } |
469 | } |
442 | |
470 | |
443 | /* ------------------------------------------------------------------------- * |
471 | /* ------------------------------------------------------------------------- * |
444 | * PROCESS SCREEN COMMANDS * |
472 | * PROCESS SCREEN COMMANDS * |
445 | * ------------------------------------------------------------------------- */ |
473 | * ------------------------------------------------------------------------- */ |
… | |
… | |
483 | } |
511 | } |
484 | |
512 | |
485 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
513 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
486 | min_it (s->cur.row, nrow - 1); |
514 | min_it (s->cur.row, nrow - 1); |
487 | min_it (s->cur.col, ncol - 1); |
515 | min_it (s->cur.col, ncol - 1); |
488 | #ifdef DEBUG_STRICT |
|
|
489 | assert (s->cur.row >= 0); |
516 | assert (s->cur.row >= 0); |
490 | assert (s->cur.col >= 0); |
517 | assert (s->cur.col >= 0); |
491 | #endif |
|
|
492 | } |
518 | } |
493 | |
519 | |
494 | void |
520 | void |
495 | rxvt_term::scr_swap_screen () |
521 | rxvt_term::scr_swap_screen () |
496 | { |
522 | { |
… | |
… | |
521 | want_refresh = 1; |
547 | want_refresh = 1; |
522 | view_start = 0; |
548 | view_start = 0; |
523 | |
549 | |
524 | selection_check (2); /* check for boundary cross */ |
550 | selection_check (2); /* check for boundary cross */ |
525 | |
551 | |
526 | int i = current_screen; current_screen = scrn; scrn = i; |
552 | current_screen = scrn; |
527 | |
553 | |
528 | #if NSCREENS |
554 | #if NSCREENS |
529 | if (option (Opt_secondaryScreen)) |
555 | if (option (Opt_secondaryScreen)) |
530 | { |
556 | { |
531 | num_scr = 0; |
557 | num_scr = 0; |
… | |
… | |
756 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
782 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
757 | screen.cur.row -= minlines; |
783 | screen.cur.row -= minlines; |
758 | } |
784 | } |
759 | } |
785 | } |
760 | |
786 | |
761 | #ifdef DEBUG_STRICT |
|
|
762 | assert (screen.cur.col < ncol); |
787 | assert (screen.cur.col < ncol); |
763 | assert (screen.cur.row < nrow |
788 | assert (screen.cur.row < nrow |
764 | && screen.cur.row >= top_row); |
789 | && screen.cur.row >= top_row); |
765 | #endif |
|
|
766 | int row = screen.cur.row; |
790 | int row = screen.cur.row; |
767 | |
791 | |
768 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
792 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
769 | |
793 | |
770 | line_t *line = &ROW(row); |
794 | line_t *line = &ROW(row); |
771 | |
795 | |
772 | while (str < strend) |
796 | while (str < strend) |
773 | { |
797 | { |
774 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
798 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
775 | |
799 | |
776 | if (c < 0x20) |
800 | if (expect_false (c < 0x20)) |
777 | if (c == C0_LF) |
801 | if (c == C0_LF) |
778 | { |
802 | { |
779 | max_it (line->l, screen.cur.col); |
803 | max_it (line->l, screen.cur.col); |
780 | |
804 | |
781 | screen.flags &= ~Screen_WrapNext; |
805 | screen.flags &= ~Screen_WrapNext; |
… | |
… | |
800 | { |
824 | { |
801 | scr_tab (1, true); |
825 | scr_tab (1, true); |
802 | continue; |
826 | continue; |
803 | } |
827 | } |
804 | |
828 | |
|
|
829 | if (expect_false ( |
805 | if (checksel /* see if we're writing within selection */ |
830 | checksel /* see if we're writing within selection */ |
806 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
831 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
807 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
832 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
|
|
833 | )) |
808 | { |
834 | { |
809 | checksel = 0; |
835 | checksel = 0; |
810 | /* |
836 | /* |
811 | * If we wrote anywhere in the selected area, kill the selection |
837 | * If we wrote anywhere in the selected area, kill the selection |
812 | * XXX: should we kill the mark too? Possibly, but maybe that |
838 | * XXX: should we kill the mark too? Possibly, but maybe that |
813 | * should be a similar check. |
839 | * should be a similar check. |
814 | */ |
840 | */ |
815 | CLEAR_SELECTION (); |
841 | CLEAR_SELECTION (); |
816 | } |
842 | } |
817 | |
843 | |
818 | if (screen.flags & Screen_WrapNext) |
844 | if (expect_false (screen.flags & Screen_WrapNext)) |
819 | { |
845 | { |
820 | scr_do_wrap (); |
846 | scr_do_wrap (); |
821 | |
847 | |
822 | line->l = ncol; |
848 | line->l = ncol; |
823 | line->is_longer (1); |
849 | line->is_longer (1); |
… | |
… | |
825 | row = screen.cur.row; |
851 | row = screen.cur.row; |
826 | line = &ROW(row); /* _must_ refresh */ |
852 | line = &ROW(row); /* _must_ refresh */ |
827 | } |
853 | } |
828 | |
854 | |
829 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
855 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
830 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
856 | if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
831 | c = 0xfffd; |
857 | c = 0xfffd; |
832 | |
858 | |
833 | // rely on wcwidth to tell us the character width, do wcwidth before |
859 | // rely on wcwidth to tell us the character width, do wcwidth before |
834 | // further replacements, as wcwidth might return -1 for the line |
860 | // further replacements, as wcwidth might return -1 for the line |
835 | // drawing characters below as they might be invalid in the current |
861 | // drawing characters below as they might be invalid in the current |
836 | // locale. |
862 | // locale. |
837 | int width = WCWIDTH (c); |
863 | int width = WCWIDTH (c); |
838 | |
864 | |
839 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
865 | if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL |
840 | { |
866 | { |
841 | // vt100 special graphics and line drawing |
867 | // vt100 special graphics and line drawing |
842 | // 5f-7e standard vt100 |
868 | // 5f-7e standard vt100 |
843 | // 40-5e rxvt extension for extra curses acs chars |
869 | // 40-5e rxvt extension for extra curses acs chars |
844 | static uint16_t vt100_0[62] = { // 41 .. 7e |
870 | static uint16_t vt100_0[62] = { // 41 .. 7e |
… | |
… | |
857 | c = vt100_0[c - 0x41]; |
883 | c = vt100_0[c - 0x41]; |
858 | width = 1; // vt100 line drawing characters are always single-width |
884 | width = 1; // vt100 line drawing characters are always single-width |
859 | } |
885 | } |
860 | } |
886 | } |
861 | |
887 | |
862 | if (screen.flags & Screen_Insert) |
888 | if (expect_false (screen.flags & Screen_Insert)) |
863 | scr_insdel_chars (width, INSERT); |
889 | scr_insdel_chars (width, INSERT); |
864 | |
890 | |
865 | if (width != 0) |
891 | if (width != 0) |
866 | { |
892 | { |
867 | #if !UNICODE_3 |
893 | #if !UNICODE_3 |
… | |
… | |
872 | # else |
898 | # else |
873 | c = 0xfffd; |
899 | c = 0xfffd; |
874 | # endif |
900 | # endif |
875 | #endif |
901 | #endif |
876 | |
902 | |
|
|
903 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
904 | |
|
|
905 | // if the character doesn't fit into the remaining columns... |
|
|
906 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
|
|
907 | { |
|
|
908 | if (screen.flags & Screen_Autowrap) |
|
|
909 | { |
|
|
910 | // ... artificially enlargen the previous one |
|
|
911 | c = NOCHAR; |
|
|
912 | // and try the same character next loop iteration |
|
|
913 | --str; |
|
|
914 | } |
|
|
915 | else |
|
|
916 | screen.cur.col = ncol - width; |
|
|
917 | } |
|
|
918 | |
877 | // nuke the character at this position, if required |
919 | // nuke the character at this position, if required |
|
|
920 | // due to wonderful coincidences everywhere else in this loop |
|
|
921 | // we never have to check for overwriting a wide char itself, |
|
|
922 | // only its tail. |
878 | if (line->t[screen.cur.col] == NOCHAR |
923 | if (expect_false (line->t[screen.cur.col] == NOCHAR)) |
879 | || (screen.cur.col < ncol - 1 |
924 | scr_kill_char (*line, screen.cur.col); |
880 | && line->t[screen.cur.col + 1] == NOCHAR)) |
|
|
881 | { |
|
|
882 | int col = screen.cur.col; |
|
|
883 | |
|
|
884 | // find begin |
|
|
885 | while (col > 0 && line->t[col] == NOCHAR) |
|
|
886 | col--; |
|
|
887 | |
|
|
888 | rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' ')); |
|
|
889 | |
|
|
890 | // found begin, nuke |
|
|
891 | do { |
|
|
892 | line->t[col] = ' '; |
|
|
893 | line->r[col] = rend; |
|
|
894 | col++; |
|
|
895 | } while (col < ncol && line->t[col] == NOCHAR); |
|
|
896 | } |
|
|
897 | |
|
|
898 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
899 | |
|
|
900 | // if the character doesn't fit into the remaining columns... |
|
|
901 | if (screen.cur.col > ncol - width && ncol >= width) |
|
|
902 | { |
|
|
903 | // ...output spaces |
|
|
904 | c = ' '; |
|
|
905 | // and try the same character next loop iteration |
|
|
906 | --str; |
|
|
907 | } |
|
|
908 | |
925 | |
909 | line->touch (); |
926 | line->touch (); |
910 | |
927 | |
911 | do |
928 | do |
912 | { |
929 | { |
913 | line->t[screen.cur.col] = c; |
930 | line->t[screen.cur.col] = c; |
914 | line->r[screen.cur.col] = rend; |
931 | line->r[screen.cur.col] = rend; |
915 | |
932 | |
916 | if (screen.cur.col < ncol - 1) |
933 | if (expect_true (screen.cur.col < ncol - 1)) |
917 | screen.cur.col++; |
934 | screen.cur.col++; |
918 | else |
935 | else |
919 | { |
936 | { |
920 | line->l = ncol; |
937 | line->l = ncol; |
921 | if (screen.flags & Screen_Autowrap) |
938 | if (screen.flags & Screen_Autowrap) |
922 | screen.flags |= Screen_WrapNext; |
939 | screen.flags |= Screen_WrapNext; |
923 | break; |
940 | |
|
|
941 | goto end_of_line; |
924 | } |
942 | } |
925 | |
943 | |
926 | c = NOCHAR; |
944 | c = NOCHAR; |
927 | } |
945 | } |
928 | while (--width > 0); |
946 | while (expect_false (--width > 0)); |
929 | |
947 | |
930 | // pad with spaces when overwriting wide character with smaller one |
948 | // pad with spaces when overwriting wide character with smaller one |
931 | if (!width) |
949 | for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++) |
932 | { |
950 | { |
933 | line->touch (); |
951 | line->t[c] = ' '; |
|
|
952 | line->r[c] = rend; |
|
|
953 | } |
934 | |
954 | |
935 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
955 | end_of_line: |
|
|
956 | ; |
|
|
957 | } |
|
|
958 | #if ENABLE_COMBINING |
|
|
959 | else // width == 0 |
|
|
960 | { |
|
|
961 | if (c != 0xfeff) // ignore BOM |
|
|
962 | { |
|
|
963 | // handle combining characters |
|
|
964 | // we just tag the accent on the previous on-screen character. |
|
|
965 | // this is arguably not correct, but also arguably not wrong. |
|
|
966 | // we don't handle double-width characters nicely yet. |
|
|
967 | line_t *linep; |
|
|
968 | text_t *tp; |
|
|
969 | rend_t *rp; |
|
|
970 | |
|
|
971 | if (screen.cur.col > 0) |
936 | { |
972 | { |
937 | line->t[c] = ' '; |
|
|
938 | line->r[c] = rend; |
973 | linep = line; |
|
|
974 | tp = line->t + screen.cur.col - 1; |
|
|
975 | rp = line->r + screen.cur.col - 1; |
939 | } |
976 | } |
|
|
977 | else if (screen.cur.row > 0 |
|
|
978 | && ROW(screen.cur.row - 1).is_longer ()) |
|
|
979 | { |
|
|
980 | linep = &ROW(screen.cur.row - 1); |
|
|
981 | tp = line->t + ncol - 1; |
|
|
982 | rp = line->r + ncol - 1; |
|
|
983 | } |
|
|
984 | else |
|
|
985 | continue; |
|
|
986 | |
|
|
987 | linep->touch (); |
|
|
988 | |
|
|
989 | while (*tp == NOCHAR && tp > linep->t) |
|
|
990 | tp--, rp--; |
|
|
991 | |
|
|
992 | // first try to find a precomposed character |
|
|
993 | unicode_t n = rxvt_compose (*tp, c); |
|
|
994 | if (n == NOCHAR) |
|
|
995 | n = rxvt_composite.compose (*tp, c); |
|
|
996 | |
|
|
997 | *tp = n; |
|
|
998 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
940 | } |
999 | } |
941 | } |
1000 | } |
942 | else // width == 0 |
|
|
943 | { |
|
|
944 | #if ENABLE_COMBINING |
|
|
945 | // handle combining characters |
|
|
946 | // we just tag the accent on the previous on-screen character. |
|
|
947 | // this is arguably not correct, but also arguably not wrong. |
|
|
948 | // we don't handle double-width characters nicely yet. |
|
|
949 | line_t *linep; |
|
|
950 | text_t *tp; |
|
|
951 | rend_t *rp; |
|
|
952 | |
|
|
953 | if (screen.cur.col > 0) |
|
|
954 | { |
|
|
955 | linep = line; |
|
|
956 | tp = line->t + screen.cur.col - 1; |
|
|
957 | rp = line->r + screen.cur.col - 1; |
|
|
958 | } |
|
|
959 | else if (screen.cur.row > 0 |
|
|
960 | && ROW(screen.cur.row - 1).is_longer ()) |
|
|
961 | { |
|
|
962 | linep = &ROW(screen.cur.row - 1); |
|
|
963 | tp = line->t + ncol - 1; |
|
|
964 | rp = line->r + ncol - 1; |
|
|
965 | } |
|
|
966 | else |
|
|
967 | continue; |
|
|
968 | |
|
|
969 | linep->touch (); |
|
|
970 | |
|
|
971 | while (*tp == NOCHAR && tp > linep->t) |
|
|
972 | tp--, rp--; |
|
|
973 | |
|
|
974 | // first try to find a precomposed character |
|
|
975 | unicode_t n = rxvt_compose (*tp, c); |
|
|
976 | if (n == NOCHAR) |
|
|
977 | n = rxvt_composite.compose (*tp, c); |
|
|
978 | |
|
|
979 | *tp = n; |
|
|
980 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
|
|
981 | #endif |
1001 | #endif |
982 | } |
|
|
983 | } |
1002 | } |
984 | |
1003 | |
985 | max_it (line->l, screen.cur.col); |
1004 | max_it (line->l, screen.cur.col); |
986 | |
1005 | |
987 | #ifdef DEBUG_STRICT |
|
|
988 | assert (screen.cur.row >= 0); |
1006 | assert (screen.cur.row >= 0); |
989 | #endif |
|
|
990 | } |
1007 | } |
991 | |
1008 | |
992 | /* ------------------------------------------------------------------------- */ |
1009 | /* ------------------------------------------------------------------------- */ |
993 | /* |
1010 | /* |
994 | * Process Backspace. Move back the cursor back a position, wrap if have to |
1011 | * Process Backspace. Move back the cursor back a position, wrap if have to |
… | |
… | |
1007 | |
1024 | |
1008 | want_refresh = 1; |
1025 | want_refresh = 1; |
1009 | #endif |
1026 | #endif |
1010 | } |
1027 | } |
1011 | } |
1028 | } |
|
|
1029 | else if (screen.flags & Screen_WrapNext) |
|
|
1030 | screen.flags &= ~Screen_WrapNext; |
1012 | else |
1031 | else |
1013 | scr_gotorc (0, -1, RELATIVE); |
1032 | scr_gotorc (0, -1, RELATIVE); |
1014 | } |
1033 | } |
1015 | |
1034 | |
1016 | /* ------------------------------------------------------------------------- */ |
1035 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1322 | if (row >= nrow) /* Out Of Bounds */ |
1341 | if (row >= nrow) /* Out Of Bounds */ |
1323 | return; |
1342 | return; |
1324 | |
1343 | |
1325 | min_it (num, nrow - row); |
1344 | min_it (num, nrow - row); |
1326 | |
1345 | |
1327 | /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */ |
|
|
1328 | if (rstyle & (RS_RVid | RS_Uline)) |
1346 | if (rstyle & (RS_Blink | RS_RVid | RS_Uline)) |
1329 | ren = (rend_t) ~RS_None; |
1347 | ren = (rend_t) ~RS_None; |
1330 | else if (GET_BASEBG (rstyle) == Color_bg) |
1348 | else if (GET_BASEBG (rstyle) == Color_bg) |
1331 | { |
1349 | { |
1332 | ren = DEFAULT_RSTYLE; |
1350 | ren = DEFAULT_RSTYLE; |
1333 | |
1351 | |
1334 | if (mapped) |
1352 | if (mapped) |
1335 | XClearArea (dpy, vt, 0, |
1353 | XClearArea (dpy, vt, 0, |
1336 | Row2Pixel (row), (unsigned int)width, |
1354 | Row2Pixel (row - view_start), (unsigned int)width, |
1337 | (unsigned int)Height2Pixel (num), False); |
1355 | (unsigned int)Height2Pixel (num), False); |
1338 | } |
1356 | } |
1339 | else |
1357 | else |
1340 | { |
1358 | { |
1341 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1359 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1342 | |
1360 | |
|
|
1361 | if (mapped) |
|
|
1362 | { |
1343 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1363 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1344 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1364 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1345 | XFillRectangle (dpy, vt, gc, |
1365 | XFillRectangle (dpy, vt, gc, |
1346 | 0, Row2Pixel (row), |
1366 | 0, Row2Pixel (row - view_start), |
1347 | (unsigned int)width, |
1367 | (unsigned int)width, |
1348 | (unsigned int)Height2Pixel (num)); |
1368 | (unsigned int)Height2Pixel (num)); |
1349 | gcvalue.foreground = pix_colors[Color_fg]; |
1369 | gcvalue.foreground = pix_colors[Color_fg]; |
1350 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1370 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
|
|
1371 | } |
1351 | } |
1372 | } |
1352 | |
1373 | |
1353 | for (; num--; row++) |
1374 | for (; num--; row++) |
1354 | { |
1375 | { |
1355 | scr_blank_screen_mem (ROW(row), rstyle); |
1376 | scr_blank_screen_mem (ROW(row), rstyle); |
|
|
1377 | |
|
|
1378 | if (row - view_start < nrow) |
1356 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1379 | scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren); |
1357 | } |
1380 | } |
1358 | } |
1381 | } |
1359 | |
1382 | |
1360 | #if !ENABLE_MINIMAL |
1383 | #if !ENABLE_MINIMAL |
1361 | void |
1384 | void |
… | |
… | |
1435 | * Insert/Delete <count> characters from the current position |
1458 | * Insert/Delete <count> characters from the current position |
1436 | */ |
1459 | */ |
1437 | void |
1460 | void |
1438 | rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW |
1461 | rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW |
1439 | { |
1462 | { |
1440 | int col, row; |
|
|
1441 | rend_t tr; |
|
|
1442 | |
|
|
1443 | want_refresh = 1; |
1463 | want_refresh = 1; |
1444 | ZERO_SCROLLBACK (); |
1464 | ZERO_SCROLLBACK (); |
1445 | |
1465 | |
1446 | if (count <= 0) |
1466 | if (count <= 0) |
1447 | return; |
1467 | return; |
… | |
… | |
1449 | scr_do_wrap (); |
1469 | scr_do_wrap (); |
1450 | |
1470 | |
1451 | selection_check (1); |
1471 | selection_check (1); |
1452 | min_it (count, ncol - screen.cur.col); |
1472 | min_it (count, ncol - screen.cur.col); |
1453 | |
1473 | |
1454 | row = screen.cur.row; |
1474 | int row = screen.cur.row; |
1455 | |
1475 | |
1456 | line_t *line = &ROW(row); |
1476 | line_t *line = &ROW(row); |
1457 | |
1477 | |
1458 | line->touch (); |
1478 | line->touch (); |
1459 | line->is_longer (0); |
1479 | line->is_longer (0); |
1460 | |
1480 | |
|
|
1481 | // nuke wide spanning the start |
|
|
1482 | if (line->t[screen.cur.col] == NOCHAR) |
|
|
1483 | scr_kill_char (*line, screen.cur.col); |
|
|
1484 | |
1461 | switch (insdel) |
1485 | switch (insdel) |
1462 | { |
1486 | { |
1463 | case INSERT: |
1487 | case INSERT: |
1464 | for (col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1488 | line->l = min (line->l + count, ncol); |
|
|
1489 | |
|
|
1490 | if (line->t[screen.cur.col] == NOCHAR) |
|
|
1491 | scr_kill_char (*line, screen.cur.col); |
|
|
1492 | |
|
|
1493 | for (int col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1465 | { |
1494 | { |
1466 | line->t[col] = line->t[col - count]; |
1495 | line->t[col] = line->t[col - count]; |
1467 | line->r[col] = line->r[col - count]; |
1496 | line->r[col] = line->r[col - count]; |
1468 | } |
1497 | } |
1469 | |
|
|
1470 | line->l = min (line->l + count, ncol); |
|
|
1471 | |
1498 | |
1472 | if (selection.op && current_screen == selection.screen |
1499 | if (selection.op && current_screen == selection.screen |
1473 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1500 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1474 | { |
1501 | { |
1475 | if (selection.end.row != screen.cur.row |
1502 | if (selection.end.row != screen.cur.row |
… | |
… | |
1490 | case ERASE: |
1517 | case ERASE: |
1491 | screen.cur.col += count; /* don't worry if > ncol */ |
1518 | screen.cur.col += count; /* don't worry if > ncol */ |
1492 | selection_check (1); |
1519 | selection_check (1); |
1493 | screen.cur.col -= count; |
1520 | screen.cur.col -= count; |
1494 | |
1521 | |
1495 | line->l = max (line->l - count, 0); |
1522 | // nuke wide char after the end |
|
|
1523 | if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR) |
|
|
1524 | scr_kill_char (*line, screen.cur.col + count); |
|
|
1525 | |
1496 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1526 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1497 | break; |
1527 | break; |
1498 | |
1528 | |
1499 | case DELETE: |
1529 | case DELETE: |
1500 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1530 | line->l = max (line->l - count, 0); |
1501 | |
1531 | |
|
|
1532 | // nuke wide char spanning the end |
|
|
1533 | if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR) |
|
|
1534 | scr_kill_char (*line, screen.cur.col + count); |
|
|
1535 | |
1502 | for (col = screen.cur.col; (col + count) < ncol; col++) |
1536 | for (int col = screen.cur.col; (col + count) < ncol; col++) |
1503 | { |
1537 | { |
1504 | line->t[col] = line->t[col + count]; |
1538 | line->t[col] = line->t[col + count]; |
1505 | line->r[col] = line->r[col + count]; |
1539 | line->r[col] = line->r[col + count]; |
1506 | } |
1540 | } |
1507 | |
1541 | |
1508 | line->l = max (line->l - count, 0); |
|
|
1509 | scr_blank_line (*line, ncol - count, count, tr); |
1542 | scr_blank_line (*line, ncol - count, count, rstyle); |
1510 | |
1543 | |
1511 | if (selection.op && current_screen == selection.screen |
1544 | if (selection.op && current_screen == selection.screen |
1512 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1545 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1513 | { |
1546 | { |
1514 | if (selection.end.row != screen.cur.row |
1547 | if (selection.end.row != screen.cur.row |
… | |
… | |
1650 | { |
1683 | { |
1651 | rvideo_state = on; |
1684 | rvideo_state = on; |
1652 | |
1685 | |
1653 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1686 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1654 | #ifdef HAVE_BG_PIXMAP |
1687 | #ifdef HAVE_BG_PIXMAP |
1655 | if (bgPixmap.pixmap == None) |
1688 | if (bg_pixmap == None) |
1656 | #endif |
1689 | #endif |
1657 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1690 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1658 | |
1691 | |
1659 | XGCValues gcvalue; |
1692 | XGCValues gcvalue; |
1660 | gcvalue.foreground = pix_colors[Color_fg]; |
1693 | gcvalue.foreground = pix_colors[Color_fg]; |
… | |
… | |
1804 | for (i = PART_BEG; i < RC_COUNT; i++) |
1837 | for (i = PART_BEG; i < RC_COUNT; i++) |
1805 | { |
1838 | { |
1806 | min_it (rc[i].col, ncol - 1); |
1839 | min_it (rc[i].col, ncol - 1); |
1807 | min_it (rc[i].row, nrow - 1); |
1840 | min_it (rc[i].row, nrow - 1); |
1808 | } |
1841 | } |
1809 | // TODO: this line somehow causes segfault if scr_expose() is called just after resize |
1842 | |
1810 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1843 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1811 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1844 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1812 | |
1845 | |
1813 | num_scr_allow = 0; |
1846 | num_scr_allow = 0; |
1814 | |
1847 | |
… | |
… | |
1892 | XMapWindow (dpy, parent[0]); |
1925 | XMapWindow (dpy, parent[0]); |
1893 | # endif |
1926 | # endif |
1894 | |
1927 | |
1895 | # if ENABLE_FRILLS |
1928 | # if ENABLE_FRILLS |
1896 | if (option (Opt_urgentOnBell)) |
1929 | if (option (Opt_urgentOnBell)) |
1897 | { |
1930 | set_urgency (1); |
1898 | if (XWMHints *h = XGetWMHints(dpy, parent[0])) |
|
|
1899 | { |
|
|
1900 | h->flags |= XUrgencyHint; |
|
|
1901 | XSetWMHints (dpy, parent[0], h); |
|
|
1902 | } |
|
|
1903 | } |
|
|
1904 | # endif |
1931 | # endif |
1905 | |
1932 | |
1906 | if (option (Opt_visualBell)) |
1933 | if (option (Opt_visualBell)) |
1907 | { |
1934 | { |
1908 | rvideo_bell = true; |
1935 | rvideo_bell = true; |
… | |
… | |
1911 | |
1938 | |
1912 | bell_ev.start (VISUAL_BELL_DURATION); |
1939 | bell_ev.start (VISUAL_BELL_DURATION); |
1913 | } |
1940 | } |
1914 | else |
1941 | else |
1915 | XBell (dpy, 0); |
1942 | XBell (dpy, 0); |
|
|
1943 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1916 | #endif |
1944 | #endif |
1917 | } |
1945 | } |
1918 | |
1946 | |
1919 | /* ------------------------------------------------------------------------- */ |
1947 | /* ------------------------------------------------------------------------- */ |
1920 | /* ARGSUSED */ |
1948 | /* ARGSUSED */ |
1921 | void |
1949 | void |
1922 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1950 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1923 | { |
1951 | { |
1924 | #ifdef PRINTPIPE |
1952 | #ifdef PRINTPIPE |
1925 | int nrows, row_start; |
1953 | int nrows, row_start; |
1926 | FILE *fd; |
1954 | FILE *fd = popen_printer (); |
1927 | |
1955 | |
1928 | if ((fd = popen_printer ()) == NULL) |
1956 | if (!fd) |
1929 | return; |
1957 | return; |
1930 | |
1958 | |
1931 | if (fullhist) |
1959 | if (fullhist) |
1932 | { |
1960 | { |
1933 | nrows = nrow - top_row; |
1961 | nrows = nrow - top_row; |
… | |
… | |
1939 | row_start = view_start; |
1967 | row_start = view_start; |
1940 | } |
1968 | } |
1941 | |
1969 | |
1942 | wctomb (0, 0); |
1970 | wctomb (0, 0); |
1943 | |
1971 | |
1944 | for (int r1 = 0; r1 < nrows; r1++) |
1972 | for (int r1 = row_start; r1 < row_start + nrows; r1++) |
1945 | { |
1973 | { |
1946 | text_t *tp = ROW(r1).t; |
1974 | text_t *tp = ROW(r1).t; |
1947 | int len = ROW(r1).l; |
1975 | int len = ROW(r1).l; |
1948 | |
1976 | |
1949 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
1977 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
… | |
… | |
1978 | * screen.text/screen.rend contain what the screen will change to. |
2006 | * screen.text/screen.rend contain what the screen will change to. |
1979 | */ |
2007 | */ |
1980 | void |
2008 | void |
1981 | rxvt_term::scr_refresh () NOTHROW |
2009 | rxvt_term::scr_refresh () NOTHROW |
1982 | { |
2010 | { |
1983 | unsigned char have_bg, |
|
|
1984 | showcursor; /* show the cursor */ |
|
|
1985 | int16_t col, row, /* column/row we're processing */ |
2011 | int16_t col, row, /* column/row we're processing */ |
1986 | ocrow; /* old cursor row */ |
2012 | ocrow; /* old cursor row */ |
1987 | int i; /* tmp */ |
2013 | int i; /* tmp */ |
1988 | #ifndef NO_CURSORCOLOR |
2014 | #ifndef NO_CURSORCOLOR |
1989 | rend_t cc1; /* store colours at cursor position (s) */ |
2015 | rend_t cc1; /* store colours at cursor position (s) */ |
… | |
… | |
2000 | /* |
2026 | /* |
2001 | * A: set up vars |
2027 | * A: set up vars |
2002 | */ |
2028 | */ |
2003 | refresh_count = 0; |
2029 | refresh_count = 0; |
2004 | |
2030 | |
|
|
2031 | unsigned int old_screen_flags = screen.flags; |
2005 | have_bg = 0; |
2032 | char have_bg = 0; |
2006 | #ifdef HAVE_BG_PIXMAP |
2033 | #ifdef HAVE_BG_PIXMAP |
2007 | have_bg = bgPixmap.pixmap != None; |
2034 | have_bg = bg_pixmap != None; |
2008 | #endif |
2035 | #endif |
2009 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2036 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2010 | |
2037 | |
2011 | /* |
2038 | /* |
2012 | * B: reverse any characters which are selected |
2039 | * B: reverse any characters which are selected |
2013 | */ |
2040 | */ |
2014 | scr_reverse_selection (); |
2041 | scr_reverse_selection (); |
|
|
2042 | |
|
|
2043 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
|
|
2044 | #if ENABLE_OVERLAY |
|
|
2045 | scr_swap_overlay (); |
|
|
2046 | #endif |
|
|
2047 | |
|
|
2048 | char showcursor = screen.flags & Screen_VisibleCursor; |
2015 | |
2049 | |
2016 | /* |
2050 | /* |
2017 | * C: set the cursor character (s) |
2051 | * C: set the cursor character (s) |
2018 | */ |
2052 | */ |
2019 | { |
2053 | { |
2020 | unsigned char setoldcursor; |
2054 | unsigned char setoldcursor; |
2021 | |
2055 | |
2022 | showcursor = (screen.flags & Screen_VisibleCursor); |
|
|
2023 | #ifdef CURSOR_BLINK |
2056 | #ifdef CURSOR_BLINK |
2024 | if (hidden_cursor) |
2057 | if (hidden_cursor) |
2025 | showcursor = 0; |
2058 | showcursor = 0; |
2026 | #endif |
2059 | #endif |
2027 | |
2060 | |
… | |
… | |
2055 | ccol2 = bgcolor_of (rstyle); |
2088 | ccol2 = bgcolor_of (rstyle); |
2056 | #else |
2089 | #else |
2057 | ccol2 = Color_bg; |
2090 | ccol2 = Color_bg; |
2058 | #endif |
2091 | #endif |
2059 | |
2092 | |
2060 | if (showcursor && focus) |
2093 | if (focus) |
2061 | { |
2094 | { |
2062 | if (option (Opt_cursorUnderline)) |
2095 | if (option (Opt_cursorUnderline)) |
2063 | *crp ^= RS_Uline; |
2096 | *crp ^= RS_Uline; |
2064 | else |
2097 | else |
2065 | { |
2098 | { |
… | |
… | |
2100 | oldcursor.col = screen.cur.col; |
2133 | oldcursor.col = screen.cur.col; |
2101 | } |
2134 | } |
2102 | } |
2135 | } |
2103 | } |
2136 | } |
2104 | |
2137 | |
2105 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
|
|
2106 | #if ENABLE_OVERLAY |
|
|
2107 | scr_swap_overlay (); |
|
|
2108 | #endif |
|
|
2109 | |
|
|
2110 | #ifndef NO_SLOW_LINK_SUPPORT |
2138 | #ifndef NO_SLOW_LINK_SUPPORT |
2111 | /* |
2139 | /* |
2112 | * D: CopyArea pass - very useful for slower links |
2140 | * D: CopyArea pass - very useful for slower links |
2113 | * This has been deliberately kept simple. |
2141 | * This has been deliberately kept simple. |
2114 | */ |
2142 | */ |
… | |
… | |
2203 | continue; |
2231 | continue; |
2204 | |
2232 | |
2205 | // redraw one or more characters |
2233 | // redraw one or more characters |
2206 | |
2234 | |
2207 | // seek to the beginning of wide characters |
2235 | // seek to the beginning of wide characters |
2208 | while (stp[col] == NOCHAR && col > 0) |
2236 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2209 | --col; |
2237 | --col; |
2210 | |
2238 | |
2211 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2239 | rend_t rend = srp[col]; /* screen rendition (target rendition) */ |
2212 | text_t *text = stp + col; |
2240 | text_t *text = stp + col; |
2213 | int count = 1; |
2241 | int count = 1; |
2214 | |
2242 | |
2215 | dtp[col] = stp[col]; |
2243 | dtp[col] = stp[col]; |
2216 | drp[col] = rend; |
2244 | drp[col] = rend; |
… | |
… | |
2220 | for (i = 0; ++col < ncol; ) |
2248 | for (i = 0; ++col < ncol; ) |
2221 | { |
2249 | { |
2222 | if (stp[col] == NOCHAR) |
2250 | if (stp[col] == NOCHAR) |
2223 | { |
2251 | { |
2224 | dtp[col] = stp[col]; |
2252 | dtp[col] = stp[col]; |
2225 | drp[col] = rend; |
2253 | drp[col] = srp[col]; |
|
|
2254 | |
2226 | count++; |
2255 | count++; |
2227 | i++; |
2256 | i++; |
2228 | |
2257 | |
2229 | continue; |
2258 | continue; |
2230 | } |
2259 | } |
… | |
… | |
2250 | |
2279 | |
2251 | col--; /* went one too far. move back */ |
2280 | col--; /* went one too far. move back */ |
2252 | count -= i; /* dump any matching trailing chars */ |
2281 | count -= i; /* dump any matching trailing chars */ |
2253 | |
2282 | |
2254 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2283 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2255 | while (i && text[count] == NOCHAR) |
2284 | while (expect_false (i && text[count] == NOCHAR)) |
2256 | count++, i--; |
2285 | count++, i--; |
2257 | |
2286 | |
2258 | /* |
2287 | /* |
2259 | * Determine the attributes for the string |
2288 | * Determine the attributes for the string |
2260 | */ |
2289 | */ |
2261 | int fore = fgcolor_of (rend); // desired foreground |
2290 | int fore = fgcolor_of (rend); // desired foreground |
2262 | int back = bgcolor_of (rend); // desired background |
2291 | int back = bgcolor_of (rend); // desired background |
2263 | |
2292 | |
2264 | // only do special processing if any attributes are set, which is unlikely |
2293 | // only do special processing if any attributes are set, which is unlikely |
2265 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2294 | if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) |
2266 | { |
2295 | { |
2267 | bool invert = rend & RS_RVid; |
2296 | bool invert = rend & RS_RVid; |
2268 | |
2297 | |
2269 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2298 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2270 | if (rend & RS_Bold && fore == Color_fg) |
2299 | if (rend & RS_Bold && fore == Color_fg) |
… | |
… | |
2289 | |
2318 | |
2290 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2319 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2291 | fore = Color_UL; |
2320 | fore = Color_UL; |
2292 | #endif |
2321 | #endif |
2293 | |
2322 | |
|
|
2323 | #ifdef OPTION_HC |
|
|
2324 | if (rend & RS_Sel) |
|
|
2325 | { |
|
|
2326 | /* invert the column if no highlightColor is set or it is the |
|
|
2327 | * current cursor column */ |
|
|
2328 | if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2329 | && ISSET_PIXCOLOR (Color_HC)) |
|
|
2330 | { |
|
|
2331 | if (ISSET_PIXCOLOR (Color_HTC)) |
|
|
2332 | fore = Color_HTC; |
|
|
2333 | // if invert is 0 reverse video is set so we use bg color as fg color |
|
|
2334 | else if (!invert) |
|
|
2335 | fore = back; |
|
|
2336 | |
|
|
2337 | back = Color_HC; |
|
|
2338 | invert = 0; |
|
|
2339 | } |
|
|
2340 | } |
|
|
2341 | #endif |
|
|
2342 | |
2294 | if (invert) |
2343 | if (invert) |
2295 | { |
2344 | { |
2296 | #ifdef OPTION_HC |
|
|
2297 | if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2298 | || !ISSET_PIXCOLOR (Color_HC)) |
|
|
2299 | #endif |
|
|
2300 | /* invert the column if no highlightColor is set or it is the |
|
|
2301 | * current cursor column */ |
|
|
2302 | ::swap (fore, back); |
2345 | ::swap (fore, back); |
2303 | #ifdef OPTION_HC |
|
|
2304 | else if (ISSET_PIXCOLOR (Color_HC)) |
|
|
2305 | back = Color_HC; |
|
|
2306 | #endif |
|
|
2307 | |
2346 | |
2308 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2347 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2309 | # ifndef OPTION_HC |
|
|
2310 | if (ISSET_PIXCOLOR (Color_RV)) |
|
|
2311 | back = Color_RV; |
|
|
2312 | # endif |
|
|
2313 | if (fore == back) |
2348 | if (fore == back) |
2314 | { |
2349 | { |
2315 | fore = Color_bg; |
2350 | fore = Color_bg; |
2316 | back = Color_fg; |
2351 | back = Color_fg; |
2317 | } |
2352 | } |
… | |
… | |
2353 | /* |
2388 | /* |
2354 | * Actually do the drawing of the string here |
2389 | * Actually do the drawing of the string here |
2355 | */ |
2390 | */ |
2356 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2391 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2357 | |
2392 | |
2358 | if (have_bg && back == Color_bg) |
2393 | if (expect_true (have_bg && back == Color_bg)) |
2359 | { |
2394 | { |
2360 | // this is very ugly, maybe push it into ->draw? |
2395 | // this is very ugly, maybe push it into ->draw? |
2361 | |
2396 | |
2362 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2397 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2363 | if (text[i] != ' ') |
2398 | if (text[i] != ' ') |
… | |
… | |
2370 | did_clear: ; |
2405 | did_clear: ; |
2371 | } |
2406 | } |
2372 | else |
2407 | else |
2373 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2408 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2374 | |
2409 | |
2375 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2410 | if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) |
2376 | { |
2411 | { |
2377 | #if ENABLE_FRILLS |
2412 | #if ENABLE_FRILLS |
2378 | if (ISSET_PIXCOLOR (Color_underline)) |
2413 | if (ISSET_PIXCOLOR (Color_underline)) |
2379 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2414 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2380 | else |
2415 | else |
… | |
… | |
2385 | xpixel, ypixel + font->ascent + 1, |
2420 | xpixel, ypixel + font->ascent + 1, |
2386 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2421 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2387 | } |
2422 | } |
2388 | } /* for (col....) */ |
2423 | } /* for (col....) */ |
2389 | } /* for (row....) */ |
2424 | } /* for (row....) */ |
2390 | |
|
|
2391 | #if ENABLE_OVERLAY |
|
|
2392 | scr_swap_overlay (); |
|
|
2393 | #endif |
|
|
2394 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2395 | |
2425 | |
2396 | /* |
2426 | /* |
2397 | * G: cleanup cursor and display outline cursor if necessary |
2427 | * G: cleanup cursor and display outline cursor if necessary |
2398 | */ |
2428 | */ |
2399 | if (showcursor) |
2429 | if (showcursor) |
… | |
… | |
2438 | } |
2468 | } |
2439 | |
2469 | |
2440 | /* |
2470 | /* |
2441 | * H: cleanup selection |
2471 | * H: cleanup selection |
2442 | */ |
2472 | */ |
|
|
2473 | #if ENABLE_OVERLAY |
|
|
2474 | scr_swap_overlay (); |
|
|
2475 | #endif |
|
|
2476 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2477 | |
2443 | scr_reverse_selection (); |
2478 | scr_reverse_selection (); |
2444 | |
2479 | |
|
|
2480 | screen.flags = old_screen_flags; |
2445 | num_scr = 0; |
2481 | num_scr = 0; |
2446 | num_scr_allow = 1; |
2482 | num_scr_allow = 1; |
2447 | } |
2483 | } |
2448 | |
2484 | |
2449 | void |
2485 | void |
… | |
… | |
2470 | scr_remap_chars (swap_buf [i]); |
2506 | scr_remap_chars (swap_buf [i]); |
2471 | } |
2507 | } |
2472 | } |
2508 | } |
2473 | |
2509 | |
2474 | void |
2510 | void |
2475 | rxvt_term::scr_recolour () NOTHROW |
2511 | rxvt_term::scr_recolour (bool refresh) NOTHROW |
2476 | { |
2512 | { |
|
|
2513 | bool transparent = false; |
|
|
2514 | |
2477 | #ifdef HAVE_BG_PIXMAP |
2515 | #ifdef HAVE_BG_PIXMAP |
2478 | bgPixmap.apply (); |
2516 | if (bg_pixmap != None) |
2479 | #else |
2517 | { |
|
|
2518 | # ifdef ENABLE_TRANSPARENCY |
|
|
2519 | if (bg_flags & BG_IS_TRANSPARENT) |
|
|
2520 | { |
|
|
2521 | XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap); |
|
|
2522 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
2480 | |
2523 | |
|
|
2524 | transparent = true; |
|
|
2525 | } |
|
|
2526 | else |
|
|
2527 | # endif |
|
|
2528 | { |
|
|
2529 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
|
|
2530 | XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); |
|
|
2531 | } |
|
|
2532 | } |
|
|
2533 | else |
|
|
2534 | #endif |
|
|
2535 | { |
2481 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2536 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
|
|
2537 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
|
|
2538 | } |
|
|
2539 | |
2482 | XClearWindow (dpy, parent[0]); |
2540 | XClearWindow (dpy, parent[0]); |
2483 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
|
|
2484 | |
2541 | |
2485 | if (scrollBar.win) |
2542 | if (scrollBar.win) |
2486 | { |
2543 | { |
|
|
2544 | if (transparent) |
|
|
2545 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
|
|
2546 | else |
2487 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2547 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2488 | scrollBar.state = STATE_IDLE; |
2548 | scrollBar.state = STATE_IDLE; |
2489 | scrollBar.show (0); |
2549 | scrollBar.show (0); |
2490 | } |
2550 | } |
2491 | |
2551 | |
2492 | #endif |
2552 | if (refresh) |
2493 | |
2553 | { |
2494 | /* bgPixmap.apply () does not do the following : */ |
|
|
2495 | scr_clear (); |
2554 | scr_clear (); |
2496 | scr_touch (true); |
2555 | scr_touch (true); |
|
|
2556 | } |
2497 | want_refresh = 1; |
2557 | want_refresh = 1; |
2498 | } |
2558 | } |
2499 | |
2559 | |
2500 | /* ------------------------------------------------------------------------- */ |
2560 | /* ------------------------------------------------------------------------- */ |
2501 | void |
2561 | void |
… | |
… | |
2569 | { |
2629 | { |
2570 | #if !ENABLE_MINIMAL |
2630 | #if !ENABLE_MINIMAL |
2571 | if (selection.rect) |
2631 | if (selection.rect) |
2572 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2632 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2573 | selection.end.row, selection.end.col, |
2633 | selection.end.row, selection.end.col, |
2574 | RS_RVid, RS_RVid | RS_Uline); |
2634 | RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline); |
2575 | else |
2635 | else |
2576 | #endif |
2636 | #endif |
2577 | scr_xor_span (selection.beg.row, selection.beg.col, |
2637 | scr_xor_span (selection.beg.row, selection.beg.col, |
2578 | selection.end.row, selection.end.col, |
2638 | selection.end.row, selection.end.col, |
2579 | RS_RVid); |
2639 | RS_Sel | RS_RVid); |
2580 | } |
2640 | } |
2581 | } |
2641 | } |
2582 | |
2642 | |
2583 | /* ------------------------------------------------------------------------- */ |
2643 | /* ------------------------------------------------------------------------- */ |
2584 | /* |
2644 | /* |
… | |
… | |
2589 | void |
2649 | void |
2590 | rxvt_term::scr_dump (int fd) NOTHROW |
2650 | rxvt_term::scr_dump (int fd) NOTHROW |
2591 | { |
2651 | { |
2592 | int row, wrote; |
2652 | int row, wrote; |
2593 | unsigned int width, towrite; |
2653 | unsigned int width, towrite; |
2594 | char r1[] = "\n"; |
2654 | const char r1[] = "\n"; |
2595 | |
2655 | |
2596 | for (row = saveLines + top_row; |
2656 | for (row = saveLines + top_row; |
2597 | row < saveLines + nrow - 1; row++) |
2657 | row < saveLines + nrow - 1; row++) |
2598 | { |
2658 | { |
2599 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2659 | width = row_buf[row].l >= 0 ? row_buf[row].l |
… | |
… | |
2645 | /* ------------------------------------------------------------------------- */ |
2705 | /* ------------------------------------------------------------------------- */ |
2646 | /* |
2706 | /* |
2647 | * Paste a selection direct to the command fd |
2707 | * Paste a selection direct to the command fd |
2648 | */ |
2708 | */ |
2649 | void |
2709 | void |
2650 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2710 | rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW |
2651 | { |
2711 | { |
2652 | /* convert normal newline chars into common keyboard Return key sequence */ |
2712 | /* convert normal newline chars into common keyboard Return key sequence */ |
2653 | for (unsigned int i = 0; i < len; i++) |
2713 | for (unsigned int i = 0; i < len; i++) |
2654 | if (data[i] == C0_LF) |
2714 | if (data[i] == C0_LF) |
2655 | data[i] = C0_CR; |
2715 | data[i] = C0_CR; |
… | |
… | |
2661 | |
2721 | |
2662 | if (priv_modes & PrivMode_BracketPaste) |
2722 | if (priv_modes & PrivMode_BracketPaste) |
2663 | tt_printf ("\e[201~"); |
2723 | tt_printf ("\e[201~"); |
2664 | } |
2724 | } |
2665 | |
2725 | |
2666 | /* ------------------------------------------------------------------------- */ |
|
|
2667 | /* |
|
|
2668 | * Respond to a notification that a primary selection has been sent |
|
|
2669 | * EXT: SelectionNotify |
|
|
2670 | */ |
|
|
2671 | void |
2726 | void |
2672 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW |
2727 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2673 | { |
2728 | { |
2674 | if (prop == None) /* check for failed XConvertSelection */ |
2729 | if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END))) |
2675 | { |
|
|
2676 | if ((selection_type & Sel_CompoundText)) |
|
|
2677 | { |
|
|
2678 | int selnum = selection_type & Sel_whereMask; |
|
|
2679 | |
|
|
2680 | selection_type = 0; |
|
|
2681 | if (selnum != Sel_direct) |
|
|
2682 | selection_request_other (XA_STRING, selnum); |
|
|
2683 | } |
|
|
2684 | |
|
|
2685 | if ((selection_type & Sel_UTF8String)) |
|
|
2686 | { |
|
|
2687 | int selnum = selection_type & Sel_whereMask; |
|
|
2688 | |
|
|
2689 | selection_type = Sel_CompoundText; |
|
|
2690 | if (selnum != Sel_direct) |
|
|
2691 | selection_request_other (xa[XA_COMPOUND_TEXT], selnum); |
|
|
2692 | else |
|
|
2693 | selection_type = 0; |
|
|
2694 | } |
|
|
2695 | |
|
|
2696 | return; |
|
|
2697 | } |
|
|
2698 | |
|
|
2699 | unsigned long bytes_after; |
|
|
2700 | XTextProperty ct; |
|
|
2701 | |
|
|
2702 | if (XGetWindowProperty (dpy, win, prop, |
|
|
2703 | 0, PROP_SIZE / 4, |
|
|
2704 | delete_prop, AnyPropertyType, |
|
|
2705 | &ct.encoding, &ct.format, |
|
|
2706 | &ct.nitems, &bytes_after, |
|
|
2707 | &ct.value) != Success) |
|
|
2708 | { |
|
|
2709 | ct.value = 0; |
|
|
2710 | goto bailout; |
|
|
2711 | } |
|
|
2712 | |
|
|
2713 | if (ct.encoding == None) |
|
|
2714 | goto bailout; |
|
|
2715 | |
|
|
2716 | if (bytes_after) |
|
|
2717 | { |
|
|
2718 | // fetch and append remaining data |
|
|
2719 | XTextProperty ct2; |
|
|
2720 | |
|
|
2721 | if (XGetWindowProperty (dpy, win, prop, |
|
|
2722 | ct.nitems / 4, (bytes_after + 3) / 4, |
|
|
2723 | delete_prop, AnyPropertyType, |
|
|
2724 | &ct2.encoding, &ct2.format, |
|
|
2725 | &ct2.nitems, &bytes_after, |
|
|
2726 | &ct2.value) != Success) |
|
|
2727 | goto bailout; |
|
|
2728 | |
|
|
2729 | // realloc should be compatible to XFree, here, and elsewhere, too |
|
|
2730 | ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); |
|
|
2731 | memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); |
|
|
2732 | ct.nitems += ct2.nitems; |
|
|
2733 | |
|
|
2734 | XFree (ct2.value); |
|
|
2735 | } |
|
|
2736 | |
|
|
2737 | if (ct.value == 0) |
|
|
2738 | goto bailout; |
|
|
2739 | |
|
|
2740 | if (ct.encoding == xa[XA_INCR]) |
|
|
2741 | { |
|
|
2742 | // INCR selection, start handshake |
|
|
2743 | if (!delete_prop) |
|
|
2744 | XDeleteProperty (dpy, win, prop); |
|
|
2745 | |
|
|
2746 | selection_wait = Sel_incr; |
|
|
2747 | incr_buf_fill = 0; |
|
|
2748 | incr_ev.start (10); |
|
|
2749 | |
|
|
2750 | goto bailout; |
|
|
2751 | } |
|
|
2752 | |
|
|
2753 | if (ct.nitems == 0) |
|
|
2754 | { |
|
|
2755 | if (selection_wait == Sel_incr) |
|
|
2756 | { |
|
|
2757 | XFree (ct.value); |
|
|
2758 | |
|
|
2759 | // finally complete, now paste the whole thing |
|
|
2760 | selection_wait = Sel_normal; |
|
|
2761 | ct.value = (unsigned char *)incr_buf; |
|
|
2762 | ct.nitems = incr_buf_fill; |
|
|
2763 | incr_buf = 0; |
|
|
2764 | incr_buf_size = 0; |
|
|
2765 | incr_ev.stop (); |
|
|
2766 | } |
|
|
2767 | else |
|
|
2768 | { |
|
|
2769 | if (selection_wait == Sel_normal |
|
|
2770 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
|
|
2771 | { |
|
|
2772 | /* |
|
|
2773 | * pass through again trying CUT_BUFFER0 if we've come from |
|
|
2774 | * XConvertSelection () but nothing was presented |
|
|
2775 | */ |
|
|
2776 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
|
|
2777 | } |
|
|
2778 | |
|
|
2779 | goto bailout; |
|
|
2780 | } |
|
|
2781 | } |
|
|
2782 | else if (selection_wait == Sel_incr) |
|
|
2783 | { |
|
|
2784 | incr_ev.start (10); |
|
|
2785 | |
|
|
2786 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
|
|
2787 | { |
|
|
2788 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
|
|
2789 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
|
|
2790 | } |
|
|
2791 | |
|
|
2792 | memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); |
|
|
2793 | incr_buf_fill += ct.nitems; |
|
|
2794 | |
|
|
2795 | goto bailout; |
|
|
2796 | } |
|
|
2797 | |
|
|
2798 | char **cl; |
|
|
2799 | int cr; |
|
|
2800 | |
|
|
2801 | #if !ENABLE_MINIMAL |
|
|
2802 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
|
|
2803 | // so recode it manually |
|
|
2804 | if (ct.encoding == xa[XA_UTF8_STRING]) |
|
|
2805 | { |
|
|
2806 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
|
|
2807 | char *s = rxvt_wcstombs (w); |
|
|
2808 | free (w); |
|
|
2809 | // TODO: strlen == only the first element will be converted. well... |
|
|
2810 | paste (s, strlen (s)); |
|
|
2811 | free (s); |
|
|
2812 | } |
|
|
2813 | else |
|
|
2814 | #endif |
|
|
2815 | if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0 |
|
|
2816 | && cl) |
|
|
2817 | { |
|
|
2818 | for (int i = 0; i < cr; i++) |
|
|
2819 | paste (cl[i], strlen (cl[i])); |
|
|
2820 | |
|
|
2821 | XFreeStringList (cl); |
|
|
2822 | } |
|
|
2823 | else |
|
|
2824 | paste ((char *)ct.value, ct.nitems); // paste raw |
|
|
2825 | |
|
|
2826 | bailout: |
|
|
2827 | XFree (ct.value); |
|
|
2828 | |
|
|
2829 | if (selection_wait == Sel_normal) |
|
|
2830 | selection_wait = Sel_none; |
|
|
2831 | } |
|
|
2832 | |
|
|
2833 | void |
|
|
2834 | rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW |
|
|
2835 | { |
|
|
2836 | selection_wait = Sel_none; |
|
|
2837 | |
|
|
2838 | incr_buf_size = 0; |
|
|
2839 | free (incr_buf); |
|
|
2840 | |
|
|
2841 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
|
|
2842 | } |
|
|
2843 | |
|
|
2844 | void |
|
|
2845 | rxvt_term::selection_property (Window win, Atom prop) NOTHROW |
|
|
2846 | { |
|
|
2847 | if (prop == None || selection_wait != Sel_incr) |
|
|
2848 | return; |
2730 | return; |
2849 | |
2731 | |
2850 | selection_paste (win, prop, true); |
2732 | tt_paste (data, len); |
2851 | } |
2733 | } |
2852 | |
2734 | |
2853 | /* ------------------------------------------------------------------------- */ |
2735 | /* ------------------------------------------------------------------------- */ |
2854 | /* |
2736 | /* |
2855 | * Request the current selection: |
2737 | * Request the current selection: |
… | |
… | |
2858 | * > CUT_BUFFER0 |
2740 | * > CUT_BUFFER0 |
2859 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2741 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2860 | * will auto fallback to CUT_BUFFER0 |
2742 | * will auto fallback to CUT_BUFFER0 |
2861 | * EXT: button 2 release |
2743 | * EXT: button 2 release |
2862 | */ |
2744 | */ |
|
|
2745 | |
|
|
2746 | static void |
|
|
2747 | selection_cb (char *data, unsigned int len, rxvt_selection *rs) |
|
|
2748 | { |
|
|
2749 | rxvt_term *term = (rxvt_term *)rs->user_data; |
|
|
2750 | |
|
|
2751 | if (data) |
|
|
2752 | term->paste (data, len); |
|
|
2753 | delete rs; |
|
|
2754 | term->selection_req = 0; |
|
|
2755 | } |
|
|
2756 | |
2863 | void |
2757 | void |
2864 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2758 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2865 | { |
2759 | { |
2866 | if (selection.text && selnum == Sel_Primary) |
2760 | if (selection.text && selnum == Sel_Primary) |
2867 | { |
2761 | { |
… | |
… | |
2869 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2763 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2870 | paste (str, strlen (str)); |
2764 | paste (str, strlen (str)); |
2871 | free (str); |
2765 | free (str); |
2872 | return; |
2766 | return; |
2873 | } |
2767 | } |
2874 | else |
2768 | else if (!selection_req) |
2875 | { |
|
|
2876 | selection_request_time = tm; |
|
|
2877 | selection_wait = Sel_normal; |
|
|
2878 | |
|
|
2879 | #if X_HAVE_UTF8_STRING |
|
|
2880 | selection_type = Sel_UTF8String; |
|
|
2881 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
|
|
2882 | return; |
|
|
2883 | #else |
|
|
2884 | selection_type = Sel_CompoundText; |
|
|
2885 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
|
|
2886 | return; |
|
|
2887 | #endif |
|
|
2888 | } |
2769 | { |
2889 | |
2770 | selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], selection_cb, this); |
2890 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2771 | selection_req->run (); |
2891 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
|
|
2892 | } |
|
|
2893 | |
|
|
2894 | int |
|
|
2895 | rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW |
|
|
2896 | { |
|
|
2897 | Atom sel; |
|
|
2898 | |
|
|
2899 | selection_type |= selnum; |
|
|
2900 | |
|
|
2901 | if (selnum == Sel_Primary) |
|
|
2902 | sel = XA_PRIMARY; |
|
|
2903 | else if (selnum == Sel_Secondary) |
|
|
2904 | sel = XA_SECONDARY; |
|
|
2905 | else |
|
|
2906 | sel = xa[XA_CLIPBOARD]; |
|
|
2907 | |
|
|
2908 | if (XGetSelectionOwner (dpy, sel) != None) |
|
|
2909 | { |
2772 | } |
2910 | XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION], |
|
|
2911 | vt, selection_request_time); |
|
|
2912 | return 1; |
|
|
2913 | } |
|
|
2914 | |
|
|
2915 | return 0; |
|
|
2916 | } |
2773 | } |
2917 | |
2774 | |
2918 | /* ------------------------------------------------------------------------- */ |
2775 | /* ------------------------------------------------------------------------- */ |
2919 | /* |
2776 | /* |
2920 | * Clear all selected text |
2777 | * Clear all selected text |
2921 | * EXT: SelectionClear |
2778 | * EXT: SelectionClear |
2922 | */ |
2779 | */ |
2923 | void |
2780 | void |
2924 | rxvt_term::selection_clear () NOTHROW |
2781 | rxvt_term::selection_clear (bool clipboard) NOTHROW |
2925 | { |
2782 | { |
|
|
2783 | if (!clipboard) |
|
|
2784 | { |
2926 | want_refresh = 1; |
2785 | want_refresh = 1; |
2927 | free (selection.text); |
2786 | free (selection.text); |
2928 | selection.text = NULL; |
2787 | selection.text = NULL; |
2929 | selection.len = 0; |
2788 | selection.len = 0; |
2930 | CLEAR_SELECTION (); |
2789 | CLEAR_SELECTION (); |
2931 | |
2790 | |
2932 | if (display->selection_owner == this) |
2791 | if (display->selection_owner == this) |
2933 | display->selection_owner = 0; |
2792 | display->selection_owner = 0; |
|
|
2793 | } |
|
|
2794 | else |
|
|
2795 | { |
|
|
2796 | free (selection.clip_text); |
|
|
2797 | selection.clip_text = NULL; |
|
|
2798 | selection.clip_len = 0; |
|
|
2799 | |
|
|
2800 | if (display->clipboard_owner == this) |
|
|
2801 | display->clipboard_owner = 0; |
|
|
2802 | } |
2934 | } |
2803 | } |
2935 | |
2804 | |
2936 | /* ------------------------------------------------------------------------- */ |
2805 | /* ------------------------------------------------------------------------- */ |
2937 | /* |
2806 | /* |
2938 | * Copy a selection into the cut buffer |
2807 | * Copy a selection into the cut buffer |
2939 | * EXT: button 1 or 3 release |
2808 | * EXT: button 1 or 3 release |
2940 | */ |
2809 | */ |
2941 | void |
2810 | void |
2942 | rxvt_term::selection_make (Time tm) |
2811 | rxvt_term::selection_make (Time tm) |
2943 | { |
2812 | { |
2944 | int i; |
2813 | int size; |
2945 | wchar_t *new_selection_text; |
2814 | wchar_t *new_selection_text; |
2946 | text_t *t; |
2815 | text_t *t; |
2947 | |
2816 | |
2948 | switch (selection.op) |
2817 | switch (selection.op) |
2949 | { |
2818 | { |
… | |
… | |
2965 | return; /* nothing selected, go away */ |
2834 | return; /* nothing selected, go away */ |
2966 | |
2835 | |
2967 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
2836 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
2968 | return; |
2837 | return; |
2969 | |
2838 | |
2970 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2839 | size = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2971 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2840 | new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t)); |
2972 | |
2841 | |
2973 | int ofs = 0; |
2842 | int ofs = 0; |
2974 | int extra = 0; |
2843 | int extra = 0; |
2975 | |
2844 | |
2976 | int col = selection.beg.col; |
2845 | int col = selection.beg.col; |
… | |
… | |
2982 | { |
2851 | { |
2983 | #if !ENABLE_MINIMAL |
2852 | #if !ENABLE_MINIMAL |
2984 | if (selection.rect) |
2853 | if (selection.rect) |
2985 | { |
2854 | { |
2986 | col = selection.beg.col; |
2855 | col = selection.beg.col; |
2987 | end_col = ncol + 1; |
2856 | end_col = selection.end.col; |
2988 | } |
2857 | } |
2989 | else |
2858 | else |
2990 | #endif |
2859 | #endif |
2991 | end_col = ROW(row).l; |
2860 | end_col = ROW(row).l; |
2992 | |
2861 | |
2993 | col = max (col, 0); |
2862 | col = max (col, 0); |
2994 | |
2863 | |
2995 | if (row == selection.end.row |
2864 | if (row == selection.end.row) |
2996 | #if !ENABLE_MINIMAL |
|
|
2997 | || selection.rect |
|
|
2998 | #endif |
|
|
2999 | ) |
|
|
3000 | min_it (end_col, selection.end.col); |
2865 | min_it (end_col, selection.end.col); |
3001 | |
2866 | |
3002 | t = ROW(row).t + col; |
2867 | t = ROW(row).t + col; |
3003 | |
2868 | |
3004 | for (; col < end_col; col++) |
2869 | for (; col < end_col; col++) |
… | |
… | |
3012 | |
2877 | |
3013 | extra -= (len - 1); |
2878 | extra -= (len - 1); |
3014 | |
2879 | |
3015 | if (extra < 0) |
2880 | if (extra < 0) |
3016 | { |
2881 | { |
3017 | extra += i; |
2882 | extra += size; |
3018 | i += i; |
2883 | size += size; |
3019 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); |
2884 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t)); |
3020 | } |
2885 | } |
3021 | |
2886 | |
3022 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
2887 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
3023 | } |
2888 | } |
3024 | #endif |
2889 | #endif |
… | |
… | |
3036 | |
2901 | |
3037 | new_selection_text[ofs++] = C0_LF; |
2902 | new_selection_text[ofs++] = C0_LF; |
3038 | } |
2903 | } |
3039 | else |
2904 | else |
3040 | #endif |
2905 | #endif |
3041 | if (!ROW(row).is_longer () && row != selection.end.row) |
2906 | if (!ROW(row).is_longer () |
|
|
2907 | && (row != selection.end.row || end_col != selection.end.col) |
|
|
2908 | && (row != selection.beg.row || selection.beg.col < ncol)) |
3042 | new_selection_text[ofs++] = C0_LF; |
2909 | new_selection_text[ofs++] = C0_LF; |
3043 | } |
2910 | } |
3044 | |
|
|
3045 | if (end_col != selection.end.col) |
|
|
3046 | new_selection_text[ofs++] = C0_LF; |
|
|
3047 | |
2911 | |
3048 | new_selection_text[ofs] = 0; |
2912 | new_selection_text[ofs] = 0; |
3049 | |
2913 | |
3050 | if (ofs == 0) |
2914 | if (ofs == 0) |
3051 | { |
2915 | { |
… | |
… | |
3064 | |
2928 | |
3065 | selection_grab (tm); |
2929 | selection_grab (tm); |
3066 | } |
2930 | } |
3067 | |
2931 | |
3068 | bool |
2932 | bool |
3069 | rxvt_term::selection_grab (Time tm) NOTHROW |
2933 | rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW |
3070 | { |
2934 | { |
|
|
2935 | Atom sel; |
|
|
2936 | |
|
|
2937 | if (!clipboard) |
|
|
2938 | { |
3071 | selection_time = tm; |
2939 | selection_time = tm; |
|
|
2940 | sel = XA_PRIMARY; |
|
|
2941 | } |
|
|
2942 | else |
|
|
2943 | { |
|
|
2944 | clipboard_time = tm; |
|
|
2945 | sel = xa[XA_CLIPBOARD]; |
|
|
2946 | } |
3072 | |
2947 | |
3073 | XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); |
2948 | XSetSelectionOwner (dpy, sel, vt, tm); |
3074 | if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) |
2949 | if (XGetSelectionOwner (dpy, sel) == vt) |
3075 | { |
2950 | { |
3076 | display->set_selection_owner (this); |
2951 | display->set_selection_owner (this, clipboard); |
3077 | return true; |
2952 | return true; |
3078 | } |
2953 | } |
3079 | else |
2954 | else |
3080 | { |
2955 | { |
3081 | selection_clear (); |
2956 | selection_clear (clipboard); |
3082 | return false; |
2957 | return false; |
3083 | } |
2958 | } |
3084 | |
2959 | |
3085 | #if 0 |
2960 | #if 0 |
3086 | XTextProperty ct; |
2961 | XTextProperty ct; |
… | |
… | |
3581 | else if (rq.target == xa[XA_MULTIPLE]) |
3456 | else if (rq.target == xa[XA_MULTIPLE]) |
3582 | { |
3457 | { |
3583 | /* TODO: Handle MULTIPLE */ |
3458 | /* TODO: Handle MULTIPLE */ |
3584 | } |
3459 | } |
3585 | #endif |
3460 | #endif |
3586 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3461 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) |
3587 | { |
3462 | { |
3588 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3463 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3589 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3464 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
|
|
3465 | ev.property = rq.property; |
|
|
3466 | } |
|
|
3467 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3468 | { |
|
|
3469 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
|
|
3470 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
3590 | ev.property = rq.property; |
3471 | ev.property = rq.property; |
3591 | } |
3472 | } |
3592 | else if (rq.target == XA_STRING |
3473 | else if (rq.target == XA_STRING |
3593 | || rq.target == xa[XA_TEXT] |
3474 | || rq.target == xa[XA_TEXT] |
3594 | || rq.target == xa[XA_COMPOUND_TEXT] |
3475 | || rq.target == xa[XA_COMPOUND_TEXT] |
… | |
… | |
3627 | { |
3508 | { |
3628 | target = xa[XA_COMPOUND_TEXT]; |
3509 | target = xa[XA_COMPOUND_TEXT]; |
3629 | style = enc_compound_text; |
3510 | style = enc_compound_text; |
3630 | } |
3511 | } |
3631 | |
3512 | |
3632 | if (selection.text) |
3513 | if (rq.selection == XA_PRIMARY && selection.text) |
3633 | { |
3514 | { |
3634 | cl = selection.text; |
3515 | cl = selection.text; |
3635 | selectlen = selection.len; |
3516 | selectlen = selection.len; |
|
|
3517 | } |
|
|
3518 | else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3519 | { |
|
|
3520 | cl = selection.clip_text; |
|
|
3521 | selectlen = selection.clip_len; |
3636 | } |
3522 | } |
3637 | else |
3523 | else |
3638 | { |
3524 | { |
3639 | cl = L""; |
3525 | cl = L""; |
3640 | selectlen = 0; |
3526 | selectlen = 0; |
… | |
… | |
3708 | h += 2; min_it (h, nrow); |
3594 | h += 2; min_it (h, nrow); |
3709 | |
3595 | |
3710 | x -= 1; clamp_it (x, 0, ncol - w); |
3596 | x -= 1; clamp_it (x, 0, ncol - w); |
3711 | y -= 1; clamp_it (y, 0, nrow - h); |
3597 | y -= 1; clamp_it (y, 0, nrow - h); |
3712 | |
3598 | |
3713 | ov_x = x; ov_y = y; |
3599 | ov.x = x; ov.y = y; |
3714 | ov_w = w; ov_h = h; |
3600 | ov.w = w; ov.h = h; |
3715 | |
3601 | |
3716 | ov_text = new text_t *[h]; |
3602 | ov.text = new text_t *[h]; |
3717 | ov_rend = new rend_t *[h]; |
3603 | ov.rend = new rend_t *[h]; |
3718 | |
3604 | |
3719 | for (y = 0; y < h; y++) |
3605 | for (y = 0; y < h; y++) |
3720 | { |
3606 | { |
3721 | text_t *tp = ov_text[y] = new text_t[w]; |
3607 | text_t *tp = ov.text[y] = new text_t[w]; |
3722 | rend_t *rp = ov_rend[y] = new rend_t[w]; |
3608 | rend_t *rp = ov.rend[y] = new rend_t[w]; |
3723 | |
3609 | |
3724 | text_t t0, t1, t2; |
3610 | text_t t0, t1, t2; |
3725 | rend_t r = OVERLAY_RSTYLE; |
3611 | rend_t r = OVERLAY_RSTYLE; |
3726 | |
3612 | |
3727 | if (y == 0) |
3613 | if (y == 0) |
… | |
… | |
3746 | } |
3632 | } |
3747 | |
3633 | |
3748 | void |
3634 | void |
3749 | rxvt_term::scr_overlay_off () NOTHROW |
3635 | rxvt_term::scr_overlay_off () NOTHROW |
3750 | { |
3636 | { |
3751 | if (!ov_text) |
3637 | if (!ov.text) |
3752 | return; |
3638 | return; |
3753 | |
3639 | |
3754 | want_refresh = 1; |
3640 | want_refresh = 1; |
3755 | |
3641 | |
3756 | for (int y = 0; y < ov_h; y++) |
3642 | for (int y = 0; y < ov.h; y++) |
3757 | { |
3643 | { |
3758 | delete [] ov_text[y]; |
3644 | delete [] ov.text[y]; |
3759 | delete [] ov_rend[y]; |
3645 | delete [] ov.rend[y]; |
3760 | } |
3646 | } |
3761 | |
3647 | |
3762 | delete [] ov_text; ov_text = 0; |
3648 | delete [] ov.text; ov.text = 0; |
3763 | delete [] ov_rend; ov_rend = 0; |
3649 | delete [] ov.rend; ov.rend = 0; |
3764 | } |
3650 | } |
3765 | |
3651 | |
3766 | void |
3652 | void |
3767 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3653 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3768 | { |
3654 | { |
3769 | if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) |
3655 | if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2) |
3770 | return; |
3656 | return; |
3771 | |
3657 | |
3772 | x++, y++; |
3658 | x++, y++; |
3773 | |
3659 | |
3774 | ov_text[y][x] = text; |
3660 | ov.text[y][x] = text; |
3775 | ov_rend[y][x] = rend; |
3661 | ov.rend[y][x] = rend; |
3776 | } |
3662 | } |
3777 | |
3663 | |
3778 | void |
3664 | void |
3779 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3665 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3780 | { |
3666 | { |
… | |
… | |
3799 | } |
3685 | } |
3800 | |
3686 | |
3801 | void |
3687 | void |
3802 | rxvt_term::scr_swap_overlay () NOTHROW |
3688 | rxvt_term::scr_swap_overlay () NOTHROW |
3803 | { |
3689 | { |
3804 | if (!ov_text) |
3690 | if (!ov.text) |
3805 | return; |
3691 | return; |
3806 | |
3692 | |
|
|
3693 | // hide cursor if it is within the overlay area |
|
|
3694 | if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w) |
|
|
3695 | && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h)) |
|
|
3696 | screen.flags &= ~Screen_VisibleCursor; |
|
|
3697 | |
3807 | // swap screen mem with overlay |
3698 | // swap screen mem with overlay |
3808 | for (int y = ov_h; y--; ) |
3699 | for (int y = ov.h; y--; ) |
3809 | { |
3700 | { |
3810 | text_t *t1 = ov_text[y]; |
3701 | text_t *t1 = ov.text[y]; |
3811 | rend_t *r1 = ov_rend[y]; |
3702 | rend_t *r1 = ov.rend[y]; |
3812 | |
3703 | |
3813 | text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; |
3704 | text_t *t2 = ROW(y + ov.y + view_start).t + ov.x; |
3814 | rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; |
3705 | rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x; |
3815 | |
3706 | |
3816 | for (int x = ov_w; x--; ) |
3707 | for (int x = ov.w; x--; ) |
3817 | { |
3708 | { |
3818 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3709 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3819 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3710 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3820 | } |
3711 | } |
3821 | } |
3712 | } |