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.262 by root, Mon Feb 20 22:42:01 2006 UTC vs.
Revision 1.323 by root, Tue Nov 4 23:53:29 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_soft_reset ();
163 scr_overlay_off ();
164#endif
165 164
166 view_start = 0; 165 view_start = 0;
167 num_scr = 0; 166 num_scr = 0;
168 167
169 if (ncol == 0) 168 if (ncol == 0)
… …
172 if (nrow == 0) 171 if (nrow == 0)
173 nrow = 24; 172 nrow = 24;
174 173
175 if (ncol == prev_ncol && nrow == prev_nrow) 174 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 175 return;
177
178 if (current_screen != PRIMARY)
179 scr_swap_screen ();
180 176
181 // we need at least two lines for wrapping to work correctly 177 // we need at least two lines for wrapping to work correctly
182 while (nrow + saveLines < 2) 178 while (nrow + saveLines < 2)
183 { 179 {
184 //TODO//FIXME 180 //TODO//FIXME
… …
237 selection.text = NULL; 233 selection.text = NULL;
238 selection.len = 0; 234 selection.len = 0;
239 selection.op = SELECTION_CLEAR; 235 selection.op = SELECTION_CLEAR;
240 selection.screen = PRIMARY; 236 selection.screen = PRIMARY;
241 selection.clicks = 0; 237 selection.clicks = 0;
242 rvideo_state = rvideo_mode = false;
243 } 238 }
244 else 239 else
245 { 240 {
246 /* 241 /*
247 * add or delete rows as appropriate 242 * add or delete rows as appropriate
… …
276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 271 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
277 } 272 }
278 273
279 line_t *old_buf = row_buf; 274 line_t *old_buf = row_buf;
280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 275 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
281 276
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 277 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 278 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 279 int q = total_rows; // rewrapped row
285 280
286 if (top_row) 281 if (top_row)
… …
330 int qcol = 0; 325 int qcol = 0;
331 326
332 // see below for cursor adjustment rationale 327 // see below for cursor adjustment rationale
333 if (p == ocur.row) 328 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow); 329 screen.cur.row = q - (total_rows - nrow);
335 330
336 // fill a single destination line 331 // fill a single destination line
337 while (lofs < llen && qcol < ncol) 332 while (lofs < llen && qcol < ncol)
338 { 333 {
339 int prow = lofs / prev_ncol; 334 int prow = lofs / prev_ncol;
340 int pcol = lofs % prev_ncol; 335 int pcol = lofs % prev_ncol;
… …
366 } 361 }
367 while (p != pend && q > 0); 362 while (p != pend && q > 0);
368 363
369 term_start = total_rows - nrow; 364 term_start = total_rows - nrow;
370 top_row = q - term_start; 365 top_row = q - term_start;
371 366
372 // make sure all terminal lines exist 367 // make sure all terminal lines exist
373 while (top_row > 0) 368 while (top_row > 0)
374 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 369 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
375 } 370 }
376 else 371 else
377 { 372 {
378 // if no scrollback exists (yet), wing, instead of wrap 373 // if no scrollback exists (yet), wing, instead of wrap
379 374
380 for (int row = min (nrow, prev_nrow); row--; ) 375 for (int row = min (nrow, prev_nrow); row--; )
381 { 376 {
382 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 377 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
383 line_t &qline = row_buf [row]; 378 line_t &qline = row_buf [row];
384 379
… …
398 delete old_ta; 393 delete old_ta;
399 delete old_ra; 394 delete old_ra;
400 395
401 clamp_it (screen.cur.row, 0, nrow - 1); 396 clamp_it (screen.cur.row, 0, nrow - 1);
402 clamp_it (screen.cur.col, 0, ncol - 1); 397 clamp_it (screen.cur.col, 0, ncol - 1);
403
404 free (tabs);
405 } 398 }
406 399
407 CLEAR_ALL_SELECTION (); 400 CLEAR_ALL_SELECTION ();
408 401
409 prev_nrow = nrow; 402 prev_nrow = nrow;
410 prev_ncol = ncol; 403 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 404
420 tt_winch (); 405 tt_winch ();
421 406
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 407 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
423} 408}
… …
435 delete ralloc; ralloc = 0; 420 delete ralloc; ralloc = 0;
436 421
437 free (row_buf); 422 free (row_buf);
438 free (swap_buf); 423 free (swap_buf);
439 free (drawn_buf); 424 free (drawn_buf);
425 row_buf = 0; // signal that we freed all the arrays above
426
440 free (tabs); 427 free (tabs);
441 428 tabs = 0;
442 row_buf = 0; // signal that we freed all the arrays
443 } 429 }
444} 430}
445 431
446/* ------------------------------------------------------------------------- */ 432/* ------------------------------------------------------------------------- */
447/* 433/*
448 * Hard reset 434 * Hard/Soft reset
449 */ 435 */
450void 436void
451rxvt_term::scr_poweron () 437rxvt_term::scr_poweron ()
452{ 438{
453 scr_release (); 439 scr_release ();
454 prev_nrow = prev_ncol = 0; 440 prev_nrow = prev_ncol = 0;
455 scr_reset (); 441 scr_reset ();
456 442
457 scr_clear (true); 443 scr_clear (true);
458 scr_refresh (); 444 scr_refresh ();
445}
446
447void
448rxvt_term::scr_soft_reset ()
449{
450 /* only affects modes, nothing drastic such as clearing the screen */
451#if ENABLE_OVERLAY
452 scr_overlay_off ();
453#endif
454
455 rvideo_mode = false;
456
457 if (current_screen != PRIMARY)
458 scr_swap_screen ();
459
460 free (tabs);
461 tabs = (char *)rxvt_malloc (ncol);
462
463 for (int col = ncol; --col; )
464 tabs [col] = col % TABSIZE == 0;
465
466 scr_scroll_region (0, MAX_ROWS - 1);
467 scr_rendition (0, ~RS_None);
468 scr_insert_mode (0);
459} 469}
460 470
461/* ------------------------------------------------------------------------- * 471/* ------------------------------------------------------------------------- *
462 * PROCESS SCREEN COMMANDS * 472 * PROCESS SCREEN COMMANDS *
463 * ------------------------------------------------------------------------- */ 473 * ------------------------------------------------------------------------- */
… …
510} 520}
511 521
512void 522void
513rxvt_term::scr_swap_screen () 523rxvt_term::scr_swap_screen ()
514{ 524{
515 if (!OPTION (Opt_secondaryScreen)) 525 if (!option (Opt_secondaryScreen))
516 return; 526 return;
517 527
518 for (int i = prev_nrow; i--; ) 528 for (int i = prev_nrow; i--; )
519 ::swap (ROW(i), swap_buf [i]); 529 ::swap (ROW(i), swap_buf [i]);
520 530
… …
542 selection_check (2); /* check for boundary cross */ 552 selection_check (2); /* check for boundary cross */
543 553
544 int i = current_screen; current_screen = scrn; scrn = i; 554 int i = current_screen; current_screen = scrn; scrn = i;
545 555
546#if NSCREENS 556#if NSCREENS
547 if (OPTION (Opt_secondaryScreen)) 557 if (option (Opt_secondaryScreen))
548 { 558 {
549 num_scr = 0; 559 num_scr = 0;
550 560
551 scr_swap_screen (); 561 scr_swap_screen ();
552 562
… …
555 screen.flags |= Screen_VisibleCursor; 565 screen.flags |= Screen_VisibleCursor;
556 swap.flags |= Screen_VisibleCursor; 566 swap.flags |= Screen_VisibleCursor;
557 } 567 }
558 else 568 else
559#endif 569#endif
560 if (OPTION (Opt_secondaryScroll)) 570 if (option (Opt_secondaryScroll))
561 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 571 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
562} 572}
563 573
564// clear WrapNext indicator, solidifying position on next line 574// clear WrapNext indicator, solidifying position on next line
565void 575void
… …
598/* 608/*
599 * Change the rendition style for following text 609 * Change the rendition style for following text
600 */ 610 */
601void 611void
602rxvt_term::scr_rendition (int set, int style) NOTHROW 612rxvt_term::scr_rendition (int set, int style) NOTHROW
603 { 613{
604 if (set) 614 if (set)
605 rstyle |= style; 615 rstyle |= style;
606 else if (style == ~RS_None) 616 else if (style == ~RS_None)
607 rstyle = DEFAULT_RSTYLE; 617 rstyle = DEFAULT_RSTYLE;
608 else 618 else
609 rstyle &= ~style; 619 rstyle &= ~style;
610 } 620}
611 621
612/* ------------------------------------------------------------------------- */ 622/* ------------------------------------------------------------------------- */
613/* 623/*
614 * Scroll text between <row1> and <row2> inclusive, by <count> lines 624 * Scroll text between <row1> and <row2> inclusive, by <count> lines
615 * count positive ==> scroll up 625 * count positive ==> scroll up
… …
624 want_refresh = 1; 634 want_refresh = 1;
625 num_scr += count; 635 num_scr += count;
626 636
627 if (count > 0 637 if (count > 0
628 && row1 == 0 638 && row1 == 0
629 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 639 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
630 { 640 {
631 top_row = max (top_row - count, -saveLines); 641 top_row = max (top_row - count, -saveLines);
632 642
633 // scroll everything up 'count' lines 643 // scroll everything up 'count' lines
634 term_start = (term_start + count) % total_rows; 644 term_start = (term_start + count) % total_rows;
… …
666 line_t &l2 = ROW(i); 676 line_t &l2 = ROW(i);
667 677
668 ::swap (l1, l2); 678 ::swap (l1, l2);
669 l2.touch (); 679 l2.touch ();
670 } 680 }
671 681
672 // move and/or clear selection, if any 682 // move and/or clear selection, if any
673 if (selection.op && current_screen == selection.screen) 683 if (selection.op && current_screen == selection.screen)
674 { 684 {
675 selection.beg.row -= count; 685 selection.beg.row -= count;
676 selection.end.row -= count; 686 selection.end.row -= count;
… …
684 selection.op = SELECTION_CLEAR; 694 selection.op = SELECTION_CLEAR;
685 } 695 }
686 } 696 }
687 697
688 // finally move the view window, if desired 698 // finally move the view window, if desired
689 if (OPTION (Opt_scrollWithBuffer) 699 if (option (Opt_scrollWithBuffer)
690 && view_start != 0 700 && view_start != 0
691 && view_start != -saveLines) 701 && view_start != -saveLines)
692 scr_page (UP, count); 702 scr_page (UP, count);
693 703
694 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 704 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
712 { 722 {
713 /* move selected region too */ 723 /* move selected region too */
714 selection.beg.row -= count; 724 selection.beg.row -= count;
715 selection.end.row -= count; 725 selection.end.row -= count;
716 selection.mark.row -= count; 726 selection.mark.row -= count;
717 727
718 selection_check (0); 728 selection_check (0);
719 } 729 }
720 } 730 }
721 731
722 // use a simple and robust scrolling algorithm, this 732 // use a simple and robust scrolling algorithm, this
… …
789 799
790 while (str < strend) 800 while (str < strend)
791 { 801 {
792 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 802 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
793 803
794 if (c < 0x20) 804 if (expect_false (c < 0x20))
795 if (c == C0_LF) 805 if (c == C0_LF)
796 { 806 {
797 max_it (line->l, screen.cur.col); 807 max_it (line->l, screen.cur.col);
798 808
799 screen.flags &= ~Screen_WrapNext; 809 screen.flags &= ~Screen_WrapNext;
… …
818 { 828 {
819 scr_tab (1, true); 829 scr_tab (1, true);
820 continue; 830 continue;
821 } 831 }
822 832
833 if (expect_false (
823 if (checksel /* see if we're writing within selection */ 834 checksel /* see if we're writing within selection */
824 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 835 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
825 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 836 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
837 ))
826 { 838 {
827 checksel = 0; 839 checksel = 0;
828 /* 840 /*
829 * If we wrote anywhere in the selected area, kill the selection 841 * If we wrote anywhere in the selected area, kill the selection
830 * XXX: should we kill the mark too? Possibly, but maybe that 842 * XXX: should we kill the mark too? Possibly, but maybe that
831 * should be a similar check. 843 * should be a similar check.
832 */ 844 */
833 CLEAR_SELECTION (); 845 CLEAR_SELECTION ();
834 } 846 }
835 847
836 if (screen.flags & Screen_WrapNext) 848 if (expect_false (screen.flags & Screen_WrapNext))
837 { 849 {
838 scr_do_wrap (); 850 scr_do_wrap ();
839 851
840 line->l = ncol; 852 line->l = ncol;
841 line->is_longer (1); 853 line->is_longer (1);
842 854
843 row = screen.cur.row; 855 row = screen.cur.row;
844 line = &ROW(row); /* _must_ refresh */ 856 line = &ROW(row); /* _must_ refresh */
845 } 857 }
846 858
847 // some utf-8 decoders "decode" surrogate characters: let's fix this. 859 // some utf-8 decoders "decode" surrogate characters: let's fix this.
848 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 860 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
849 c = 0xfffd; 861 c = 0xfffd;
850 862
851 // rely on wcwidth to tell us the character width, do wcwidth before 863 // rely on wcwidth to tell us the character width, do wcwidth before
852 // further replacements, as wcwidth might return -1 for the line 864 // further replacements, as wcwidth might return -1 for the line
853 // drawing characters below as they might be invalid in the current 865 // drawing characters below as they might be invalid in the current
854 // locale. 866 // locale.
855 int width = WCWIDTH (c); 867 int width = WCWIDTH (c);
856 868
857 if (charsets [screen.charset] == '0') // DEC SPECIAL 869 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
858 { 870 {
859 // vt100 special graphics and line drawing 871 // vt100 special graphics and line drawing
860 // 5f-7e standard vt100 872 // 5f-7e standard vt100
861 // 40-5e rxvt extension for extra curses acs chars 873 // 40-5e rxvt extension for extra curses acs chars
862 static uint16_t vt100_0[62] = { // 41 .. 7e 874 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
875 c = vt100_0[c - 0x41]; 887 c = vt100_0[c - 0x41];
876 width = 1; // vt100 line drawing characters are always single-width 888 width = 1; // vt100 line drawing characters are always single-width
877 } 889 }
878 } 890 }
879 891
880 if (screen.flags & Screen_Insert) 892 if (expect_false (screen.flags & Screen_Insert))
881 scr_insdel_chars (width, INSERT); 893 scr_insdel_chars (width, INSERT);
882 894
883 if (width != 0) 895 if (width != 0)
884 { 896 {
885#if !UNICODE_3 897#if !UNICODE_3
… …
891 c = 0xfffd; 903 c = 0xfffd;
892# endif 904# endif
893#endif 905#endif
894 906
895 // nuke the character at this position, if required 907 // nuke the character at this position, if required
908 if (expect_false (
896 if (line->t[screen.cur.col] == NOCHAR 909 line->t[screen.cur.col] == NOCHAR
897 || (screen.cur.col < ncol - 1 910 || (screen.cur.col < ncol - 1
898 && line->t[screen.cur.col + 1] == NOCHAR)) 911 && line->t[screen.cur.col + 1] == NOCHAR)
912 ))
913 scr_kill_char (*line, screen.cur.col);
914
915 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
916
917 // if the character doesn't fit into the remaining columns...
918 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
899 { 919 {
900 int col = screen.cur.col; 920 // ... 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 = ' '; 921 c = NOCHAR;
923 // and try the same character next loop iteration 922 // and try the same character next loop iteration
924 --str; 923 --str;
925 } 924 }
926 925
927 line->touch (); 926 line->touch ();
… …
929 do 928 do
930 { 929 {
931 line->t[screen.cur.col] = c; 930 line->t[screen.cur.col] = c;
932 line->r[screen.cur.col] = rend; 931 line->r[screen.cur.col] = rend;
933 932
934 if (screen.cur.col < ncol - 1) 933 if (expect_true (screen.cur.col < ncol - 1))
935 screen.cur.col++; 934 screen.cur.col++;
936 else 935 else
937 { 936 {
938 line->l = ncol; 937 line->l = ncol;
939 if (screen.flags & Screen_Autowrap) 938 if (screen.flags & Screen_Autowrap)
… …
941 break; 940 break;
942 } 941 }
943 942
944 c = NOCHAR; 943 c = NOCHAR;
945 } 944 }
946 while (--width > 0); 945 while (expect_false (--width > 0));
947 946
948 // pad with spaces when overwriting wide character with smaller one 947 // pad with spaces when overwriting wide character with smaller one
949 if (!width) 948 if (expect_false (!width))
950 { 949 {
951 line->touch (); 950 line->touch ();
952 951
953 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 952 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
954 { 953 {
955 line->t[c] = ' '; 954 line->t[c] = ' ';
956 line->r[c] = rend; 955 line->r[c] = rend;
957 } 956 }
958 } 957 }
959 } 958 }
959#if ENABLE_COMBINING
960 else // width == 0 960 else // width == 0
961 { 961 {
962#if ENABLE_COMBINING 962 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 { 963 {
964 // handle combining characters
965 // we just tag the accent on the previous on-screen character.
966 // this is arguably not correct, but also arguably not wrong.
967 // we don't handle double-width characters nicely yet.
968 line_t *linep;
969 text_t *tp;
970 rend_t *rp;
971
972 if (screen.cur.col > 0)
973 {
973 linep = line; 974 linep = line;
974 tp = line->t + screen.cur.col - 1; 975 tp = line->t + screen.cur.col - 1;
975 rp = line->r + screen.cur.col - 1; 976 rp = line->r + screen.cur.col - 1;
977 }
978 else if (screen.cur.row > 0
979 && ROW(screen.cur.row - 1).is_longer ())
980 {
981 linep = &ROW(screen.cur.row - 1);
982 tp = line->t + ncol - 1;
983 rp = line->r + ncol - 1;
984 }
985 else
986 continue;
987
988 linep->touch ();
989
990 while (*tp == NOCHAR && tp > linep->t)
991 tp--, rp--;
992
993 // first try to find a precomposed character
994 unicode_t n = rxvt_compose (*tp, c);
995 if (n == NOCHAR)
996 n = rxvt_composite.compose (*tp, c);
997
998 *tp = n;
999 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
976 } 1000 }
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 } 1001 }
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 1002#endif
1000 }
1001 } 1003 }
1002 1004
1003 max_it (line->l, screen.cur.col); 1005 max_it (line->l, screen.cur.col);
1004 1006
1005#ifdef DEBUG_STRICT 1007#ifdef DEBUG_STRICT
… …
1013 * XTERM_SEQ: CTRL-H 1015 * XTERM_SEQ: CTRL-H
1014 */ 1016 */
1015void 1017void
1016rxvt_term::scr_backspace () NOTHROW 1018rxvt_term::scr_backspace () NOTHROW
1017{ 1019{
1018 want_refresh = 1;
1019
1020 if (screen.cur.col == 0) 1020 if (screen.cur.col == 0)
1021 { 1021 {
1022 if (screen.cur.row > 0) 1022 if (screen.cur.row > 0)
1023 { 1023 {
1024#ifdef TERMCAP_HAS_BW 1024#ifdef TERMCAP_HAS_BW
1025 screen.cur.col = ncol - 1; 1025 screen.cur.col = ncol - 1;
1026 screen.cur.row--; 1026 --screen.cur.row;
1027 return; 1027
1028 want_refresh = 1;
1028#endif 1029#endif
1029 } 1030 }
1030 } 1031 }
1031 else if (!(screen.flags & Screen_WrapNext)) 1032 else
1032 scr_gotorc (0, -1, RELATIVE); 1033 scr_gotorc (0, -1, RELATIVE);
1033
1034 screen.flags &= ~Screen_WrapNext;
1035} 1034}
1036 1035
1037/* ------------------------------------------------------------------------- */ 1036/* ------------------------------------------------------------------------- */
1038/* 1037/*
1039 * Process Horizontal Tab 1038 * Process Horizontal Tab
… …
1062 x = i; 1061 x = i;
1063 1062
1064 if (!--count) 1063 if (!--count)
1065 break; 1064 break;
1066 } 1065 }
1067 else 1066 else
1068 ht &= l.t[i] == ' ' 1067 ht &= l.t[i] == ' '
1069 && RS_SAME (l.r[i], base_rend); 1068 && RS_SAME (l.r[i], base_rend);
1070 1069
1071 if (count) 1070 if (count)
1072 x = ncol - 1; 1071 x = ncol - 1;
1073 1072
1074 // store horizontal tab commands as characters inside the text 1073 // store horizontal tab commands as characters inside the text
1075 // buffer so they can be selected and pasted. 1074 // buffer so they can be selected and pasted.
1076 if (ht && OPTION (Opt_pastableTabs)) 1075 if (ht && option (Opt_pastableTabs))
1077 { 1076 {
1078 base_rend = SET_FONT (base_rend, 0); 1077 base_rend = SET_FONT (base_rend, 0);
1079 1078
1080 l.touch (x); 1079 l.touch (x);
1081 1080
… …
1188 } 1187 }
1189 } 1188 }
1190 else 1189 else
1191 { 1190 {
1192 if (screen.flags & Screen_Relative) 1191 if (screen.flags & Screen_Relative)
1192 {
1193 { /* relative origin mode */ 1193 /* relative origin mode */
1194 screen.cur.row = row + screen.tscroll; 1194 screen.cur.row = row + screen.tscroll;
1195 min_it (screen.cur.row, screen.bscroll); 1195 min_it (screen.cur.row, screen.bscroll);
1196 } 1196 }
1197 else 1197 else
1198 screen.cur.row = row; 1198 screen.cur.row = row;
… …
1231/* 1231/*
1232 * Erase part or whole of a line 1232 * Erase part or whole of a line
1233 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1233 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1234 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1234 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1235 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1235 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1236 * extension: clear to right unless wrapped: ESC [ 3 K
1236 */ 1237 */
1237void 1238void
1238rxvt_term::scr_erase_line (int mode) NOTHROW 1239rxvt_term::scr_erase_line (int mode) NOTHROW
1239{ 1240{
1240 unsigned int col, num; 1241 unsigned int col, num;
… …
1249 line.touch (); 1250 line.touch ();
1250 line.is_longer (0); 1251 line.is_longer (0);
1251 1252
1252 switch (mode) 1253 switch (mode)
1253 { 1254 {
1255 case 3:
1256 if (screen.flags & Screen_WrapNext)
1257 return;
1258
1259 /* fall through */
1260
1254 case 0: /* erase to end of line */ 1261 case 0: /* erase to end of line */
1255 col = screen.cur.col; 1262 col = screen.cur.col;
1256 num = ncol - col; 1263 num = ncol - col;
1257 min_it (line.l, col); 1264 min_it (line.l, col);
1265
1258 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1266 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1259 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1267 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1260 CLEAR_SELECTION (); 1268 CLEAR_SELECTION ();
1261 break; 1269 break;
1270
1262 case 1: /* erase to beginning of line */ 1271 case 1: /* erase to beginning of line */
1263 col = 0; 1272 col = 0;
1264 num = screen.cur.col + 1; 1273 num = screen.cur.col + 1;
1274
1265 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1275 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1266 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1276 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1267 CLEAR_SELECTION (); 1277 CLEAR_SELECTION ();
1268 break; 1278 break;
1279
1269 case 2: /* erase whole line */ 1280 case 2: /* erase whole line */
1270 col = 0; 1281 col = 0;
1271 num = ncol; 1282 num = ncol;
1272 line.l = 0; 1283 line.l = 0;
1273 if (selection.beg.row <= screen.cur.row 1284 if (selection.beg.row <= screen.cur.row
… …
1331 if (row >= nrow) /* Out Of Bounds */ 1342 if (row >= nrow) /* Out Of Bounds */
1332 return; 1343 return;
1333 1344
1334 min_it (num, nrow - row); 1345 min_it (num, nrow - row);
1335 1346
1347 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1336 if (rstyle & (RS_RVid | RS_Uline)) 1348 if (rstyle & (RS_RVid | RS_Uline))
1337 ren = (rend_t) ~RS_None; 1349 ren = (rend_t) ~RS_None;
1338 else if (GET_BASEBG (rstyle) == Color_bg) 1350 else if (GET_BASEBG (rstyle) == Color_bg)
1339 { 1351 {
1340 ren = DEFAULT_RSTYLE; 1352 ren = DEFAULT_RSTYLE;
1341 CLEAR_ROWS (row, num); 1353
1354 if (mapped && !view_start)
1355 XClearArea (dpy, vt, 0,
1356 Row2Pixel (row - view_start), (unsigned int)width,
1357 (unsigned int)Height2Pixel (num), False);
1342 } 1358 }
1343 else 1359 else
1344 { 1360 {
1345 ren = rstyle & (RS_fgMask | RS_bgMask); 1361 ren = rstyle & (RS_fgMask | RS_bgMask);
1362
1363 if (mapped && !view_start)
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 - view_start),
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);
1373 }
1351 } 1374 }
1352 1375
1353 for (; num--; row++) 1376 for (; num--; row++)
1354 { 1377 {
1355 scr_blank_screen_mem (ROW(row), rstyle); 1378 scr_blank_screen_mem (ROW(row), rstyle);
1379 if (!view_start)
1356 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1380 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1357 } 1381 }
1358} 1382}
1359 1383
1360#if !ENABLE_MINIMAL 1384#if !ENABLE_MINIMAL
1361void 1385void
… …
1435 * Insert/Delete <count> characters from the current position 1459 * Insert/Delete <count> characters from the current position
1436 */ 1460 */
1437void 1461void
1438rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1462rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1439{ 1463{
1440 int col, row;
1441 rend_t tr;
1442
1443 want_refresh = 1; 1464 want_refresh = 1;
1444 ZERO_SCROLLBACK (); 1465 ZERO_SCROLLBACK ();
1445 1466
1446 if (count <= 0) 1467 if (count <= 0)
1447 return; 1468 return;
… …
1449 scr_do_wrap (); 1470 scr_do_wrap ();
1450 1471
1451 selection_check (1); 1472 selection_check (1);
1452 min_it (count, ncol - screen.cur.col); 1473 min_it (count, ncol - screen.cur.col);
1453 1474
1454 row = screen.cur.row; 1475 int row = screen.cur.row;
1455 1476
1456 line_t *line = &ROW(row); 1477 line_t *line = &ROW(row);
1457 1478
1458 line->touch (); 1479 line->touch ();
1459 line->is_longer (0); 1480 line->is_longer (0);
1460 1481
1482 // nuke wide spanning the start
1483 if (line->t[screen.cur.col] == NOCHAR)
1484 scr_kill_char (*line, screen.cur.col);
1485
1461 switch (insdel) 1486 switch (insdel)
1462 { 1487 {
1463 case INSERT: 1488 case INSERT:
1464 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1489 line->l = min (line->l + count, ncol);
1490
1491 if (line->t[screen.cur.col] == NOCHAR)
1492 scr_kill_char (*line, screen.cur.col);
1493
1494 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1465 { 1495 {
1466 line->t[col] = line->t[col - count]; 1496 line->t[col] = line->t[col - count];
1467 line->r[col] = line->r[col - count]; 1497 line->r[col] = line->r[col - count];
1468 } 1498 }
1469
1470 line->l = min (line->l + count, ncol);
1471 1499
1472 if (selection.op && current_screen == selection.screen 1500 if (selection.op && current_screen == selection.screen
1473 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1501 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1474 { 1502 {
1475 if (selection.end.row != screen.cur.row 1503 if (selection.end.row != screen.cur.row
1476 || (selection.end.col + count >= ncol)) 1504 || (selection.end.col + count >= ncol))
1477 CLEAR_SELECTION (); 1505 CLEAR_SELECTION ();
1478 else 1506 else
1507 {
1479 { /* shift selection */ 1508 /* shift selection */
1480 selection.beg.col += count; 1509 selection.beg.col += count;
1481 selection.mark.col += count; /* XXX: yes? */ 1510 selection.mark.col += count; /* XXX: yes? */
1482 selection.end.col += count; 1511 selection.end.col += count;
1483 } 1512 }
1484 } 1513 }
… …
1489 case ERASE: 1518 case ERASE:
1490 screen.cur.col += count; /* don't worry if > ncol */ 1519 screen.cur.col += count; /* don't worry if > ncol */
1491 selection_check (1); 1520 selection_check (1);
1492 screen.cur.col -= count; 1521 screen.cur.col -= count;
1493 1522
1494 line->l = max (line->l - count, 0); 1523 // nuke wide char after the end
1524 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1525 scr_kill_char (*line, screen.cur.col + count);
1526
1495 scr_blank_line (*line, screen.cur.col, count, rstyle); 1527 scr_blank_line (*line, screen.cur.col, count, rstyle);
1496 break; 1528 break;
1497 1529
1498 case DELETE: 1530 case DELETE:
1499 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1531 line->l = max (line->l - count, 0);
1500 1532
1533 // nuke wide char spanning the end
1534 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1535 scr_kill_char (*line, screen.cur.col + count);
1536
1501 for (col = screen.cur.col; (col + count) < ncol; col++) 1537 for (int col = screen.cur.col; (col + count) < ncol; col++)
1502 { 1538 {
1503 line->t[col] = line->t[col + count]; 1539 line->t[col] = line->t[col + count];
1504 line->r[col] = line->r[col + count]; 1540 line->r[col] = line->r[col + count];
1505 } 1541 }
1506 1542
1507 line->l = max (line->l - count, 0);
1508 scr_blank_line (*line, ncol - count, count, tr); 1543 scr_blank_line (*line, ncol - count, count,
1544 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1509 1545
1510 if (selection.op && current_screen == selection.screen 1546 if (selection.op && current_screen == selection.screen
1511 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1547 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1512 { 1548 {
1513 if (selection.end.row != screen.cur.row 1549 if (selection.end.row != screen.cur.row
… …
1623 */ 1659 */
1624void 1660void
1625rxvt_term::scr_set_tab (int mode) NOTHROW 1661rxvt_term::scr_set_tab (int mode) NOTHROW
1626{ 1662{
1627 if (mode < 0) 1663 if (mode < 0)
1628 memset (tabs, 0, ncol * sizeof (char)); 1664 memset (tabs, 0, ncol);
1629 else if (screen.cur.col < ncol) 1665 else if (screen.cur.col < ncol)
1630 tabs [screen.cur.col] = !!mode; 1666 tabs [screen.cur.col] = !!mode;
1631} 1667}
1632 1668
1633/* ------------------------------------------------------------------------- */ 1669/* ------------------------------------------------------------------------- */
… …
1648 if (rvideo_state != on) 1684 if (rvideo_state != on)
1649 { 1685 {
1650 rvideo_state = on; 1686 rvideo_state = on;
1651 1687
1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1688 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1653#if XPM_BACKGROUND 1689#ifdef HAVE_BG_PIXMAP
1654 if (bgPixmap.pixmap == None) 1690 if (bgPixmap.pixmap == None)
1655#endif
1656#if TRANSPARENT
1657 if (!OPTION (Opt_transparent) || am_transparent == 0)
1658#endif 1691#endif
1659 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1692 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1660 1693
1661 XGCValues gcvalue; 1694 XGCValues gcvalue;
1662 gcvalue.foreground = pix_colors[Color_fg]; 1695 gcvalue.foreground = pix_colors[Color_fg];
… …
1806 for (i = PART_BEG; i < RC_COUNT; i++) 1839 for (i = PART_BEG; i < RC_COUNT; i++)
1807 { 1840 {
1808 min_it (rc[i].col, ncol - 1); 1841 min_it (rc[i].col, ncol - 1);
1809 min_it (rc[i].row, nrow - 1); 1842 min_it (rc[i].row, nrow - 1);
1810 } 1843 }
1811 1844// 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++) 1845 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); 1846 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1814 1847
1815 num_scr_allow = 0; 1848 num_scr_allow = 0;
1816 1849
… …
1871 return true; 1904 return true;
1872} 1905}
1873 1906
1874#ifndef NO_BELL 1907#ifndef NO_BELL
1875void 1908void
1876rxvt_term::bell_cb (time_watcher &w) 1909rxvt_term::bell_cb (ev::timer &w, int revents)
1877{ 1910{
1878 rvideo_bell = false; 1911 rvideo_bell = false;
1879 scr_rvideo_mode (rvideo_mode); 1912 scr_rvideo_mode (rvideo_mode);
1913 refresh_check ();
1880} 1914}
1881#endif 1915#endif
1882 1916
1883/* ------------------------------------------------------------------------- */ 1917/* ------------------------------------------------------------------------- */
1884void 1918void
… …
1886{ 1920{
1887#ifndef NO_BELL 1921#ifndef NO_BELL
1888 1922
1889# ifndef NO_MAPALERT 1923# ifndef NO_MAPALERT
1890# ifdef MAPALERT_OPTION 1924# ifdef MAPALERT_OPTION
1891 if (OPTION (Opt_mapAlert)) 1925 if (option (Opt_mapAlert))
1892# endif 1926# endif
1893 XMapWindow (dpy, parent[0]); 1927 XMapWindow (dpy, parent[0]);
1894# endif 1928# endif
1895 1929
1930# if ENABLE_FRILLS
1931 if (option (Opt_urgentOnBell))
1932 set_urgency (1);
1933# endif
1934
1896 if (OPTION (Opt_visualBell)) 1935 if (option (Opt_visualBell))
1897 { 1936 {
1898 rvideo_bell = true; 1937 rvideo_bell = true;
1899 scr_rvideo_mode (rvideo_mode); 1938 scr_rvideo_mode (rvideo_mode);
1900 display->flush (); 1939 flush ();
1901 1940
1902 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1941 bell_ev.start (VISUAL_BELL_DURATION);
1903 } 1942 }
1904 else 1943 else
1905 XBell (dpy, 0); 1944 XBell (dpy, 0);
1906
1907#endif 1945#endif
1908} 1946}
1909 1947
1910/* ------------------------------------------------------------------------- */ 1948/* ------------------------------------------------------------------------- */
1911/* ARGSUSED */ 1949/* ARGSUSED */
1912void 1950void
1913rxvt_term::scr_printscreen (int fullhist) NOTHROW 1951rxvt_term::scr_printscreen (int fullhist) NOTHROW
1914{ 1952{
1915#ifdef PRINTPIPE 1953#ifdef PRINTPIPE
1916 int nrows, row_start; 1954 int nrows, row_start;
1917 FILE *fd; 1955 FILE *fd = popen_printer ();
1918 1956
1919 if ((fd = popen_printer ()) == NULL) 1957 if (!fd)
1920 return; 1958 return;
1921 1959
1922 if (fullhist) 1960 if (fullhist)
1923 { 1961 {
1924 nrows = nrow - top_row; 1962 nrows = nrow - top_row;
… …
1978 int i; /* tmp */ 2016 int i; /* tmp */
1979#ifndef NO_CURSORCOLOR 2017#ifndef NO_CURSORCOLOR
1980 rend_t cc1; /* store colours at cursor position (s) */ 2018 rend_t cc1; /* store colours at cursor position (s) */
1981#endif 2019#endif
1982 rend_t *crp; // cursor rendition pointer 2020 rend_t *crp; // cursor rendition pointer
2021 rend_t ccol1, /* Cursor colour */
2022 ccol2; /* Cursor colour2 */
1983 2023
1984 want_refresh = 0; /* screen is current */ 2024 want_refresh = 0; /* screen is current */
1985 2025
1986 if (refresh_type == NO_REFRESH || !mapped) 2026 if (refresh_type == NO_REFRESH || !mapped)
1987 return; 2027 return;
1988 2028
1989 /* 2029 /*
1990 * A: set up vars 2030 * A: set up vars
1991 */ 2031 */
2032 refresh_count = 0;
2033
1992 have_bg = 0; 2034 have_bg = 0;
1993 refresh_count = 0; 2035#ifdef HAVE_BG_PIXMAP
1994
1995#if XPM_BACKGROUND
1996 have_bg |= bgPixmap.pixmap != None; 2036 have_bg = bgPixmap.pixmap != None;
1997#endif
1998#if TRANSPARENT
1999 have_bg |= OPTION (Opt_transparent) && am_transparent;
2000#endif 2037#endif
2001 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2002 2039
2003 /* 2040 /*
2004 * B: reverse any characters which are selected 2041 * B: reverse any characters which are selected
… …
2008 /* 2045 /*
2009 * C: set the cursor character (s) 2046 * C: set the cursor character (s)
2010 */ 2047 */
2011 { 2048 {
2012 unsigned char setoldcursor; 2049 unsigned char setoldcursor;
2013 rend_t ccol1, /* Cursor colour */
2014 ccol2; /* Cursor colour2 */
2015 2050
2016 showcursor = (screen.flags & Screen_VisibleCursor); 2051 showcursor = (screen.flags & Screen_VisibleCursor);
2017#ifdef CURSOR_BLINK 2052#ifdef CURSOR_BLINK
2018 if (hidden_cursor) 2053 if (hidden_cursor)
2019 showcursor = 0; 2054 showcursor = 0;
… …
2026 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2061 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2027 col--; 2062 col--;
2028 2063
2029 crp = &ROW(screen.cur.row).r[col]; 2064 crp = &ROW(screen.cur.row).r[col];
2030 2065
2066#ifndef NO_CURSORCOLOR
2067 cc1 = *crp & (RS_fgMask | RS_bgMask);
2068 if (ISSET_PIXCOLOR (Color_cursor))
2069 ccol1 = Color_cursor;
2070 else
2071#endif
2072#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2073 ccol1 = fgcolor_of (rstyle);
2074#else
2075 ccol1 = Color_fg;
2076#endif
2077
2078#ifndef NO_CURSORCOLOR
2079 if (ISSET_PIXCOLOR (Color_cursor2))
2080 ccol2 = Color_cursor2;
2081 else
2082#endif
2083#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2084 ccol2 = bgcolor_of (rstyle);
2085#else
2086 ccol2 = Color_bg;
2087#endif
2088
2031 if (showcursor && focus) 2089 if (showcursor && focus)
2032 { 2090 {
2033 if (OPTION (Opt_cursorUnderline)) 2091 if (option (Opt_cursorUnderline))
2034 *crp ^= RS_Uline; 2092 *crp ^= RS_Uline;
2035 else 2093 else
2036 { 2094 {
2037 *crp ^= RS_RVid; 2095 *crp ^= RS_RVid;
2038
2039#ifndef NO_CURSORCOLOR
2040 cc1 = *crp & (RS_fgMask | RS_bgMask);
2041 if (ISSET_PIXCOLOR (Color_cursor))
2042 ccol1 = Color_cursor;
2043 else
2044#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2045 ccol1 = fgcolor_of (rstyle);
2046#else
2047 ccol1 = Color_fg;
2048#endif
2049 if (ISSET_PIXCOLOR (Color_cursor2))
2050 ccol2 = Color_cursor2;
2051 else
2052#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2053 ccol2 = bgcolor_of (rstyle);
2054#else
2055 ccol2 = Color_bg;
2056#endif
2057 *crp = SET_FGCOLOR (*crp, ccol1); 2096 *crp = SET_FGCOLOR (*crp, ccol1);
2058 *crp = SET_BGCOLOR (*crp, ccol2); 2097 *crp = SET_BGCOLOR (*crp, ccol2);
2059#endif
2060 } 2098 }
2061 } 2099 }
2062 } 2100 }
2063 2101
2064 /* make sure no outline cursor is left around */ 2102 /* make sure no outline cursor is left around */
… …
2194 continue; 2232 continue;
2195 2233
2196 // redraw one or more characters 2234 // redraw one or more characters
2197 2235
2198 // seek to the beginning of wide characters 2236 // seek to the beginning of wide characters
2199 while (stp[col] == NOCHAR && col > 0) 2237 while (expect_false (stp[col] == NOCHAR && col > 0))
2200 --col; 2238 --col;
2201 2239
2202 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2240 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2203 text_t *text = stp + col; 2241 text_t *text = stp + col;
2204 int count = 1; 2242 int count = 1;
… …
2241 2279
2242 col--; /* went one too far. move back */ 2280 col--; /* went one too far. move back */
2243 count -= i; /* dump any matching trailing chars */ 2281 count -= i; /* dump any matching trailing chars */
2244 2282
2245 // sometimes we optimize away the trailing NOCHAR's, add them back 2283 // sometimes we optimize away the trailing NOCHAR's, add them back
2246 while (i && text[count] == NOCHAR) 2284 while (expect_false (i && text[count] == NOCHAR))
2247 count++, i--; 2285 count++, i--;
2248 2286
2249 /* 2287 /*
2250 * Determine the attributes for the string 2288 * Determine the attributes for the string
2251 */ 2289 */
2252 int fore = fgcolor_of (rend); // desired foreground 2290 int fore = fgcolor_of (rend); // desired foreground
2253 int back = bgcolor_of (rend); // desired background 2291 int back = bgcolor_of (rend); // desired background
2254 2292
2255 // only do special processing if any attributes are set, which is unlikely 2293 // only do special processing if any attributes are set, which is unlikely
2256 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2294 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2257 { 2295 {
2258#if ENABLE_STYLES
2259 // "careful" (too wide) character handling
2260
2261 // include previous careful character(s) if possible, looks nicer (best effort...)
2262 while (text > stp
2263 && srp[text - stp - 1] & RS_Careful
2264 && RS_SAME (rend, srp[text - stp - 1]))
2265 text--, count++, xpixel -= fwidth;
2266
2267 // force redraw after "careful" characters to avoid pixel droppings
2268 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2269 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2270
2271 // force redraw before "careful" characters to avoid pixel droppings
2272 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2273 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2274#endif
2275
2276 bool invert = rend & RS_RVid; 2296 bool invert = rend & RS_RVid;
2277 2297
2278#ifndef NO_BOLD_UNDERLINE_REVERSE 2298#ifndef NO_BOLD_UNDERLINE_REVERSE
2279 if (rend & RS_Bold
2280 && fore == Color_fg) 2299 if (rend & RS_Bold && fore == Color_fg)
2281 { 2300 {
2282 if (ISSET_PIXCOLOR (Color_BD)) 2301 if (ISSET_PIXCOLOR (Color_BD))
2283 fore = Color_BD; 2302 fore = Color_BD;
2284# if !ENABLE_STYLES 2303# if !ENABLE_STYLES
2285 else 2304 else
2286 invert = !invert; 2305 invert = !invert;
2287# endif 2306# endif
2288 } 2307 }
2289 2308
2290 if (rend & RS_Italic 2309 if (rend & RS_Italic && fore == Color_fg)
2291 && fore == Color_fg)
2292 { 2310 {
2293 if (ISSET_PIXCOLOR (Color_IT)) 2311 if (ISSET_PIXCOLOR (Color_IT))
2294 fore = Color_IT; 2312 fore = Color_IT;
2295# if !ENABLE_STYLES 2313# if !ENABLE_STYLES
2296 else 2314 else
2297 invert = !invert; 2315 invert = !invert;
2298# endif 2316# endif
2299 } 2317 }
2300 2318
2301 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2319 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2302 fore = Color_UL; 2320 fore = Color_UL;
2303#endif 2321#endif
2304 2322
2305 if (invert) 2323 if (invert)
2306 { 2324 {
2325#ifdef OPTION_HC
2326 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2327 || !ISSET_PIXCOLOR (Color_HC))
2328#endif
2329 /* invert the column if no highlightColor is set or it is the
2330 * current cursor column */
2307 ::swap (fore, back); 2331 ::swap (fore, back);
2332#ifdef OPTION_HC
2333 else if (ISSET_PIXCOLOR (Color_HC))
2334 back = Color_HC;
2335#endif
2308 2336
2309#ifndef NO_BOLD_UNDERLINE_REVERSE 2337#ifndef NO_BOLD_UNDERLINE_REVERSE
2338# ifndef OPTION_HC
2310 if (ISSET_PIXCOLOR (Color_RV)) 2339 if (ISSET_PIXCOLOR (Color_RV))
2311 back = Color_RV; 2340 back = Color_RV;
2312 2341# endif
2313 if (fore == back) 2342 if (fore == back)
2314 { 2343 {
2315 fore = Color_bg; 2344 fore = Color_bg;
2316 back = Color_fg; 2345 back = Color_fg;
2317 } 2346 }
… …
2319 } 2348 }
2320 2349
2321#ifdef TEXT_BLINK 2350#ifdef TEXT_BLINK
2322 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2351 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2323 { 2352 {
2324 if (!text_blink_ev.active) 2353 if (!text_blink_ev.is_active ())
2325 { 2354 {
2326 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2355 text_blink_ev.again ();
2327 hidden_text = 0; 2356 hidden_text = 0;
2328 } 2357 }
2329 else if (hidden_text) 2358 else if (hidden_text)
2330 fore = back; 2359 fore = back;
2331 } 2360 }
2332#endif 2361#endif
2362
2363#if ENABLE_STYLES
2364 // "careful" (too wide) character handling
2365
2366 // include previous careful character(s) if possible, looks nicer (best effort...)
2367 while (text > stp
2368 && srp[text - stp - 1] & RS_Careful
2369 && RS_SAME (rend, srp[text - stp - 1]))
2370 text--, count++, xpixel -= fwidth;
2371
2372 // force redraw after "careful" characters to avoid pixel droppings
2373 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2374 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2375
2376 // force redraw before "careful" characters to avoid pixel droppings
2377 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2378 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2379#endif
2333 } 2380 }
2334 2381
2335 /* 2382 /*
2336 * Actually do the drawing of the string here 2383 * Actually do the drawing of the string here
2337 */ 2384 */
2338 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2385 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2339 2386
2340 if (back == fore) 2387 if (expect_true (have_bg && back == Color_bg))
2341 font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back);
2342 else if (back == Color_bg && have_bg)
2343 { 2388 {
2344 // this is very ugly, maybe push it into ->draw? 2389 // this is very ugly, maybe push it into ->draw?
2345 2390
2346 for (i = 0; i < count; i++) /* don't draw empty strings */ 2391 for (i = 0; i < count; i++) /* don't draw empty strings */
2347 if (text[i] != ' ') 2392 if (text[i] != ' ')
2348 { 2393 {
2349 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2394 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2350 goto did_clear; 2395 goto did_clear;
2351 } 2396 }
2352 2397
2353 CLEAR_CHARS (xpixel, ypixel, count); 2398 CLEAR_CHARS (xpixel, ypixel, count);
2354 did_clear: ; 2399 did_clear: ;
2355 } 2400 }
2356 else 2401 else
2357 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2402 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2358 2403
2359 if (rend & RS_Uline && font->descent > 1 && fore != back) 2404 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2360 { 2405 {
2361#if ENABLE_FRILLS 2406#if ENABLE_FRILLS
2362 if (ISSET_PIXCOLOR (Color_underline)) 2407 if (ISSET_PIXCOLOR (Color_underline))
2363 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2408 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2364 else 2409 else
2365#endif 2410#endif
2366 XSetForeground (dpy, gc, pix_colors[fore]); 2411 XSetForeground (dpy, gc, pix_colors[fore]);
2367 2412
2368 XDrawLine (dpy, drawBuffer, gc, 2413 XDrawLine (dpy, vt, gc,
2369 xpixel, ypixel + font->ascent + 1, 2414 xpixel, ypixel + font->ascent + 1,
2370 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2415 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2371 } 2416 }
2372 } /* for (col....) */ 2417 } /* for (col....) */
2373 } /* for (row....) */ 2418 } /* for (row....) */
… …
2382 */ 2427 */
2383 if (showcursor) 2428 if (showcursor)
2384 { 2429 {
2385 if (focus) 2430 if (focus)
2386 { 2431 {
2387 if (OPTION (Opt_cursorUnderline)) 2432 if (option (Opt_cursorUnderline))
2388 *crp ^= RS_Uline; 2433 *crp ^= RS_Uline;
2389 else 2434 else
2390 { 2435 {
2391 *crp ^= RS_RVid; 2436 *crp ^= RS_RVid;
2392#ifndef NO_CURSORCOLOR 2437#ifndef NO_CURSORCOLOR
… …
2407 cursorwidth++; 2452 cursorwidth++;
2408 2453
2409#ifndef NO_CURSORCOLOR 2454#ifndef NO_CURSORCOLOR
2410 if (ISSET_PIXCOLOR (Color_cursor)) 2455 if (ISSET_PIXCOLOR (Color_cursor))
2411 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2456 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2457 else
2412#endif 2458#endif
2459 XSetForeground (dpy, gc, pix_colors[ccol1]);
2413 2460
2414 XDrawRectangle (dpy, drawBuffer, gc, 2461 XDrawRectangle (dpy, vt, gc,
2415 Col2Pixel (col), 2462 Col2Pixel (col),
2416 Row2Pixel (oldcursor.row), 2463 Row2Pixel (oldcursor.row),
2417 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2464 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2418 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2465 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2419 } 2466 }
… …
2454} 2501}
2455 2502
2456void 2503void
2457rxvt_term::scr_recolour () NOTHROW 2504rxvt_term::scr_recolour () NOTHROW
2458{ 2505{
2459 if (1 2506#ifdef HAVE_BG_PIXMAP
2460#if TRANSPARENT 2507 bgPixmap.apply ();
2461 && !am_transparent 2508#else
2462#endif 2509
2463#if XPM_BACKGROUND
2464 && !bgPixmap.pixmap
2465#endif
2466 )
2467 {
2468 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2510 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2469 XClearWindow (dpy, parent[0]); 2511 XClearWindow (dpy, parent[0]);
2470 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2512 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2471#if HAVE_SCROLLBARS 2513
2472 if (scrollBar.win) 2514 if (scrollBar.win)
2473 { 2515 {
2474 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2516 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2475 scrollBar.setIdle (); 2517 scrollBar.state = STATE_IDLE;
2476 scrollbar_show (0); 2518 scrollBar.show (0);
2477 }
2478#endif
2479 } 2519 }
2480 2520
2521#endif
2522
2523 /* bgPixmap.apply () does not do the following : */
2481 scr_clear (); 2524 scr_clear ();
2482 scr_touch (true); 2525 scr_touch (true);
2483 want_refresh = 1; 2526 want_refresh = 1;
2484} 2527}
2485 2528
… …
2577{ 2620{
2578 int row, wrote; 2621 int row, wrote;
2579 unsigned int width, towrite; 2622 unsigned int width, towrite;
2580 char r1[] = "\n"; 2623 char r1[] = "\n";
2581 2624
2582 for (row = saveLines - nsaved; 2625 for (row = saveLines + top_row;
2583 row < saveLines + nrow - 1; row++) 2626 row < saveLines + nrow - 1; row++)
2584 { 2627 {
2585 width = row_buf[row].l >= 0 ? row_buf[row].l 2628 width = row_buf[row].l >= 0 ? row_buf[row].l
2586 : ncol; 2629 : ncol;
2587 for (towrite = width; towrite; towrite -= wrote) 2630 for (towrite = width; towrite; towrite -= wrote)
… …
2638 /* convert normal newline chars into common keyboard Return key sequence */ 2681 /* convert normal newline chars into common keyboard Return key sequence */
2639 for (unsigned int i = 0; i < len; i++) 2682 for (unsigned int i = 0; i < len; i++)
2640 if (data[i] == C0_LF) 2683 if (data[i] == C0_LF)
2641 data[i] = C0_CR; 2684 data[i] = C0_CR;
2642 2685
2686 if (priv_modes & PrivMode_BracketPaste)
2687 tt_printf ("\e[200~");
2688
2643 tt_write (data, len); 2689 tt_write (data, len);
2690
2691 if (priv_modes & PrivMode_BracketPaste)
2692 tt_printf ("\e[201~");
2644} 2693}
2645 2694
2646/* ------------------------------------------------------------------------- */ 2695/* ------------------------------------------------------------------------- */
2647/* 2696/*
2648 * Respond to a notification that a primary selection has been sent 2697 * Respond to a notification that a primary selection has been sent
… …
2723 if (!delete_prop) 2772 if (!delete_prop)
2724 XDeleteProperty (dpy, win, prop); 2773 XDeleteProperty (dpy, win, prop);
2725 2774
2726 selection_wait = Sel_incr; 2775 selection_wait = Sel_incr;
2727 incr_buf_fill = 0; 2776 incr_buf_fill = 0;
2728 incr_ev.start (NOW + 10); 2777 incr_ev.start (10);
2729 2778
2730 goto bailout; 2779 goto bailout;
2731 } 2780 }
2732 2781
2733 if (ct.nitems == 0) 2782 if (ct.nitems == 0)
… …
2742 ct.nitems = incr_buf_fill; 2791 ct.nitems = incr_buf_fill;
2743 incr_buf = 0; 2792 incr_buf = 0;
2744 incr_buf_size = 0; 2793 incr_buf_size = 0;
2745 incr_ev.stop (); 2794 incr_ev.stop ();
2746 } 2795 }
2747 else 2796 else
2748 { 2797 {
2749 if (selection_wait == Sel_normal 2798 if (selection_wait == Sel_normal
2750 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2799 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2751 { 2800 {
2752 /* 2801 /*
… …
2759 goto bailout; 2808 goto bailout;
2760 } 2809 }
2761 } 2810 }
2762 else if (selection_wait == Sel_incr) 2811 else if (selection_wait == Sel_incr)
2763 { 2812 {
2764 incr_ev.start (NOW + 10); 2813 incr_ev.start (10);
2765 2814
2766 while (incr_buf_fill + ct.nitems > incr_buf_size) 2815 while (incr_buf_fill + ct.nitems > incr_buf_size)
2767 { 2816 {
2768 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2817 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2769 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2818 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2809 if (selection_wait == Sel_normal) 2858 if (selection_wait == Sel_normal)
2810 selection_wait = Sel_none; 2859 selection_wait = Sel_none;
2811} 2860}
2812 2861
2813void 2862void
2814rxvt_term::incr_cb (time_watcher &w) NOTHROW 2863rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2815{ 2864{
2816 selection_wait = Sel_none; 2865 selection_wait = Sel_none;
2817 2866
2818 incr_buf_size = 0; 2867 incr_buf_size = 0;
2819 free (incr_buf); 2868 free (incr_buf);
… …
2830 selection_paste (win, prop, true); 2879 selection_paste (win, prop, true);
2831} 2880}
2832 2881
2833/* ------------------------------------------------------------------------- */ 2882/* ------------------------------------------------------------------------- */
2834/* 2883/*
2835 * Request the current selection: 2884 * Request the current selection:
2836 * Order: > internal selection if available 2885 * Order: > internal selection if available
2837 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2886 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2838 * > CUT_BUFFER0 2887 * > CUT_BUFFER0
2839 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2888 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2840 * will auto fallback to CUT_BUFFER0 2889 * will auto fallback to CUT_BUFFER0
… …
2842 */ 2891 */
2843void 2892void
2844rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2893rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2845{ 2894{
2846 if (selection.text && selnum == Sel_Primary) 2895 if (selection.text && selnum == Sel_Primary)
2896 {
2847 { /* internal selection */ 2897 /* internal selection */
2848 char *str = rxvt_wcstombs (selection.text, selection.len); 2898 char *str = rxvt_wcstombs (selection.text, selection.len);
2849 paste (str, strlen (str)); 2899 paste (str, strlen (str));
2850 free (str); 2900 free (str);
2851 return; 2901 return;
2852 } 2902 }
… …
3118 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3168 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3119 3169
3120 while (selection.mark.col > 0 3170 while (selection.mark.col > 0
3121 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3171 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3122 --selection.mark.col; 3172 --selection.mark.col;
3123 3173
3124 if (selection.op) 3174 if (selection.op)
3175 {
3125 { /* clear the old selection */ 3176 /* clear the old selection */
3126 selection.beg.row = selection.end.row = selection.mark.row; 3177 selection.beg.row = selection.end.row = selection.mark.row;
3127 selection.beg.col = selection.end.col = selection.mark.col; 3178 selection.beg.col = selection.end.col = selection.mark.col;
3128 } 3179 }
3129 3180
3130 selection.op = SELECTION_INIT; 3181 selection.op = SELECTION_INIT;
… …
3319 * a point/word/line which is either the start or end of the selection 3370 * a point/word/line which is either the start or end of the selection
3320 * and it was decided by whichever point/word/line was `fixed' at the 3371 * and it was decided by whichever point/word/line was `fixed' at the
3321 * time of the most recent button3 press 3372 * time of the most recent button3 press
3322 */ 3373 */
3323 if (button3 && buttonpress) 3374 if (button3 && buttonpress)
3375 {
3324 { /* button3 press */ 3376 /* button3 press */
3325 /* 3377 /*
3326 * first determine which edge of the selection we are closest to 3378 * first determine which edge of the selection we are closest to
3327 */ 3379 */
3328 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3380 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3329 || (!ROWCOL_IS_AFTER (pos, selection.end) 3381 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3347 selection.mark.row = selection.beg.row; 3399 selection.mark.row = selection.beg.row;
3348 selection.mark.col = selection.beg.col; 3400 selection.mark.col = selection.beg.col;
3349 } 3401 }
3350 } 3402 }
3351 else 3403 else
3404 {
3352 { /* button1 drag or button3 drag */ 3405 /* button1 drag or button3 drag */
3353 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3406 if (ROWCOL_IS_AFTER (selection.mark, pos))
3354 { 3407 {
3355 if (selection.mark.row == selection.end.row 3408 if (selection.mark.row == selection.end.row
3356 && selection.mark.col == selection.end.col 3409 && selection.mark.col == selection.end.col
3357 && clickchange 3410 && clickchange
… …
3400 selection_delimit_word (DN, &selection.end, &selection.end); 3453 selection_delimit_word (DN, &selection.end, &selection.end);
3401 } 3454 }
3402 else if (selection.clicks == 3) 3455 else if (selection.clicks == 3)
3403 { 3456 {
3404#if ENABLE_FRILLS 3457#if ENABLE_FRILLS
3405 if (OPTION (Opt_tripleclickwords)) 3458 if (option (Opt_tripleclickwords))
3406 { 3459 {
3407 selection_delimit_word (UP, &selection.beg, &selection.beg); 3460 selection_delimit_word (UP, &selection.beg, &selection.beg);
3408 3461
3409 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3462 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3410 { 3463 {
… …
3438 selection.end.row++; 3491 selection.end.row++;
3439 } 3492 }
3440 } 3493 }
3441 3494
3442 if (button3 && buttonpress) 3495 if (button3 && buttonpress)
3496 {
3443 { /* mark may need to be changed */ 3497 /* mark may need to be changed */
3444 if (closeto == LEFT) 3498 if (closeto == LEFT)
3445 { 3499 {
3446 selection.mark.row = selection.end.row; 3500 selection.mark.row = selection.end.row;
3447 selection.mark.col = selection.end.col - (selection.clicks == 2); 3501 selection.mark.col = selection.end.col - (selection.clicks == 2);
3448 } 3502 }
… …
3647 XFree (ct.value); 3701 XFree (ct.value);
3648 } 3702 }
3649 3703
3650 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3704 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3651} 3705}
3652
3653/* ------------------------------------------------------------------------- *
3654 * MOUSE ROUTINES *
3655 * ------------------------------------------------------------------------- */
3656
3657/*
3658 * return col/row values corresponding to x/y pixel values
3659 */
3660void
3661rxvt_term::pixel_position (int *x, int *y) NOTHROW
3662{
3663 *x = Pixel2Col (*x);
3664 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3665 *y = Pixel2Row (*y);
3666 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3667}
3668 3706
3669/* ------------------------------------------------------------------------- */ 3707/* ------------------------------------------------------------------------- */
3670#ifdef USE_XIM 3708#ifdef USE_XIM
3671void 3709void
3672rxvt_term::im_set_position (XPoint &pos) NOTHROW 3710rxvt_term::im_set_position (XPoint &pos) NOTHROW

Diff Legend

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