ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.267 by root, Thu Nov 2 17:23:50 2006 UTC vs.
Revision 1.318 by root, Tue Nov 4 22:44:09 2008 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <X11/Xmd.h> /* get the typedef for CARD32 */
32
33#include <inttypes.h> 31#include <inttypes.h>
34 32
35#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a seperate compile!
36 34
37inline void fill_text (text_t *start, text_t value, int len) 35static inline void fill_text (text_t *start, text_t value, int len)
38{ 36{
39 while (len--) 37 while (len--)
40 *start++ = value; 38 *start++ = value;
41} 39}
42 40
… …
47 45
48/* ------------------------------------------------------------------------- * 46/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 48 * ------------------------------------------------------------------------- */
51#define ZERO_SCROLLBACK() \ 49#define ZERO_SCROLLBACK() \
52 if (OPTION (Opt_scrollTtyOutput)) \ 50 if (option (Opt_scrollTtyOutput)) \
53 view_start = 0 51 view_start = 0
54#define CLEAR_SELECTION() \ 52#define CLEAR_SELECTION() \
55 selection.beg.row = selection.beg.col \ 53 selection.beg.row = selection.beg.col \
56 = selection.end.row = selection.end.col = 0 54 = selection.end.row = selection.end.col = 0
57#define CLEAR_ALL_SELECTION() \ 55#define CLEAR_ALL_SELECTION() \
… …
85 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 83 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
86#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 84#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
87 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 85 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
88 86
89/* 87/*
90 * CLEAR_ROWS : clear <num> rows starting from row <row>
91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 88 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
93 */ 89 */
94#define drawBuffer vt
95
96#define CLEAR_ROWS(row, num) \
97 if (mapped) \
98 XClearArea (dpy, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False)
101
102#define CLEAR_CHARS(x, y, num) \ 90#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 91 if (mapped) \
104 XClearArea (dpy, drawBuffer, x, y, \ 92 XClearArea (dpy, vt, x, y, \
105 (unsigned int)Width2Pixel (num), \ 93 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 94 (unsigned int)Height2Pixel (1), False)
107
108#define ERASE_ROWS(row, num) \
109 XFillRectangle (dpy, drawBuffer, gc, \
110 0, Row2Pixel (row), \
111 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num))
113 95
114/* ------------------------------------------------------------------------- * 96/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 97 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 98 * ------------------------------------------------------------------------- */
117 99
… …
150 132
151 l.l = 0; 133 l.l = 0;
152 l.f = 0; 134 l.f = 0;
153} 135}
154 136
137// nuke a single wide character at the given column
138void
139rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
140{
141 // find begin
142 while (col > 0 && l.t[col] == NOCHAR)
143 col--;
144
145 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147
148 // found start, nuke
149 do {
150 l.t[col] = ' ';
151 l.r[col] = rend;
152 col++;
153 } while (col < ncol && l.t[col] == NOCHAR);
154}
155
155/* ------------------------------------------------------------------------- * 156/* ------------------------------------------------------------------------- *
156 * SCREEN INITIALISATION * 157 * SCREEN INITIALISATION *
157 * ------------------------------------------------------------------------- */ 158 * ------------------------------------------------------------------------- */
158 159
159void 160void
160rxvt_term::scr_reset () 161rxvt_term::scr_reset ()
161{ 162{
162#if ENABLE_OVERLAY
163 scr_overlay_off ();
164#endif
165
166 view_start = 0; 163 view_start = 0;
167 num_scr = 0; 164 num_scr = 0;
168 165
169 if (ncol == 0) 166 if (ncol == 0)
170 ncol = 80; 167 ncol = 80;
… …
172 if (nrow == 0) 169 if (nrow == 0)
173 nrow = 24; 170 nrow = 24;
174 171
175 if (ncol == prev_ncol && nrow == prev_nrow) 172 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 173 return;
177
178 if (current_screen != PRIMARY)
179 scr_swap_screen ();
180 174
181 // we need at least two lines for wrapping to work correctly 175 // we need at least two lines for wrapping to work correctly
182 while (nrow + saveLines < 2) 176 while (nrow + saveLines < 2)
183 { 177 {
184 //TODO//FIXME 178 //TODO//FIXME
… …
237 selection.text = NULL; 231 selection.text = NULL;
238 selection.len = 0; 232 selection.len = 0;
239 selection.op = SELECTION_CLEAR; 233 selection.op = SELECTION_CLEAR;
240 selection.screen = PRIMARY; 234 selection.screen = PRIMARY;
241 selection.clicks = 0; 235 selection.clicks = 0;
242 rvideo_state = rvideo_mode = false;
243 } 236 }
244 else 237 else
245 { 238 {
246 /* 239 /*
247 * add or delete rows as appropriate 240 * add or delete rows as appropriate
… …
276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 269 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
277 } 270 }
278 271
279 line_t *old_buf = row_buf; 272 line_t *old_buf = row_buf;
280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 273 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
281 274
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 275 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 276 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 277 int q = total_rows; // rewrapped row
285 278
286 if (top_row) 279 if (top_row)
… …
330 int qcol = 0; 323 int qcol = 0;
331 324
332 // see below for cursor adjustment rationale 325 // see below for cursor adjustment rationale
333 if (p == ocur.row) 326 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow); 327 screen.cur.row = q - (total_rows - nrow);
335 328
336 // fill a single destination line 329 // fill a single destination line
337 while (lofs < llen && qcol < ncol) 330 while (lofs < llen && qcol < ncol)
338 { 331 {
339 int prow = lofs / prev_ncol; 332 int prow = lofs / prev_ncol;
340 int pcol = lofs % prev_ncol; 333 int pcol = lofs % prev_ncol;
… …
366 } 359 }
367 while (p != pend && q > 0); 360 while (p != pend && q > 0);
368 361
369 term_start = total_rows - nrow; 362 term_start = total_rows - nrow;
370 top_row = q - term_start; 363 top_row = q - term_start;
371 364
372 // make sure all terminal lines exist 365 // make sure all terminal lines exist
373 while (top_row > 0) 366 while (top_row > 0)
374 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 367 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
375 } 368 }
376 else 369 else
377 { 370 {
378 // if no scrollback exists (yet), wing, instead of wrap 371 // if no scrollback exists (yet), wing, instead of wrap
379 372
380 for (int row = min (nrow, prev_nrow); row--; ) 373 for (int row = min (nrow, prev_nrow); row--; )
381 { 374 {
382 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 375 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
383 line_t &qline = row_buf [row]; 376 line_t &qline = row_buf [row];
384 377
… …
398 delete old_ta; 391 delete old_ta;
399 delete old_ra; 392 delete old_ra;
400 393
401 clamp_it (screen.cur.row, 0, nrow - 1); 394 clamp_it (screen.cur.row, 0, nrow - 1);
402 clamp_it (screen.cur.col, 0, ncol - 1); 395 clamp_it (screen.cur.col, 0, ncol - 1);
403
404 free (tabs);
405 } 396 }
406 397
407 CLEAR_ALL_SELECTION (); 398 CLEAR_ALL_SELECTION ();
408 399
409 prev_nrow = nrow; 400 prev_nrow = nrow;
410 prev_ncol = ncol; 401 prev_ncol = ncol;
411
412 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
413
414 for (int col = ncol; --col; )
415 tabs [col] = col % TABSIZE == 0;
416
417 if (current_screen != PRIMARY)
418 scr_swap_screen ();
419 402
420 tt_winch (); 403 tt_winch ();
421 404
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 405 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
423} 406}
… …
435 delete ralloc; ralloc = 0; 418 delete ralloc; ralloc = 0;
436 419
437 free (row_buf); 420 free (row_buf);
438 free (swap_buf); 421 free (swap_buf);
439 free (drawn_buf); 422 free (drawn_buf);
423 row_buf = 0; // signal that we freed all the arrays above
424
440 free (tabs); 425 free (tabs);
441 426 tabs = 0;
442 row_buf = 0; // signal that we freed all the arrays
443 } 427 }
444} 428}
445 429
446/* ------------------------------------------------------------------------- */ 430/* ------------------------------------------------------------------------- */
447/* 431/*
448 * Hard reset 432 * Hard/Soft reset
449 */ 433 */
450void 434void
451rxvt_term::scr_poweron () 435rxvt_term::scr_poweron ()
452{ 436{
453 scr_release (); 437 scr_release ();
454 prev_nrow = prev_ncol = 0; 438 prev_nrow = prev_ncol = 0;
439 scr_soft_reset ();
455 scr_reset (); 440 scr_reset ();
456 441
457 scr_clear (true); 442 scr_clear (true);
458 scr_refresh (); 443 scr_refresh ();
444}
445
446void
447rxvt_term::scr_soft_reset ()
448{
449 /* only affects modes, nothing drastic such as clearing the screen */
450#if ENABLE_OVERLAY
451 scr_overlay_off ();
452#endif
453
454 rvideo_mode = false;
455
456 if (current_screen != PRIMARY)
457 scr_swap_screen ();
458
459 free (tabs);
460 tabs = (char *)rxvt_malloc (ncol);
461
462 for (int col = ncol; --col; )
463 tabs [col] = col % TABSIZE == 0;
464
465 if (current_screen != PRIMARY)
466 scr_swap_screen ();
467
468 scr_scroll_region (0, MAX_ROWS - 1);
469 scr_rendition (0, ~RS_None);
470 scr_insert_mode (0);
459} 471}
460 472
461/* ------------------------------------------------------------------------- * 473/* ------------------------------------------------------------------------- *
462 * PROCESS SCREEN COMMANDS * 474 * PROCESS SCREEN COMMANDS *
463 * ------------------------------------------------------------------------- */ 475 * ------------------------------------------------------------------------- */
… …
510} 522}
511 523
512void 524void
513rxvt_term::scr_swap_screen () 525rxvt_term::scr_swap_screen ()
514{ 526{
515 if (!OPTION (Opt_secondaryScreen)) 527 if (!option (Opt_secondaryScreen))
516 return; 528 return;
517 529
518 for (int i = prev_nrow; i--; ) 530 for (int i = prev_nrow; i--; )
519 ::swap (ROW(i), swap_buf [i]); 531 ::swap (ROW(i), swap_buf [i]);
520 532
… …
542 selection_check (2); /* check for boundary cross */ 554 selection_check (2); /* check for boundary cross */
543 555
544 int i = current_screen; current_screen = scrn; scrn = i; 556 int i = current_screen; current_screen = scrn; scrn = i;
545 557
546#if NSCREENS 558#if NSCREENS
547 if (OPTION (Opt_secondaryScreen)) 559 if (option (Opt_secondaryScreen))
548 { 560 {
549 num_scr = 0; 561 num_scr = 0;
550 562
551 scr_swap_screen (); 563 scr_swap_screen ();
552 564
… …
555 screen.flags |= Screen_VisibleCursor; 567 screen.flags |= Screen_VisibleCursor;
556 swap.flags |= Screen_VisibleCursor; 568 swap.flags |= Screen_VisibleCursor;
557 } 569 }
558 else 570 else
559#endif 571#endif
560 if (OPTION (Opt_secondaryScroll)) 572 if (option (Opt_secondaryScroll))
561 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 573 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
562} 574}
563 575
564// clear WrapNext indicator, solidifying position on next line 576// clear WrapNext indicator, solidifying position on next line
565void 577void
… …
598/* 610/*
599 * Change the rendition style for following text 611 * Change the rendition style for following text
600 */ 612 */
601void 613void
602rxvt_term::scr_rendition (int set, int style) NOTHROW 614rxvt_term::scr_rendition (int set, int style) NOTHROW
603 { 615{
604 if (set) 616 if (set)
605 rstyle |= style; 617 rstyle |= style;
606 else if (style == ~RS_None) 618 else if (style == ~RS_None)
607 rstyle = DEFAULT_RSTYLE; 619 rstyle = DEFAULT_RSTYLE;
608 else 620 else
609 rstyle &= ~style; 621 rstyle &= ~style;
610 } 622}
611 623
612/* ------------------------------------------------------------------------- */ 624/* ------------------------------------------------------------------------- */
613/* 625/*
614 * Scroll text between <row1> and <row2> inclusive, by <count> lines 626 * Scroll text between <row1> and <row2> inclusive, by <count> lines
615 * count positive ==> scroll up 627 * count positive ==> scroll up
… …
624 want_refresh = 1; 636 want_refresh = 1;
625 num_scr += count; 637 num_scr += count;
626 638
627 if (count > 0 639 if (count > 0
628 && row1 == 0 640 && row1 == 0
629 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 641 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
630 { 642 {
631 top_row = max (top_row - count, -saveLines); 643 top_row = max (top_row - count, -saveLines);
632 644
633 // scroll everything up 'count' lines 645 // scroll everything up 'count' lines
634 term_start = (term_start + count) % total_rows; 646 term_start = (term_start + count) % total_rows;
… …
666 line_t &l2 = ROW(i); 678 line_t &l2 = ROW(i);
667 679
668 ::swap (l1, l2); 680 ::swap (l1, l2);
669 l2.touch (); 681 l2.touch ();
670 } 682 }
671 683
672 // move and/or clear selection, if any 684 // move and/or clear selection, if any
673 if (selection.op && current_screen == selection.screen) 685 if (selection.op && current_screen == selection.screen)
674 { 686 {
675 selection.beg.row -= count; 687 selection.beg.row -= count;
676 selection.end.row -= count; 688 selection.end.row -= count;
… …
684 selection.op = SELECTION_CLEAR; 696 selection.op = SELECTION_CLEAR;
685 } 697 }
686 } 698 }
687 699
688 // finally move the view window, if desired 700 // finally move the view window, if desired
689 if (OPTION (Opt_scrollWithBuffer) 701 if (option (Opt_scrollWithBuffer)
690 && view_start != 0 702 && view_start != 0
691 && view_start != -saveLines) 703 && view_start != -saveLines)
692 scr_page (UP, count); 704 scr_page (UP, count);
693 705
694 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 706 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
712 { 724 {
713 /* move selected region too */ 725 /* move selected region too */
714 selection.beg.row -= count; 726 selection.beg.row -= count;
715 selection.end.row -= count; 727 selection.end.row -= count;
716 selection.mark.row -= count; 728 selection.mark.row -= count;
717 729
718 selection_check (0); 730 selection_check (0);
719 } 731 }
720 } 732 }
721 733
722 // use a simple and robust scrolling algorithm, this 734 // use a simple and robust scrolling algorithm, this
… …
789 801
790 while (str < strend) 802 while (str < strend)
791 { 803 {
792 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 804 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
793 805
794 if (c < 0x20) 806 if (expect_false (c < 0x20))
795 if (c == C0_LF) 807 if (c == C0_LF)
796 { 808 {
797 max_it (line->l, screen.cur.col); 809 max_it (line->l, screen.cur.col);
798 810
799 screen.flags &= ~Screen_WrapNext; 811 screen.flags &= ~Screen_WrapNext;
… …
818 { 830 {
819 scr_tab (1, true); 831 scr_tab (1, true);
820 continue; 832 continue;
821 } 833 }
822 834
835 if (expect_false (
823 if (checksel /* see if we're writing within selection */ 836 checksel /* see if we're writing within selection */
824 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 837 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
825 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 838 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
839 ))
826 { 840 {
827 checksel = 0; 841 checksel = 0;
828 /* 842 /*
829 * If we wrote anywhere in the selected area, kill the selection 843 * If we wrote anywhere in the selected area, kill the selection
830 * XXX: should we kill the mark too? Possibly, but maybe that 844 * XXX: should we kill the mark too? Possibly, but maybe that
831 * should be a similar check. 845 * should be a similar check.
832 */ 846 */
833 CLEAR_SELECTION (); 847 CLEAR_SELECTION ();
834 } 848 }
835 849
836 if (screen.flags & Screen_WrapNext) 850 if (expect_false (screen.flags & Screen_WrapNext))
837 { 851 {
838 scr_do_wrap (); 852 scr_do_wrap ();
839 853
840 line->l = ncol; 854 line->l = ncol;
841 line->is_longer (1); 855 line->is_longer (1);
842 856
843 row = screen.cur.row; 857 row = screen.cur.row;
844 line = &ROW(row); /* _must_ refresh */ 858 line = &ROW(row); /* _must_ refresh */
845 } 859 }
846 860
847 // some utf-8 decoders "decode" surrogate characters: let's fix this. 861 // some utf-8 decoders "decode" surrogate characters: let's fix this.
848 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 862 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
849 c = 0xfffd; 863 c = 0xfffd;
850 864
851 // rely on wcwidth to tell us the character width, do wcwidth before 865 // rely on wcwidth to tell us the character width, do wcwidth before
852 // further replacements, as wcwidth might return -1 for the line 866 // further replacements, as wcwidth might return -1 for the line
853 // drawing characters below as they might be invalid in the current 867 // drawing characters below as they might be invalid in the current
854 // locale. 868 // locale.
855 int width = WCWIDTH (c); 869 int width = WCWIDTH (c);
856 870
857 if (charsets [screen.charset] == '0') // DEC SPECIAL 871 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
858 { 872 {
859 // vt100 special graphics and line drawing 873 // vt100 special graphics and line drawing
860 // 5f-7e standard vt100 874 // 5f-7e standard vt100
861 // 40-5e rxvt extension for extra curses acs chars 875 // 40-5e rxvt extension for extra curses acs chars
862 static uint16_t vt100_0[62] = { // 41 .. 7e 876 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
875 c = vt100_0[c - 0x41]; 889 c = vt100_0[c - 0x41];
876 width = 1; // vt100 line drawing characters are always single-width 890 width = 1; // vt100 line drawing characters are always single-width
877 } 891 }
878 } 892 }
879 893
880 if (screen.flags & Screen_Insert) 894 if (expect_false (screen.flags & Screen_Insert))
881 scr_insdel_chars (width, INSERT); 895 scr_insdel_chars (width, INSERT);
882 896
883 if (width != 0) 897 if (width != 0)
884 { 898 {
885#if !UNICODE_3 899#if !UNICODE_3
… …
891 c = 0xfffd; 905 c = 0xfffd;
892# endif 906# endif
893#endif 907#endif
894 908
895 // nuke the character at this position, if required 909 // nuke the character at this position, if required
910 if (expect_false (
896 if (line->t[screen.cur.col] == NOCHAR 911 line->t[screen.cur.col] == NOCHAR
897 || (screen.cur.col < ncol - 1 912 || (screen.cur.col < ncol - 1
898 && line->t[screen.cur.col + 1] == NOCHAR)) 913 && line->t[screen.cur.col + 1] == NOCHAR)
914 ))
915 scr_kill_char (*line, screen.cur.col);
916
917 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
918
919 // if the character doesn't fit into the remaining columns...
920 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
899 { 921 {
900 int col = screen.cur.col; 922 // ... artificially enlargen the previous one
901
902 // find begin
903 while (col > 0 && line->t[col] == NOCHAR)
904 col--;
905
906 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
907
908 // found begin, nuke
909 do {
910 line->t[col] = ' ';
911 line->r[col] = rend;
912 col++;
913 } while (col < ncol && line->t[col] == NOCHAR);
914 }
915
916 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
917
918 // if the character doesn't fit into the remaining columns...
919 if (screen.cur.col > ncol - width && ncol >= width)
920 {
921 // ...output spaces
922 c = ' '; 923 c = NOCHAR;
923 // and try the same character next loop iteration 924 // and try the same character next loop iteration
924 --str; 925 --str;
925 } 926 }
926 927
927 line->touch (); 928 line->touch ();
… …
929 do 930 do
930 { 931 {
931 line->t[screen.cur.col] = c; 932 line->t[screen.cur.col] = c;
932 line->r[screen.cur.col] = rend; 933 line->r[screen.cur.col] = rend;
933 934
934 if (screen.cur.col < ncol - 1) 935 if (expect_true (screen.cur.col < ncol - 1))
935 screen.cur.col++; 936 screen.cur.col++;
936 else 937 else
937 { 938 {
938 line->l = ncol; 939 line->l = ncol;
939 if (screen.flags & Screen_Autowrap) 940 if (screen.flags & Screen_Autowrap)
… …
941 break; 942 break;
942 } 943 }
943 944
944 c = NOCHAR; 945 c = NOCHAR;
945 } 946 }
946 while (--width > 0); 947 while (expect_false (--width > 0));
947 948
948 // pad with spaces when overwriting wide character with smaller one 949 // pad with spaces when overwriting wide character with smaller one
949 if (!width) 950 if (expect_false (!width))
950 { 951 {
951 line->touch (); 952 line->touch ();
952 953
953 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 954 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
954 { 955 {
955 line->t[c] = ' '; 956 line->t[c] = ' ';
956 line->r[c] = rend; 957 line->r[c] = rend;
957 } 958 }
958 } 959 }
959 } 960 }
961#if ENABLE_COMBINING
960 else // width == 0 962 else // width == 0
961 { 963 {
962#if ENABLE_COMBINING 964 if (c != 0xfeff) // ignore BOM
963 // handle combining characters
964 // we just tag the accent on the previous on-screen character.
965 // this is arguably not correct, but also arguably not wrong.
966 // we don't handle double-width characters nicely yet.
967 line_t *linep;
968 text_t *tp;
969 rend_t *rp;
970
971 if (screen.cur.col > 0)
972 { 965 {
966 // handle combining characters
967 // we just tag the accent on the previous on-screen character.
968 // this is arguably not correct, but also arguably not wrong.
969 // we don't handle double-width characters nicely yet.
970 line_t *linep;
971 text_t *tp;
972 rend_t *rp;
973
974 if (screen.cur.col > 0)
975 {
973 linep = line; 976 linep = line;
974 tp = line->t + screen.cur.col - 1; 977 tp = line->t + screen.cur.col - 1;
975 rp = line->r + screen.cur.col - 1; 978 rp = line->r + screen.cur.col - 1;
979 }
980 else if (screen.cur.row > 0
981 && ROW(screen.cur.row - 1).is_longer ())
982 {
983 linep = &ROW(screen.cur.row - 1);
984 tp = line->t + ncol - 1;
985 rp = line->r + ncol - 1;
986 }
987 else
988 continue;
989
990 linep->touch ();
991
992 while (*tp == NOCHAR && tp > linep->t)
993 tp--, rp--;
994
995 // first try to find a precomposed character
996 unicode_t n = rxvt_compose (*tp, c);
997 if (n == NOCHAR)
998 n = rxvt_composite.compose (*tp, c);
999
1000 *tp = n;
1001 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
976 } 1002 }
977 else if (screen.cur.row > 0
978 && ROW(screen.cur.row - 1).is_longer ())
979 {
980 linep = &ROW(screen.cur.row - 1);
981 tp = line->t + ncol - 1;
982 rp = line->r + ncol - 1;
983 } 1003 }
984 else
985 continue;
986
987 linep->touch ();
988
989 while (*tp == NOCHAR && tp > linep->t)
990 tp--, rp--;
991
992 // first try to find a precomposed character
993 unicode_t n = rxvt_compose (*tp, c);
994 if (n == NOCHAR)
995 n = rxvt_composite.compose (*tp, c);
996
997 *tp = n;
998 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
999#endif 1004#endif
1000 }
1001 } 1005 }
1002 1006
1003 max_it (line->l, screen.cur.col); 1007 max_it (line->l, screen.cur.col);
1004 1008
1005#ifdef DEBUG_STRICT 1009#ifdef DEBUG_STRICT
… …
1013 * XTERM_SEQ: CTRL-H 1017 * XTERM_SEQ: CTRL-H
1014 */ 1018 */
1015void 1019void
1016rxvt_term::scr_backspace () NOTHROW 1020rxvt_term::scr_backspace () NOTHROW
1017{ 1021{
1018 want_refresh = 1;
1019
1020 if (screen.cur.col == 0) 1022 if (screen.cur.col == 0)
1021 { 1023 {
1022 if (screen.cur.row > 0) 1024 if (screen.cur.row > 0)
1023 { 1025 {
1024#ifdef TERMCAP_HAS_BW 1026#ifdef TERMCAP_HAS_BW
1025 screen.cur.col = ncol - 1; 1027 screen.cur.col = ncol - 1;
1026 screen.cur.row--; 1028 --screen.cur.row;
1027 return; 1029
1030 want_refresh = 1;
1028#endif 1031#endif
1029 } 1032 }
1030 } 1033 }
1031 else if (!(screen.flags & Screen_WrapNext)) 1034 else
1032 scr_gotorc (0, -1, RELATIVE); 1035 scr_gotorc (0, -1, RELATIVE);
1033
1034 screen.flags &= ~Screen_WrapNext;
1035} 1036}
1036 1037
1037/* ------------------------------------------------------------------------- */ 1038/* ------------------------------------------------------------------------- */
1038/* 1039/*
1039 * Process Horizontal Tab 1040 * Process Horizontal Tab
… …
1062 x = i; 1063 x = i;
1063 1064
1064 if (!--count) 1065 if (!--count)
1065 break; 1066 break;
1066 } 1067 }
1067 else 1068 else
1068 ht &= l.t[i] == ' ' 1069 ht &= l.t[i] == ' '
1069 && RS_SAME (l.r[i], base_rend); 1070 && RS_SAME (l.r[i], base_rend);
1070 1071
1071 if (count) 1072 if (count)
1072 x = ncol - 1; 1073 x = ncol - 1;
1073 1074
1074 // store horizontal tab commands as characters inside the text 1075 // store horizontal tab commands as characters inside the text
1075 // buffer so they can be selected and pasted. 1076 // buffer so they can be selected and pasted.
1076 if (ht && OPTION (Opt_pastableTabs)) 1077 if (ht && option (Opt_pastableTabs))
1077 { 1078 {
1078 base_rend = SET_FONT (base_rend, 0); 1079 base_rend = SET_FONT (base_rend, 0);
1079 1080
1080 l.touch (x); 1081 l.touch (x);
1081 1082
… …
1188 } 1189 }
1189 } 1190 }
1190 else 1191 else
1191 { 1192 {
1192 if (screen.flags & Screen_Relative) 1193 if (screen.flags & Screen_Relative)
1194 {
1193 { /* relative origin mode */ 1195 /* relative origin mode */
1194 screen.cur.row = row + screen.tscroll; 1196 screen.cur.row = row + screen.tscroll;
1195 min_it (screen.cur.row, screen.bscroll); 1197 min_it (screen.cur.row, screen.bscroll);
1196 } 1198 }
1197 else 1199 else
1198 screen.cur.row = row; 1200 screen.cur.row = row;
… …
1231/* 1233/*
1232 * Erase part or whole of a line 1234 * Erase part or whole of a line
1233 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1235 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1234 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1236 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1235 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1237 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1238 * extension: clear to right unless wrapped: ESC [ 3 K
1236 */ 1239 */
1237void 1240void
1238rxvt_term::scr_erase_line (int mode) NOTHROW 1241rxvt_term::scr_erase_line (int mode) NOTHROW
1239{ 1242{
1240 unsigned int col, num; 1243 unsigned int col, num;
… …
1249 line.touch (); 1252 line.touch ();
1250 line.is_longer (0); 1253 line.is_longer (0);
1251 1254
1252 switch (mode) 1255 switch (mode)
1253 { 1256 {
1257 case 3:
1258 if (screen.flags & Screen_WrapNext)
1259 return;
1260
1261 /* fall through */
1262
1254 case 0: /* erase to end of line */ 1263 case 0: /* erase to end of line */
1255 col = screen.cur.col; 1264 col = screen.cur.col;
1256 num = ncol - col; 1265 num = ncol - col;
1257 min_it (line.l, col); 1266 min_it (line.l, col);
1267
1258 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1268 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1259 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1269 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1260 CLEAR_SELECTION (); 1270 CLEAR_SELECTION ();
1261 break; 1271 break;
1272
1262 case 1: /* erase to beginning of line */ 1273 case 1: /* erase to beginning of line */
1263 col = 0; 1274 col = 0;
1264 num = screen.cur.col + 1; 1275 num = screen.cur.col + 1;
1276
1265 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1277 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1266 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1278 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1267 CLEAR_SELECTION (); 1279 CLEAR_SELECTION ();
1268 break; 1280 break;
1281
1269 case 2: /* erase whole line */ 1282 case 2: /* erase whole line */
1270 col = 0; 1283 col = 0;
1271 num = ncol; 1284 num = ncol;
1272 line.l = 0; 1285 line.l = 0;
1273 if (selection.beg.row <= screen.cur.row 1286 if (selection.beg.row <= screen.cur.row
… …
1331 if (row >= nrow) /* Out Of Bounds */ 1344 if (row >= nrow) /* Out Of Bounds */
1332 return; 1345 return;
1333 1346
1334 min_it (num, nrow - row); 1347 min_it (num, nrow - row);
1335 1348
1349 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1336 if (rstyle & (RS_RVid | RS_Uline)) 1350 if (rstyle & (RS_RVid | RS_Uline))
1337 ren = (rend_t) ~RS_None; 1351 ren = (rend_t) ~RS_None;
1338 else if (GET_BASEBG (rstyle) == Color_bg) 1352 else if (GET_BASEBG (rstyle) == Color_bg)
1339 { 1353 {
1340 ren = DEFAULT_RSTYLE; 1354 ren = DEFAULT_RSTYLE;
1341 CLEAR_ROWS (row, num); 1355
1356 if (mapped)
1357 XClearArea (dpy, vt, 0,
1358 Row2Pixel (row), (unsigned int)width,
1359 (unsigned int)Height2Pixel (num), False);
1342 } 1360 }
1343 else 1361 else
1344 { 1362 {
1345 ren = rstyle & (RS_fgMask | RS_bgMask); 1363 ren = rstyle & (RS_fgMask | RS_bgMask);
1364
1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1347 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1366 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1348 ERASE_ROWS (row, num); 1367 XFillRectangle (dpy, vt, gc,
1368 0, Row2Pixel (row),
1369 (unsigned int)width,
1370 (unsigned int)Height2Pixel (num));
1349 gcvalue.foreground = pix_colors[Color_fg]; 1371 gcvalue.foreground = pix_colors[Color_fg];
1350 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1372 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1351 } 1373 }
1352 1374
1353 for (; num--; row++) 1375 for (; num--; row++)
… …
1435 * Insert/Delete <count> characters from the current position 1457 * Insert/Delete <count> characters from the current position
1436 */ 1458 */
1437void 1459void
1438rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1460rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1439{ 1461{
1440 int col, row;
1441 rend_t tr;
1442
1443 want_refresh = 1; 1462 want_refresh = 1;
1444 ZERO_SCROLLBACK (); 1463 ZERO_SCROLLBACK ();
1445 1464
1446 if (count <= 0) 1465 if (count <= 0)
1447 return; 1466 return;
… …
1449 scr_do_wrap (); 1468 scr_do_wrap ();
1450 1469
1451 selection_check (1); 1470 selection_check (1);
1452 min_it (count, ncol - screen.cur.col); 1471 min_it (count, ncol - screen.cur.col);
1453 1472
1454 row = screen.cur.row; 1473 int row = screen.cur.row;
1455 1474
1456 line_t *line = &ROW(row); 1475 line_t *line = &ROW(row);
1457 1476
1458 line->touch (); 1477 line->touch ();
1459 line->is_longer (0); 1478 line->is_longer (0);
1460 1479
1480 // nuke wide spanning the start
1481 if (line->t[screen.cur.col] == NOCHAR)
1482 scr_kill_char (*line, screen.cur.col);
1483
1461 switch (insdel) 1484 switch (insdel)
1462 { 1485 {
1463 case INSERT: 1486 case INSERT:
1464 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1487 line->l = min (line->l + count, ncol);
1488
1489 if (line->t[screen.cur.col] == NOCHAR)
1490 scr_kill_char (*line, screen.cur.col);
1491
1492 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1465 { 1493 {
1466 line->t[col] = line->t[col - count]; 1494 line->t[col] = line->t[col - count];
1467 line->r[col] = line->r[col - count]; 1495 line->r[col] = line->r[col - count];
1468 } 1496 }
1469
1470 line->l = min (line->l + count, ncol);
1471 1497
1472 if (selection.op && current_screen == selection.screen 1498 if (selection.op && current_screen == selection.screen
1473 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1499 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1474 { 1500 {
1475 if (selection.end.row != screen.cur.row 1501 if (selection.end.row != screen.cur.row
1476 || (selection.end.col + count >= ncol)) 1502 || (selection.end.col + count >= ncol))
1477 CLEAR_SELECTION (); 1503 CLEAR_SELECTION ();
1478 else 1504 else
1505 {
1479 { /* shift selection */ 1506 /* shift selection */
1480 selection.beg.col += count; 1507 selection.beg.col += count;
1481 selection.mark.col += count; /* XXX: yes? */ 1508 selection.mark.col += count; /* XXX: yes? */
1482 selection.end.col += count; 1509 selection.end.col += count;
1483 } 1510 }
1484 } 1511 }
… …
1489 case ERASE: 1516 case ERASE:
1490 screen.cur.col += count; /* don't worry if > ncol */ 1517 screen.cur.col += count; /* don't worry if > ncol */
1491 selection_check (1); 1518 selection_check (1);
1492 screen.cur.col -= count; 1519 screen.cur.col -= count;
1493 1520
1494 line->l = max (line->l - count, 0); 1521 // nuke wide char after the end
1522 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1523 scr_kill_char (*line, screen.cur.col + count);
1524
1495 scr_blank_line (*line, screen.cur.col, count, rstyle); 1525 scr_blank_line (*line, screen.cur.col, count, rstyle);
1496 break; 1526 break;
1497 1527
1498 case DELETE: 1528 case DELETE:
1499 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1529 line->l = max (line->l - count, 0);
1500 1530
1531 // nuke wide char spanning the end
1532 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1533 scr_kill_char (*line, screen.cur.col + count);
1534
1501 for (col = screen.cur.col; (col + count) < ncol; col++) 1535 for (int col = screen.cur.col; (col + count) < ncol; col++)
1502 { 1536 {
1503 line->t[col] = line->t[col + count]; 1537 line->t[col] = line->t[col + count];
1504 line->r[col] = line->r[col + count]; 1538 line->r[col] = line->r[col + count];
1505 } 1539 }
1506 1540
1507 line->l = max (line->l - count, 0);
1508 scr_blank_line (*line, ncol - count, count, tr); 1541 scr_blank_line (*line, ncol - count, count,
1542 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1509 1543
1510 if (selection.op && current_screen == selection.screen 1544 if (selection.op && current_screen == selection.screen
1511 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1545 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1512 { 1546 {
1513 if (selection.end.row != screen.cur.row 1547 if (selection.end.row != screen.cur.row
… …
1623 */ 1657 */
1624void 1658void
1625rxvt_term::scr_set_tab (int mode) NOTHROW 1659rxvt_term::scr_set_tab (int mode) NOTHROW
1626{ 1660{
1627 if (mode < 0) 1661 if (mode < 0)
1628 memset (tabs, 0, ncol * sizeof (char)); 1662 memset (tabs, 0, ncol);
1629 else if (screen.cur.col < ncol) 1663 else if (screen.cur.col < ncol)
1630 tabs [screen.cur.col] = !!mode; 1664 tabs [screen.cur.col] = !!mode;
1631} 1665}
1632 1666
1633/* ------------------------------------------------------------------------- */ 1667/* ------------------------------------------------------------------------- */
… …
1648 if (rvideo_state != on) 1682 if (rvideo_state != on)
1649 { 1683 {
1650 rvideo_state = on; 1684 rvideo_state = on;
1651 1685
1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1686 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1653#if XPM_BACKGROUND 1687#ifdef HAVE_BG_PIXMAP
1654 if (bgPixmap.pixmap == None) 1688 if (bgPixmap.pixmap == None)
1655#endif
1656#if TRANSPARENT
1657 if (!OPTION (Opt_transparent) || am_transparent == 0)
1658#endif 1689#endif
1659 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1690 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1660 1691
1661 XGCValues gcvalue; 1692 XGCValues gcvalue;
1662 gcvalue.foreground = pix_colors[Color_fg]; 1693 gcvalue.foreground = pix_colors[Color_fg];
… …
1806 for (i = PART_BEG; i < RC_COUNT; i++) 1837 for (i = PART_BEG; i < RC_COUNT; i++)
1807 { 1838 {
1808 min_it (rc[i].col, ncol - 1); 1839 min_it (rc[i].col, ncol - 1);
1809 min_it (rc[i].row, nrow - 1); 1840 min_it (rc[i].row, nrow - 1);
1810 } 1841 }
1811 1842// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1812 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1843 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1813 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1844 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1814 1845
1815 num_scr_allow = 0; 1846 num_scr_allow = 0;
1816 1847
… …
1871 return true; 1902 return true;
1872} 1903}
1873 1904
1874#ifndef NO_BELL 1905#ifndef NO_BELL
1875void 1906void
1876rxvt_term::bell_cb (time_watcher &w) 1907rxvt_term::bell_cb (ev::timer &w, int revents)
1877{ 1908{
1878 rvideo_bell = false; 1909 rvideo_bell = false;
1879 scr_rvideo_mode (rvideo_mode); 1910 scr_rvideo_mode (rvideo_mode);
1911 refresh_check ();
1880} 1912}
1881#endif 1913#endif
1882 1914
1883/* ------------------------------------------------------------------------- */ 1915/* ------------------------------------------------------------------------- */
1884void 1916void
… …
1886{ 1918{
1887#ifndef NO_BELL 1919#ifndef NO_BELL
1888 1920
1889# ifndef NO_MAPALERT 1921# ifndef NO_MAPALERT
1890# ifdef MAPALERT_OPTION 1922# ifdef MAPALERT_OPTION
1891 if (OPTION (Opt_mapAlert)) 1923 if (option (Opt_mapAlert))
1892# endif 1924# endif
1893 XMapWindow (dpy, parent[0]); 1925 XMapWindow (dpy, parent[0]);
1894# endif 1926# endif
1895 1927
1928# if ENABLE_FRILLS
1929 if (option (Opt_urgentOnBell))
1930 set_urgency (1);
1931# endif
1932
1896 if (OPTION (Opt_visualBell)) 1933 if (option (Opt_visualBell))
1897 { 1934 {
1898 rvideo_bell = true; 1935 rvideo_bell = true;
1899 scr_rvideo_mode (rvideo_mode); 1936 scr_rvideo_mode (rvideo_mode);
1900 display->flush (); 1937 flush ();
1901 1938
1902 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1939 bell_ev.start (VISUAL_BELL_DURATION);
1903 } 1940 }
1904 else 1941 else
1905 XBell (dpy, 0); 1942 XBell (dpy, 0);
1906
1907#endif 1943#endif
1908} 1944}
1909 1945
1910/* ------------------------------------------------------------------------- */ 1946/* ------------------------------------------------------------------------- */
1911/* ARGSUSED */ 1947/* ARGSUSED */
1912void 1948void
1913rxvt_term::scr_printscreen (int fullhist) NOTHROW 1949rxvt_term::scr_printscreen (int fullhist) NOTHROW
1914{ 1950{
1915#ifdef PRINTPIPE 1951#ifdef PRINTPIPE
1916 int nrows, row_start; 1952 int nrows, row_start;
1917 FILE *fd; 1953 FILE *fd = popen_printer ();
1918 1954
1919 if ((fd = popen_printer ()) == NULL) 1955 if (!fd)
1920 return; 1956 return;
1921 1957
1922 if (fullhist) 1958 if (fullhist)
1923 { 1959 {
1924 nrows = nrow - top_row; 1960 nrows = nrow - top_row;
… …
1989 return; 2025 return;
1990 2026
1991 /* 2027 /*
1992 * A: set up vars 2028 * A: set up vars
1993 */ 2029 */
2030 refresh_count = 0;
2031
1994 have_bg = 0; 2032 have_bg = 0;
1995 refresh_count = 0; 2033#ifdef HAVE_BG_PIXMAP
1996
1997#if XPM_BACKGROUND
1998 have_bg |= bgPixmap.pixmap != None; 2034 have_bg = bgPixmap.pixmap != None;
1999#endif
2000#if TRANSPARENT
2001 have_bg |= OPTION (Opt_transparent) && am_transparent;
2002#endif 2035#endif
2003 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2036 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2004 2037
2005 /* 2038 /*
2006 * B: reverse any characters which are selected 2039 * B: reverse any characters which are selected
… …
2051 ccol2 = Color_bg; 2084 ccol2 = Color_bg;
2052#endif 2085#endif
2053 2086
2054 if (showcursor && focus) 2087 if (showcursor && focus)
2055 { 2088 {
2056 if (OPTION (Opt_cursorUnderline)) 2089 if (option (Opt_cursorUnderline))
2057 *crp ^= RS_Uline; 2090 *crp ^= RS_Uline;
2058 else 2091 else
2059 { 2092 {
2060 *crp ^= RS_RVid; 2093 *crp ^= RS_RVid;
2061 *crp = SET_FGCOLOR (*crp, ccol1); 2094 *crp = SET_FGCOLOR (*crp, ccol1);
… …
2197 continue; 2230 continue;
2198 2231
2199 // redraw one or more characters 2232 // redraw one or more characters
2200 2233
2201 // seek to the beginning of wide characters 2234 // seek to the beginning of wide characters
2202 while (stp[col] == NOCHAR && col > 0) 2235 while (expect_false (stp[col] == NOCHAR && col > 0))
2203 --col; 2236 --col;
2204 2237
2205 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2238 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2206 text_t *text = stp + col; 2239 text_t *text = stp + col;
2207 int count = 1; 2240 int count = 1;
… …
2244 2277
2245 col--; /* went one too far. move back */ 2278 col--; /* went one too far. move back */
2246 count -= i; /* dump any matching trailing chars */ 2279 count -= i; /* dump any matching trailing chars */
2247 2280
2248 // sometimes we optimize away the trailing NOCHAR's, add them back 2281 // sometimes we optimize away the trailing NOCHAR's, add them back
2249 while (i && text[count] == NOCHAR) 2282 while (expect_false (i && text[count] == NOCHAR))
2250 count++, i--; 2283 count++, i--;
2251 2284
2252 /* 2285 /*
2253 * Determine the attributes for the string 2286 * Determine the attributes for the string
2254 */ 2287 */
2255 int fore = fgcolor_of (rend); // desired foreground 2288 int fore = fgcolor_of (rend); // desired foreground
2256 int back = bgcolor_of (rend); // desired background 2289 int back = bgcolor_of (rend); // desired background
2257 2290
2258 // only do special processing if any attributes are set, which is unlikely 2291 // only do special processing if any attributes are set, which is unlikely
2259 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2292 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2260 { 2293 {
2261 bool invert = rend & RS_RVid; 2294 bool invert = rend & RS_RVid;
2262 2295
2263#ifndef NO_BOLD_UNDERLINE_REVERSE 2296#ifndef NO_BOLD_UNDERLINE_REVERSE
2264 if (rend & RS_Bold
2265 && fore == Color_fg) 2297 if (rend & RS_Bold && fore == Color_fg)
2266 { 2298 {
2267 if (ISSET_PIXCOLOR (Color_BD)) 2299 if (ISSET_PIXCOLOR (Color_BD))
2268 fore = Color_BD; 2300 fore = Color_BD;
2269# if !ENABLE_STYLES 2301# if !ENABLE_STYLES
2270 else 2302 else
2271 invert = !invert; 2303 invert = !invert;
2272# endif 2304# endif
2273 } 2305 }
2274 2306
2275 if (rend & RS_Italic 2307 if (rend & RS_Italic && fore == Color_fg)
2276 && fore == Color_fg)
2277 { 2308 {
2278 if (ISSET_PIXCOLOR (Color_IT)) 2309 if (ISSET_PIXCOLOR (Color_IT))
2279 fore = Color_IT; 2310 fore = Color_IT;
2280# if !ENABLE_STYLES 2311# if !ENABLE_STYLES
2281 else 2312 else
… …
2315 } 2346 }
2316 2347
2317#ifdef TEXT_BLINK 2348#ifdef TEXT_BLINK
2318 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2349 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2319 { 2350 {
2320 if (!text_blink_ev.active) 2351 if (!text_blink_ev.is_active ())
2321 { 2352 {
2322 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2353 text_blink_ev.again ();
2323 hidden_text = 0; 2354 hidden_text = 0;
2324 } 2355 }
2325 else if (hidden_text) 2356 else if (hidden_text)
2326 fore = back; 2357 fore = back;
2327 } 2358 }
… …
2349 /* 2380 /*
2350 * Actually do the drawing of the string here 2381 * Actually do the drawing of the string here
2351 */ 2382 */
2352 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2383 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2353 2384
2354 if (have_bg && back == Color_bg) 2385 if (expect_true (have_bg && back == Color_bg))
2355 { 2386 {
2356 // this is very ugly, maybe push it into ->draw? 2387 // this is very ugly, maybe push it into ->draw?
2357 2388
2358 for (i = 0; i < count; i++) /* don't draw empty strings */ 2389 for (i = 0; i < count; i++) /* don't draw empty strings */
2359 if (text[i] != ' ') 2390 if (text[i] != ' ')
… …
2366 did_clear: ; 2397 did_clear: ;
2367 } 2398 }
2368 else 2399 else
2369 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2400 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2370 2401
2371 if (rend & RS_Uline && font->descent > 1 && fore != back) 2402 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2372 { 2403 {
2373#if ENABLE_FRILLS 2404#if ENABLE_FRILLS
2374 if (ISSET_PIXCOLOR (Color_underline)) 2405 if (ISSET_PIXCOLOR (Color_underline))
2375 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2406 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2376 else 2407 else
2377#endif 2408#endif
2378 XSetForeground (dpy, gc, pix_colors[fore]); 2409 XSetForeground (dpy, gc, pix_colors[fore]);
2379 2410
2380 XDrawLine (dpy, drawBuffer, gc, 2411 XDrawLine (dpy, vt, gc,
2381 xpixel, ypixel + font->ascent + 1, 2412 xpixel, ypixel + font->ascent + 1,
2382 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2413 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2383 } 2414 }
2384 } /* for (col....) */ 2415 } /* for (col....) */
2385 } /* for (row....) */ 2416 } /* for (row....) */
… …
2394 */ 2425 */
2395 if (showcursor) 2426 if (showcursor)
2396 { 2427 {
2397 if (focus) 2428 if (focus)
2398 { 2429 {
2399 if (OPTION (Opt_cursorUnderline)) 2430 if (option (Opt_cursorUnderline))
2400 *crp ^= RS_Uline; 2431 *crp ^= RS_Uline;
2401 else 2432 else
2402 { 2433 {
2403 *crp ^= RS_RVid; 2434 *crp ^= RS_RVid;
2404#ifndef NO_CURSORCOLOR 2435#ifndef NO_CURSORCOLOR
… …
2423 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2454 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2424 else 2455 else
2425#endif 2456#endif
2426 XSetForeground (dpy, gc, pix_colors[ccol1]); 2457 XSetForeground (dpy, gc, pix_colors[ccol1]);
2427 2458
2428 XDrawRectangle (dpy, drawBuffer, gc, 2459 XDrawRectangle (dpy, vt, gc,
2429 Col2Pixel (col), 2460 Col2Pixel (col),
2430 Row2Pixel (oldcursor.row), 2461 Row2Pixel (oldcursor.row),
2431 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2462 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2432 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2463 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2433 } 2464 }
… …
2468} 2499}
2469 2500
2470void 2501void
2471rxvt_term::scr_recolour () NOTHROW 2502rxvt_term::scr_recolour () NOTHROW
2472{ 2503{
2473 if (1 2504#ifdef HAVE_BG_PIXMAP
2474#if TRANSPARENT 2505 bgPixmap.apply ();
2475 && !am_transparent 2506#else
2476#endif 2507
2477#if XPM_BACKGROUND
2478 && !bgPixmap.pixmap
2479#endif
2480 )
2481 {
2482 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2508 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2483 XClearWindow (dpy, parent[0]); 2509 XClearWindow (dpy, parent[0]);
2484 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2510 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2485#if HAVE_SCROLLBARS 2511
2486 if (scrollBar.win) 2512 if (scrollBar.win)
2487 { 2513 {
2488 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2514 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2489 scrollBar.setIdle (); 2515 scrollBar.state = STATE_IDLE;
2490 scrollbar_show (0); 2516 scrollBar.show (0);
2491 }
2492#endif
2493 } 2517 }
2494 2518
2519#endif
2520
2521 /* bgPixmap.apply () does not do the following : */
2495 scr_clear (); 2522 scr_clear ();
2496 scr_touch (true); 2523 scr_touch (true);
2497 want_refresh = 1; 2524 want_refresh = 1;
2498} 2525}
2499 2526
… …
2591{ 2618{
2592 int row, wrote; 2619 int row, wrote;
2593 unsigned int width, towrite; 2620 unsigned int width, towrite;
2594 char r1[] = "\n"; 2621 char r1[] = "\n";
2595 2622
2596 for (row = saveLines - nsaved; 2623 for (row = saveLines + top_row;
2597 row < saveLines + nrow - 1; row++) 2624 row < saveLines + nrow - 1; row++)
2598 { 2625 {
2599 width = row_buf[row].l >= 0 ? row_buf[row].l 2626 width = row_buf[row].l >= 0 ? row_buf[row].l
2600 : ncol; 2627 : ncol;
2601 for (towrite = width; towrite; towrite -= wrote) 2628 for (towrite = width; towrite; towrite -= wrote)
… …
2652 /* convert normal newline chars into common keyboard Return key sequence */ 2679 /* convert normal newline chars into common keyboard Return key sequence */
2653 for (unsigned int i = 0; i < len; i++) 2680 for (unsigned int i = 0; i < len; i++)
2654 if (data[i] == C0_LF) 2681 if (data[i] == C0_LF)
2655 data[i] = C0_CR; 2682 data[i] = C0_CR;
2656 2683
2684 if (priv_modes & PrivMode_BracketPaste)
2685 tt_printf ("\e[200~");
2686
2657 tt_write (data, len); 2687 tt_write (data, len);
2688
2689 if (priv_modes & PrivMode_BracketPaste)
2690 tt_printf ("\e[201~");
2658} 2691}
2659 2692
2660/* ------------------------------------------------------------------------- */ 2693/* ------------------------------------------------------------------------- */
2661/* 2694/*
2662 * Respond to a notification that a primary selection has been sent 2695 * Respond to a notification that a primary selection has been sent
… …
2737 if (!delete_prop) 2770 if (!delete_prop)
2738 XDeleteProperty (dpy, win, prop); 2771 XDeleteProperty (dpy, win, prop);
2739 2772
2740 selection_wait = Sel_incr; 2773 selection_wait = Sel_incr;
2741 incr_buf_fill = 0; 2774 incr_buf_fill = 0;
2742 incr_ev.start (NOW + 10); 2775 incr_ev.start (10);
2743 2776
2744 goto bailout; 2777 goto bailout;
2745 } 2778 }
2746 2779
2747 if (ct.nitems == 0) 2780 if (ct.nitems == 0)
… …
2756 ct.nitems = incr_buf_fill; 2789 ct.nitems = incr_buf_fill;
2757 incr_buf = 0; 2790 incr_buf = 0;
2758 incr_buf_size = 0; 2791 incr_buf_size = 0;
2759 incr_ev.stop (); 2792 incr_ev.stop ();
2760 } 2793 }
2761 else 2794 else
2762 { 2795 {
2763 if (selection_wait == Sel_normal 2796 if (selection_wait == Sel_normal
2764 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2797 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2765 { 2798 {
2766 /* 2799 /*
… …
2773 goto bailout; 2806 goto bailout;
2774 } 2807 }
2775 } 2808 }
2776 else if (selection_wait == Sel_incr) 2809 else if (selection_wait == Sel_incr)
2777 { 2810 {
2778 incr_ev.start (NOW + 10); 2811 incr_ev.start (10);
2779 2812
2780 while (incr_buf_fill + ct.nitems > incr_buf_size) 2813 while (incr_buf_fill + ct.nitems > incr_buf_size)
2781 { 2814 {
2782 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2815 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2783 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2816 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2823 if (selection_wait == Sel_normal) 2856 if (selection_wait == Sel_normal)
2824 selection_wait = Sel_none; 2857 selection_wait = Sel_none;
2825} 2858}
2826 2859
2827void 2860void
2828rxvt_term::incr_cb (time_watcher &w) NOTHROW 2861rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2829{ 2862{
2830 selection_wait = Sel_none; 2863 selection_wait = Sel_none;
2831 2864
2832 incr_buf_size = 0; 2865 incr_buf_size = 0;
2833 free (incr_buf); 2866 free (incr_buf);
… …
2844 selection_paste (win, prop, true); 2877 selection_paste (win, prop, true);
2845} 2878}
2846 2879
2847/* ------------------------------------------------------------------------- */ 2880/* ------------------------------------------------------------------------- */
2848/* 2881/*
2849 * Request the current selection: 2882 * Request the current selection:
2850 * Order: > internal selection if available 2883 * Order: > internal selection if available
2851 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2884 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2852 * > CUT_BUFFER0 2885 * > CUT_BUFFER0
2853 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2886 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2854 * will auto fallback to CUT_BUFFER0 2887 * will auto fallback to CUT_BUFFER0
… …
2856 */ 2889 */
2857void 2890void
2858rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2891rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2859{ 2892{
2860 if (selection.text && selnum == Sel_Primary) 2893 if (selection.text && selnum == Sel_Primary)
2894 {
2861 { /* internal selection */ 2895 /* internal selection */
2862 char *str = rxvt_wcstombs (selection.text, selection.len); 2896 char *str = rxvt_wcstombs (selection.text, selection.len);
2863 paste (str, strlen (str)); 2897 paste (str, strlen (str));
2864 free (str); 2898 free (str);
2865 return; 2899 return;
2866 } 2900 }
… …
3132 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3166 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3133 3167
3134 while (selection.mark.col > 0 3168 while (selection.mark.col > 0
3135 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3169 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3136 --selection.mark.col; 3170 --selection.mark.col;
3137 3171
3138 if (selection.op) 3172 if (selection.op)
3173 {
3139 { /* clear the old selection */ 3174 /* clear the old selection */
3140 selection.beg.row = selection.end.row = selection.mark.row; 3175 selection.beg.row = selection.end.row = selection.mark.row;
3141 selection.beg.col = selection.end.col = selection.mark.col; 3176 selection.beg.col = selection.end.col = selection.mark.col;
3142 } 3177 }
3143 3178
3144 selection.op = SELECTION_INIT; 3179 selection.op = SELECTION_INIT;
… …
3333 * a point/word/line which is either the start or end of the selection 3368 * a point/word/line which is either the start or end of the selection
3334 * and it was decided by whichever point/word/line was `fixed' at the 3369 * and it was decided by whichever point/word/line was `fixed' at the
3335 * time of the most recent button3 press 3370 * time of the most recent button3 press
3336 */ 3371 */
3337 if (button3 && buttonpress) 3372 if (button3 && buttonpress)
3373 {
3338 { /* button3 press */ 3374 /* button3 press */
3339 /* 3375 /*
3340 * first determine which edge of the selection we are closest to 3376 * first determine which edge of the selection we are closest to
3341 */ 3377 */
3342 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3378 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3343 || (!ROWCOL_IS_AFTER (pos, selection.end) 3379 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3361 selection.mark.row = selection.beg.row; 3397 selection.mark.row = selection.beg.row;
3362 selection.mark.col = selection.beg.col; 3398 selection.mark.col = selection.beg.col;
3363 } 3399 }
3364 } 3400 }
3365 else 3401 else
3402 {
3366 { /* button1 drag or button3 drag */ 3403 /* button1 drag or button3 drag */
3367 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3404 if (ROWCOL_IS_AFTER (selection.mark, pos))
3368 { 3405 {
3369 if (selection.mark.row == selection.end.row 3406 if (selection.mark.row == selection.end.row
3370 && selection.mark.col == selection.end.col 3407 && selection.mark.col == selection.end.col
3371 && clickchange 3408 && clickchange
… …
3414 selection_delimit_word (DN, &selection.end, &selection.end); 3451 selection_delimit_word (DN, &selection.end, &selection.end);
3415 } 3452 }
3416 else if (selection.clicks == 3) 3453 else if (selection.clicks == 3)
3417 { 3454 {
3418#if ENABLE_FRILLS 3455#if ENABLE_FRILLS
3419 if (OPTION (Opt_tripleclickwords)) 3456 if (option (Opt_tripleclickwords))
3420 { 3457 {
3421 selection_delimit_word (UP, &selection.beg, &selection.beg); 3458 selection_delimit_word (UP, &selection.beg, &selection.beg);
3422 3459
3423 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3460 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3424 { 3461 {
… …
3452 selection.end.row++; 3489 selection.end.row++;
3453 } 3490 }
3454 } 3491 }
3455 3492
3456 if (button3 && buttonpress) 3493 if (button3 && buttonpress)
3494 {
3457 { /* mark may need to be changed */ 3495 /* mark may need to be changed */
3458 if (closeto == LEFT) 3496 if (closeto == LEFT)
3459 { 3497 {
3460 selection.mark.row = selection.end.row; 3498 selection.mark.row = selection.end.row;
3461 selection.mark.col = selection.end.col - (selection.clicks == 2); 3499 selection.mark.col = selection.end.col - (selection.clicks == 2);
3462 } 3500 }
… …
3661 XFree (ct.value); 3699 XFree (ct.value);
3662 } 3700 }
3663 3701
3664 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3702 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3665} 3703}
3666
3667/* ------------------------------------------------------------------------- *
3668 * MOUSE ROUTINES *
3669 * ------------------------------------------------------------------------- */
3670
3671/*
3672 * return col/row values corresponding to x/y pixel values
3673 */
3674void
3675rxvt_term::pixel_position (int *x, int *y) NOTHROW
3676{
3677 *x = Pixel2Col (*x);
3678 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3679 *y = Pixel2Row (*y);
3680 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3681}
3682 3704
3683/* ------------------------------------------------------------------------- */ 3705/* ------------------------------------------------------------------------- */
3684#ifdef USE_XIM 3706#ifdef USE_XIM
3685void 3707void
3686rxvt_term::im_set_position (XPoint &pos) NOTHROW 3708rxvt_term::im_set_position (XPoint &pos) NOTHROW

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines