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.247 by root, Sun Jan 22 20:39:47 2006 UTC vs.
Revision 1.319 by root, Tue Nov 4 23:08:44 2008 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-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 (display->display, 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 (display->display, 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 (display->display, 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
… …
126 width = ncol; 108 width = ncol;
127 } 109 }
128 110
129 l.touch (); 111 l.touch ();
130 112
131 efs &= ~RS_baseattrMask; 113 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 114 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133 115
134 text_t *et = l.t + col; 116 text_t *et = l.t + col;
135 rend_t *er = l.r + col; 117 rend_t *er = l.r + col;
136 118
… …
148{ 130{
149 scr_blank_line (l, 0, ncol, efs); 131 scr_blank_line (l, 0, ncol, efs);
150 132
151 l.l = 0; 133 l.l = 0;
152 l.f = 0; 134 l.f = 0;
135}
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);
153} 154}
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 scr_scroll_region (0, MAX_ROWS - 1);
466 scr_rendition (0, ~RS_None);
467 scr_insert_mode (0);
459} 468}
460 469
461/* ------------------------------------------------------------------------- * 470/* ------------------------------------------------------------------------- *
462 * PROCESS SCREEN COMMANDS * 471 * PROCESS SCREEN COMMANDS *
463 * ------------------------------------------------------------------------- */ 472 * ------------------------------------------------------------------------- */
… …
510} 519}
511 520
512void 521void
513rxvt_term::scr_swap_screen () 522rxvt_term::scr_swap_screen ()
514{ 523{
515 if (!OPTION (Opt_secondaryScreen)) 524 if (!option (Opt_secondaryScreen))
516 return; 525 return;
517 526
518 for (int i = prev_nrow; i--; ) 527 for (int i = prev_nrow; i--; )
519 ::swap (ROW(i), swap_buf [i]); 528 ::swap (ROW(i), swap_buf [i]);
520 529
… …
542 selection_check (2); /* check for boundary cross */ 551 selection_check (2); /* check for boundary cross */
543 552
544 int i = current_screen; current_screen = scrn; scrn = i; 553 int i = current_screen; current_screen = scrn; scrn = i;
545 554
546#if NSCREENS 555#if NSCREENS
547 if (OPTION (Opt_secondaryScreen)) 556 if (option (Opt_secondaryScreen))
548 { 557 {
549 num_scr = 0; 558 num_scr = 0;
550 559
551 scr_swap_screen (); 560 scr_swap_screen ();
552 561
… …
555 screen.flags |= Screen_VisibleCursor; 564 screen.flags |= Screen_VisibleCursor;
556 swap.flags |= Screen_VisibleCursor; 565 swap.flags |= Screen_VisibleCursor;
557 } 566 }
558 else 567 else
559#endif 568#endif
560 if (OPTION (Opt_secondaryScroll)) 569 if (option (Opt_secondaryScroll))
561 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 570 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
562} 571}
563 572
564// clear WrapNext indicator, solidifying position on next line 573// clear WrapNext indicator, solidifying position on next line
565void 574void
… …
598/* 607/*
599 * Change the rendition style for following text 608 * Change the rendition style for following text
600 */ 609 */
601void 610void
602rxvt_term::scr_rendition (int set, int style) NOTHROW 611rxvt_term::scr_rendition (int set, int style) NOTHROW
603 { 612{
604 if (set) 613 if (set)
605 rstyle |= style; 614 rstyle |= style;
606 else if (style == ~RS_None) 615 else if (style == ~RS_None)
607 rstyle = DEFAULT_RSTYLE; 616 rstyle = DEFAULT_RSTYLE;
608 else 617 else
609 rstyle &= ~style; 618 rstyle &= ~style;
610 } 619}
611 620
612/* ------------------------------------------------------------------------- */ 621/* ------------------------------------------------------------------------- */
613/* 622/*
614 * Scroll text between <row1> and <row2> inclusive, by <count> lines 623 * Scroll text between <row1> and <row2> inclusive, by <count> lines
615 * count positive ==> scroll up 624 * count positive ==> scroll up
… …
624 want_refresh = 1; 633 want_refresh = 1;
625 num_scr += count; 634 num_scr += count;
626 635
627 if (count > 0 636 if (count > 0
628 && row1 == 0 637 && row1 == 0
629 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 638 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
630 { 639 {
631 top_row = max (top_row - count, -saveLines); 640 top_row = max (top_row - count, -saveLines);
632 641
633 // scroll everything up 'count' lines 642 // scroll everything up 'count' lines
634 term_start = (term_start + count) % total_rows; 643 term_start = (term_start + count) % total_rows;
… …
641 } 650 }
642 651
643 // erase newly scrolled-in lines 652 // erase newly scrolled-in lines
644 for (int i = count; i--; ) 653 for (int i = count; i--; )
645 { 654 {
646 // basically this is a slightly optimized scr_blank_screen_mem
647 // it is worth the effort on slower machines
648 line_t &l = ROW(nrow - 1 - i); 655 line_t &l = ROW(nrow - 1 - i);
649 656
657 // optimize if already cleared, can be significant on slow machines
658 // could be rolled into scr_blank_screen_mem
659 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
660 {
650 scr_blank_line (l, 0, l.l, rstyle); 661 scr_blank_line (l, 0, l.l, rstyle);
651
652 l.l = 0; 662 l.l = 0;
653 l.f = 0; 663 l.f = 0;
664 }
665 else
666 scr_blank_screen_mem (l, rstyle);
654 } 667 }
655 668
656 // now copy lines below the scroll region bottom to the 669 // now copy lines below the scroll region bottom to the
657 // bottom of the screen again, so they look as if they 670 // bottom of the screen again, so they look as if they
658 // hadn't moved. 671 // hadn't moved.
… …
662 line_t &l2 = ROW(i); 675 line_t &l2 = ROW(i);
663 676
664 ::swap (l1, l2); 677 ::swap (l1, l2);
665 l2.touch (); 678 l2.touch ();
666 } 679 }
667 680
668 // move and/or clear selection, if any 681 // move and/or clear selection, if any
669 if (selection.op && current_screen == selection.screen) 682 if (selection.op && current_screen == selection.screen)
670 { 683 {
671 selection.beg.row -= count; 684 selection.beg.row -= count;
672 selection.end.row -= count; 685 selection.end.row -= count;
… …
680 selection.op = SELECTION_CLEAR; 693 selection.op = SELECTION_CLEAR;
681 } 694 }
682 } 695 }
683 696
684 // finally move the view window, if desired 697 // finally move the view window, if desired
685 if (OPTION (Opt_scrollWithBuffer) 698 if (option (Opt_scrollWithBuffer)
686 && view_start != 0 699 && view_start != 0
687 && view_start != -saveLines) 700 && view_start != -saveLines)
688 scr_page (UP, count); 701 scr_page (UP, count);
689 702
690 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 703 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
708 { 721 {
709 /* move selected region too */ 722 /* move selected region too */
710 selection.beg.row -= count; 723 selection.beg.row -= count;
711 selection.end.row -= count; 724 selection.end.row -= count;
712 selection.mark.row -= count; 725 selection.mark.row -= count;
713 726
714 selection_check (0); 727 selection_check (0);
715 } 728 }
716 } 729 }
717 730
718 // use a simple and robust scrolling algorithm, this 731 // use a simple and robust scrolling algorithm, this
… …
758 ZERO_SCROLLBACK (); 771 ZERO_SCROLLBACK ();
759 772
760 if (minlines > 0) 773 if (minlines > 0)
761 { 774 {
762 minlines += screen.cur.row - screen.bscroll; 775 minlines += screen.cur.row - screen.bscroll;
776 min_it (minlines, screen.cur.row - top_row);
763 777
764 if (minlines > 0 778 if (minlines > 0
765 && screen.tscroll == 0 779 && screen.tscroll == 0
766 && screen.bscroll == nrow - 1) 780 && screen.bscroll == nrow - 1)
767 { 781 {
… …
784 798
785 while (str < strend) 799 while (str < strend)
786 { 800 {
787 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 801 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
788 802
789 if (c < 0x20) 803 if (expect_false (c < 0x20))
790 if (c == C0_LF) 804 if (c == C0_LF)
791 { 805 {
792 max_it (line->l, screen.cur.col); 806 max_it (line->l, screen.cur.col);
793 807
794 screen.flags &= ~Screen_WrapNext; 808 screen.flags &= ~Screen_WrapNext;
… …
813 { 827 {
814 scr_tab (1, true); 828 scr_tab (1, true);
815 continue; 829 continue;
816 } 830 }
817 831
832 if (expect_false (
818 if (checksel /* see if we're writing within selection */ 833 checksel /* see if we're writing within selection */
819 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 834 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
820 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 835 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
836 ))
821 { 837 {
822 checksel = 0; 838 checksel = 0;
823 /* 839 /*
824 * If we wrote anywhere in the selected area, kill the selection 840 * If we wrote anywhere in the selected area, kill the selection
825 * XXX: should we kill the mark too? Possibly, but maybe that 841 * XXX: should we kill the mark too? Possibly, but maybe that
826 * should be a similar check. 842 * should be a similar check.
827 */ 843 */
828 CLEAR_SELECTION (); 844 CLEAR_SELECTION ();
829 } 845 }
830 846
831 if (screen.flags & Screen_WrapNext) 847 if (expect_false (screen.flags & Screen_WrapNext))
832 { 848 {
833 scr_do_wrap (); 849 scr_do_wrap ();
834 850
835 line->l = ncol; 851 line->l = ncol;
836 line->is_longer (1); 852 line->is_longer (1);
837 853
838 row = screen.cur.row; 854 row = screen.cur.row;
839 line = &ROW(row); /* _must_ refresh */ 855 line = &ROW(row); /* _must_ refresh */
840 } 856 }
841 857
842 // some utf-8 decoders "decode" surrogate characters: let's fix this. 858 // some utf-8 decoders "decode" surrogate characters: let's fix this.
843 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 859 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
844 c = 0xfffd; 860 c = 0xfffd;
845 861
846 // rely on wcwidth to tell us the character width, at least for non-latin1 862 // rely on wcwidth to tell us the character width, do wcwidth before
847 // do wcwidth before further replacements, as wcwidth might return -1 863 // further replacements, as wcwidth might return -1 for the line
848 // for the line drawing characters below as they might be invalid in the current 864 // drawing characters below as they might be invalid in the current
849 // locale. 865 // locale.
850 int width = c < 0x100 ? 1 : wcwidth (c); 866 int width = WCWIDTH (c);
851 867
852 if (charsets [screen.charset] == '0') // DEC SPECIAL 868 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
853 { 869 {
854 // vt100 special graphics and line drawing 870 // vt100 special graphics and line drawing
855 // 5f-7e standard vt100 871 // 5f-7e standard vt100
856 // 40-5e rxvt extension for extra curses acs chars 872 // 40-5e rxvt extension for extra curses acs chars
857 static uint16_t vt100_0[62] = { // 41 .. 7e 873 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
870 c = vt100_0[c - 0x41]; 886 c = vt100_0[c - 0x41];
871 width = 1; // vt100 line drawing characters are always single-width 887 width = 1; // vt100 line drawing characters are always single-width
872 } 888 }
873 } 889 }
874 890
875 if (screen.flags & Screen_Insert) 891 if (expect_false (screen.flags & Screen_Insert))
876 scr_insdel_chars (width, INSERT); 892 scr_insdel_chars (width, INSERT);
877 893
878 if (width != 0) 894 if (width != 0)
879 { 895 {
880#if !UNICODE_3 896#if !UNICODE_3
… …
886 c = 0xfffd; 902 c = 0xfffd;
887# endif 903# endif
888#endif 904#endif
889 905
890 // nuke the character at this position, if required 906 // nuke the character at this position, if required
907 if (expect_false (
891 if (line->t[screen.cur.col] == NOCHAR 908 line->t[screen.cur.col] == NOCHAR
892 || (screen.cur.col < ncol - 1 909 || (screen.cur.col < ncol - 1
893 && line->t[screen.cur.col + 1] == NOCHAR)) 910 && line->t[screen.cur.col + 1] == NOCHAR)
911 ))
912 scr_kill_char (*line, screen.cur.col);
913
914 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
915
916 // if the character doesn't fit into the remaining columns...
917 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
894 { 918 {
895 int col = screen.cur.col; 919 // ... artificially enlargen the previous one
896
897 // find begin
898 while (col > 0 && line->t[col] == NOCHAR)
899 col--;
900
901 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
902
903 // found begin, nuke
904 do {
905 line->t[col] = ' ';
906 line->r[col] = rend;
907 col++;
908 } while (col < ncol && line->t[col] == NOCHAR);
909 }
910
911 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
912
913 // if the character doesn't fit into the remaining columns...
914 if (screen.cur.col > ncol - width && ncol >= width)
915 {
916 // ...output spaces
917 c = ' '; 920 c = NOCHAR;
918 // and try the same character next loop iteration 921 // and try the same character next loop iteration
919 --str; 922 --str;
920 } 923 }
921 924
922 line->touch (); 925 line->touch ();
… …
924 do 927 do
925 { 928 {
926 line->t[screen.cur.col] = c; 929 line->t[screen.cur.col] = c;
927 line->r[screen.cur.col] = rend; 930 line->r[screen.cur.col] = rend;
928 931
929 if (screen.cur.col < ncol - 1) 932 if (expect_true (screen.cur.col < ncol - 1))
930 screen.cur.col++; 933 screen.cur.col++;
931 else 934 else
932 { 935 {
933 line->l = ncol; 936 line->l = ncol;
934 if (screen.flags & Screen_Autowrap) 937 if (screen.flags & Screen_Autowrap)
… …
936 break; 939 break;
937 } 940 }
938 941
939 c = NOCHAR; 942 c = NOCHAR;
940 } 943 }
941 while (--width > 0); 944 while (expect_false (--width > 0));
942 945
943 // pad with spaces when overwriting wide character with smaller one 946 // pad with spaces when overwriting wide character with smaller one
944 if (!width) 947 if (expect_false (!width))
945 { 948 {
946 line->touch (); 949 line->touch ();
947 950
948 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
949 { 952 {
950 line->t[c] = ' '; 953 line->t[c] = ' ';
951 line->r[c] = rend; 954 line->r[c] = rend;
952 } 955 }
953 } 956 }
954 } 957 }
958#if ENABLE_COMBINING
955 else // width == 0 959 else // width == 0
956 { 960 {
957#if ENABLE_COMBINING 961 if (c != 0xfeff) // ignore BOM
958 // handle combining characters
959 // we just tag the accent on the previous on-screen character.
960 // this is arguably not correct, but also arguably not wrong.
961 // we don't handle double-width characters nicely yet.
962 line_t *linep;
963 text_t *tp;
964 rend_t *rp;
965
966 if (screen.cur.col > 0)
967 { 962 {
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 {
968 linep = line; 973 linep = line;
969 tp = line->t + screen.cur.col - 1; 974 tp = line->t + screen.cur.col - 1;
970 rp = line->r + screen.cur.col - 1; 975 rp = line->r + screen.cur.col - 1;
976 }
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 }
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));
971 } 999 }
972 else if (screen.cur.row > 0
973 && ROW(screen.cur.row - 1).is_longer ())
974 {
975 linep = &ROW(screen.cur.row - 1);
976 tp = line->t + ncol - 1;
977 rp = line->r + ncol - 1;
978 } 1000 }
979 else
980 continue;
981
982 linep->touch ();
983
984 while (*tp == NOCHAR && tp > linep->t)
985 tp--, rp--;
986
987 // first try to find a precomposed character
988 unicode_t n = rxvt_compose (*tp, c);
989 if (n == NOCHAR)
990 n = rxvt_composite.compose (*tp, c);
991
992 *tp = n;
993 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
994#endif 1001#endif
995 }
996 } 1002 }
997 1003
998 max_it (line->l, screen.cur.col); 1004 max_it (line->l, screen.cur.col);
999 1005
1000#ifdef DEBUG_STRICT 1006#ifdef DEBUG_STRICT
… …
1008 * XTERM_SEQ: CTRL-H 1014 * XTERM_SEQ: CTRL-H
1009 */ 1015 */
1010void 1016void
1011rxvt_term::scr_backspace () NOTHROW 1017rxvt_term::scr_backspace () NOTHROW
1012{ 1018{
1013 want_refresh = 1;
1014
1015 if (screen.cur.col == 0) 1019 if (screen.cur.col == 0)
1016 { 1020 {
1017 if (screen.cur.row > 0) 1021 if (screen.cur.row > 0)
1018 { 1022 {
1019#ifdef TERMCAP_HAS_BW 1023#ifdef TERMCAP_HAS_BW
1020 screen.cur.col = ncol - 1; 1024 screen.cur.col = ncol - 1;
1021 screen.cur.row--; 1025 --screen.cur.row;
1022 return; 1026
1027 want_refresh = 1;
1023#endif 1028#endif
1024 } 1029 }
1025 } 1030 }
1026 else if (!(screen.flags & Screen_WrapNext)) 1031 else
1027 scr_gotorc (0, -1, RELATIVE); 1032 scr_gotorc (0, -1, RELATIVE);
1028
1029 screen.flags &= ~Screen_WrapNext;
1030} 1033}
1031 1034
1032/* ------------------------------------------------------------------------- */ 1035/* ------------------------------------------------------------------------- */
1033/* 1036/*
1034 * Process Horizontal Tab 1037 * Process Horizontal Tab
… …
1057 x = i; 1060 x = i;
1058 1061
1059 if (!--count) 1062 if (!--count)
1060 break; 1063 break;
1061 } 1064 }
1062 else 1065 else
1063 ht &= l.t[i] == ' ' 1066 ht &= l.t[i] == ' '
1064 && RS_SAME (l.r[i], base_rend); 1067 && RS_SAME (l.r[i], base_rend);
1065 1068
1066 if (count) 1069 if (count)
1067 x = ncol - 1; 1070 x = ncol - 1;
1068 1071
1069 // store horizontal tab commands as characters inside the text 1072 // store horizontal tab commands as characters inside the text
1070 // buffer so they can be selected and pasted. 1073 // buffer so they can be selected and pasted.
1071 if (ht && OPTION (Opt_pastableTabs)) 1074 if (ht && option (Opt_pastableTabs))
1072 { 1075 {
1073 base_rend = SET_FONT (base_rend, 0); 1076 base_rend = SET_FONT (base_rend, 0);
1074 1077
1075 l.touch (x); 1078 l.touch (x);
1076 1079
… …
1109 * Process DEC Back Index 1112 * Process DEC Back Index
1110 * XTERM_SEQ: ESC 6 1113 * XTERM_SEQ: ESC 6
1111 * Move cursor left in row. If we're at the left boundary, shift everything 1114 * Move cursor left in row. If we're at the left boundary, shift everything
1112 * in that row right. Clear left column. 1115 * in that row right. Clear left column.
1113 */ 1116 */
1114#if ENABLE_FRILLS 1117#if !ENABLE_MINIMAL
1115void 1118void
1116rxvt_term::scr_backindex () NOTHROW 1119rxvt_term::scr_backindex () NOTHROW
1117{ 1120{
1118 if (screen.cur.col > 0) 1121 if (screen.cur.col > 0)
1119 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1122 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
… …
1126 * Process DEC Forward Index 1129 * Process DEC Forward Index
1127 * XTERM_SEQ: ESC 9 1130 * XTERM_SEQ: ESC 9
1128 * Move cursor right in row. If we're at the right boundary, shift everything 1131 * Move cursor right in row. If we're at the right boundary, shift everything
1129 * in that row left. Clear right column. 1132 * in that row left. Clear right column.
1130 */ 1133 */
1131#if ENABLE_FRILLS 1134#if !ENABLE_MINIMAL
1132void 1135void
1133rxvt_term::scr_forwardindex () NOTHROW 1136rxvt_term::scr_forwardindex () NOTHROW
1134{ 1137{
1135 if (screen.cur.col < ncol - 1) 1138 if (screen.cur.col < ncol - 1)
1136 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1139 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
… …
1183 } 1186 }
1184 } 1187 }
1185 else 1188 else
1186 { 1189 {
1187 if (screen.flags & Screen_Relative) 1190 if (screen.flags & Screen_Relative)
1191 {
1188 { /* relative origin mode */ 1192 /* relative origin mode */
1189 screen.cur.row = row + screen.tscroll; 1193 screen.cur.row = row + screen.tscroll;
1190 min_it (screen.cur.row, screen.bscroll); 1194 min_it (screen.cur.row, screen.bscroll);
1191 } 1195 }
1192 else 1196 else
1193 screen.cur.row = row; 1197 screen.cur.row = row;
… …
1226/* 1230/*
1227 * Erase part or whole of a line 1231 * Erase part or whole of a line
1228 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1232 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1229 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1233 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1230 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1234 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1235 * extension: clear to right unless wrapped: ESC [ 3 K
1231 */ 1236 */
1232void 1237void
1233rxvt_term::scr_erase_line (int mode) NOTHROW 1238rxvt_term::scr_erase_line (int mode) NOTHROW
1234{ 1239{
1235 unsigned int col, num; 1240 unsigned int col, num;
… …
1244 line.touch (); 1249 line.touch ();
1245 line.is_longer (0); 1250 line.is_longer (0);
1246 1251
1247 switch (mode) 1252 switch (mode)
1248 { 1253 {
1254 case 3:
1255 if (screen.flags & Screen_WrapNext)
1256 return;
1257
1258 /* fall through */
1259
1249 case 0: /* erase to end of line */ 1260 case 0: /* erase to end of line */
1250 col = screen.cur.col; 1261 col = screen.cur.col;
1251 num = ncol - col; 1262 num = ncol - col;
1252 min_it (line.l, col); 1263 min_it (line.l, col);
1264
1253 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1265 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1254 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1266 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1255 CLEAR_SELECTION (); 1267 CLEAR_SELECTION ();
1256 break; 1268 break;
1269
1257 case 1: /* erase to beginning of line */ 1270 case 1: /* erase to beginning of line */
1258 col = 0; 1271 col = 0;
1259 num = screen.cur.col + 1; 1272 num = screen.cur.col + 1;
1273
1260 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1274 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1261 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1275 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1262 CLEAR_SELECTION (); 1276 CLEAR_SELECTION ();
1263 break; 1277 break;
1278
1264 case 2: /* erase whole line */ 1279 case 2: /* erase whole line */
1265 col = 0; 1280 col = 0;
1266 num = ncol; 1281 num = ncol;
1267 line.l = 0; 1282 line.l = 0;
1268 if (selection.beg.row <= screen.cur.row 1283 if (selection.beg.row <= screen.cur.row
… …
1326 if (row >= nrow) /* Out Of Bounds */ 1341 if (row >= nrow) /* Out Of Bounds */
1327 return; 1342 return;
1328 1343
1329 min_it (num, nrow - row); 1344 min_it (num, nrow - row);
1330 1345
1346 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1331 if (rstyle & (RS_RVid | RS_Uline)) 1347 if (rstyle & (RS_RVid | RS_Uline))
1332 ren = (rend_t) ~RS_None; 1348 ren = (rend_t) ~RS_None;
1333 else if (GET_BASEBG (rstyle) == Color_bg) 1349 else if (GET_BASEBG (rstyle) == Color_bg)
1334 { 1350 {
1335 ren = DEFAULT_RSTYLE; 1351 ren = DEFAULT_RSTYLE;
1336 CLEAR_ROWS (row, num); 1352
1353 if (mapped)
1354 XClearArea (dpy, vt, 0,
1355 Row2Pixel (row), (unsigned int)width,
1356 (unsigned int)Height2Pixel (num), False);
1337 } 1357 }
1338 else 1358 else
1339 { 1359 {
1340 ren = rstyle & (RS_fgMask | RS_bgMask); 1360 ren = rstyle & (RS_fgMask | RS_bgMask);
1361
1341 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1362 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1342 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1363 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1343 ERASE_ROWS (row, num); 1364 XFillRectangle (dpy, vt, gc,
1365 0, Row2Pixel (row),
1366 (unsigned int)width,
1367 (unsigned int)Height2Pixel (num));
1344 gcvalue.foreground = pix_colors[Color_fg]; 1368 gcvalue.foreground = pix_colors[Color_fg];
1345 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1369 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1346 } 1370 }
1347 1371
1348 for (; num--; row++) 1372 for (; num--; row++)
1349 { 1373 {
1350 scr_blank_screen_mem (ROW(row), rstyle); 1374 scr_blank_screen_mem (ROW(row), rstyle);
1351 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1375 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1352 } 1376 }
1353} 1377}
1354 1378
1355#if ENABLE_FRILLS 1379#if !ENABLE_MINIMAL
1356void 1380void
1357rxvt_term::scr_erase_savelines () NOTHROW 1381rxvt_term::scr_erase_savelines () NOTHROW
1358{ 1382{
1359 want_refresh = 1; 1383 want_refresh = 1;
1360 ZERO_SCROLLBACK (); 1384 ZERO_SCROLLBACK ();
… …
1430 * Insert/Delete <count> characters from the current position 1454 * Insert/Delete <count> characters from the current position
1431 */ 1455 */
1432void 1456void
1433rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1457rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1434{ 1458{
1435 int col, row;
1436 rend_t tr;
1437
1438 want_refresh = 1; 1459 want_refresh = 1;
1439 ZERO_SCROLLBACK (); 1460 ZERO_SCROLLBACK ();
1440 1461
1441 if (count <= 0) 1462 if (count <= 0)
1442 return; 1463 return;
… …
1444 scr_do_wrap (); 1465 scr_do_wrap ();
1445 1466
1446 selection_check (1); 1467 selection_check (1);
1447 min_it (count, ncol - screen.cur.col); 1468 min_it (count, ncol - screen.cur.col);
1448 1469
1449 row = screen.cur.row; 1470 int row = screen.cur.row;
1450 1471
1451 line_t *line = &ROW(row); 1472 line_t *line = &ROW(row);
1452 1473
1453 line->touch (); 1474 line->touch ();
1454 line->is_longer (0); 1475 line->is_longer (0);
1455 1476
1477 // nuke wide spanning the start
1478 if (line->t[screen.cur.col] == NOCHAR)
1479 scr_kill_char (*line, screen.cur.col);
1480
1456 switch (insdel) 1481 switch (insdel)
1457 { 1482 {
1458 case INSERT: 1483 case INSERT:
1459 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1484 line->l = min (line->l + count, ncol);
1485
1486 if (line->t[screen.cur.col] == NOCHAR)
1487 scr_kill_char (*line, screen.cur.col);
1488
1489 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1460 { 1490 {
1461 line->t[col] = line->t[col - count]; 1491 line->t[col] = line->t[col - count];
1462 line->r[col] = line->r[col - count]; 1492 line->r[col] = line->r[col - count];
1463 } 1493 }
1464
1465 line->l = min (line->l + count, ncol);
1466 1494
1467 if (selection.op && current_screen == selection.screen 1495 if (selection.op && current_screen == selection.screen
1468 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1496 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1469 { 1497 {
1470 if (selection.end.row != screen.cur.row 1498 if (selection.end.row != screen.cur.row
1471 || (selection.end.col + count >= ncol)) 1499 || (selection.end.col + count >= ncol))
1472 CLEAR_SELECTION (); 1500 CLEAR_SELECTION ();
1473 else 1501 else
1502 {
1474 { /* shift selection */ 1503 /* shift selection */
1475 selection.beg.col += count; 1504 selection.beg.col += count;
1476 selection.mark.col += count; /* XXX: yes? */ 1505 selection.mark.col += count; /* XXX: yes? */
1477 selection.end.col += count; 1506 selection.end.col += count;
1478 } 1507 }
1479 } 1508 }
… …
1484 case ERASE: 1513 case ERASE:
1485 screen.cur.col += count; /* don't worry if > ncol */ 1514 screen.cur.col += count; /* don't worry if > ncol */
1486 selection_check (1); 1515 selection_check (1);
1487 screen.cur.col -= count; 1516 screen.cur.col -= count;
1488 1517
1489 line->l = max (line->l - count, 0); 1518 // nuke wide char after the end
1519 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1520 scr_kill_char (*line, screen.cur.col + count);
1521
1490 scr_blank_line (*line, screen.cur.col, count, rstyle); 1522 scr_blank_line (*line, screen.cur.col, count, rstyle);
1491 break; 1523 break;
1492 1524
1493 case DELETE: 1525 case DELETE:
1494 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1526 line->l = max (line->l - count, 0);
1495 1527
1528 // nuke wide char spanning the end
1529 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1530 scr_kill_char (*line, screen.cur.col + count);
1531
1496 for (col = screen.cur.col; (col + count) < ncol; col++) 1532 for (int col = screen.cur.col; (col + count) < ncol; col++)
1497 { 1533 {
1498 line->t[col] = line->t[col + count]; 1534 line->t[col] = line->t[col + count];
1499 line->r[col] = line->r[col + count]; 1535 line->r[col] = line->r[col + count];
1500 } 1536 }
1501 1537
1502 line->l = max (line->l - count, 0);
1503 scr_blank_line (*line, ncol - count, count, tr); 1538 scr_blank_line (*line, ncol - count, count,
1539 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1504 1540
1505 if (selection.op && current_screen == selection.screen 1541 if (selection.op && current_screen == selection.screen
1506 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1542 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1507 { 1543 {
1508 if (selection.end.row != screen.cur.row 1544 if (selection.end.row != screen.cur.row
… …
1618 */ 1654 */
1619void 1655void
1620rxvt_term::scr_set_tab (int mode) NOTHROW 1656rxvt_term::scr_set_tab (int mode) NOTHROW
1621{ 1657{
1622 if (mode < 0) 1658 if (mode < 0)
1623 memset (tabs, 0, ncol * sizeof (char)); 1659 memset (tabs, 0, ncol);
1624 else if (screen.cur.col < ncol) 1660 else if (screen.cur.col < ncol)
1625 tabs [screen.cur.col] = !!mode; 1661 tabs [screen.cur.col] = !!mode;
1626} 1662}
1627 1663
1628/* ------------------------------------------------------------------------- */ 1664/* ------------------------------------------------------------------------- */
… …
1643 if (rvideo_state != on) 1679 if (rvideo_state != on)
1644 { 1680 {
1645 rvideo_state = on; 1681 rvideo_state = on;
1646 1682
1647 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1683 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1648#if XPM_BACKGROUND 1684#ifdef HAVE_BG_PIXMAP
1649 if (bgPixmap.pixmap == None) 1685 if (bgPixmap.pixmap == None)
1650#endif 1686#endif
1651#if TRANSPARENT
1652 if (!OPTION (Opt_transparent) || am_transparent == 0)
1653#endif
1654 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 1687 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1655 1688
1656 XGCValues gcvalue; 1689 XGCValues gcvalue;
1657 gcvalue.foreground = pix_colors[Color_fg]; 1690 gcvalue.foreground = pix_colors[Color_fg];
1658 gcvalue.background = pix_colors[Color_bg]; 1691 gcvalue.background = pix_colors[Color_bg];
1659 XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue); 1692 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1660 1693
1661 scr_clear (); 1694 scr_clear ();
1662 scr_touch (true); 1695 scr_touch (true);
1663 } 1696 }
1664} 1697}
… …
1749{ 1782{
1750 bool found = false; 1783 bool found = false;
1751 1784
1752 for (int i = 0; i < nrow; i++) 1785 for (int i = 0; i < nrow; i++)
1753 { 1786 {
1754 int col = 0;
1755 rend_t *drp = drawn_buf[i].r; 1787 rend_t *drp = drawn_buf[i].r;
1756 1788
1757 for (; col < ncol; col++, drp++) 1789 for (int col = 0; col < ncol; col++, drp++)
1758 if ((*drp & mask) == value) 1790 if ((*drp & mask) == value)
1759 { 1791 {
1760 found = true; 1792 found = true;
1761 *drp = ~value; 1793 *drp = ~value;
1762 } 1794 }
… …
1802 for (i = PART_BEG; i < RC_COUNT; i++) 1834 for (i = PART_BEG; i < RC_COUNT; i++)
1803 { 1835 {
1804 min_it (rc[i].col, ncol - 1); 1836 min_it (rc[i].col, ncol - 1);
1805 min_it (rc[i].row, nrow - 1); 1837 min_it (rc[i].row, nrow - 1);
1806 } 1838 }
1807 1839// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1808 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1840 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1809 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1841 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1810 1842
1811 num_scr_allow = 0; 1843 num_scr_allow = 0;
1812 1844
… …
1867 return true; 1899 return true;
1868} 1900}
1869 1901
1870#ifndef NO_BELL 1902#ifndef NO_BELL
1871void 1903void
1872rxvt_term::bell_cb (time_watcher &w) 1904rxvt_term::bell_cb (ev::timer &w, int revents)
1873{ 1905{
1874 rvideo_bell = false; 1906 rvideo_bell = false;
1875 scr_rvideo_mode (rvideo_mode); 1907 scr_rvideo_mode (rvideo_mode);
1908 refresh_check ();
1876} 1909}
1877#endif 1910#endif
1878 1911
1879/* ------------------------------------------------------------------------- */ 1912/* ------------------------------------------------------------------------- */
1880void 1913void
… …
1882{ 1915{
1883#ifndef NO_BELL 1916#ifndef NO_BELL
1884 1917
1885# ifndef NO_MAPALERT 1918# ifndef NO_MAPALERT
1886# ifdef MAPALERT_OPTION 1919# ifdef MAPALERT_OPTION
1887 if (OPTION (Opt_mapAlert)) 1920 if (option (Opt_mapAlert))
1888# endif 1921# endif
1889 XMapWindow (display->display, parent[0]); 1922 XMapWindow (dpy, parent[0]);
1890# endif 1923# endif
1891 1924
1925# if ENABLE_FRILLS
1926 if (option (Opt_urgentOnBell))
1927 set_urgency (1);
1928# endif
1929
1892 if (OPTION (Opt_visualBell)) 1930 if (option (Opt_visualBell))
1893 { 1931 {
1894 rvideo_bell = true; 1932 rvideo_bell = true;
1895 scr_rvideo_mode (rvideo_mode); 1933 scr_rvideo_mode (rvideo_mode);
1896 display->flush (); 1934 flush ();
1897 1935
1898 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1936 bell_ev.start (VISUAL_BELL_DURATION);
1899 } 1937 }
1900 else 1938 else
1901 XBell (display->display, 0); 1939 XBell (dpy, 0);
1902
1903#endif 1940#endif
1904} 1941}
1905 1942
1906/* ------------------------------------------------------------------------- */ 1943/* ------------------------------------------------------------------------- */
1907/* ARGSUSED */ 1944/* ARGSUSED */
1908void 1945void
1909rxvt_term::scr_printscreen (int fullhist) NOTHROW 1946rxvt_term::scr_printscreen (int fullhist) NOTHROW
1910{ 1947{
1911#ifdef PRINTPIPE 1948#ifdef PRINTPIPE
1912 int nrows, row_start; 1949 int nrows, row_start;
1913 FILE *fd; 1950 FILE *fd = popen_printer ();
1914 1951
1915 if ((fd = popen_printer ()) == NULL) 1952 if (!fd)
1916 return; 1953 return;
1917 1954
1918 if (fullhist) 1955 if (fullhist)
1919 { 1956 {
1920 nrows = nrow - top_row; 1957 nrows = nrow - top_row;
… …
1965 * screen.text/screen.rend contain what the screen will change to. 2002 * screen.text/screen.rend contain what the screen will change to.
1966 */ 2003 */
1967void 2004void
1968rxvt_term::scr_refresh () NOTHROW 2005rxvt_term::scr_refresh () NOTHROW
1969{ 2006{
1970 unsigned char must_clear, /* use draw_string not draw_image_string */ 2007 unsigned char have_bg,
1971 showcursor; /* show the cursor */ 2008 showcursor; /* show the cursor */
1972 int16_t col, row, /* column/row we're processing */ 2009 int16_t col, row, /* column/row we're processing */
1973 ocrow; /* old cursor row */ 2010 ocrow; /* old cursor row */
1974 int i; /* tmp */ 2011 int i; /* tmp */
1975#ifndef NO_CURSORCOLOR 2012#ifndef NO_CURSORCOLOR
1976 rend_t cc1; /* store colours at cursor position (s) */ 2013 rend_t cc1; /* store colours at cursor position (s) */
1977#endif 2014#endif
1978 rend_t *crp; // cursor rendition pointer 2015 rend_t *crp; // cursor rendition pointer
2016 rend_t ccol1, /* Cursor colour */
2017 ccol2; /* Cursor colour2 */
1979 2018
1980 want_refresh = 0; /* screen is current */ 2019 want_refresh = 0; /* screen is current */
1981 2020
1982 if (refresh_type == NO_REFRESH || !mapped) 2021 if (refresh_type == NO_REFRESH || !mapped)
1983 return; 2022 return;
1984 2023
1985 /* 2024 /*
1986 * A: set up vars 2025 * A: set up vars
1987 */ 2026 */
1988 must_clear = 0;
1989 refresh_count = 0; 2027 refresh_count = 0;
1990 2028
1991#if XPM_BACKGROUND 2029 have_bg = 0;
2030#ifdef HAVE_BG_PIXMAP
1992 must_clear |= bgPixmap.pixmap != None; 2031 have_bg = bgPixmap.pixmap != None;
1993#endif
1994#if TRANSPARENT
1995 must_clear |= OPTION (Opt_transparent) && am_transparent;
1996#endif 2032#endif
1997 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2033 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1998 2034
1999 /* 2035 /*
2000 * B: reverse any characters which are selected 2036 * B: reverse any characters which are selected
… …
2004 /* 2040 /*
2005 * C: set the cursor character (s) 2041 * C: set the cursor character (s)
2006 */ 2042 */
2007 { 2043 {
2008 unsigned char setoldcursor; 2044 unsigned char setoldcursor;
2009 rend_t ccol1, /* Cursor colour */
2010 ccol2; /* Cursor colour2 */
2011 2045
2012 showcursor = (screen.flags & Screen_VisibleCursor); 2046 showcursor = (screen.flags & Screen_VisibleCursor);
2013#ifdef CURSOR_BLINK 2047#ifdef CURSOR_BLINK
2014 if (hidden_cursor) 2048 if (hidden_cursor)
2015 showcursor = 0; 2049 showcursor = 0;
… …
2022 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2056 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2023 col--; 2057 col--;
2024 2058
2025 crp = &ROW(screen.cur.row).r[col]; 2059 crp = &ROW(screen.cur.row).r[col];
2026 2060
2061#ifndef NO_CURSORCOLOR
2062 cc1 = *crp & (RS_fgMask | RS_bgMask);
2063 if (ISSET_PIXCOLOR (Color_cursor))
2064 ccol1 = Color_cursor;
2065 else
2066#endif
2067#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2068 ccol1 = fgcolor_of (rstyle);
2069#else
2070 ccol1 = Color_fg;
2071#endif
2072
2073#ifndef NO_CURSORCOLOR
2074 if (ISSET_PIXCOLOR (Color_cursor2))
2075 ccol2 = Color_cursor2;
2076 else
2077#endif
2078#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2079 ccol2 = bgcolor_of (rstyle);
2080#else
2081 ccol2 = Color_bg;
2082#endif
2083
2027 if (showcursor && focus) 2084 if (showcursor && focus)
2028 { 2085 {
2029 if (OPTION (Opt_cursorUnderline)) 2086 if (option (Opt_cursorUnderline))
2030 *crp ^= RS_Uline; 2087 *crp ^= RS_Uline;
2031 else 2088 else
2032 { 2089 {
2033 *crp ^= RS_RVid; 2090 *crp ^= RS_RVid;
2034
2035#ifndef NO_CURSORCOLOR
2036 cc1 = *crp & (RS_fgMask | RS_bgMask);
2037 if (ISSET_PIXCOLOR (Color_cursor))
2038 ccol1 = Color_cursor;
2039 else
2040#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2041 ccol1 = fgcolor_of (rstyle);
2042#else
2043 ccol1 = Color_fg;
2044#endif
2045 if (ISSET_PIXCOLOR (Color_cursor2))
2046 ccol2 = Color_cursor2;
2047 else
2048#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2049 ccol2 = bgcolor_of (rstyle);
2050#else
2051 ccol2 = Color_bg;
2052#endif
2053 *crp = SET_FGCOLOR (*crp, ccol1); 2091 *crp = SET_FGCOLOR (*crp, ccol1);
2054 *crp = SET_BGCOLOR (*crp, ccol2); 2092 *crp = SET_BGCOLOR (*crp, ccol2);
2055#endif
2056 } 2093 }
2057 } 2094 }
2058 } 2095 }
2059 2096
2060 /* make sure no outline cursor is left around */ 2097 /* make sure no outline cursor is left around */
… …
2099 * D: CopyArea pass - very useful for slower links 2136 * D: CopyArea pass - very useful for slower links
2100 * This has been deliberately kept simple. 2137 * This has been deliberately kept simple.
2101 */ 2138 */
2102 if (!display->is_local 2139 if (!display->is_local
2103 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2140 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2104 && abs (num_scr) < nrow && !must_clear) 2141 && abs (num_scr) < nrow && !have_bg)
2105 { 2142 {
2106 int16_t nits; 2143 int16_t nits;
2144 int i = num_scr;
2107 int j; 2145 int j;
2108 int len, wlen; 2146 int len, wlen;
2109 dLocal (int, num_scr); 2147 dLocal (int, num_scr);
2110 2148
2111 j = nrow; 2149 j = nrow;
2112 wlen = len = -1; 2150 wlen = len = -1;
2113 row = i > 0 ? 0 : j - 1; 2151 row = i > 0 ? 0 : j - 1;
2152
2114 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2153 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2115 { 2154 {
2116 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2155 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2117 { 2156 {
2118 line_t s = ROW(view_start + row); 2157 line_t s = ROW(view_start + row);
… …
2139 wlen = row; 2178 wlen = row;
2140 continue; 2179 continue;
2141 } 2180 }
2142 } 2181 }
2143 2182
2144 if (len != -1) 2183 if (len >= 0)
2145 { 2184 {
2146 /* also comes here at end if needed because of >= above */ 2185 /* also comes here at end if needed because of >= above */
2147 if (wlen < len) 2186 if (wlen < len)
2148 ::swap (wlen, len); 2187 ::swap (wlen, len);
2149 2188
2189 XGCValues gcv;
2190
2191 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2150 XCopyArea (display->display, vt, vt, 2192 XCopyArea (dpy, vt, vt,
2151 gc, 0, Row2Pixel (len + i), 2193 gc, 0, Row2Pixel (len + i),
2152 (unsigned int)this->width, 2194 (unsigned int)this->width,
2153 (unsigned int)Height2Pixel (wlen - len + 1), 2195 (unsigned int)Height2Pixel (wlen - len + 1),
2154 0, Row2Pixel (len)); 2196 0, Row2Pixel (len));
2197 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2198
2155 len = -1; 2199 len = -1;
2156 } 2200 }
2157 } 2201 }
2158 } 2202 }
2159#endif 2203#endif
… …
2183 continue; 2227 continue;
2184 2228
2185 // redraw one or more characters 2229 // redraw one or more characters
2186 2230
2187 // seek to the beginning of wide characters 2231 // seek to the beginning of wide characters
2188 while (stp[col] == NOCHAR && col > 0) 2232 while (expect_false (stp[col] == NOCHAR && col > 0))
2189 --col; 2233 --col;
2190 2234
2191 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2235 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2192 text_t *text = stp + col; 2236 text_t *text = stp + col;
2193 int count = 1; 2237 int count = 1;
… …
2215 count++; 2259 count++;
2216 2260
2217 if (stp[col] != dtp[col] 2261 if (stp[col] != dtp[col]
2218 || !RS_SAME (srp[col], drp[col])) 2262 || !RS_SAME (srp[col], drp[col]))
2219 { 2263 {
2220 if (must_clear && (i++ > count / 2)) 2264 if (have_bg && (i++ > count / 2))
2221 break; 2265 break;
2222 2266
2223 dtp[col] = stp[col]; 2267 dtp[col] = stp[col];
2224 drp[col] = rend; 2268 drp[col] = rend;
2225 i = 0; 2269 i = 0;
2226 } 2270 }
2227 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2271 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2228 break; 2272 break;
2229 } 2273 }
2230 2274
2231 col--; /* went one too far. move back */ 2275 col--; /* went one too far. move back */
2232 count -= i; /* dump any matching trailing chars */ 2276 count -= i; /* dump any matching trailing chars */
2233 2277
2234 // sometimes we optimize away the trailing NOCHAR's, add them back 2278 // sometimes we optimize away the trailing NOCHAR's, add them back
2235 while (i && text[count] == NOCHAR) 2279 while (expect_false (i && text[count] == NOCHAR))
2236 count++, i--; 2280 count++, i--;
2237 2281
2238 /* 2282 /*
2239 * Determine the attributes for the string 2283 * Determine the attributes for the string
2240 */ 2284 */
2241 int fore = fgcolor_of (rend); // desired foreground 2285 int fore = fgcolor_of (rend); // desired foreground
2242 int back = bgcolor_of (rend); // desired background 2286 int back = bgcolor_of (rend); // desired background
2243 2287
2244 // only do special processing if any attributes are set, which is unlikely 2288 // only do special processing if any attributes are set, which is unlikely
2245 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2289 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2246 { 2290 {
2247#if ENABLE_STYLES
2248 // force redraw after "careful" characters to avoid pixel droppings
2249 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2250 drp[col + 1] = ~srp[col + 1];
2251
2252 // include previous careful character(s) if possible, looks nicer (best effort...)
2253 while (text > stp
2254 && srp[text - stp - 1] & RS_Careful
2255 && RS_SAME (rend, srp[text - stp - 1]))
2256 text--, count++, xpixel -= fwidth;
2257#endif
2258
2259 bool invert = rend & RS_RVid; 2291 bool invert = rend & RS_RVid;
2260 2292
2261#ifndef NO_BOLD_UNDERLINE_REVERSE 2293#ifndef NO_BOLD_UNDERLINE_REVERSE
2262 if (rend & RS_Bold
2263 && fore == Color_fg) 2294 if (rend & RS_Bold && fore == Color_fg)
2264 { 2295 {
2265 if (ISSET_PIXCOLOR (Color_BD)) 2296 if (ISSET_PIXCOLOR (Color_BD))
2266 fore = Color_BD; 2297 fore = Color_BD;
2267# if !ENABLE_STYLES 2298# if !ENABLE_STYLES
2268 else 2299 else
2269 invert = !invert; 2300 invert = !invert;
2270# endif 2301# endif
2271 } 2302 }
2272 2303
2273 if (rend & RS_Italic 2304 if (rend & RS_Italic && fore == Color_fg)
2274 && fore == Color_fg)
2275 { 2305 {
2276 if (ISSET_PIXCOLOR (Color_IT)) 2306 if (ISSET_PIXCOLOR (Color_IT))
2277 fore = Color_IT; 2307 fore = Color_IT;
2278# if !ENABLE_STYLES 2308# if !ENABLE_STYLES
2279 else 2309 else
2280 invert = !invert; 2310 invert = !invert;
2281# endif 2311# endif
2282 } 2312 }
2283 2313
2284 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2314 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2285 fore = Color_UL; 2315 fore = Color_UL;
2286#endif 2316#endif
2287 2317
2288 if (invert) 2318 if (invert)
2289 { 2319 {
2320#ifdef OPTION_HC
2321 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2322 || !ISSET_PIXCOLOR (Color_HC))
2323#endif
2324 /* invert the column if no highlightColor is set or it is the
2325 * current cursor column */
2290 ::swap (fore, back); 2326 ::swap (fore, back);
2327#ifdef OPTION_HC
2328 else if (ISSET_PIXCOLOR (Color_HC))
2329 back = Color_HC;
2330#endif
2291 2331
2292#ifndef NO_BOLD_UNDERLINE_REVERSE 2332#ifndef NO_BOLD_UNDERLINE_REVERSE
2333# ifndef OPTION_HC
2293 if (ISSET_PIXCOLOR (Color_RV)) 2334 if (ISSET_PIXCOLOR (Color_RV))
2294 back = Color_RV; 2335 back = Color_RV;
2295 2336# endif
2296 if (fore == back) 2337 if (fore == back)
2297 { 2338 {
2298 fore = Color_bg; 2339 fore = Color_bg;
2299 back = Color_fg; 2340 back = Color_fg;
2300 } 2341 }
… …
2302 } 2343 }
2303 2344
2304#ifdef TEXT_BLINK 2345#ifdef TEXT_BLINK
2305 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2346 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2306 { 2347 {
2307 if (!text_blink_ev.active) 2348 if (!text_blink_ev.is_active ())
2308 { 2349 {
2309 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2350 text_blink_ev.again ();
2310 hidden_text = 0; 2351 hidden_text = 0;
2311 } 2352 }
2312 else if (hidden_text) 2353 else if (hidden_text)
2313 fore = back; 2354 fore = back;
2314 } 2355 }
2315#endif 2356#endif
2357
2358#if ENABLE_STYLES
2359 // "careful" (too wide) character handling
2360
2361 // include previous careful character(s) if possible, looks nicer (best effort...)
2362 while (text > stp
2363 && srp[text - stp - 1] & RS_Careful
2364 && RS_SAME (rend, srp[text - stp - 1]))
2365 text--, count++, xpixel -= fwidth;
2366
2367 // force redraw after "careful" characters to avoid pixel droppings
2368 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2369 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2370
2371 // force redraw before "careful" characters to avoid pixel droppings
2372 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2373 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2374#endif
2316 } 2375 }
2317 2376
2318 /* 2377 /*
2319 * Actually do the drawing of the string here 2378 * Actually do the drawing of the string here
2320 */ 2379 */
2321 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2380 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2322 2381
2323 if (back == fore) 2382 if (expect_true (have_bg && back == Color_bg))
2324 font->clear_rect (*drawable, xpixel, ypixel,
2325 fwidth * count, fheight,
2326 back);
2327 else if (back == Color_bg)
2328 { 2383 {
2329 if (must_clear) 2384 // this is very ugly, maybe push it into ->draw?
2330 {
2331 CLEAR_CHARS (xpixel, ypixel, count);
2332 2385
2333 for (i = 0; i < count; i++) /* don't draw empty strings */ 2386 for (i = 0; i < count; i++) /* don't draw empty strings */
2334 if (text[i] != ' ') 2387 if (text[i] != ' ')
2335 { 2388 {
2336 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2389 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2337 break; 2390 goto did_clear;
2338 }
2339 } 2391 }
2340 else 2392
2341 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2393 CLEAR_CHARS (xpixel, ypixel, count);
2394 did_clear: ;
2342 } 2395 }
2343 else 2396 else
2344 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2397 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2345 2398
2346 if (rend & RS_Uline && font->descent > 1 && fore != back) 2399 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2347 { 2400 {
2348#if ENABLE_FRILLS 2401#if ENABLE_FRILLS
2349 if (ISSET_PIXCOLOR (Color_underline)) 2402 if (ISSET_PIXCOLOR (Color_underline))
2350 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2403 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2351 else 2404 else
2352#endif 2405#endif
2353 XSetForeground (display->display, gc, pix_colors[fore]); 2406 XSetForeground (dpy, gc, pix_colors[fore]);
2354 2407
2355 XDrawLine (display->display, drawBuffer, gc, 2408 XDrawLine (dpy, vt, gc,
2356 xpixel, ypixel + font->ascent + 1, 2409 xpixel, ypixel + font->ascent + 1,
2357 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2410 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2358 } 2411 }
2359 } /* for (col....) */ 2412 } /* for (col....) */
2360 } /* for (row....) */ 2413 } /* for (row....) */
… …
2369 */ 2422 */
2370 if (showcursor) 2423 if (showcursor)
2371 { 2424 {
2372 if (focus) 2425 if (focus)
2373 { 2426 {
2374 if (OPTION (Opt_cursorUnderline)) 2427 if (option (Opt_cursorUnderline))
2375 *crp ^= RS_Uline; 2428 *crp ^= RS_Uline;
2376 else 2429 else
2377 { 2430 {
2378 *crp ^= RS_RVid; 2431 *crp ^= RS_RVid;
2379#ifndef NO_CURSORCOLOR 2432#ifndef NO_CURSORCOLOR
… …
2393 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2446 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2394 cursorwidth++; 2447 cursorwidth++;
2395 2448
2396#ifndef NO_CURSORCOLOR 2449#ifndef NO_CURSORCOLOR
2397 if (ISSET_PIXCOLOR (Color_cursor)) 2450 if (ISSET_PIXCOLOR (Color_cursor))
2398 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2451 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2452 else
2399#endif 2453#endif
2454 XSetForeground (dpy, gc, pix_colors[ccol1]);
2400 2455
2401 XDrawRectangle (display->display, drawBuffer, gc, 2456 XDrawRectangle (dpy, vt, gc,
2402 Col2Pixel (col), 2457 Col2Pixel (col),
2403 Row2Pixel (oldcursor.row), 2458 Row2Pixel (oldcursor.row),
2404 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2459 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2405 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2460 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2406 } 2461 }
… …
2441} 2496}
2442 2497
2443void 2498void
2444rxvt_term::scr_recolour () NOTHROW 2499rxvt_term::scr_recolour () NOTHROW
2445{ 2500{
2446 if (1 2501#ifdef HAVE_BG_PIXMAP
2447#if TRANSPARENT 2502 bgPixmap.apply ();
2448 && !am_transparent 2503#else
2449#endif 2504
2450#if XPM_BACKGROUND
2451 && !bgPixmap.pixmap
2452#endif
2453 )
2454 {
2455 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2505 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2456 XClearWindow (display->display, parent[0]); 2506 XClearWindow (dpy, parent[0]);
2457 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2507 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2458#if HAVE_SCROLLBARS 2508
2459 if (scrollBar.win) 2509 if (scrollBar.win)
2460 { 2510 {
2461 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2511 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2462 scrollBar.setIdle (); 2512 scrollBar.state = STATE_IDLE;
2463 scrollbar_show (0); 2513 scrollBar.show (0);
2464 }
2465#endif
2466 } 2514 }
2467 2515
2516#endif
2517
2518 /* bgPixmap.apply () does not do the following : */
2468 scr_clear (); 2519 scr_clear ();
2469 scr_touch (true); 2520 scr_touch (true);
2470 want_refresh = 1; 2521 want_refresh = 1;
2471} 2522}
2472 2523
… …
2479 2530
2480 num_scr_allow = 0; 2531 num_scr_allow = 0;
2481 want_refresh = 1; 2532 want_refresh = 1;
2482 2533
2483 if (really) 2534 if (really)
2484 XClearWindow (display->display, vt); 2535 XClearWindow (dpy, vt);
2485} 2536}
2486 2537
2487void 2538void
2488rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2539rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2489{ 2540{
… …
2538{ 2589{
2539 if (selection.op 2590 if (selection.op
2540 && current_screen == selection.screen 2591 && current_screen == selection.screen
2541 && selection.end.row >= view_start) 2592 && selection.end.row >= view_start)
2542 { 2593 {
2543#if ENABLE_FRILLS 2594#if !ENABLE_MINIMAL
2544 if (selection.rect) 2595 if (selection.rect)
2545 scr_xor_rect (selection.beg.row, selection.beg.col, 2596 scr_xor_rect (selection.beg.row, selection.beg.col,
2546 selection.end.row, selection.end.col, 2597 selection.end.row, selection.end.col,
2547 RS_RVid, RS_RVid | RS_Uline); 2598 RS_RVid, RS_RVid | RS_Uline);
2548 else 2599 else
… …
2564{ 2615{
2565 int row, wrote; 2616 int row, wrote;
2566 unsigned int width, towrite; 2617 unsigned int width, towrite;
2567 char r1[] = "\n"; 2618 char r1[] = "\n";
2568 2619
2569 for (row = saveLines - nsaved; 2620 for (row = saveLines + top_row;
2570 row < saveLines + nrow - 1; row++) 2621 row < saveLines + nrow - 1; row++)
2571 { 2622 {
2572 width = row_buf[row].l >= 0 ? row_buf[row].l 2623 width = row_buf[row].l >= 0 ? row_buf[row].l
2573 : ncol; 2624 : ncol;
2574 for (towrite = width; towrite; towrite -= wrote) 2625 for (towrite = width; towrite; towrite -= wrote)
… …
2625 /* convert normal newline chars into common keyboard Return key sequence */ 2676 /* convert normal newline chars into common keyboard Return key sequence */
2626 for (unsigned int i = 0; i < len; i++) 2677 for (unsigned int i = 0; i < len; i++)
2627 if (data[i] == C0_LF) 2678 if (data[i] == C0_LF)
2628 data[i] = C0_CR; 2679 data[i] = C0_CR;
2629 2680
2681 if (priv_modes & PrivMode_BracketPaste)
2682 tt_printf ("\e[200~");
2683
2630 tt_write (data, len); 2684 tt_write (data, len);
2685
2686 if (priv_modes & PrivMode_BracketPaste)
2687 tt_printf ("\e[201~");
2631} 2688}
2632 2689
2633/* ------------------------------------------------------------------------- */ 2690/* ------------------------------------------------------------------------- */
2634/* 2691/*
2635 * Respond to a notification that a primary selection has been sent 2692 * Respond to a notification that a primary selection has been sent
… …
2664 } 2721 }
2665 2722
2666 unsigned long bytes_after; 2723 unsigned long bytes_after;
2667 XTextProperty ct; 2724 XTextProperty ct;
2668 2725
2669 if (XGetWindowProperty (display->display, win, prop, 2726 if (XGetWindowProperty (dpy, win, prop,
2670 0, PROP_SIZE / 4, 2727 0, PROP_SIZE / 4,
2671 delete_prop, AnyPropertyType, 2728 delete_prop, AnyPropertyType,
2672 &ct.encoding, &ct.format, 2729 &ct.encoding, &ct.format,
2673 &ct.nitems, &bytes_after, 2730 &ct.nitems, &bytes_after,
2674 &ct.value) != Success) 2731 &ct.value) != Success)
… …
2683 if (bytes_after) 2740 if (bytes_after)
2684 { 2741 {
2685 // fetch and append remaining data 2742 // fetch and append remaining data
2686 XTextProperty ct2; 2743 XTextProperty ct2;
2687 2744
2688 if (XGetWindowProperty (display->display, win, prop, 2745 if (XGetWindowProperty (dpy, win, prop,
2689 ct.nitems / 4, (bytes_after + 3) / 4, 2746 ct.nitems / 4, (bytes_after + 3) / 4,
2690 delete_prop, AnyPropertyType, 2747 delete_prop, AnyPropertyType,
2691 &ct2.encoding, &ct2.format, 2748 &ct2.encoding, &ct2.format,
2692 &ct2.nitems, &bytes_after, 2749 &ct2.nitems, &bytes_after,
2693 &ct2.value) != Success) 2750 &ct2.value) != Success)
… …
2706 2763
2707 if (ct.encoding == xa[XA_INCR]) 2764 if (ct.encoding == xa[XA_INCR])
2708 { 2765 {
2709 // INCR selection, start handshake 2766 // INCR selection, start handshake
2710 if (!delete_prop) 2767 if (!delete_prop)
2711 XDeleteProperty (display->display, win, prop); 2768 XDeleteProperty (dpy, win, prop);
2712 2769
2713 selection_wait = Sel_incr; 2770 selection_wait = Sel_incr;
2714 incr_buf_fill = 0; 2771 incr_buf_fill = 0;
2715 incr_ev.start (NOW + 10); 2772 incr_ev.start (10);
2716 2773
2717 goto bailout; 2774 goto bailout;
2718 } 2775 }
2719 2776
2720 if (ct.nitems == 0) 2777 if (ct.nitems == 0)
… …
2729 ct.nitems = incr_buf_fill; 2786 ct.nitems = incr_buf_fill;
2730 incr_buf = 0; 2787 incr_buf = 0;
2731 incr_buf_size = 0; 2788 incr_buf_size = 0;
2732 incr_ev.stop (); 2789 incr_ev.stop ();
2733 } 2790 }
2734 else 2791 else
2735 { 2792 {
2736 if (selection_wait == Sel_normal 2793 if (selection_wait == Sel_normal
2737 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2794 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2738 { 2795 {
2739 /* 2796 /*
… …
2746 goto bailout; 2803 goto bailout;
2747 } 2804 }
2748 } 2805 }
2749 else if (selection_wait == Sel_incr) 2806 else if (selection_wait == Sel_incr)
2750 { 2807 {
2751 incr_ev.start (NOW + 10); 2808 incr_ev.start (10);
2752 2809
2753 while (incr_buf_fill + ct.nitems > incr_buf_size) 2810 while (incr_buf_fill + ct.nitems > incr_buf_size)
2754 { 2811 {
2755 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2812 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2756 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2813 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2763 } 2820 }
2764 2821
2765 char **cl; 2822 char **cl;
2766 int cr; 2823 int cr;
2767 2824
2768#if ENABLE_FRILLS 2825#if !ENABLE_MINIMAL
2769 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2826 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2770 // so recode it manually 2827 // so recode it manually
2771 if (ct.encoding == xa[XA_UTF8_STRING]) 2828 if (ct.encoding == xa[XA_UTF8_STRING])
2772 { 2829 {
2773 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2830 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2777 paste (s, strlen (s)); 2834 paste (s, strlen (s));
2778 free (s); 2835 free (s);
2779 } 2836 }
2780 else 2837 else
2781#endif 2838#endif
2782 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2839 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2783 && cl) 2840 && cl)
2784 { 2841 {
2785 for (int i = 0; i < cr; i++) 2842 for (int i = 0; i < cr; i++)
2786 paste (cl[i], strlen (cl[i])); 2843 paste (cl[i], strlen (cl[i]));
2787 2844
… …
2796 if (selection_wait == Sel_normal) 2853 if (selection_wait == Sel_normal)
2797 selection_wait = Sel_none; 2854 selection_wait = Sel_none;
2798} 2855}
2799 2856
2800void 2857void
2801rxvt_term::incr_cb (time_watcher &w) NOTHROW 2858rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2802{ 2859{
2803 selection_wait = Sel_none; 2860 selection_wait = Sel_none;
2804 2861
2805 incr_buf_size = 0; 2862 incr_buf_size = 0;
2806 free (incr_buf); 2863 free (incr_buf);
… …
2817 selection_paste (win, prop, true); 2874 selection_paste (win, prop, true);
2818} 2875}
2819 2876
2820/* ------------------------------------------------------------------------- */ 2877/* ------------------------------------------------------------------------- */
2821/* 2878/*
2822 * Request the current selection: 2879 * Request the current selection:
2823 * Order: > internal selection if available 2880 * Order: > internal selection if available
2824 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2881 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2825 * > CUT_BUFFER0 2882 * > CUT_BUFFER0
2826 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2883 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2827 * will auto fallback to CUT_BUFFER0 2884 * will auto fallback to CUT_BUFFER0
… …
2829 */ 2886 */
2830void 2887void
2831rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2888rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2832{ 2889{
2833 if (selection.text && selnum == Sel_Primary) 2890 if (selection.text && selnum == Sel_Primary)
2891 {
2834 { /* internal selection */ 2892 /* internal selection */
2835 char *str = rxvt_wcstombs (selection.text, selection.len); 2893 char *str = rxvt_wcstombs (selection.text, selection.len);
2836 paste (str, strlen (str)); 2894 paste (str, strlen (str));
2837 free (str); 2895 free (str);
2838 return; 2896 return;
2839 } 2897 }
… …
2869 else if (selnum == Sel_Secondary) 2927 else if (selnum == Sel_Secondary)
2870 sel = XA_SECONDARY; 2928 sel = XA_SECONDARY;
2871 else 2929 else
2872 sel = xa[XA_CLIPBOARD]; 2930 sel = xa[XA_CLIPBOARD];
2873 2931
2874 if (XGetSelectionOwner (display->display, sel) != None) 2932 if (XGetSelectionOwner (dpy, sel) != None)
2875 { 2933 {
2876 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2934 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2877 vt, selection_request_time); 2935 vt, selection_request_time);
2878 return 1; 2936 return 1;
2879 } 2937 }
2880 2938
2881 return 0; 2939 return 0;
… …
2944 3002
2945 int end_col; 3003 int end_col;
2946 3004
2947 for (; row <= selection.end.row; row++, col = 0) 3005 for (; row <= selection.end.row; row++, col = 0)
2948 { 3006 {
2949#if ENABLE_FRILLS 3007#if !ENABLE_MINIMAL
2950 if (selection.rect) 3008 if (selection.rect)
2951 { 3009 {
2952 col = selection.beg.col; 3010 col = selection.beg.col;
2953 end_col = ncol + 1; 3011 end_col = ncol + 1;
2954 } 3012 }
… …
2957 end_col = ROW(row).l; 3015 end_col = ROW(row).l;
2958 3016
2959 col = max (col, 0); 3017 col = max (col, 0);
2960 3018
2961 if (row == selection.end.row 3019 if (row == selection.end.row
2962#if ENABLE_FRILLS 3020#if !ENABLE_MINIMAL
2963 || selection.rect 3021 || selection.rect
2964#endif 3022#endif
2965 ) 3023 )
2966 min_it (end_col, selection.end.col); 3024 min_it (end_col, selection.end.col);
2967 3025
… …
2990#endif 3048#endif
2991 else 3049 else
2992 new_selection_text[ofs++] = *t++; 3050 new_selection_text[ofs++] = *t++;
2993 } 3051 }
2994 3052
2995#if ENABLE_FRILLS 3053#if !ENABLE_MINIMAL
2996 if (selection.rect) 3054 if (selection.rect)
2997 { 3055 {
2998 while (ofs 3056 while (ofs
2999 && new_selection_text[ofs - 1] != C0_LF 3057 && new_selection_text[ofs - 1] != C0_LF
3000 && unicode::is_space (new_selection_text[ofs - 1])) 3058 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3034bool 3092bool
3035rxvt_term::selection_grab (Time tm) NOTHROW 3093rxvt_term::selection_grab (Time tm) NOTHROW
3036{ 3094{
3037 selection_time = tm; 3095 selection_time = tm;
3038 3096
3039 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3097 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3040 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3098 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3041 { 3099 {
3042 display->set_selection_owner (this); 3100 display->set_selection_owner (this);
3043 return true; 3101 return true;
3044 } 3102 }
3045 else 3103 else
… …
3049 } 3107 }
3050 3108
3051#if 0 3109#if 0
3052 XTextProperty ct; 3110 XTextProperty ct;
3053 3111
3054 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3112 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3055 { 3113 {
3056 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3114 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3057 XFree (ct.value); 3115 XFree (ct.value);
3058 } 3116 }
3059#endif 3117#endif
… …
3105 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3163 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3106 3164
3107 while (selection.mark.col > 0 3165 while (selection.mark.col > 0
3108 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3166 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3109 --selection.mark.col; 3167 --selection.mark.col;
3110 3168
3111 if (selection.op) 3169 if (selection.op)
3170 {
3112 { /* clear the old selection */ 3171 /* clear the old selection */
3113 selection.beg.row = selection.end.row = selection.mark.row; 3172 selection.beg.row = selection.end.row = selection.mark.row;
3114 selection.beg.col = selection.end.col = selection.mark.col; 3173 selection.beg.col = selection.end.col = selection.mark.col;
3115 } 3174 }
3116 3175
3117 selection.op = SELECTION_INIT; 3176 selection.op = SELECTION_INIT;
… …
3306 * a point/word/line which is either the start or end of the selection 3365 * a point/word/line which is either the start or end of the selection
3307 * and it was decided by whichever point/word/line was `fixed' at the 3366 * and it was decided by whichever point/word/line was `fixed' at the
3308 * time of the most recent button3 press 3367 * time of the most recent button3 press
3309 */ 3368 */
3310 if (button3 && buttonpress) 3369 if (button3 && buttonpress)
3370 {
3311 { /* button3 press */ 3371 /* button3 press */
3312 /* 3372 /*
3313 * first determine which edge of the selection we are closest to 3373 * first determine which edge of the selection we are closest to
3314 */ 3374 */
3315 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3375 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3316 || (!ROWCOL_IS_AFTER (pos, selection.end) 3376 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3334 selection.mark.row = selection.beg.row; 3394 selection.mark.row = selection.beg.row;
3335 selection.mark.col = selection.beg.col; 3395 selection.mark.col = selection.beg.col;
3336 } 3396 }
3337 } 3397 }
3338 else 3398 else
3399 {
3339 { /* button1 drag or button3 drag */ 3400 /* button1 drag or button3 drag */
3340 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3401 if (ROWCOL_IS_AFTER (selection.mark, pos))
3341 { 3402 {
3342 if (selection.mark.row == selection.end.row 3403 if (selection.mark.row == selection.end.row
3343 && selection.mark.col == selection.end.col 3404 && selection.mark.col == selection.end.col
3344 && clickchange 3405 && clickchange
… …
3361 3422
3362 if (selection.clicks == 1) 3423 if (selection.clicks == 1)
3363 { 3424 {
3364 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3425 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3365 && !ROW(selection.beg.row).is_longer () 3426 && !ROW(selection.beg.row).is_longer ()
3366#if ENABLE_FRILLS 3427#if !ENABLE_MINIMAL
3367 && !selection.rect 3428 && !selection.rect
3368#endif 3429#endif
3369 ) 3430 )
3370 selection.beg.col = ncol; 3431 selection.beg.col = ncol;
3371 3432
3372 if ( 3433 if (
3373 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3434 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3374 && !ROW(selection.end.row).is_longer () 3435 && !ROW(selection.end.row).is_longer ()
3375#if ENABLE_FRILLS 3436#if !ENABLE_MINIMAL
3376 && !selection.rect 3437 && !selection.rect
3377#endif 3438#endif
3378 ) 3439 )
3379 selection.end.col = ncol; 3440 selection.end.col = ncol;
3380 } 3441 }
… …
3387 selection_delimit_word (DN, &selection.end, &selection.end); 3448 selection_delimit_word (DN, &selection.end, &selection.end);
3388 } 3449 }
3389 else if (selection.clicks == 3) 3450 else if (selection.clicks == 3)
3390 { 3451 {
3391#if ENABLE_FRILLS 3452#if ENABLE_FRILLS
3392 if (OPTION (Opt_tripleclickwords)) 3453 if (option (Opt_tripleclickwords))
3393 { 3454 {
3394 selection_delimit_word (UP, &selection.beg, &selection.beg); 3455 selection_delimit_word (UP, &selection.beg, &selection.beg);
3395 3456
3396 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3457 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3397 { 3458 {
3398 if (!ROW(end_row).is_longer ()) 3459 if (!ROW(end_row).is_longer ())
3399 { 3460 {
3400 selection.end.row = end_row; 3461 selection.end.row = end_row;
3401 selection.end.col = ROW(end_row).l; 3462 selection.end.col = ROW(end_row).l;
3463# if !ENABLE_MINIMAL
3402 selection_remove_trailing_spaces (); 3464 selection_remove_trailing_spaces ();
3465# endif
3403 break; 3466 break;
3404 } 3467 }
3405 } 3468 }
3406 } 3469 }
3407 else 3470 else
… …
3423 selection.end.row++; 3486 selection.end.row++;
3424 } 3487 }
3425 } 3488 }
3426 3489
3427 if (button3 && buttonpress) 3490 if (button3 && buttonpress)
3491 {
3428 { /* mark may need to be changed */ 3492 /* mark may need to be changed */
3429 if (closeto == LEFT) 3493 if (closeto == LEFT)
3430 { 3494 {
3431 selection.mark.row = selection.end.row; 3495 selection.mark.row = selection.end.row;
3432 selection.mark.col = selection.end.col - (selection.clicks == 2); 3496 selection.mark.col = selection.end.col - (selection.clicks == 2);
3433 } 3497 }
… …
3436 selection.mark.row = selection.beg.row; 3500 selection.mark.row = selection.beg.row;
3437 selection.mark.col = selection.beg.col; 3501 selection.mark.col = selection.beg.col;
3438 } 3502 }
3439 } 3503 }
3440 3504
3441#if ENABLE_FRILLS 3505#if !ENABLE_MINIMAL
3442 if (selection.rect && selection.beg.col > selection.end.col) 3506 if (selection.rect && selection.beg.col > selection.end.col)
3443 ::swap (selection.beg.col, selection.end.col); 3507 ::swap (selection.beg.col, selection.end.col);
3444#endif 3508#endif
3445} 3509}
3446 3510
3447#if ENABLE_FRILLS 3511#if !ENABLE_MINIMAL
3448void 3512void
3449rxvt_term::selection_remove_trailing_spaces () NOTHROW 3513rxvt_term::selection_remove_trailing_spaces () NOTHROW
3450{ 3514{
3451 int32_t end_col, end_row; 3515 int32_t end_col, end_row;
3452 text_t *stp; 3516 text_t *stp;
… …
3507 */ 3571 */
3508void 3572void
3509rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3573rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3510{ 3574{
3511 XSelectionEvent ev; 3575 XSelectionEvent ev;
3512 dDisp;
3513 3576
3514 ev.type = SelectionNotify; 3577 ev.type = SelectionNotify;
3515 ev.property = None; 3578 ev.property = None;
3516 ev.display = rq.display; 3579 ev.display = rq.display;
3517 ev.requestor = rq.requestor; 3580 ev.requestor = rq.requestor;
… …
3531 *target++ = xa[XA_COMPOUND_TEXT]; 3594 *target++ = xa[XA_COMPOUND_TEXT];
3532#if X_HAVE_UTF8_STRING 3595#if X_HAVE_UTF8_STRING
3533 *target++ = xa[XA_UTF8_STRING]; 3596 *target++ = xa[XA_UTF8_STRING];
3534#endif 3597#endif
3535 3598
3536 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3599 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3537 32, PropModeReplace, 3600 32, PropModeReplace,
3538 (unsigned char *)target_list, target - target_list); 3601 (unsigned char *)target_list, target - target_list);
3539 ev.property = rq.property; 3602 ev.property = rq.property;
3540 } 3603 }
3541#if TODO // TODO 3604#if TODO // TODO
… …
3544 /* TODO: Handle MULTIPLE */ 3607 /* TODO: Handle MULTIPLE */
3545 } 3608 }
3546#endif 3609#endif
3547 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3610 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3548 { 3611 {
3549 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3612 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3550 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3613 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3551 ev.property = rq.property; 3614 ev.property = rq.property;
3552 } 3615 }
3553 else if (rq.target == XA_STRING 3616 else if (rq.target == XA_STRING
3554 || rq.target == xa[XA_TEXT] 3617 || rq.target == xa[XA_TEXT]
… …
3578 style = enc_string; 3641 style = enc_string;
3579 else if (target == xa[XA_TEXT]) 3642 else if (target == xa[XA_TEXT])
3580 style = enc_text; 3643 style = enc_text;
3581 else if (target == xa[XA_COMPOUND_TEXT]) 3644 else if (target == xa[XA_COMPOUND_TEXT])
3582 style = enc_compound_text; 3645 style = enc_compound_text;
3583#if ENABLE_FRILLS 3646#if !ENABLE_MINIMAL
3584 else if (target == xa[XA_UTF8_STRING]) 3647 else if (target == xa[XA_UTF8_STRING])
3585 style = enc_utf8; 3648 style = enc_utf8;
3586#endif 3649#endif
3587 else 3650 else
3588 { 3651 {
… …
3599 { 3662 {
3600 cl = L""; 3663 cl = L"";
3601 selectlen = 0; 3664 selectlen = 0;
3602 } 3665 }
3603 3666
3604#if ENABLE_FRILLS 3667#if !ENABLE_MINIMAL
3605 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3668 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3606 // so recode it manually 3669 // so recode it manually
3607 if (style == enc_utf8) 3670 if (style == enc_utf8)
3608 { 3671 {
3609 freect = 1; 3672 freect = 1;
… …
3612 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3675 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3613 ct.nitems = strlen ((char *)ct.value); 3676 ct.nitems = strlen ((char *)ct.value);
3614 } 3677 }
3615 else 3678 else
3616#endif 3679#endif
3617 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3680 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3618 freect = 1; 3681 freect = 1;
3619 else 3682 else
3620 { 3683 {
3621 /* if we failed to convert then send it raw */ 3684 /* if we failed to convert then send it raw */
3622 ct.value = (unsigned char *)cl; 3685 ct.value = (unsigned char *)cl;
3623 ct.nitems = selectlen; 3686 ct.nitems = selectlen;
3624 ct.encoding = target; 3687 ct.encoding = target;
3625 } 3688 }
3626 3689
3627 XChangeProperty (disp, rq.requestor, rq.property, 3690 XChangeProperty (dpy, rq.requestor, rq.property,
3628 ct.encoding, 8, PropModeReplace, 3691 ct.encoding, 8, PropModeReplace,
3629 ct.value, (int)ct.nitems); 3692 ct.value, (int)ct.nitems);
3630 ev.property = rq.property; 3693 ev.property = rq.property;
3631 3694
3632 if (freect) 3695 if (freect)
3633 XFree (ct.value); 3696 XFree (ct.value);
3634 } 3697 }
3635 3698
3636 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3699 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3637}
3638
3639/* ------------------------------------------------------------------------- *
3640 * MOUSE ROUTINES *
3641 * ------------------------------------------------------------------------- */
3642
3643/*
3644 * return col/row values corresponding to x/y pixel values
3645 */
3646void
3647rxvt_term::pixel_position (int *x, int *y) NOTHROW
3648{
3649 *x = Pixel2Col (*x);
3650 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3651 *y = Pixel2Row (*y);
3652 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3653} 3700}
3654 3701
3655/* ------------------------------------------------------------------------- */ 3702/* ------------------------------------------------------------------------- */
3656#ifdef USE_XIM 3703#ifdef USE_XIM
3657void 3704void
3658rxvt_term::im_set_position (XPoint &pos) NOTHROW 3705rxvt_term::im_set_position (XPoint &pos) NOTHROW
3659{ 3706{
3660 XWindowAttributes xwa; 3707 XWindowAttributes xwa;
3661 3708
3662 XGetWindowAttributes (display->display, vt, &xwa); 3709 XGetWindowAttributes (dpy, vt, &xwa);
3663 3710
3664 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3711 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3665 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3712 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3666} 3713}
3667#endif 3714#endif
… …
3763rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW 3810rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3764{ 3811{
3765 while (*s) 3812 while (*s)
3766 { 3813 {
3767 text_t t = *s++; 3814 text_t t = *s++;
3768 int width = wcwidth (t); 3815 int width = WCWIDTH (t);
3769 3816
3770 while (width--) 3817 while (width--)
3771 { 3818 {
3772 scr_overlay_set (x++, y, t); 3819 scr_overlay_set (x++, y, t);
3773 t = NOCHAR; 3820 t = NOCHAR;

Diff Legend

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