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 (display->display, 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 (display->display, 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 (display->display, 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 | * ------------------------------------------------------------------------- */ |
… | |
… | |
126 | width = ncol; |
122 | width = ncol; |
127 | } |
123 | } |
128 | |
124 | |
129 | l.touch (); |
125 | l.touch (); |
130 | |
126 | |
131 | efs &= ~RS_baseattrMask; |
127 | efs &= ~RS_baseattrMask; // remove italic etc. fontstyles |
132 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
128 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
133 | |
129 | |
134 | text_t *et = l.t + col; |
130 | text_t *et = l.t + col; |
135 | rend_t *er = l.r + col; |
131 | rend_t *er = l.r + col; |
136 | |
132 | |
… | |
… | |
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; |
… | |
… | |
641 | } |
637 | } |
642 | |
638 | |
643 | // erase newly scrolled-in lines |
639 | // erase newly scrolled-in lines |
644 | for (int i = count; i--; ) |
640 | for (int i = count; i--; ) |
645 | { |
641 | { |
646 | // basically this is a slightly optimized scr_blank_screen_mem |
|
|
647 | // it is worth the effort on slower machines |
|
|
648 | line_t &l = ROW(nrow - 1 - i); |
642 | line_t &l = ROW(nrow - 1 - i); |
649 | |
643 | |
|
|
644 | // optimize if already cleared, can be significant on slow machines |
|
|
645 | // could be rolled into scr_blank_screen_mem |
|
|
646 | if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) |
|
|
647 | { |
650 | scr_blank_line (l, 0, l.l, rstyle); |
648 | scr_blank_line (l, 0, l.l, rstyle); |
651 | |
|
|
652 | l.l = 0; |
649 | l.l = 0; |
653 | l.f = 0; |
650 | l.f = 0; |
|
|
651 | } |
|
|
652 | else |
|
|
653 | scr_blank_screen_mem (l, rstyle); |
654 | } |
654 | } |
655 | |
655 | |
656 | // now copy lines below the scroll region bottom to the |
656 | // now copy lines below the scroll region bottom to the |
657 | // bottom of the screen again, so they look as if they |
657 | // bottom of the screen again, so they look as if they |
658 | // hadn't moved. |
658 | // hadn't moved. |
… | |
… | |
662 | line_t &l2 = ROW(i); |
662 | line_t &l2 = ROW(i); |
663 | |
663 | |
664 | ::swap (l1, l2); |
664 | ::swap (l1, l2); |
665 | l2.touch (); |
665 | l2.touch (); |
666 | } |
666 | } |
667 | |
667 | |
668 | // move and/or clear selection, if any |
668 | // move and/or clear selection, if any |
669 | if (selection.op && current_screen == selection.screen) |
669 | if (selection.op && current_screen == selection.screen) |
670 | { |
670 | { |
671 | selection.beg.row -= count; |
671 | selection.beg.row -= count; |
672 | selection.end.row -= count; |
672 | selection.end.row -= count; |
… | |
… | |
680 | selection.op = SELECTION_CLEAR; |
680 | selection.op = SELECTION_CLEAR; |
681 | } |
681 | } |
682 | } |
682 | } |
683 | |
683 | |
684 | // finally move the view window, if desired |
684 | // finally move the view window, if desired |
685 | if (OPTION (Opt_scrollWithBuffer) |
685 | if (option (Opt_scrollWithBuffer) |
686 | && view_start != 0 |
686 | && view_start != 0 |
687 | && view_start != -saveLines) |
687 | && view_start != -saveLines) |
688 | scr_page (UP, count); |
688 | scr_page (UP, count); |
689 | |
689 | |
690 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
690 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
… | |
… | |
708 | { |
708 | { |
709 | /* move selected region too */ |
709 | /* move selected region too */ |
710 | selection.beg.row -= count; |
710 | selection.beg.row -= count; |
711 | selection.end.row -= count; |
711 | selection.end.row -= count; |
712 | selection.mark.row -= count; |
712 | selection.mark.row -= count; |
713 | |
713 | |
714 | selection_check (0); |
714 | selection_check (0); |
715 | } |
715 | } |
716 | } |
716 | } |
717 | |
717 | |
718 | // use a simple and robust scrolling algorithm, this |
718 | // use a simple and robust scrolling algorithm, this |
… | |
… | |
758 | ZERO_SCROLLBACK (); |
758 | ZERO_SCROLLBACK (); |
759 | |
759 | |
760 | if (minlines > 0) |
760 | if (minlines > 0) |
761 | { |
761 | { |
762 | minlines += screen.cur.row - screen.bscroll; |
762 | minlines += screen.cur.row - screen.bscroll; |
|
|
763 | min_it (minlines, screen.cur.row - top_row); |
763 | |
764 | |
764 | if (minlines > 0 |
765 | if (minlines > 0 |
765 | && screen.tscroll == 0 |
766 | && screen.tscroll == 0 |
766 | && screen.bscroll == nrow - 1) |
767 | && screen.bscroll == nrow - 1) |
767 | { |
768 | { |
… | |
… | |
829 | } |
830 | } |
830 | |
831 | |
831 | if (screen.flags & Screen_WrapNext) |
832 | if (screen.flags & Screen_WrapNext) |
832 | { |
833 | { |
833 | scr_do_wrap (); |
834 | scr_do_wrap (); |
834 | |
835 | |
835 | line->l = ncol; |
836 | line->l = ncol; |
836 | line->is_longer (1); |
837 | line->is_longer (1); |
837 | |
838 | |
838 | row = screen.cur.row; |
839 | row = screen.cur.row; |
839 | line = &ROW(row); /* _must_ refresh */ |
840 | line = &ROW(row); /* _must_ refresh */ |
… | |
… | |
841 | |
842 | |
842 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
843 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
843 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
844 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
844 | c = 0xfffd; |
845 | c = 0xfffd; |
845 | |
846 | |
846 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
847 | // rely on wcwidth to tell us the character width, do wcwidth before |
847 | // do wcwidth before further replacements, as wcwidth might return -1 |
848 | // further replacements, as wcwidth might return -1 for the line |
848 | // for the line drawing characters below as they might be invalid in the current |
849 | // drawing characters below as they might be invalid in the current |
849 | // locale. |
850 | // locale. |
850 | int width = c < 0x100 ? 1 : wcwidth (c); |
851 | int width = WCWIDTH (c); |
851 | |
852 | |
852 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
853 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
853 | { |
854 | { |
854 | // vt100 special graphics and line drawing |
855 | // vt100 special graphics and line drawing |
855 | // 5f-7e standard vt100 |
856 | // 5f-7e standard vt100 |
… | |
… | |
1008 | * XTERM_SEQ: CTRL-H |
1009 | * XTERM_SEQ: CTRL-H |
1009 | */ |
1010 | */ |
1010 | void |
1011 | void |
1011 | rxvt_term::scr_backspace () NOTHROW |
1012 | rxvt_term::scr_backspace () NOTHROW |
1012 | { |
1013 | { |
1013 | want_refresh = 1; |
|
|
1014 | |
|
|
1015 | if (screen.cur.col == 0) |
1014 | if (screen.cur.col == 0) |
1016 | { |
1015 | { |
1017 | if (screen.cur.row > 0) |
1016 | if (screen.cur.row > 0) |
1018 | { |
1017 | { |
1019 | #ifdef TERMCAP_HAS_BW |
1018 | #ifdef TERMCAP_HAS_BW |
1020 | screen.cur.col = ncol - 1; |
1019 | screen.cur.col = ncol - 1; |
1021 | screen.cur.row--; |
1020 | --screen.cur.row; |
1022 | return; |
1021 | |
|
|
1022 | want_refresh = 1; |
1023 | #endif |
1023 | #endif |
1024 | } |
1024 | } |
1025 | } |
1025 | } |
1026 | else if (!(screen.flags & Screen_WrapNext)) |
1026 | else |
1027 | scr_gotorc (0, -1, RELATIVE); |
1027 | scr_gotorc (0, -1, RELATIVE); |
1028 | |
|
|
1029 | screen.flags &= ~Screen_WrapNext; |
|
|
1030 | } |
1028 | } |
1031 | |
1029 | |
1032 | /* ------------------------------------------------------------------------- */ |
1030 | /* ------------------------------------------------------------------------- */ |
1033 | /* |
1031 | /* |
1034 | * Process Horizontal Tab |
1032 | * Process Horizontal Tab |
… | |
… | |
1057 | x = i; |
1055 | x = i; |
1058 | |
1056 | |
1059 | if (!--count) |
1057 | if (!--count) |
1060 | break; |
1058 | break; |
1061 | } |
1059 | } |
1062 | else |
1060 | else |
1063 | ht &= l.t[i] == ' ' |
1061 | ht &= l.t[i] == ' ' |
1064 | && RS_SAME (l.r[i], base_rend); |
1062 | && RS_SAME (l.r[i], base_rend); |
1065 | |
1063 | |
1066 | if (count) |
1064 | if (count) |
1067 | x = ncol - 1; |
1065 | x = ncol - 1; |
1068 | |
1066 | |
1069 | // store horizontal tab commands as characters inside the text |
1067 | // store horizontal tab commands as characters inside the text |
1070 | // buffer so they can be selected and pasted. |
1068 | // buffer so they can be selected and pasted. |
1071 | if (ht && OPTION (Opt_pastableTabs)) |
1069 | if (ht && option (Opt_pastableTabs)) |
1072 | { |
1070 | { |
1073 | base_rend = SET_FONT (base_rend, 0); |
1071 | base_rend = SET_FONT (base_rend, 0); |
1074 | |
1072 | |
1075 | l.touch (x); |
1073 | l.touch (x); |
1076 | |
1074 | |
… | |
… | |
1109 | * Process DEC Back Index |
1107 | * Process DEC Back Index |
1110 | * XTERM_SEQ: ESC 6 |
1108 | * XTERM_SEQ: ESC 6 |
1111 | * Move cursor left in row. If we're at the left boundary, shift everything |
1109 | * Move cursor left in row. If we're at the left boundary, shift everything |
1112 | * in that row right. Clear left column. |
1110 | * in that row right. Clear left column. |
1113 | */ |
1111 | */ |
1114 | #if ENABLE_FRILLS |
1112 | #if !ENABLE_MINIMAL |
1115 | void |
1113 | void |
1116 | rxvt_term::scr_backindex () NOTHROW |
1114 | rxvt_term::scr_backindex () NOTHROW |
1117 | { |
1115 | { |
1118 | if (screen.cur.col > 0) |
1116 | if (screen.cur.col > 0) |
1119 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1117 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
… | |
… | |
1126 | * Process DEC Forward Index |
1124 | * Process DEC Forward Index |
1127 | * XTERM_SEQ: ESC 9 |
1125 | * XTERM_SEQ: ESC 9 |
1128 | * Move cursor right in row. If we're at the right boundary, shift everything |
1126 | * Move cursor right in row. If we're at the right boundary, shift everything |
1129 | * in that row left. Clear right column. |
1127 | * in that row left. Clear right column. |
1130 | */ |
1128 | */ |
1131 | #if ENABLE_FRILLS |
1129 | #if !ENABLE_MINIMAL |
1132 | void |
1130 | void |
1133 | rxvt_term::scr_forwardindex () NOTHROW |
1131 | rxvt_term::scr_forwardindex () NOTHROW |
1134 | { |
1132 | { |
1135 | if (screen.cur.col < ncol - 1) |
1133 | if (screen.cur.col < ncol - 1) |
1136 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1134 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
… | |
… | |
1183 | } |
1181 | } |
1184 | } |
1182 | } |
1185 | else |
1183 | else |
1186 | { |
1184 | { |
1187 | if (screen.flags & Screen_Relative) |
1185 | if (screen.flags & Screen_Relative) |
|
|
1186 | { |
1188 | { /* relative origin mode */ |
1187 | /* relative origin mode */ |
1189 | screen.cur.row = row + screen.tscroll; |
1188 | screen.cur.row = row + screen.tscroll; |
1190 | min_it (screen.cur.row, screen.bscroll); |
1189 | min_it (screen.cur.row, screen.bscroll); |
1191 | } |
1190 | } |
1192 | else |
1191 | else |
1193 | screen.cur.row = row; |
1192 | screen.cur.row = row; |
… | |
… | |
1337 | } |
1336 | } |
1338 | else |
1337 | else |
1339 | { |
1338 | { |
1340 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1339 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1341 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1340 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1342 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1341 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1343 | ERASE_ROWS (row, num); |
1342 | ERASE_ROWS (row, num); |
1344 | gcvalue.foreground = pix_colors[Color_fg]; |
1343 | gcvalue.foreground = pix_colors[Color_fg]; |
1345 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1344 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1346 | } |
1345 | } |
1347 | |
1346 | |
1348 | for (; num--; row++) |
1347 | for (; num--; row++) |
1349 | { |
1348 | { |
1350 | scr_blank_screen_mem (ROW(row), rstyle); |
1349 | scr_blank_screen_mem (ROW(row), rstyle); |
1351 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1350 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1352 | } |
1351 | } |
1353 | } |
1352 | } |
1354 | |
1353 | |
1355 | #if ENABLE_FRILLS |
1354 | #if !ENABLE_MINIMAL |
1356 | void |
1355 | void |
1357 | rxvt_term::scr_erase_savelines () NOTHROW |
1356 | rxvt_term::scr_erase_savelines () NOTHROW |
1358 | { |
1357 | { |
1359 | want_refresh = 1; |
1358 | want_refresh = 1; |
1360 | ZERO_SCROLLBACK (); |
1359 | ZERO_SCROLLBACK (); |
… | |
… | |
1469 | { |
1468 | { |
1470 | if (selection.end.row != screen.cur.row |
1469 | if (selection.end.row != screen.cur.row |
1471 | || (selection.end.col + count >= ncol)) |
1470 | || (selection.end.col + count >= ncol)) |
1472 | CLEAR_SELECTION (); |
1471 | CLEAR_SELECTION (); |
1473 | else |
1472 | else |
|
|
1473 | { |
1474 | { /* shift selection */ |
1474 | /* shift selection */ |
1475 | selection.beg.col += count; |
1475 | selection.beg.col += count; |
1476 | selection.mark.col += count; /* XXX: yes? */ |
1476 | selection.mark.col += count; /* XXX: yes? */ |
1477 | selection.end.col += count; |
1477 | selection.end.col += count; |
1478 | } |
1478 | } |
1479 | } |
1479 | } |
… | |
… | |
1618 | */ |
1618 | */ |
1619 | void |
1619 | void |
1620 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1620 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1621 | { |
1621 | { |
1622 | if (mode < 0) |
1622 | if (mode < 0) |
1623 | memset (tabs, 0, ncol * sizeof (char)); |
1623 | memset (tabs, 0, ncol); |
1624 | else if (screen.cur.col < ncol) |
1624 | else if (screen.cur.col < ncol) |
1625 | tabs [screen.cur.col] = !!mode; |
1625 | tabs [screen.cur.col] = !!mode; |
1626 | } |
1626 | } |
1627 | |
1627 | |
1628 | /* ------------------------------------------------------------------------- */ |
1628 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1643 | if (rvideo_state != on) |
1643 | if (rvideo_state != on) |
1644 | { |
1644 | { |
1645 | rvideo_state = on; |
1645 | rvideo_state = on; |
1646 | |
1646 | |
1647 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1647 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1648 | #if XPM_BACKGROUND |
1648 | #ifdef HAVE_BG_PIXMAP |
1649 | if (bgPixmap.pixmap == None) |
1649 | if (bgPixmap.pixmap == None) |
1650 | #endif |
1650 | #endif |
1651 | #if TRANSPARENT |
|
|
1652 | if (!OPTION (Opt_transparent) || am_transparent == 0) |
|
|
1653 | #endif |
|
|
1654 | XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); |
1651 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1655 | |
1652 | |
1656 | XGCValues gcvalue; |
1653 | XGCValues gcvalue; |
1657 | gcvalue.foreground = pix_colors[Color_fg]; |
1654 | gcvalue.foreground = pix_colors[Color_fg]; |
1658 | gcvalue.background = pix_colors[Color_bg]; |
1655 | gcvalue.background = pix_colors[Color_bg]; |
1659 | XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue); |
1656 | XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue); |
1660 | |
1657 | |
1661 | scr_clear (); |
1658 | scr_clear (); |
1662 | scr_touch (true); |
1659 | scr_touch (true); |
1663 | } |
1660 | } |
1664 | } |
1661 | } |
… | |
… | |
1749 | { |
1746 | { |
1750 | bool found = false; |
1747 | bool found = false; |
1751 | |
1748 | |
1752 | for (int i = 0; i < nrow; i++) |
1749 | for (int i = 0; i < nrow; i++) |
1753 | { |
1750 | { |
1754 | int col = 0; |
|
|
1755 | rend_t *drp = drawn_buf[i].r; |
1751 | rend_t *drp = drawn_buf[i].r; |
1756 | |
1752 | |
1757 | for (; col < ncol; col++, drp++) |
1753 | for (int col = 0; col < ncol; col++, drp++) |
1758 | if ((*drp & mask) == value) |
1754 | if ((*drp & mask) == value) |
1759 | { |
1755 | { |
1760 | found = true; |
1756 | found = true; |
1761 | *drp = ~value; |
1757 | *drp = ~value; |
1762 | } |
1758 | } |
… | |
… | |
1802 | for (i = PART_BEG; i < RC_COUNT; i++) |
1798 | for (i = PART_BEG; i < RC_COUNT; i++) |
1803 | { |
1799 | { |
1804 | min_it (rc[i].col, ncol - 1); |
1800 | min_it (rc[i].col, ncol - 1); |
1805 | min_it (rc[i].row, nrow - 1); |
1801 | min_it (rc[i].row, nrow - 1); |
1806 | } |
1802 | } |
1807 | |
1803 | // TODO: this line somehow causes segfault if scr_expose() is called just after resize |
1808 | 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++) |
1809 | 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); |
1810 | |
1806 | |
1811 | num_scr_allow = 0; |
1807 | num_scr_allow = 0; |
1812 | |
1808 | |
… | |
… | |
1867 | return true; |
1863 | return true; |
1868 | } |
1864 | } |
1869 | |
1865 | |
1870 | #ifndef NO_BELL |
1866 | #ifndef NO_BELL |
1871 | void |
1867 | void |
1872 | rxvt_term::bell_cb (time_watcher &w) |
1868 | rxvt_term::bell_cb (ev::timer &w, int revents) |
1873 | { |
1869 | { |
1874 | rvideo_bell = false; |
1870 | rvideo_bell = false; |
1875 | scr_rvideo_mode (rvideo_mode); |
1871 | scr_rvideo_mode (rvideo_mode); |
|
|
1872 | refresh_check (); |
1876 | } |
1873 | } |
1877 | #endif |
1874 | #endif |
1878 | |
1875 | |
1879 | /* ------------------------------------------------------------------------- */ |
1876 | /* ------------------------------------------------------------------------- */ |
1880 | void |
1877 | void |
… | |
… | |
1882 | { |
1879 | { |
1883 | #ifndef NO_BELL |
1880 | #ifndef NO_BELL |
1884 | |
1881 | |
1885 | # ifndef NO_MAPALERT |
1882 | # ifndef NO_MAPALERT |
1886 | # ifdef MAPALERT_OPTION |
1883 | # ifdef MAPALERT_OPTION |
1887 | if (OPTION (Opt_mapAlert)) |
1884 | if (option (Opt_mapAlert)) |
1888 | # endif |
1885 | # endif |
1889 | XMapWindow (display->display, parent[0]); |
1886 | XMapWindow (dpy, parent[0]); |
1890 | # endif |
1887 | # endif |
1891 | |
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 | |
1892 | if (OPTION (Opt_visualBell)) |
1900 | if (option (Opt_visualBell)) |
1893 | { |
1901 | { |
1894 | rvideo_bell = true; |
1902 | rvideo_bell = true; |
1895 | scr_rvideo_mode (rvideo_mode); |
1903 | scr_rvideo_mode (rvideo_mode); |
1896 | display->flush (); |
1904 | flush (); |
1897 | |
1905 | |
1898 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1906 | bell_ev.start (VISUAL_BELL_DURATION); |
1899 | } |
1907 | } |
1900 | else |
1908 | else |
1901 | XBell (display->display, 0); |
1909 | XBell (dpy, 0); |
1902 | |
|
|
1903 | #endif |
1910 | #endif |
1904 | } |
1911 | } |
1905 | |
1912 | |
1906 | /* ------------------------------------------------------------------------- */ |
1913 | /* ------------------------------------------------------------------------- */ |
1907 | /* ARGSUSED */ |
1914 | /* ARGSUSED */ |
… | |
… | |
1965 | * screen.text/screen.rend contain what the screen will change to. |
1972 | * screen.text/screen.rend contain what the screen will change to. |
1966 | */ |
1973 | */ |
1967 | void |
1974 | void |
1968 | rxvt_term::scr_refresh () NOTHROW |
1975 | rxvt_term::scr_refresh () NOTHROW |
1969 | { |
1976 | { |
1970 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1977 | unsigned char have_bg, |
1971 | showcursor; /* show the cursor */ |
1978 | showcursor; /* show the cursor */ |
1972 | int16_t col, row, /* column/row we're processing */ |
1979 | int16_t col, row, /* column/row we're processing */ |
1973 | ocrow; /* old cursor row */ |
1980 | ocrow; /* old cursor row */ |
1974 | int i; /* tmp */ |
1981 | int i; /* tmp */ |
1975 | #ifndef NO_CURSORCOLOR |
1982 | #ifndef NO_CURSORCOLOR |
1976 | rend_t cc1; /* store colours at cursor position (s) */ |
1983 | rend_t cc1; /* store colours at cursor position (s) */ |
1977 | #endif |
1984 | #endif |
1978 | rend_t *crp; // cursor rendition pointer |
1985 | rend_t *crp; // cursor rendition pointer |
|
|
1986 | rend_t ccol1, /* Cursor colour */ |
|
|
1987 | ccol2; /* Cursor colour2 */ |
1979 | |
1988 | |
1980 | want_refresh = 0; /* screen is current */ |
1989 | want_refresh = 0; /* screen is current */ |
1981 | |
1990 | |
1982 | if (refresh_type == NO_REFRESH || !mapped) |
1991 | if (refresh_type == NO_REFRESH || !mapped) |
1983 | return; |
1992 | return; |
1984 | |
1993 | |
1985 | /* |
1994 | /* |
1986 | * A: set up vars |
1995 | * A: set up vars |
1987 | */ |
1996 | */ |
1988 | must_clear = 0; |
1997 | have_bg = 0; |
1989 | refresh_count = 0; |
1998 | refresh_count = 0; |
1990 | |
1999 | |
1991 | #if XPM_BACKGROUND |
2000 | #ifdef HAVE_BG_PIXMAP |
1992 | must_clear |= bgPixmap.pixmap != None; |
2001 | have_bg |= bgPixmap.pixmap != None; |
1993 | #endif |
|
|
1994 | #if TRANSPARENT |
|
|
1995 | must_clear |= OPTION (Opt_transparent) && am_transparent; |
|
|
1996 | #endif |
2002 | #endif |
1997 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2003 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
1998 | |
2004 | |
1999 | /* |
2005 | /* |
2000 | * B: reverse any characters which are selected |
2006 | * B: reverse any characters which are selected |
… | |
… | |
2004 | /* |
2010 | /* |
2005 | * C: set the cursor character (s) |
2011 | * C: set the cursor character (s) |
2006 | */ |
2012 | */ |
2007 | { |
2013 | { |
2008 | unsigned char setoldcursor; |
2014 | unsigned char setoldcursor; |
2009 | rend_t ccol1, /* Cursor colour */ |
|
|
2010 | ccol2; /* Cursor colour2 */ |
|
|
2011 | |
2015 | |
2012 | showcursor = (screen.flags & Screen_VisibleCursor); |
2016 | showcursor = (screen.flags & Screen_VisibleCursor); |
2013 | #ifdef CURSOR_BLINK |
2017 | #ifdef CURSOR_BLINK |
2014 | if (hidden_cursor) |
2018 | if (hidden_cursor) |
2015 | showcursor = 0; |
2019 | showcursor = 0; |
… | |
… | |
2022 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2026 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2023 | col--; |
2027 | col--; |
2024 | |
2028 | |
2025 | crp = &ROW(screen.cur.row).r[col]; |
2029 | crp = &ROW(screen.cur.row).r[col]; |
2026 | |
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 | |
2027 | if (showcursor && focus) |
2054 | if (showcursor && focus) |
2028 | { |
2055 | { |
2029 | if (OPTION (Opt_cursorUnderline)) |
2056 | if (option (Opt_cursorUnderline)) |
2030 | *crp ^= RS_Uline; |
2057 | *crp ^= RS_Uline; |
2031 | else |
2058 | else |
2032 | { |
2059 | { |
2033 | *crp ^= RS_RVid; |
2060 | *crp ^= RS_RVid; |
2034 | |
|
|
2035 | #ifndef NO_CURSORCOLOR |
|
|
2036 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
|
|
2037 | if (ISSET_PIXCOLOR (Color_cursor)) |
|
|
2038 | ccol1 = Color_cursor; |
|
|
2039 | else |
|
|
2040 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2041 | ccol1 = fgcolor_of (rstyle); |
|
|
2042 | #else |
|
|
2043 | ccol1 = Color_fg; |
|
|
2044 | #endif |
|
|
2045 | if (ISSET_PIXCOLOR (Color_cursor2)) |
|
|
2046 | ccol2 = Color_cursor2; |
|
|
2047 | else |
|
|
2048 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2049 | ccol2 = bgcolor_of (rstyle); |
|
|
2050 | #else |
|
|
2051 | ccol2 = Color_bg; |
|
|
2052 | #endif |
|
|
2053 | *crp = SET_FGCOLOR (*crp, ccol1); |
2061 | *crp = SET_FGCOLOR (*crp, ccol1); |
2054 | *crp = SET_BGCOLOR (*crp, ccol2); |
2062 | *crp = SET_BGCOLOR (*crp, ccol2); |
2055 | #endif |
|
|
2056 | } |
2063 | } |
2057 | } |
2064 | } |
2058 | } |
2065 | } |
2059 | |
2066 | |
2060 | /* make sure no outline cursor is left around */ |
2067 | /* make sure no outline cursor is left around */ |
… | |
… | |
2099 | * D: CopyArea pass - very useful for slower links |
2106 | * D: CopyArea pass - very useful for slower links |
2100 | * This has been deliberately kept simple. |
2107 | * This has been deliberately kept simple. |
2101 | */ |
2108 | */ |
2102 | if (!display->is_local |
2109 | if (!display->is_local |
2103 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2110 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2104 | && abs (num_scr) < nrow && !must_clear) |
2111 | && abs (num_scr) < nrow && !have_bg) |
2105 | { |
2112 | { |
2106 | int16_t nits; |
2113 | int16_t nits; |
|
|
2114 | int i = num_scr; |
2107 | int j; |
2115 | int j; |
2108 | int len, wlen; |
2116 | int len, wlen; |
2109 | dLocal (int, num_scr); |
2117 | dLocal (int, num_scr); |
2110 | |
2118 | |
2111 | j = nrow; |
2119 | j = nrow; |
2112 | wlen = len = -1; |
2120 | wlen = len = -1; |
2113 | row = i > 0 ? 0 : j - 1; |
2121 | row = i > 0 ? 0 : j - 1; |
|
|
2122 | |
2114 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2123 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2115 | { |
2124 | { |
2116 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2125 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2117 | { |
2126 | { |
2118 | line_t s = ROW(view_start + row); |
2127 | line_t s = ROW(view_start + row); |
… | |
… | |
2139 | wlen = row; |
2148 | wlen = row; |
2140 | continue; |
2149 | continue; |
2141 | } |
2150 | } |
2142 | } |
2151 | } |
2143 | |
2152 | |
2144 | if (len != -1) |
2153 | if (len >= 0) |
2145 | { |
2154 | { |
2146 | /* also comes here at end if needed because of >= above */ |
2155 | /* also comes here at end if needed because of >= above */ |
2147 | if (wlen < len) |
2156 | if (wlen < len) |
2148 | ::swap (wlen, len); |
2157 | ::swap (wlen, len); |
2149 | |
2158 | |
|
|
2159 | XGCValues gcv; |
|
|
2160 | |
|
|
2161 | gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv); |
2150 | XCopyArea (display->display, vt, vt, |
2162 | XCopyArea (dpy, vt, vt, |
2151 | gc, 0, Row2Pixel (len + i), |
2163 | gc, 0, Row2Pixel (len + i), |
2152 | (unsigned int)this->width, |
2164 | (unsigned int)this->width, |
2153 | (unsigned int)Height2Pixel (wlen - len + 1), |
2165 | (unsigned int)Height2Pixel (wlen - len + 1), |
2154 | 0, Row2Pixel (len)); |
2166 | 0, Row2Pixel (len)); |
|
|
2167 | gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv); |
|
|
2168 | |
2155 | len = -1; |
2169 | len = -1; |
2156 | } |
2170 | } |
2157 | } |
2171 | } |
2158 | } |
2172 | } |
2159 | #endif |
2173 | #endif |
… | |
… | |
2215 | count++; |
2229 | count++; |
2216 | |
2230 | |
2217 | if (stp[col] != dtp[col] |
2231 | if (stp[col] != dtp[col] |
2218 | || !RS_SAME (srp[col], drp[col])) |
2232 | || !RS_SAME (srp[col], drp[col])) |
2219 | { |
2233 | { |
2220 | if (must_clear && (i++ > count / 2)) |
2234 | if (have_bg && (i++ > count / 2)) |
2221 | break; |
2235 | break; |
2222 | |
2236 | |
2223 | dtp[col] = stp[col]; |
2237 | dtp[col] = stp[col]; |
2224 | drp[col] = rend; |
2238 | drp[col] = rend; |
2225 | i = 0; |
2239 | i = 0; |
2226 | } |
2240 | } |
2227 | else if (must_clear || (stp[col] != ' ' && ++i >= 16)) |
2241 | else if (have_bg || (stp[col] != ' ' && ++i >= 16)) |
2228 | break; |
2242 | break; |
2229 | } |
2243 | } |
2230 | |
2244 | |
2231 | col--; /* went one too far. move back */ |
2245 | col--; /* went one too far. move back */ |
2232 | count -= i; /* dump any matching trailing chars */ |
2246 | count -= i; /* dump any matching trailing chars */ |
… | |
… | |
2242 | int back = bgcolor_of (rend); // desired background |
2256 | int back = bgcolor_of (rend); // desired background |
2243 | |
2257 | |
2244 | // 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 |
2245 | 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)) |
2246 | { |
2260 | { |
2247 | #if ENABLE_STYLES |
|
|
2248 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2249 | if (srp[col] & RS_Careful && col < ncol - 1 && 0) |
|
|
2250 | drp[col + 1] = ~srp[col + 1]; |
|
|
2251 | |
|
|
2252 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2253 | while (text > stp |
|
|
2254 | && srp[text - stp - 1] & RS_Careful |
|
|
2255 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2256 | text--, count++, xpixel -= fwidth; |
|
|
2257 | #endif |
|
|
2258 | |
|
|
2259 | bool invert = rend & RS_RVid; |
2261 | bool invert = rend & RS_RVid; |
2260 | |
2262 | |
2261 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2263 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2262 | if (rend & RS_Bold |
|
|
2263 | && fore == Color_fg) |
2264 | if (rend & RS_Bold && fore == Color_fg) |
2264 | { |
2265 | { |
2265 | if (ISSET_PIXCOLOR (Color_BD)) |
2266 | if (ISSET_PIXCOLOR (Color_BD)) |
2266 | fore = Color_BD; |
2267 | fore = Color_BD; |
2267 | # if !ENABLE_STYLES |
2268 | # if !ENABLE_STYLES |
2268 | else |
2269 | else |
2269 | invert = !invert; |
2270 | invert = !invert; |
2270 | # endif |
2271 | # endif |
2271 | } |
2272 | } |
2272 | |
2273 | |
2273 | if (rend & RS_Italic |
2274 | if (rend & RS_Italic && fore == Color_fg) |
2274 | && fore == Color_fg) |
|
|
2275 | { |
2275 | { |
2276 | if (ISSET_PIXCOLOR (Color_IT)) |
2276 | if (ISSET_PIXCOLOR (Color_IT)) |
2277 | fore = Color_IT; |
2277 | fore = Color_IT; |
2278 | # if !ENABLE_STYLES |
2278 | # if !ENABLE_STYLES |
2279 | else |
2279 | else |
2280 | invert = !invert; |
2280 | invert = !invert; |
2281 | # endif |
2281 | # endif |
2282 | } |
2282 | } |
2283 | |
2283 | |
2284 | if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) |
2284 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2285 | fore = Color_UL; |
2285 | fore = Color_UL; |
2286 | #endif |
2286 | #endif |
2287 | |
2287 | |
2288 | if (invert) |
2288 | if (invert) |
2289 | { |
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 */ |
2290 | ::swap (fore, back); |
2296 | ::swap (fore, back); |
|
|
2297 | #ifdef OPTION_HC |
|
|
2298 | else if (ISSET_PIXCOLOR (Color_HC)) |
|
|
2299 | back = Color_HC; |
|
|
2300 | #endif |
2291 | |
2301 | |
2292 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2302 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
|
|
2303 | # ifndef OPTION_HC |
2293 | if (ISSET_PIXCOLOR (Color_RV)) |
2304 | if (ISSET_PIXCOLOR (Color_RV)) |
2294 | back = Color_RV; |
2305 | back = Color_RV; |
2295 | |
2306 | # endif |
2296 | if (fore == back) |
2307 | if (fore == back) |
2297 | { |
2308 | { |
2298 | fore = Color_bg; |
2309 | fore = Color_bg; |
2299 | back = Color_fg; |
2310 | back = Color_fg; |
2300 | } |
2311 | } |
… | |
… | |
2302 | } |
2313 | } |
2303 | |
2314 | |
2304 | #ifdef TEXT_BLINK |
2315 | #ifdef TEXT_BLINK |
2305 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2316 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2306 | { |
2317 | { |
2307 | if (!text_blink_ev.active) |
2318 | if (!text_blink_ev.is_active ()) |
2308 | { |
2319 | { |
2309 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
2320 | text_blink_ev.again (); |
2310 | hidden_text = 0; |
2321 | hidden_text = 0; |
2311 | } |
2322 | } |
2312 | else if (hidden_text) |
2323 | else if (hidden_text) |
2313 | fore = back; |
2324 | fore = back; |
2314 | } |
2325 | } |
2315 | #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 |
2316 | } |
2345 | } |
2317 | |
2346 | |
2318 | /* |
2347 | /* |
2319 | * Actually do the drawing of the string here |
2348 | * Actually do the drawing of the string here |
2320 | */ |
2349 | */ |
2321 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2350 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2322 | |
2351 | |
2323 | if (back == fore) |
|
|
2324 | font->clear_rect (*drawable, xpixel, ypixel, |
|
|
2325 | fwidth * count, fheight, |
|
|
2326 | back); |
|
|
2327 | else if (back == Color_bg) |
2352 | if (have_bg && back == Color_bg) |
2328 | { |
2353 | { |
2329 | if (must_clear) |
2354 | // this is very ugly, maybe push it into ->draw? |
2330 | { |
|
|
2331 | CLEAR_CHARS (xpixel, ypixel, count); |
|
|
2332 | |
2355 | |
2333 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2356 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2334 | if (text[i] != ' ') |
2357 | if (text[i] != ' ') |
2335 | { |
2358 | { |
2336 | font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); |
2359 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent); |
2337 | break; |
2360 | goto did_clear; |
2338 | } |
|
|
2339 | } |
2361 | } |
2340 | else |
2362 | |
2341 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); |
2363 | CLEAR_CHARS (xpixel, ypixel, count); |
|
|
2364 | did_clear: ; |
2342 | } |
2365 | } |
2343 | else |
2366 | else |
2344 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2367 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2345 | |
2368 | |
2346 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2369 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2347 | { |
2370 | { |
2348 | #if ENABLE_FRILLS |
2371 | #if ENABLE_FRILLS |
2349 | if (ISSET_PIXCOLOR (Color_underline)) |
2372 | if (ISSET_PIXCOLOR (Color_underline)) |
2350 | XSetForeground (display->display, gc, pix_colors[Color_underline]); |
2373 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2351 | else |
2374 | else |
2352 | #endif |
2375 | #endif |
2353 | XSetForeground (display->display, gc, pix_colors[fore]); |
2376 | XSetForeground (dpy, gc, pix_colors[fore]); |
2354 | |
2377 | |
2355 | XDrawLine (display->display, drawBuffer, gc, |
2378 | XDrawLine (dpy, vt, gc, |
2356 | xpixel, ypixel + font->ascent + 1, |
2379 | xpixel, ypixel + font->ascent + 1, |
2357 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2380 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2358 | } |
2381 | } |
2359 | } /* for (col....) */ |
2382 | } /* for (col....) */ |
2360 | } /* for (row....) */ |
2383 | } /* for (row....) */ |
… | |
… | |
2369 | */ |
2392 | */ |
2370 | if (showcursor) |
2393 | if (showcursor) |
2371 | { |
2394 | { |
2372 | if (focus) |
2395 | if (focus) |
2373 | { |
2396 | { |
2374 | if (OPTION (Opt_cursorUnderline)) |
2397 | if (option (Opt_cursorUnderline)) |
2375 | *crp ^= RS_Uline; |
2398 | *crp ^= RS_Uline; |
2376 | else |
2399 | else |
2377 | { |
2400 | { |
2378 | *crp ^= RS_RVid; |
2401 | *crp ^= RS_RVid; |
2379 | #ifndef NO_CURSORCOLOR |
2402 | #ifndef NO_CURSORCOLOR |
… | |
… | |
2393 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2416 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2394 | cursorwidth++; |
2417 | cursorwidth++; |
2395 | |
2418 | |
2396 | #ifndef NO_CURSORCOLOR |
2419 | #ifndef NO_CURSORCOLOR |
2397 | if (ISSET_PIXCOLOR (Color_cursor)) |
2420 | if (ISSET_PIXCOLOR (Color_cursor)) |
2398 | XSetForeground (display->display, gc, pix_colors[Color_cursor]); |
2421 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
|
|
2422 | else |
2399 | #endif |
2423 | #endif |
|
|
2424 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2400 | |
2425 | |
2401 | XDrawRectangle (display->display, drawBuffer, gc, |
2426 | XDrawRectangle (dpy, vt, gc, |
2402 | Col2Pixel (col), |
2427 | Col2Pixel (col), |
2403 | Row2Pixel (oldcursor.row), |
2428 | Row2Pixel (oldcursor.row), |
2404 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2429 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2405 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2430 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2406 | } |
2431 | } |
… | |
… | |
2441 | } |
2466 | } |
2442 | |
2467 | |
2443 | void |
2468 | void |
2444 | rxvt_term::scr_recolour () NOTHROW |
2469 | rxvt_term::scr_recolour () NOTHROW |
2445 | { |
2470 | { |
2446 | if (1 |
2471 | #ifdef HAVE_BG_PIXMAP |
2447 | #if TRANSPARENT |
2472 | bgPixmap.apply (); |
2448 | && !am_transparent |
2473 | #else |
2449 | #endif |
2474 | |
2450 | #if XPM_BACKGROUND |
|
|
2451 | && !bgPixmap.pixmap |
|
|
2452 | #endif |
|
|
2453 | ) |
|
|
2454 | { |
|
|
2455 | XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); |
2475 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2456 | XClearWindow (display->display, parent[0]); |
2476 | XClearWindow (dpy, parent[0]); |
2457 | XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); |
2477 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
|
|
2478 | |
2458 | #if HAVE_SCROLLBARS |
2479 | # if HAVE_SCROLLBARS |
2459 | if (scrollBar.win) |
2480 | if (scrollBar.win) |
2460 | { |
2481 | { |
2461 | XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); |
2482 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2462 | scrollBar.setIdle (); |
2483 | scrollBar.setIdle (); |
2463 | scrollbar_show (0); |
2484 | scrollbar_show (0); |
2464 | } |
2485 | } |
2465 | #endif |
2486 | # endif |
2466 | } |
|
|
2467 | |
2487 | |
2468 | scr_clear (); |
2488 | scr_clear (); |
2469 | scr_touch (true); |
2489 | scr_touch (true); |
2470 | want_refresh = 1; |
2490 | want_refresh = 1; |
|
|
2491 | |
|
|
2492 | #endif |
2471 | } |
2493 | } |
2472 | |
2494 | |
2473 | /* ------------------------------------------------------------------------- */ |
2495 | /* ------------------------------------------------------------------------- */ |
2474 | void |
2496 | void |
2475 | rxvt_term::scr_clear (bool really) NOTHROW |
2497 | rxvt_term::scr_clear (bool really) NOTHROW |
… | |
… | |
2479 | |
2501 | |
2480 | num_scr_allow = 0; |
2502 | num_scr_allow = 0; |
2481 | want_refresh = 1; |
2503 | want_refresh = 1; |
2482 | |
2504 | |
2483 | if (really) |
2505 | if (really) |
2484 | XClearWindow (display->display, vt); |
2506 | XClearWindow (dpy, vt); |
2485 | } |
2507 | } |
2486 | |
2508 | |
2487 | void |
2509 | void |
2488 | rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW |
2510 | rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW |
2489 | { |
2511 | { |
… | |
… | |
2538 | { |
2560 | { |
2539 | if (selection.op |
2561 | if (selection.op |
2540 | && current_screen == selection.screen |
2562 | && current_screen == selection.screen |
2541 | && selection.end.row >= view_start) |
2563 | && selection.end.row >= view_start) |
2542 | { |
2564 | { |
2543 | #if ENABLE_FRILLS |
2565 | #if !ENABLE_MINIMAL |
2544 | if (selection.rect) |
2566 | if (selection.rect) |
2545 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2567 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2546 | selection.end.row, selection.end.col, |
2568 | selection.end.row, selection.end.col, |
2547 | RS_RVid, RS_RVid | RS_Uline); |
2569 | RS_RVid, RS_RVid | RS_Uline); |
2548 | else |
2570 | else |
… | |
… | |
2625 | /* convert normal newline chars into common keyboard Return key sequence */ |
2647 | /* convert normal newline chars into common keyboard Return key sequence */ |
2626 | for (unsigned int i = 0; i < len; i++) |
2648 | for (unsigned int i = 0; i < len; i++) |
2627 | if (data[i] == C0_LF) |
2649 | if (data[i] == C0_LF) |
2628 | data[i] = C0_CR; |
2650 | data[i] = C0_CR; |
2629 | |
2651 | |
|
|
2652 | if (priv_modes & PrivMode_BracketPaste) |
|
|
2653 | tt_printf ("\e[200~"); |
|
|
2654 | |
2630 | tt_write (data, len); |
2655 | tt_write (data, len); |
|
|
2656 | |
|
|
2657 | if (priv_modes & PrivMode_BracketPaste) |
|
|
2658 | tt_printf ("\e[201~"); |
2631 | } |
2659 | } |
2632 | |
2660 | |
2633 | /* ------------------------------------------------------------------------- */ |
2661 | /* ------------------------------------------------------------------------- */ |
2634 | /* |
2662 | /* |
2635 | * Respond to a notification that a primary selection has been sent |
2663 | * Respond to a notification that a primary selection has been sent |
… | |
… | |
2664 | } |
2692 | } |
2665 | |
2693 | |
2666 | unsigned long bytes_after; |
2694 | unsigned long bytes_after; |
2667 | XTextProperty ct; |
2695 | XTextProperty ct; |
2668 | |
2696 | |
2669 | if (XGetWindowProperty (display->display, win, prop, |
2697 | if (XGetWindowProperty (dpy, win, prop, |
2670 | 0, PROP_SIZE / 4, |
2698 | 0, PROP_SIZE / 4, |
2671 | delete_prop, AnyPropertyType, |
2699 | delete_prop, AnyPropertyType, |
2672 | &ct.encoding, &ct.format, |
2700 | &ct.encoding, &ct.format, |
2673 | &ct.nitems, &bytes_after, |
2701 | &ct.nitems, &bytes_after, |
2674 | &ct.value) != Success) |
2702 | &ct.value) != Success) |
… | |
… | |
2683 | if (bytes_after) |
2711 | if (bytes_after) |
2684 | { |
2712 | { |
2685 | // fetch and append remaining data |
2713 | // fetch and append remaining data |
2686 | XTextProperty ct2; |
2714 | XTextProperty ct2; |
2687 | |
2715 | |
2688 | if (XGetWindowProperty (display->display, win, prop, |
2716 | if (XGetWindowProperty (dpy, win, prop, |
2689 | ct.nitems / 4, (bytes_after + 3) / 4, |
2717 | ct.nitems / 4, (bytes_after + 3) / 4, |
2690 | delete_prop, AnyPropertyType, |
2718 | delete_prop, AnyPropertyType, |
2691 | &ct2.encoding, &ct2.format, |
2719 | &ct2.encoding, &ct2.format, |
2692 | &ct2.nitems, &bytes_after, |
2720 | &ct2.nitems, &bytes_after, |
2693 | &ct2.value) != Success) |
2721 | &ct2.value) != Success) |
… | |
… | |
2706 | |
2734 | |
2707 | if (ct.encoding == xa[XA_INCR]) |
2735 | if (ct.encoding == xa[XA_INCR]) |
2708 | { |
2736 | { |
2709 | // INCR selection, start handshake |
2737 | // INCR selection, start handshake |
2710 | if (!delete_prop) |
2738 | if (!delete_prop) |
2711 | XDeleteProperty (display->display, win, prop); |
2739 | XDeleteProperty (dpy, win, prop); |
2712 | |
2740 | |
2713 | selection_wait = Sel_incr; |
2741 | selection_wait = Sel_incr; |
2714 | incr_buf_fill = 0; |
2742 | incr_buf_fill = 0; |
2715 | incr_ev.start (NOW + 10); |
2743 | incr_ev.start (10); |
2716 | |
2744 | |
2717 | goto bailout; |
2745 | goto bailout; |
2718 | } |
2746 | } |
2719 | |
2747 | |
2720 | if (ct.nitems == 0) |
2748 | if (ct.nitems == 0) |
… | |
… | |
2729 | ct.nitems = incr_buf_fill; |
2757 | ct.nitems = incr_buf_fill; |
2730 | incr_buf = 0; |
2758 | incr_buf = 0; |
2731 | incr_buf_size = 0; |
2759 | incr_buf_size = 0; |
2732 | incr_ev.stop (); |
2760 | incr_ev.stop (); |
2733 | } |
2761 | } |
2734 | else |
2762 | else |
2735 | { |
2763 | { |
2736 | if (selection_wait == Sel_normal |
2764 | if (selection_wait == Sel_normal |
2737 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2765 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2738 | { |
2766 | { |
2739 | /* |
2767 | /* |
… | |
… | |
2746 | goto bailout; |
2774 | goto bailout; |
2747 | } |
2775 | } |
2748 | } |
2776 | } |
2749 | else if (selection_wait == Sel_incr) |
2777 | else if (selection_wait == Sel_incr) |
2750 | { |
2778 | { |
2751 | incr_ev.start (NOW + 10); |
2779 | incr_ev.start (10); |
2752 | |
2780 | |
2753 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2781 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2754 | { |
2782 | { |
2755 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
2783 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
2756 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
2784 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
… | |
… | |
2763 | } |
2791 | } |
2764 | |
2792 | |
2765 | char **cl; |
2793 | char **cl; |
2766 | int cr; |
2794 | int cr; |
2767 | |
2795 | |
2768 | #if ENABLE_FRILLS |
2796 | #if !ENABLE_MINIMAL |
2769 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
2797 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
2770 | // so recode it manually |
2798 | // so recode it manually |
2771 | if (ct.encoding == xa[XA_UTF8_STRING]) |
2799 | if (ct.encoding == xa[XA_UTF8_STRING]) |
2772 | { |
2800 | { |
2773 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
2801 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
… | |
… | |
2777 | paste (s, strlen (s)); |
2805 | paste (s, strlen (s)); |
2778 | free (s); |
2806 | free (s); |
2779 | } |
2807 | } |
2780 | else |
2808 | else |
2781 | #endif |
2809 | #endif |
2782 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 |
2810 | if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0 |
2783 | && cl) |
2811 | && cl) |
2784 | { |
2812 | { |
2785 | for (int i = 0; i < cr; i++) |
2813 | for (int i = 0; i < cr; i++) |
2786 | paste (cl[i], strlen (cl[i])); |
2814 | paste (cl[i], strlen (cl[i])); |
2787 | |
2815 | |
… | |
… | |
2796 | if (selection_wait == Sel_normal) |
2824 | if (selection_wait == Sel_normal) |
2797 | selection_wait = Sel_none; |
2825 | selection_wait = Sel_none; |
2798 | } |
2826 | } |
2799 | |
2827 | |
2800 | void |
2828 | void |
2801 | rxvt_term::incr_cb (time_watcher &w) NOTHROW |
2829 | rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW |
2802 | { |
2830 | { |
2803 | selection_wait = Sel_none; |
2831 | selection_wait = Sel_none; |
2804 | |
2832 | |
2805 | incr_buf_size = 0; |
2833 | incr_buf_size = 0; |
2806 | free (incr_buf); |
2834 | free (incr_buf); |
… | |
… | |
2817 | selection_paste (win, prop, true); |
2845 | selection_paste (win, prop, true); |
2818 | } |
2846 | } |
2819 | |
2847 | |
2820 | /* ------------------------------------------------------------------------- */ |
2848 | /* ------------------------------------------------------------------------- */ |
2821 | /* |
2849 | /* |
2822 | * Request the current selection: |
2850 | * Request the current selection: |
2823 | * Order: > internal selection if available |
2851 | * Order: > internal selection if available |
2824 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2852 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2825 | * > CUT_BUFFER0 |
2853 | * > CUT_BUFFER0 |
2826 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2854 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2827 | * will auto fallback to CUT_BUFFER0 |
2855 | * will auto fallback to CUT_BUFFER0 |
… | |
… | |
2829 | */ |
2857 | */ |
2830 | void |
2858 | void |
2831 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2859 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2832 | { |
2860 | { |
2833 | if (selection.text && selnum == Sel_Primary) |
2861 | if (selection.text && selnum == Sel_Primary) |
|
|
2862 | { |
2834 | { /* internal selection */ |
2863 | /* internal selection */ |
2835 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2864 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2836 | paste (str, strlen (str)); |
2865 | paste (str, strlen (str)); |
2837 | free (str); |
2866 | free (str); |
2838 | return; |
2867 | return; |
2839 | } |
2868 | } |
… | |
… | |
2869 | else if (selnum == Sel_Secondary) |
2898 | else if (selnum == Sel_Secondary) |
2870 | sel = XA_SECONDARY; |
2899 | sel = XA_SECONDARY; |
2871 | else |
2900 | else |
2872 | sel = xa[XA_CLIPBOARD]; |
2901 | sel = xa[XA_CLIPBOARD]; |
2873 | |
2902 | |
2874 | if (XGetSelectionOwner (display->display, sel) != None) |
2903 | if (XGetSelectionOwner (dpy, sel) != None) |
2875 | { |
2904 | { |
2876 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2905 | XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION], |
2877 | vt, selection_request_time); |
2906 | vt, selection_request_time); |
2878 | return 1; |
2907 | return 1; |
2879 | } |
2908 | } |
2880 | |
2909 | |
2881 | return 0; |
2910 | return 0; |
… | |
… | |
2944 | |
2973 | |
2945 | int end_col; |
2974 | int end_col; |
2946 | |
2975 | |
2947 | for (; row <= selection.end.row; row++, col = 0) |
2976 | for (; row <= selection.end.row; row++, col = 0) |
2948 | { |
2977 | { |
2949 | #if ENABLE_FRILLS |
2978 | #if !ENABLE_MINIMAL |
2950 | if (selection.rect) |
2979 | if (selection.rect) |
2951 | { |
2980 | { |
2952 | col = selection.beg.col; |
2981 | col = selection.beg.col; |
2953 | end_col = ncol + 1; |
2982 | end_col = ncol + 1; |
2954 | } |
2983 | } |
… | |
… | |
2957 | end_col = ROW(row).l; |
2986 | end_col = ROW(row).l; |
2958 | |
2987 | |
2959 | col = max (col, 0); |
2988 | col = max (col, 0); |
2960 | |
2989 | |
2961 | if (row == selection.end.row |
2990 | if (row == selection.end.row |
2962 | #if ENABLE_FRILLS |
2991 | #if !ENABLE_MINIMAL |
2963 | || selection.rect |
2992 | || selection.rect |
2964 | #endif |
2993 | #endif |
2965 | ) |
2994 | ) |
2966 | min_it (end_col, selection.end.col); |
2995 | min_it (end_col, selection.end.col); |
2967 | |
2996 | |
… | |
… | |
2990 | #endif |
3019 | #endif |
2991 | else |
3020 | else |
2992 | new_selection_text[ofs++] = *t++; |
3021 | new_selection_text[ofs++] = *t++; |
2993 | } |
3022 | } |
2994 | |
3023 | |
2995 | #if ENABLE_FRILLS |
3024 | #if !ENABLE_MINIMAL |
2996 | if (selection.rect) |
3025 | if (selection.rect) |
2997 | { |
3026 | { |
2998 | while (ofs |
3027 | while (ofs |
2999 | && new_selection_text[ofs - 1] != C0_LF |
3028 | && new_selection_text[ofs - 1] != C0_LF |
3000 | && unicode::is_space (new_selection_text[ofs - 1])) |
3029 | && unicode::is_space (new_selection_text[ofs - 1])) |
… | |
… | |
3034 | bool |
3063 | bool |
3035 | rxvt_term::selection_grab (Time tm) NOTHROW |
3064 | rxvt_term::selection_grab (Time tm) NOTHROW |
3036 | { |
3065 | { |
3037 | selection_time = tm; |
3066 | selection_time = tm; |
3038 | |
3067 | |
3039 | XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); |
3068 | XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); |
3040 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) |
3069 | if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) |
3041 | { |
3070 | { |
3042 | display->set_selection_owner (this); |
3071 | display->set_selection_owner (this); |
3043 | return true; |
3072 | return true; |
3044 | } |
3073 | } |
3045 | else |
3074 | else |
… | |
… | |
3049 | } |
3078 | } |
3050 | |
3079 | |
3051 | #if 0 |
3080 | #if 0 |
3052 | XTextProperty ct; |
3081 | XTextProperty ct; |
3053 | |
3082 | |
3054 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
3083 | if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0) |
3055 | { |
3084 | { |
3056 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3085 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3057 | XFree (ct.value); |
3086 | XFree (ct.value); |
3058 | } |
3087 | } |
3059 | #endif |
3088 | #endif |
… | |
… | |
3105 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3134 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3106 | |
3135 | |
3107 | while (selection.mark.col > 0 |
3136 | while (selection.mark.col > 0 |
3108 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3137 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3109 | --selection.mark.col; |
3138 | --selection.mark.col; |
3110 | |
3139 | |
3111 | if (selection.op) |
3140 | if (selection.op) |
|
|
3141 | { |
3112 | { /* clear the old selection */ |
3142 | /* clear the old selection */ |
3113 | selection.beg.row = selection.end.row = selection.mark.row; |
3143 | selection.beg.row = selection.end.row = selection.mark.row; |
3114 | selection.beg.col = selection.end.col = selection.mark.col; |
3144 | selection.beg.col = selection.end.col = selection.mark.col; |
3115 | } |
3145 | } |
3116 | |
3146 | |
3117 | selection.op = SELECTION_INIT; |
3147 | selection.op = SELECTION_INIT; |
… | |
… | |
3306 | * a point/word/line which is either the start or end of the selection |
3336 | * a point/word/line which is either the start or end of the selection |
3307 | * and it was decided by whichever point/word/line was `fixed' at the |
3337 | * and it was decided by whichever point/word/line was `fixed' at the |
3308 | * time of the most recent button3 press |
3338 | * time of the most recent button3 press |
3309 | */ |
3339 | */ |
3310 | if (button3 && buttonpress) |
3340 | if (button3 && buttonpress) |
|
|
3341 | { |
3311 | { /* button3 press */ |
3342 | /* button3 press */ |
3312 | /* |
3343 | /* |
3313 | * first determine which edge of the selection we are closest to |
3344 | * first determine which edge of the selection we are closest to |
3314 | */ |
3345 | */ |
3315 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3346 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3316 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
3347 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
… | |
… | |
3334 | selection.mark.row = selection.beg.row; |
3365 | selection.mark.row = selection.beg.row; |
3335 | selection.mark.col = selection.beg.col; |
3366 | selection.mark.col = selection.beg.col; |
3336 | } |
3367 | } |
3337 | } |
3368 | } |
3338 | else |
3369 | else |
|
|
3370 | { |
3339 | { /* button1 drag or button3 drag */ |
3371 | /* button1 drag or button3 drag */ |
3340 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3372 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3341 | { |
3373 | { |
3342 | if (selection.mark.row == selection.end.row |
3374 | if (selection.mark.row == selection.end.row |
3343 | && selection.mark.col == selection.end.col |
3375 | && selection.mark.col == selection.end.col |
3344 | && clickchange |
3376 | && clickchange |
… | |
… | |
3361 | |
3393 | |
3362 | if (selection.clicks == 1) |
3394 | if (selection.clicks == 1) |
3363 | { |
3395 | { |
3364 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3396 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3365 | && !ROW(selection.beg.row).is_longer () |
3397 | && !ROW(selection.beg.row).is_longer () |
3366 | #if ENABLE_FRILLS |
3398 | #if !ENABLE_MINIMAL |
3367 | && !selection.rect |
3399 | && !selection.rect |
3368 | #endif |
3400 | #endif |
3369 | ) |
3401 | ) |
3370 | selection.beg.col = ncol; |
3402 | selection.beg.col = ncol; |
3371 | |
3403 | |
3372 | if ( |
3404 | if ( |
3373 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3405 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3374 | && !ROW(selection.end.row).is_longer () |
3406 | && !ROW(selection.end.row).is_longer () |
3375 | #if ENABLE_FRILLS |
3407 | #if !ENABLE_MINIMAL |
3376 | && !selection.rect |
3408 | && !selection.rect |
3377 | #endif |
3409 | #endif |
3378 | ) |
3410 | ) |
3379 | selection.end.col = ncol; |
3411 | selection.end.col = ncol; |
3380 | } |
3412 | } |
… | |
… | |
3387 | selection_delimit_word (DN, &selection.end, &selection.end); |
3419 | selection_delimit_word (DN, &selection.end, &selection.end); |
3388 | } |
3420 | } |
3389 | else if (selection.clicks == 3) |
3421 | else if (selection.clicks == 3) |
3390 | { |
3422 | { |
3391 | #if ENABLE_FRILLS |
3423 | #if ENABLE_FRILLS |
3392 | if (OPTION (Opt_tripleclickwords)) |
3424 | if (option (Opt_tripleclickwords)) |
3393 | { |
3425 | { |
3394 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3426 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3395 | |
3427 | |
3396 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3428 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3397 | { |
3429 | { |
3398 | if (!ROW(end_row).is_longer ()) |
3430 | if (!ROW(end_row).is_longer ()) |
3399 | { |
3431 | { |
3400 | selection.end.row = end_row; |
3432 | selection.end.row = end_row; |
3401 | selection.end.col = ROW(end_row).l; |
3433 | selection.end.col = ROW(end_row).l; |
|
|
3434 | # if !ENABLE_MINIMAL |
3402 | selection_remove_trailing_spaces (); |
3435 | selection_remove_trailing_spaces (); |
|
|
3436 | # endif |
3403 | break; |
3437 | break; |
3404 | } |
3438 | } |
3405 | } |
3439 | } |
3406 | } |
3440 | } |
3407 | else |
3441 | else |
… | |
… | |
3423 | selection.end.row++; |
3457 | selection.end.row++; |
3424 | } |
3458 | } |
3425 | } |
3459 | } |
3426 | |
3460 | |
3427 | if (button3 && buttonpress) |
3461 | if (button3 && buttonpress) |
|
|
3462 | { |
3428 | { /* mark may need to be changed */ |
3463 | /* mark may need to be changed */ |
3429 | if (closeto == LEFT) |
3464 | if (closeto == LEFT) |
3430 | { |
3465 | { |
3431 | selection.mark.row = selection.end.row; |
3466 | selection.mark.row = selection.end.row; |
3432 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3467 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3433 | } |
3468 | } |
… | |
… | |
3436 | selection.mark.row = selection.beg.row; |
3471 | selection.mark.row = selection.beg.row; |
3437 | selection.mark.col = selection.beg.col; |
3472 | selection.mark.col = selection.beg.col; |
3438 | } |
3473 | } |
3439 | } |
3474 | } |
3440 | |
3475 | |
3441 | #if ENABLE_FRILLS |
3476 | #if !ENABLE_MINIMAL |
3442 | if (selection.rect && selection.beg.col > selection.end.col) |
3477 | if (selection.rect && selection.beg.col > selection.end.col) |
3443 | ::swap (selection.beg.col, selection.end.col); |
3478 | ::swap (selection.beg.col, selection.end.col); |
3444 | #endif |
3479 | #endif |
3445 | } |
3480 | } |
3446 | |
3481 | |
3447 | #if ENABLE_FRILLS |
3482 | #if !ENABLE_MINIMAL |
3448 | void |
3483 | void |
3449 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3484 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3450 | { |
3485 | { |
3451 | int32_t end_col, end_row; |
3486 | int32_t end_col, end_row; |
3452 | text_t *stp; |
3487 | text_t *stp; |
… | |
… | |
3507 | */ |
3542 | */ |
3508 | void |
3543 | void |
3509 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3544 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3510 | { |
3545 | { |
3511 | XSelectionEvent ev; |
3546 | XSelectionEvent ev; |
3512 | dDisp; |
|
|
3513 | |
3547 | |
3514 | ev.type = SelectionNotify; |
3548 | ev.type = SelectionNotify; |
3515 | ev.property = None; |
3549 | ev.property = None; |
3516 | ev.display = rq.display; |
3550 | ev.display = rq.display; |
3517 | ev.requestor = rq.requestor; |
3551 | ev.requestor = rq.requestor; |
… | |
… | |
3531 | *target++ = xa[XA_COMPOUND_TEXT]; |
3565 | *target++ = xa[XA_COMPOUND_TEXT]; |
3532 | #if X_HAVE_UTF8_STRING |
3566 | #if X_HAVE_UTF8_STRING |
3533 | *target++ = xa[XA_UTF8_STRING]; |
3567 | *target++ = xa[XA_UTF8_STRING]; |
3534 | #endif |
3568 | #endif |
3535 | |
3569 | |
3536 | XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, |
3570 | XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, |
3537 | 32, PropModeReplace, |
3571 | 32, PropModeReplace, |
3538 | (unsigned char *)target_list, target - target_list); |
3572 | (unsigned char *)target_list, target - target_list); |
3539 | ev.property = rq.property; |
3573 | ev.property = rq.property; |
3540 | } |
3574 | } |
3541 | #if TODO // TODO |
3575 | #if TODO // TODO |
… | |
… | |
3544 | /* TODO: Handle MULTIPLE */ |
3578 | /* TODO: Handle MULTIPLE */ |
3545 | } |
3579 | } |
3546 | #endif |
3580 | #endif |
3547 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3581 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3548 | { |
3582 | { |
3549 | XChangeProperty (disp, rq.requestor, rq.property, rq.target, |
3583 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3550 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3584 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3551 | ev.property = rq.property; |
3585 | ev.property = rq.property; |
3552 | } |
3586 | } |
3553 | else if (rq.target == XA_STRING |
3587 | else if (rq.target == XA_STRING |
3554 | || rq.target == xa[XA_TEXT] |
3588 | || rq.target == xa[XA_TEXT] |
… | |
… | |
3578 | style = enc_string; |
3612 | style = enc_string; |
3579 | else if (target == xa[XA_TEXT]) |
3613 | else if (target == xa[XA_TEXT]) |
3580 | style = enc_text; |
3614 | style = enc_text; |
3581 | else if (target == xa[XA_COMPOUND_TEXT]) |
3615 | else if (target == xa[XA_COMPOUND_TEXT]) |
3582 | style = enc_compound_text; |
3616 | style = enc_compound_text; |
3583 | #if ENABLE_FRILLS |
3617 | #if !ENABLE_MINIMAL |
3584 | else if (target == xa[XA_UTF8_STRING]) |
3618 | else if (target == xa[XA_UTF8_STRING]) |
3585 | style = enc_utf8; |
3619 | style = enc_utf8; |
3586 | #endif |
3620 | #endif |
3587 | else |
3621 | else |
3588 | { |
3622 | { |
… | |
… | |
3599 | { |
3633 | { |
3600 | cl = L""; |
3634 | cl = L""; |
3601 | selectlen = 0; |
3635 | selectlen = 0; |
3602 | } |
3636 | } |
3603 | |
3637 | |
3604 | #if ENABLE_FRILLS |
3638 | #if !ENABLE_MINIMAL |
3605 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
3639 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
3606 | // so recode it manually |
3640 | // so recode it manually |
3607 | if (style == enc_utf8) |
3641 | if (style == enc_utf8) |
3608 | { |
3642 | { |
3609 | freect = 1; |
3643 | freect = 1; |
… | |
… | |
3612 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3646 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3613 | ct.nitems = strlen ((char *)ct.value); |
3647 | ct.nitems = strlen ((char *)ct.value); |
3614 | } |
3648 | } |
3615 | else |
3649 | else |
3616 | #endif |
3650 | #endif |
3617 | if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3651 | if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3618 | freect = 1; |
3652 | freect = 1; |
3619 | else |
3653 | else |
3620 | { |
3654 | { |
3621 | /* if we failed to convert then send it raw */ |
3655 | /* if we failed to convert then send it raw */ |
3622 | ct.value = (unsigned char *)cl; |
3656 | ct.value = (unsigned char *)cl; |
3623 | ct.nitems = selectlen; |
3657 | ct.nitems = selectlen; |
3624 | ct.encoding = target; |
3658 | ct.encoding = target; |
3625 | } |
3659 | } |
3626 | |
3660 | |
3627 | XChangeProperty (disp, rq.requestor, rq.property, |
3661 | XChangeProperty (dpy, rq.requestor, rq.property, |
3628 | ct.encoding, 8, PropModeReplace, |
3662 | ct.encoding, 8, PropModeReplace, |
3629 | ct.value, (int)ct.nitems); |
3663 | ct.value, (int)ct.nitems); |
3630 | ev.property = rq.property; |
3664 | ev.property = rq.property; |
3631 | |
3665 | |
3632 | if (freect) |
3666 | if (freect) |
3633 | XFree (ct.value); |
3667 | XFree (ct.value); |
3634 | } |
3668 | } |
3635 | |
3669 | |
3636 | XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); |
3670 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3637 | } |
|
|
3638 | |
|
|
3639 | /* ------------------------------------------------------------------------- * |
|
|
3640 | * MOUSE ROUTINES * |
|
|
3641 | * ------------------------------------------------------------------------- */ |
|
|
3642 | |
|
|
3643 | /* |
|
|
3644 | * return col/row values corresponding to x/y pixel values |
|
|
3645 | */ |
|
|
3646 | void |
|
|
3647 | rxvt_term::pixel_position (int *x, int *y) NOTHROW |
|
|
3648 | { |
|
|
3649 | *x = Pixel2Col (*x); |
|
|
3650 | /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ |
|
|
3651 | *y = Pixel2Row (*y); |
|
|
3652 | /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ |
|
|
3653 | } |
3671 | } |
3654 | |
3672 | |
3655 | /* ------------------------------------------------------------------------- */ |
3673 | /* ------------------------------------------------------------------------- */ |
3656 | #ifdef USE_XIM |
3674 | #ifdef USE_XIM |
3657 | void |
3675 | void |
3658 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3676 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3659 | { |
3677 | { |
3660 | XWindowAttributes xwa; |
3678 | XWindowAttributes xwa; |
3661 | |
3679 | |
3662 | XGetWindowAttributes (display->display, vt, &xwa); |
3680 | XGetWindowAttributes (dpy, vt, &xwa); |
3663 | |
3681 | |
3664 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3682 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3665 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3683 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3666 | } |
3684 | } |
3667 | #endif |
3685 | #endif |
… | |
… | |
3763 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW |
3781 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW |
3764 | { |
3782 | { |
3765 | while (*s) |
3783 | while (*s) |
3766 | { |
3784 | { |
3767 | text_t t = *s++; |
3785 | text_t t = *s++; |
3768 | int width = wcwidth (t); |
3786 | int width = WCWIDTH (t); |
3769 | |
3787 | |
3770 | while (width--) |
3788 | while (width--) |
3771 | { |
3789 | { |
3772 | scr_overlay_set (x++, y, t); |
3790 | scr_overlay_set (x++, y, t); |
3773 | t = NOCHAR; |
3791 | t = NOCHAR; |