1 | /*--------------------------------*-C-*--------------------------------------* |
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. |
… | |
… | |
26 | |
26 | |
27 | #include "../config.h" /* NECESSARY */ |
27 | #include "../config.h" /* NECESSARY */ |
28 | #include "rxvt.h" /* NECESSARY */ |
28 | #include "rxvt.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
30 | |
30 | |
31 | #include <X11/Xmd.h> /* get the typedef for CARD32 */ |
|
|
32 | |
|
|
33 | #include <inttypes.h> |
31 | #include <inttypes.h> |
34 | |
32 | |
35 | #include "salloc.C" // HACK, should be a seperate compile! |
33 | #include "salloc.C" // HACK, should be a seperate compile! |
36 | |
34 | |
37 | inline void fill_text (text_t *start, text_t value, int len) |
35 | static inline void fill_text (text_t *start, text_t value, int len) |
38 | { |
36 | { |
39 | while (len--) |
37 | while (len--) |
40 | *start++ = value; |
38 | *start++ = value; |
41 | } |
39 | } |
42 | |
40 | |
… | |
… | |
47 | |
45 | |
48 | /* ------------------------------------------------------------------------- * |
46 | /* ------------------------------------------------------------------------- * |
49 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
47 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
50 | * ------------------------------------------------------------------------- */ |
48 | * ------------------------------------------------------------------------- */ |
51 | #define ZERO_SCROLLBACK() \ |
49 | #define ZERO_SCROLLBACK() \ |
52 | if (OPTION (Opt_scrollTtyOutput)) \ |
50 | if (option (Opt_scrollTtyOutput)) \ |
53 | view_start = 0 |
51 | view_start = 0 |
54 | #define CLEAR_SELECTION() \ |
52 | #define CLEAR_SELECTION() \ |
55 | selection.beg.row = selection.beg.col \ |
53 | selection.beg.row = selection.beg.col \ |
56 | = selection.end.row = selection.end.col = 0 |
54 | = selection.end.row = selection.end.col = 0 |
57 | #define CLEAR_ALL_SELECTION() \ |
55 | #define CLEAR_ALL_SELECTION() \ |
… | |
… | |
89 | /* |
87 | /* |
90 | * CLEAR_ROWS : clear <num> rows starting from row <row> |
88 | * CLEAR_ROWS : clear <num> rows starting from row <row> |
91 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
89 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
92 | * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour |
90 | * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour |
93 | */ |
91 | */ |
94 | #define drawBuffer vt |
|
|
95 | |
|
|
96 | #define CLEAR_ROWS(row, num) \ |
92 | #define CLEAR_ROWS(row, num) \ |
97 | if (mapped) \ |
93 | if (mapped) \ |
98 | XClearArea (dpy, drawBuffer, 0, \ |
94 | XClearArea (dpy, vt, 0, \ |
99 | Row2Pixel (row), (unsigned int)width, \ |
95 | Row2Pixel (row), (unsigned int)width, \ |
100 | (unsigned int)Height2Pixel (num), False) |
96 | (unsigned int)Height2Pixel (num), False) |
101 | |
97 | |
102 | #define CLEAR_CHARS(x, y, num) \ |
98 | #define CLEAR_CHARS(x, y, num) \ |
103 | if (mapped) \ |
99 | if (mapped) \ |
104 | XClearArea (dpy, drawBuffer, x, y, \ |
100 | XClearArea (dpy, vt, x, y, \ |
105 | (unsigned int)Width2Pixel (num), \ |
101 | (unsigned int)Width2Pixel (num), \ |
106 | (unsigned int)Height2Pixel (1), False) |
102 | (unsigned int)Height2Pixel (1), False) |
107 | |
103 | |
108 | #define ERASE_ROWS(row, num) \ |
104 | #define ERASE_ROWS(row, num) \ |
109 | XFillRectangle (dpy, drawBuffer, gc, \ |
105 | XFillRectangle (dpy, vt, gc, \ |
110 | 0, Row2Pixel (row), \ |
106 | 0, Row2Pixel (row), \ |
111 | (unsigned int)width, \ |
107 | (unsigned int)width, \ |
112 | (unsigned int)Height2Pixel (num)) |
108 | (unsigned int)Height2Pixel (num)) |
113 | |
109 | |
114 | /* ------------------------------------------------------------------------- * |
110 | /* ------------------------------------------------------------------------- * |
115 | * SCREEN `COMMON' ROUTINES * |
111 | * SCREEN `COMMON' ROUTINES * |
116 | * ------------------------------------------------------------------------- */ |
112 | * ------------------------------------------------------------------------- */ |
… | |
… | |
161 | { |
157 | { |
162 | #if ENABLE_OVERLAY |
158 | #if ENABLE_OVERLAY |
163 | scr_overlay_off (); |
159 | scr_overlay_off (); |
164 | #endif |
160 | #endif |
165 | |
161 | |
|
|
162 | rvideo_mode = false; |
166 | view_start = 0; |
163 | view_start = 0; |
167 | num_scr = 0; |
164 | num_scr = 0; |
168 | |
165 | |
169 | if (ncol == 0) |
166 | if (ncol == 0) |
170 | ncol = 80; |
167 | ncol = 80; |
… | |
… | |
237 | selection.text = NULL; |
234 | selection.text = NULL; |
238 | selection.len = 0; |
235 | selection.len = 0; |
239 | selection.op = SELECTION_CLEAR; |
236 | selection.op = SELECTION_CLEAR; |
240 | selection.screen = PRIMARY; |
237 | selection.screen = PRIMARY; |
241 | selection.clicks = 0; |
238 | selection.clicks = 0; |
242 | rvideo_state = rvideo_mode = false; |
|
|
243 | } |
239 | } |
244 | else |
240 | else |
245 | { |
241 | { |
246 | /* |
242 | /* |
247 | * add or delete rows as appropriate |
243 | * add or delete rows as appropriate |
… | |
… | |
276 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
272 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
277 | } |
273 | } |
278 | |
274 | |
279 | line_t *old_buf = row_buf; |
275 | line_t *old_buf = row_buf; |
280 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
276 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
281 | |
277 | |
282 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
278 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
283 | int pend = MOD (term_start + top_row , prev_total_rows); |
279 | int pend = MOD (term_start + top_row , prev_total_rows); |
284 | int q = total_rows; // rewrapped row |
280 | int q = total_rows; // rewrapped row |
285 | |
281 | |
286 | if (top_row) |
282 | if (top_row) |
… | |
… | |
330 | int qcol = 0; |
326 | int qcol = 0; |
331 | |
327 | |
332 | // see below for cursor adjustment rationale |
328 | // see below for cursor adjustment rationale |
333 | if (p == ocur.row) |
329 | if (p == ocur.row) |
334 | screen.cur.row = q - (total_rows - nrow); |
330 | screen.cur.row = q - (total_rows - nrow); |
335 | |
331 | |
336 | // fill a single destination line |
332 | // fill a single destination line |
337 | while (lofs < llen && qcol < ncol) |
333 | while (lofs < llen && qcol < ncol) |
338 | { |
334 | { |
339 | int prow = lofs / prev_ncol; |
335 | int prow = lofs / prev_ncol; |
340 | int pcol = lofs % prev_ncol; |
336 | int pcol = lofs % prev_ncol; |
… | |
… | |
366 | } |
362 | } |
367 | while (p != pend && q > 0); |
363 | while (p != pend && q > 0); |
368 | |
364 | |
369 | term_start = total_rows - nrow; |
365 | term_start = total_rows - nrow; |
370 | top_row = q - term_start; |
366 | top_row = q - term_start; |
371 | |
367 | |
372 | // make sure all terminal lines exist |
368 | // make sure all terminal lines exist |
373 | while (top_row > 0) |
369 | while (top_row > 0) |
374 | scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); |
370 | scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); |
375 | } |
371 | } |
376 | else |
372 | else |
377 | { |
373 | { |
378 | // if no scrollback exists (yet), wing, instead of wrap |
374 | // if no scrollback exists (yet), wing, instead of wrap |
379 | |
375 | |
380 | for (int row = min (nrow, prev_nrow); row--; ) |
376 | for (int row = min (nrow, prev_nrow); row--; ) |
381 | { |
377 | { |
382 | line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; |
378 | line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; |
383 | line_t &qline = row_buf [row]; |
379 | line_t &qline = row_buf [row]; |
384 | |
380 | |
… | |
… | |
407 | CLEAR_ALL_SELECTION (); |
403 | CLEAR_ALL_SELECTION (); |
408 | |
404 | |
409 | prev_nrow = nrow; |
405 | prev_nrow = nrow; |
410 | prev_ncol = ncol; |
406 | prev_ncol = ncol; |
411 | |
407 | |
412 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
408 | tabs = (char *)rxvt_malloc (ncol); |
413 | |
409 | |
414 | for (int col = ncol; col--; ) |
410 | for (int col = ncol; --col; ) |
415 | tabs [col] = col % TABSIZE == 0; |
411 | tabs [col] = col % TABSIZE == 0; |
416 | |
412 | |
417 | if (current_screen != PRIMARY) |
413 | if (current_screen != PRIMARY) |
418 | scr_swap_screen (); |
414 | scr_swap_screen (); |
419 | |
415 | |
… | |
… | |
510 | } |
506 | } |
511 | |
507 | |
512 | void |
508 | void |
513 | rxvt_term::scr_swap_screen () |
509 | rxvt_term::scr_swap_screen () |
514 | { |
510 | { |
515 | if (!OPTION (Opt_secondaryScreen)) |
511 | if (!option (Opt_secondaryScreen)) |
516 | return; |
512 | return; |
517 | |
513 | |
518 | for (int i = prev_nrow; i--; ) |
514 | for (int i = prev_nrow; i--; ) |
519 | ::swap (ROW(i), swap_buf [i]); |
515 | ::swap (ROW(i), swap_buf [i]); |
520 | |
516 | |
… | |
… | |
542 | selection_check (2); /* check for boundary cross */ |
538 | selection_check (2); /* check for boundary cross */ |
543 | |
539 | |
544 | int i = current_screen; current_screen = scrn; scrn = i; |
540 | int i = current_screen; current_screen = scrn; scrn = i; |
545 | |
541 | |
546 | #if NSCREENS |
542 | #if NSCREENS |
547 | if (OPTION (Opt_secondaryScreen)) |
543 | if (option (Opt_secondaryScreen)) |
548 | { |
544 | { |
549 | num_scr = 0; |
545 | num_scr = 0; |
550 | |
546 | |
551 | scr_swap_screen (); |
547 | scr_swap_screen (); |
552 | |
548 | |
… | |
… | |
555 | screen.flags |= Screen_VisibleCursor; |
551 | screen.flags |= Screen_VisibleCursor; |
556 | swap.flags |= Screen_VisibleCursor; |
552 | swap.flags |= Screen_VisibleCursor; |
557 | } |
553 | } |
558 | else |
554 | else |
559 | #endif |
555 | #endif |
560 | if (OPTION (Opt_secondaryScroll)) |
556 | if (option (Opt_secondaryScroll)) |
561 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
557 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
562 | } |
558 | } |
563 | |
559 | |
564 | // clear WrapNext indicator, solidifying position on next line |
560 | // clear WrapNext indicator, solidifying position on next line |
565 | void |
561 | void |
… | |
… | |
598 | /* |
594 | /* |
599 | * Change the rendition style for following text |
595 | * Change the rendition style for following text |
600 | */ |
596 | */ |
601 | void |
597 | void |
602 | rxvt_term::scr_rendition (int set, int style) NOTHROW |
598 | rxvt_term::scr_rendition (int set, int style) NOTHROW |
603 | { |
599 | { |
604 | if (set) |
600 | if (set) |
605 | rstyle |= style; |
601 | rstyle |= style; |
606 | else if (style == ~RS_None) |
602 | else if (style == ~RS_None) |
607 | rstyle = DEFAULT_RSTYLE; |
603 | rstyle = DEFAULT_RSTYLE; |
608 | else |
604 | else |
609 | rstyle &= ~style; |
605 | rstyle &= ~style; |
610 | } |
606 | } |
611 | |
607 | |
612 | /* ------------------------------------------------------------------------- */ |
608 | /* ------------------------------------------------------------------------- */ |
613 | /* |
609 | /* |
614 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
610 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
615 | * count positive ==> scroll up |
611 | * count positive ==> scroll up |
… | |
… | |
624 | want_refresh = 1; |
620 | want_refresh = 1; |
625 | num_scr += count; |
621 | num_scr += count; |
626 | |
622 | |
627 | if (count > 0 |
623 | if (count > 0 |
628 | && row1 == 0 |
624 | && row1 == 0 |
629 | && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) |
625 | && (current_screen == PRIMARY || option (Opt_secondaryScroll))) |
630 | { |
626 | { |
631 | top_row = max (top_row - count, -saveLines); |
627 | top_row = max (top_row - count, -saveLines); |
632 | |
628 | |
633 | // scroll everything up 'count' lines |
629 | // scroll everything up 'count' lines |
634 | term_start = (term_start + count) % total_rows; |
630 | term_start = (term_start + count) % total_rows; |
… | |
… | |
645 | { |
641 | { |
646 | line_t &l = ROW(nrow - 1 - i); |
642 | line_t &l = ROW(nrow - 1 - i); |
647 | |
643 | |
648 | // optimize if already cleared, can be significant on slow machines |
644 | // optimize if already cleared, can be significant on slow machines |
649 | // could be rolled into scr_blank_screen_mem |
645 | // could be rolled into scr_blank_screen_mem |
650 | if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & RS_bgMask)) |
646 | if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) |
651 | { |
647 | { |
652 | scr_blank_line (l, 0, l.l, rstyle); |
648 | scr_blank_line (l, 0, l.l, rstyle); |
653 | l.l = 0; |
649 | l.l = 0; |
654 | l.f = 0; |
650 | l.f = 0; |
655 | } |
651 | } |
… | |
… | |
666 | line_t &l2 = ROW(i); |
662 | line_t &l2 = ROW(i); |
667 | |
663 | |
668 | ::swap (l1, l2); |
664 | ::swap (l1, l2); |
669 | l2.touch (); |
665 | l2.touch (); |
670 | } |
666 | } |
671 | |
667 | |
672 | // move and/or clear selection, if any |
668 | // move and/or clear selection, if any |
673 | if (selection.op && current_screen == selection.screen) |
669 | if (selection.op && current_screen == selection.screen) |
674 | { |
670 | { |
675 | selection.beg.row -= count; |
671 | selection.beg.row -= count; |
676 | selection.end.row -= count; |
672 | selection.end.row -= count; |
… | |
… | |
684 | selection.op = SELECTION_CLEAR; |
680 | selection.op = SELECTION_CLEAR; |
685 | } |
681 | } |
686 | } |
682 | } |
687 | |
683 | |
688 | // finally move the view window, if desired |
684 | // finally move the view window, if desired |
689 | if (OPTION (Opt_scrollWithBuffer) |
685 | if (option (Opt_scrollWithBuffer) |
690 | && view_start != 0 |
686 | && view_start != 0 |
691 | && view_start != -saveLines) |
687 | && view_start != -saveLines) |
692 | scr_page (UP, count); |
688 | scr_page (UP, count); |
693 | |
689 | |
694 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
690 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
… | |
… | |
712 | { |
708 | { |
713 | /* move selected region too */ |
709 | /* move selected region too */ |
714 | selection.beg.row -= count; |
710 | selection.beg.row -= count; |
715 | selection.end.row -= count; |
711 | selection.end.row -= count; |
716 | selection.mark.row -= count; |
712 | selection.mark.row -= count; |
717 | |
713 | |
718 | selection_check (0); |
714 | selection_check (0); |
719 | } |
715 | } |
720 | } |
716 | } |
721 | |
717 | |
722 | // use a simple and robust scrolling algorithm, this |
718 | // use a simple and robust scrolling algorithm, this |
… | |
… | |
834 | } |
830 | } |
835 | |
831 | |
836 | if (screen.flags & Screen_WrapNext) |
832 | if (screen.flags & Screen_WrapNext) |
837 | { |
833 | { |
838 | scr_do_wrap (); |
834 | scr_do_wrap (); |
839 | |
835 | |
840 | line->l = ncol; |
836 | line->l = ncol; |
841 | line->is_longer (1); |
837 | line->is_longer (1); |
842 | |
838 | |
843 | row = screen.cur.row; |
839 | row = screen.cur.row; |
844 | line = &ROW(row); /* _must_ refresh */ |
840 | line = &ROW(row); /* _must_ refresh */ |
… | |
… | |
1013 | * XTERM_SEQ: CTRL-H |
1009 | * XTERM_SEQ: CTRL-H |
1014 | */ |
1010 | */ |
1015 | void |
1011 | void |
1016 | rxvt_term::scr_backspace () NOTHROW |
1012 | rxvt_term::scr_backspace () NOTHROW |
1017 | { |
1013 | { |
1018 | want_refresh = 1; |
|
|
1019 | |
|
|
1020 | if (screen.cur.col == 0) |
1014 | if (screen.cur.col == 0) |
1021 | { |
1015 | { |
1022 | if (screen.cur.row > 0) |
1016 | if (screen.cur.row > 0) |
1023 | { |
1017 | { |
1024 | #ifdef TERMCAP_HAS_BW |
1018 | #ifdef TERMCAP_HAS_BW |
1025 | screen.cur.col = ncol - 1; |
1019 | screen.cur.col = ncol - 1; |
1026 | screen.cur.row--; |
1020 | --screen.cur.row; |
1027 | return; |
1021 | |
|
|
1022 | want_refresh = 1; |
1028 | #endif |
1023 | #endif |
1029 | } |
1024 | } |
1030 | } |
1025 | } |
1031 | else if (!(screen.flags & Screen_WrapNext)) |
1026 | else |
1032 | scr_gotorc (0, -1, RELATIVE); |
1027 | scr_gotorc (0, -1, RELATIVE); |
1033 | |
|
|
1034 | screen.flags &= ~Screen_WrapNext; |
|
|
1035 | } |
1028 | } |
1036 | |
1029 | |
1037 | /* ------------------------------------------------------------------------- */ |
1030 | /* ------------------------------------------------------------------------- */ |
1038 | /* |
1031 | /* |
1039 | * Process Horizontal Tab |
1032 | * Process Horizontal Tab |
… | |
… | |
1062 | x = i; |
1055 | x = i; |
1063 | |
1056 | |
1064 | if (!--count) |
1057 | if (!--count) |
1065 | break; |
1058 | break; |
1066 | } |
1059 | } |
1067 | else |
1060 | else |
1068 | ht &= l.t[i] == ' ' |
1061 | ht &= l.t[i] == ' ' |
1069 | && RS_SAME (l.r[i], base_rend); |
1062 | && RS_SAME (l.r[i], base_rend); |
1070 | |
1063 | |
1071 | if (count) |
1064 | if (count) |
1072 | x = ncol - 1; |
1065 | x = ncol - 1; |
1073 | |
1066 | |
1074 | // store horizontal tab commands as characters inside the text |
1067 | // store horizontal tab commands as characters inside the text |
1075 | // buffer so they can be selected and pasted. |
1068 | // buffer so they can be selected and pasted. |
1076 | if (ht && OPTION (Opt_pastableTabs)) |
1069 | if (ht && option (Opt_pastableTabs)) |
1077 | { |
1070 | { |
1078 | base_rend = SET_FONT (base_rend, 0); |
1071 | base_rend = SET_FONT (base_rend, 0); |
1079 | |
1072 | |
1080 | l.touch (x); |
1073 | l.touch (x); |
1081 | |
1074 | |
… | |
… | |
1188 | } |
1181 | } |
1189 | } |
1182 | } |
1190 | else |
1183 | else |
1191 | { |
1184 | { |
1192 | if (screen.flags & Screen_Relative) |
1185 | if (screen.flags & Screen_Relative) |
|
|
1186 | { |
1193 | { /* relative origin mode */ |
1187 | /* relative origin mode */ |
1194 | screen.cur.row = row + screen.tscroll; |
1188 | screen.cur.row = row + screen.tscroll; |
1195 | min_it (screen.cur.row, screen.bscroll); |
1189 | min_it (screen.cur.row, screen.bscroll); |
1196 | } |
1190 | } |
1197 | else |
1191 | else |
1198 | screen.cur.row = row; |
1192 | screen.cur.row = row; |
… | |
… | |
1474 | { |
1468 | { |
1475 | if (selection.end.row != screen.cur.row |
1469 | if (selection.end.row != screen.cur.row |
1476 | || (selection.end.col + count >= ncol)) |
1470 | || (selection.end.col + count >= ncol)) |
1477 | CLEAR_SELECTION (); |
1471 | CLEAR_SELECTION (); |
1478 | else |
1472 | else |
|
|
1473 | { |
1479 | { /* shift selection */ |
1474 | /* shift selection */ |
1480 | selection.beg.col += count; |
1475 | selection.beg.col += count; |
1481 | selection.mark.col += count; /* XXX: yes? */ |
1476 | selection.mark.col += count; /* XXX: yes? */ |
1482 | selection.end.col += count; |
1477 | selection.end.col += count; |
1483 | } |
1478 | } |
1484 | } |
1479 | } |
… | |
… | |
1623 | */ |
1618 | */ |
1624 | void |
1619 | void |
1625 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1620 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1626 | { |
1621 | { |
1627 | if (mode < 0) |
1622 | if (mode < 0) |
1628 | memset (tabs, 0, ncol * sizeof (char)); |
1623 | memset (tabs, 0, ncol); |
1629 | else if (screen.cur.col < ncol) |
1624 | else if (screen.cur.col < ncol) |
1630 | tabs [screen.cur.col] = !!mode; |
1625 | tabs [screen.cur.col] = !!mode; |
1631 | } |
1626 | } |
1632 | |
1627 | |
1633 | /* ------------------------------------------------------------------------- */ |
1628 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1648 | if (rvideo_state != on) |
1643 | if (rvideo_state != on) |
1649 | { |
1644 | { |
1650 | rvideo_state = on; |
1645 | rvideo_state = on; |
1651 | |
1646 | |
1652 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1647 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1653 | #if XPM_BACKGROUND |
1648 | #ifdef HAVE_BG_PIXMAP |
1654 | if (bgPixmap.pixmap == None) |
1649 | if (bgPixmap.pixmap == None) |
1655 | #endif |
|
|
1656 | #if TRANSPARENT |
|
|
1657 | if (!OPTION (Opt_transparent) || am_transparent == 0) |
|
|
1658 | #endif |
1650 | #endif |
1659 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1651 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1660 | |
1652 | |
1661 | XGCValues gcvalue; |
1653 | XGCValues gcvalue; |
1662 | gcvalue.foreground = pix_colors[Color_fg]; |
1654 | gcvalue.foreground = pix_colors[Color_fg]; |
… | |
… | |
1806 | for (i = PART_BEG; i < RC_COUNT; i++) |
1798 | for (i = PART_BEG; i < RC_COUNT; i++) |
1807 | { |
1799 | { |
1808 | min_it (rc[i].col, ncol - 1); |
1800 | min_it (rc[i].col, ncol - 1); |
1809 | min_it (rc[i].row, nrow - 1); |
1801 | min_it (rc[i].row, nrow - 1); |
1810 | } |
1802 | } |
1811 | |
1803 | // TODO: this line somehow causes segfault if scr_expose() is called just after resize |
1812 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1804 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1813 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1805 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1814 | |
1806 | |
1815 | num_scr_allow = 0; |
1807 | num_scr_allow = 0; |
1816 | |
1808 | |
… | |
… | |
1871 | return true; |
1863 | return true; |
1872 | } |
1864 | } |
1873 | |
1865 | |
1874 | #ifndef NO_BELL |
1866 | #ifndef NO_BELL |
1875 | void |
1867 | void |
1876 | rxvt_term::bell_cb (time_watcher &w) |
1868 | rxvt_term::bell_cb (ev::timer &w, int revents) |
1877 | { |
1869 | { |
1878 | rvideo_bell = false; |
1870 | rvideo_bell = false; |
1879 | scr_rvideo_mode (rvideo_mode); |
1871 | scr_rvideo_mode (rvideo_mode); |
|
|
1872 | refresh_check (); |
1880 | } |
1873 | } |
1881 | #endif |
1874 | #endif |
1882 | |
1875 | |
1883 | /* ------------------------------------------------------------------------- */ |
1876 | /* ------------------------------------------------------------------------- */ |
1884 | void |
1877 | void |
… | |
… | |
1886 | { |
1879 | { |
1887 | #ifndef NO_BELL |
1880 | #ifndef NO_BELL |
1888 | |
1881 | |
1889 | # ifndef NO_MAPALERT |
1882 | # ifndef NO_MAPALERT |
1890 | # ifdef MAPALERT_OPTION |
1883 | # ifdef MAPALERT_OPTION |
1891 | if (OPTION (Opt_mapAlert)) |
1884 | if (option (Opt_mapAlert)) |
1892 | # endif |
1885 | # endif |
1893 | XMapWindow (dpy, parent[0]); |
1886 | XMapWindow (dpy, parent[0]); |
1894 | # endif |
1887 | # endif |
1895 | |
1888 | |
|
|
1889 | # if ENABLE_FRILLS |
|
|
1890 | if (option (Opt_urgentOnBell)) |
|
|
1891 | { |
|
|
1892 | if (XWMHints *h = XGetWMHints(dpy, parent[0])) |
|
|
1893 | { |
|
|
1894 | h->flags |= XUrgencyHint; |
|
|
1895 | XSetWMHints (dpy, parent[0], h); |
|
|
1896 | } |
|
|
1897 | } |
|
|
1898 | # endif |
|
|
1899 | |
1896 | if (OPTION (Opt_visualBell)) |
1900 | if (option (Opt_visualBell)) |
1897 | { |
1901 | { |
1898 | rvideo_bell = true; |
1902 | rvideo_bell = true; |
1899 | scr_rvideo_mode (rvideo_mode); |
1903 | scr_rvideo_mode (rvideo_mode); |
1900 | display->flush (); |
1904 | flush (); |
1901 | |
1905 | |
1902 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1906 | bell_ev.start (VISUAL_BELL_DURATION); |
1903 | } |
1907 | } |
1904 | else |
1908 | else |
1905 | XBell (dpy, 0); |
1909 | XBell (dpy, 0); |
1906 | |
|
|
1907 | #endif |
1910 | #endif |
1908 | } |
1911 | } |
1909 | |
1912 | |
1910 | /* ------------------------------------------------------------------------- */ |
1913 | /* ------------------------------------------------------------------------- */ |
1911 | /* ARGSUSED */ |
1914 | /* ARGSUSED */ |
… | |
… | |
1969 | * screen.text/screen.rend contain what the screen will change to. |
1972 | * screen.text/screen.rend contain what the screen will change to. |
1970 | */ |
1973 | */ |
1971 | void |
1974 | void |
1972 | rxvt_term::scr_refresh () NOTHROW |
1975 | rxvt_term::scr_refresh () NOTHROW |
1973 | { |
1976 | { |
1974 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1977 | unsigned char have_bg, |
1975 | showcursor; /* show the cursor */ |
1978 | showcursor; /* show the cursor */ |
1976 | int16_t col, row, /* column/row we're processing */ |
1979 | int16_t col, row, /* column/row we're processing */ |
1977 | ocrow; /* old cursor row */ |
1980 | ocrow; /* old cursor row */ |
1978 | int i; /* tmp */ |
1981 | int i; /* tmp */ |
1979 | #ifndef NO_CURSORCOLOR |
1982 | #ifndef NO_CURSORCOLOR |
1980 | rend_t cc1; /* store colours at cursor position (s) */ |
1983 | rend_t cc1; /* store colours at cursor position (s) */ |
1981 | #endif |
1984 | #endif |
1982 | rend_t *crp; // cursor rendition pointer |
1985 | rend_t *crp; // cursor rendition pointer |
|
|
1986 | rend_t ccol1, /* Cursor colour */ |
|
|
1987 | ccol2; /* Cursor colour2 */ |
1983 | |
1988 | |
1984 | want_refresh = 0; /* screen is current */ |
1989 | want_refresh = 0; /* screen is current */ |
1985 | |
1990 | |
1986 | if (refresh_type == NO_REFRESH || !mapped) |
1991 | if (refresh_type == NO_REFRESH || !mapped) |
1987 | return; |
1992 | return; |
1988 | |
1993 | |
1989 | /* |
1994 | /* |
1990 | * A: set up vars |
1995 | * A: set up vars |
1991 | */ |
1996 | */ |
1992 | must_clear = 0; |
|
|
1993 | refresh_count = 0; |
1997 | refresh_count = 0; |
1994 | |
1998 | |
1995 | #if XPM_BACKGROUND |
1999 | have_bg = 0; |
|
|
2000 | #ifdef HAVE_BG_PIXMAP |
1996 | must_clear |= bgPixmap.pixmap != None; |
2001 | have_bg = bgPixmap.pixmap != None; |
1997 | #endif |
|
|
1998 | #if TRANSPARENT |
|
|
1999 | must_clear |= OPTION (Opt_transparent) && am_transparent; |
|
|
2000 | #endif |
2002 | #endif |
2001 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2003 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2002 | |
2004 | |
2003 | /* |
2005 | /* |
2004 | * B: reverse any characters which are selected |
2006 | * B: reverse any characters which are selected |
… | |
… | |
2008 | /* |
2010 | /* |
2009 | * C: set the cursor character (s) |
2011 | * C: set the cursor character (s) |
2010 | */ |
2012 | */ |
2011 | { |
2013 | { |
2012 | unsigned char setoldcursor; |
2014 | unsigned char setoldcursor; |
2013 | rend_t ccol1, /* Cursor colour */ |
|
|
2014 | ccol2; /* Cursor colour2 */ |
|
|
2015 | |
2015 | |
2016 | showcursor = (screen.flags & Screen_VisibleCursor); |
2016 | showcursor = (screen.flags & Screen_VisibleCursor); |
2017 | #ifdef CURSOR_BLINK |
2017 | #ifdef CURSOR_BLINK |
2018 | if (hidden_cursor) |
2018 | if (hidden_cursor) |
2019 | showcursor = 0; |
2019 | showcursor = 0; |
… | |
… | |
2026 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2026 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2027 | col--; |
2027 | col--; |
2028 | |
2028 | |
2029 | crp = &ROW(screen.cur.row).r[col]; |
2029 | crp = &ROW(screen.cur.row).r[col]; |
2030 | |
2030 | |
|
|
2031 | #ifndef NO_CURSORCOLOR |
|
|
2032 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
|
|
2033 | if (ISSET_PIXCOLOR (Color_cursor)) |
|
|
2034 | ccol1 = Color_cursor; |
|
|
2035 | else |
|
|
2036 | #endif |
|
|
2037 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2038 | ccol1 = fgcolor_of (rstyle); |
|
|
2039 | #else |
|
|
2040 | ccol1 = Color_fg; |
|
|
2041 | #endif |
|
|
2042 | |
|
|
2043 | #ifndef NO_CURSORCOLOR |
|
|
2044 | if (ISSET_PIXCOLOR (Color_cursor2)) |
|
|
2045 | ccol2 = Color_cursor2; |
|
|
2046 | else |
|
|
2047 | #endif |
|
|
2048 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2049 | ccol2 = bgcolor_of (rstyle); |
|
|
2050 | #else |
|
|
2051 | ccol2 = Color_bg; |
|
|
2052 | #endif |
|
|
2053 | |
2031 | if (showcursor && focus) |
2054 | if (showcursor && focus) |
2032 | { |
2055 | { |
2033 | if (OPTION (Opt_cursorUnderline)) |
2056 | if (option (Opt_cursorUnderline)) |
2034 | *crp ^= RS_Uline; |
2057 | *crp ^= RS_Uline; |
2035 | else |
2058 | else |
2036 | { |
2059 | { |
2037 | *crp ^= RS_RVid; |
2060 | *crp ^= RS_RVid; |
2038 | |
|
|
2039 | #ifndef NO_CURSORCOLOR |
|
|
2040 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
|
|
2041 | if (ISSET_PIXCOLOR (Color_cursor)) |
|
|
2042 | ccol1 = Color_cursor; |
|
|
2043 | else |
|
|
2044 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2045 | ccol1 = fgcolor_of (rstyle); |
|
|
2046 | #else |
|
|
2047 | ccol1 = Color_fg; |
|
|
2048 | #endif |
|
|
2049 | if (ISSET_PIXCOLOR (Color_cursor2)) |
|
|
2050 | ccol2 = Color_cursor2; |
|
|
2051 | else |
|
|
2052 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2053 | ccol2 = bgcolor_of (rstyle); |
|
|
2054 | #else |
|
|
2055 | ccol2 = Color_bg; |
|
|
2056 | #endif |
|
|
2057 | *crp = SET_FGCOLOR (*crp, ccol1); |
2061 | *crp = SET_FGCOLOR (*crp, ccol1); |
2058 | *crp = SET_BGCOLOR (*crp, ccol2); |
2062 | *crp = SET_BGCOLOR (*crp, ccol2); |
2059 | #endif |
|
|
2060 | } |
2063 | } |
2061 | } |
2064 | } |
2062 | } |
2065 | } |
2063 | |
2066 | |
2064 | /* make sure no outline cursor is left around */ |
2067 | /* make sure no outline cursor is left around */ |
… | |
… | |
2103 | * D: CopyArea pass - very useful for slower links |
2106 | * D: CopyArea pass - very useful for slower links |
2104 | * This has been deliberately kept simple. |
2107 | * This has been deliberately kept simple. |
2105 | */ |
2108 | */ |
2106 | if (!display->is_local |
2109 | if (!display->is_local |
2107 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2110 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2108 | && abs (num_scr) < nrow && !must_clear) |
2111 | && abs (num_scr) < nrow && !have_bg) |
2109 | { |
2112 | { |
2110 | int16_t nits; |
2113 | int16_t nits; |
|
|
2114 | int i = num_scr; |
2111 | int j; |
2115 | int j; |
2112 | int len, wlen; |
2116 | int len, wlen; |
2113 | dLocal (int, num_scr); |
2117 | dLocal (int, num_scr); |
2114 | |
2118 | |
2115 | j = nrow; |
2119 | j = nrow; |
2116 | wlen = len = -1; |
2120 | wlen = len = -1; |
2117 | row = i > 0 ? 0 : j - 1; |
2121 | row = i > 0 ? 0 : j - 1; |
|
|
2122 | |
2118 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2123 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2119 | { |
2124 | { |
2120 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2125 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2121 | { |
2126 | { |
2122 | line_t s = ROW(view_start + row); |
2127 | line_t s = ROW(view_start + row); |
… | |
… | |
2143 | wlen = row; |
2148 | wlen = row; |
2144 | continue; |
2149 | continue; |
2145 | } |
2150 | } |
2146 | } |
2151 | } |
2147 | |
2152 | |
2148 | if (len != -1) |
2153 | if (len >= 0) |
2149 | { |
2154 | { |
2150 | /* also comes here at end if needed because of >= above */ |
2155 | /* also comes here at end if needed because of >= above */ |
2151 | if (wlen < len) |
2156 | if (wlen < len) |
2152 | ::swap (wlen, len); |
2157 | ::swap (wlen, len); |
2153 | |
2158 | |
|
|
2159 | XGCValues gcv; |
|
|
2160 | |
|
|
2161 | gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv); |
2154 | XCopyArea (dpy, vt, vt, |
2162 | XCopyArea (dpy, vt, vt, |
2155 | gc, 0, Row2Pixel (len + i), |
2163 | gc, 0, Row2Pixel (len + i), |
2156 | (unsigned int)this->width, |
2164 | (unsigned int)this->width, |
2157 | (unsigned int)Height2Pixel (wlen - len + 1), |
2165 | (unsigned int)Height2Pixel (wlen - len + 1), |
2158 | 0, Row2Pixel (len)); |
2166 | 0, Row2Pixel (len)); |
|
|
2167 | gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv); |
|
|
2168 | |
2159 | len = -1; |
2169 | len = -1; |
2160 | } |
2170 | } |
2161 | } |
2171 | } |
2162 | } |
2172 | } |
2163 | #endif |
2173 | #endif |
… | |
… | |
2219 | count++; |
2229 | count++; |
2220 | |
2230 | |
2221 | if (stp[col] != dtp[col] |
2231 | if (stp[col] != dtp[col] |
2222 | || !RS_SAME (srp[col], drp[col])) |
2232 | || !RS_SAME (srp[col], drp[col])) |
2223 | { |
2233 | { |
2224 | if (must_clear && (i++ > count / 2)) |
2234 | if (have_bg && (i++ > count / 2)) |
2225 | break; |
2235 | break; |
2226 | |
2236 | |
2227 | dtp[col] = stp[col]; |
2237 | dtp[col] = stp[col]; |
2228 | drp[col] = rend; |
2238 | drp[col] = rend; |
2229 | i = 0; |
2239 | i = 0; |
2230 | } |
2240 | } |
2231 | else if (must_clear || (stp[col] != ' ' && ++i >= 16)) |
2241 | else if (have_bg || (stp[col] != ' ' && ++i >= 16)) |
2232 | break; |
2242 | break; |
2233 | } |
2243 | } |
2234 | |
2244 | |
2235 | col--; /* went one too far. move back */ |
2245 | col--; /* went one too far. move back */ |
2236 | count -= i; /* dump any matching trailing chars */ |
2246 | count -= i; /* dump any matching trailing chars */ |
… | |
… | |
2246 | int back = bgcolor_of (rend); // desired background |
2256 | int back = bgcolor_of (rend); // desired background |
2247 | |
2257 | |
2248 | // only do special processing if any attributes are set, which is unlikely |
2258 | // only do special processing if any attributes are set, which is unlikely |
2249 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2259 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2250 | { |
2260 | { |
2251 | #if ENABLE_STYLES |
|
|
2252 | // "careful" (too wide) character handling |
|
|
2253 | |
|
|
2254 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2255 | while (text > stp |
|
|
2256 | && srp[text - stp - 1] & RS_Careful |
|
|
2257 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2258 | text--, count++, xpixel -= fwidth; |
|
|
2259 | |
|
|
2260 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2261 | for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) |
|
|
2262 | drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw; |
|
|
2263 | |
|
|
2264 | // force redraw before "careful" characters to avoid pixel droppings |
|
|
2265 | for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++) |
|
|
2266 | drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw; |
|
|
2267 | #endif |
|
|
2268 | |
|
|
2269 | bool invert = rend & RS_RVid; |
2261 | bool invert = rend & RS_RVid; |
2270 | |
2262 | |
2271 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2263 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2272 | if (rend & RS_Bold |
|
|
2273 | && fore == Color_fg) |
2264 | if (rend & RS_Bold && fore == Color_fg) |
2274 | { |
2265 | { |
2275 | if (ISSET_PIXCOLOR (Color_BD)) |
2266 | if (ISSET_PIXCOLOR (Color_BD)) |
2276 | fore = Color_BD; |
2267 | fore = Color_BD; |
2277 | # if !ENABLE_STYLES |
2268 | # if !ENABLE_STYLES |
2278 | else |
2269 | else |
2279 | invert = !invert; |
2270 | invert = !invert; |
2280 | # endif |
2271 | # endif |
2281 | } |
2272 | } |
2282 | |
2273 | |
2283 | if (rend & RS_Italic |
2274 | if (rend & RS_Italic && fore == Color_fg) |
2284 | && fore == Color_fg) |
|
|
2285 | { |
2275 | { |
2286 | if (ISSET_PIXCOLOR (Color_IT)) |
2276 | if (ISSET_PIXCOLOR (Color_IT)) |
2287 | fore = Color_IT; |
2277 | fore = Color_IT; |
2288 | # if !ENABLE_STYLES |
2278 | # if !ENABLE_STYLES |
2289 | else |
2279 | else |
2290 | invert = !invert; |
2280 | invert = !invert; |
2291 | # endif |
2281 | # endif |
2292 | } |
2282 | } |
2293 | |
2283 | |
2294 | if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) |
2284 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2295 | fore = Color_UL; |
2285 | fore = Color_UL; |
2296 | #endif |
2286 | #endif |
2297 | |
2287 | |
2298 | if (invert) |
2288 | if (invert) |
2299 | { |
2289 | { |
|
|
2290 | #ifdef OPTION_HC |
|
|
2291 | if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2292 | || !ISSET_PIXCOLOR (Color_HC)) |
|
|
2293 | #endif |
|
|
2294 | /* invert the column if no highlightColor is set or it is the |
|
|
2295 | * current cursor column */ |
2300 | ::swap (fore, back); |
2296 | ::swap (fore, back); |
|
|
2297 | #ifdef OPTION_HC |
|
|
2298 | else if (ISSET_PIXCOLOR (Color_HC)) |
|
|
2299 | back = Color_HC; |
|
|
2300 | #endif |
2301 | |
2301 | |
2302 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2302 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
|
|
2303 | # ifndef OPTION_HC |
2303 | if (ISSET_PIXCOLOR (Color_RV)) |
2304 | if (ISSET_PIXCOLOR (Color_RV)) |
2304 | back = Color_RV; |
2305 | back = Color_RV; |
2305 | |
2306 | # endif |
2306 | if (fore == back) |
2307 | if (fore == back) |
2307 | { |
2308 | { |
2308 | fore = Color_bg; |
2309 | fore = Color_bg; |
2309 | back = Color_fg; |
2310 | back = Color_fg; |
2310 | } |
2311 | } |
… | |
… | |
2312 | } |
2313 | } |
2313 | |
2314 | |
2314 | #ifdef TEXT_BLINK |
2315 | #ifdef TEXT_BLINK |
2315 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2316 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2316 | { |
2317 | { |
2317 | if (!text_blink_ev.active) |
2318 | if (!text_blink_ev.is_active ()) |
2318 | { |
2319 | { |
2319 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
2320 | text_blink_ev.again (); |
2320 | hidden_text = 0; |
2321 | hidden_text = 0; |
2321 | } |
2322 | } |
2322 | else if (hidden_text) |
2323 | else if (hidden_text) |
2323 | fore = back; |
2324 | fore = back; |
2324 | } |
2325 | } |
2325 | #endif |
2326 | #endif |
|
|
2327 | |
|
|
2328 | #if ENABLE_STYLES |
|
|
2329 | // "careful" (too wide) character handling |
|
|
2330 | |
|
|
2331 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2332 | while (text > stp |
|
|
2333 | && srp[text - stp - 1] & RS_Careful |
|
|
2334 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2335 | text--, count++, xpixel -= fwidth; |
|
|
2336 | |
|
|
2337 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2338 | for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) |
|
|
2339 | drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw; |
|
|
2340 | |
|
|
2341 | // force redraw before "careful" characters to avoid pixel droppings |
|
|
2342 | for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++) |
|
|
2343 | drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw; |
|
|
2344 | #endif |
2326 | } |
2345 | } |
2327 | |
2346 | |
2328 | /* |
2347 | /* |
2329 | * Actually do the drawing of the string here |
2348 | * Actually do the drawing of the string here |
2330 | */ |
2349 | */ |
2331 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2350 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2332 | |
2351 | |
2333 | if (back == fore) |
|
|
2334 | font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back); |
|
|
2335 | else if (back == Color_bg) |
2352 | if (have_bg && back == Color_bg) |
2336 | { |
2353 | { |
2337 | if (must_clear) |
2354 | // this is very ugly, maybe push it into ->draw? |
2338 | { |
|
|
2339 | CLEAR_CHARS (xpixel, ypixel, count); |
|
|
2340 | |
2355 | |
2341 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2356 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2342 | if (text[i] != ' ') |
2357 | if (text[i] != ' ') |
2343 | { |
2358 | { |
2344 | font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); |
2359 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent); |
2345 | break; |
2360 | goto did_clear; |
2346 | } |
|
|
2347 | } |
2361 | } |
2348 | else |
2362 | |
2349 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); |
2363 | CLEAR_CHARS (xpixel, ypixel, count); |
|
|
2364 | did_clear: ; |
2350 | } |
2365 | } |
2351 | else |
2366 | else |
2352 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2367 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2353 | |
2368 | |
2354 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2369 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
… | |
… | |
2358 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2373 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2359 | else |
2374 | else |
2360 | #endif |
2375 | #endif |
2361 | XSetForeground (dpy, gc, pix_colors[fore]); |
2376 | XSetForeground (dpy, gc, pix_colors[fore]); |
2362 | |
2377 | |
2363 | XDrawLine (dpy, drawBuffer, gc, |
2378 | XDrawLine (dpy, vt, gc, |
2364 | xpixel, ypixel + font->ascent + 1, |
2379 | xpixel, ypixel + font->ascent + 1, |
2365 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2380 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2366 | } |
2381 | } |
2367 | } /* for (col....) */ |
2382 | } /* for (col....) */ |
2368 | } /* for (row....) */ |
2383 | } /* for (row....) */ |
… | |
… | |
2377 | */ |
2392 | */ |
2378 | if (showcursor) |
2393 | if (showcursor) |
2379 | { |
2394 | { |
2380 | if (focus) |
2395 | if (focus) |
2381 | { |
2396 | { |
2382 | if (OPTION (Opt_cursorUnderline)) |
2397 | if (option (Opt_cursorUnderline)) |
2383 | *crp ^= RS_Uline; |
2398 | *crp ^= RS_Uline; |
2384 | else |
2399 | else |
2385 | { |
2400 | { |
2386 | *crp ^= RS_RVid; |
2401 | *crp ^= RS_RVid; |
2387 | #ifndef NO_CURSORCOLOR |
2402 | #ifndef NO_CURSORCOLOR |
… | |
… | |
2402 | cursorwidth++; |
2417 | cursorwidth++; |
2403 | |
2418 | |
2404 | #ifndef NO_CURSORCOLOR |
2419 | #ifndef NO_CURSORCOLOR |
2405 | if (ISSET_PIXCOLOR (Color_cursor)) |
2420 | if (ISSET_PIXCOLOR (Color_cursor)) |
2406 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
2421 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
|
|
2422 | else |
2407 | #endif |
2423 | #endif |
|
|
2424 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2408 | |
2425 | |
2409 | XDrawRectangle (dpy, drawBuffer, gc, |
2426 | XDrawRectangle (dpy, vt, gc, |
2410 | Col2Pixel (col), |
2427 | Col2Pixel (col), |
2411 | Row2Pixel (oldcursor.row), |
2428 | Row2Pixel (oldcursor.row), |
2412 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2429 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2413 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2430 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2414 | } |
2431 | } |
… | |
… | |
2449 | } |
2466 | } |
2450 | |
2467 | |
2451 | void |
2468 | void |
2452 | rxvt_term::scr_recolour () NOTHROW |
2469 | rxvt_term::scr_recolour () NOTHROW |
2453 | { |
2470 | { |
2454 | if (1 |
2471 | #ifdef HAVE_BG_PIXMAP |
2455 | #if TRANSPARENT |
2472 | bgPixmap.apply (); |
2456 | && !am_transparent |
2473 | #else |
2457 | #endif |
2474 | |
2458 | #if XPM_BACKGROUND |
|
|
2459 | && !bgPixmap.pixmap |
|
|
2460 | #endif |
|
|
2461 | ) |
|
|
2462 | { |
|
|
2463 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2475 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2464 | XClearWindow (dpy, parent[0]); |
2476 | XClearWindow (dpy, parent[0]); |
2465 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2477 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2466 | #if HAVE_SCROLLBARS |
2478 | |
2467 | if (scrollBar.win) |
2479 | if (scrollBar.win) |
2468 | { |
2480 | { |
2469 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2481 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2470 | scrollBar.setIdle (); |
2482 | scrollBar.state = STATE_IDLE; |
2471 | scrollbar_show (0); |
2483 | scrollBar.show (0); |
2472 | } |
|
|
2473 | #endif |
|
|
2474 | } |
2484 | } |
2475 | |
2485 | |
|
|
2486 | #endif |
|
|
2487 | |
|
|
2488 | /* bgPixmap.apply () does not do the following : */ |
2476 | scr_clear (); |
2489 | scr_clear (); |
2477 | scr_touch (true); |
2490 | scr_touch (true); |
2478 | want_refresh = 1; |
2491 | want_refresh = 1; |
2479 | } |
2492 | } |
2480 | |
2493 | |
… | |
… | |
2572 | { |
2585 | { |
2573 | int row, wrote; |
2586 | int row, wrote; |
2574 | unsigned int width, towrite; |
2587 | unsigned int width, towrite; |
2575 | char r1[] = "\n"; |
2588 | char r1[] = "\n"; |
2576 | |
2589 | |
2577 | for (row = saveLines - nsaved; |
2590 | for (row = saveLines + top_row; |
2578 | row < saveLines + nrow - 1; row++) |
2591 | row < saveLines + nrow - 1; row++) |
2579 | { |
2592 | { |
2580 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2593 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2581 | : ncol; |
2594 | : ncol; |
2582 | for (towrite = width; towrite; towrite -= wrote) |
2595 | for (towrite = width; towrite; towrite -= wrote) |
… | |
… | |
2633 | /* convert normal newline chars into common keyboard Return key sequence */ |
2646 | /* convert normal newline chars into common keyboard Return key sequence */ |
2634 | for (unsigned int i = 0; i < len; i++) |
2647 | for (unsigned int i = 0; i < len; i++) |
2635 | if (data[i] == C0_LF) |
2648 | if (data[i] == C0_LF) |
2636 | data[i] = C0_CR; |
2649 | data[i] = C0_CR; |
2637 | |
2650 | |
|
|
2651 | if (priv_modes & PrivMode_BracketPaste) |
|
|
2652 | tt_printf ("\e[200~"); |
|
|
2653 | |
2638 | tt_write (data, len); |
2654 | tt_write (data, len); |
|
|
2655 | |
|
|
2656 | if (priv_modes & PrivMode_BracketPaste) |
|
|
2657 | tt_printf ("\e[201~"); |
2639 | } |
2658 | } |
2640 | |
2659 | |
2641 | /* ------------------------------------------------------------------------- */ |
2660 | /* ------------------------------------------------------------------------- */ |
2642 | /* |
2661 | /* |
2643 | * Respond to a notification that a primary selection has been sent |
2662 | * Respond to a notification that a primary selection has been sent |
… | |
… | |
2718 | if (!delete_prop) |
2737 | if (!delete_prop) |
2719 | XDeleteProperty (dpy, win, prop); |
2738 | XDeleteProperty (dpy, win, prop); |
2720 | |
2739 | |
2721 | selection_wait = Sel_incr; |
2740 | selection_wait = Sel_incr; |
2722 | incr_buf_fill = 0; |
2741 | incr_buf_fill = 0; |
2723 | incr_ev.start (NOW + 10); |
2742 | incr_ev.start (10); |
2724 | |
2743 | |
2725 | goto bailout; |
2744 | goto bailout; |
2726 | } |
2745 | } |
2727 | |
2746 | |
2728 | if (ct.nitems == 0) |
2747 | if (ct.nitems == 0) |
… | |
… | |
2737 | ct.nitems = incr_buf_fill; |
2756 | ct.nitems = incr_buf_fill; |
2738 | incr_buf = 0; |
2757 | incr_buf = 0; |
2739 | incr_buf_size = 0; |
2758 | incr_buf_size = 0; |
2740 | incr_ev.stop (); |
2759 | incr_ev.stop (); |
2741 | } |
2760 | } |
2742 | else |
2761 | else |
2743 | { |
2762 | { |
2744 | if (selection_wait == Sel_normal |
2763 | if (selection_wait == Sel_normal |
2745 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2764 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2746 | { |
2765 | { |
2747 | /* |
2766 | /* |
… | |
… | |
2754 | goto bailout; |
2773 | goto bailout; |
2755 | } |
2774 | } |
2756 | } |
2775 | } |
2757 | else if (selection_wait == Sel_incr) |
2776 | else if (selection_wait == Sel_incr) |
2758 | { |
2777 | { |
2759 | incr_ev.start (NOW + 10); |
2778 | incr_ev.start (10); |
2760 | |
2779 | |
2761 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2780 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2762 | { |
2781 | { |
2763 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
2782 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
2764 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
2783 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
… | |
… | |
2804 | if (selection_wait == Sel_normal) |
2823 | if (selection_wait == Sel_normal) |
2805 | selection_wait = Sel_none; |
2824 | selection_wait = Sel_none; |
2806 | } |
2825 | } |
2807 | |
2826 | |
2808 | void |
2827 | void |
2809 | rxvt_term::incr_cb (time_watcher &w) NOTHROW |
2828 | rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW |
2810 | { |
2829 | { |
2811 | selection_wait = Sel_none; |
2830 | selection_wait = Sel_none; |
2812 | |
2831 | |
2813 | incr_buf_size = 0; |
2832 | incr_buf_size = 0; |
2814 | free (incr_buf); |
2833 | free (incr_buf); |
… | |
… | |
2825 | selection_paste (win, prop, true); |
2844 | selection_paste (win, prop, true); |
2826 | } |
2845 | } |
2827 | |
2846 | |
2828 | /* ------------------------------------------------------------------------- */ |
2847 | /* ------------------------------------------------------------------------- */ |
2829 | /* |
2848 | /* |
2830 | * Request the current selection: |
2849 | * Request the current selection: |
2831 | * Order: > internal selection if available |
2850 | * Order: > internal selection if available |
2832 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2851 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2833 | * > CUT_BUFFER0 |
2852 | * > CUT_BUFFER0 |
2834 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2853 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2835 | * will auto fallback to CUT_BUFFER0 |
2854 | * will auto fallback to CUT_BUFFER0 |
… | |
… | |
2837 | */ |
2856 | */ |
2838 | void |
2857 | void |
2839 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2858 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2840 | { |
2859 | { |
2841 | if (selection.text && selnum == Sel_Primary) |
2860 | if (selection.text && selnum == Sel_Primary) |
|
|
2861 | { |
2842 | { /* internal selection */ |
2862 | /* internal selection */ |
2843 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2863 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2844 | paste (str, strlen (str)); |
2864 | paste (str, strlen (str)); |
2845 | free (str); |
2865 | free (str); |
2846 | return; |
2866 | return; |
2847 | } |
2867 | } |
… | |
… | |
3113 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3133 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3114 | |
3134 | |
3115 | while (selection.mark.col > 0 |
3135 | while (selection.mark.col > 0 |
3116 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3136 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3117 | --selection.mark.col; |
3137 | --selection.mark.col; |
3118 | |
3138 | |
3119 | if (selection.op) |
3139 | if (selection.op) |
|
|
3140 | { |
3120 | { /* clear the old selection */ |
3141 | /* clear the old selection */ |
3121 | selection.beg.row = selection.end.row = selection.mark.row; |
3142 | selection.beg.row = selection.end.row = selection.mark.row; |
3122 | selection.beg.col = selection.end.col = selection.mark.col; |
3143 | selection.beg.col = selection.end.col = selection.mark.col; |
3123 | } |
3144 | } |
3124 | |
3145 | |
3125 | selection.op = SELECTION_INIT; |
3146 | selection.op = SELECTION_INIT; |
… | |
… | |
3314 | * a point/word/line which is either the start or end of the selection |
3335 | * a point/word/line which is either the start or end of the selection |
3315 | * and it was decided by whichever point/word/line was `fixed' at the |
3336 | * and it was decided by whichever point/word/line was `fixed' at the |
3316 | * time of the most recent button3 press |
3337 | * time of the most recent button3 press |
3317 | */ |
3338 | */ |
3318 | if (button3 && buttonpress) |
3339 | if (button3 && buttonpress) |
|
|
3340 | { |
3319 | { /* button3 press */ |
3341 | /* button3 press */ |
3320 | /* |
3342 | /* |
3321 | * first determine which edge of the selection we are closest to |
3343 | * first determine which edge of the selection we are closest to |
3322 | */ |
3344 | */ |
3323 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3345 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3324 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
3346 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
… | |
… | |
3342 | selection.mark.row = selection.beg.row; |
3364 | selection.mark.row = selection.beg.row; |
3343 | selection.mark.col = selection.beg.col; |
3365 | selection.mark.col = selection.beg.col; |
3344 | } |
3366 | } |
3345 | } |
3367 | } |
3346 | else |
3368 | else |
|
|
3369 | { |
3347 | { /* button1 drag or button3 drag */ |
3370 | /* button1 drag or button3 drag */ |
3348 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3371 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3349 | { |
3372 | { |
3350 | if (selection.mark.row == selection.end.row |
3373 | if (selection.mark.row == selection.end.row |
3351 | && selection.mark.col == selection.end.col |
3374 | && selection.mark.col == selection.end.col |
3352 | && clickchange |
3375 | && clickchange |
… | |
… | |
3395 | selection_delimit_word (DN, &selection.end, &selection.end); |
3418 | selection_delimit_word (DN, &selection.end, &selection.end); |
3396 | } |
3419 | } |
3397 | else if (selection.clicks == 3) |
3420 | else if (selection.clicks == 3) |
3398 | { |
3421 | { |
3399 | #if ENABLE_FRILLS |
3422 | #if ENABLE_FRILLS |
3400 | if (OPTION (Opt_tripleclickwords)) |
3423 | if (option (Opt_tripleclickwords)) |
3401 | { |
3424 | { |
3402 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3425 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3403 | |
3426 | |
3404 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3427 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3405 | { |
3428 | { |
… | |
… | |
3433 | selection.end.row++; |
3456 | selection.end.row++; |
3434 | } |
3457 | } |
3435 | } |
3458 | } |
3436 | |
3459 | |
3437 | if (button3 && buttonpress) |
3460 | if (button3 && buttonpress) |
|
|
3461 | { |
3438 | { /* mark may need to be changed */ |
3462 | /* mark may need to be changed */ |
3439 | if (closeto == LEFT) |
3463 | if (closeto == LEFT) |
3440 | { |
3464 | { |
3441 | selection.mark.row = selection.end.row; |
3465 | selection.mark.row = selection.end.row; |
3442 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3466 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3443 | } |
3467 | } |
… | |
… | |
3642 | XFree (ct.value); |
3666 | XFree (ct.value); |
3643 | } |
3667 | } |
3644 | |
3668 | |
3645 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3669 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3646 | } |
3670 | } |
3647 | |
|
|
3648 | /* ------------------------------------------------------------------------- * |
|
|
3649 | * MOUSE ROUTINES * |
|
|
3650 | * ------------------------------------------------------------------------- */ |
|
|
3651 | |
|
|
3652 | /* |
|
|
3653 | * return col/row values corresponding to x/y pixel values |
|
|
3654 | */ |
|
|
3655 | void |
|
|
3656 | rxvt_term::pixel_position (int *x, int *y) NOTHROW |
|
|
3657 | { |
|
|
3658 | *x = Pixel2Col (*x); |
|
|
3659 | /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ |
|
|
3660 | *y = Pixel2Row (*y); |
|
|
3661 | /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ |
|
|
3662 | } |
|
|
3663 | |
3671 | |
3664 | /* ------------------------------------------------------------------------- */ |
3672 | /* ------------------------------------------------------------------------- */ |
3665 | #ifdef USE_XIM |
3673 | #ifdef USE_XIM |
3666 | void |
3674 | void |
3667 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3675 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |