1 | /*---------------------------------------------------------------------------* |
1 | /*---------------------------------------------------------------------------* |
2 | * File: screen.C |
2 | * File: screen.C |
3 | *---------------------------------------------------------------------------* |
3 | *---------------------------------------------------------------------------* |
4 | * |
4 | * |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
6 | * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> |
6 | * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> |
7 | * |
7 | * |
8 | * This program is free software; you can redistribute it and/or modify |
8 | * This program is free software; you can redistribute it and/or modify |
9 | * it under the terms of the GNU General Public License as published by |
9 | * it under the terms of the GNU General Public License as published by |
10 | * the Free Software Foundation; either version 2 of the License, or |
10 | * the Free Software Foundation; either version 2 of the License, or |
11 | * (at your option) any later version. |
11 | * (at your option) any later version. |
… | |
… | |
28 | #include "rxvt.h" /* NECESSARY */ |
28 | #include "rxvt.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
30 | |
30 | |
31 | #include <inttypes.h> |
31 | #include <inttypes.h> |
32 | |
32 | |
33 | #include "salloc.C" // HACK, should be a seperate compile! |
33 | #include "salloc.C" // HACK, should be a separate compile! |
34 | |
34 | |
|
|
35 | static inline void |
35 | static inline void fill_text (text_t *start, text_t value, int len) |
36 | fill_text (text_t *start, text_t value, int len) |
36 | { |
37 | { |
37 | while (len--) |
38 | while (len--) |
38 | *start++ = value; |
39 | *start++ = value; |
39 | } |
40 | } |
40 | |
41 | |
41 | /* ------------------------------------------------------------------------- */ |
42 | /* ------------------------------------------------------------------------- */ |
42 | #define PROP_SIZE 256*1024 |
|
|
43 | #define PASTE_SIZE 32768 |
|
|
44 | #define TABSIZE 8 /* default tab size */ |
43 | #define TABSIZE 8 /* default tab size */ |
45 | |
44 | |
46 | /* ------------------------------------------------------------------------- * |
45 | /* ------------------------------------------------------------------------- * |
47 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
46 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
48 | * ------------------------------------------------------------------------- */ |
47 | * ------------------------------------------------------------------------- */ |
… | |
… | |
83 | ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) |
82 | ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) |
84 | #define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ |
83 | #define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ |
85 | ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) |
84 | ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) |
86 | |
85 | |
87 | /* |
86 | /* |
88 | * CLEAR_ROWS : clear <num> rows starting from row <row> |
|
|
89 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
87 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
90 | * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour |
|
|
91 | */ |
88 | */ |
92 | #define 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) \ |
89 | #define CLEAR_CHARS(x, y, num) \ |
101 | if (mapped) \ |
90 | if (mapped) \ |
102 | XClearArea (dpy, drawBuffer, x, y, \ |
91 | XClearArea (dpy, vt, x, y, \ |
103 | (unsigned int)Width2Pixel (num), \ |
92 | (unsigned int)Width2Pixel (num), \ |
104 | (unsigned int)Height2Pixel (1), False) |
93 | (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 | |
94 | |
112 | /* ------------------------------------------------------------------------- * |
95 | /* ------------------------------------------------------------------------- * |
113 | * SCREEN `COMMON' ROUTINES * |
96 | * SCREEN `COMMON' ROUTINES * |
114 | * ------------------------------------------------------------------------- */ |
97 | * ------------------------------------------------------------------------- */ |
115 | |
98 | |
… | |
… | |
148 | |
131 | |
149 | l.l = 0; |
132 | l.l = 0; |
150 | l.f = 0; |
133 | l.f = 0; |
151 | } |
134 | } |
152 | |
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 | |
153 | /* ------------------------------------------------------------------------- * |
157 | /* ------------------------------------------------------------------------- * |
154 | * SCREEN INITIALISATION * |
158 | * SCREEN INITIALISATION * |
155 | * ------------------------------------------------------------------------- */ |
159 | * ------------------------------------------------------------------------- */ |
156 | |
160 | |
157 | void |
161 | void |
158 | rxvt_term::scr_reset () |
162 | rxvt_term::scr_reset () |
159 | { |
163 | { |
160 | #if ENABLE_OVERLAY |
|
|
161 | scr_overlay_off (); |
|
|
162 | #endif |
|
|
163 | |
|
|
164 | rvideo_mode = false; |
|
|
165 | view_start = 0; |
164 | view_start = 0; |
166 | num_scr = 0; |
165 | num_scr = 0; |
167 | |
166 | |
168 | if (ncol == 0) |
167 | if (ncol == 0) |
169 | ncol = 80; |
168 | ncol = 80; |
… | |
… | |
171 | if (nrow == 0) |
170 | if (nrow == 0) |
172 | nrow = 24; |
171 | nrow = 24; |
173 | |
172 | |
174 | if (ncol == prev_ncol && nrow == prev_nrow) |
173 | if (ncol == prev_ncol && nrow == prev_nrow) |
175 | return; |
174 | return; |
176 | |
|
|
177 | if (current_screen != PRIMARY) |
|
|
178 | scr_swap_screen (); |
|
|
179 | |
175 | |
180 | // we need at least two lines for wrapping to work correctly |
176 | // we need at least two lines for wrapping to work correctly |
181 | while (nrow + saveLines < 2) |
177 | while (nrow + saveLines < 2) |
182 | { |
178 | { |
183 | //TODO//FIXME |
179 | //TODO//FIXME |
… | |
… | |
236 | selection.text = NULL; |
232 | selection.text = NULL; |
237 | selection.len = 0; |
233 | selection.len = 0; |
238 | selection.op = SELECTION_CLEAR; |
234 | selection.op = SELECTION_CLEAR; |
239 | selection.screen = PRIMARY; |
235 | selection.screen = PRIMARY; |
240 | selection.clicks = 0; |
236 | selection.clicks = 0; |
|
|
237 | selection.clip_text = NULL; |
|
|
238 | selection.clip_len = 0; |
241 | } |
239 | } |
242 | else |
240 | else |
243 | { |
241 | { |
244 | /* |
242 | /* |
245 | * add or delete rows as appropriate |
243 | * add or delete rows as appropriate |
… | |
… | |
283 | |
281 | |
284 | if (top_row) |
282 | if (top_row) |
285 | { |
283 | { |
286 | // 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 |
287 | // 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 |
288 | |
287 | |
289 | row_col_t ocur = screen.cur; |
288 | row_col_t ocur = screen.cur; |
290 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
289 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
291 | |
290 | |
292 | do |
291 | do |
293 | { |
292 | { |
294 | p = MOD (p - 1, prev_total_rows); |
293 | p = MOD (p - 1, prev_total_rows); |
295 | #ifdef DEBUG_STRICT |
|
|
296 | assert (old_buf [MOD (p, prev_total_rows)].t); |
294 | assert (old_buf [MOD (p, prev_total_rows)].t); |
297 | #endif |
|
|
298 | int plines = 1; |
295 | int plines = 1; |
299 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
296 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
300 | |
297 | |
301 | 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 ()) |
302 | { |
299 | { |
… | |
… | |
396 | delete old_ta; |
393 | delete old_ta; |
397 | delete old_ra; |
394 | delete old_ra; |
398 | |
395 | |
399 | clamp_it (screen.cur.row, 0, nrow - 1); |
396 | clamp_it (screen.cur.row, 0, nrow - 1); |
400 | clamp_it (screen.cur.col, 0, ncol - 1); |
397 | clamp_it (screen.cur.col, 0, ncol - 1); |
|
|
398 | } |
401 | |
399 | |
402 | free (tabs); |
400 | free (tabs); |
403 | } |
401 | tabs = (char *)rxvt_malloc (ncol); |
|
|
402 | |
|
|
403 | for (int col = ncol; col--; ) |
|
|
404 | tabs [col] = col % TABSIZE == 0; |
404 | |
405 | |
405 | CLEAR_ALL_SELECTION (); |
406 | CLEAR_ALL_SELECTION (); |
406 | |
407 | |
407 | prev_nrow = nrow; |
408 | prev_nrow = nrow; |
408 | prev_ncol = ncol; |
409 | 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 | |
410 | |
418 | tt_winch (); |
411 | tt_winch (); |
419 | |
412 | |
420 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
413 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
421 | } |
414 | } |
… | |
… | |
433 | delete ralloc; ralloc = 0; |
426 | delete ralloc; ralloc = 0; |
434 | |
427 | |
435 | free (row_buf); |
428 | free (row_buf); |
436 | free (swap_buf); |
429 | free (swap_buf); |
437 | free (drawn_buf); |
430 | free (drawn_buf); |
|
|
431 | row_buf = 0; // signal that we freed all the arrays above |
|
|
432 | |
438 | free (tabs); |
433 | free (tabs); |
439 | |
434 | tabs = 0; |
440 | row_buf = 0; // signal that we freed all the arrays |
|
|
441 | } |
435 | } |
442 | } |
436 | } |
443 | |
437 | |
444 | /* ------------------------------------------------------------------------- */ |
438 | /* ------------------------------------------------------------------------- */ |
445 | /* |
439 | /* |
446 | * Hard reset |
440 | * Hard/Soft reset |
447 | */ |
441 | */ |
448 | void |
442 | void |
449 | rxvt_term::scr_poweron () |
443 | rxvt_term::scr_poweron () |
450 | { |
444 | { |
451 | scr_release (); |
445 | scr_release (); |
452 | prev_nrow = prev_ncol = 0; |
446 | prev_nrow = prev_ncol = 0; |
|
|
447 | rvideo_mode = false; |
|
|
448 | scr_soft_reset (); |
453 | scr_reset (); |
449 | scr_reset (); |
454 | |
450 | |
455 | scr_clear (true); |
451 | scr_clear (true); |
456 | 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); |
457 | } |
469 | } |
458 | |
470 | |
459 | /* ------------------------------------------------------------------------- * |
471 | /* ------------------------------------------------------------------------- * |
460 | * PROCESS SCREEN COMMANDS * |
472 | * PROCESS SCREEN COMMANDS * |
461 | * ------------------------------------------------------------------------- */ |
473 | * ------------------------------------------------------------------------- */ |
… | |
… | |
499 | } |
511 | } |
500 | |
512 | |
501 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
513 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
502 | min_it (s->cur.row, nrow - 1); |
514 | min_it (s->cur.row, nrow - 1); |
503 | min_it (s->cur.col, ncol - 1); |
515 | min_it (s->cur.col, ncol - 1); |
504 | #ifdef DEBUG_STRICT |
|
|
505 | assert (s->cur.row >= 0); |
516 | assert (s->cur.row >= 0); |
506 | assert (s->cur.col >= 0); |
517 | assert (s->cur.col >= 0); |
507 | #endif |
|
|
508 | } |
518 | } |
509 | |
519 | |
510 | void |
520 | void |
511 | rxvt_term::scr_swap_screen () |
521 | rxvt_term::scr_swap_screen () |
512 | { |
522 | { |
… | |
… | |
537 | want_refresh = 1; |
547 | want_refresh = 1; |
538 | view_start = 0; |
548 | view_start = 0; |
539 | |
549 | |
540 | selection_check (2); /* check for boundary cross */ |
550 | selection_check (2); /* check for boundary cross */ |
541 | |
551 | |
542 | int i = current_screen; current_screen = scrn; scrn = i; |
552 | current_screen = scrn; |
543 | |
553 | |
544 | #if NSCREENS |
554 | #if NSCREENS |
545 | if (option (Opt_secondaryScreen)) |
555 | if (option (Opt_secondaryScreen)) |
546 | { |
556 | { |
547 | num_scr = 0; |
557 | num_scr = 0; |
… | |
… | |
596 | /* |
606 | /* |
597 | * Change the rendition style for following text |
607 | * Change the rendition style for following text |
598 | */ |
608 | */ |
599 | void |
609 | void |
600 | rxvt_term::scr_rendition (int set, int style) NOTHROW |
610 | rxvt_term::scr_rendition (int set, int style) NOTHROW |
601 | { |
611 | { |
602 | if (set) |
612 | if (set) |
603 | rstyle |= style; |
613 | rstyle |= style; |
604 | else if (style == ~RS_None) |
614 | else if (style == ~RS_None) |
605 | rstyle = DEFAULT_RSTYLE; |
615 | rstyle = DEFAULT_RSTYLE; |
606 | else |
616 | else |
607 | rstyle &= ~style; |
617 | rstyle &= ~style; |
608 | } |
618 | } |
609 | |
619 | |
610 | /* ------------------------------------------------------------------------- */ |
620 | /* ------------------------------------------------------------------------- */ |
611 | /* |
621 | /* |
612 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
622 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
613 | * count positive ==> scroll up |
623 | * count positive ==> scroll up |
… | |
… | |
772 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
782 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
773 | screen.cur.row -= minlines; |
783 | screen.cur.row -= minlines; |
774 | } |
784 | } |
775 | } |
785 | } |
776 | |
786 | |
777 | #ifdef DEBUG_STRICT |
|
|
778 | assert (screen.cur.col < ncol); |
787 | assert (screen.cur.col < ncol); |
779 | assert (screen.cur.row < nrow |
788 | assert (screen.cur.row < nrow |
780 | && screen.cur.row >= top_row); |
789 | && screen.cur.row >= top_row); |
781 | #endif |
|
|
782 | int row = screen.cur.row; |
790 | int row = screen.cur.row; |
783 | |
791 | |
784 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
792 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
785 | |
793 | |
786 | line_t *line = &ROW(row); |
794 | line_t *line = &ROW(row); |
787 | |
795 | |
788 | while (str < strend) |
796 | while (str < strend) |
789 | { |
797 | { |
790 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
798 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
791 | |
799 | |
792 | if (c < 0x20) |
800 | if (expect_false (c < 0x20)) |
793 | if (c == C0_LF) |
801 | if (c == C0_LF) |
794 | { |
802 | { |
795 | max_it (line->l, screen.cur.col); |
803 | max_it (line->l, screen.cur.col); |
796 | |
804 | |
797 | screen.flags &= ~Screen_WrapNext; |
805 | screen.flags &= ~Screen_WrapNext; |
… | |
… | |
816 | { |
824 | { |
817 | scr_tab (1, true); |
825 | scr_tab (1, true); |
818 | continue; |
826 | continue; |
819 | } |
827 | } |
820 | |
828 | |
|
|
829 | if (expect_false ( |
821 | if (checksel /* see if we're writing within selection */ |
830 | checksel /* see if we're writing within selection */ |
822 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
831 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
823 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
832 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
|
|
833 | )) |
824 | { |
834 | { |
825 | checksel = 0; |
835 | checksel = 0; |
826 | /* |
836 | /* |
827 | * If we wrote anywhere in the selected area, kill the selection |
837 | * If we wrote anywhere in the selected area, kill the selection |
828 | * XXX: should we kill the mark too? Possibly, but maybe that |
838 | * XXX: should we kill the mark too? Possibly, but maybe that |
829 | * should be a similar check. |
839 | * should be a similar check. |
830 | */ |
840 | */ |
831 | CLEAR_SELECTION (); |
841 | CLEAR_SELECTION (); |
832 | } |
842 | } |
833 | |
843 | |
834 | if (screen.flags & Screen_WrapNext) |
844 | if (expect_false (screen.flags & Screen_WrapNext)) |
835 | { |
845 | { |
836 | scr_do_wrap (); |
846 | scr_do_wrap (); |
837 | |
847 | |
838 | line->l = ncol; |
848 | line->l = ncol; |
839 | line->is_longer (1); |
849 | line->is_longer (1); |
… | |
… | |
841 | row = screen.cur.row; |
851 | row = screen.cur.row; |
842 | line = &ROW(row); /* _must_ refresh */ |
852 | line = &ROW(row); /* _must_ refresh */ |
843 | } |
853 | } |
844 | |
854 | |
845 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
855 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
846 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
856 | if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
847 | c = 0xfffd; |
857 | c = 0xfffd; |
848 | |
858 | |
849 | // 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 |
850 | // further replacements, as wcwidth might return -1 for the line |
860 | // further replacements, as wcwidth might return -1 for the line |
851 | // drawing characters below as they might be invalid in the current |
861 | // drawing characters below as they might be invalid in the current |
852 | // locale. |
862 | // locale. |
853 | int width = WCWIDTH (c); |
863 | int width = WCWIDTH (c); |
854 | |
864 | |
855 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
865 | if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL |
856 | { |
866 | { |
857 | // vt100 special graphics and line drawing |
867 | // vt100 special graphics and line drawing |
858 | // 5f-7e standard vt100 |
868 | // 5f-7e standard vt100 |
859 | // 40-5e rxvt extension for extra curses acs chars |
869 | // 40-5e rxvt extension for extra curses acs chars |
860 | static uint16_t vt100_0[62] = { // 41 .. 7e |
870 | static uint16_t vt100_0[62] = { // 41 .. 7e |
… | |
… | |
873 | c = vt100_0[c - 0x41]; |
883 | c = vt100_0[c - 0x41]; |
874 | width = 1; // vt100 line drawing characters are always single-width |
884 | width = 1; // vt100 line drawing characters are always single-width |
875 | } |
885 | } |
876 | } |
886 | } |
877 | |
887 | |
878 | if (screen.flags & Screen_Insert) |
888 | if (expect_false (screen.flags & Screen_Insert)) |
879 | scr_insdel_chars (width, INSERT); |
889 | scr_insdel_chars (width, INSERT); |
880 | |
890 | |
881 | if (width != 0) |
891 | if (width != 0) |
882 | { |
892 | { |
883 | #if !UNICODE_3 |
893 | #if !UNICODE_3 |
… | |
… | |
888 | # else |
898 | # else |
889 | c = 0xfffd; |
899 | c = 0xfffd; |
890 | # endif |
900 | # endif |
891 | #endif |
901 | #endif |
892 | |
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 | |
893 | // 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. |
894 | if (line->t[screen.cur.col] == NOCHAR |
923 | if (expect_false (line->t[screen.cur.col] == NOCHAR)) |
895 | || (screen.cur.col < ncol - 1 |
924 | 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 | |
925 | |
925 | line->touch (); |
926 | line->touch (); |
926 | |
927 | |
927 | do |
928 | do |
928 | { |
929 | { |
929 | line->t[screen.cur.col] = c; |
930 | line->t[screen.cur.col] = c; |
930 | line->r[screen.cur.col] = rend; |
931 | line->r[screen.cur.col] = rend; |
931 | |
932 | |
932 | if (screen.cur.col < ncol - 1) |
933 | if (expect_true (screen.cur.col < ncol - 1)) |
933 | screen.cur.col++; |
934 | screen.cur.col++; |
934 | else |
935 | else |
935 | { |
936 | { |
936 | line->l = ncol; |
937 | line->l = ncol; |
937 | if (screen.flags & Screen_Autowrap) |
938 | if (screen.flags & Screen_Autowrap) |
938 | screen.flags |= Screen_WrapNext; |
939 | screen.flags |= Screen_WrapNext; |
939 | break; |
940 | |
|
|
941 | goto end_of_line; |
940 | } |
942 | } |
941 | |
943 | |
942 | c = NOCHAR; |
944 | c = NOCHAR; |
943 | } |
945 | } |
944 | while (--width > 0); |
946 | while (expect_false (--width > 0)); |
945 | |
947 | |
946 | // pad with spaces when overwriting wide character with smaller one |
948 | // pad with spaces when overwriting wide character with smaller one |
947 | if (!width) |
949 | for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++) |
948 | { |
950 | { |
949 | line->touch (); |
951 | line->t[c] = ' '; |
|
|
952 | line->r[c] = rend; |
|
|
953 | } |
950 | |
954 | |
951 | 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) |
952 | { |
972 | { |
953 | line->t[c] = ' '; |
|
|
954 | line->r[c] = rend; |
973 | linep = line; |
|
|
974 | tp = line->t + screen.cur.col - 1; |
|
|
975 | rp = line->r + screen.cur.col - 1; |
955 | } |
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)); |
956 | } |
999 | } |
957 | } |
1000 | } |
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 |
1001 | #endif |
998 | } |
|
|
999 | } |
1002 | } |
1000 | |
1003 | |
1001 | max_it (line->l, screen.cur.col); |
1004 | max_it (line->l, screen.cur.col); |
1002 | |
1005 | |
1003 | #ifdef DEBUG_STRICT |
|
|
1004 | assert (screen.cur.row >= 0); |
1006 | assert (screen.cur.row >= 0); |
1005 | #endif |
|
|
1006 | } |
1007 | } |
1007 | |
1008 | |
1008 | /* ------------------------------------------------------------------------- */ |
1009 | /* ------------------------------------------------------------------------- */ |
1009 | /* |
1010 | /* |
1010 | * 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 |
1011 | * XTERM_SEQ: CTRL-H |
1012 | * XTERM_SEQ: CTRL-H |
1012 | */ |
1013 | */ |
1013 | void |
1014 | void |
1014 | rxvt_term::scr_backspace () NOTHROW |
1015 | rxvt_term::scr_backspace () NOTHROW |
1015 | { |
1016 | { |
1016 | want_refresh = 1; |
|
|
1017 | |
|
|
1018 | if (screen.cur.col == 0) |
1017 | if (screen.cur.col == 0) |
1019 | { |
1018 | { |
1020 | if (screen.cur.row > 0) |
1019 | if (screen.cur.row > 0) |
1021 | { |
1020 | { |
1022 | #ifdef TERMCAP_HAS_BW |
1021 | #ifdef TERMCAP_HAS_BW |
1023 | screen.cur.col = ncol - 1; |
1022 | screen.cur.col = ncol - 1; |
1024 | screen.cur.row--; |
1023 | --screen.cur.row; |
1025 | return; |
1024 | |
|
|
1025 | want_refresh = 1; |
1026 | #endif |
1026 | #endif |
1027 | } |
1027 | } |
1028 | } |
1028 | } |
1029 | else if (!(screen.flags & Screen_WrapNext)) |
1029 | else if (screen.flags & Screen_WrapNext) |
|
|
1030 | screen.flags &= ~Screen_WrapNext; |
|
|
1031 | else |
1030 | scr_gotorc (0, -1, RELATIVE); |
1032 | scr_gotorc (0, -1, RELATIVE); |
1031 | |
|
|
1032 | screen.flags &= ~Screen_WrapNext; |
|
|
1033 | } |
1033 | } |
1034 | |
1034 | |
1035 | /* ------------------------------------------------------------------------- */ |
1035 | /* ------------------------------------------------------------------------- */ |
1036 | /* |
1036 | /* |
1037 | * Process Horizontal Tab |
1037 | * Process Horizontal Tab |
… | |
… | |
1186 | } |
1186 | } |
1187 | } |
1187 | } |
1188 | else |
1188 | else |
1189 | { |
1189 | { |
1190 | if (screen.flags & Screen_Relative) |
1190 | if (screen.flags & Screen_Relative) |
|
|
1191 | { |
1191 | { /* relative origin mode */ |
1192 | /* relative origin mode */ |
1192 | screen.cur.row = row + screen.tscroll; |
1193 | screen.cur.row = row + screen.tscroll; |
1193 | min_it (screen.cur.row, screen.bscroll); |
1194 | min_it (screen.cur.row, screen.bscroll); |
1194 | } |
1195 | } |
1195 | else |
1196 | else |
1196 | screen.cur.row = row; |
1197 | screen.cur.row = row; |
… | |
… | |
1229 | /* |
1230 | /* |
1230 | * Erase part or whole of a line |
1231 | * Erase part or whole of a line |
1231 | * XTERM_SEQ: Clear line to right: ESC [ 0 K |
1232 | * XTERM_SEQ: Clear line to right: ESC [ 0 K |
1232 | * XTERM_SEQ: Clear line to left : ESC [ 1 K |
1233 | * XTERM_SEQ: Clear line to left : ESC [ 1 K |
1233 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
1234 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
|
|
1235 | * extension: clear to right unless wrapped: ESC [ 3 K |
1234 | */ |
1236 | */ |
1235 | void |
1237 | void |
1236 | rxvt_term::scr_erase_line (int mode) NOTHROW |
1238 | rxvt_term::scr_erase_line (int mode) NOTHROW |
1237 | { |
1239 | { |
1238 | unsigned int col, num; |
1240 | unsigned int col, num; |
… | |
… | |
1247 | line.touch (); |
1249 | line.touch (); |
1248 | line.is_longer (0); |
1250 | line.is_longer (0); |
1249 | |
1251 | |
1250 | switch (mode) |
1252 | switch (mode) |
1251 | { |
1253 | { |
|
|
1254 | case 3: |
|
|
1255 | if (screen.flags & Screen_WrapNext) |
|
|
1256 | return; |
|
|
1257 | |
|
|
1258 | /* fall through */ |
|
|
1259 | |
1252 | case 0: /* erase to end of line */ |
1260 | case 0: /* erase to end of line */ |
1253 | col = screen.cur.col; |
1261 | col = screen.cur.col; |
1254 | num = ncol - col; |
1262 | num = ncol - col; |
1255 | min_it (line.l, col); |
1263 | min_it (line.l, col); |
|
|
1264 | |
1256 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1265 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1257 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1266 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1258 | CLEAR_SELECTION (); |
1267 | CLEAR_SELECTION (); |
1259 | break; |
1268 | break; |
|
|
1269 | |
1260 | case 1: /* erase to beginning of line */ |
1270 | case 1: /* erase to beginning of line */ |
1261 | col = 0; |
1271 | col = 0; |
1262 | num = screen.cur.col + 1; |
1272 | num = screen.cur.col + 1; |
|
|
1273 | |
1263 | if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) |
1274 | if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) |
1264 | || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) |
1275 | || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) |
1265 | CLEAR_SELECTION (); |
1276 | CLEAR_SELECTION (); |
1266 | break; |
1277 | break; |
|
|
1278 | |
1267 | case 2: /* erase whole line */ |
1279 | case 2: /* erase whole line */ |
1268 | col = 0; |
1280 | col = 0; |
1269 | num = ncol; |
1281 | num = ncol; |
1270 | line.l = 0; |
1282 | line.l = 0; |
1271 | if (selection.beg.row <= screen.cur.row |
1283 | if (selection.beg.row <= screen.cur.row |
… | |
… | |
1329 | if (row >= nrow) /* Out Of Bounds */ |
1341 | if (row >= nrow) /* Out Of Bounds */ |
1330 | return; |
1342 | return; |
1331 | |
1343 | |
1332 | min_it (num, nrow - row); |
1344 | min_it (num, nrow - row); |
1333 | |
1345 | |
1334 | if (rstyle & (RS_RVid | RS_Uline)) |
1346 | if (rstyle & (RS_Blink | RS_RVid | RS_Uline)) |
1335 | ren = (rend_t) ~RS_None; |
1347 | ren = (rend_t) ~RS_None; |
1336 | else if (GET_BASEBG (rstyle) == Color_bg) |
1348 | else if (GET_BASEBG (rstyle) == Color_bg) |
1337 | { |
1349 | { |
1338 | ren = DEFAULT_RSTYLE; |
1350 | ren = DEFAULT_RSTYLE; |
1339 | CLEAR_ROWS (row, num); |
1351 | |
|
|
1352 | if (mapped) |
|
|
1353 | XClearArea (dpy, vt, 0, |
|
|
1354 | Row2Pixel (row - view_start), (unsigned int)width, |
|
|
1355 | (unsigned int)Height2Pixel (num), False); |
1340 | } |
1356 | } |
1341 | else |
1357 | else |
1342 | { |
1358 | { |
1343 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1359 | ren = rstyle & (RS_fgMask | RS_bgMask); |
|
|
1360 | |
|
|
1361 | if (mapped) |
|
|
1362 | { |
1344 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1363 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1345 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1364 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1346 | ERASE_ROWS (row, num); |
1365 | XFillRectangle (dpy, vt, gc, |
|
|
1366 | 0, Row2Pixel (row - view_start), |
|
|
1367 | (unsigned int)width, |
|
|
1368 | (unsigned int)Height2Pixel (num)); |
1347 | gcvalue.foreground = pix_colors[Color_fg]; |
1369 | gcvalue.foreground = pix_colors[Color_fg]; |
1348 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1370 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
|
|
1371 | } |
1349 | } |
1372 | } |
1350 | |
1373 | |
1351 | for (; num--; row++) |
1374 | for (; num--; row++) |
1352 | { |
1375 | { |
1353 | scr_blank_screen_mem (ROW(row), rstyle); |
1376 | scr_blank_screen_mem (ROW(row), rstyle); |
|
|
1377 | |
|
|
1378 | if (row - view_start < nrow) |
1354 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1379 | scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren); |
1355 | } |
1380 | } |
1356 | } |
1381 | } |
1357 | |
1382 | |
1358 | #if !ENABLE_MINIMAL |
1383 | #if !ENABLE_MINIMAL |
1359 | void |
1384 | void |
… | |
… | |
1433 | * Insert/Delete <count> characters from the current position |
1458 | * Insert/Delete <count> characters from the current position |
1434 | */ |
1459 | */ |
1435 | void |
1460 | void |
1436 | rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW |
1461 | rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW |
1437 | { |
1462 | { |
1438 | int col, row; |
|
|
1439 | rend_t tr; |
|
|
1440 | |
|
|
1441 | want_refresh = 1; |
1463 | want_refresh = 1; |
1442 | ZERO_SCROLLBACK (); |
1464 | ZERO_SCROLLBACK (); |
1443 | |
1465 | |
1444 | if (count <= 0) |
1466 | if (count <= 0) |
1445 | return; |
1467 | return; |
… | |
… | |
1447 | scr_do_wrap (); |
1469 | scr_do_wrap (); |
1448 | |
1470 | |
1449 | selection_check (1); |
1471 | selection_check (1); |
1450 | min_it (count, ncol - screen.cur.col); |
1472 | min_it (count, ncol - screen.cur.col); |
1451 | |
1473 | |
1452 | row = screen.cur.row; |
1474 | int row = screen.cur.row; |
1453 | |
1475 | |
1454 | line_t *line = &ROW(row); |
1476 | line_t *line = &ROW(row); |
1455 | |
1477 | |
1456 | line->touch (); |
1478 | line->touch (); |
1457 | line->is_longer (0); |
1479 | line->is_longer (0); |
1458 | |
1480 | |
|
|
1481 | // nuke wide spanning the start |
|
|
1482 | if (line->t[screen.cur.col] == NOCHAR) |
|
|
1483 | scr_kill_char (*line, screen.cur.col); |
|
|
1484 | |
1459 | switch (insdel) |
1485 | switch (insdel) |
1460 | { |
1486 | { |
1461 | case INSERT: |
1487 | case INSERT: |
1462 | 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--) |
1463 | { |
1494 | { |
1464 | line->t[col] = line->t[col - count]; |
1495 | line->t[col] = line->t[col - count]; |
1465 | line->r[col] = line->r[col - count]; |
1496 | line->r[col] = line->r[col - count]; |
1466 | } |
1497 | } |
1467 | |
|
|
1468 | line->l = min (line->l + count, ncol); |
|
|
1469 | |
1498 | |
1470 | if (selection.op && current_screen == selection.screen |
1499 | if (selection.op && current_screen == selection.screen |
1471 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1500 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1472 | { |
1501 | { |
1473 | if (selection.end.row != screen.cur.row |
1502 | if (selection.end.row != screen.cur.row |
1474 | || (selection.end.col + count >= ncol)) |
1503 | || (selection.end.col + count >= ncol)) |
1475 | CLEAR_SELECTION (); |
1504 | CLEAR_SELECTION (); |
1476 | else |
1505 | else |
|
|
1506 | { |
1477 | { /* shift selection */ |
1507 | /* shift selection */ |
1478 | selection.beg.col += count; |
1508 | selection.beg.col += count; |
1479 | selection.mark.col += count; /* XXX: yes? */ |
1509 | selection.mark.col += count; /* XXX: yes? */ |
1480 | selection.end.col += count; |
1510 | selection.end.col += count; |
1481 | } |
1511 | } |
1482 | } |
1512 | } |
… | |
… | |
1487 | case ERASE: |
1517 | case ERASE: |
1488 | screen.cur.col += count; /* don't worry if > ncol */ |
1518 | screen.cur.col += count; /* don't worry if > ncol */ |
1489 | selection_check (1); |
1519 | selection_check (1); |
1490 | screen.cur.col -= count; |
1520 | screen.cur.col -= count; |
1491 | |
1521 | |
1492 | 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 | |
1493 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1526 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1494 | break; |
1527 | break; |
1495 | |
1528 | |
1496 | case DELETE: |
1529 | case DELETE: |
1497 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1530 | line->l = max (line->l - count, 0); |
1498 | |
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 | |
1499 | for (col = screen.cur.col; (col + count) < ncol; col++) |
1536 | for (int col = screen.cur.col; (col + count) < ncol; col++) |
1500 | { |
1537 | { |
1501 | line->t[col] = line->t[col + count]; |
1538 | line->t[col] = line->t[col + count]; |
1502 | line->r[col] = line->r[col + count]; |
1539 | line->r[col] = line->r[col + count]; |
1503 | } |
1540 | } |
1504 | |
1541 | |
1505 | line->l = max (line->l - count, 0); |
|
|
1506 | scr_blank_line (*line, ncol - count, count, tr); |
1542 | scr_blank_line (*line, ncol - count, count, rstyle); |
1507 | |
1543 | |
1508 | if (selection.op && current_screen == selection.screen |
1544 | if (selection.op && current_screen == selection.screen |
1509 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1545 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1510 | { |
1546 | { |
1511 | if (selection.end.row != screen.cur.row |
1547 | if (selection.end.row != screen.cur.row |
… | |
… | |
1647 | { |
1683 | { |
1648 | rvideo_state = on; |
1684 | rvideo_state = on; |
1649 | |
1685 | |
1650 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1686 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1651 | #ifdef HAVE_BG_PIXMAP |
1687 | #ifdef HAVE_BG_PIXMAP |
1652 | if (bgPixmap.pixmap == None) |
1688 | if (bg_pixmap == None) |
1653 | #endif |
1689 | #endif |
1654 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1690 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1655 | |
1691 | |
1656 | XGCValues gcvalue; |
1692 | XGCValues gcvalue; |
1657 | gcvalue.foreground = pix_colors[Color_fg]; |
1693 | gcvalue.foreground = pix_colors[Color_fg]; |
… | |
… | |
1801 | for (i = PART_BEG; i < RC_COUNT; i++) |
1837 | for (i = PART_BEG; i < RC_COUNT; i++) |
1802 | { |
1838 | { |
1803 | min_it (rc[i].col, ncol - 1); |
1839 | min_it (rc[i].col, ncol - 1); |
1804 | min_it (rc[i].row, nrow - 1); |
1840 | min_it (rc[i].row, nrow - 1); |
1805 | } |
1841 | } |
1806 | // TODO: this line somehow causes segfault if scr_expose() is called just after resize |
1842 | |
1807 | 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++) |
1808 | 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); |
1809 | |
1845 | |
1810 | num_scr_allow = 0; |
1846 | num_scr_allow = 0; |
1811 | |
1847 | |
… | |
… | |
1866 | return true; |
1902 | return true; |
1867 | } |
1903 | } |
1868 | |
1904 | |
1869 | #ifndef NO_BELL |
1905 | #ifndef NO_BELL |
1870 | void |
1906 | void |
1871 | rxvt_term::bell_cb (time_watcher &w) |
1907 | rxvt_term::bell_cb (ev::timer &w, int revents) |
1872 | { |
1908 | { |
1873 | rvideo_bell = false; |
1909 | rvideo_bell = false; |
1874 | scr_rvideo_mode (rvideo_mode); |
1910 | scr_rvideo_mode (rvideo_mode); |
|
|
1911 | refresh_check (); |
1875 | } |
1912 | } |
1876 | #endif |
1913 | #endif |
1877 | |
1914 | |
1878 | /* ------------------------------------------------------------------------- */ |
1915 | /* ------------------------------------------------------------------------- */ |
1879 | void |
1916 | void |
… | |
… | |
1888 | XMapWindow (dpy, parent[0]); |
1925 | XMapWindow (dpy, parent[0]); |
1889 | # endif |
1926 | # endif |
1890 | |
1927 | |
1891 | # if ENABLE_FRILLS |
1928 | # if ENABLE_FRILLS |
1892 | if (option (Opt_urgentOnBell)) |
1929 | if (option (Opt_urgentOnBell)) |
1893 | { |
1930 | 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 |
1931 | # endif |
1901 | |
1932 | |
1902 | if (option (Opt_visualBell)) |
1933 | if (option (Opt_visualBell)) |
1903 | { |
1934 | { |
1904 | rvideo_bell = true; |
1935 | rvideo_bell = true; |
1905 | scr_rvideo_mode (rvideo_mode); |
1936 | scr_rvideo_mode (rvideo_mode); |
1906 | display->flush (); |
1937 | flush (); |
1907 | |
1938 | |
1908 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1939 | bell_ev.start (VISUAL_BELL_DURATION); |
1909 | } |
1940 | } |
1910 | else |
1941 | else |
1911 | XBell (dpy, 0); |
1942 | XBell (dpy, 0); |
|
|
1943 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1912 | #endif |
1944 | #endif |
1913 | } |
1945 | } |
1914 | |
1946 | |
1915 | /* ------------------------------------------------------------------------- */ |
1947 | /* ------------------------------------------------------------------------- */ |
1916 | /* ARGSUSED */ |
1948 | /* ARGSUSED */ |
1917 | void |
1949 | void |
1918 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1950 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1919 | { |
1951 | { |
1920 | #ifdef PRINTPIPE |
1952 | #ifdef PRINTPIPE |
1921 | int nrows, row_start; |
1953 | int nrows, row_start; |
1922 | FILE *fd; |
1954 | FILE *fd = popen_printer (); |
1923 | |
1955 | |
1924 | if ((fd = popen_printer ()) == NULL) |
1956 | if (!fd) |
1925 | return; |
1957 | return; |
1926 | |
1958 | |
1927 | if (fullhist) |
1959 | if (fullhist) |
1928 | { |
1960 | { |
1929 | nrows = nrow - top_row; |
1961 | nrows = nrow - top_row; |
… | |
… | |
1935 | row_start = view_start; |
1967 | row_start = view_start; |
1936 | } |
1968 | } |
1937 | |
1969 | |
1938 | wctomb (0, 0); |
1970 | wctomb (0, 0); |
1939 | |
1971 | |
1940 | for (int r1 = 0; r1 < nrows; r1++) |
1972 | for (int r1 = row_start; r1 < row_start + nrows; r1++) |
1941 | { |
1973 | { |
1942 | text_t *tp = ROW(r1).t; |
1974 | text_t *tp = ROW(r1).t; |
1943 | int len = ROW(r1).l; |
1975 | int len = ROW(r1).l; |
1944 | |
1976 | |
1945 | 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 |
… | |
… | |
1974 | * screen.text/screen.rend contain what the screen will change to. |
2006 | * screen.text/screen.rend contain what the screen will change to. |
1975 | */ |
2007 | */ |
1976 | void |
2008 | void |
1977 | rxvt_term::scr_refresh () NOTHROW |
2009 | rxvt_term::scr_refresh () NOTHROW |
1978 | { |
2010 | { |
1979 | unsigned char have_bg, |
|
|
1980 | showcursor; /* show the cursor */ |
|
|
1981 | int16_t col, row, /* column/row we're processing */ |
2011 | int16_t col, row, /* column/row we're processing */ |
1982 | ocrow; /* old cursor row */ |
2012 | ocrow; /* old cursor row */ |
1983 | int i; /* tmp */ |
2013 | int i; /* tmp */ |
1984 | #ifndef NO_CURSORCOLOR |
2014 | #ifndef NO_CURSORCOLOR |
1985 | rend_t cc1; /* store colours at cursor position (s) */ |
2015 | rend_t cc1; /* store colours at cursor position (s) */ |
… | |
… | |
1994 | return; |
2024 | return; |
1995 | |
2025 | |
1996 | /* |
2026 | /* |
1997 | * A: set up vars |
2027 | * A: set up vars |
1998 | */ |
2028 | */ |
1999 | have_bg = 0; |
|
|
2000 | refresh_count = 0; |
2029 | refresh_count = 0; |
2001 | |
2030 | |
|
|
2031 | unsigned int old_screen_flags = screen.flags; |
|
|
2032 | char have_bg = 0; |
2002 | #ifdef HAVE_BG_PIXMAP |
2033 | #ifdef HAVE_BG_PIXMAP |
2003 | have_bg |= bgPixmap.pixmap != None; |
2034 | have_bg = bg_pixmap != None; |
2004 | #endif |
2035 | #endif |
2005 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2036 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2006 | |
2037 | |
2007 | /* |
2038 | /* |
2008 | * B: reverse any characters which are selected |
2039 | * B: reverse any characters which are selected |
2009 | */ |
2040 | */ |
2010 | 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; |
2011 | |
2049 | |
2012 | /* |
2050 | /* |
2013 | * C: set the cursor character (s) |
2051 | * C: set the cursor character (s) |
2014 | */ |
2052 | */ |
2015 | { |
2053 | { |
2016 | unsigned char setoldcursor; |
2054 | unsigned char setoldcursor; |
2017 | |
2055 | |
2018 | showcursor = (screen.flags & Screen_VisibleCursor); |
|
|
2019 | #ifdef CURSOR_BLINK |
2056 | #ifdef CURSOR_BLINK |
2020 | if (hidden_cursor) |
2057 | if (hidden_cursor) |
2021 | showcursor = 0; |
2058 | showcursor = 0; |
2022 | #endif |
2059 | #endif |
2023 | |
2060 | |
… | |
… | |
2051 | ccol2 = bgcolor_of (rstyle); |
2088 | ccol2 = bgcolor_of (rstyle); |
2052 | #else |
2089 | #else |
2053 | ccol2 = Color_bg; |
2090 | ccol2 = Color_bg; |
2054 | #endif |
2091 | #endif |
2055 | |
2092 | |
2056 | if (showcursor && focus) |
2093 | if (focus) |
2057 | { |
2094 | { |
2058 | if (option (Opt_cursorUnderline)) |
2095 | if (option (Opt_cursorUnderline)) |
2059 | *crp ^= RS_Uline; |
2096 | *crp ^= RS_Uline; |
2060 | else |
2097 | else |
2061 | { |
2098 | { |
… | |
… | |
2096 | oldcursor.col = screen.cur.col; |
2133 | oldcursor.col = screen.cur.col; |
2097 | } |
2134 | } |
2098 | } |
2135 | } |
2099 | } |
2136 | } |
2100 | |
2137 | |
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 |
2138 | #ifndef NO_SLOW_LINK_SUPPORT |
2107 | /* |
2139 | /* |
2108 | * D: CopyArea pass - very useful for slower links |
2140 | * D: CopyArea pass - very useful for slower links |
2109 | * This has been deliberately kept simple. |
2141 | * This has been deliberately kept simple. |
2110 | */ |
2142 | */ |
… | |
… | |
2199 | continue; |
2231 | continue; |
2200 | |
2232 | |
2201 | // redraw one or more characters |
2233 | // redraw one or more characters |
2202 | |
2234 | |
2203 | // seek to the beginning of wide characters |
2235 | // seek to the beginning of wide characters |
2204 | while (stp[col] == NOCHAR && col > 0) |
2236 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2205 | --col; |
2237 | --col; |
2206 | |
2238 | |
2207 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2239 | rend_t rend = srp[col]; /* screen rendition (target rendition) */ |
2208 | text_t *text = stp + col; |
2240 | text_t *text = stp + col; |
2209 | int count = 1; |
2241 | int count = 1; |
2210 | |
2242 | |
2211 | dtp[col] = stp[col]; |
2243 | dtp[col] = stp[col]; |
2212 | drp[col] = rend; |
2244 | drp[col] = rend; |
… | |
… | |
2216 | for (i = 0; ++col < ncol; ) |
2248 | for (i = 0; ++col < ncol; ) |
2217 | { |
2249 | { |
2218 | if (stp[col] == NOCHAR) |
2250 | if (stp[col] == NOCHAR) |
2219 | { |
2251 | { |
2220 | dtp[col] = stp[col]; |
2252 | dtp[col] = stp[col]; |
2221 | drp[col] = rend; |
2253 | drp[col] = srp[col]; |
|
|
2254 | |
2222 | count++; |
2255 | count++; |
2223 | i++; |
2256 | i++; |
2224 | |
2257 | |
2225 | continue; |
2258 | continue; |
2226 | } |
2259 | } |
… | |
… | |
2246 | |
2279 | |
2247 | col--; /* went one too far. move back */ |
2280 | col--; /* went one too far. move back */ |
2248 | count -= i; /* dump any matching trailing chars */ |
2281 | count -= i; /* dump any matching trailing chars */ |
2249 | |
2282 | |
2250 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2283 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2251 | while (i && text[count] == NOCHAR) |
2284 | while (expect_false (i && text[count] == NOCHAR)) |
2252 | count++, i--; |
2285 | count++, i--; |
2253 | |
2286 | |
2254 | /* |
2287 | /* |
2255 | * Determine the attributes for the string |
2288 | * Determine the attributes for the string |
2256 | */ |
2289 | */ |
2257 | int fore = fgcolor_of (rend); // desired foreground |
2290 | int fore = fgcolor_of (rend); // desired foreground |
2258 | int back = bgcolor_of (rend); // desired background |
2291 | int back = bgcolor_of (rend); // desired background |
2259 | |
2292 | |
2260 | // 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 |
2261 | 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))) |
2262 | { |
2295 | { |
2263 | bool invert = rend & RS_RVid; |
2296 | bool invert = rend & RS_RVid; |
2264 | |
2297 | |
2265 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2298 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2266 | if (rend & RS_Bold |
|
|
2267 | && fore == Color_fg) |
2299 | if (rend & RS_Bold && fore == Color_fg) |
2268 | { |
2300 | { |
2269 | if (ISSET_PIXCOLOR (Color_BD)) |
2301 | if (ISSET_PIXCOLOR (Color_BD)) |
2270 | fore = Color_BD; |
2302 | fore = Color_BD; |
2271 | # if !ENABLE_STYLES |
2303 | # if !ENABLE_STYLES |
2272 | else |
2304 | else |
2273 | invert = !invert; |
2305 | invert = !invert; |
2274 | # endif |
2306 | # endif |
2275 | } |
2307 | } |
2276 | |
2308 | |
2277 | if (rend & RS_Italic |
2309 | if (rend & RS_Italic && fore == Color_fg) |
2278 | && fore == Color_fg) |
|
|
2279 | { |
2310 | { |
2280 | if (ISSET_PIXCOLOR (Color_IT)) |
2311 | if (ISSET_PIXCOLOR (Color_IT)) |
2281 | fore = Color_IT; |
2312 | fore = Color_IT; |
2282 | # if !ENABLE_STYLES |
2313 | # if !ENABLE_STYLES |
2283 | else |
2314 | else |
… | |
… | |
2287 | |
2318 | |
2288 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2319 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2289 | fore = Color_UL; |
2320 | fore = Color_UL; |
2290 | #endif |
2321 | #endif |
2291 | |
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 | |
2292 | if (invert) |
2343 | if (invert) |
2293 | { |
2344 | { |
2294 | #ifdef OPTION_HC |
|
|
2295 | if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2296 | || !ISSET_PIXCOLOR (Color_HC)) |
|
|
2297 | #endif |
|
|
2298 | /* invert the column if no highlightColor is set or it is the |
|
|
2299 | * current cursor column */ |
|
|
2300 | ::swap (fore, back); |
2345 | ::swap (fore, back); |
2301 | #ifdef OPTION_HC |
|
|
2302 | else if (ISSET_PIXCOLOR (Color_HC)) |
|
|
2303 | back = Color_HC; |
|
|
2304 | #endif |
|
|
2305 | |
2346 | |
2306 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2347 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2307 | # ifndef OPTION_HC |
|
|
2308 | if (ISSET_PIXCOLOR (Color_RV)) |
|
|
2309 | back = Color_RV; |
|
|
2310 | # endif |
|
|
2311 | if (fore == back) |
2348 | if (fore == back) |
2312 | { |
2349 | { |
2313 | fore = Color_bg; |
2350 | fore = Color_bg; |
2314 | back = Color_fg; |
2351 | back = Color_fg; |
2315 | } |
2352 | } |
… | |
… | |
2317 | } |
2354 | } |
2318 | |
2355 | |
2319 | #ifdef TEXT_BLINK |
2356 | #ifdef TEXT_BLINK |
2320 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2357 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2321 | { |
2358 | { |
2322 | if (!text_blink_ev.active) |
2359 | if (!text_blink_ev.is_active ()) |
2323 | { |
2360 | { |
2324 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
2361 | text_blink_ev.again (); |
2325 | hidden_text = 0; |
2362 | hidden_text = 0; |
2326 | } |
2363 | } |
2327 | else if (hidden_text) |
2364 | else if (hidden_text) |
2328 | fore = back; |
2365 | fore = back; |
2329 | } |
2366 | } |
… | |
… | |
2351 | /* |
2388 | /* |
2352 | * Actually do the drawing of the string here |
2389 | * Actually do the drawing of the string here |
2353 | */ |
2390 | */ |
2354 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2391 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2355 | |
2392 | |
2356 | if (have_bg && back == Color_bg) |
2393 | if (expect_true (have_bg && back == Color_bg)) |
2357 | { |
2394 | { |
2358 | // this is very ugly, maybe push it into ->draw? |
2395 | // this is very ugly, maybe push it into ->draw? |
2359 | |
2396 | |
2360 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2397 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2361 | if (text[i] != ' ') |
2398 | if (text[i] != ' ') |
… | |
… | |
2368 | did_clear: ; |
2405 | did_clear: ; |
2369 | } |
2406 | } |
2370 | else |
2407 | else |
2371 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2408 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2372 | |
2409 | |
2373 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2410 | if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) |
2374 | { |
2411 | { |
2375 | #if ENABLE_FRILLS |
2412 | #if ENABLE_FRILLS |
2376 | if (ISSET_PIXCOLOR (Color_underline)) |
2413 | if (ISSET_PIXCOLOR (Color_underline)) |
2377 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2414 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2378 | else |
2415 | else |
2379 | #endif |
2416 | #endif |
2380 | XSetForeground (dpy, gc, pix_colors[fore]); |
2417 | XSetForeground (dpy, gc, pix_colors[fore]); |
2381 | |
2418 | |
2382 | XDrawLine (dpy, drawBuffer, gc, |
2419 | XDrawLine (dpy, vt, gc, |
2383 | xpixel, ypixel + font->ascent + 1, |
2420 | xpixel, ypixel + font->ascent + 1, |
2384 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2421 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2385 | } |
2422 | } |
2386 | } /* for (col....) */ |
2423 | } /* for (col....) */ |
2387 | } /* for (row....) */ |
2424 | } /* for (row....) */ |
2388 | |
|
|
2389 | #if ENABLE_OVERLAY |
|
|
2390 | scr_swap_overlay (); |
|
|
2391 | #endif |
|
|
2392 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2393 | |
2425 | |
2394 | /* |
2426 | /* |
2395 | * G: cleanup cursor and display outline cursor if necessary |
2427 | * G: cleanup cursor and display outline cursor if necessary |
2396 | */ |
2428 | */ |
2397 | if (showcursor) |
2429 | if (showcursor) |
… | |
… | |
2425 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
2457 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
2426 | else |
2458 | else |
2427 | #endif |
2459 | #endif |
2428 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2460 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2429 | |
2461 | |
2430 | XDrawRectangle (dpy, drawBuffer, gc, |
2462 | XDrawRectangle (dpy, vt, gc, |
2431 | Col2Pixel (col), |
2463 | Col2Pixel (col), |
2432 | Row2Pixel (oldcursor.row), |
2464 | Row2Pixel (oldcursor.row), |
2433 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2465 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2434 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2466 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2435 | } |
2467 | } |
2436 | } |
2468 | } |
2437 | |
2469 | |
2438 | /* |
2470 | /* |
2439 | * H: cleanup selection |
2471 | * H: cleanup selection |
2440 | */ |
2472 | */ |
|
|
2473 | #if ENABLE_OVERLAY |
|
|
2474 | scr_swap_overlay (); |
|
|
2475 | #endif |
|
|
2476 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2477 | |
2441 | scr_reverse_selection (); |
2478 | scr_reverse_selection (); |
2442 | |
2479 | |
|
|
2480 | screen.flags = old_screen_flags; |
2443 | num_scr = 0; |
2481 | num_scr = 0; |
2444 | num_scr_allow = 1; |
2482 | num_scr_allow = 1; |
2445 | } |
2483 | } |
2446 | |
2484 | |
2447 | void |
2485 | void |
… | |
… | |
2468 | scr_remap_chars (swap_buf [i]); |
2506 | scr_remap_chars (swap_buf [i]); |
2469 | } |
2507 | } |
2470 | } |
2508 | } |
2471 | |
2509 | |
2472 | void |
2510 | void |
2473 | rxvt_term::scr_recolour () NOTHROW |
2511 | rxvt_term::scr_recolour (bool refresh) NOTHROW |
2474 | { |
2512 | { |
|
|
2513 | bool transparent = false; |
|
|
2514 | |
2475 | #ifdef HAVE_BG_PIXMAP |
2515 | #ifdef HAVE_BG_PIXMAP |
2476 | bgPixmap.apply (); |
2516 | if (bg_pixmap != None) |
2477 | #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); |
|
|
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 | { |
2478 | 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 | |
2479 | XClearWindow (dpy, parent[0]); |
2540 | XClearWindow (dpy, parent[0]); |
2480 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2541 | |
2481 | # if HAVE_SCROLLBARS |
|
|
2482 | if (scrollBar.win) |
2542 | if (scrollBar.win) |
2483 | { |
2543 | { |
|
|
2544 | if (transparent) |
|
|
2545 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
|
|
2546 | else |
2484 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2547 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2485 | scrollBar.setIdle (); |
2548 | scrollBar.state = STATE_IDLE; |
2486 | scrollbar_show (0); |
2549 | scrollBar.show (0); |
2487 | } |
2550 | } |
2488 | # endif |
2551 | |
|
|
2552 | if (refresh) |
|
|
2553 | { |
2489 | scr_clear (); |
2554 | scr_clear (); |
2490 | scr_touch (true); |
2555 | scr_touch (true); |
|
|
2556 | } |
2491 | want_refresh = 1; |
2557 | want_refresh = 1; |
2492 | #endif |
|
|
2493 | |
|
|
2494 | } |
2558 | } |
2495 | |
2559 | |
2496 | /* ------------------------------------------------------------------------- */ |
2560 | /* ------------------------------------------------------------------------- */ |
2497 | void |
2561 | void |
2498 | rxvt_term::scr_clear (bool really) NOTHROW |
2562 | rxvt_term::scr_clear (bool really) NOTHROW |
… | |
… | |
2565 | { |
2629 | { |
2566 | #if !ENABLE_MINIMAL |
2630 | #if !ENABLE_MINIMAL |
2567 | if (selection.rect) |
2631 | if (selection.rect) |
2568 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2632 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2569 | selection.end.row, selection.end.col, |
2633 | selection.end.row, selection.end.col, |
2570 | RS_RVid, RS_RVid | RS_Uline); |
2634 | RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline); |
2571 | else |
2635 | else |
2572 | #endif |
2636 | #endif |
2573 | scr_xor_span (selection.beg.row, selection.beg.col, |
2637 | scr_xor_span (selection.beg.row, selection.beg.col, |
2574 | selection.end.row, selection.end.col, |
2638 | selection.end.row, selection.end.col, |
2575 | RS_RVid); |
2639 | RS_Sel | RS_RVid); |
2576 | } |
2640 | } |
2577 | } |
2641 | } |
2578 | |
2642 | |
2579 | /* ------------------------------------------------------------------------- */ |
2643 | /* ------------------------------------------------------------------------- */ |
2580 | /* |
2644 | /* |
… | |
… | |
2585 | void |
2649 | void |
2586 | rxvt_term::scr_dump (int fd) NOTHROW |
2650 | rxvt_term::scr_dump (int fd) NOTHROW |
2587 | { |
2651 | { |
2588 | int row, wrote; |
2652 | int row, wrote; |
2589 | unsigned int width, towrite; |
2653 | unsigned int width, towrite; |
2590 | char r1[] = "\n"; |
2654 | const char r1[] = "\n"; |
2591 | |
2655 | |
2592 | for (row = saveLines - nsaved; |
2656 | for (row = saveLines + top_row; |
2593 | row < saveLines + nrow - 1; row++) |
2657 | row < saveLines + nrow - 1; row++) |
2594 | { |
2658 | { |
2595 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2659 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2596 | : ncol; |
2660 | : ncol; |
2597 | for (towrite = width; towrite; towrite -= wrote) |
2661 | for (towrite = width; towrite; towrite -= wrote) |
… | |
… | |
2641 | /* ------------------------------------------------------------------------- */ |
2705 | /* ------------------------------------------------------------------------- */ |
2642 | /* |
2706 | /* |
2643 | * Paste a selection direct to the command fd |
2707 | * Paste a selection direct to the command fd |
2644 | */ |
2708 | */ |
2645 | void |
2709 | void |
2646 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2710 | rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW |
2647 | { |
2711 | { |
2648 | /* convert normal newline chars into common keyboard Return key sequence */ |
2712 | /* convert normal newline chars into common keyboard Return key sequence */ |
2649 | for (unsigned int i = 0; i < len; i++) |
2713 | for (unsigned int i = 0; i < len; i++) |
2650 | if (data[i] == C0_LF) |
2714 | if (data[i] == C0_LF) |
2651 | data[i] = C0_CR; |
2715 | data[i] = C0_CR; |
2652 | |
2716 | |
|
|
2717 | if (priv_modes & PrivMode_BracketPaste) |
|
|
2718 | tt_printf ("\e[200~"); |
|
|
2719 | |
2653 | tt_write (data, len); |
2720 | tt_write (data, len); |
|
|
2721 | |
|
|
2722 | if (priv_modes & PrivMode_BracketPaste) |
|
|
2723 | tt_printf ("\e[201~"); |
|
|
2724 | } |
|
|
2725 | |
|
|
2726 | void |
|
|
2727 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
|
|
2728 | { |
|
|
2729 | if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END))) |
|
|
2730 | return; |
|
|
2731 | |
|
|
2732 | tt_paste (data, len); |
2654 | } |
2733 | } |
2655 | |
2734 | |
2656 | /* ------------------------------------------------------------------------- */ |
2735 | /* ------------------------------------------------------------------------- */ |
2657 | /* |
2736 | /* |
2658 | * Respond to a notification that a primary selection has been sent |
2737 | * Respond to a notification that a primary selection has been sent |
… | |
… | |
2661 | void |
2740 | void |
2662 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW |
2741 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW |
2663 | { |
2742 | { |
2664 | if (prop == None) /* check for failed XConvertSelection */ |
2743 | if (prop == None) /* check for failed XConvertSelection */ |
2665 | { |
2744 | { |
|
|
2745 | int selnum = selection_type & Sel_whereMask; |
|
|
2746 | |
2666 | if ((selection_type & Sel_CompoundText)) |
2747 | if ((selection_type & Sel_CompoundText)) |
2667 | { |
2748 | { |
2668 | int selnum = selection_type & Sel_whereMask; |
|
|
2669 | |
|
|
2670 | selection_type = 0; |
2749 | selection_type = 0; |
2671 | if (selnum != Sel_direct) |
|
|
2672 | selection_request_other (XA_STRING, selnum); |
2750 | selection_request_other (XA_STRING, selnum); |
2673 | } |
2751 | } |
2674 | |
2752 | |
2675 | if ((selection_type & Sel_UTF8String)) |
2753 | if ((selection_type & Sel_UTF8String)) |
2676 | { |
2754 | { |
2677 | int selnum = selection_type & Sel_whereMask; |
|
|
2678 | |
|
|
2679 | selection_type = Sel_CompoundText; |
2755 | selection_type = Sel_CompoundText; |
2680 | if (selnum != Sel_direct) |
|
|
2681 | selection_request_other (xa[XA_COMPOUND_TEXT], selnum); |
2756 | selection_request_other (xa[XA_COMPOUND_TEXT], selnum); |
2682 | else |
|
|
2683 | selection_type = 0; |
|
|
2684 | } |
2757 | } |
2685 | |
2758 | |
2686 | return; |
2759 | return; |
2687 | } |
2760 | } |
2688 | |
2761 | |
2689 | unsigned long bytes_after; |
2762 | unsigned long bytes_after; |
2690 | XTextProperty ct; |
2763 | XTextProperty ct; |
2691 | |
2764 | |
|
|
2765 | // length == (2^31 - 1) / 4, as gdk |
2692 | if (XGetWindowProperty (dpy, win, prop, |
2766 | if (XGetWindowProperty (dpy, win, prop, |
2693 | 0, PROP_SIZE / 4, |
2767 | 0, 0x1fffffff, |
2694 | delete_prop, AnyPropertyType, |
2768 | delete_prop, AnyPropertyType, |
2695 | &ct.encoding, &ct.format, |
2769 | &ct.encoding, &ct.format, |
2696 | &ct.nitems, &bytes_after, |
2770 | &ct.nitems, &bytes_after, |
2697 | &ct.value) != Success) |
2771 | &ct.value) != Success) |
2698 | { |
2772 | { |
… | |
… | |
2701 | } |
2775 | } |
2702 | |
2776 | |
2703 | if (ct.encoding == None) |
2777 | if (ct.encoding == None) |
2704 | goto bailout; |
2778 | goto bailout; |
2705 | |
2779 | |
2706 | if (bytes_after) |
|
|
2707 | { |
|
|
2708 | // fetch and append remaining data |
|
|
2709 | XTextProperty ct2; |
|
|
2710 | |
|
|
2711 | if (XGetWindowProperty (dpy, win, prop, |
|
|
2712 | ct.nitems / 4, (bytes_after + 3) / 4, |
|
|
2713 | delete_prop, AnyPropertyType, |
|
|
2714 | &ct2.encoding, &ct2.format, |
|
|
2715 | &ct2.nitems, &bytes_after, |
|
|
2716 | &ct2.value) != Success) |
|
|
2717 | goto bailout; |
|
|
2718 | |
|
|
2719 | // realloc should be compatible to XFree, here, and elsewhere, too |
|
|
2720 | ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); |
|
|
2721 | memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); |
|
|
2722 | ct.nitems += ct2.nitems; |
|
|
2723 | |
|
|
2724 | XFree (ct2.value); |
|
|
2725 | } |
|
|
2726 | |
|
|
2727 | if (ct.value == 0) |
2780 | if (ct.value == 0) |
2728 | goto bailout; |
2781 | goto bailout; |
2729 | |
2782 | |
2730 | if (ct.encoding == xa[XA_INCR]) |
2783 | if (ct.encoding == xa[XA_INCR]) |
2731 | { |
2784 | { |
… | |
… | |
2733 | if (!delete_prop) |
2786 | if (!delete_prop) |
2734 | XDeleteProperty (dpy, win, prop); |
2787 | XDeleteProperty (dpy, win, prop); |
2735 | |
2788 | |
2736 | selection_wait = Sel_incr; |
2789 | selection_wait = Sel_incr; |
2737 | incr_buf_fill = 0; |
2790 | incr_buf_fill = 0; |
2738 | incr_ev.start (NOW + 10); |
2791 | incr_ev.start (10); |
2739 | |
2792 | |
2740 | goto bailout; |
2793 | goto bailout; |
2741 | } |
2794 | } |
2742 | |
2795 | |
2743 | if (ct.nitems == 0) |
2796 | if (ct.nitems == 0) |
… | |
… | |
2761 | { |
2814 | { |
2762 | /* |
2815 | /* |
2763 | * pass through again trying CUT_BUFFER0 if we've come from |
2816 | * pass through again trying CUT_BUFFER0 if we've come from |
2764 | * XConvertSelection () but nothing was presented |
2817 | * XConvertSelection () but nothing was presented |
2765 | */ |
2818 | */ |
2766 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2819 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
2767 | } |
2820 | } |
2768 | |
2821 | |
2769 | goto bailout; |
2822 | goto bailout; |
2770 | } |
2823 | } |
2771 | } |
2824 | } |
2772 | else if (selection_wait == Sel_incr) |
2825 | else if (selection_wait == Sel_incr) |
2773 | { |
2826 | { |
2774 | incr_ev.start (NOW + 10); |
2827 | incr_ev.start (10); |
2775 | |
2828 | |
2776 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2829 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2777 | { |
2830 | { |
2778 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
2831 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
2779 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
2832 | incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size); |
2780 | } |
2833 | } |
2781 | |
2834 | |
2782 | memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); |
2835 | memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); |
2783 | incr_buf_fill += ct.nitems; |
2836 | incr_buf_fill += ct.nitems; |
2784 | |
2837 | |
… | |
… | |
2819 | if (selection_wait == Sel_normal) |
2872 | if (selection_wait == Sel_normal) |
2820 | selection_wait = Sel_none; |
2873 | selection_wait = Sel_none; |
2821 | } |
2874 | } |
2822 | |
2875 | |
2823 | void |
2876 | void |
2824 | rxvt_term::incr_cb (time_watcher &w) NOTHROW |
2877 | rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW |
2825 | { |
2878 | { |
2826 | selection_wait = Sel_none; |
2879 | selection_wait = Sel_none; |
2827 | |
2880 | |
2828 | incr_buf_size = 0; |
2881 | incr_buf_size = 0; |
2829 | free (incr_buf); |
2882 | free (incr_buf); |
|
|
2883 | incr_buf = 0; |
2830 | |
2884 | |
2831 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
2885 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
2832 | } |
2886 | } |
2833 | |
2887 | |
2834 | void |
2888 | void |
… | |
… | |
2852 | */ |
2906 | */ |
2853 | void |
2907 | void |
2854 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2908 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2855 | { |
2909 | { |
2856 | if (selection.text && selnum == Sel_Primary) |
2910 | if (selection.text && selnum == Sel_Primary) |
|
|
2911 | { |
2857 | { /* internal selection */ |
2912 | /* internal selection */ |
2858 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2913 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2859 | paste (str, strlen (str)); |
2914 | paste (str, strlen (str)); |
2860 | free (str); |
2915 | free (str); |
2861 | return; |
2916 | return; |
2862 | } |
2917 | } |
… | |
… | |
2866 | selection_wait = Sel_normal; |
2921 | selection_wait = Sel_normal; |
2867 | |
2922 | |
2868 | #if X_HAVE_UTF8_STRING |
2923 | #if X_HAVE_UTF8_STRING |
2869 | selection_type = Sel_UTF8String; |
2924 | selection_type = Sel_UTF8String; |
2870 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
2925 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
2871 | return; |
2926 | return; |
2872 | #else |
2927 | #else |
2873 | selection_type = Sel_CompoundText; |
2928 | selection_type = Sel_CompoundText; |
2874 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
2929 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
2875 | return; |
2930 | return; |
2876 | #endif |
2931 | #endif |
2877 | } |
2932 | } |
2878 | |
2933 | |
2879 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2934 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2880 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
2935 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
… | |
… | |
2908 | /* |
2963 | /* |
2909 | * Clear all selected text |
2964 | * Clear all selected text |
2910 | * EXT: SelectionClear |
2965 | * EXT: SelectionClear |
2911 | */ |
2966 | */ |
2912 | void |
2967 | void |
2913 | rxvt_term::selection_clear () NOTHROW |
2968 | rxvt_term::selection_clear (bool clipboard) NOTHROW |
2914 | { |
2969 | { |
|
|
2970 | if (!clipboard) |
|
|
2971 | { |
2915 | want_refresh = 1; |
2972 | want_refresh = 1; |
2916 | free (selection.text); |
2973 | free (selection.text); |
2917 | selection.text = NULL; |
2974 | selection.text = NULL; |
2918 | selection.len = 0; |
2975 | selection.len = 0; |
2919 | CLEAR_SELECTION (); |
2976 | CLEAR_SELECTION (); |
2920 | |
2977 | |
2921 | if (display->selection_owner == this) |
2978 | if (display->selection_owner == this) |
2922 | display->selection_owner = 0; |
2979 | display->selection_owner = 0; |
|
|
2980 | } |
|
|
2981 | else |
|
|
2982 | { |
|
|
2983 | free (selection.clip_text); |
|
|
2984 | selection.clip_text = NULL; |
|
|
2985 | selection.clip_len = 0; |
|
|
2986 | |
|
|
2987 | if (display->clipboard_owner == this) |
|
|
2988 | display->clipboard_owner = 0; |
|
|
2989 | } |
2923 | } |
2990 | } |
2924 | |
2991 | |
2925 | /* ------------------------------------------------------------------------- */ |
2992 | /* ------------------------------------------------------------------------- */ |
2926 | /* |
2993 | /* |
2927 | * Copy a selection into the cut buffer |
2994 | * Copy a selection into the cut buffer |
2928 | * EXT: button 1 or 3 release |
2995 | * EXT: button 1 or 3 release |
2929 | */ |
2996 | */ |
2930 | void |
2997 | void |
2931 | rxvt_term::selection_make (Time tm) |
2998 | rxvt_term::selection_make (Time tm) |
2932 | { |
2999 | { |
2933 | int i; |
3000 | int size; |
2934 | wchar_t *new_selection_text; |
3001 | wchar_t *new_selection_text; |
2935 | text_t *t; |
3002 | text_t *t; |
2936 | |
3003 | |
2937 | switch (selection.op) |
3004 | switch (selection.op) |
2938 | { |
3005 | { |
… | |
… | |
2954 | return; /* nothing selected, go away */ |
3021 | return; /* nothing selected, go away */ |
2955 | |
3022 | |
2956 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
3023 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
2957 | return; |
3024 | return; |
2958 | |
3025 | |
2959 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
3026 | size = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2960 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
3027 | new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t)); |
2961 | |
3028 | |
2962 | int ofs = 0; |
3029 | int ofs = 0; |
2963 | int extra = 0; |
3030 | int extra = 0; |
2964 | |
3031 | |
2965 | int col = selection.beg.col; |
3032 | int col = selection.beg.col; |
… | |
… | |
2971 | { |
3038 | { |
2972 | #if !ENABLE_MINIMAL |
3039 | #if !ENABLE_MINIMAL |
2973 | if (selection.rect) |
3040 | if (selection.rect) |
2974 | { |
3041 | { |
2975 | col = selection.beg.col; |
3042 | col = selection.beg.col; |
2976 | end_col = ncol + 1; |
3043 | end_col = selection.end.col; |
2977 | } |
3044 | } |
2978 | else |
3045 | else |
2979 | #endif |
3046 | #endif |
2980 | end_col = ROW(row).l; |
3047 | end_col = ROW(row).l; |
2981 | |
3048 | |
2982 | col = max (col, 0); |
3049 | col = max (col, 0); |
2983 | |
3050 | |
2984 | if (row == selection.end.row |
3051 | if (row == selection.end.row) |
2985 | #if !ENABLE_MINIMAL |
|
|
2986 | || selection.rect |
|
|
2987 | #endif |
|
|
2988 | ) |
|
|
2989 | min_it (end_col, selection.end.col); |
3052 | min_it (end_col, selection.end.col); |
2990 | |
3053 | |
2991 | t = ROW(row).t + col; |
3054 | t = ROW(row).t + col; |
2992 | |
3055 | |
2993 | for (; col < end_col; col++) |
3056 | for (; col < end_col; col++) |
… | |
… | |
3001 | |
3064 | |
3002 | extra -= (len - 1); |
3065 | extra -= (len - 1); |
3003 | |
3066 | |
3004 | if (extra < 0) |
3067 | if (extra < 0) |
3005 | { |
3068 | { |
3006 | extra += i; |
3069 | extra += size; |
3007 | i += i; |
3070 | size += size; |
3008 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); |
3071 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t)); |
3009 | } |
3072 | } |
3010 | |
3073 | |
3011 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
3074 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
3012 | } |
3075 | } |
3013 | #endif |
3076 | #endif |
… | |
… | |
3025 | |
3088 | |
3026 | new_selection_text[ofs++] = C0_LF; |
3089 | new_selection_text[ofs++] = C0_LF; |
3027 | } |
3090 | } |
3028 | else |
3091 | else |
3029 | #endif |
3092 | #endif |
3030 | if (!ROW(row).is_longer () && row != selection.end.row) |
3093 | if (!ROW(row).is_longer () |
|
|
3094 | && (row != selection.end.row || end_col != selection.end.col) |
|
|
3095 | && (row != selection.beg.row || selection.beg.col < ncol)) |
3031 | new_selection_text[ofs++] = C0_LF; |
3096 | new_selection_text[ofs++] = C0_LF; |
3032 | } |
3097 | } |
3033 | |
|
|
3034 | if (end_col != selection.end.col) |
|
|
3035 | new_selection_text[ofs++] = C0_LF; |
|
|
3036 | |
3098 | |
3037 | new_selection_text[ofs] = 0; |
3099 | new_selection_text[ofs] = 0; |
3038 | |
3100 | |
3039 | if (ofs == 0) |
3101 | if (ofs == 0) |
3040 | { |
3102 | { |
… | |
… | |
3053 | |
3115 | |
3054 | selection_grab (tm); |
3116 | selection_grab (tm); |
3055 | } |
3117 | } |
3056 | |
3118 | |
3057 | bool |
3119 | bool |
3058 | rxvt_term::selection_grab (Time tm) NOTHROW |
3120 | rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW |
3059 | { |
3121 | { |
|
|
3122 | Atom sel; |
|
|
3123 | |
|
|
3124 | if (!clipboard) |
|
|
3125 | { |
3060 | selection_time = tm; |
3126 | selection_time = tm; |
|
|
3127 | sel = XA_PRIMARY; |
|
|
3128 | } |
|
|
3129 | else |
|
|
3130 | { |
|
|
3131 | clipboard_time = tm; |
|
|
3132 | sel = xa[XA_CLIPBOARD]; |
|
|
3133 | } |
3061 | |
3134 | |
3062 | XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); |
3135 | XSetSelectionOwner (dpy, sel, vt, tm); |
3063 | if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) |
3136 | if (XGetSelectionOwner (dpy, sel) == vt) |
3064 | { |
3137 | { |
3065 | display->set_selection_owner (this); |
3138 | display->set_selection_owner (this, clipboard); |
3066 | return true; |
3139 | return true; |
3067 | } |
3140 | } |
3068 | else |
3141 | else |
3069 | { |
3142 | { |
3070 | selection_clear (); |
3143 | selection_clear (clipboard); |
3071 | return false; |
3144 | return false; |
3072 | } |
3145 | } |
3073 | |
3146 | |
3074 | #if 0 |
3147 | #if 0 |
3075 | XTextProperty ct; |
3148 | XTextProperty ct; |
… | |
… | |
3130 | while (selection.mark.col > 0 |
3203 | while (selection.mark.col > 0 |
3131 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3204 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3132 | --selection.mark.col; |
3205 | --selection.mark.col; |
3133 | |
3206 | |
3134 | if (selection.op) |
3207 | if (selection.op) |
|
|
3208 | { |
3135 | { /* clear the old selection */ |
3209 | /* clear the old selection */ |
3136 | selection.beg.row = selection.end.row = selection.mark.row; |
3210 | selection.beg.row = selection.end.row = selection.mark.row; |
3137 | selection.beg.col = selection.end.col = selection.mark.col; |
3211 | selection.beg.col = selection.end.col = selection.mark.col; |
3138 | } |
3212 | } |
3139 | |
3213 | |
3140 | selection.op = SELECTION_INIT; |
3214 | selection.op = SELECTION_INIT; |
… | |
… | |
3329 | * a point/word/line which is either the start or end of the selection |
3403 | * a point/word/line which is either the start or end of the selection |
3330 | * and it was decided by whichever point/word/line was `fixed' at the |
3404 | * and it was decided by whichever point/word/line was `fixed' at the |
3331 | * time of the most recent button3 press |
3405 | * time of the most recent button3 press |
3332 | */ |
3406 | */ |
3333 | if (button3 && buttonpress) |
3407 | if (button3 && buttonpress) |
|
|
3408 | { |
3334 | { /* button3 press */ |
3409 | /* button3 press */ |
3335 | /* |
3410 | /* |
3336 | * first determine which edge of the selection we are closest to |
3411 | * first determine which edge of the selection we are closest to |
3337 | */ |
3412 | */ |
3338 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3413 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3339 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
3414 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
… | |
… | |
3357 | selection.mark.row = selection.beg.row; |
3432 | selection.mark.row = selection.beg.row; |
3358 | selection.mark.col = selection.beg.col; |
3433 | selection.mark.col = selection.beg.col; |
3359 | } |
3434 | } |
3360 | } |
3435 | } |
3361 | else |
3436 | else |
|
|
3437 | { |
3362 | { /* button1 drag or button3 drag */ |
3438 | /* button1 drag or button3 drag */ |
3363 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3439 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3364 | { |
3440 | { |
3365 | if (selection.mark.row == selection.end.row |
3441 | if (selection.mark.row == selection.end.row |
3366 | && selection.mark.col == selection.end.col |
3442 | && selection.mark.col == selection.end.col |
3367 | && clickchange |
3443 | && clickchange |
… | |
… | |
3448 | selection.end.row++; |
3524 | selection.end.row++; |
3449 | } |
3525 | } |
3450 | } |
3526 | } |
3451 | |
3527 | |
3452 | if (button3 && buttonpress) |
3528 | if (button3 && buttonpress) |
|
|
3529 | { |
3453 | { /* mark may need to be changed */ |
3530 | /* mark may need to be changed */ |
3454 | if (closeto == LEFT) |
3531 | if (closeto == LEFT) |
3455 | { |
3532 | { |
3456 | selection.mark.row = selection.end.row; |
3533 | selection.mark.row = selection.end.row; |
3457 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3534 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3458 | } |
3535 | } |
… | |
… | |
3566 | else if (rq.target == xa[XA_MULTIPLE]) |
3643 | else if (rq.target == xa[XA_MULTIPLE]) |
3567 | { |
3644 | { |
3568 | /* TODO: Handle MULTIPLE */ |
3645 | /* TODO: Handle MULTIPLE */ |
3569 | } |
3646 | } |
3570 | #endif |
3647 | #endif |
3571 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3648 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) |
3572 | { |
3649 | { |
3573 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3650 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3574 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3651 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
|
|
3652 | ev.property = rq.property; |
|
|
3653 | } |
|
|
3654 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3655 | { |
|
|
3656 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
|
|
3657 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
3575 | ev.property = rq.property; |
3658 | ev.property = rq.property; |
3576 | } |
3659 | } |
3577 | else if (rq.target == XA_STRING |
3660 | else if (rq.target == XA_STRING |
3578 | || rq.target == xa[XA_TEXT] |
3661 | || rq.target == xa[XA_TEXT] |
3579 | || rq.target == xa[XA_COMPOUND_TEXT] |
3662 | || rq.target == xa[XA_COMPOUND_TEXT] |
… | |
… | |
3612 | { |
3695 | { |
3613 | target = xa[XA_COMPOUND_TEXT]; |
3696 | target = xa[XA_COMPOUND_TEXT]; |
3614 | style = enc_compound_text; |
3697 | style = enc_compound_text; |
3615 | } |
3698 | } |
3616 | |
3699 | |
3617 | if (selection.text) |
3700 | if (rq.selection == XA_PRIMARY && selection.text) |
3618 | { |
3701 | { |
3619 | cl = selection.text; |
3702 | cl = selection.text; |
3620 | selectlen = selection.len; |
3703 | selectlen = selection.len; |
|
|
3704 | } |
|
|
3705 | else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3706 | { |
|
|
3707 | cl = selection.clip_text; |
|
|
3708 | selectlen = selection.clip_len; |
3621 | } |
3709 | } |
3622 | else |
3710 | else |
3623 | { |
3711 | { |
3624 | cl = L""; |
3712 | cl = L""; |
3625 | selectlen = 0; |
3713 | selectlen = 0; |
… | |
… | |
3693 | h += 2; min_it (h, nrow); |
3781 | h += 2; min_it (h, nrow); |
3694 | |
3782 | |
3695 | x -= 1; clamp_it (x, 0, ncol - w); |
3783 | x -= 1; clamp_it (x, 0, ncol - w); |
3696 | y -= 1; clamp_it (y, 0, nrow - h); |
3784 | y -= 1; clamp_it (y, 0, nrow - h); |
3697 | |
3785 | |
3698 | ov_x = x; ov_y = y; |
3786 | ov.x = x; ov.y = y; |
3699 | ov_w = w; ov_h = h; |
3787 | ov.w = w; ov.h = h; |
3700 | |
3788 | |
3701 | ov_text = new text_t *[h]; |
3789 | ov.text = new text_t *[h]; |
3702 | ov_rend = new rend_t *[h]; |
3790 | ov.rend = new rend_t *[h]; |
3703 | |
3791 | |
3704 | for (y = 0; y < h; y++) |
3792 | for (y = 0; y < h; y++) |
3705 | { |
3793 | { |
3706 | text_t *tp = ov_text[y] = new text_t[w]; |
3794 | text_t *tp = ov.text[y] = new text_t[w]; |
3707 | rend_t *rp = ov_rend[y] = new rend_t[w]; |
3795 | rend_t *rp = ov.rend[y] = new rend_t[w]; |
3708 | |
3796 | |
3709 | text_t t0, t1, t2; |
3797 | text_t t0, t1, t2; |
3710 | rend_t r = OVERLAY_RSTYLE; |
3798 | rend_t r = OVERLAY_RSTYLE; |
3711 | |
3799 | |
3712 | if (y == 0) |
3800 | if (y == 0) |
… | |
… | |
3731 | } |
3819 | } |
3732 | |
3820 | |
3733 | void |
3821 | void |
3734 | rxvt_term::scr_overlay_off () NOTHROW |
3822 | rxvt_term::scr_overlay_off () NOTHROW |
3735 | { |
3823 | { |
3736 | if (!ov_text) |
3824 | if (!ov.text) |
3737 | return; |
3825 | return; |
3738 | |
3826 | |
3739 | want_refresh = 1; |
3827 | want_refresh = 1; |
3740 | |
3828 | |
3741 | for (int y = 0; y < ov_h; y++) |
3829 | for (int y = 0; y < ov.h; y++) |
3742 | { |
3830 | { |
3743 | delete [] ov_text[y]; |
3831 | delete [] ov.text[y]; |
3744 | delete [] ov_rend[y]; |
3832 | delete [] ov.rend[y]; |
3745 | } |
3833 | } |
3746 | |
3834 | |
3747 | delete [] ov_text; ov_text = 0; |
3835 | delete [] ov.text; ov.text = 0; |
3748 | delete [] ov_rend; ov_rend = 0; |
3836 | delete [] ov.rend; ov.rend = 0; |
3749 | } |
3837 | } |
3750 | |
3838 | |
3751 | void |
3839 | void |
3752 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3840 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3753 | { |
3841 | { |
3754 | if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) |
3842 | if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2) |
3755 | return; |
3843 | return; |
3756 | |
3844 | |
3757 | x++, y++; |
3845 | x++, y++; |
3758 | |
3846 | |
3759 | ov_text[y][x] = text; |
3847 | ov.text[y][x] = text; |
3760 | ov_rend[y][x] = rend; |
3848 | ov.rend[y][x] = rend; |
3761 | } |
3849 | } |
3762 | |
3850 | |
3763 | void |
3851 | void |
3764 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3852 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3765 | { |
3853 | { |
… | |
… | |
3784 | } |
3872 | } |
3785 | |
3873 | |
3786 | void |
3874 | void |
3787 | rxvt_term::scr_swap_overlay () NOTHROW |
3875 | rxvt_term::scr_swap_overlay () NOTHROW |
3788 | { |
3876 | { |
3789 | if (!ov_text) |
3877 | if (!ov.text) |
3790 | return; |
3878 | return; |
3791 | |
3879 | |
|
|
3880 | // hide cursor if it is within the overlay area |
|
|
3881 | if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w) |
|
|
3882 | && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h)) |
|
|
3883 | screen.flags &= ~Screen_VisibleCursor; |
|
|
3884 | |
3792 | // swap screen mem with overlay |
3885 | // swap screen mem with overlay |
3793 | for (int y = ov_h; y--; ) |
3886 | for (int y = ov.h; y--; ) |
3794 | { |
3887 | { |
3795 | text_t *t1 = ov_text[y]; |
3888 | text_t *t1 = ov.text[y]; |
3796 | rend_t *r1 = ov_rend[y]; |
3889 | rend_t *r1 = ov.rend[y]; |
3797 | |
3890 | |
3798 | text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; |
3891 | text_t *t2 = ROW(y + ov.y + view_start).t + ov.x; |
3799 | rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; |
3892 | rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x; |
3800 | |
3893 | |
3801 | for (int x = ov_w; x--; ) |
3894 | for (int x = ov.w; x--; ) |
3802 | { |
3895 | { |
3803 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3896 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3804 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3897 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3805 | } |
3898 | } |
3806 | } |
3899 | } |