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-2006 Marc Lehmann <pcg@goof.com> |
… | |
… | |
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 | inline void fill_text (text_t *start, text_t value, int len) |
… | |
… | |
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() \ |
… | |
… | |
93 | */ |
91 | */ |
94 | #define drawBuffer vt |
92 | #define drawBuffer vt |
95 | |
93 | |
96 | #define CLEAR_ROWS(row, num) \ |
94 | #define CLEAR_ROWS(row, num) \ |
97 | if (mapped) \ |
95 | if (mapped) \ |
98 | XClearArea (display->display, drawBuffer, 0, \ |
96 | XClearArea (dpy, drawBuffer, 0, \ |
99 | Row2Pixel (row), (unsigned int)width, \ |
97 | Row2Pixel (row), (unsigned int)width, \ |
100 | (unsigned int)Height2Pixel (num), False) |
98 | (unsigned int)Height2Pixel (num), False) |
101 | |
99 | |
102 | #define CLEAR_CHARS(x, y, num) \ |
100 | #define CLEAR_CHARS(x, y, num) \ |
103 | if (mapped) \ |
101 | if (mapped) \ |
104 | XClearArea (display->display, drawBuffer, x, y, \ |
102 | XClearArea (dpy, drawBuffer, x, y, \ |
105 | (unsigned int)Width2Pixel (num), \ |
103 | (unsigned int)Width2Pixel (num), \ |
106 | (unsigned int)Height2Pixel (1), False) |
104 | (unsigned int)Height2Pixel (1), False) |
107 | |
105 | |
108 | #define ERASE_ROWS(row, num) \ |
106 | #define ERASE_ROWS(row, num) \ |
109 | XFillRectangle (display->display, drawBuffer, gc, \ |
107 | XFillRectangle (dpy, drawBuffer, gc, \ |
110 | 0, Row2Pixel (row), \ |
108 | 0, Row2Pixel (row), \ |
111 | (unsigned int)width, \ |
109 | (unsigned int)width, \ |
112 | (unsigned int)Height2Pixel (num)) |
110 | (unsigned int)Height2Pixel (num)) |
113 | |
111 | |
114 | /* ------------------------------------------------------------------------- * |
112 | /* ------------------------------------------------------------------------- * |
… | |
… | |
126 | width = ncol; |
124 | width = ncol; |
127 | } |
125 | } |
128 | |
126 | |
129 | l.touch (); |
127 | l.touch (); |
130 | |
128 | |
131 | efs &= ~RS_baseattrMask; |
129 | efs &= ~RS_baseattrMask; // remove italic etc. fontstyles |
132 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
130 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
133 | |
131 | |
134 | text_t *et = l.t + col; |
132 | text_t *et = l.t + col; |
135 | rend_t *er = l.r + col; |
133 | rend_t *er = l.r + col; |
136 | |
134 | |
… | |
… | |
161 | { |
159 | { |
162 | #if ENABLE_OVERLAY |
160 | #if ENABLE_OVERLAY |
163 | scr_overlay_off (); |
161 | scr_overlay_off (); |
164 | #endif |
162 | #endif |
165 | |
163 | |
|
|
164 | rvideo_mode = false; |
166 | view_start = 0; |
165 | view_start = 0; |
167 | num_scr = 0; |
166 | num_scr = 0; |
168 | |
167 | |
169 | if (ncol == 0) |
168 | if (ncol == 0) |
170 | ncol = 80; |
169 | ncol = 80; |
… | |
… | |
173 | nrow = 24; |
172 | nrow = 24; |
174 | |
173 | |
175 | if (ncol == prev_ncol && nrow == prev_nrow) |
174 | if (ncol == prev_ncol && nrow == prev_nrow) |
176 | return; |
175 | return; |
177 | |
176 | |
|
|
177 | if (current_screen != PRIMARY) |
|
|
178 | scr_swap_screen (); |
|
|
179 | |
178 | // we need at least two lines for wrapping to work correctly |
180 | // we need at least two lines for wrapping to work correctly |
179 | if (nrow + saveLines < 2) |
181 | while (nrow + saveLines < 2) |
180 | { |
182 | { |
181 | //TODO//FIXME |
183 | //TODO//FIXME |
182 | saveLines++; |
184 | saveLines++; |
183 | prev_nrow--; |
185 | prev_nrow--; |
184 | top_row--; |
186 | top_row--; |
… | |
… | |
195 | if (!row_buf) |
197 | if (!row_buf) |
196 | { |
198 | { |
197 | /* |
199 | /* |
198 | * first time called so just malloc everything: don't rely on realloc |
200 | * first time called so just malloc everything: don't rely on realloc |
199 | */ |
201 | */ |
200 | top_row = 0; /* no saved lines */ |
202 | top_row = 0; |
201 | term_start = 0; |
203 | term_start = 0; |
202 | |
204 | |
203 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
205 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
204 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
206 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
205 | |
207 | |
… | |
… | |
234 | selection.text = NULL; |
236 | selection.text = NULL; |
235 | selection.len = 0; |
237 | selection.len = 0; |
236 | selection.op = SELECTION_CLEAR; |
238 | selection.op = SELECTION_CLEAR; |
237 | selection.screen = PRIMARY; |
239 | selection.screen = PRIMARY; |
238 | selection.clicks = 0; |
240 | selection.clicks = 0; |
239 | rvideo = 0; |
|
|
240 | } |
241 | } |
241 | else |
242 | else |
242 | { |
243 | { |
243 | /* |
244 | /* |
244 | * add or delete rows as appropriate |
245 | * add or delete rows as appropriate |
… | |
… | |
280 | int pend = MOD (term_start + top_row , prev_total_rows); |
281 | int pend = MOD (term_start + top_row , prev_total_rows); |
281 | int q = total_rows; // rewrapped row |
282 | int q = total_rows; // rewrapped row |
282 | |
283 | |
283 | if (top_row) |
284 | if (top_row) |
284 | { |
285 | { |
285 | // re-wrap lines, this is rather ugly, possibly because I am too dumb |
286 | // Re-wrap lines. This is rather ugly, possibly because I am too dumb |
286 | // to come up with a lean and mean algorithm. |
287 | // to come up with a lean and mean algorithm. |
287 | |
288 | |
288 | row_col_t ocur = screen.cur; |
289 | row_col_t ocur = screen.cur; |
289 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
290 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
290 | |
291 | |
… | |
… | |
347 | |
348 | |
348 | line_t &pline = old_buf [prow]; |
349 | line_t &pline = old_buf [prow]; |
349 | |
350 | |
350 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
351 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
351 | |
352 | |
352 | #if DEBUG_STRICT |
|
|
353 | assert (len); |
|
|
354 | assert (pline.t); |
|
|
355 | #endif |
|
|
356 | |
|
|
357 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
353 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
358 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
354 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
359 | |
355 | |
360 | lofs += len; |
356 | lofs += len; |
361 | qcol += len; |
357 | qcol += len; |
… | |
… | |
401 | delete old_ra; |
397 | delete old_ra; |
402 | |
398 | |
403 | clamp_it (screen.cur.row, 0, nrow - 1); |
399 | clamp_it (screen.cur.row, 0, nrow - 1); |
404 | clamp_it (screen.cur.col, 0, ncol - 1); |
400 | clamp_it (screen.cur.col, 0, ncol - 1); |
405 | |
401 | |
406 | if (tabs) |
|
|
407 | free (tabs); |
402 | free (tabs); |
408 | } |
403 | } |
409 | |
404 | |
410 | CLEAR_ALL_SELECTION (); |
405 | CLEAR_ALL_SELECTION (); |
411 | |
406 | |
412 | prev_nrow = nrow; |
407 | prev_nrow = nrow; |
413 | prev_ncol = ncol; |
408 | prev_ncol = ncol; |
414 | |
409 | |
415 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
410 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
416 | |
411 | |
417 | for (int col = ncol; col--; ) |
412 | for (int col = ncol; --col; ) |
418 | tabs [col] = col % TABSIZE == 0; |
413 | tabs [col] = col % TABSIZE == 0; |
419 | |
414 | |
|
|
415 | if (current_screen != PRIMARY) |
|
|
416 | scr_swap_screen (); |
|
|
417 | |
420 | tt_winch (); |
418 | tt_winch (); |
421 | |
419 | |
422 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
420 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
423 | } |
421 | } |
424 | |
422 | |
… | |
… | |
427 | * Free everything. That way malloc debugging can find leakage. |
425 | * Free everything. That way malloc debugging can find leakage. |
428 | */ |
426 | */ |
429 | void |
427 | void |
430 | rxvt_term::scr_release () NOTHROW |
428 | rxvt_term::scr_release () NOTHROW |
431 | { |
429 | { |
|
|
430 | if (row_buf) |
|
|
431 | { |
432 | delete talloc; talloc = 0; |
432 | delete talloc; talloc = 0; |
433 | delete ralloc; ralloc = 0; |
433 | delete ralloc; ralloc = 0; |
434 | |
434 | |
435 | free (row_buf); |
435 | free (row_buf); |
436 | free (swap_buf); |
436 | free (swap_buf); |
437 | free (drawn_buf); |
437 | free (drawn_buf); |
438 | free (tabs); |
438 | free (tabs); |
439 | |
439 | |
440 | row_buf = 0; // signal that we freed all the arrays |
440 | row_buf = 0; // signal that we freed all the arrays |
|
|
441 | } |
441 | } |
442 | } |
442 | |
443 | |
443 | /* ------------------------------------------------------------------------- */ |
444 | /* ------------------------------------------------------------------------- */ |
444 | /* |
445 | /* |
445 | * Hard reset |
446 | * Hard reset |
446 | */ |
447 | */ |
447 | void |
448 | void |
448 | rxvt_term::scr_poweron () NOTHROW |
449 | rxvt_term::scr_poweron () |
449 | { |
450 | { |
450 | scr_release (); |
451 | scr_release (); |
451 | prev_nrow = prev_ncol = 0; |
452 | prev_nrow = prev_ncol = 0; |
452 | scr_reset (); |
453 | scr_reset (); |
453 | |
454 | |
… | |
… | |
504 | assert (s->cur.row >= 0); |
505 | assert (s->cur.row >= 0); |
505 | assert (s->cur.col >= 0); |
506 | assert (s->cur.col >= 0); |
506 | #endif |
507 | #endif |
507 | } |
508 | } |
508 | |
509 | |
|
|
510 | void |
|
|
511 | rxvt_term::scr_swap_screen () |
|
|
512 | { |
|
|
513 | if (!option (Opt_secondaryScreen)) |
|
|
514 | return; |
|
|
515 | |
|
|
516 | for (int i = prev_nrow; i--; ) |
|
|
517 | ::swap (ROW(i), swap_buf [i]); |
|
|
518 | |
|
|
519 | ::swap (screen.cur, swap.cur); |
|
|
520 | |
|
|
521 | screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); |
|
|
522 | screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); |
|
|
523 | } |
|
|
524 | |
509 | /* ------------------------------------------------------------------------- */ |
525 | /* ------------------------------------------------------------------------- */ |
510 | /* |
526 | /* |
511 | * Swap between primary and secondary screens |
527 | * Swap between primary and secondary screens |
512 | * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h |
528 | * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h |
513 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
529 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
514 | */ |
530 | */ |
515 | int |
531 | void |
516 | rxvt_term::scr_change_screen (int scrn) NOTHROW |
532 | rxvt_term::scr_change_screen (int scrn) |
517 | { |
533 | { |
|
|
534 | if (scrn == current_screen) |
|
|
535 | return; |
|
|
536 | |
518 | want_refresh = 1; |
537 | want_refresh = 1; |
519 | view_start = 0; |
538 | view_start = 0; |
520 | |
539 | |
521 | if (current_screen == scrn) |
|
|
522 | return scrn; |
|
|
523 | |
|
|
524 | selection_check (2); /* check for boundary cross */ |
540 | selection_check (2); /* check for boundary cross */ |
525 | |
541 | |
526 | int i = current_screen; current_screen = scrn; scrn = i; |
542 | int i = current_screen; current_screen = scrn; scrn = i; |
527 | |
543 | |
528 | ::swap (screen.cur.row, swap.cur.row); |
|
|
529 | ::swap (screen.cur.col, swap.cur.col); |
|
|
530 | |
|
|
531 | screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); |
|
|
532 | screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); |
|
|
533 | |
|
|
534 | #if NSCREENS |
544 | #if NSCREENS |
535 | if (OPTION (Opt_secondaryScreen)) |
545 | if (option (Opt_secondaryScreen)) |
536 | { |
546 | { |
537 | num_scr = 0; |
547 | num_scr = 0; |
538 | |
548 | |
539 | for (int i = prev_nrow; i--; ) |
549 | scr_swap_screen (); |
540 | ::swap (ROW(i), swap_buf [i]); |
|
|
541 | |
550 | |
542 | ::swap (screen.charset, swap.charset); |
551 | ::swap (screen.charset, swap.charset); |
543 | ::swap (screen.flags, swap.flags); |
552 | ::swap (screen.flags, swap.flags); |
544 | screen.flags |= Screen_VisibleCursor; |
553 | screen.flags |= Screen_VisibleCursor; |
545 | swap.flags |= Screen_VisibleCursor; |
554 | swap.flags |= Screen_VisibleCursor; |
546 | } |
555 | } |
547 | else |
556 | else |
548 | #endif |
557 | #endif |
549 | if (OPTION (Opt_secondaryScroll)) |
558 | if (option (Opt_secondaryScroll)) |
550 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
559 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
551 | |
|
|
552 | return scrn; |
|
|
553 | } |
560 | } |
554 | |
561 | |
555 | // clear WrapNext indicator, solidifying position on next line |
562 | // clear WrapNext indicator, solidifying position on next line |
556 | void |
563 | void |
557 | rxvt_term::scr_do_wrap () NOTHROW |
564 | rxvt_term::scr_do_wrap () NOTHROW |
… | |
… | |
615 | want_refresh = 1; |
622 | want_refresh = 1; |
616 | num_scr += count; |
623 | num_scr += count; |
617 | |
624 | |
618 | if (count > 0 |
625 | if (count > 0 |
619 | && row1 == 0 |
626 | && row1 == 0 |
620 | && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) |
627 | && (current_screen == PRIMARY || option (Opt_secondaryScroll))) |
621 | { |
628 | { |
622 | top_row = max (top_row - count, -saveLines); |
629 | top_row = max (top_row - count, -saveLines); |
623 | |
630 | |
624 | // scroll everything up 'count' lines |
631 | // scroll everything up 'count' lines |
625 | term_start = (term_start + count) % total_rows; |
632 | term_start = (term_start + count) % total_rows; |
… | |
… | |
632 | } |
639 | } |
633 | |
640 | |
634 | // erase newly scrolled-in lines |
641 | // erase newly scrolled-in lines |
635 | for (int i = count; i--; ) |
642 | for (int i = count; i--; ) |
636 | { |
643 | { |
637 | // basically this is a slightly optimized scr_blank_screen_mem |
|
|
638 | // it is worth the effort on slower machines |
|
|
639 | line_t &l = ROW(nrow - 1 - i); |
644 | line_t &l = ROW(nrow - 1 - i); |
640 | |
645 | |
|
|
646 | // optimize if already cleared, can be significant on slow machines |
|
|
647 | // could be rolled into scr_blank_screen_mem |
|
|
648 | if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) |
|
|
649 | { |
641 | scr_blank_line (l, 0, l.l, rstyle); |
650 | scr_blank_line (l, 0, l.l, rstyle); |
642 | |
|
|
643 | l.l = 0; |
651 | l.l = 0; |
644 | l.f = 0; |
652 | l.f = 0; |
|
|
653 | } |
|
|
654 | else |
|
|
655 | scr_blank_screen_mem (l, rstyle); |
645 | } |
656 | } |
646 | |
657 | |
647 | // now copy lines below the scroll region bottom to the |
658 | // now copy lines below the scroll region bottom to the |
648 | // bottom of the screen again, so they look as if they |
659 | // bottom of the screen again, so they look as if they |
649 | // hadn't moved. |
660 | // hadn't moved. |
… | |
… | |
671 | selection.op = SELECTION_CLEAR; |
682 | selection.op = SELECTION_CLEAR; |
672 | } |
683 | } |
673 | } |
684 | } |
674 | |
685 | |
675 | // finally move the view window, if desired |
686 | // finally move the view window, if desired |
676 | if (OPTION (Opt_scrollWithBuffer) |
687 | if (option (Opt_scrollWithBuffer) |
677 | && view_start != 0 |
688 | && view_start != 0 |
678 | && view_start != -saveLines) |
689 | && view_start != -saveLines) |
679 | scr_page (UP, count); |
690 | scr_page (UP, count); |
680 | |
691 | |
681 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
692 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
… | |
… | |
749 | ZERO_SCROLLBACK (); |
760 | ZERO_SCROLLBACK (); |
750 | |
761 | |
751 | if (minlines > 0) |
762 | if (minlines > 0) |
752 | { |
763 | { |
753 | minlines += screen.cur.row - screen.bscroll; |
764 | minlines += screen.cur.row - screen.bscroll; |
|
|
765 | min_it (minlines, screen.cur.row - top_row); |
754 | |
766 | |
755 | if (minlines > 0 |
767 | if (minlines > 0 |
756 | && screen.tscroll == 0 |
768 | && screen.tscroll == 0 |
757 | && screen.bscroll == nrow - 1) |
769 | && screen.bscroll == nrow - 1) |
758 | { |
770 | { |
… | |
… | |
832 | |
844 | |
833 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
845 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
834 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
846 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
835 | c = 0xfffd; |
847 | c = 0xfffd; |
836 | |
848 | |
837 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
849 | // rely on wcwidth to tell us the character width, do wcwidth before |
838 | // do wcwidth before further replacements, as wcwidth might return -1 |
850 | // further replacements, as wcwidth might return -1 for the line |
839 | // for the line drawing characters below as they might be invalid in the current |
851 | // drawing characters below as they might be invalid in the current |
840 | // locale. |
852 | // locale. |
841 | int width = c < 0x100 ? 1 : wcwidth (c); |
853 | int width = WCWIDTH (c); |
842 | |
854 | |
843 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
855 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
844 | { |
856 | { |
845 | // vt100 special graphics and line drawing |
857 | // vt100 special graphics and line drawing |
846 | // 5f-7e standard vt100 |
858 | // 5f-7e standard vt100 |
… | |
… | |
1057 | if (count) |
1069 | if (count) |
1058 | x = ncol - 1; |
1070 | x = ncol - 1; |
1059 | |
1071 | |
1060 | // store horizontal tab commands as characters inside the text |
1072 | // store horizontal tab commands as characters inside the text |
1061 | // buffer so they can be selected and pasted. |
1073 | // buffer so they can be selected and pasted. |
1062 | if (ht && OPTION (Opt_pastableTabs)) |
1074 | if (ht && option (Opt_pastableTabs)) |
1063 | { |
1075 | { |
1064 | base_rend = SET_FONT (base_rend, 0); |
1076 | base_rend = SET_FONT (base_rend, 0); |
1065 | |
1077 | |
1066 | l.touch (x); |
1078 | l.touch (x); |
1067 | |
1079 | |
… | |
… | |
1100 | * Process DEC Back Index |
1112 | * Process DEC Back Index |
1101 | * XTERM_SEQ: ESC 6 |
1113 | * XTERM_SEQ: ESC 6 |
1102 | * Move cursor left in row. If we're at the left boundary, shift everything |
1114 | * Move cursor left in row. If we're at the left boundary, shift everything |
1103 | * in that row right. Clear left column. |
1115 | * in that row right. Clear left column. |
1104 | */ |
1116 | */ |
1105 | #if ENABLE_FRILLS |
1117 | #if !ENABLE_MINIMAL |
1106 | void |
1118 | void |
1107 | rxvt_term::scr_backindex () NOTHROW |
1119 | rxvt_term::scr_backindex () NOTHROW |
1108 | { |
1120 | { |
1109 | if (screen.cur.col > 0) |
1121 | if (screen.cur.col > 0) |
1110 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1122 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
… | |
… | |
1117 | * Process DEC Forward Index |
1129 | * Process DEC Forward Index |
1118 | * XTERM_SEQ: ESC 9 |
1130 | * XTERM_SEQ: ESC 9 |
1119 | * Move cursor right in row. If we're at the right boundary, shift everything |
1131 | * Move cursor right in row. If we're at the right boundary, shift everything |
1120 | * in that row left. Clear right column. |
1132 | * in that row left. Clear right column. |
1121 | */ |
1133 | */ |
1122 | #if ENABLE_FRILLS |
1134 | #if !ENABLE_MINIMAL |
1123 | void |
1135 | void |
1124 | rxvt_term::scr_forwardindex () NOTHROW |
1136 | rxvt_term::scr_forwardindex () NOTHROW |
1125 | { |
1137 | { |
1126 | if (screen.cur.col < ncol - 1) |
1138 | if (screen.cur.col < ncol - 1) |
1127 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1139 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
… | |
… | |
1328 | } |
1340 | } |
1329 | else |
1341 | else |
1330 | { |
1342 | { |
1331 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1343 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1332 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1344 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1333 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1345 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1334 | ERASE_ROWS (row, num); |
1346 | ERASE_ROWS (row, num); |
1335 | gcvalue.foreground = pix_colors[Color_fg]; |
1347 | gcvalue.foreground = pix_colors[Color_fg]; |
1336 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1348 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1337 | } |
1349 | } |
1338 | |
1350 | |
1339 | for (; num--; row++) |
1351 | for (; num--; row++) |
1340 | { |
1352 | { |
1341 | scr_blank_screen_mem (ROW(row), rstyle); |
1353 | scr_blank_screen_mem (ROW(row), rstyle); |
1342 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1354 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1343 | } |
1355 | } |
1344 | } |
1356 | } |
1345 | |
1357 | |
1346 | #if ENABLE_FRILLS |
1358 | #if !ENABLE_MINIMAL |
1347 | void |
1359 | void |
1348 | rxvt_term::scr_erase_savelines () NOTHROW |
1360 | rxvt_term::scr_erase_savelines () NOTHROW |
1349 | { |
1361 | { |
1350 | want_refresh = 1; |
1362 | want_refresh = 1; |
1351 | ZERO_SCROLLBACK (); |
1363 | ZERO_SCROLLBACK (); |
… | |
… | |
1621 | * Set reverse/normal video |
1633 | * Set reverse/normal video |
1622 | * XTERM_SEQ: Reverse video: ESC [ ? 5 h |
1634 | * XTERM_SEQ: Reverse video: ESC [ ? 5 h |
1623 | * XTERM_SEQ: Normal video : ESC [ ? 5 l |
1635 | * XTERM_SEQ: Normal video : ESC [ ? 5 l |
1624 | */ |
1636 | */ |
1625 | void |
1637 | void |
1626 | rxvt_term::scr_rvideo_mode (int mode) NOTHROW |
1638 | rxvt_term::scr_rvideo_mode (bool on) NOTHROW |
1627 | { |
1639 | { |
1628 | XGCValues gcvalue; |
1640 | rvideo_mode = on; |
1629 | |
1641 | |
|
|
1642 | #ifndef NO_BELL |
|
|
1643 | on ^= rvideo_bell; |
|
|
1644 | #endif |
|
|
1645 | |
1630 | if (rvideo != mode) |
1646 | if (rvideo_state != on) |
1631 | { |
1647 | { |
1632 | rvideo = mode; |
1648 | rvideo_state = on; |
|
|
1649 | |
1633 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1650 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1634 | #if XPM_BACKGROUND |
1651 | #ifdef HAVE_BG_PIXMAP |
1635 | if (bgPixmap.pixmap == None) |
1652 | if (bgPixmap.pixmap == None) |
1636 | #endif |
1653 | #endif |
1637 | #if TRANSPARENT |
1654 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1638 | if (! OPTION (Opt_transparent) || am_transparent == 0) |
|
|
1639 | #endif |
|
|
1640 | XSetWindowBackground (display->display, vt, |
|
|
1641 | pix_colors[Color_bg]); |
|
|
1642 | |
1655 | |
|
|
1656 | XGCValues gcvalue; |
1643 | gcvalue.foreground = pix_colors[Color_fg]; |
1657 | gcvalue.foreground = pix_colors[Color_fg]; |
1644 | gcvalue.background = pix_colors[Color_bg]; |
1658 | gcvalue.background = pix_colors[Color_bg]; |
1645 | XChangeGC (display->display, gc, GCBackground | GCForeground, |
1659 | XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue); |
1646 | &gcvalue); |
1660 | |
1647 | scr_clear (); |
1661 | scr_clear (); |
1648 | scr_touch (true); |
1662 | scr_touch (true); |
1649 | } |
1663 | } |
1650 | } |
1664 | } |
1651 | |
1665 | |
… | |
… | |
1735 | { |
1749 | { |
1736 | bool found = false; |
1750 | bool found = false; |
1737 | |
1751 | |
1738 | for (int i = 0; i < nrow; i++) |
1752 | for (int i = 0; i < nrow; i++) |
1739 | { |
1753 | { |
1740 | int col = 0; |
|
|
1741 | rend_t *drp = drawn_buf[i].r; |
1754 | rend_t *drp = drawn_buf[i].r; |
1742 | |
1755 | |
1743 | for (; col < ncol; col++, drp++) |
1756 | for (int col = 0; col < ncol; col++, drp++) |
1744 | if ((*drp & mask) == value) |
1757 | if ((*drp & mask) == value) |
1745 | { |
1758 | { |
1746 | found = true; |
1759 | found = true; |
1747 | *drp = ~value; |
1760 | *drp = ~value; |
1748 | } |
1761 | } |
… | |
… | |
1788 | for (i = PART_BEG; i < RC_COUNT; i++) |
1801 | for (i = PART_BEG; i < RC_COUNT; i++) |
1789 | { |
1802 | { |
1790 | min_it (rc[i].col, ncol - 1); |
1803 | min_it (rc[i].col, ncol - 1); |
1791 | min_it (rc[i].row, nrow - 1); |
1804 | min_it (rc[i].row, nrow - 1); |
1792 | } |
1805 | } |
1793 | |
1806 | // TODO: this line somehow causes segfault if scr_expose() is called just after resize |
1794 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1807 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1795 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1808 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1796 | |
1809 | |
1797 | num_scr_allow = 0; |
1810 | num_scr_allow = 0; |
1798 | |
1811 | |
… | |
… | |
1851 | HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); |
1864 | HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); |
1852 | |
1865 | |
1853 | return true; |
1866 | return true; |
1854 | } |
1867 | } |
1855 | |
1868 | |
|
|
1869 | #ifndef NO_BELL |
|
|
1870 | void |
|
|
1871 | rxvt_term::bell_cb (time_watcher &w) |
|
|
1872 | { |
|
|
1873 | rvideo_bell = false; |
|
|
1874 | scr_rvideo_mode (rvideo_mode); |
|
|
1875 | } |
|
|
1876 | #endif |
|
|
1877 | |
1856 | /* ------------------------------------------------------------------------- */ |
1878 | /* ------------------------------------------------------------------------- */ |
1857 | void |
1879 | void |
1858 | rxvt_term::scr_bell () NOTHROW |
1880 | rxvt_term::scr_bell () NOTHROW |
1859 | { |
1881 | { |
1860 | #ifndef NO_BELL |
1882 | #ifndef NO_BELL |
1861 | |
1883 | |
1862 | # ifndef NO_MAPALERT |
1884 | # ifndef NO_MAPALERT |
1863 | # ifdef MAPALERT_OPTION |
1885 | # ifdef MAPALERT_OPTION |
1864 | if (OPTION (Opt_mapAlert)) |
1886 | if (option (Opt_mapAlert)) |
1865 | # endif |
1887 | # endif |
1866 | XMapWindow (display->display, parent[0]); |
1888 | XMapWindow (dpy, parent[0]); |
1867 | # endif |
1889 | # endif |
|
|
1890 | # if ENABLE_FRILLS |
|
|
1891 | if (option (Opt_urgentOnBell)) |
|
|
1892 | { |
|
|
1893 | XWMHints *h; |
1868 | |
1894 | |
1869 | if (OPTION (Opt_visualBell)) |
1895 | h = XGetWMHints(dpy, parent[0]); |
|
|
1896 | if (h != NULL) |
|
|
1897 | { |
|
|
1898 | h->flags |= XUrgencyHint; |
|
|
1899 | XSetWMHints(dpy, parent[0], h); |
|
|
1900 | } |
1870 | { |
1901 | } |
1871 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1902 | # endif |
|
|
1903 | |
|
|
1904 | if (option (Opt_visualBell)) |
|
|
1905 | { |
|
|
1906 | rvideo_bell = true; |
|
|
1907 | scr_rvideo_mode (rvideo_mode); |
1872 | display->flush (); |
1908 | display->flush (); |
1873 | rxvt_usleep (VISUAL_BELL_DURATION); |
1909 | |
1874 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1910 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1875 | } |
1911 | } |
1876 | else |
1912 | else |
1877 | XBell (display->display, 0); |
1913 | XBell (dpy, 0); |
1878 | |
|
|
1879 | #endif |
1914 | #endif |
1880 | } |
1915 | } |
1881 | |
1916 | |
1882 | /* ------------------------------------------------------------------------- */ |
1917 | /* ------------------------------------------------------------------------- */ |
1883 | /* ARGSUSED */ |
1918 | /* ARGSUSED */ |
… | |
… | |
1941 | * screen.text/screen.rend contain what the screen will change to. |
1976 | * screen.text/screen.rend contain what the screen will change to. |
1942 | */ |
1977 | */ |
1943 | void |
1978 | void |
1944 | rxvt_term::scr_refresh () NOTHROW |
1979 | rxvt_term::scr_refresh () NOTHROW |
1945 | { |
1980 | { |
1946 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1981 | unsigned char have_bg, |
1947 | showcursor; /* show the cursor */ |
1982 | showcursor; /* show the cursor */ |
1948 | int16_t col, row, /* column/row we're processing */ |
1983 | int16_t col, row, /* column/row we're processing */ |
1949 | ocrow; /* old cursor row */ |
1984 | ocrow; /* old cursor row */ |
1950 | int i; /* tmp */ |
1985 | int i; /* tmp */ |
1951 | #ifndef NO_CURSORCOLOR |
1986 | #ifndef NO_CURSORCOLOR |
1952 | rend_t cc1; /* store colours at cursor position (s) */ |
1987 | rend_t cc1; /* store colours at cursor position (s) */ |
1953 | #endif |
1988 | #endif |
1954 | rend_t *crp; // cursor rendition pointer |
1989 | rend_t *crp; // cursor rendition pointer |
|
|
1990 | rend_t ccol1, /* Cursor colour */ |
|
|
1991 | ccol2; /* Cursor colour2 */ |
1955 | |
1992 | |
1956 | want_refresh = 0; /* screen is current */ |
1993 | want_refresh = 0; /* screen is current */ |
1957 | |
1994 | |
1958 | if (refresh_type == NO_REFRESH || !mapped) |
1995 | if (refresh_type == NO_REFRESH || !mapped) |
1959 | return; |
1996 | return; |
1960 | |
1997 | |
1961 | /* |
1998 | /* |
1962 | * A: set up vars |
1999 | * A: set up vars |
1963 | */ |
2000 | */ |
1964 | must_clear = 0; |
2001 | have_bg = 0; |
1965 | refresh_count = 0; |
2002 | refresh_count = 0; |
1966 | |
2003 | |
1967 | #if XPM_BACKGROUND |
2004 | #ifdef HAVE_BG_PIXMAP |
1968 | must_clear |= bgPixmap.pixmap != None; |
2005 | have_bg |= bgPixmap.pixmap != None; |
1969 | #endif |
|
|
1970 | #if TRANSPARENT |
|
|
1971 | must_clear |= OPTION (Opt_transparent) && am_transparent; |
|
|
1972 | #endif |
2006 | #endif |
1973 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2007 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
1974 | |
2008 | |
1975 | /* |
2009 | /* |
1976 | * B: reverse any characters which are selected |
2010 | * B: reverse any characters which are selected |
… | |
… | |
1980 | /* |
2014 | /* |
1981 | * C: set the cursor character (s) |
2015 | * C: set the cursor character (s) |
1982 | */ |
2016 | */ |
1983 | { |
2017 | { |
1984 | unsigned char setoldcursor; |
2018 | unsigned char setoldcursor; |
1985 | rend_t ccol1, /* Cursor colour */ |
|
|
1986 | ccol2; /* Cursor colour2 */ |
|
|
1987 | |
2019 | |
1988 | showcursor = (screen.flags & Screen_VisibleCursor); |
2020 | showcursor = (screen.flags & Screen_VisibleCursor); |
1989 | #ifdef CURSOR_BLINK |
2021 | #ifdef CURSOR_BLINK |
1990 | if (hidden_cursor) |
2022 | if (hidden_cursor) |
1991 | showcursor = 0; |
2023 | showcursor = 0; |
… | |
… | |
1998 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2030 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
1999 | col--; |
2031 | col--; |
2000 | |
2032 | |
2001 | crp = &ROW(screen.cur.row).r[col]; |
2033 | crp = &ROW(screen.cur.row).r[col]; |
2002 | |
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 | #endif |
|
|
2041 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2042 | ccol1 = fgcolor_of (rstyle); |
|
|
2043 | #else |
|
|
2044 | ccol1 = Color_fg; |
|
|
2045 | #endif |
|
|
2046 | |
|
|
2047 | #ifndef NO_CURSORCOLOR |
|
|
2048 | if (ISSET_PIXCOLOR (Color_cursor2)) |
|
|
2049 | ccol2 = Color_cursor2; |
|
|
2050 | else |
|
|
2051 | #endif |
|
|
2052 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2053 | ccol2 = bgcolor_of (rstyle); |
|
|
2054 | #else |
|
|
2055 | ccol2 = Color_bg; |
|
|
2056 | #endif |
|
|
2057 | |
2003 | if (showcursor && focus) |
2058 | if (showcursor && focus) |
2004 | { |
2059 | { |
2005 | if (OPTION (Opt_cursorUnderline)) |
2060 | if (option (Opt_cursorUnderline)) |
2006 | *crp ^= RS_Uline; |
2061 | *crp ^= RS_Uline; |
2007 | else |
2062 | else |
2008 | { |
2063 | { |
2009 | *crp ^= RS_RVid; |
2064 | *crp ^= RS_RVid; |
2010 | |
|
|
2011 | #ifndef NO_CURSORCOLOR |
|
|
2012 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
|
|
2013 | if (ISSET_PIXCOLOR (Color_cursor)) |
|
|
2014 | ccol1 = Color_cursor; |
|
|
2015 | else |
|
|
2016 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2017 | ccol1 = fgcolor_of (rstyle); |
|
|
2018 | #else |
|
|
2019 | ccol1 = Color_fg; |
|
|
2020 | #endif |
|
|
2021 | if (ISSET_PIXCOLOR (Color_cursor2)) |
|
|
2022 | ccol2 = Color_cursor2; |
|
|
2023 | else |
|
|
2024 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2025 | ccol2 = bgcolor_of (rstyle); |
|
|
2026 | #else |
|
|
2027 | ccol2 = Color_bg; |
|
|
2028 | #endif |
|
|
2029 | *crp = SET_FGCOLOR (*crp, ccol1); |
2065 | *crp = SET_FGCOLOR (*crp, ccol1); |
2030 | *crp = SET_BGCOLOR (*crp, ccol2); |
2066 | *crp = SET_BGCOLOR (*crp, ccol2); |
2031 | #endif |
|
|
2032 | } |
2067 | } |
2033 | } |
2068 | } |
2034 | } |
2069 | } |
2035 | |
2070 | |
2036 | /* make sure no outline cursor is left around */ |
2071 | /* make sure no outline cursor is left around */ |
… | |
… | |
2075 | * D: CopyArea pass - very useful for slower links |
2110 | * D: CopyArea pass - very useful for slower links |
2076 | * This has been deliberately kept simple. |
2111 | * This has been deliberately kept simple. |
2077 | */ |
2112 | */ |
2078 | if (!display->is_local |
2113 | if (!display->is_local |
2079 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2114 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2080 | && abs (num_scr) < nrow && !must_clear) |
2115 | && abs (num_scr) < nrow && !have_bg) |
2081 | { |
2116 | { |
2082 | int16_t nits; |
2117 | int16_t nits; |
|
|
2118 | int i = num_scr; |
2083 | int j; |
2119 | int j; |
2084 | int len, wlen; |
2120 | int len, wlen; |
2085 | dLocal (int, num_scr); |
2121 | dLocal (int, num_scr); |
2086 | |
2122 | |
2087 | j = nrow; |
2123 | j = nrow; |
2088 | wlen = len = -1; |
2124 | wlen = len = -1; |
2089 | row = i > 0 ? 0 : j - 1; |
2125 | row = i > 0 ? 0 : j - 1; |
|
|
2126 | |
2090 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2127 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2091 | { |
2128 | { |
2092 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2129 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2093 | { |
2130 | { |
2094 | line_t s = ROW(view_start + row); |
2131 | line_t s = ROW(view_start + row); |
… | |
… | |
2115 | wlen = row; |
2152 | wlen = row; |
2116 | continue; |
2153 | continue; |
2117 | } |
2154 | } |
2118 | } |
2155 | } |
2119 | |
2156 | |
2120 | if (len != -1) |
2157 | if (len >= 0) |
2121 | { |
2158 | { |
2122 | /* also comes here at end if needed because of >= above */ |
2159 | /* also comes here at end if needed because of >= above */ |
2123 | if (wlen < len) |
2160 | if (wlen < len) |
2124 | ::swap (wlen, len); |
2161 | ::swap (wlen, len); |
2125 | |
2162 | |
|
|
2163 | XGCValues gcv; |
|
|
2164 | |
|
|
2165 | gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv); |
2126 | XCopyArea (display->display, vt, vt, |
2166 | XCopyArea (dpy, vt, vt, |
2127 | gc, 0, Row2Pixel (len + i), |
2167 | gc, 0, Row2Pixel (len + i), |
2128 | (unsigned int)this->width, |
2168 | (unsigned int)this->width, |
2129 | (unsigned int)Height2Pixel (wlen - len + 1), |
2169 | (unsigned int)Height2Pixel (wlen - len + 1), |
2130 | 0, Row2Pixel (len)); |
2170 | 0, Row2Pixel (len)); |
|
|
2171 | gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv); |
|
|
2172 | |
2131 | len = -1; |
2173 | len = -1; |
2132 | } |
2174 | } |
2133 | } |
2175 | } |
2134 | } |
2176 | } |
2135 | #endif |
2177 | #endif |
… | |
… | |
2191 | count++; |
2233 | count++; |
2192 | |
2234 | |
2193 | if (stp[col] != dtp[col] |
2235 | if (stp[col] != dtp[col] |
2194 | || !RS_SAME (srp[col], drp[col])) |
2236 | || !RS_SAME (srp[col], drp[col])) |
2195 | { |
2237 | { |
2196 | if (must_clear && (i++ > count / 2)) |
2238 | if (have_bg && (i++ > count / 2)) |
2197 | break; |
2239 | break; |
2198 | |
2240 | |
2199 | dtp[col] = stp[col]; |
2241 | dtp[col] = stp[col]; |
2200 | drp[col] = rend; |
2242 | drp[col] = rend; |
2201 | i = 0; |
2243 | i = 0; |
2202 | } |
2244 | } |
2203 | else if (must_clear || (stp[col] != ' ' && ++i >= 16)) |
2245 | else if (have_bg || (stp[col] != ' ' && ++i >= 16)) |
2204 | break; |
2246 | break; |
2205 | } |
2247 | } |
2206 | |
2248 | |
2207 | col--; /* went one too far. move back */ |
2249 | col--; /* went one too far. move back */ |
2208 | count -= i; /* dump any matching trailing chars */ |
2250 | count -= i; /* dump any matching trailing chars */ |
… | |
… | |
2218 | int back = bgcolor_of (rend); // desired background |
2260 | int back = bgcolor_of (rend); // desired background |
2219 | |
2261 | |
2220 | // only do special processing if any attributes are set, which is unlikely |
2262 | // only do special processing if any attributes are set, which is unlikely |
2221 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2263 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2222 | { |
2264 | { |
2223 | #if ENABLE_STYLES |
|
|
2224 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2225 | if (srp[col] & RS_Careful && col < ncol - 1 && 0) |
|
|
2226 | drp[col + 1] = ~srp[col + 1]; |
|
|
2227 | |
|
|
2228 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2229 | while (text > stp |
|
|
2230 | && srp[text - stp - 1] & RS_Careful |
|
|
2231 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2232 | text--, count++, xpixel -= fwidth; |
|
|
2233 | #endif |
|
|
2234 | |
|
|
2235 | bool invert = rend & RS_RVid; |
2265 | bool invert = rend & RS_RVid; |
2236 | |
2266 | |
2237 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2267 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2238 | if (rend & RS_Bold |
2268 | if (rend & RS_Bold |
2239 | && fore == Color_fg) |
2269 | && fore == Color_fg) |
… | |
… | |
2255 | else |
2285 | else |
2256 | invert = !invert; |
2286 | invert = !invert; |
2257 | # endif |
2287 | # endif |
2258 | } |
2288 | } |
2259 | |
2289 | |
2260 | if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) |
2290 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2261 | fore = Color_UL; |
2291 | fore = Color_UL; |
2262 | #endif |
2292 | #endif |
2263 | |
2293 | |
2264 | if (invert) |
2294 | if (invert) |
2265 | { |
2295 | { |
|
|
2296 | #ifdef OPTION_HC |
|
|
2297 | if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2298 | || !ISSET_PIXCOLOR (Color_HC)) |
|
|
2299 | #endif |
|
|
2300 | /* invert the column if no highlightColor is set or it is the |
|
|
2301 | * current cursor column */ |
2266 | ::swap (fore, back); |
2302 | ::swap (fore, back); |
|
|
2303 | #ifdef OPTION_HC |
|
|
2304 | else if (ISSET_PIXCOLOR (Color_HC)) |
|
|
2305 | back = Color_HC; |
|
|
2306 | #endif |
2267 | |
2307 | |
2268 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2308 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
|
|
2309 | # ifndef OPTION_HC |
2269 | if (ISSET_PIXCOLOR (Color_RV)) |
2310 | if (ISSET_PIXCOLOR (Color_RV)) |
2270 | back = Color_RV; |
2311 | back = Color_RV; |
2271 | |
2312 | # endif |
2272 | if (fore == back) |
2313 | if (fore == back) |
2273 | { |
2314 | { |
2274 | fore = Color_bg; |
2315 | fore = Color_bg; |
2275 | back = Color_fg; |
2316 | back = Color_fg; |
2276 | } |
2317 | } |
… | |
… | |
2287 | } |
2328 | } |
2288 | else if (hidden_text) |
2329 | else if (hidden_text) |
2289 | fore = back; |
2330 | fore = back; |
2290 | } |
2331 | } |
2291 | #endif |
2332 | #endif |
|
|
2333 | |
|
|
2334 | #if ENABLE_STYLES |
|
|
2335 | // "careful" (too wide) character handling |
|
|
2336 | |
|
|
2337 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2338 | while (text > stp |
|
|
2339 | && srp[text - stp - 1] & RS_Careful |
|
|
2340 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2341 | text--, count++, xpixel -= fwidth; |
|
|
2342 | |
|
|
2343 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2344 | for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) |
|
|
2345 | drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw; |
|
|
2346 | |
|
|
2347 | // force redraw before "careful" characters to avoid pixel droppings |
|
|
2348 | for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++) |
|
|
2349 | drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw; |
|
|
2350 | #endif |
2292 | } |
2351 | } |
2293 | |
2352 | |
2294 | /* |
2353 | /* |
2295 | * Actually do the drawing of the string here |
2354 | * Actually do the drawing of the string here |
2296 | */ |
2355 | */ |
2297 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2356 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2298 | |
2357 | |
2299 | if (back == fore) |
|
|
2300 | font->clear_rect (*drawable, xpixel, ypixel, |
|
|
2301 | fwidth * count, fheight, |
|
|
2302 | back); |
|
|
2303 | else if (back == Color_bg) |
2358 | if (have_bg && back == Color_bg) |
2304 | { |
2359 | { |
2305 | if (must_clear) |
2360 | // this is very ugly, maybe push it into ->draw? |
2306 | { |
|
|
2307 | CLEAR_CHARS (xpixel, ypixel, count); |
|
|
2308 | |
2361 | |
2309 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2362 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2310 | if (text[i] != ' ') |
2363 | if (text[i] != ' ') |
2311 | { |
2364 | { |
2312 | font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); |
2365 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent); |
2313 | break; |
2366 | goto did_clear; |
2314 | } |
|
|
2315 | } |
2367 | } |
2316 | else |
2368 | |
2317 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); |
2369 | CLEAR_CHARS (xpixel, ypixel, count); |
|
|
2370 | did_clear: ; |
2318 | } |
2371 | } |
2319 | else |
2372 | else |
2320 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2373 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2321 | |
2374 | |
2322 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2375 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2323 | { |
2376 | { |
2324 | #if ENABLE_FRILLS |
2377 | #if ENABLE_FRILLS |
2325 | if (ISSET_PIXCOLOR (Color_underline)) |
2378 | if (ISSET_PIXCOLOR (Color_underline)) |
2326 | XSetForeground (display->display, gc, pix_colors[Color_underline]); |
2379 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2327 | else |
2380 | else |
2328 | #endif |
2381 | #endif |
2329 | XSetForeground (display->display, gc, pix_colors[fore]); |
2382 | XSetForeground (dpy, gc, pix_colors[fore]); |
2330 | |
2383 | |
2331 | XDrawLine (display->display, drawBuffer, gc, |
2384 | XDrawLine (dpy, drawBuffer, gc, |
2332 | xpixel, ypixel + font->ascent + 1, |
2385 | xpixel, ypixel + font->ascent + 1, |
2333 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2386 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2334 | } |
2387 | } |
2335 | } /* for (col....) */ |
2388 | } /* for (col....) */ |
2336 | } /* for (row....) */ |
2389 | } /* for (row....) */ |
… | |
… | |
2345 | */ |
2398 | */ |
2346 | if (showcursor) |
2399 | if (showcursor) |
2347 | { |
2400 | { |
2348 | if (focus) |
2401 | if (focus) |
2349 | { |
2402 | { |
2350 | if (OPTION (Opt_cursorUnderline)) |
2403 | if (option (Opt_cursorUnderline)) |
2351 | *crp ^= RS_Uline; |
2404 | *crp ^= RS_Uline; |
2352 | else |
2405 | else |
2353 | { |
2406 | { |
2354 | *crp ^= RS_RVid; |
2407 | *crp ^= RS_RVid; |
2355 | #ifndef NO_CURSORCOLOR |
2408 | #ifndef NO_CURSORCOLOR |
… | |
… | |
2369 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2422 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2370 | cursorwidth++; |
2423 | cursorwidth++; |
2371 | |
2424 | |
2372 | #ifndef NO_CURSORCOLOR |
2425 | #ifndef NO_CURSORCOLOR |
2373 | if (ISSET_PIXCOLOR (Color_cursor)) |
2426 | if (ISSET_PIXCOLOR (Color_cursor)) |
2374 | XSetForeground (display->display, gc, pix_colors[Color_cursor]); |
2427 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
|
|
2428 | else |
2375 | #endif |
2429 | #endif |
|
|
2430 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2376 | |
2431 | |
2377 | XDrawRectangle (display->display, drawBuffer, gc, |
2432 | XDrawRectangle (dpy, drawBuffer, gc, |
2378 | Col2Pixel (col), |
2433 | Col2Pixel (col), |
2379 | Row2Pixel (oldcursor.row), |
2434 | Row2Pixel (oldcursor.row), |
2380 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2435 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2381 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2436 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2382 | } |
2437 | } |
… | |
… | |
2417 | } |
2472 | } |
2418 | |
2473 | |
2419 | void |
2474 | void |
2420 | rxvt_term::scr_recolour () NOTHROW |
2475 | rxvt_term::scr_recolour () NOTHROW |
2421 | { |
2476 | { |
2422 | if (1 |
2477 | #ifdef HAVE_BG_PIXMAP |
2423 | #if TRANSPARENT |
2478 | bgPixmap.apply (); |
2424 | && !am_transparent |
2479 | #else |
2425 | #endif |
|
|
2426 | #if XPM_BACKGROUND |
|
|
2427 | && !bgPixmap.pixmap |
|
|
2428 | #endif |
|
|
2429 | ) |
|
|
2430 | { |
|
|
2431 | XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); |
2480 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2432 | XClearWindow (display->display, parent[0]); |
2481 | XClearWindow (dpy, parent[0]); |
2433 | XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); |
2482 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2434 | #if HAVE_SCROLLBARS |
2483 | # if HAVE_SCROLLBARS |
2435 | if (scrollBar.win) |
2484 | if (scrollBar.win) |
2436 | { |
2485 | { |
2437 | XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); |
2486 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2438 | scrollBar.setIdle (); |
2487 | scrollBar.setIdle (); |
2439 | scrollbar_show (0); |
2488 | scrollbar_show (0); |
2440 | } |
2489 | } |
2441 | #endif |
2490 | # endif |
2442 | } |
2491 | #endif |
2443 | |
2492 | |
2444 | scr_clear (); |
2493 | scr_clear (); |
2445 | scr_touch (true); |
2494 | scr_touch (true); |
2446 | want_refresh = 1; |
2495 | want_refresh = 1; |
2447 | } |
2496 | } |
2448 | |
2497 | |
… | |
… | |
2455 | |
2504 | |
2456 | num_scr_allow = 0; |
2505 | num_scr_allow = 0; |
2457 | want_refresh = 1; |
2506 | want_refresh = 1; |
2458 | |
2507 | |
2459 | if (really) |
2508 | if (really) |
2460 | XClearWindow (display->display, vt); |
2509 | XClearWindow (dpy, vt); |
2461 | } |
2510 | } |
2462 | |
2511 | |
2463 | void |
2512 | void |
2464 | rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW |
2513 | rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW |
2465 | { |
2514 | { |
… | |
… | |
2514 | { |
2563 | { |
2515 | if (selection.op |
2564 | if (selection.op |
2516 | && current_screen == selection.screen |
2565 | && current_screen == selection.screen |
2517 | && selection.end.row >= view_start) |
2566 | && selection.end.row >= view_start) |
2518 | { |
2567 | { |
2519 | #if ENABLE_FRILLS |
2568 | #if !ENABLE_MINIMAL |
2520 | if (selection.rect) |
2569 | if (selection.rect) |
2521 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2570 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2522 | selection.end.row, selection.end.col, |
2571 | selection.end.row, selection.end.col, |
2523 | RS_RVid, RS_RVid | RS_Uline); |
2572 | RS_RVid, RS_RVid | RS_Uline); |
2524 | else |
2573 | else |
… | |
… | |
2640 | } |
2689 | } |
2641 | |
2690 | |
2642 | unsigned long bytes_after; |
2691 | unsigned long bytes_after; |
2643 | XTextProperty ct; |
2692 | XTextProperty ct; |
2644 | |
2693 | |
2645 | if (XGetWindowProperty (display->display, win, prop, |
2694 | if (XGetWindowProperty (dpy, win, prop, |
2646 | 0, PROP_SIZE / 4, |
2695 | 0, PROP_SIZE / 4, |
2647 | delete_prop, AnyPropertyType, |
2696 | delete_prop, AnyPropertyType, |
2648 | &ct.encoding, &ct.format, |
2697 | &ct.encoding, &ct.format, |
2649 | &ct.nitems, &bytes_after, |
2698 | &ct.nitems, &bytes_after, |
2650 | &ct.value) != Success) |
2699 | &ct.value) != Success) |
… | |
… | |
2659 | if (bytes_after) |
2708 | if (bytes_after) |
2660 | { |
2709 | { |
2661 | // fetch and append remaining data |
2710 | // fetch and append remaining data |
2662 | XTextProperty ct2; |
2711 | XTextProperty ct2; |
2663 | |
2712 | |
2664 | if (XGetWindowProperty (display->display, win, prop, |
2713 | if (XGetWindowProperty (dpy, win, prop, |
2665 | ct.nitems / 4, (bytes_after + 3) / 4, |
2714 | ct.nitems / 4, (bytes_after + 3) / 4, |
2666 | delete_prop, AnyPropertyType, |
2715 | delete_prop, AnyPropertyType, |
2667 | &ct2.encoding, &ct2.format, |
2716 | &ct2.encoding, &ct2.format, |
2668 | &ct2.nitems, &bytes_after, |
2717 | &ct2.nitems, &bytes_after, |
2669 | &ct2.value) != Success) |
2718 | &ct2.value) != Success) |
… | |
… | |
2682 | |
2731 | |
2683 | if (ct.encoding == xa[XA_INCR]) |
2732 | if (ct.encoding == xa[XA_INCR]) |
2684 | { |
2733 | { |
2685 | // INCR selection, start handshake |
2734 | // INCR selection, start handshake |
2686 | if (!delete_prop) |
2735 | if (!delete_prop) |
2687 | XDeleteProperty (display->display, win, prop); |
2736 | XDeleteProperty (dpy, win, prop); |
2688 | |
2737 | |
2689 | selection_wait = Sel_incr; |
2738 | selection_wait = Sel_incr; |
2690 | incr_buf_fill = 0; |
2739 | incr_buf_fill = 0; |
2691 | incr_ev.start (NOW + 10); |
2740 | incr_ev.start (NOW + 10); |
2692 | |
2741 | |
… | |
… | |
2739 | } |
2788 | } |
2740 | |
2789 | |
2741 | char **cl; |
2790 | char **cl; |
2742 | int cr; |
2791 | int cr; |
2743 | |
2792 | |
2744 | #if ENABLE_FRILLS |
2793 | #if !ENABLE_MINIMAL |
2745 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
2794 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
2746 | // so recode it manually |
2795 | // so recode it manually |
2747 | if (ct.encoding == xa[XA_UTF8_STRING]) |
2796 | if (ct.encoding == xa[XA_UTF8_STRING]) |
2748 | { |
2797 | { |
2749 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
2798 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
… | |
… | |
2753 | paste (s, strlen (s)); |
2802 | paste (s, strlen (s)); |
2754 | free (s); |
2803 | free (s); |
2755 | } |
2804 | } |
2756 | else |
2805 | else |
2757 | #endif |
2806 | #endif |
2758 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 |
2807 | if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0 |
2759 | && cl) |
2808 | && cl) |
2760 | { |
2809 | { |
2761 | for (int i = 0; i < cr; i++) |
2810 | for (int i = 0; i < cr; i++) |
2762 | paste (cl[i], strlen (cl[i])); |
2811 | paste (cl[i], strlen (cl[i])); |
2763 | |
2812 | |
… | |
… | |
2845 | else if (selnum == Sel_Secondary) |
2894 | else if (selnum == Sel_Secondary) |
2846 | sel = XA_SECONDARY; |
2895 | sel = XA_SECONDARY; |
2847 | else |
2896 | else |
2848 | sel = xa[XA_CLIPBOARD]; |
2897 | sel = xa[XA_CLIPBOARD]; |
2849 | |
2898 | |
2850 | if (XGetSelectionOwner (display->display, sel) != None) |
2899 | if (XGetSelectionOwner (dpy, sel) != None) |
2851 | { |
2900 | { |
2852 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2901 | XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION], |
2853 | vt, selection_request_time); |
2902 | vt, selection_request_time); |
2854 | return 1; |
2903 | return 1; |
2855 | } |
2904 | } |
2856 | |
2905 | |
2857 | return 0; |
2906 | return 0; |
… | |
… | |
2920 | |
2969 | |
2921 | int end_col; |
2970 | int end_col; |
2922 | |
2971 | |
2923 | for (; row <= selection.end.row; row++, col = 0) |
2972 | for (; row <= selection.end.row; row++, col = 0) |
2924 | { |
2973 | { |
2925 | #if ENABLE_FRILLS |
2974 | #if !ENABLE_MINIMAL |
2926 | if (selection.rect) |
2975 | if (selection.rect) |
2927 | { |
2976 | { |
2928 | col = selection.beg.col; |
2977 | col = selection.beg.col; |
2929 | end_col = ncol + 1; |
2978 | end_col = ncol + 1; |
2930 | } |
2979 | } |
… | |
… | |
2933 | end_col = ROW(row).l; |
2982 | end_col = ROW(row).l; |
2934 | |
2983 | |
2935 | col = max (col, 0); |
2984 | col = max (col, 0); |
2936 | |
2985 | |
2937 | if (row == selection.end.row |
2986 | if (row == selection.end.row |
2938 | #if ENABLE_FRILLS |
2987 | #if !ENABLE_MINIMAL |
2939 | || selection.rect |
2988 | || selection.rect |
2940 | #endif |
2989 | #endif |
2941 | ) |
2990 | ) |
2942 | min_it (end_col, selection.end.col); |
2991 | min_it (end_col, selection.end.col); |
2943 | |
2992 | |
… | |
… | |
2966 | #endif |
3015 | #endif |
2967 | else |
3016 | else |
2968 | new_selection_text[ofs++] = *t++; |
3017 | new_selection_text[ofs++] = *t++; |
2969 | } |
3018 | } |
2970 | |
3019 | |
2971 | #if ENABLE_FRILLS |
3020 | #if !ENABLE_MINIMAL |
2972 | if (selection.rect) |
3021 | if (selection.rect) |
2973 | { |
3022 | { |
2974 | while (ofs |
3023 | while (ofs |
2975 | && new_selection_text[ofs - 1] != C0_LF |
3024 | && new_selection_text[ofs - 1] != C0_LF |
2976 | && unicode::is_space (new_selection_text[ofs - 1])) |
3025 | && unicode::is_space (new_selection_text[ofs - 1])) |
… | |
… | |
3010 | bool |
3059 | bool |
3011 | rxvt_term::selection_grab (Time tm) NOTHROW |
3060 | rxvt_term::selection_grab (Time tm) NOTHROW |
3012 | { |
3061 | { |
3013 | selection_time = tm; |
3062 | selection_time = tm; |
3014 | |
3063 | |
3015 | XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); |
3064 | XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); |
3016 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) |
3065 | if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) |
3017 | { |
3066 | { |
3018 | display->set_selection_owner (this); |
3067 | display->set_selection_owner (this); |
3019 | return true; |
3068 | return true; |
3020 | } |
3069 | } |
3021 | else |
3070 | else |
… | |
… | |
3025 | } |
3074 | } |
3026 | |
3075 | |
3027 | #if 0 |
3076 | #if 0 |
3028 | XTextProperty ct; |
3077 | XTextProperty ct; |
3029 | |
3078 | |
3030 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
3079 | if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0) |
3031 | { |
3080 | { |
3032 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3081 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3033 | XFree (ct.value); |
3082 | XFree (ct.value); |
3034 | } |
3083 | } |
3035 | #endif |
3084 | #endif |
… | |
… | |
3337 | |
3386 | |
3338 | if (selection.clicks == 1) |
3387 | if (selection.clicks == 1) |
3339 | { |
3388 | { |
3340 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3389 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3341 | && !ROW(selection.beg.row).is_longer () |
3390 | && !ROW(selection.beg.row).is_longer () |
3342 | #if ENABLE_FRILLS |
3391 | #if !ENABLE_MINIMAL |
3343 | && !selection.rect |
3392 | && !selection.rect |
3344 | #endif |
3393 | #endif |
3345 | ) |
3394 | ) |
3346 | selection.beg.col = ncol; |
3395 | selection.beg.col = ncol; |
3347 | |
3396 | |
3348 | if ( |
3397 | if ( |
3349 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3398 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3350 | && !ROW(selection.end.row).is_longer () |
3399 | && !ROW(selection.end.row).is_longer () |
3351 | #if ENABLE_FRILLS |
3400 | #if !ENABLE_MINIMAL |
3352 | && !selection.rect |
3401 | && !selection.rect |
3353 | #endif |
3402 | #endif |
3354 | ) |
3403 | ) |
3355 | selection.end.col = ncol; |
3404 | selection.end.col = ncol; |
3356 | } |
3405 | } |
… | |
… | |
3363 | selection_delimit_word (DN, &selection.end, &selection.end); |
3412 | selection_delimit_word (DN, &selection.end, &selection.end); |
3364 | } |
3413 | } |
3365 | else if (selection.clicks == 3) |
3414 | else if (selection.clicks == 3) |
3366 | { |
3415 | { |
3367 | #if ENABLE_FRILLS |
3416 | #if ENABLE_FRILLS |
3368 | if (OPTION (Opt_tripleclickwords)) |
3417 | if (option (Opt_tripleclickwords)) |
3369 | { |
3418 | { |
3370 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3419 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3371 | |
3420 | |
3372 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3421 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3373 | { |
3422 | { |
3374 | if (!ROW(end_row).is_longer ()) |
3423 | if (!ROW(end_row).is_longer ()) |
3375 | { |
3424 | { |
3376 | selection.end.row = end_row; |
3425 | selection.end.row = end_row; |
3377 | selection.end.col = ROW(end_row).l; |
3426 | selection.end.col = ROW(end_row).l; |
|
|
3427 | # if !ENABLE_MINIMAL |
3378 | selection_remove_trailing_spaces (); |
3428 | selection_remove_trailing_spaces (); |
|
|
3429 | # endif |
3379 | break; |
3430 | break; |
3380 | } |
3431 | } |
3381 | } |
3432 | } |
3382 | } |
3433 | } |
3383 | else |
3434 | else |
… | |
… | |
3412 | selection.mark.row = selection.beg.row; |
3463 | selection.mark.row = selection.beg.row; |
3413 | selection.mark.col = selection.beg.col; |
3464 | selection.mark.col = selection.beg.col; |
3414 | } |
3465 | } |
3415 | } |
3466 | } |
3416 | |
3467 | |
3417 | #if ENABLE_FRILLS |
3468 | #if !ENABLE_MINIMAL |
3418 | if (selection.rect && selection.beg.col > selection.end.col) |
3469 | if (selection.rect && selection.beg.col > selection.end.col) |
3419 | ::swap (selection.beg.col, selection.end.col); |
3470 | ::swap (selection.beg.col, selection.end.col); |
3420 | #endif |
3471 | #endif |
3421 | } |
3472 | } |
3422 | |
3473 | |
3423 | #if ENABLE_FRILLS |
3474 | #if !ENABLE_MINIMAL |
3424 | void |
3475 | void |
3425 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3476 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3426 | { |
3477 | { |
3427 | int32_t end_col, end_row; |
3478 | int32_t end_col, end_row; |
3428 | text_t *stp; |
3479 | text_t *stp; |
… | |
… | |
3483 | */ |
3534 | */ |
3484 | void |
3535 | void |
3485 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3536 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3486 | { |
3537 | { |
3487 | XSelectionEvent ev; |
3538 | XSelectionEvent ev; |
3488 | dDisp; |
|
|
3489 | |
3539 | |
3490 | ev.type = SelectionNotify; |
3540 | ev.type = SelectionNotify; |
3491 | ev.property = None; |
3541 | ev.property = None; |
3492 | ev.display = rq.display; |
3542 | ev.display = rq.display; |
3493 | ev.requestor = rq.requestor; |
3543 | ev.requestor = rq.requestor; |
… | |
… | |
3507 | *target++ = xa[XA_COMPOUND_TEXT]; |
3557 | *target++ = xa[XA_COMPOUND_TEXT]; |
3508 | #if X_HAVE_UTF8_STRING |
3558 | #if X_HAVE_UTF8_STRING |
3509 | *target++ = xa[XA_UTF8_STRING]; |
3559 | *target++ = xa[XA_UTF8_STRING]; |
3510 | #endif |
3560 | #endif |
3511 | |
3561 | |
3512 | XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, |
3562 | XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, |
3513 | 32, PropModeReplace, |
3563 | 32, PropModeReplace, |
3514 | (unsigned char *)target_list, target - target_list); |
3564 | (unsigned char *)target_list, target - target_list); |
3515 | ev.property = rq.property; |
3565 | ev.property = rq.property; |
3516 | } |
3566 | } |
3517 | #if TODO // TODO |
3567 | #if TODO // TODO |
… | |
… | |
3520 | /* TODO: Handle MULTIPLE */ |
3570 | /* TODO: Handle MULTIPLE */ |
3521 | } |
3571 | } |
3522 | #endif |
3572 | #endif |
3523 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3573 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3524 | { |
3574 | { |
3525 | XChangeProperty (disp, rq.requestor, rq.property, rq.target, |
3575 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3526 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3576 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3527 | ev.property = rq.property; |
3577 | ev.property = rq.property; |
3528 | } |
3578 | } |
3529 | else if (rq.target == XA_STRING |
3579 | else if (rq.target == XA_STRING |
3530 | || rq.target == xa[XA_TEXT] |
3580 | || rq.target == xa[XA_TEXT] |
… | |
… | |
3554 | style = enc_string; |
3604 | style = enc_string; |
3555 | else if (target == xa[XA_TEXT]) |
3605 | else if (target == xa[XA_TEXT]) |
3556 | style = enc_text; |
3606 | style = enc_text; |
3557 | else if (target == xa[XA_COMPOUND_TEXT]) |
3607 | else if (target == xa[XA_COMPOUND_TEXT]) |
3558 | style = enc_compound_text; |
3608 | style = enc_compound_text; |
3559 | #if ENABLE_FRILLS |
3609 | #if !ENABLE_MINIMAL |
3560 | else if (target == xa[XA_UTF8_STRING]) |
3610 | else if (target == xa[XA_UTF8_STRING]) |
3561 | style = enc_utf8; |
3611 | style = enc_utf8; |
3562 | #endif |
3612 | #endif |
3563 | else |
3613 | else |
3564 | { |
3614 | { |
… | |
… | |
3575 | { |
3625 | { |
3576 | cl = L""; |
3626 | cl = L""; |
3577 | selectlen = 0; |
3627 | selectlen = 0; |
3578 | } |
3628 | } |
3579 | |
3629 | |
3580 | #if ENABLE_FRILLS |
3630 | #if !ENABLE_MINIMAL |
3581 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
3631 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
3582 | // so recode it manually |
3632 | // so recode it manually |
3583 | if (style == enc_utf8) |
3633 | if (style == enc_utf8) |
3584 | { |
3634 | { |
3585 | freect = 1; |
3635 | freect = 1; |
… | |
… | |
3588 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3638 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3589 | ct.nitems = strlen ((char *)ct.value); |
3639 | ct.nitems = strlen ((char *)ct.value); |
3590 | } |
3640 | } |
3591 | else |
3641 | else |
3592 | #endif |
3642 | #endif |
3593 | if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3643 | if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3594 | freect = 1; |
3644 | freect = 1; |
3595 | else |
3645 | else |
3596 | { |
3646 | { |
3597 | /* if we failed to convert then send it raw */ |
3647 | /* if we failed to convert then send it raw */ |
3598 | ct.value = (unsigned char *)cl; |
3648 | ct.value = (unsigned char *)cl; |
3599 | ct.nitems = selectlen; |
3649 | ct.nitems = selectlen; |
3600 | ct.encoding = target; |
3650 | ct.encoding = target; |
3601 | } |
3651 | } |
3602 | |
3652 | |
3603 | XChangeProperty (disp, rq.requestor, rq.property, |
3653 | XChangeProperty (dpy, rq.requestor, rq.property, |
3604 | ct.encoding, 8, PropModeReplace, |
3654 | ct.encoding, 8, PropModeReplace, |
3605 | ct.value, (int)ct.nitems); |
3655 | ct.value, (int)ct.nitems); |
3606 | ev.property = rq.property; |
3656 | ev.property = rq.property; |
3607 | |
3657 | |
3608 | if (freect) |
3658 | if (freect) |
3609 | XFree (ct.value); |
3659 | XFree (ct.value); |
3610 | } |
3660 | } |
3611 | |
3661 | |
3612 | XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); |
3662 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3613 | } |
3663 | } |
3614 | |
3664 | |
3615 | /* ------------------------------------------------------------------------- * |
3665 | /* ------------------------------------------------------------------------- * |
3616 | * MOUSE ROUTINES * |
3666 | * MOUSE ROUTINES * |
3617 | * ------------------------------------------------------------------------- */ |
3667 | * ------------------------------------------------------------------------- */ |
… | |
… | |
3633 | void |
3683 | void |
3634 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3684 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3635 | { |
3685 | { |
3636 | XWindowAttributes xwa; |
3686 | XWindowAttributes xwa; |
3637 | |
3687 | |
3638 | XGetWindowAttributes (display->display, vt, &xwa); |
3688 | XGetWindowAttributes (dpy, vt, &xwa); |
3639 | |
3689 | |
3640 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3690 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3641 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3691 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3642 | } |
3692 | } |
3643 | #endif |
3693 | #endif |
… | |
… | |
3739 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW |
3789 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW |
3740 | { |
3790 | { |
3741 | while (*s) |
3791 | while (*s) |
3742 | { |
3792 | { |
3743 | text_t t = *s++; |
3793 | text_t t = *s++; |
3744 | int width = wcwidth (t); |
3794 | int width = WCWIDTH (t); |
3745 | |
3795 | |
3746 | while (width--) |
3796 | while (width--) |
3747 | { |
3797 | { |
3748 | scr_overlay_set (x++, y, t); |
3798 | scr_overlay_set (x++, y, t); |
3749 | t = NOCHAR; |
3799 | t = NOCHAR; |