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

Diff Legend

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