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