1 | /*--------------------------------*-C-*--------------------------------------* |
1 | /*--------------------------------*-C-*--------------------------------------* |
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-2004 Marc Lehmann <pcg@goof.com> |
6 | * Copyright (c) 2003-2006 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. |
… | |
… | |
24 | * This file handles _all_ screen updates and selections |
24 | * This file handles _all_ screen updates and selections |
25 | */ |
25 | */ |
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 | |
30 | |
30 | #include <X11/Xmd.h> /* get the typedef for CARD32 */ |
31 | #include <X11/Xmd.h> /* get the typedef for CARD32 */ |
31 | |
32 | |
32 | #include <inttypes.h> |
33 | #include <inttypes.h> |
33 | |
34 | |
… | |
… | |
46 | |
47 | |
47 | /* ------------------------------------------------------------------------- * |
48 | /* ------------------------------------------------------------------------- * |
48 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
49 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
49 | * ------------------------------------------------------------------------- */ |
50 | * ------------------------------------------------------------------------- */ |
50 | #define ZERO_SCROLLBACK() \ |
51 | #define ZERO_SCROLLBACK() \ |
51 | if (options & Opt_scrollTtyOutput) \ |
52 | if (OPTION (Opt_scrollTtyOutput)) \ |
52 | view_start = 0 |
53 | view_start = 0 |
53 | #define CLEAR_SELECTION() \ |
54 | #define CLEAR_SELECTION() \ |
54 | selection.beg.row = selection.beg.col \ |
55 | selection.beg.row = selection.beg.col \ |
55 | = selection.end.row = selection.end.col = 0 |
56 | = selection.end.row = selection.end.col = 0 |
56 | #define CLEAR_ALL_SELECTION() \ |
57 | #define CLEAR_ALL_SELECTION() \ |
… | |
… | |
123 | lalloc (l); |
124 | lalloc (l); |
124 | col = 0; |
125 | col = 0; |
125 | width = ncol; |
126 | width = ncol; |
126 | } |
127 | } |
127 | |
128 | |
|
|
129 | l.touch (); |
|
|
130 | |
128 | efs &= ~RS_baseattrMask; |
131 | efs &= ~RS_baseattrMask; |
129 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
132 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
130 | |
133 | |
131 | text_t *et = l.t + col; |
134 | text_t *et = l.t + col; |
132 | rend_t *er = l.r + col; |
135 | rend_t *er = l.r + col; |
… | |
… | |
280 | if (nsaved) |
283 | if (nsaved) |
281 | { |
284 | { |
282 | // re-wrap lines, this is rather ugly, possibly because I am too dumb |
285 | // re-wrap lines, this is rather ugly, possibly because I am too dumb |
283 | // to come up with a lean and mean algorithm. |
286 | // to come up with a lean and mean algorithm. |
284 | |
287 | |
285 | while (p != pend && q > 0) |
288 | row_col_t ocur = screen.cur; |
|
|
289 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
|
|
290 | |
|
|
291 | do |
286 | { |
292 | { |
287 | p = MOD (p - 1, prev_total_rows); |
293 | p = MOD (p - 1, prev_total_rows); |
288 | #ifdef DEBUG_STRICT |
294 | #ifdef DEBUG_STRICT |
289 | assert (old_buf [MOD (p, prev_total_rows)].t); |
295 | assert (old_buf [MOD (p, prev_total_rows)].t); |
290 | #endif |
296 | #endif |
291 | |
297 | int plines = 1; |
292 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
298 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
293 | |
299 | |
294 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
300 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
295 | { |
301 | { |
296 | p = MOD (p - 1, prev_total_rows); |
302 | p = MOD (p - 1, prev_total_rows); |
297 | |
303 | |
|
|
304 | plines++; |
298 | llen += prev_ncol; |
305 | llen += prev_ncol; |
299 | } |
306 | } |
300 | |
307 | |
301 | int qlines = max (0, (llen - 1) / ncol) + 1; |
308 | int qlines = max (0, (llen - 1) / ncol) + 1; |
302 | |
309 | |
… | |
… | |
312 | // re-assemble the full line by destination lines |
319 | // re-assemble the full line by destination lines |
313 | for (int qrow = q; qlines--; qrow++) |
320 | for (int qrow = q; qlines--; qrow++) |
314 | { |
321 | { |
315 | qline = row_buf + qrow; |
322 | qline = row_buf + qrow; |
316 | lalloc (*qline); |
323 | lalloc (*qline); |
|
|
324 | qline->l = ncol; |
317 | qline->set_is_longer (); |
325 | qline->is_longer (1); |
318 | |
326 | |
319 | int qcol = 0; |
327 | int qcol = 0; |
320 | |
328 | |
321 | // fill a single destination line |
329 | // fill a single destination line |
322 | while (lofs < llen && qcol < ncol) |
330 | while (lofs < llen && qcol < ncol) |
323 | { |
331 | { |
324 | int prow = lofs / prev_ncol; |
332 | int prow = lofs / prev_ncol; |
325 | int pcol = lofs % prev_ncol; |
333 | int pcol = lofs % prev_ncol; |
326 | |
334 | |
327 | line_t &pline = old_buf [MOD (p + prow, prev_total_rows)]; |
335 | prow = MOD (p + prow, prev_total_rows); |
|
|
336 | |
|
|
337 | // we only adjust the cursor _row_ and put it into |
|
|
338 | // the topmost line of "long line" it was in, as |
|
|
339 | // this seems to upset applications/shells/readline |
|
|
340 | // least. |
|
|
341 | if (prow == ocur.row) |
|
|
342 | screen.cur.row = q - (total_rows - nrow); |
|
|
343 | |
|
|
344 | line_t &pline = old_buf [prow]; |
328 | |
345 | |
329 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
346 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
330 | |
347 | |
331 | assert (len); |
348 | assert (len); |
332 | assert (pline.t); |
349 | assert (pline.t); |
… | |
… | |
337 | lofs += len; |
354 | lofs += len; |
338 | qcol += len; |
355 | qcol += len; |
339 | } |
356 | } |
340 | } |
357 | } |
341 | |
358 | |
342 | qline->l = llen < ncol ? llen : MOD (llen - 1, ncol) + 1; |
359 | qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0; |
|
|
360 | qline->is_longer (0); |
343 | scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); |
361 | scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); |
344 | } |
362 | } |
|
|
363 | while (p != pend && q > 0); |
345 | |
364 | |
346 | term_start = total_rows - nrow; |
365 | term_start = total_rows - nrow; |
347 | view_start = 0; |
|
|
348 | nsaved = term_start - q; |
366 | nsaved = term_start - q; |
349 | |
367 | |
350 | // make sure all terminal lines exist |
368 | // make sure all terminal lines exist |
351 | while (nsaved < 0) |
369 | while (nsaved < 0) |
352 | scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); |
370 | scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); |
353 | |
|
|
354 | } |
371 | } |
355 | else |
372 | else |
356 | { |
373 | { |
357 | // if no scrollback exists (yet), wing, instead of wrap |
374 | // if no scrollback exists (yet), wing, instead of wrap |
358 | |
375 | |
… | |
… | |
369 | { |
386 | { |
370 | row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); |
387 | row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); |
371 | } |
388 | } |
372 | |
389 | |
373 | term_start = 0; |
390 | term_start = 0; |
374 | view_start = 0; |
|
|
375 | } |
391 | } |
376 | |
392 | |
377 | #ifdef DEBUG_STRICT |
393 | #ifdef DEBUG_STRICT //TODO: remove |
378 | for (int i = -nsaved; i < nrow; i++) |
394 | for (int i = -nsaved; i < nrow; i++) |
379 | assert (ROW (i).t); |
395 | assert (ROW (i).t); |
380 | #endif |
396 | #endif |
381 | |
397 | |
382 | free (old_buf); |
398 | free (old_buf); |
… | |
… | |
397 | |
413 | |
398 | for (int col = ncol; col--; ) |
414 | for (int col = ncol; col--; ) |
399 | tabs [col] = col % TABSIZE == 0; |
415 | tabs [col] = col % TABSIZE == 0; |
400 | |
416 | |
401 | tt_winch (); |
417 | tt_winch (); |
|
|
418 | |
|
|
419 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
402 | } |
420 | } |
403 | |
421 | |
404 | /* ------------------------------------------------------------------------- */ |
422 | /* ------------------------------------------------------------------------- */ |
405 | /* |
423 | /* |
406 | * Free everything. That way malloc debugging can find leakage. |
424 | * Free everything. That way malloc debugging can find leakage. |
… | |
… | |
510 | |
528 | |
511 | screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); |
529 | screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); |
512 | screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); |
530 | screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); |
513 | |
531 | |
514 | #if NSCREENS |
532 | #if NSCREENS |
515 | if (options & Opt_secondaryScreen) |
533 | if (OPTION (Opt_secondaryScreen)) |
516 | { |
534 | { |
517 | num_scr = 0; |
535 | num_scr = 0; |
518 | |
536 | |
519 | for (int i = prev_nrow; i--; ) |
537 | for (int i = prev_nrow; i--; ) |
520 | ::swap (ROW(i), swap_buf [i]); |
538 | ::swap (ROW(i), swap_buf [i]); |
… | |
… | |
524 | screen.flags |= Screen_VisibleCursor; |
542 | screen.flags |= Screen_VisibleCursor; |
525 | swap.flags |= Screen_VisibleCursor; |
543 | swap.flags |= Screen_VisibleCursor; |
526 | } |
544 | } |
527 | else |
545 | else |
528 | #endif |
546 | #endif |
529 | if (options & Opt_secondaryScroll) |
547 | if (OPTION (Opt_secondaryScroll)) |
530 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
548 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
531 | |
549 | |
532 | return scrn; |
550 | return scrn; |
533 | } |
551 | } |
534 | |
552 | |
… | |
… | |
596 | num_scr += count; |
614 | num_scr += count; |
597 | |
615 | |
598 | if (count > 0 |
616 | if (count > 0 |
599 | && row1 == 0 |
617 | && row1 == 0 |
600 | && row2 == nrow - 1 |
618 | && row2 == nrow - 1 |
601 | && (current_screen == PRIMARY || options & Opt_secondaryScroll)) |
619 | && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) |
602 | { |
620 | { |
603 | nsaved = min (nsaved + count, saveLines); |
621 | nsaved = min (nsaved + count, saveLines); |
|
|
622 | |
|
|
623 | HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END)); |
|
|
624 | |
604 | term_start = (term_start + count) % total_rows; |
625 | term_start = (term_start + count) % total_rows; |
605 | |
626 | |
606 | if (selection.op && current_screen == selection.screen) |
627 | if (selection.op && current_screen == selection.screen) |
607 | { |
628 | { |
608 | selection.beg.row -= count; |
629 | selection.beg.row -= count; |
609 | selection.end.row -= count; |
630 | selection.end.row -= count; |
610 | selection.mark.row -= count; |
631 | selection.mark.row -= count; |
611 | |
632 | |
612 | selection_check (0); |
633 | if (selection.beg.row < -nsaved |
|
|
634 | || selection.end.row < -nsaved |
|
|
635 | || selection.mark.row < -nsaved) |
|
|
636 | { |
|
|
637 | CLEAR_ALL_SELECTION (); |
|
|
638 | selection.op = SELECTION_CLEAR; |
|
|
639 | } |
613 | } |
640 | } |
614 | |
641 | |
615 | for (int i = count; i--; ) |
642 | for (int i = count; i--; ) |
|
|
643 | { |
|
|
644 | ROW(row2 - i).l = 0; |
616 | scr_blank_screen_mem (ROW(row2 - i), rstyle); |
645 | scr_blank_screen_mem (ROW(row2 - i), rstyle); |
|
|
646 | } |
617 | |
647 | |
618 | if ((options & Opt_scrollWithBuffer) |
648 | if (OPTION (Opt_scrollWithBuffer) |
619 | && view_start != 0 |
649 | && view_start != 0 |
620 | && view_start != saveLines) |
650 | && view_start != saveLines) |
621 | scr_page (UP, count); |
651 | scr_page (UP, count); |
622 | } |
652 | } |
623 | else |
653 | else |
624 | { |
654 | { |
625 | if (selection.op && current_screen == selection.screen) |
655 | if (selection.op && current_screen == selection.screen) |
626 | { |
656 | { |
627 | int i = selection.beg.row; |
657 | if ((selection.beg.row < row1 && selection.end.row > row1) |
628 | int j = selection.end.row; |
658 | || (selection.beg.row < row2 && selection.end.row > row2) |
629 | |
|
|
630 | if ((i < row1 && j > row1) |
|
|
631 | || (i < row2 && j > row2) |
|
|
632 | || (i - count < row1 && i >= row1) |
659 | || (selection.beg.row - count < row1 && selection.beg.row >= row1) |
633 | || (i - count > row2 && i <= row2) |
660 | || (selection.beg.row - count > row2 && selection.beg.row <= row2) |
634 | || (j - count < row1 && j >= row1) |
661 | || (selection.end.row - count < row1 && selection.end.row >= row1) |
635 | || (j - count > row2 && j <= row2)) |
662 | || (selection.end.row - count > row2 && selection.end.row <= row2)) |
636 | { |
663 | { |
637 | CLEAR_ALL_SELECTION (); |
664 | CLEAR_ALL_SELECTION (); |
638 | selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ |
665 | selection.op = SELECTION_CLEAR; |
639 | } |
666 | } |
640 | else if (j >= row1 && j <= row2) |
667 | else if (selection.end.row >= row1 && selection.end.row <= row2) |
641 | { |
668 | { |
642 | /* move selected region too */ |
669 | /* move selected region too */ |
643 | selection.beg.row -= count; |
670 | selection.beg.row -= count; |
644 | selection.end.row -= count; |
671 | selection.end.row -= count; |
645 | selection.mark.row -= count; |
672 | selection.mark.row -= count; |
… | |
… | |
673 | /* ------------------------------------------------------------------------- */ |
700 | /* ------------------------------------------------------------------------- */ |
674 | /* |
701 | /* |
675 | * Add text given in <str> of length <len> to screen struct |
702 | * Add text given in <str> of length <len> to screen struct |
676 | */ |
703 | */ |
677 | void |
704 | void |
678 | rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) |
705 | rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) |
679 | { |
706 | { |
680 | if (len <= 0) /* sanity */ |
707 | if (len <= 0) /* sanity */ |
681 | return; |
708 | return; |
682 | |
709 | |
683 | unsigned char checksel; |
710 | unsigned char checksel; |
684 | unicode_t c; |
711 | unicode_t c; |
685 | int row, last_col; |
712 | int ncol = this->ncol; |
686 | const unicode_t *strend = str + len; |
713 | const wchar_t *strend = str + len; |
687 | |
714 | |
688 | want_refresh = 1; |
715 | want_refresh = 1; |
689 | ZERO_SCROLLBACK (); |
716 | ZERO_SCROLLBACK (); |
690 | last_col = ncol; |
|
|
691 | |
717 | |
692 | if (nlines > 0) |
718 | if (minlines > 0) |
693 | { |
719 | { |
694 | nlines += screen.cur.row - screen.bscroll; |
720 | minlines += screen.cur.row - screen.bscroll; |
|
|
721 | |
695 | if (nlines > 0 |
722 | if (minlines > 0 |
696 | && screen.tscroll == 0 |
723 | && screen.tscroll == 0 |
697 | && screen.bscroll == (nrow - 1)) |
724 | && screen.bscroll == nrow - 1) |
698 | { |
725 | { |
699 | /* _at least_ this many lines need to be scrolled */ |
726 | /* _at least_ this many lines need to be scrolled */ |
700 | scr_scroll_text (screen.tscroll, screen.bscroll, nlines); |
727 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
701 | screen.cur.row -= nlines; |
728 | screen.cur.row -= minlines; |
702 | } |
729 | } |
703 | } |
730 | } |
704 | |
731 | |
705 | #ifdef DEBUG_STRICT |
732 | #ifdef DEBUG_STRICT |
706 | assert (screen.cur.col < last_col); |
733 | assert (screen.cur.col < ncol); |
707 | assert (screen.cur.row < nrow |
734 | assert (screen.cur.row < nrow |
708 | && screen.cur.row >= -nsaved); |
735 | && screen.cur.row >= -nsaved); |
709 | #endif |
736 | #endif |
710 | row = screen.cur.row; |
737 | int row = screen.cur.row; |
711 | |
738 | |
712 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
739 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
713 | |
740 | |
714 | line_t *line = &ROW(row); |
741 | line_t *line = &ROW(row); |
715 | |
742 | |
716 | while (str < strend) |
743 | while (str < strend) |
717 | { |
744 | { |
718 | c = *str++; |
745 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
719 | |
746 | |
720 | if (c < 0x20) |
747 | if (c < 0x20) |
721 | if (c == C0_LF) |
748 | if (c == C0_LF) |
722 | { |
749 | { |
723 | if (!line->is_longer ()) /* XXX: think about this */ |
|
|
724 | max_it (line->l, screen.cur.col); |
750 | max_it (line->l, screen.cur.col); |
725 | |
751 | |
726 | screen.flags &= ~Screen_WrapNext; |
752 | screen.flags &= ~Screen_WrapNext; |
727 | |
753 | |
728 | if (screen.cur.row == screen.bscroll) |
754 | if (screen.cur.row == screen.bscroll) |
729 | scr_scroll_text (screen.tscroll, screen.bscroll, 1); |
755 | scr_scroll_text (screen.tscroll, screen.bscroll, 1); |
… | |
… | |
733 | line = &ROW(row); /* _must_ refresh */ |
759 | line = &ROW(row); /* _must_ refresh */ |
734 | continue; |
760 | continue; |
735 | } |
761 | } |
736 | else if (c == C0_CR) |
762 | else if (c == C0_CR) |
737 | { |
763 | { |
738 | if (!line->is_longer ()) /* XXX: think about this */ |
|
|
739 | max_it (line->l, screen.cur.col); |
764 | max_it (line->l, screen.cur.col); |
740 | |
765 | |
741 | screen.flags &= ~Screen_WrapNext; |
766 | screen.flags &= ~Screen_WrapNext; |
742 | screen.cur.col = 0; |
767 | screen.cur.col = 0; |
743 | continue; |
768 | continue; |
744 | } |
769 | } |
… | |
… | |
761 | CLEAR_SELECTION (); |
786 | CLEAR_SELECTION (); |
762 | } |
787 | } |
763 | |
788 | |
764 | if (screen.flags & Screen_WrapNext) |
789 | if (screen.flags & Screen_WrapNext) |
765 | { |
790 | { |
|
|
791 | max_it (line->l, ncol); |
766 | line->set_is_longer (); |
792 | line->is_longer (1); |
767 | |
793 | |
768 | scr_do_wrap (); |
794 | scr_do_wrap (); |
769 | |
795 | |
770 | row = screen.cur.row; |
796 | row = screen.cur.row; |
771 | line = &ROW(row); /* _must_ refresh */ |
797 | line = &ROW(row); /* _must_ refresh */ |
… | |
… | |
779 | // do wcwidth before further replacements, as wcwidth might return -1 |
805 | // do wcwidth before further replacements, as wcwidth might return -1 |
780 | // for the line drawing characters below as they might be invalid in the current |
806 | // for the line drawing characters below as they might be invalid in the current |
781 | // locale. |
807 | // locale. |
782 | int width = c < 0x100 ? 1 : wcwidth (c); |
808 | int width = c < 0x100 ? 1 : wcwidth (c); |
783 | |
809 | |
784 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
810 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
785 | { |
811 | { |
786 | // vt100 special graphics and line drawing |
812 | // vt100 special graphics and line drawing |
787 | // 5f-7e standard vt100 |
813 | // 5f-7e standard vt100 |
788 | // 40-5e rxvt extension for extra curses acs chars |
814 | // 40-5e rxvt extension for extra curses acs chars |
789 | static uint16_t vt100_0[62] = { // 41 .. 7e |
815 | static uint16_t vt100_0[62] = { // 41 .. 7e |
… | |
… | |
841 | } |
867 | } |
842 | |
868 | |
843 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
869 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
844 | |
870 | |
845 | // if the character doesn't fit into the remaining columns... |
871 | // if the character doesn't fit into the remaining columns... |
846 | if (screen.cur.col > last_col - width && last_col >= width) |
872 | if (screen.cur.col > ncol - width && ncol >= width) |
847 | { |
873 | { |
848 | // ...output spaces |
874 | // ...output spaces |
849 | c = ' '; |
875 | c = ' '; |
850 | // and try the same character next loop iteration |
876 | // and try the same character next loop iteration |
851 | --str; |
877 | --str; |
852 | } |
878 | } |
853 | |
879 | |
|
|
880 | line->touch (); |
|
|
881 | |
854 | do |
882 | do |
855 | { |
883 | { |
856 | line->t[screen.cur.col] = c; |
884 | line->t[screen.cur.col] = c; |
857 | line->r[screen.cur.col] = rend; |
885 | line->r[screen.cur.col] = rend; |
858 | |
886 | |
859 | if (screen.cur.col < last_col - 1) |
887 | if (screen.cur.col < ncol - 1) |
860 | screen.cur.col++; |
888 | screen.cur.col++; |
861 | else |
889 | else |
862 | { |
890 | { |
863 | line->l = last_col; |
891 | line->l = ncol; |
864 | if (screen.flags & Screen_Autowrap) |
892 | if (screen.flags & Screen_Autowrap) |
865 | screen.flags |= Screen_WrapNext; |
893 | screen.flags |= Screen_WrapNext; |
866 | break; |
894 | break; |
867 | } |
895 | } |
868 | |
896 | |
… | |
… | |
870 | } |
898 | } |
871 | while (--width > 0); |
899 | while (--width > 0); |
872 | |
900 | |
873 | // pad with spaces when overwriting wide character with smaller one |
901 | // pad with spaces when overwriting wide character with smaller one |
874 | if (!width) |
902 | if (!width) |
|
|
903 | { |
|
|
904 | line->touch (); |
|
|
905 | |
875 | for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) |
906 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
876 | { |
907 | { |
877 | line->t[c] = ' '; |
908 | line->t[c] = ' '; |
878 | line->r[c] = rend; |
909 | line->r[c] = rend; |
879 | } |
910 | } |
|
|
911 | } |
880 | } |
912 | } |
881 | else // width == 0 |
913 | else // width == 0 |
882 | { |
914 | { |
883 | #if ENABLE_COMBINING |
915 | #if ENABLE_COMBINING |
884 | // handle combining characters |
916 | // handle combining characters |
885 | // we just tag the accent on the previous on-screen character. |
917 | // we just tag the accent on the previous on-screen character. |
886 | // this is arguably not correct, but also arguably not wrong. |
918 | // this is arguably not correct, but also arguably not wrong. |
887 | // we don't handle double-width characters nicely yet. |
919 | // we don't handle double-width characters nicely yet. |
|
|
920 | line_t *linep; |
888 | text_t *tp; |
921 | text_t *tp; |
889 | rend_t *rp; |
922 | rend_t *rp; |
890 | |
923 | |
891 | if (screen.cur.col > 0) |
924 | if (screen.cur.col > 0) |
892 | { |
925 | { |
|
|
926 | linep = line; |
893 | tp = line->t + screen.cur.col - 1; |
927 | tp = line->t + screen.cur.col - 1; |
894 | rp = line->r + screen.cur.col - 1; |
928 | rp = line->r + screen.cur.col - 1; |
895 | |
|
|
896 | while (*tp == NOCHAR && tp > line->t) |
|
|
897 | tp--, rp--; |
|
|
898 | } |
929 | } |
899 | else if (screen.cur.row > 0 |
930 | else if (screen.cur.row > 0 |
900 | && ROW(screen.cur.row - 1).is_longer ()) |
931 | && ROW(screen.cur.row - 1).is_longer ()) |
901 | { |
932 | { |
902 | line_t *line = &ROW(screen.cur.row - 1); |
933 | linep = &ROW(screen.cur.row - 1); |
903 | |
|
|
904 | tp = line->t + last_col - 1; |
934 | tp = line->t + ncol - 1; |
905 | rp = line->r + last_col - 1; |
935 | rp = line->r + ncol - 1; |
906 | |
|
|
907 | while (*tp == NOCHAR && tp > line->t) |
|
|
908 | tp--, rp--; |
|
|
909 | } |
936 | } |
910 | else |
937 | else |
911 | continue; |
938 | continue; |
|
|
939 | |
|
|
940 | linep->touch (); |
|
|
941 | |
|
|
942 | while (*tp == NOCHAR && tp > linep->t) |
|
|
943 | tp--, rp--; |
912 | |
944 | |
913 | // first try to find a precomposed character |
945 | // first try to find a precomposed character |
914 | unicode_t n = rxvt_compose (*tp, c); |
946 | unicode_t n = rxvt_compose (*tp, c); |
915 | if (n == NOCHAR) |
947 | if (n == NOCHAR) |
916 | n = rxvt_composite.compose (*tp, c); |
948 | n = rxvt_composite.compose (*tp, c); |
… | |
… | |
919 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
951 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
920 | #endif |
952 | #endif |
921 | } |
953 | } |
922 | } |
954 | } |
923 | |
955 | |
924 | if (!line->is_longer ()) /* XXX: think about this */ |
|
|
925 | max_it (line->l, screen.cur.col); |
956 | max_it (line->l, screen.cur.col); |
926 | |
957 | |
927 | #ifdef DEBUG_STRICT |
958 | #ifdef DEBUG_STRICT |
928 | assert (screen.cur.row >= 0); |
959 | assert (screen.cur.row >= 0); |
929 | #endif |
960 | #endif |
930 | } |
961 | } |
… | |
… | |
972 | |
1003 | |
973 | if (count == 0) |
1004 | if (count == 0) |
974 | return; |
1005 | return; |
975 | else if (count > 0) |
1006 | else if (count > 0) |
976 | { |
1007 | { |
977 | int row = screen.cur.row; |
|
|
978 | |
|
|
979 | line_t &l = ROW(row); |
1008 | line_t &l = ROW(screen.cur.row); |
980 | rend_t base_rend = l.r[i]; |
1009 | rend_t base_rend = l.r[i]; |
981 | ht &= l.t[i] == ' '; |
1010 | ht &= l.t[i] == ' '; |
982 | |
1011 | |
983 | for (; ++i < ncol; ) |
1012 | for (; ++i < ncol; ) |
984 | if (tabs[i]) |
1013 | if (tabs[i]) |
985 | { |
1014 | { |
986 | x = i; |
1015 | x = i; |
|
|
1016 | |
987 | if (!--count) |
1017 | if (!--count) |
988 | break; |
1018 | break; |
989 | } |
1019 | } |
990 | else |
1020 | else |
991 | ht &= l.t[i] == ' ' |
1021 | ht &= l.t[i] == ' ' |
… | |
… | |
994 | if (count) |
1024 | if (count) |
995 | x = ncol - 1; |
1025 | x = ncol - 1; |
996 | |
1026 | |
997 | // store horizontal tab commands as characters inside the text |
1027 | // store horizontal tab commands as characters inside the text |
998 | // buffer so they can be selected and pasted. |
1028 | // buffer so they can be selected and pasted. |
999 | if (ht && options & Opt_pastableTabs) |
1029 | if (ht && OPTION (Opt_pastableTabs)) |
1000 | { |
1030 | { |
1001 | base_rend = SET_FONT (base_rend, 0); |
1031 | base_rend = SET_FONT (base_rend, 0); |
1002 | |
1032 | |
1003 | if (!l.is_longer ()) /* XXX: think about this */ |
1033 | l.touch (x); |
1004 | max_it (l.l, x); |
|
|
1005 | |
1034 | |
1006 | i = screen.cur.col; |
1035 | i = screen.cur.col; |
1007 | |
1036 | |
1008 | l.t[i] = '\t'; |
1037 | l.t[i] = '\t'; |
1009 | l.r[i] = base_rend; |
1038 | l.r[i] = base_rend; |
… | |
… | |
1059 | */ |
1088 | */ |
1060 | #if ENABLE_FRILLS |
1089 | #if ENABLE_FRILLS |
1061 | void |
1090 | void |
1062 | rxvt_term::scr_forwardindex () |
1091 | rxvt_term::scr_forwardindex () |
1063 | { |
1092 | { |
1064 | int row; |
|
|
1065 | |
|
|
1066 | if (screen.cur.col < ncol - 1) |
1093 | if (screen.cur.col < ncol - 1) |
1067 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1094 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1068 | else |
1095 | else |
1069 | { |
1096 | { |
1070 | row = screen.cur.row; |
1097 | line_t &l = ROW(screen.cur.row); |
1071 | |
1098 | |
1072 | if (ROW(row).is_longer ()) //TODO//FIXME//LEN |
1099 | l.touch (); |
1073 | ROW(row).l = ncol; |
1100 | l.is_longer (0); |
1074 | |
1101 | |
1075 | scr_gotorc (0, 0, R_RELATIVE); |
1102 | scr_gotorc (0, 0, R_RELATIVE); |
1076 | scr_insdel_chars (1, DELETE); |
1103 | scr_insdel_chars (1, DELETE); |
1077 | scr_gotorc (0, ncol - 1, R_RELATIVE); |
1104 | scr_gotorc (0, ncol - 1, R_RELATIVE); |
1078 | } |
1105 | } |
… | |
… | |
1161 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
1188 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
1162 | */ |
1189 | */ |
1163 | void |
1190 | void |
1164 | rxvt_term::scr_erase_line (int mode) |
1191 | rxvt_term::scr_erase_line (int mode) |
1165 | { |
1192 | { |
1166 | unsigned int row, col, num; |
1193 | unsigned int col, num; |
1167 | |
1194 | |
1168 | want_refresh = 1; |
1195 | want_refresh = 1; |
1169 | ZERO_SCROLLBACK (); |
1196 | ZERO_SCROLLBACK (); |
1170 | |
1197 | |
1171 | selection_check (1); |
1198 | selection_check (1); |
1172 | |
1199 | |
1173 | row = screen.cur.row; |
1200 | line_t &line = ROW(screen.cur.row); |
|
|
1201 | |
|
|
1202 | line.touch (); |
|
|
1203 | line.is_longer (0); |
1174 | |
1204 | |
1175 | switch (mode) |
1205 | switch (mode) |
1176 | { |
1206 | { |
1177 | case 0: /* erase to end of line */ |
1207 | case 0: /* erase to end of line */ |
1178 | col = screen.cur.col; |
1208 | col = screen.cur.col; |
1179 | num = ncol - col; |
1209 | num = ncol - col; |
1180 | min_it (ROW(row).l, col); |
1210 | min_it (line.l, col); |
1181 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1211 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1182 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1212 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1183 | CLEAR_SELECTION (); |
1213 | CLEAR_SELECTION (); |
1184 | break; |
1214 | break; |
1185 | case 1: /* erase to beginning of line */ |
1215 | case 1: /* erase to beginning of line */ |
… | |
… | |
1190 | CLEAR_SELECTION (); |
1220 | CLEAR_SELECTION (); |
1191 | break; |
1221 | break; |
1192 | case 2: /* erase whole line */ |
1222 | case 2: /* erase whole line */ |
1193 | col = 0; |
1223 | col = 0; |
1194 | num = ncol; |
1224 | num = ncol; |
1195 | ROW(row).l = 0; |
1225 | line.l = 0; |
1196 | if (selection.beg.row <= screen.cur.row |
1226 | if (selection.beg.row <= screen.cur.row |
1197 | && selection.end.row >= screen.cur.row) |
1227 | && selection.end.row >= screen.cur.row) |
1198 | CLEAR_SELECTION (); |
1228 | CLEAR_SELECTION (); |
1199 | break; |
1229 | break; |
1200 | default: |
1230 | default: |
1201 | return; |
1231 | return; |
1202 | } |
1232 | } |
1203 | |
1233 | |
1204 | scr_blank_line (ROW(row), col, num, rstyle); |
1234 | scr_blank_line (line, col, num, rstyle); |
1205 | } |
1235 | } |
1206 | |
1236 | |
1207 | /* ------------------------------------------------------------------------- */ |
1237 | /* ------------------------------------------------------------------------- */ |
1208 | /* |
1238 | /* |
1209 | * Erase part of whole of the screen |
1239 | * Erase part of whole of the screen |
… | |
… | |
1264 | CLEAR_ROWS (row, num); |
1294 | CLEAR_ROWS (row, num); |
1265 | } |
1295 | } |
1266 | else |
1296 | else |
1267 | { |
1297 | { |
1268 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1298 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1269 | gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; |
1299 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1270 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1300 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1271 | ERASE_ROWS (row, num); |
1301 | ERASE_ROWS (row, num); |
1272 | gcvalue.foreground = pix_colors[Color_fg]; |
1302 | gcvalue.foreground = pix_colors[Color_fg]; |
1273 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1303 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1274 | } |
1304 | } |
1275 | |
1305 | |
1276 | for (; num--; row++) |
1306 | for (; num--; row++) |
1277 | { |
1307 | { |
|
|
1308 | line_t &l = ROW(row); |
|
|
1309 | l.l = 0; |
|
|
1310 | l.is_longer (0); |
1278 | scr_blank_screen_mem (ROW (row), rstyle); |
1311 | scr_blank_screen_mem (l, rstyle); |
1279 | ROW (row).l = 0; |
|
|
1280 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1312 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1281 | } |
1313 | } |
1282 | } |
1314 | } |
1283 | |
1315 | |
1284 | #if ENABLE_FRILLS |
1316 | #if ENABLE_FRILLS |
… | |
… | |
1317 | rend_t *r1 = line.r; |
1349 | rend_t *r1 = line.r; |
1318 | |
1350 | |
1319 | for (int j = ncol; j--; ) |
1351 | for (int j = ncol; j--; ) |
1320 | *r1++ = fs; |
1352 | *r1++ = fs; |
1321 | |
1353 | |
1322 | line.l = ncol; /* make the `E's selectable */ |
1354 | line.is_longer (0); |
|
|
1355 | line.touch (ncol); |
1323 | } |
1356 | } |
1324 | } |
1357 | } |
1325 | |
1358 | |
1326 | /* ------------------------------------------------------------------------- */ |
1359 | /* ------------------------------------------------------------------------- */ |
1327 | /* |
1360 | /* |
… | |
… | |
1375 | min_it (count, ncol - screen.cur.col); |
1408 | min_it (count, ncol - screen.cur.col); |
1376 | |
1409 | |
1377 | row = screen.cur.row; |
1410 | row = screen.cur.row; |
1378 | |
1411 | |
1379 | line_t *line = &ROW(row); |
1412 | line_t *line = &ROW(row); |
|
|
1413 | |
|
|
1414 | line->touch (); |
|
|
1415 | line->is_longer (0); |
1380 | |
1416 | |
1381 | switch (insdel) |
1417 | switch (insdel) |
1382 | { |
1418 | { |
1383 | case INSERT: |
1419 | case INSERT: |
1384 | for (col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1420 | for (col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1385 | { |
1421 | { |
1386 | line->t[col] = line->t[col - count]; |
1422 | line->t[col] = line->t[col - count]; |
1387 | line->r[col] = line->r[col - count]; |
1423 | line->r[col] = line->r[col - count]; |
1388 | } |
1424 | } |
1389 | |
1425 | |
1390 | if (!line->is_longer ()) |
1426 | line->l = min (line->l + count, ncol); |
1391 | { |
|
|
1392 | line->l += count; |
|
|
1393 | min_it (line->l, ncol); |
|
|
1394 | } |
|
|
1395 | |
1427 | |
1396 | if (selection.op && current_screen == selection.screen |
1428 | if (selection.op && current_screen == selection.screen |
1397 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1429 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1398 | { |
1430 | { |
1399 | if (selection.end.row != screen.cur.row |
1431 | if (selection.end.row != screen.cur.row |
… | |
… | |
1412 | |
1444 | |
1413 | case ERASE: |
1445 | case ERASE: |
1414 | screen.cur.col += count; /* don't worry if > ncol */ |
1446 | screen.cur.col += count; /* don't worry if > ncol */ |
1415 | selection_check (1); |
1447 | selection_check (1); |
1416 | screen.cur.col -= count; |
1448 | screen.cur.col -= count; |
|
|
1449 | |
|
|
1450 | line->l = max (line->l - count, 0); |
1417 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1451 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1418 | break; |
1452 | break; |
1419 | |
1453 | |
1420 | case DELETE: |
1454 | case DELETE: |
1421 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1455 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
… | |
… | |
1424 | { |
1458 | { |
1425 | line->t[col] = line->t[col + count]; |
1459 | line->t[col] = line->t[col + count]; |
1426 | line->r[col] = line->r[col + count]; |
1460 | line->r[col] = line->r[col + count]; |
1427 | } |
1461 | } |
1428 | |
1462 | |
|
|
1463 | line->l = max (line->l - count, 0); |
1429 | scr_blank_line (*line, ncol - count, count, tr); |
1464 | scr_blank_line (*line, ncol - count, count, tr); |
1430 | |
|
|
1431 | if (line->is_longer ()) /* break line continuation */ |
|
|
1432 | line->l = ncol; |
|
|
1433 | |
|
|
1434 | line->l = max (line->l - count, 0); |
|
|
1435 | |
1465 | |
1436 | if (selection.op && current_screen == selection.screen |
1466 | if (selection.op && current_screen == selection.screen |
1437 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1467 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1438 | { |
1468 | { |
1439 | if (selection.end.row != screen.cur.row |
1469 | if (selection.end.row != screen.cur.row |
… | |
… | |
1551 | rxvt_term::scr_set_tab (int mode) |
1581 | rxvt_term::scr_set_tab (int mode) |
1552 | { |
1582 | { |
1553 | if (mode < 0) |
1583 | if (mode < 0) |
1554 | memset (tabs, 0, ncol * sizeof (char)); |
1584 | memset (tabs, 0, ncol * sizeof (char)); |
1555 | else if (screen.cur.col < ncol) |
1585 | else if (screen.cur.col < ncol) |
1556 | tabs[screen.cur.col] = (mode ? 1 : 0); |
1586 | tabs [screen.cur.col] = !!mode; |
1557 | } |
1587 | } |
1558 | |
1588 | |
1559 | /* ------------------------------------------------------------------------- */ |
1589 | /* ------------------------------------------------------------------------- */ |
1560 | /* |
1590 | /* |
1561 | * Set reverse/normal video |
1591 | * Set reverse/normal video |
… | |
… | |
1573 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1603 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1574 | #if XPM_BACKGROUND |
1604 | #if XPM_BACKGROUND |
1575 | if (bgPixmap.pixmap == None) |
1605 | if (bgPixmap.pixmap == None) |
1576 | #endif |
1606 | #endif |
1577 | #if TRANSPARENT |
1607 | #if TRANSPARENT |
1578 | if (! (options & Opt_transparent) || am_transparent == 0) |
1608 | if (! OPTION (Opt_transparent) || am_transparent == 0) |
1579 | #endif |
1609 | #endif |
1580 | XSetWindowBackground (display->display, vt, |
1610 | XSetWindowBackground (display->display, vt, |
1581 | pix_colors[Color_bg]); |
1611 | pix_colors[Color_bg]); |
1582 | |
1612 | |
1583 | gcvalue.foreground = pix_colors[Color_fg]; |
1613 | gcvalue.foreground = pix_colors[Color_fg]; |
… | |
… | |
1608 | * Set font style |
1638 | * Set font style |
1609 | */ |
1639 | */ |
1610 | void |
1640 | void |
1611 | rxvt_term::set_font_style () |
1641 | rxvt_term::set_font_style () |
1612 | { |
1642 | { |
|
|
1643 | #if 0 |
1613 | switch (charsets[screen.charset]) |
1644 | switch (charsets [screen.charset]) |
1614 | { |
1645 | { |
1615 | case '0': /* DEC Special Character & Line Drawing Set */ |
1646 | case '0': /* DEC Special Character & Line Drawing Set */ |
1616 | break; |
1647 | break; |
1617 | case 'A': /* United Kingdom (UK) */ |
1648 | case 'A': /* United Kingdom (UK) */ |
1618 | break; |
1649 | break; |
… | |
… | |
1625 | case 'C': /* Finnish character set */ |
1656 | case 'C': /* Finnish character set */ |
1626 | break; |
1657 | break; |
1627 | case 'K': /* German character set */ |
1658 | case 'K': /* German character set */ |
1628 | break; |
1659 | break; |
1629 | } |
1660 | } |
|
|
1661 | #endif |
1630 | } |
1662 | } |
1631 | |
1663 | |
1632 | /* ------------------------------------------------------------------------- */ |
1664 | /* ------------------------------------------------------------------------- */ |
1633 | /* |
1665 | /* |
1634 | * Choose a font |
1666 | * Choose a font |
… | |
… | |
1801 | int |
1833 | int |
1802 | rxvt_term::scr_changeview (unsigned int oldviewstart) |
1834 | rxvt_term::scr_changeview (unsigned int oldviewstart) |
1803 | { |
1835 | { |
1804 | if (view_start != oldviewstart) |
1836 | if (view_start != oldviewstart) |
1805 | { |
1837 | { |
|
|
1838 | HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); |
|
|
1839 | |
1806 | want_refresh = 1; |
1840 | want_refresh = 1; |
1807 | num_scr -= (view_start - oldviewstart); |
1841 | num_scr -= (view_start - oldviewstart); |
1808 | } |
1842 | } |
1809 | |
1843 | |
1810 | return (int) (view_start - oldviewstart); |
1844 | return (int)view_start - (int)oldviewstart; |
1811 | } |
1845 | } |
1812 | |
1846 | |
1813 | /* ------------------------------------------------------------------------- */ |
1847 | /* ------------------------------------------------------------------------- */ |
1814 | void |
1848 | void |
1815 | rxvt_term::scr_bell () |
1849 | rxvt_term::scr_bell () |
1816 | { |
1850 | { |
1817 | #ifndef NO_BELL |
1851 | #ifndef NO_BELL |
1818 | |
1852 | |
1819 | # ifndef NO_MAPALERT |
1853 | # ifndef NO_MAPALERT |
1820 | # ifdef MAPALERT_OPTION |
1854 | # ifdef MAPALERT_OPTION |
1821 | if (options & Opt_mapAlert) |
1855 | if (OPTION (Opt_mapAlert)) |
1822 | # endif |
1856 | # endif |
1823 | XMapWindow (display->display, parent[0]); |
1857 | XMapWindow (display->display, parent[0]); |
1824 | # endif |
1858 | # endif |
1825 | |
1859 | |
1826 | if (options & Opt_visualBell) |
1860 | if (OPTION (Opt_visualBell)) |
1827 | { |
1861 | { |
1828 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1862 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1829 | rxvt_usleep (VISUAL_BELL_DURATION); |
1863 | rxvt_usleep (VISUAL_BELL_DURATION); |
1830 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1864 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1831 | } |
1865 | } |
… | |
… | |
1922 | |
1956 | |
1923 | #if XPM_BACKGROUND |
1957 | #if XPM_BACKGROUND |
1924 | must_clear |= bgPixmap.pixmap != None; |
1958 | must_clear |= bgPixmap.pixmap != None; |
1925 | #endif |
1959 | #endif |
1926 | #if TRANSPARENT |
1960 | #if TRANSPARENT |
1927 | must_clear |= (options & Opt_transparent) && am_transparent; |
1961 | must_clear |= OPTION (Opt_transparent) && am_transparent; |
1928 | #endif |
1962 | #endif |
1929 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
1963 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
1930 | |
1964 | |
1931 | /* |
1965 | /* |
1932 | * B: reverse any characters which are selected |
1966 | * B: reverse any characters which are selected |
… | |
… | |
1956 | |
1990 | |
1957 | crp = &ROW(screen.cur.row).r[col]; |
1991 | crp = &ROW(screen.cur.row).r[col]; |
1958 | |
1992 | |
1959 | if (showcursor && focus) |
1993 | if (showcursor && focus) |
1960 | { |
1994 | { |
1961 | if (options & Opt_cursorUnderline) |
1995 | if (OPTION (Opt_cursorUnderline)) |
1962 | *crp ^= RS_Uline; |
1996 | *crp ^= RS_Uline; |
1963 | else |
1997 | else |
1964 | { |
1998 | { |
1965 | *crp ^= RS_RVid; |
1999 | *crp ^= RS_RVid; |
1966 | |
2000 | |
… | |
… | |
1968 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
2002 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
1969 | if (ISSET_PIXCOLOR (Color_cursor)) |
2003 | if (ISSET_PIXCOLOR (Color_cursor)) |
1970 | ccol1 = Color_cursor; |
2004 | ccol1 = Color_cursor; |
1971 | else |
2005 | else |
1972 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2006 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
1973 | ccol1 = GET_FGCOLOR (rstyle); |
2007 | ccol1 = fgcolor_of (rstyle); |
1974 | #else |
2008 | #else |
1975 | ccol1 = Color_fg; |
2009 | ccol1 = Color_fg; |
1976 | #endif |
2010 | #endif |
1977 | if (ISSET_PIXCOLOR (Color_cursor2)) |
2011 | if (ISSET_PIXCOLOR (Color_cursor2)) |
1978 | ccol2 = Color_cursor2; |
2012 | ccol2 = Color_cursor2; |
1979 | else |
2013 | else |
1980 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2014 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
1981 | ccol2 = GET_BGCOLOR (rstyle); |
2015 | ccol2 = bgcolor_of (rstyle); |
1982 | #else |
2016 | #else |
1983 | ccol2 = Color_bg; |
2017 | ccol2 = Color_bg; |
1984 | #endif |
2018 | #endif |
1985 | *crp = SET_FGCOLOR (*crp, ccol1); |
2019 | *crp = SET_FGCOLOR (*crp, ccol1); |
1986 | *crp = SET_BGCOLOR (*crp, ccol2); |
2020 | *crp = SET_BGCOLOR (*crp, ccol2); |
… | |
… | |
2019 | oldcursor.col = screen.cur.col; |
2053 | oldcursor.col = screen.cur.col; |
2020 | } |
2054 | } |
2021 | } |
2055 | } |
2022 | } |
2056 | } |
2023 | |
2057 | |
|
|
2058 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
2024 | #if ENABLE_OVERLAY |
2059 | #if ENABLE_OVERLAY |
2025 | scr_swap_overlay (); |
2060 | scr_swap_overlay (); |
2026 | #endif |
2061 | #endif |
2027 | |
2062 | |
2028 | #ifndef NO_SLOW_LINK_SUPPORT |
2063 | #ifndef NO_SLOW_LINK_SUPPORT |
… | |
… | |
2078 | if (wlen < len) |
2113 | if (wlen < len) |
2079 | ::swap (wlen, len); |
2114 | ::swap (wlen, len); |
2080 | |
2115 | |
2081 | XCopyArea (display->display, vt, vt, |
2116 | XCopyArea (display->display, vt, vt, |
2082 | gc, 0, Row2Pixel (len + i), |
2117 | gc, 0, Row2Pixel (len + i), |
2083 | (unsigned int)TermWin_TotalWidth (), |
2118 | (unsigned int)this->width, |
2084 | (unsigned int)Height2Pixel (wlen - len + 1), |
2119 | (unsigned int)Height2Pixel (wlen - len + 1), |
2085 | 0, Row2Pixel (len)); |
2120 | 0, Row2Pixel (len)); |
2086 | len = -1; |
2121 | len = -1; |
2087 | } |
2122 | } |
2088 | } |
2123 | } |
… | |
… | |
2167 | count++, i--; |
2202 | count++, i--; |
2168 | |
2203 | |
2169 | /* |
2204 | /* |
2170 | * Determine the attributes for the string |
2205 | * Determine the attributes for the string |
2171 | */ |
2206 | */ |
2172 | int fore = GET_FGCOLOR (rend); // desired foreground |
2207 | int fore = fgcolor_of (rend); // desired foreground |
2173 | int back = GET_BGCOLOR (rend); // desired background |
2208 | int back = bgcolor_of (rend); // desired background |
2174 | |
2209 | |
2175 | // only do special processing if any attributes are set, which is rare |
2210 | // only do special processing if any attributes are set, which is unlikely |
2176 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2211 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2177 | { |
2212 | { |
2178 | #if ENABLE_STYLES |
2213 | #if ENABLE_STYLES |
2179 | // force redraw after "careful" characters to avoid pixel droppings |
2214 | // force redraw after "careful" characters to avoid pixel droppings |
2180 | if (srp[col] & RS_Careful && col < ncol - 1 && 0) |
2215 | if (srp[col] & RS_Careful && col < ncol - 1 && 0) |
… | |
… | |
2291 | } /* for (row....) */ |
2326 | } /* for (row....) */ |
2292 | |
2327 | |
2293 | #if ENABLE_OVERLAY |
2328 | #if ENABLE_OVERLAY |
2294 | scr_swap_overlay (); |
2329 | scr_swap_overlay (); |
2295 | #endif |
2330 | #endif |
|
|
2331 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
2296 | |
2332 | |
2297 | /* |
2333 | /* |
2298 | * G: cleanup cursor and display outline cursor if necessary |
2334 | * G: cleanup cursor and display outline cursor if necessary |
2299 | */ |
2335 | */ |
2300 | if (showcursor) |
2336 | if (showcursor) |
2301 | { |
2337 | { |
2302 | if (focus) |
2338 | if (focus) |
2303 | { |
2339 | { |
2304 | if (options & Opt_cursorUnderline) |
2340 | if (OPTION (Opt_cursorUnderline)) |
2305 | *crp ^= RS_Uline; |
2341 | *crp ^= RS_Uline; |
2306 | else |
2342 | else |
2307 | { |
2343 | { |
2308 | *crp ^= RS_RVid; |
2344 | *crp ^= RS_RVid; |
2309 | #ifndef NO_CURSORCOLOR |
2345 | #ifndef NO_CURSORCOLOR |
… | |
… | |
2347 | num_scr = 0; |
2383 | num_scr = 0; |
2348 | num_scr_allow = 1; |
2384 | num_scr_allow = 1; |
2349 | } |
2385 | } |
2350 | |
2386 | |
2351 | void |
2387 | void |
2352 | rxvt_term::scr_remap_chars (const line_t &l) |
2388 | rxvt_term::scr_remap_chars (line_t &l) |
2353 | { |
2389 | { |
2354 | if (!l.t) |
2390 | if (!l.t) |
2355 | return; |
2391 | return; |
|
|
2392 | |
|
|
2393 | l.touch (); // maybe a bit of an overkill, but its not performance-relevant |
2356 | |
2394 | |
2357 | for (int i = ncol; i--; ) |
2395 | for (int i = ncol; i--; ) |
2358 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2396 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2359 | } |
2397 | } |
2360 | |
2398 | |
… | |
… | |
2428 | |
2466 | |
2429 | #if ENABLE_FRILLS |
2467 | #if ENABLE_FRILLS |
2430 | if (selection.rect) |
2468 | if (selection.rect) |
2431 | { |
2469 | { |
2432 | for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) |
2470 | for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) |
|
|
2471 | { |
|
|
2472 | text_t *stp = ROW(row).t; |
|
|
2473 | rend_t *srp = ROW(row).r; |
|
|
2474 | |
2433 | for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) |
2475 | for (col = selection.beg.col; col < selection.end.col; col++) |
2434 | srp[col] ^= RS_RVid; |
2476 | srp[col] ^= RS_RVid; |
|
|
2477 | |
|
|
2478 | while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col]))) |
|
|
2479 | srp[col] ^= RS_RVid | RS_Uline; |
|
|
2480 | |
|
|
2481 | if (++col < selection.end.col) |
|
|
2482 | srp[col] ^= RS_RVid | RS_Uline; |
|
|
2483 | } |
2435 | } |
2484 | } |
2436 | else |
2485 | else |
2437 | #endif |
2486 | #endif |
2438 | { |
2487 | { |
2439 | if (selection.beg.row >= -view_start) |
2488 | if (selection.beg.row >= -view_start) |
… | |
… | |
2442 | row = selection.beg.row; |
2491 | row = selection.beg.row; |
2443 | } |
2492 | } |
2444 | else |
2493 | else |
2445 | { |
2494 | { |
2446 | col = 0; |
2495 | col = 0; |
2447 | row = view_start; |
2496 | row = -view_start; |
2448 | } |
2497 | } |
2449 | |
2498 | |
2450 | for (; row < min (selection.end.row, view_end); row++, col = 0) |
2499 | for (; row < min (selection.end.row, view_end); row++, col = 0) |
2451 | for (rend_t *srp = ROW(row).r; col < ncol; col++) |
2500 | for (rend_t *srp = ROW(row).r; col < ncol; col++) |
2452 | srp[col] ^= RS_RVid; |
2501 | srp[col] ^= RS_RVid; |
… | |
… | |
2523 | /* ------------------------------------------------------------------------- */ |
2572 | /* ------------------------------------------------------------------------- */ |
2524 | /* |
2573 | /* |
2525 | * Paste a selection direct to the command fd |
2574 | * Paste a selection direct to the command fd |
2526 | */ |
2575 | */ |
2527 | void |
2576 | void |
2528 | rxvt_term::paste (unsigned char *data, unsigned int len) |
2577 | rxvt_term::paste (char *data, unsigned int len) |
2529 | { |
2578 | { |
2530 | /* convert normal newline chars into common keyboard Return key sequence */ |
2579 | /* convert normal newline chars into common keyboard Return key sequence */ |
2531 | for (unsigned int i = 0; i < len; i++) |
2580 | for (unsigned int i = 0; i < len; i++) |
2532 | if (data[i] == C0_LF) |
2581 | if (data[i] == C0_LF) |
2533 | data[i] = C0_CR; |
2582 | data[i] = C0_CR; |
… | |
… | |
2677 | { |
2726 | { |
2678 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
2727 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
2679 | char *s = rxvt_wcstombs (w); |
2728 | char *s = rxvt_wcstombs (w); |
2680 | free (w); |
2729 | free (w); |
2681 | // TODO: strlen == only the first element will be converted. well... |
2730 | // TODO: strlen == only the first element will be converted. well... |
2682 | paste ((unsigned char *)s, strlen (s)); |
2731 | paste (s, strlen (s)); |
2683 | free (s); |
2732 | free (s); |
2684 | } |
2733 | } |
2685 | else |
2734 | else |
2686 | #endif |
2735 | #endif |
2687 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 |
2736 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 |
2688 | && cl) |
2737 | && cl) |
2689 | { |
2738 | { |
2690 | for (int i = 0; i < cr; i++) |
2739 | for (int i = 0; i < cr; i++) |
2691 | paste ((unsigned char *)cl[i], strlen (cl[i])); |
2740 | paste (cl[i], strlen (cl[i])); |
2692 | |
2741 | |
2693 | XFreeStringList (cl); |
2742 | XFreeStringList (cl); |
2694 | } |
2743 | } |
2695 | else |
2744 | else |
2696 | paste (ct.value, ct.nitems); // paste raw |
2745 | paste ((char *)ct.value, ct.nitems); // paste raw |
2697 | |
2746 | |
2698 | bailout: |
2747 | bailout: |
2699 | XFree (ct.value); |
2748 | XFree (ct.value); |
2700 | |
2749 | |
2701 | if (selection_wait == Sel_normal) |
2750 | if (selection_wait == Sel_normal) |
… | |
… | |
2739 | return; /* outside window */ |
2788 | return; /* outside window */ |
2740 | |
2789 | |
2741 | if (selection.text) |
2790 | if (selection.text) |
2742 | { /* internal selection */ |
2791 | { /* internal selection */ |
2743 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2792 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2744 | paste ((unsigned char *)str, strlen (str)); |
2793 | paste (str, strlen (str)); |
2745 | free (str); |
2794 | free (str); |
2746 | return; |
2795 | return; |
2747 | } |
2796 | } |
2748 | else |
2797 | else |
2749 | { |
2798 | { |
… | |
… | |
2841 | selection.op = SELECTION_DONE; |
2890 | selection.op = SELECTION_DONE; |
2842 | |
2891 | |
2843 | if (selection.clicks == 4) |
2892 | if (selection.clicks == 4) |
2844 | return; /* nothing selected, go away */ |
2893 | return; /* nothing selected, go away */ |
2845 | |
2894 | |
|
|
2895 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
|
|
2896 | return; |
|
|
2897 | |
2846 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2898 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2847 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2899 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2848 | |
2900 | |
2849 | int ofs = 0; |
2901 | int ofs = 0; |
2850 | int extra = 0; |
2902 | int extra = 0; |
… | |
… | |
2862 | col = selection.beg.col; |
2914 | col = selection.beg.col; |
2863 | end_col = ncol + 1; |
2915 | end_col = ncol + 1; |
2864 | } |
2916 | } |
2865 | else |
2917 | else |
2866 | #endif |
2918 | #endif |
2867 | end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN |
2919 | end_col = ROW(row).l; |
2868 | |
2920 | |
2869 | col = max (col, 0); |
2921 | col = max (col, 0); |
2870 | |
2922 | |
2871 | if (row == selection.end.row || selection.rect) |
2923 | if (row == selection.end.row |
|
|
2924 | #if ENABLE_FRILLS |
|
|
2925 | || selection.rect |
|
|
2926 | #endif |
|
|
2927 | ) |
2872 | end_col = min (end_col, selection.end.col); |
2928 | min_it (end_col, selection.end.col); |
2873 | |
2929 | |
2874 | t = ROW(row).t + col; |
2930 | t = ROW(row).t + col; |
|
|
2931 | |
2875 | for (; col < end_col; col++) |
2932 | for (; col < end_col; col++) |
2876 | { |
2933 | { |
2877 | if (*t == NOCHAR) |
2934 | if (*t == NOCHAR) |
2878 | t++; |
2935 | t++; |
2879 | #if ENABLE_COMBINING |
2936 | #if ENABLE_COMBINING |
… | |
… | |
2895 | #endif |
2952 | #endif |
2896 | else |
2953 | else |
2897 | new_selection_text[ofs++] = *t++; |
2954 | new_selection_text[ofs++] = *t++; |
2898 | } |
2955 | } |
2899 | |
2956 | |
|
|
2957 | #if ENABLE_FRILLS |
|
|
2958 | if (selection.rect) |
|
|
2959 | { |
|
|
2960 | while (ofs |
|
|
2961 | && new_selection_text[ofs - 1] != C0_LF |
|
|
2962 | && unicode::is_space (new_selection_text[ofs - 1])) |
|
|
2963 | --ofs; |
|
|
2964 | |
|
|
2965 | new_selection_text[ofs++] = C0_LF; |
|
|
2966 | } |
|
|
2967 | else |
|
|
2968 | #endif |
2900 | if (!ROW(row).is_longer () && row != selection.end.row) |
2969 | if (!ROW(row).is_longer () && row != selection.end.row) |
2901 | new_selection_text[ofs++] = C0_LF; |
2970 | new_selection_text[ofs++] = C0_LF; |
2902 | } |
2971 | } |
2903 | |
2972 | |
2904 | if (end_col != selection.end.col) |
2973 | if (end_col != selection.end.col) |
2905 | new_selection_text[ofs++] = C0_LF; |
2974 | new_selection_text[ofs++] = C0_LF; |
2906 | |
2975 | |
… | |
… | |
2916 | |
2985 | |
2917 | // we usually allocate much more than necessary, so realloc it smaller again |
2986 | // we usually allocate much more than necessary, so realloc it smaller again |
2918 | selection.len = ofs; |
2987 | selection.len = ofs; |
2919 | selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); |
2988 | selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); |
2920 | |
2989 | |
|
|
2990 | if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END))) |
|
|
2991 | return; |
|
|
2992 | |
|
|
2993 | selection_grab (tm); |
|
|
2994 | } |
|
|
2995 | |
|
|
2996 | bool |
|
|
2997 | rxvt_term::selection_grab (Time tm) |
|
|
2998 | { |
|
|
2999 | selection_time = tm; |
|
|
3000 | |
2921 | XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); |
3001 | XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); |
2922 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) |
3002 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) |
|
|
3003 | { |
2923 | display->set_selection_owner (this); |
3004 | display->set_selection_owner (this); |
|
|
3005 | return true; |
|
|
3006 | } |
2924 | else |
3007 | else |
2925 | rxvt_warn ("can't get primary selection, ignoring.\n"); |
3008 | return false; |
2926 | |
3009 | |
2927 | #if 0 |
3010 | #if 0 |
2928 | XTextProperty ct; |
3011 | XTextProperty ct; |
2929 | |
3012 | |
2930 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
3013 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
2931 | { |
3014 | { |
2932 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3015 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
2933 | XFree (ct.value); |
3016 | XFree (ct.value); |
2934 | } |
3017 | } |
2935 | #endif |
3018 | #endif |
2936 | |
|
|
2937 | selection_time = tm; |
|
|
2938 | } |
3019 | } |
2939 | |
3020 | |
2940 | /* ------------------------------------------------------------------------- */ |
3021 | /* ------------------------------------------------------------------------- */ |
2941 | /* |
3022 | /* |
2942 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
3023 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
… | |
… | |
3064 | } |
3145 | } |
3065 | } |
3146 | } |
3066 | break; |
3147 | break; |
3067 | } |
3148 | } |
3068 | |
3149 | |
3069 | Old_Word_Selection_You_Die: |
|
|
3070 | if (dirn == DN) |
3150 | if (dirn == DN) |
3071 | col++; /* put us on one past the end */ |
3151 | col++; /* put us on one past the end */ |
3072 | |
3152 | |
3073 | /* Poke the values back in */ |
3153 | /* Poke the values back in */ |
3074 | ret->row = row; |
3154 | ret->row = row; |
… | |
… | |
3251 | else if (selection.clicks == 2) |
3331 | else if (selection.clicks == 2) |
3252 | { |
3332 | { |
3253 | if (ROWCOL_IS_AFTER (selection.end, selection.beg)) |
3333 | if (ROWCOL_IS_AFTER (selection.end, selection.beg)) |
3254 | selection.end.col--; |
3334 | selection.end.col--; |
3255 | |
3335 | |
|
|
3336 | if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END))) |
|
|
3337 | { |
3256 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3338 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3257 | selection_delimit_word (DN, &selection.end, &selection.end); |
3339 | selection_delimit_word (DN, &selection.end, &selection.end); |
|
|
3340 | } |
3258 | } |
3341 | } |
3259 | else if (selection.clicks == 3) |
3342 | else if (selection.clicks == 3) |
3260 | { |
3343 | { |
3261 | #if ENABLE_FRILLS |
3344 | #if ENABLE_FRILLS |
3262 | if (options & Opt_tripleclickwords) |
3345 | if (OPTION (Opt_tripleclickwords)) |
3263 | { |
3346 | { |
3264 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3347 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3265 | |
3348 | |
3266 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3349 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3267 | { |
3350 | { |
… | |
… | |
3328 | { |
3411 | { |
3329 | stp = ROW(end_row).t; |
3412 | stp = ROW(end_row).t; |
3330 | |
3413 | |
3331 | while (--end_col >= 0) |
3414 | while (--end_col >= 0) |
3332 | { |
3415 | { |
3333 | if (stp[end_col] != ' ' |
3416 | if (stp[end_col] != NOCHAR |
3334 | && stp[end_col] != '\t' |
3417 | && !unicode::is_space (stp[end_col])) |
3335 | && stp[end_col] != NOCHAR) |
|
|
3336 | break; |
3418 | break; |
3337 | } |
3419 | } |
3338 | |
3420 | |
3339 | if (end_col >= 0 |
3421 | if (end_col >= 0 |
3340 | || !ROW(end_row - 1).is_longer ()) |
3422 | || !ROW(end_row - 1).is_longer ()) |
… | |
… | |
3539 | |
3621 | |
3540 | #if ENABLE_OVERLAY |
3622 | #if ENABLE_OVERLAY |
3541 | void |
3623 | void |
3542 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) |
3624 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) |
3543 | { |
3625 | { |
3544 | if (nrow < 3 || ncol < 3) |
3626 | if (nrow < 1 || ncol < 1) |
3545 | return; |
3627 | return; |
3546 | |
3628 | |
3547 | want_refresh = 1; |
3629 | want_refresh = 1; |
3548 | |
3630 | |
3549 | scr_overlay_off (); |
3631 | scr_overlay_off (); |
… | |
… | |
3656 | for (int y = ov_h; y--; ) |
3738 | for (int y = ov_h; y--; ) |
3657 | { |
3739 | { |
3658 | text_t *t1 = ov_text[y]; |
3740 | text_t *t1 = ov_text[y]; |
3659 | rend_t *r1 = ov_rend[y]; |
3741 | rend_t *r1 = ov_rend[y]; |
3660 | |
3742 | |
3661 | text_t *t2 = ROW(y - view_start).t + ov_x; |
3743 | text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; |
3662 | rend_t *r2 = ROW(y - view_start).r + ov_x; |
3744 | rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; |
3663 | |
3745 | |
3664 | for (int x = ov_w; x--; ) |
3746 | for (int x = ov_w; x--; ) |
3665 | { |
3747 | { |
3666 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3748 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3667 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3749 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |