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; |
… | |
… | |
142 | /* Fill a full line with blanks - make sure it is allocated first */ |
145 | /* Fill a full line with blanks - make sure it is allocated first */ |
143 | void |
146 | void |
144 | rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) |
147 | rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) |
145 | { |
148 | { |
146 | scr_blank_line (l, 0, ncol, efs); |
149 | scr_blank_line (l, 0, ncol, efs); |
|
|
150 | |
|
|
151 | l.l = 0; |
|
|
152 | l.f = 0; |
147 | } |
153 | } |
148 | |
154 | |
149 | /* ------------------------------------------------------------------------- * |
155 | /* ------------------------------------------------------------------------- * |
150 | * SCREEN INITIALISATION * |
156 | * SCREEN INITIALISATION * |
151 | * ------------------------------------------------------------------------- */ |
157 | * ------------------------------------------------------------------------- */ |
… | |
… | |
188 | |
194 | |
189 | if (!row_buf) |
195 | if (!row_buf) |
190 | { |
196 | { |
191 | /* |
197 | /* |
192 | * first time called so just malloc everything: don't rely on realloc |
198 | * first time called so just malloc everything: don't rely on realloc |
193 | * Note: this is still needed so that all the scrollback lines are NULL |
|
|
194 | */ |
199 | */ |
195 | nsaved = 0; /* no saved lines */ |
200 | nsaved = 0; /* no saved lines */ |
196 | term_start = 0; |
201 | term_start = 0; |
197 | |
202 | |
198 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
203 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
199 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
204 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
200 | |
205 | |
201 | row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); |
206 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
202 | temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); |
|
|
203 | drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
207 | drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
204 | swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
208 | swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
205 | |
209 | |
206 | for (int row = nrow; row--; ) |
210 | for (int row = nrow; row--; ) |
207 | { |
211 | { |
208 | scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); |
212 | scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); |
209 | scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
213 | scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
… | |
… | |
254 | } |
258 | } |
255 | } |
259 | } |
256 | #endif |
260 | #endif |
257 | |
261 | |
258 | drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); |
262 | drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); |
259 | temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t)); |
|
|
260 | swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); |
263 | swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); |
261 | |
264 | |
262 | for (int row = min (nrow, prev_nrow); row--; ) |
265 | for (int row = min (nrow, prev_nrow); row--; ) |
263 | { |
266 | { |
264 | lresize (drawn_buf[row]); |
267 | lresize (drawn_buf[row]); |
… | |
… | |
269 | { |
272 | { |
270 | swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
273 | swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
271 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
274 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
272 | } |
275 | } |
273 | |
276 | |
|
|
277 | line_t *old_buf = row_buf; |
274 | line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); |
278 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
275 | |
279 | |
276 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
280 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
277 | int pend = MOD (term_start - nsaved , prev_total_rows); |
281 | int pend = MOD (term_start - nsaved , prev_total_rows); |
278 | int q = total_rows; // rewrapped row |
282 | int q = total_rows; // rewrapped row |
279 | |
283 | |
… | |
… | |
289 | { |
293 | { |
290 | p = MOD (p - 1, prev_total_rows); |
294 | p = MOD (p - 1, prev_total_rows); |
291 | #ifdef DEBUG_STRICT |
295 | #ifdef DEBUG_STRICT |
292 | assert (old_buf [MOD (p, prev_total_rows)].t); |
296 | assert (old_buf [MOD (p, prev_total_rows)].t); |
293 | #endif |
297 | #endif |
294 | |
|
|
295 | int plines = 1; |
298 | int plines = 1; |
296 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
299 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
297 | |
300 | |
298 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
301 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
299 | { |
302 | { |
… | |
… | |
317 | // re-assemble the full line by destination lines |
320 | // re-assemble the full line by destination lines |
318 | for (int qrow = q; qlines--; qrow++) |
321 | for (int qrow = q; qlines--; qrow++) |
319 | { |
322 | { |
320 | qline = row_buf + qrow; |
323 | qline = row_buf + qrow; |
321 | lalloc (*qline); |
324 | lalloc (*qline); |
|
|
325 | qline->l = ncol; |
322 | qline->set_is_longer (); |
326 | qline->is_longer (1); |
323 | |
327 | |
324 | int qcol = 0; |
328 | int qcol = 0; |
325 | |
329 | |
326 | // fill a single destination line |
330 | // fill a single destination line |
327 | while (lofs < llen && qcol < ncol) |
331 | while (lofs < llen && qcol < ncol) |
… | |
… | |
352 | qcol += len; |
356 | qcol += len; |
353 | } |
357 | } |
354 | } |
358 | } |
355 | |
359 | |
356 | qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0; |
360 | qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0; |
357 | #ifdef DEBUG_STRICT //TODO//FIXME//TEMPORARY |
361 | qline->is_longer (0); |
358 | if (qline->l < 0) |
|
|
359 | { |
|
|
360 | fprintf (stderr, "ERROR, PLEASE REPORT to rxvt-unicode@plan9.de: qline->l %d = llen %d < ncol %d ? %d : MOD %d\n", qline->l,llen,ncol,llen,MOD (llen - 1, ncol) + 1);//D |
|
|
361 | qline->l = 0; |
|
|
362 | } |
|
|
363 | #endif |
|
|
364 | scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); |
362 | scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); |
365 | } |
363 | } |
366 | while (p != pend && q > 0); |
364 | while (p != pend && q > 0); |
367 | |
365 | |
368 | term_start = total_rows - nrow; |
366 | term_start = total_rows - nrow; |
369 | nsaved = term_start - q; |
367 | nsaved = term_start - q; |
370 | |
368 | |
371 | // make sure all terminal lines exist |
369 | // make sure all terminal lines exist |
372 | while (nsaved < 0) |
370 | while (nsaved < 0) |
373 | scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); |
371 | scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); |
374 | |
|
|
375 | } |
372 | } |
376 | else |
373 | else |
377 | { |
374 | { |
378 | // if no scrollback exists (yet), wing, instead of wrap |
375 | // if no scrollback exists (yet), wing, instead of wrap |
379 | |
376 | |
… | |
… | |
417 | |
414 | |
418 | for (int col = ncol; col--; ) |
415 | for (int col = ncol; col--; ) |
419 | tabs [col] = col % TABSIZE == 0; |
416 | tabs [col] = col % TABSIZE == 0; |
420 | |
417 | |
421 | tt_winch (); |
418 | tt_winch (); |
|
|
419 | |
|
|
420 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
422 | } |
421 | } |
423 | |
422 | |
424 | /* ------------------------------------------------------------------------- */ |
423 | /* ------------------------------------------------------------------------- */ |
425 | /* |
424 | /* |
426 | * Free everything. That way malloc debugging can find leakage. |
425 | * Free everything. That way malloc debugging can find leakage. |
… | |
… | |
432 | delete ralloc; ralloc = 0; |
431 | delete ralloc; ralloc = 0; |
433 | |
432 | |
434 | free (row_buf); |
433 | free (row_buf); |
435 | free (swap_buf); |
434 | free (swap_buf); |
436 | free (drawn_buf); |
435 | free (drawn_buf); |
437 | free (temp_buf); |
|
|
438 | free (tabs); |
436 | free (tabs); |
439 | |
437 | |
440 | row_buf = 0; // signal that we freed all the arrays |
438 | row_buf = 0; // signal that we freed all the arrays |
441 | } |
439 | } |
442 | |
440 | |
… | |
… | |
530 | |
528 | |
531 | screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); |
529 | screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); |
532 | screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); |
530 | screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); |
533 | |
531 | |
534 | #if NSCREENS |
532 | #if NSCREENS |
535 | if (options & Opt_secondaryScreen) |
533 | if (OPTION (Opt_secondaryScreen)) |
536 | { |
534 | { |
537 | num_scr = 0; |
535 | num_scr = 0; |
538 | |
536 | |
539 | for (int i = prev_nrow; i--; ) |
537 | for (int i = prev_nrow; i--; ) |
540 | ::swap (ROW(i), swap_buf [i]); |
538 | ::swap (ROW(i), swap_buf [i]); |
… | |
… | |
544 | screen.flags |= Screen_VisibleCursor; |
542 | screen.flags |= Screen_VisibleCursor; |
545 | swap.flags |= Screen_VisibleCursor; |
543 | swap.flags |= Screen_VisibleCursor; |
546 | } |
544 | } |
547 | else |
545 | else |
548 | #endif |
546 | #endif |
549 | if (options & Opt_secondaryScroll) |
547 | if (OPTION (Opt_secondaryScroll)) |
550 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
548 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
551 | |
549 | |
552 | return scrn; |
550 | return scrn; |
553 | } |
551 | } |
554 | |
552 | |
… | |
… | |
616 | num_scr += count; |
614 | num_scr += count; |
617 | |
615 | |
618 | if (count > 0 |
616 | if (count > 0 |
619 | && row1 == 0 |
617 | && row1 == 0 |
620 | && row2 == nrow - 1 |
618 | && row2 == nrow - 1 |
621 | && (current_screen == PRIMARY || options & Opt_secondaryScroll)) |
619 | && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) |
622 | { |
620 | { |
623 | 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 | |
624 | term_start = (term_start + count) % total_rows; |
625 | term_start = (term_start + count) % total_rows; |
625 | |
626 | |
626 | if (selection.op && current_screen == selection.screen) |
627 | if (selection.op && current_screen == selection.screen) |
627 | { |
628 | { |
628 | selection.beg.row -= count; |
629 | selection.beg.row -= count; |
… | |
… | |
638 | } |
639 | } |
639 | } |
640 | } |
640 | |
641 | |
641 | for (int i = count; i--; ) |
642 | for (int i = count; i--; ) |
642 | { |
643 | { |
643 | ROW(row2 - i).l = 0; |
644 | // basically thi is a slightly optimized scr_blank_screen_mem |
644 | scr_blank_screen_mem (ROW(row2 - i), rstyle); |
645 | // it is worth the effort on slower machines |
|
|
646 | line_t &l = ROW(row2 - i); |
|
|
647 | |
|
|
648 | scr_blank_line (l, 0, l.l, rstyle); |
|
|
649 | |
|
|
650 | l.l = 0; |
|
|
651 | l.f = 0; |
645 | } |
652 | } |
646 | |
653 | |
647 | if ((options & Opt_scrollWithBuffer) |
654 | if (OPTION (Opt_scrollWithBuffer) |
648 | && view_start != 0 |
655 | && view_start != 0 |
649 | && view_start != saveLines) |
656 | && view_start != saveLines) |
650 | scr_page (UP, count); |
657 | scr_page (UP, count); |
651 | } |
658 | } |
652 | else |
659 | else |
… | |
… | |
679 | |
686 | |
680 | int rows = row2 - row1 + 1; |
687 | int rows = row2 - row1 + 1; |
681 | |
688 | |
682 | min_it (count, rows); |
689 | min_it (count, rows); |
683 | |
690 | |
|
|
691 | line_t *temp_buf = row_buf + total_rows; |
|
|
692 | |
684 | for (int row = 0; row < rows; row++) |
693 | for (int row = 0; row < rows; row++) |
685 | { |
694 | { |
686 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
695 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
687 | |
696 | |
688 | if (!IN_RANGE_EXC (row + count, 0, rows)) |
697 | if (!IN_RANGE_EXC (row + count, 0, rows)) |
… | |
… | |
699 | /* ------------------------------------------------------------------------- */ |
708 | /* ------------------------------------------------------------------------- */ |
700 | /* |
709 | /* |
701 | * Add text given in <str> of length <len> to screen struct |
710 | * Add text given in <str> of length <len> to screen struct |
702 | */ |
711 | */ |
703 | void |
712 | void |
704 | rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) |
713 | rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) |
705 | { |
714 | { |
706 | if (len <= 0) /* sanity */ |
715 | if (len <= 0) /* sanity */ |
707 | return; |
716 | return; |
708 | |
717 | |
709 | unsigned char checksel; |
718 | unsigned char checksel; |
710 | unicode_t c; |
719 | unicode_t c; |
711 | int last_col; |
720 | int ncol = this->ncol; |
712 | const unicode_t *strend = str + len; |
721 | const wchar_t *strend = str + len; |
713 | |
722 | |
714 | want_refresh = 1; |
723 | want_refresh = 1; |
715 | ZERO_SCROLLBACK (); |
724 | ZERO_SCROLLBACK (); |
716 | last_col = ncol; |
|
|
717 | |
725 | |
718 | if (nlines > 0) |
726 | if (minlines > 0) |
719 | { |
727 | { |
720 | nlines += screen.cur.row - screen.bscroll; |
728 | minlines += screen.cur.row - screen.bscroll; |
|
|
729 | |
721 | if (nlines > 0 |
730 | if (minlines > 0 |
722 | && screen.tscroll == 0 |
731 | && screen.tscroll == 0 |
723 | && screen.bscroll == (nrow - 1)) |
732 | && screen.bscroll == nrow - 1) |
724 | { |
733 | { |
725 | /* _at least_ this many lines need to be scrolled */ |
734 | /* _at least_ this many lines need to be scrolled */ |
726 | scr_scroll_text (screen.tscroll, screen.bscroll, nlines); |
735 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
727 | screen.cur.row -= nlines; |
736 | screen.cur.row -= minlines; |
728 | } |
737 | } |
729 | } |
738 | } |
730 | |
739 | |
731 | #ifdef DEBUG_STRICT |
740 | #ifdef DEBUG_STRICT |
732 | assert (screen.cur.col < last_col); |
741 | assert (screen.cur.col < ncol); |
733 | assert (screen.cur.row < nrow |
742 | assert (screen.cur.row < nrow |
734 | && screen.cur.row >= -nsaved); |
743 | && screen.cur.row >= -nsaved); |
735 | #endif |
744 | #endif |
736 | int row = screen.cur.row; |
745 | int row = screen.cur.row; |
737 | |
746 | |
… | |
… | |
739 | |
748 | |
740 | line_t *line = &ROW(row); |
749 | line_t *line = &ROW(row); |
741 | |
750 | |
742 | while (str < strend) |
751 | while (str < strend) |
743 | { |
752 | { |
744 | c = *str++; |
753 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
745 | |
754 | |
746 | if (c < 0x20) |
755 | if (c < 0x20) |
747 | if (c == C0_LF) |
756 | if (c == C0_LF) |
748 | { |
757 | { |
749 | if (!line->is_longer ()) /* XXX: think about this */ |
|
|
750 | max_it (line->l, screen.cur.col); |
758 | max_it (line->l, screen.cur.col); |
751 | |
759 | |
752 | screen.flags &= ~Screen_WrapNext; |
760 | screen.flags &= ~Screen_WrapNext; |
753 | |
761 | |
754 | if (screen.cur.row == screen.bscroll) |
762 | if (screen.cur.row == screen.bscroll) |
755 | scr_scroll_text (screen.tscroll, screen.bscroll, 1); |
763 | scr_scroll_text (screen.tscroll, screen.bscroll, 1); |
… | |
… | |
759 | line = &ROW(row); /* _must_ refresh */ |
767 | line = &ROW(row); /* _must_ refresh */ |
760 | continue; |
768 | continue; |
761 | } |
769 | } |
762 | else if (c == C0_CR) |
770 | else if (c == C0_CR) |
763 | { |
771 | { |
764 | if (!line->is_longer ()) /* XXX: think about this */ |
|
|
765 | max_it (line->l, screen.cur.col); |
772 | max_it (line->l, screen.cur.col); |
766 | |
773 | |
767 | screen.flags &= ~Screen_WrapNext; |
774 | screen.flags &= ~Screen_WrapNext; |
768 | screen.cur.col = 0; |
775 | screen.cur.col = 0; |
769 | continue; |
776 | continue; |
770 | } |
777 | } |
… | |
… | |
787 | CLEAR_SELECTION (); |
794 | CLEAR_SELECTION (); |
788 | } |
795 | } |
789 | |
796 | |
790 | if (screen.flags & Screen_WrapNext) |
797 | if (screen.flags & Screen_WrapNext) |
791 | { |
798 | { |
|
|
799 | max_it (line->l, ncol); |
792 | line->set_is_longer (); |
800 | line->is_longer (1); |
793 | |
801 | |
794 | scr_do_wrap (); |
802 | scr_do_wrap (); |
795 | |
803 | |
796 | row = screen.cur.row; |
804 | row = screen.cur.row; |
797 | line = &ROW(row); /* _must_ refresh */ |
805 | line = &ROW(row); /* _must_ refresh */ |
… | |
… | |
805 | // do wcwidth before further replacements, as wcwidth might return -1 |
813 | // do wcwidth before further replacements, as wcwidth might return -1 |
806 | // for the line drawing characters below as they might be invalid in the current |
814 | // for the line drawing characters below as they might be invalid in the current |
807 | // locale. |
815 | // locale. |
808 | int width = c < 0x100 ? 1 : wcwidth (c); |
816 | int width = c < 0x100 ? 1 : wcwidth (c); |
809 | |
817 | |
810 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
818 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
811 | { |
819 | { |
812 | // vt100 special graphics and line drawing |
820 | // vt100 special graphics and line drawing |
813 | // 5f-7e standard vt100 |
821 | // 5f-7e standard vt100 |
814 | // 40-5e rxvt extension for extra curses acs chars |
822 | // 40-5e rxvt extension for extra curses acs chars |
815 | static uint16_t vt100_0[62] = { // 41 .. 7e |
823 | static uint16_t vt100_0[62] = { // 41 .. 7e |
… | |
… | |
867 | } |
875 | } |
868 | |
876 | |
869 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
877 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
870 | |
878 | |
871 | // if the character doesn't fit into the remaining columns... |
879 | // if the character doesn't fit into the remaining columns... |
872 | if (screen.cur.col > last_col - width && last_col >= width) |
880 | if (screen.cur.col > ncol - width && ncol >= width) |
873 | { |
881 | { |
874 | // ...output spaces |
882 | // ...output spaces |
875 | c = ' '; |
883 | c = ' '; |
876 | // and try the same character next loop iteration |
884 | // and try the same character next loop iteration |
877 | --str; |
885 | --str; |
878 | } |
886 | } |
879 | |
887 | |
|
|
888 | line->touch (); |
|
|
889 | |
880 | do |
890 | do |
881 | { |
891 | { |
882 | line->t[screen.cur.col] = c; |
892 | line->t[screen.cur.col] = c; |
883 | line->r[screen.cur.col] = rend; |
893 | line->r[screen.cur.col] = rend; |
884 | |
894 | |
885 | if (screen.cur.col < last_col - 1) |
895 | if (screen.cur.col < ncol - 1) |
886 | screen.cur.col++; |
896 | screen.cur.col++; |
887 | else |
897 | else |
888 | { |
898 | { |
889 | line->l = last_col; |
899 | line->l = ncol; |
890 | if (screen.flags & Screen_Autowrap) |
900 | if (screen.flags & Screen_Autowrap) |
891 | screen.flags |= Screen_WrapNext; |
901 | screen.flags |= Screen_WrapNext; |
892 | break; |
902 | break; |
893 | } |
903 | } |
894 | |
904 | |
… | |
… | |
896 | } |
906 | } |
897 | while (--width > 0); |
907 | while (--width > 0); |
898 | |
908 | |
899 | // pad with spaces when overwriting wide character with smaller one |
909 | // pad with spaces when overwriting wide character with smaller one |
900 | if (!width) |
910 | if (!width) |
|
|
911 | { |
|
|
912 | line->touch (); |
|
|
913 | |
901 | for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) |
914 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
902 | { |
915 | { |
903 | line->t[c] = ' '; |
916 | line->t[c] = ' '; |
904 | line->r[c] = rend; |
917 | line->r[c] = rend; |
905 | } |
918 | } |
|
|
919 | } |
906 | } |
920 | } |
907 | else // width == 0 |
921 | else // width == 0 |
908 | { |
922 | { |
909 | #if ENABLE_COMBINING |
923 | #if ENABLE_COMBINING |
910 | // handle combining characters |
924 | // handle combining characters |
911 | // we just tag the accent on the previous on-screen character. |
925 | // we just tag the accent on the previous on-screen character. |
912 | // this is arguably not correct, but also arguably not wrong. |
926 | // this is arguably not correct, but also arguably not wrong. |
913 | // we don't handle double-width characters nicely yet. |
927 | // we don't handle double-width characters nicely yet. |
|
|
928 | line_t *linep; |
914 | text_t *tp; |
929 | text_t *tp; |
915 | rend_t *rp; |
930 | rend_t *rp; |
916 | |
931 | |
917 | if (screen.cur.col > 0) |
932 | if (screen.cur.col > 0) |
918 | { |
933 | { |
|
|
934 | linep = line; |
919 | tp = line->t + screen.cur.col - 1; |
935 | tp = line->t + screen.cur.col - 1; |
920 | rp = line->r + screen.cur.col - 1; |
936 | rp = line->r + screen.cur.col - 1; |
921 | |
|
|
922 | while (*tp == NOCHAR && tp > line->t) |
|
|
923 | tp--, rp--; |
|
|
924 | } |
937 | } |
925 | else if (screen.cur.row > 0 |
938 | else if (screen.cur.row > 0 |
926 | && ROW(screen.cur.row - 1).is_longer ()) |
939 | && ROW(screen.cur.row - 1).is_longer ()) |
927 | { |
940 | { |
928 | line_t *line = &ROW(screen.cur.row - 1); |
941 | linep = &ROW(screen.cur.row - 1); |
929 | |
|
|
930 | tp = line->t + last_col - 1; |
942 | tp = line->t + ncol - 1; |
931 | rp = line->r + last_col - 1; |
943 | rp = line->r + ncol - 1; |
932 | |
|
|
933 | while (*tp == NOCHAR && tp > line->t) |
|
|
934 | tp--, rp--; |
|
|
935 | } |
944 | } |
936 | else |
945 | else |
937 | continue; |
946 | continue; |
|
|
947 | |
|
|
948 | linep->touch (); |
|
|
949 | |
|
|
950 | while (*tp == NOCHAR && tp > linep->t) |
|
|
951 | tp--, rp--; |
938 | |
952 | |
939 | // first try to find a precomposed character |
953 | // first try to find a precomposed character |
940 | unicode_t n = rxvt_compose (*tp, c); |
954 | unicode_t n = rxvt_compose (*tp, c); |
941 | if (n == NOCHAR) |
955 | if (n == NOCHAR) |
942 | n = rxvt_composite.compose (*tp, c); |
956 | n = rxvt_composite.compose (*tp, c); |
… | |
… | |
945 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
959 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
946 | #endif |
960 | #endif |
947 | } |
961 | } |
948 | } |
962 | } |
949 | |
963 | |
950 | if (!line->is_longer ()) /* XXX: think about this */ |
|
|
951 | max_it (line->l, screen.cur.col); |
964 | max_it (line->l, screen.cur.col); |
952 | |
965 | |
953 | #ifdef DEBUG_STRICT |
966 | #ifdef DEBUG_STRICT |
954 | assert (screen.cur.row >= 0); |
967 | assert (screen.cur.row >= 0); |
955 | #endif |
968 | #endif |
956 | } |
969 | } |
… | |
… | |
1006 | |
1019 | |
1007 | for (; ++i < ncol; ) |
1020 | for (; ++i < ncol; ) |
1008 | if (tabs[i]) |
1021 | if (tabs[i]) |
1009 | { |
1022 | { |
1010 | x = i; |
1023 | x = i; |
|
|
1024 | |
1011 | if (!--count) |
1025 | if (!--count) |
1012 | break; |
1026 | break; |
1013 | } |
1027 | } |
1014 | else |
1028 | else |
1015 | ht &= l.t[i] == ' ' |
1029 | ht &= l.t[i] == ' ' |
… | |
… | |
1018 | if (count) |
1032 | if (count) |
1019 | x = ncol - 1; |
1033 | x = ncol - 1; |
1020 | |
1034 | |
1021 | // store horizontal tab commands as characters inside the text |
1035 | // store horizontal tab commands as characters inside the text |
1022 | // buffer so they can be selected and pasted. |
1036 | // buffer so they can be selected and pasted. |
1023 | if (ht && options & Opt_pastableTabs) |
1037 | if (ht && OPTION (Opt_pastableTabs)) |
1024 | { |
1038 | { |
1025 | base_rend = SET_FONT (base_rend, 0); |
1039 | base_rend = SET_FONT (base_rend, 0); |
1026 | |
1040 | |
1027 | if (!l.is_longer ()) /* XXX: think about this */ |
1041 | l.touch (x); |
1028 | max_it (l.l, x); |
|
|
1029 | |
1042 | |
1030 | i = screen.cur.col; |
1043 | i = screen.cur.col; |
1031 | |
1044 | |
1032 | l.t[i] = '\t'; |
1045 | l.t[i] = '\t'; |
1033 | l.r[i] = base_rend; |
1046 | l.r[i] = base_rend; |
… | |
… | |
1087 | { |
1100 | { |
1088 | if (screen.cur.col < ncol - 1) |
1101 | if (screen.cur.col < ncol - 1) |
1089 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1102 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1090 | else |
1103 | else |
1091 | { |
1104 | { |
1092 | if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN |
1105 | line_t &l = ROW(screen.cur.row); |
1093 | ROW(screen.cur.row).l = ncol; |
1106 | |
|
|
1107 | l.touch (); |
|
|
1108 | l.is_longer (0); |
1094 | |
1109 | |
1095 | scr_gotorc (0, 0, R_RELATIVE); |
1110 | scr_gotorc (0, 0, R_RELATIVE); |
1096 | scr_insdel_chars (1, DELETE); |
1111 | scr_insdel_chars (1, DELETE); |
1097 | scr_gotorc (0, ncol - 1, R_RELATIVE); |
1112 | scr_gotorc (0, ncol - 1, R_RELATIVE); |
1098 | } |
1113 | } |
… | |
… | |
1189 | ZERO_SCROLLBACK (); |
1204 | ZERO_SCROLLBACK (); |
1190 | |
1205 | |
1191 | selection_check (1); |
1206 | selection_check (1); |
1192 | |
1207 | |
1193 | line_t &line = ROW(screen.cur.row); |
1208 | line_t &line = ROW(screen.cur.row); |
|
|
1209 | |
|
|
1210 | line.touch (); |
|
|
1211 | line.is_longer (0); |
1194 | |
1212 | |
1195 | switch (mode) |
1213 | switch (mode) |
1196 | { |
1214 | { |
1197 | case 0: /* erase to end of line */ |
1215 | case 0: /* erase to end of line */ |
1198 | col = screen.cur.col; |
1216 | col = screen.cur.col; |
… | |
… | |
1284 | CLEAR_ROWS (row, num); |
1302 | CLEAR_ROWS (row, num); |
1285 | } |
1303 | } |
1286 | else |
1304 | else |
1287 | { |
1305 | { |
1288 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1306 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1289 | gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; |
1307 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1290 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1308 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1291 | ERASE_ROWS (row, num); |
1309 | ERASE_ROWS (row, num); |
1292 | gcvalue.foreground = pix_colors[Color_fg]; |
1310 | gcvalue.foreground = pix_colors[Color_fg]; |
1293 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1311 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1294 | } |
1312 | } |
1295 | |
1313 | |
1296 | for (; num--; row++) |
1314 | for (; num--; row++) |
1297 | { |
1315 | { |
1298 | ROW (row).l = 0; |
|
|
1299 | scr_blank_screen_mem (ROW (row), rstyle); |
1316 | scr_blank_screen_mem (ROW(row), rstyle); |
1300 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1317 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1301 | } |
1318 | } |
1302 | } |
1319 | } |
1303 | |
1320 | |
1304 | #if ENABLE_FRILLS |
1321 | #if ENABLE_FRILLS |
… | |
… | |
1337 | rend_t *r1 = line.r; |
1354 | rend_t *r1 = line.r; |
1338 | |
1355 | |
1339 | for (int j = ncol; j--; ) |
1356 | for (int j = ncol; j--; ) |
1340 | *r1++ = fs; |
1357 | *r1++ = fs; |
1341 | |
1358 | |
1342 | line.l = ncol; /* make the `E's selectable */ |
1359 | line.is_longer (0); |
|
|
1360 | line.touch (ncol); |
1343 | } |
1361 | } |
1344 | } |
1362 | } |
1345 | |
1363 | |
1346 | /* ------------------------------------------------------------------------- */ |
1364 | /* ------------------------------------------------------------------------- */ |
1347 | /* |
1365 | /* |
… | |
… | |
1395 | min_it (count, ncol - screen.cur.col); |
1413 | min_it (count, ncol - screen.cur.col); |
1396 | |
1414 | |
1397 | row = screen.cur.row; |
1415 | row = screen.cur.row; |
1398 | |
1416 | |
1399 | line_t *line = &ROW(row); |
1417 | line_t *line = &ROW(row); |
|
|
1418 | |
|
|
1419 | line->touch (); |
|
|
1420 | line->is_longer (0); |
1400 | |
1421 | |
1401 | switch (insdel) |
1422 | switch (insdel) |
1402 | { |
1423 | { |
1403 | case INSERT: |
1424 | case INSERT: |
1404 | for (col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1425 | for (col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1405 | { |
1426 | { |
1406 | line->t[col] = line->t[col - count]; |
1427 | line->t[col] = line->t[col - count]; |
1407 | line->r[col] = line->r[col - count]; |
1428 | line->r[col] = line->r[col - count]; |
1408 | } |
1429 | } |
1409 | |
1430 | |
1410 | if (!line->is_longer ()) |
1431 | line->l = min (line->l + count, ncol); |
1411 | { |
|
|
1412 | line->l += count; |
|
|
1413 | min_it (line->l, ncol); |
|
|
1414 | } |
|
|
1415 | |
1432 | |
1416 | if (selection.op && current_screen == selection.screen |
1433 | if (selection.op && current_screen == selection.screen |
1417 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1434 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1418 | { |
1435 | { |
1419 | if (selection.end.row != screen.cur.row |
1436 | if (selection.end.row != screen.cur.row |
… | |
… | |
1432 | |
1449 | |
1433 | case ERASE: |
1450 | case ERASE: |
1434 | screen.cur.col += count; /* don't worry if > ncol */ |
1451 | screen.cur.col += count; /* don't worry if > ncol */ |
1435 | selection_check (1); |
1452 | selection_check (1); |
1436 | screen.cur.col -= count; |
1453 | screen.cur.col -= count; |
|
|
1454 | |
|
|
1455 | line->l = max (line->l - count, 0); |
1437 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1456 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1438 | break; |
1457 | break; |
1439 | |
1458 | |
1440 | case DELETE: |
1459 | case DELETE: |
1441 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1460 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
… | |
… | |
1444 | { |
1463 | { |
1445 | line->t[col] = line->t[col + count]; |
1464 | line->t[col] = line->t[col + count]; |
1446 | line->r[col] = line->r[col + count]; |
1465 | line->r[col] = line->r[col + count]; |
1447 | } |
1466 | } |
1448 | |
1467 | |
|
|
1468 | line->l = max (line->l - count, 0); |
1449 | scr_blank_line (*line, ncol - count, count, tr); |
1469 | scr_blank_line (*line, ncol - count, count, tr); |
1450 | |
|
|
1451 | if (line->is_longer ()) /* break line continuation */ |
|
|
1452 | line->l = ncol; |
|
|
1453 | |
|
|
1454 | line->l = max (line->l - count, 0); |
|
|
1455 | |
1470 | |
1456 | if (selection.op && current_screen == selection.screen |
1471 | if (selection.op && current_screen == selection.screen |
1457 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1472 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1458 | { |
1473 | { |
1459 | if (selection.end.row != screen.cur.row |
1474 | if (selection.end.row != screen.cur.row |
… | |
… | |
1571 | rxvt_term::scr_set_tab (int mode) |
1586 | rxvt_term::scr_set_tab (int mode) |
1572 | { |
1587 | { |
1573 | if (mode < 0) |
1588 | if (mode < 0) |
1574 | memset (tabs, 0, ncol * sizeof (char)); |
1589 | memset (tabs, 0, ncol * sizeof (char)); |
1575 | else if (screen.cur.col < ncol) |
1590 | else if (screen.cur.col < ncol) |
1576 | tabs[screen.cur.col] = (mode ? 1 : 0); |
1591 | tabs [screen.cur.col] = !!mode; |
1577 | } |
1592 | } |
1578 | |
1593 | |
1579 | /* ------------------------------------------------------------------------- */ |
1594 | /* ------------------------------------------------------------------------- */ |
1580 | /* |
1595 | /* |
1581 | * Set reverse/normal video |
1596 | * Set reverse/normal video |
… | |
… | |
1593 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1608 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1594 | #if XPM_BACKGROUND |
1609 | #if XPM_BACKGROUND |
1595 | if (bgPixmap.pixmap == None) |
1610 | if (bgPixmap.pixmap == None) |
1596 | #endif |
1611 | #endif |
1597 | #if TRANSPARENT |
1612 | #if TRANSPARENT |
1598 | if (! (options & Opt_transparent) || am_transparent == 0) |
1613 | if (! OPTION (Opt_transparent) || am_transparent == 0) |
1599 | #endif |
1614 | #endif |
1600 | XSetWindowBackground (display->display, vt, |
1615 | XSetWindowBackground (display->display, vt, |
1601 | pix_colors[Color_bg]); |
1616 | pix_colors[Color_bg]); |
1602 | |
1617 | |
1603 | gcvalue.foreground = pix_colors[Color_fg]; |
1618 | gcvalue.foreground = pix_colors[Color_fg]; |
… | |
… | |
1628 | * Set font style |
1643 | * Set font style |
1629 | */ |
1644 | */ |
1630 | void |
1645 | void |
1631 | rxvt_term::set_font_style () |
1646 | rxvt_term::set_font_style () |
1632 | { |
1647 | { |
|
|
1648 | #if 0 |
1633 | switch (charsets[screen.charset]) |
1649 | switch (charsets [screen.charset]) |
1634 | { |
1650 | { |
1635 | case '0': /* DEC Special Character & Line Drawing Set */ |
1651 | case '0': /* DEC Special Character & Line Drawing Set */ |
1636 | break; |
1652 | break; |
1637 | case 'A': /* United Kingdom (UK) */ |
1653 | case 'A': /* United Kingdom (UK) */ |
1638 | break; |
1654 | break; |
… | |
… | |
1645 | case 'C': /* Finnish character set */ |
1661 | case 'C': /* Finnish character set */ |
1646 | break; |
1662 | break; |
1647 | case 'K': /* German character set */ |
1663 | case 'K': /* German character set */ |
1648 | break; |
1664 | break; |
1649 | } |
1665 | } |
|
|
1666 | #endif |
1650 | } |
1667 | } |
1651 | |
1668 | |
1652 | /* ------------------------------------------------------------------------- */ |
1669 | /* ------------------------------------------------------------------------- */ |
1653 | /* |
1670 | /* |
1654 | * Choose a font |
1671 | * Choose a font |
… | |
… | |
1821 | int |
1838 | int |
1822 | rxvt_term::scr_changeview (unsigned int oldviewstart) |
1839 | rxvt_term::scr_changeview (unsigned int oldviewstart) |
1823 | { |
1840 | { |
1824 | if (view_start != oldviewstart) |
1841 | if (view_start != oldviewstart) |
1825 | { |
1842 | { |
|
|
1843 | HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); |
|
|
1844 | |
1826 | want_refresh = 1; |
1845 | want_refresh = 1; |
1827 | num_scr -= (view_start - oldviewstart); |
1846 | num_scr -= (view_start - oldviewstart); |
1828 | } |
1847 | } |
1829 | |
1848 | |
1830 | return (int) (view_start - oldviewstart); |
1849 | return (int)view_start - (int)oldviewstart; |
1831 | } |
1850 | } |
1832 | |
1851 | |
1833 | /* ------------------------------------------------------------------------- */ |
1852 | /* ------------------------------------------------------------------------- */ |
1834 | void |
1853 | void |
1835 | rxvt_term::scr_bell () |
1854 | rxvt_term::scr_bell () |
1836 | { |
1855 | { |
1837 | #ifndef NO_BELL |
1856 | #ifndef NO_BELL |
1838 | |
1857 | |
1839 | # ifndef NO_MAPALERT |
1858 | # ifndef NO_MAPALERT |
1840 | # ifdef MAPALERT_OPTION |
1859 | # ifdef MAPALERT_OPTION |
1841 | if (options & Opt_mapAlert) |
1860 | if (OPTION (Opt_mapAlert)) |
1842 | # endif |
1861 | # endif |
1843 | XMapWindow (display->display, parent[0]); |
1862 | XMapWindow (display->display, parent[0]); |
1844 | # endif |
1863 | # endif |
1845 | |
1864 | |
1846 | if (options & Opt_visualBell) |
1865 | if (OPTION (Opt_visualBell)) |
1847 | { |
1866 | { |
1848 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1867 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
|
|
1868 | display->flush (); |
1849 | rxvt_usleep (VISUAL_BELL_DURATION); |
1869 | rxvt_usleep (VISUAL_BELL_DURATION); |
1850 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1870 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1851 | } |
1871 | } |
1852 | else |
1872 | else |
1853 | XBell (display->display, 0); |
1873 | XBell (display->display, 0); |
… | |
… | |
1942 | |
1962 | |
1943 | #if XPM_BACKGROUND |
1963 | #if XPM_BACKGROUND |
1944 | must_clear |= bgPixmap.pixmap != None; |
1964 | must_clear |= bgPixmap.pixmap != None; |
1945 | #endif |
1965 | #endif |
1946 | #if TRANSPARENT |
1966 | #if TRANSPARENT |
1947 | must_clear |= (options & Opt_transparent) && am_transparent; |
1967 | must_clear |= OPTION (Opt_transparent) && am_transparent; |
1948 | #endif |
1968 | #endif |
1949 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
1969 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
1950 | |
1970 | |
1951 | /* |
1971 | /* |
1952 | * B: reverse any characters which are selected |
1972 | * B: reverse any characters which are selected |
… | |
… | |
1976 | |
1996 | |
1977 | crp = &ROW(screen.cur.row).r[col]; |
1997 | crp = &ROW(screen.cur.row).r[col]; |
1978 | |
1998 | |
1979 | if (showcursor && focus) |
1999 | if (showcursor && focus) |
1980 | { |
2000 | { |
1981 | if (options & Opt_cursorUnderline) |
2001 | if (OPTION (Opt_cursorUnderline)) |
1982 | *crp ^= RS_Uline; |
2002 | *crp ^= RS_Uline; |
1983 | else |
2003 | else |
1984 | { |
2004 | { |
1985 | *crp ^= RS_RVid; |
2005 | *crp ^= RS_RVid; |
1986 | |
2006 | |
… | |
… | |
1988 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
2008 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
1989 | if (ISSET_PIXCOLOR (Color_cursor)) |
2009 | if (ISSET_PIXCOLOR (Color_cursor)) |
1990 | ccol1 = Color_cursor; |
2010 | ccol1 = Color_cursor; |
1991 | else |
2011 | else |
1992 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2012 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
1993 | ccol1 = GET_FGCOLOR (rstyle); |
2013 | ccol1 = fgcolor_of (rstyle); |
1994 | #else |
2014 | #else |
1995 | ccol1 = Color_fg; |
2015 | ccol1 = Color_fg; |
1996 | #endif |
2016 | #endif |
1997 | if (ISSET_PIXCOLOR (Color_cursor2)) |
2017 | if (ISSET_PIXCOLOR (Color_cursor2)) |
1998 | ccol2 = Color_cursor2; |
2018 | ccol2 = Color_cursor2; |
1999 | else |
2019 | else |
2000 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2020 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2001 | ccol2 = GET_BGCOLOR (rstyle); |
2021 | ccol2 = bgcolor_of (rstyle); |
2002 | #else |
2022 | #else |
2003 | ccol2 = Color_bg; |
2023 | ccol2 = Color_bg; |
2004 | #endif |
2024 | #endif |
2005 | *crp = SET_FGCOLOR (*crp, ccol1); |
2025 | *crp = SET_FGCOLOR (*crp, ccol1); |
2006 | *crp = SET_BGCOLOR (*crp, ccol2); |
2026 | *crp = SET_BGCOLOR (*crp, ccol2); |
… | |
… | |
2039 | oldcursor.col = screen.cur.col; |
2059 | oldcursor.col = screen.cur.col; |
2040 | } |
2060 | } |
2041 | } |
2061 | } |
2042 | } |
2062 | } |
2043 | |
2063 | |
|
|
2064 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
2044 | #if ENABLE_OVERLAY |
2065 | #if ENABLE_OVERLAY |
2045 | scr_swap_overlay (); |
2066 | scr_swap_overlay (); |
2046 | #endif |
2067 | #endif |
2047 | |
2068 | |
2048 | #ifndef NO_SLOW_LINK_SUPPORT |
2069 | #ifndef NO_SLOW_LINK_SUPPORT |
… | |
… | |
2098 | if (wlen < len) |
2119 | if (wlen < len) |
2099 | ::swap (wlen, len); |
2120 | ::swap (wlen, len); |
2100 | |
2121 | |
2101 | XCopyArea (display->display, vt, vt, |
2122 | XCopyArea (display->display, vt, vt, |
2102 | gc, 0, Row2Pixel (len + i), |
2123 | gc, 0, Row2Pixel (len + i), |
2103 | (unsigned int)TermWin_TotalWidth (), |
2124 | (unsigned int)this->width, |
2104 | (unsigned int)Height2Pixel (wlen - len + 1), |
2125 | (unsigned int)Height2Pixel (wlen - len + 1), |
2105 | 0, Row2Pixel (len)); |
2126 | 0, Row2Pixel (len)); |
2106 | len = -1; |
2127 | len = -1; |
2107 | } |
2128 | } |
2108 | } |
2129 | } |
… | |
… | |
2187 | count++, i--; |
2208 | count++, i--; |
2188 | |
2209 | |
2189 | /* |
2210 | /* |
2190 | * Determine the attributes for the string |
2211 | * Determine the attributes for the string |
2191 | */ |
2212 | */ |
2192 | int fore = GET_FGCOLOR (rend); // desired foreground |
2213 | int fore = fgcolor_of (rend); // desired foreground |
2193 | int back = GET_BGCOLOR (rend); // desired background |
2214 | int back = bgcolor_of (rend); // desired background |
2194 | |
2215 | |
2195 | // only do special processing if any attributes are set, which is unlikely |
2216 | // only do special processing if any attributes are set, which is unlikely |
2196 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2217 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2197 | { |
2218 | { |
2198 | #if ENABLE_STYLES |
2219 | #if ENABLE_STYLES |
… | |
… | |
2311 | } /* for (row....) */ |
2332 | } /* for (row....) */ |
2312 | |
2333 | |
2313 | #if ENABLE_OVERLAY |
2334 | #if ENABLE_OVERLAY |
2314 | scr_swap_overlay (); |
2335 | scr_swap_overlay (); |
2315 | #endif |
2336 | #endif |
|
|
2337 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
2316 | |
2338 | |
2317 | /* |
2339 | /* |
2318 | * G: cleanup cursor and display outline cursor if necessary |
2340 | * G: cleanup cursor and display outline cursor if necessary |
2319 | */ |
2341 | */ |
2320 | if (showcursor) |
2342 | if (showcursor) |
2321 | { |
2343 | { |
2322 | if (focus) |
2344 | if (focus) |
2323 | { |
2345 | { |
2324 | if (options & Opt_cursorUnderline) |
2346 | if (OPTION (Opt_cursorUnderline)) |
2325 | *crp ^= RS_Uline; |
2347 | *crp ^= RS_Uline; |
2326 | else |
2348 | else |
2327 | { |
2349 | { |
2328 | *crp ^= RS_RVid; |
2350 | *crp ^= RS_RVid; |
2329 | #ifndef NO_CURSORCOLOR |
2351 | #ifndef NO_CURSORCOLOR |
… | |
… | |
2359 | /* |
2381 | /* |
2360 | * H: cleanup selection |
2382 | * H: cleanup selection |
2361 | */ |
2383 | */ |
2362 | scr_reverse_selection (); |
2384 | scr_reverse_selection (); |
2363 | |
2385 | |
2364 | if (refresh_type & SMOOTH_REFRESH) |
|
|
2365 | XFlush (display->display); |
|
|
2366 | |
|
|
2367 | num_scr = 0; |
2386 | num_scr = 0; |
2368 | num_scr_allow = 1; |
2387 | num_scr_allow = 1; |
2369 | } |
2388 | } |
2370 | |
2389 | |
2371 | void |
2390 | void |
2372 | rxvt_term::scr_remap_chars (const line_t &l) |
2391 | rxvt_term::scr_remap_chars (line_t &l) |
2373 | { |
2392 | { |
2374 | if (!l.t) |
2393 | if (!l.t) |
2375 | return; |
2394 | return; |
|
|
2395 | |
|
|
2396 | l.touch (); // maybe a bit of an overkill, but it's not performance-relevant |
2376 | |
2397 | |
2377 | for (int i = ncol; i--; ) |
2398 | for (int i = ncol; i--; ) |
2378 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2399 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2379 | } |
2400 | } |
2380 | |
2401 | |
… | |
… | |
2433 | |
2454 | |
2434 | if (really) |
2455 | if (really) |
2435 | XClearWindow (display->display, vt); |
2456 | XClearWindow (display->display, vt); |
2436 | } |
2457 | } |
2437 | |
2458 | |
|
|
2459 | void |
|
|
2460 | rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) |
|
|
2461 | { |
|
|
2462 | int view_end = -view_start + nrow; |
|
|
2463 | int row, col; |
|
|
2464 | |
|
|
2465 | for (row = max (beg_row, -view_start); row <= min (end_row, view_end); row++) |
|
|
2466 | { |
|
|
2467 | text_t *stp = ROW(row).t; |
|
|
2468 | rend_t *srp = ROW(row).r; |
|
|
2469 | |
|
|
2470 | for (col = beg_col; col < end_col; col++) |
|
|
2471 | srp[col] ^= rstyle1; |
|
|
2472 | |
|
|
2473 | while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col]))) |
|
|
2474 | srp[col] ^= rstyle2; |
|
|
2475 | |
|
|
2476 | if (++col < end_col) |
|
|
2477 | srp[col] ^= rstyle2; |
|
|
2478 | } |
|
|
2479 | } |
|
|
2480 | |
|
|
2481 | void |
|
|
2482 | rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) |
|
|
2483 | { |
|
|
2484 | int view_end = -view_start + nrow; |
|
|
2485 | int row, col; |
|
|
2486 | |
|
|
2487 | if (beg_row >= -view_start) |
|
|
2488 | { |
|
|
2489 | col = beg_col; |
|
|
2490 | row = beg_row; |
|
|
2491 | } |
|
|
2492 | else |
|
|
2493 | { |
|
|
2494 | col = 0; |
|
|
2495 | row = -view_start; |
|
|
2496 | } |
|
|
2497 | |
|
|
2498 | for (; row < min (end_row, view_end); row++, col = 0) |
|
|
2499 | for (rend_t *srp = ROW(row).r; col < ncol; col++) |
|
|
2500 | srp[col] ^= rstyle; |
|
|
2501 | |
|
|
2502 | if (row == end_row) |
|
|
2503 | for (rend_t *srp = ROW(row).r; col < end_col; col++) |
|
|
2504 | srp[col] ^= rstyle; |
|
|
2505 | } |
|
|
2506 | |
2438 | /* ------------------------------------------------------------------------- */ |
2507 | /* ------------------------------------------------------------------------- */ |
2439 | void |
2508 | void |
2440 | rxvt_term::scr_reverse_selection () |
2509 | rxvt_term::scr_reverse_selection () |
2441 | { |
2510 | { |
2442 | if (selection.op |
2511 | if (selection.op |
2443 | && current_screen == selection.screen |
2512 | && current_screen == selection.screen |
2444 | && selection.end.row >= -view_start) |
2513 | && selection.end.row >= -view_start) |
2445 | { |
2514 | { |
2446 | int view_end = -view_start + nrow; |
|
|
2447 | int row, col; |
|
|
2448 | |
|
|
2449 | #if ENABLE_FRILLS |
2515 | #if ENABLE_FRILLS |
2450 | if (selection.rect) |
2516 | if (selection.rect) |
2451 | { |
2517 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2452 | for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) |
2518 | selection.end.row, selection.end.col, |
2453 | { |
2519 | RS_RVid, RS_RVid | RS_Uline); |
2454 | text_t *stp = ROW(row).t; |
|
|
2455 | rend_t *srp = ROW(row).r; |
|
|
2456 | |
|
|
2457 | for (col = selection.beg.col; col < selection.end.col; col++) |
|
|
2458 | srp[col] ^= RS_RVid; |
|
|
2459 | |
|
|
2460 | while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col]))) |
|
|
2461 | srp[col] ^= RS_RVid | RS_Uline; |
|
|
2462 | } |
|
|
2463 | } |
|
|
2464 | else |
2520 | else |
2465 | #endif |
2521 | #endif |
2466 | { |
2522 | scr_xor_span (selection.beg.row, selection.beg.col, |
2467 | if (selection.beg.row >= -view_start) |
2523 | selection.end.row, selection.end.col, |
2468 | { |
2524 | RS_RVid); |
2469 | col = selection.beg.col; |
|
|
2470 | row = selection.beg.row; |
|
|
2471 | } |
|
|
2472 | else |
|
|
2473 | { |
|
|
2474 | col = 0; |
|
|
2475 | row = -view_start; |
|
|
2476 | } |
|
|
2477 | |
|
|
2478 | for (; row < min (selection.end.row, view_end); row++, col = 0) |
|
|
2479 | for (rend_t *srp = ROW(row).r; col < ncol; col++) |
|
|
2480 | srp[col] ^= RS_RVid; |
|
|
2481 | |
|
|
2482 | if (row == selection.end.row) |
|
|
2483 | for (rend_t *srp = ROW(row).r; col < selection.end.col; col++) |
|
|
2484 | srp[col] ^= RS_RVid; |
|
|
2485 | } |
|
|
2486 | } |
2525 | } |
2487 | } |
2526 | } |
2488 | |
2527 | |
2489 | /* ------------------------------------------------------------------------- */ |
2528 | /* ------------------------------------------------------------------------- */ |
2490 | /* |
2529 | /* |
… | |
… | |
2551 | /* ------------------------------------------------------------------------- */ |
2590 | /* ------------------------------------------------------------------------- */ |
2552 | /* |
2591 | /* |
2553 | * Paste a selection direct to the command fd |
2592 | * Paste a selection direct to the command fd |
2554 | */ |
2593 | */ |
2555 | void |
2594 | void |
2556 | rxvt_term::paste (unsigned char *data, unsigned int len) |
2595 | rxvt_term::paste (char *data, unsigned int len) |
2557 | { |
2596 | { |
2558 | /* convert normal newline chars into common keyboard Return key sequence */ |
2597 | /* convert normal newline chars into common keyboard Return key sequence */ |
2559 | for (unsigned int i = 0; i < len; i++) |
2598 | for (unsigned int i = 0; i < len; i++) |
2560 | if (data[i] == C0_LF) |
2599 | if (data[i] == C0_LF) |
2561 | data[i] = C0_CR; |
2600 | data[i] = C0_CR; |
… | |
… | |
2705 | { |
2744 | { |
2706 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
2745 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
2707 | char *s = rxvt_wcstombs (w); |
2746 | char *s = rxvt_wcstombs (w); |
2708 | free (w); |
2747 | free (w); |
2709 | // TODO: strlen == only the first element will be converted. well... |
2748 | // TODO: strlen == only the first element will be converted. well... |
2710 | paste ((unsigned char *)s, strlen (s)); |
2749 | paste (s, strlen (s)); |
2711 | free (s); |
2750 | free (s); |
2712 | } |
2751 | } |
2713 | else |
2752 | else |
2714 | #endif |
2753 | #endif |
2715 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 |
2754 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 |
2716 | && cl) |
2755 | && cl) |
2717 | { |
2756 | { |
2718 | for (int i = 0; i < cr; i++) |
2757 | for (int i = 0; i < cr; i++) |
2719 | paste ((unsigned char *)cl[i], strlen (cl[i])); |
2758 | paste (cl[i], strlen (cl[i])); |
2720 | |
2759 | |
2721 | XFreeStringList (cl); |
2760 | XFreeStringList (cl); |
2722 | } |
2761 | } |
2723 | else |
2762 | else |
2724 | paste (ct.value, ct.nitems); // paste raw |
2763 | paste ((char *)ct.value, ct.nitems); // paste raw |
2725 | |
2764 | |
2726 | bailout: |
2765 | bailout: |
2727 | XFree (ct.value); |
2766 | XFree (ct.value); |
2728 | |
2767 | |
2729 | if (selection_wait == Sel_normal) |
2768 | if (selection_wait == Sel_normal) |
… | |
… | |
2767 | return; /* outside window */ |
2806 | return; /* outside window */ |
2768 | |
2807 | |
2769 | if (selection.text) |
2808 | if (selection.text) |
2770 | { /* internal selection */ |
2809 | { /* internal selection */ |
2771 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2810 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2772 | paste ((unsigned char *)str, strlen (str)); |
2811 | paste (str, strlen (str)); |
2773 | free (str); |
2812 | free (str); |
2774 | return; |
2813 | return; |
2775 | } |
2814 | } |
2776 | else |
2815 | else |
2777 | { |
2816 | { |
… | |
… | |
2869 | selection.op = SELECTION_DONE; |
2908 | selection.op = SELECTION_DONE; |
2870 | |
2909 | |
2871 | if (selection.clicks == 4) |
2910 | if (selection.clicks == 4) |
2872 | return; /* nothing selected, go away */ |
2911 | return; /* nothing selected, go away */ |
2873 | |
2912 | |
|
|
2913 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
|
|
2914 | return; |
|
|
2915 | |
2874 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2916 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2875 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2917 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2876 | |
2918 | |
2877 | int ofs = 0; |
2919 | int ofs = 0; |
2878 | int extra = 0; |
2920 | int extra = 0; |
… | |
… | |
2890 | col = selection.beg.col; |
2932 | col = selection.beg.col; |
2891 | end_col = ncol + 1; |
2933 | end_col = ncol + 1; |
2892 | } |
2934 | } |
2893 | else |
2935 | else |
2894 | #endif |
2936 | #endif |
2895 | end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN |
2937 | end_col = ROW(row).l; |
2896 | |
2938 | |
2897 | col = max (col, 0); |
2939 | col = max (col, 0); |
2898 | |
2940 | |
2899 | if (row == selection.end.row |
2941 | if (row == selection.end.row |
2900 | #if ENABLE_FRILLS |
2942 | #if ENABLE_FRILLS |
… | |
… | |
2902 | #endif |
2944 | #endif |
2903 | ) |
2945 | ) |
2904 | min_it (end_col, selection.end.col); |
2946 | min_it (end_col, selection.end.col); |
2905 | |
2947 | |
2906 | t = ROW(row).t + col; |
2948 | t = ROW(row).t + col; |
|
|
2949 | |
2907 | for (; col < end_col; col++) |
2950 | for (; col < end_col; col++) |
2908 | { |
2951 | { |
2909 | if (*t == NOCHAR) |
2952 | if (*t == NOCHAR) |
2910 | t++; |
2953 | t++; |
2911 | #if ENABLE_COMBINING |
2954 | #if ENABLE_COMBINING |
… | |
… | |
2960 | |
3003 | |
2961 | // we usually allocate much more than necessary, so realloc it smaller again |
3004 | // we usually allocate much more than necessary, so realloc it smaller again |
2962 | selection.len = ofs; |
3005 | selection.len = ofs; |
2963 | selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); |
3006 | selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); |
2964 | |
3007 | |
|
|
3008 | if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END))) |
|
|
3009 | return; |
|
|
3010 | |
|
|
3011 | selection_grab (tm); |
|
|
3012 | } |
|
|
3013 | |
|
|
3014 | bool |
|
|
3015 | rxvt_term::selection_grab (Time tm) |
|
|
3016 | { |
|
|
3017 | selection_time = tm; |
|
|
3018 | |
2965 | XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); |
3019 | XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); |
2966 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) |
3020 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) |
|
|
3021 | { |
2967 | display->set_selection_owner (this); |
3022 | display->set_selection_owner (this); |
|
|
3023 | return true; |
|
|
3024 | } |
2968 | else |
3025 | else |
2969 | rxvt_warn ("can't get primary selection, ignoring.\n"); |
3026 | return false; |
2970 | |
3027 | |
2971 | #if 0 |
3028 | #if 0 |
2972 | XTextProperty ct; |
3029 | XTextProperty ct; |
2973 | |
3030 | |
2974 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
3031 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
2975 | { |
3032 | { |
2976 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3033 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
2977 | XFree (ct.value); |
3034 | XFree (ct.value); |
2978 | } |
3035 | } |
2979 | #endif |
3036 | #endif |
2980 | |
|
|
2981 | selection_time = tm; |
|
|
2982 | } |
3037 | } |
2983 | |
3038 | |
2984 | /* ------------------------------------------------------------------------- */ |
3039 | /* ------------------------------------------------------------------------- */ |
2985 | /* |
3040 | /* |
2986 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
3041 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
… | |
… | |
3108 | } |
3163 | } |
3109 | } |
3164 | } |
3110 | break; |
3165 | break; |
3111 | } |
3166 | } |
3112 | |
3167 | |
3113 | Old_Word_Selection_You_Die: |
|
|
3114 | if (dirn == DN) |
3168 | if (dirn == DN) |
3115 | col++; /* put us on one past the end */ |
3169 | col++; /* put us on one past the end */ |
3116 | |
3170 | |
3117 | /* Poke the values back in */ |
3171 | /* Poke the values back in */ |
3118 | ret->row = row; |
3172 | ret->row = row; |
… | |
… | |
3295 | else if (selection.clicks == 2) |
3349 | else if (selection.clicks == 2) |
3296 | { |
3350 | { |
3297 | if (ROWCOL_IS_AFTER (selection.end, selection.beg)) |
3351 | if (ROWCOL_IS_AFTER (selection.end, selection.beg)) |
3298 | selection.end.col--; |
3352 | selection.end.col--; |
3299 | |
3353 | |
|
|
3354 | if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END))) |
|
|
3355 | { |
3300 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3356 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3301 | selection_delimit_word (DN, &selection.end, &selection.end); |
3357 | selection_delimit_word (DN, &selection.end, &selection.end); |
|
|
3358 | } |
3302 | } |
3359 | } |
3303 | else if (selection.clicks == 3) |
3360 | else if (selection.clicks == 3) |
3304 | { |
3361 | { |
3305 | #if ENABLE_FRILLS |
3362 | #if ENABLE_FRILLS |
3306 | if (options & Opt_tripleclickwords) |
3363 | if (OPTION (Opt_tripleclickwords)) |
3307 | { |
3364 | { |
3308 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3365 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3309 | |
3366 | |
3310 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3367 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3311 | { |
3368 | { |
… | |
… | |
3582 | |
3639 | |
3583 | #if ENABLE_OVERLAY |
3640 | #if ENABLE_OVERLAY |
3584 | void |
3641 | void |
3585 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) |
3642 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) |
3586 | { |
3643 | { |
3587 | if (nrow < 3 || ncol < 3) |
3644 | if (nrow < 1 || ncol < 1) |
3588 | return; |
3645 | return; |
3589 | |
3646 | |
3590 | want_refresh = 1; |
3647 | want_refresh = 1; |
3591 | |
3648 | |
3592 | scr_overlay_off (); |
3649 | scr_overlay_off (); |