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.255 by root, Mon Jan 30 04:27:17 2006 UTC vs.
Revision 1.314 by root, Tue Nov 4 14:34:13 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
… …
150 132
151 l.l = 0; 133 l.l = 0;
152 l.f = 0; 134 l.f = 0;
153} 135}
154 136
137// nuke a single wide character at the given column
138void
139rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
140{
141 // find begin
142 while (col > 0 && l.t[col] == NOCHAR)
143 col--;
144
145 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147
148 // found begin, nuke
149 do {
150 l.t[col] = ' ';
151 l.r[col] = rend;
152 col++;
153 } while (col < ncol && l.t[col] == NOCHAR);
154}
155
155/* ------------------------------------------------------------------------- * 156/* ------------------------------------------------------------------------- *
156 * SCREEN INITIALISATION * 157 * SCREEN INITIALISATION *
157 * ------------------------------------------------------------------------- */ 158 * ------------------------------------------------------------------------- */
158 159
159void 160void
… …
161{ 162{
162#if ENABLE_OVERLAY 163#if ENABLE_OVERLAY
163 scr_overlay_off (); 164 scr_overlay_off ();
164#endif 165#endif
165 166
167 rvideo_mode = false;
166 view_start = 0; 168 view_start = 0;
167 num_scr = 0; 169 num_scr = 0;
168 170
169 if (ncol == 0) 171 if (ncol == 0)
170 ncol = 80; 172 ncol = 80;
… …
237 selection.text = NULL; 239 selection.text = NULL;
238 selection.len = 0; 240 selection.len = 0;
239 selection.op = SELECTION_CLEAR; 241 selection.op = SELECTION_CLEAR;
240 selection.screen = PRIMARY; 242 selection.screen = PRIMARY;
241 selection.clicks = 0; 243 selection.clicks = 0;
242 rvideo_state = rvideo_mode = false;
243 } 244 }
244 else 245 else
245 { 246 {
246 /* 247 /*
247 * add or delete rows as appropriate 248 * add or delete rows as appropriate
… …
276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 277 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
277 } 278 }
278 279
279 line_t *old_buf = row_buf; 280 line_t *old_buf = row_buf;
280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 281 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
281 282
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 283 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 284 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 285 int q = total_rows; // rewrapped row
285 286
286 if (top_row) 287 if (top_row)
… …
330 int qcol = 0; 331 int qcol = 0;
331 332
332 // see below for cursor adjustment rationale 333 // see below for cursor adjustment rationale
333 if (p == ocur.row) 334 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow); 335 screen.cur.row = q - (total_rows - nrow);
335 336
336 // fill a single destination line 337 // fill a single destination line
337 while (lofs < llen && qcol < ncol) 338 while (lofs < llen && qcol < ncol)
338 { 339 {
339 int prow = lofs / prev_ncol; 340 int prow = lofs / prev_ncol;
340 int pcol = lofs % prev_ncol; 341 int pcol = lofs % prev_ncol;
… …
366 } 367 }
367 while (p != pend && q > 0); 368 while (p != pend && q > 0);
368 369
369 term_start = total_rows - nrow; 370 term_start = total_rows - nrow;
370 top_row = q - term_start; 371 top_row = q - term_start;
371 372
372 // make sure all terminal lines exist 373 // make sure all terminal lines exist
373 while (top_row > 0) 374 while (top_row > 0)
374 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 375 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
375 } 376 }
376 else 377 else
377 { 378 {
378 // if no scrollback exists (yet), wing, instead of wrap 379 // if no scrollback exists (yet), wing, instead of wrap
379 380
380 for (int row = min (nrow, prev_nrow); row--; ) 381 for (int row = min (nrow, prev_nrow); row--; )
381 { 382 {
382 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 383 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
383 line_t &qline = row_buf [row]; 384 line_t &qline = row_buf [row];
384 385
… …
407 CLEAR_ALL_SELECTION (); 408 CLEAR_ALL_SELECTION ();
408 409
409 prev_nrow = nrow; 410 prev_nrow = nrow;
410 prev_ncol = ncol; 411 prev_ncol = ncol;
411 412
412 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 413 tabs = (char *)rxvt_malloc (ncol);
413 414
414 for (int col = ncol; col--; ) 415 for (int col = ncol; --col; )
415 tabs [col] = col % TABSIZE == 0; 416 tabs [col] = col % TABSIZE == 0;
416 417
417 if (current_screen != PRIMARY) 418 if (current_screen != PRIMARY)
418 scr_swap_screen (); 419 scr_swap_screen ();
419 420
… …
510} 511}
511 512
512void 513void
513rxvt_term::scr_swap_screen () 514rxvt_term::scr_swap_screen ()
514{ 515{
515 if (!OPTION (Opt_secondaryScreen)) 516 if (!option (Opt_secondaryScreen))
516 return; 517 return;
517 518
518 for (int i = prev_nrow; i--; ) 519 for (int i = prev_nrow; i--; )
519 ::swap (ROW(i), swap_buf [i]); 520 ::swap (ROW(i), swap_buf [i]);
520 521
… …
542 selection_check (2); /* check for boundary cross */ 543 selection_check (2); /* check for boundary cross */
543 544
544 int i = current_screen; current_screen = scrn; scrn = i; 545 int i = current_screen; current_screen = scrn; scrn = i;
545 546
546#if NSCREENS 547#if NSCREENS
547 if (OPTION (Opt_secondaryScreen)) 548 if (option (Opt_secondaryScreen))
548 { 549 {
549 num_scr = 0; 550 num_scr = 0;
550 551
551 scr_swap_screen (); 552 scr_swap_screen ();
552 553
… …
555 screen.flags |= Screen_VisibleCursor; 556 screen.flags |= Screen_VisibleCursor;
556 swap.flags |= Screen_VisibleCursor; 557 swap.flags |= Screen_VisibleCursor;
557 } 558 }
558 else 559 else
559#endif 560#endif
560 if (OPTION (Opt_secondaryScroll)) 561 if (option (Opt_secondaryScroll))
561 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 562 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
562} 563}
563 564
564// clear WrapNext indicator, solidifying position on next line 565// clear WrapNext indicator, solidifying position on next line
565void 566void
… …
598/* 599/*
599 * Change the rendition style for following text 600 * Change the rendition style for following text
600 */ 601 */
601void 602void
602rxvt_term::scr_rendition (int set, int style) NOTHROW 603rxvt_term::scr_rendition (int set, int style) NOTHROW
603 { 604{
604 if (set) 605 if (set)
605 rstyle |= style; 606 rstyle |= style;
606 else if (style == ~RS_None) 607 else if (style == ~RS_None)
607 rstyle = DEFAULT_RSTYLE; 608 rstyle = DEFAULT_RSTYLE;
608 else 609 else
609 rstyle &= ~style; 610 rstyle &= ~style;
610 } 611}
611 612
612/* ------------------------------------------------------------------------- */ 613/* ------------------------------------------------------------------------- */
613/* 614/*
614 * Scroll text between <row1> and <row2> inclusive, by <count> lines 615 * Scroll text between <row1> and <row2> inclusive, by <count> lines
615 * count positive ==> scroll up 616 * count positive ==> scroll up
… …
624 want_refresh = 1; 625 want_refresh = 1;
625 num_scr += count; 626 num_scr += count;
626 627
627 if (count > 0 628 if (count > 0
628 && row1 == 0 629 && row1 == 0
629 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 630 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
630 { 631 {
631 top_row = max (top_row - count, -saveLines); 632 top_row = max (top_row - count, -saveLines);
632 633
633 // scroll everything up 'count' lines 634 // scroll everything up 'count' lines
634 term_start = (term_start + count) % total_rows; 635 term_start = (term_start + count) % total_rows;
… …
645 { 646 {
646 line_t &l = ROW(nrow - 1 - i); 647 line_t &l = ROW(nrow - 1 - i);
647 648
648 // optimize if already cleared, can be significant on slow machines 649 // optimize if already cleared, can be significant on slow machines
649 // could be rolled into scr_blank_screen_mem 650 // could be rolled into scr_blank_screen_mem
650 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & RS_bgMask)) 651 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
651 { 652 {
652 scr_blank_line (l, 0, l.l, rstyle); 653 scr_blank_line (l, 0, l.l, rstyle);
653 l.l = 0; 654 l.l = 0;
654 l.f = 0; 655 l.f = 0;
655 } 656 }
… …
666 line_t &l2 = ROW(i); 667 line_t &l2 = ROW(i);
667 668
668 ::swap (l1, l2); 669 ::swap (l1, l2);
669 l2.touch (); 670 l2.touch ();
670 } 671 }
671 672
672 // move and/or clear selection, if any 673 // move and/or clear selection, if any
673 if (selection.op && current_screen == selection.screen) 674 if (selection.op && current_screen == selection.screen)
674 { 675 {
675 selection.beg.row -= count; 676 selection.beg.row -= count;
676 selection.end.row -= count; 677 selection.end.row -= count;
… …
684 selection.op = SELECTION_CLEAR; 685 selection.op = SELECTION_CLEAR;
685 } 686 }
686 } 687 }
687 688
688 // finally move the view window, if desired 689 // finally move the view window, if desired
689 if (OPTION (Opt_scrollWithBuffer) 690 if (option (Opt_scrollWithBuffer)
690 && view_start != 0 691 && view_start != 0
691 && view_start != -saveLines) 692 && view_start != -saveLines)
692 scr_page (UP, count); 693 scr_page (UP, count);
693 694
694 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 695 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
712 { 713 {
713 /* move selected region too */ 714 /* move selected region too */
714 selection.beg.row -= count; 715 selection.beg.row -= count;
715 selection.end.row -= count; 716 selection.end.row -= count;
716 selection.mark.row -= count; 717 selection.mark.row -= count;
717 718
718 selection_check (0); 719 selection_check (0);
719 } 720 }
720 } 721 }
721 722
722 // use a simple and robust scrolling algorithm, this 723 // use a simple and robust scrolling algorithm, this
… …
789 790
790 while (str < strend) 791 while (str < strend)
791 { 792 {
792 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 793 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
793 794
794 if (c < 0x20) 795 if (expect_false (c < 0x20))
795 if (c == C0_LF) 796 if (c == C0_LF)
796 { 797 {
797 max_it (line->l, screen.cur.col); 798 max_it (line->l, screen.cur.col);
798 799
799 screen.flags &= ~Screen_WrapNext; 800 screen.flags &= ~Screen_WrapNext;
… …
818 { 819 {
819 scr_tab (1, true); 820 scr_tab (1, true);
820 continue; 821 continue;
821 } 822 }
822 823
824 if (expect_false (
823 if (checksel /* see if we're writing within selection */ 825 checksel /* see if we're writing within selection */
824 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 826 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
825 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 827 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
828 ))
826 { 829 {
827 checksel = 0; 830 checksel = 0;
828 /* 831 /*
829 * If we wrote anywhere in the selected area, kill the selection 832 * If we wrote anywhere in the selected area, kill the selection
830 * XXX: should we kill the mark too? Possibly, but maybe that 833 * XXX: should we kill the mark too? Possibly, but maybe that
831 * should be a similar check. 834 * should be a similar check.
832 */ 835 */
833 CLEAR_SELECTION (); 836 CLEAR_SELECTION ();
834 } 837 }
835 838
836 if (screen.flags & Screen_WrapNext) 839 if (expect_false (screen.flags & Screen_WrapNext))
837 { 840 {
838 scr_do_wrap (); 841 scr_do_wrap ();
839 842
840 line->l = ncol; 843 line->l = ncol;
841 line->is_longer (1); 844 line->is_longer (1);
842 845
843 row = screen.cur.row; 846 row = screen.cur.row;
844 line = &ROW(row); /* _must_ refresh */ 847 line = &ROW(row); /* _must_ refresh */
845 } 848 }
846 849
847 // some utf-8 decoders "decode" surrogate characters: let's fix this. 850 // some utf-8 decoders "decode" surrogate characters: let's fix this.
848 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 851 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
849 c = 0xfffd; 852 c = 0xfffd;
850 853
851 // rely on wcwidth to tell us the character width, do wcwidth before 854 // rely on wcwidth to tell us the character width, do wcwidth before
852 // further replacements, as wcwidth might return -1 for the line 855 // further replacements, as wcwidth might return -1 for the line
853 // drawing characters below as they might be invalid in the current 856 // drawing characters below as they might be invalid in the current
854 // locale. 857 // locale.
855 int width = WCWIDTH (c); 858 int width = WCWIDTH (c);
856 859
857 if (charsets [screen.charset] == '0') // DEC SPECIAL 860 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
858 { 861 {
859 // vt100 special graphics and line drawing 862 // vt100 special graphics and line drawing
860 // 5f-7e standard vt100 863 // 5f-7e standard vt100
861 // 40-5e rxvt extension for extra curses acs chars 864 // 40-5e rxvt extension for extra curses acs chars
862 static uint16_t vt100_0[62] = { // 41 .. 7e 865 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
875 c = vt100_0[c - 0x41]; 878 c = vt100_0[c - 0x41];
876 width = 1; // vt100 line drawing characters are always single-width 879 width = 1; // vt100 line drawing characters are always single-width
877 } 880 }
878 } 881 }
879 882
880 if (screen.flags & Screen_Insert) 883 if (expect_false (screen.flags & Screen_Insert))
881 scr_insdel_chars (width, INSERT); 884 scr_insdel_chars (width, INSERT);
882 885
883 if (width != 0) 886 if (width != 0)
884 { 887 {
885#if !UNICODE_3 888#if !UNICODE_3
… …
891 c = 0xfffd; 894 c = 0xfffd;
892# endif 895# endif
893#endif 896#endif
894 897
895 // nuke the character at this position, if required 898 // nuke the character at this position, if required
899 if (expect_false (
896 if (line->t[screen.cur.col] == NOCHAR 900 line->t[screen.cur.col] == NOCHAR
897 || (screen.cur.col < ncol - 1 901 || (screen.cur.col < ncol - 1
898 && line->t[screen.cur.col + 1] == NOCHAR)) 902 && line->t[screen.cur.col + 1] == NOCHAR)
899 { 903 ))
900 int col = screen.cur.col; 904 scr_kill_char (*line, screen.cur.col);
901
902 // find begin
903 while (col > 0 && line->t[col] == NOCHAR)
904 col--;
905
906 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
907
908 // found begin, nuke
909 do {
910 line->t[col] = ' ';
911 line->r[col] = rend;
912 col++;
913 } while (col < ncol && line->t[col] == NOCHAR);
914 }
915 905
916 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 906 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
917 907
918 // if the character doesn't fit into the remaining columns... 908 // if the character doesn't fit into the remaining columns...
919 if (screen.cur.col > ncol - width && ncol >= width) 909 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
920 { 910 {
921 // ...output spaces 911 // ...output spaces
922 c = ' '; 912 c = ' ';
923 // and try the same character next loop iteration 913 // and try the same character next loop iteration
924 --str; 914 --str;
… …
929 do 919 do
930 { 920 {
931 line->t[screen.cur.col] = c; 921 line->t[screen.cur.col] = c;
932 line->r[screen.cur.col] = rend; 922 line->r[screen.cur.col] = rend;
933 923
934 if (screen.cur.col < ncol - 1) 924 if (expect_true (screen.cur.col < ncol - 1))
935 screen.cur.col++; 925 screen.cur.col++;
936 else 926 else
937 { 927 {
938 line->l = ncol; 928 line->l = ncol;
939 if (screen.flags & Screen_Autowrap) 929 if (screen.flags & Screen_Autowrap)
… …
941 break; 931 break;
942 } 932 }
943 933
944 c = NOCHAR; 934 c = NOCHAR;
945 } 935 }
946 while (--width > 0); 936 while (expect_false (--width > 0));
947 937
948 // pad with spaces when overwriting wide character with smaller one 938 // pad with spaces when overwriting wide character with smaller one
949 if (!width) 939 if (expect_false (!width))
950 { 940 {
951 line->touch (); 941 line->touch ();
952 942
953 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 943 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
954 { 944 {
955 line->t[c] = ' '; 945 line->t[c] = ' ';
956 line->r[c] = rend; 946 line->r[c] = rend;
957 } 947 }
958 } 948 }
959 } 949 }
950#if ENABLE_COMBINING
960 else // width == 0 951 else // width == 0
961 { 952 {
962#if ENABLE_COMBINING 953 if (c != 0xfeff) // ignore BOM
963 // handle combining characters
964 // we just tag the accent on the previous on-screen character.
965 // this is arguably not correct, but also arguably not wrong.
966 // we don't handle double-width characters nicely yet.
967 line_t *linep;
968 text_t *tp;
969 rend_t *rp;
970
971 if (screen.cur.col > 0)
972 { 954 {
955 // handle combining characters
956 // we just tag the accent on the previous on-screen character.
957 // this is arguably not correct, but also arguably not wrong.
958 // we don't handle double-width characters nicely yet.
959 line_t *linep;
960 text_t *tp;
961 rend_t *rp;
962
963 if (screen.cur.col > 0)
964 {
973 linep = line; 965 linep = line;
974 tp = line->t + screen.cur.col - 1; 966 tp = line->t + screen.cur.col - 1;
975 rp = line->r + screen.cur.col - 1; 967 rp = line->r + screen.cur.col - 1;
968 }
969 else if (screen.cur.row > 0
970 && ROW(screen.cur.row - 1).is_longer ())
971 {
972 linep = &ROW(screen.cur.row - 1);
973 tp = line->t + ncol - 1;
974 rp = line->r + ncol - 1;
975 }
976 else
977 continue;
978
979 linep->touch ();
980
981 while (*tp == NOCHAR && tp > linep->t)
982 tp--, rp--;
983
984 // first try to find a precomposed character
985 unicode_t n = rxvt_compose (*tp, c);
986 if (n == NOCHAR)
987 n = rxvt_composite.compose (*tp, c);
988
989 *tp = n;
990 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
976 } 991 }
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 } 992 }
984 else
985 continue;
986
987 linep->touch ();
988
989 while (*tp == NOCHAR && tp > linep->t)
990 tp--, rp--;
991
992 // first try to find a precomposed character
993 unicode_t n = rxvt_compose (*tp, c);
994 if (n == NOCHAR)
995 n = rxvt_composite.compose (*tp, c);
996
997 *tp = n;
998 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
999#endif 993#endif
1000 }
1001 } 994 }
1002 995
1003 max_it (line->l, screen.cur.col); 996 max_it (line->l, screen.cur.col);
1004 997
1005#ifdef DEBUG_STRICT 998#ifdef DEBUG_STRICT
… …
1013 * XTERM_SEQ: CTRL-H 1006 * XTERM_SEQ: CTRL-H
1014 */ 1007 */
1015void 1008void
1016rxvt_term::scr_backspace () NOTHROW 1009rxvt_term::scr_backspace () NOTHROW
1017{ 1010{
1018 want_refresh = 1;
1019
1020 if (screen.cur.col == 0) 1011 if (screen.cur.col == 0)
1021 { 1012 {
1022 if (screen.cur.row > 0) 1013 if (screen.cur.row > 0)
1023 { 1014 {
1024#ifdef TERMCAP_HAS_BW 1015#ifdef TERMCAP_HAS_BW
1025 screen.cur.col = ncol - 1; 1016 screen.cur.col = ncol - 1;
1026 screen.cur.row--; 1017 --screen.cur.row;
1027 return; 1018
1019 want_refresh = 1;
1028#endif 1020#endif
1029 } 1021 }
1030 } 1022 }
1031 else if (!(screen.flags & Screen_WrapNext)) 1023 else
1032 scr_gotorc (0, -1, RELATIVE); 1024 scr_gotorc (0, -1, RELATIVE);
1033
1034 screen.flags &= ~Screen_WrapNext;
1035} 1025}
1036 1026
1037/* ------------------------------------------------------------------------- */ 1027/* ------------------------------------------------------------------------- */
1038/* 1028/*
1039 * Process Horizontal Tab 1029 * Process Horizontal Tab
… …
1062 x = i; 1052 x = i;
1063 1053
1064 if (!--count) 1054 if (!--count)
1065 break; 1055 break;
1066 } 1056 }
1067 else 1057 else
1068 ht &= l.t[i] == ' ' 1058 ht &= l.t[i] == ' '
1069 && RS_SAME (l.r[i], base_rend); 1059 && RS_SAME (l.r[i], base_rend);
1070 1060
1071 if (count) 1061 if (count)
1072 x = ncol - 1; 1062 x = ncol - 1;
1073 1063
1074 // store horizontal tab commands as characters inside the text 1064 // store horizontal tab commands as characters inside the text
1075 // buffer so they can be selected and pasted. 1065 // buffer so they can be selected and pasted.
1076 if (ht && OPTION (Opt_pastableTabs)) 1066 if (ht && option (Opt_pastableTabs))
1077 { 1067 {
1078 base_rend = SET_FONT (base_rend, 0); 1068 base_rend = SET_FONT (base_rend, 0);
1079 1069
1080 l.touch (x); 1070 l.touch (x);
1081 1071
… …
1114 * Process DEC Back Index 1104 * Process DEC Back Index
1115 * XTERM_SEQ: ESC 6 1105 * XTERM_SEQ: ESC 6
1116 * Move cursor left in row. If we're at the left boundary, shift everything 1106 * Move cursor left in row. If we're at the left boundary, shift everything
1117 * in that row right. Clear left column. 1107 * in that row right. Clear left column.
1118 */ 1108 */
1119#if ENABLE_FRILLS 1109#if !ENABLE_MINIMAL
1120void 1110void
1121rxvt_term::scr_backindex () NOTHROW 1111rxvt_term::scr_backindex () NOTHROW
1122{ 1112{
1123 if (screen.cur.col > 0) 1113 if (screen.cur.col > 0)
1124 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1114 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
… …
1131 * Process DEC Forward Index 1121 * Process DEC Forward Index
1132 * XTERM_SEQ: ESC 9 1122 * XTERM_SEQ: ESC 9
1133 * Move cursor right in row. If we're at the right boundary, shift everything 1123 * Move cursor right in row. If we're at the right boundary, shift everything
1134 * in that row left. Clear right column. 1124 * in that row left. Clear right column.
1135 */ 1125 */
1136#if ENABLE_FRILLS 1126#if !ENABLE_MINIMAL
1137void 1127void
1138rxvt_term::scr_forwardindex () NOTHROW 1128rxvt_term::scr_forwardindex () NOTHROW
1139{ 1129{
1140 if (screen.cur.col < ncol - 1) 1130 if (screen.cur.col < ncol - 1)
1141 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1131 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
… …
1188 } 1178 }
1189 } 1179 }
1190 else 1180 else
1191 { 1181 {
1192 if (screen.flags & Screen_Relative) 1182 if (screen.flags & Screen_Relative)
1183 {
1193 { /* relative origin mode */ 1184 /* relative origin mode */
1194 screen.cur.row = row + screen.tscroll; 1185 screen.cur.row = row + screen.tscroll;
1195 min_it (screen.cur.row, screen.bscroll); 1186 min_it (screen.cur.row, screen.bscroll);
1196 } 1187 }
1197 else 1188 else
1198 screen.cur.row = row; 1189 screen.cur.row = row;
… …
1231/* 1222/*
1232 * Erase part or whole of a line 1223 * Erase part or whole of a line
1233 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1224 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1234 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1225 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1235 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1226 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1227 * extension: clear to right unless wrapped: ESC [ 3 K
1236 */ 1228 */
1237void 1229void
1238rxvt_term::scr_erase_line (int mode) NOTHROW 1230rxvt_term::scr_erase_line (int mode) NOTHROW
1239{ 1231{
1240 unsigned int col, num; 1232 unsigned int col, num;
… …
1249 line.touch (); 1241 line.touch ();
1250 line.is_longer (0); 1242 line.is_longer (0);
1251 1243
1252 switch (mode) 1244 switch (mode)
1253 { 1245 {
1246 case 3:
1247 if (screen.flags & Screen_WrapNext)
1248 return;
1249
1250 /* fall through */
1251
1254 case 0: /* erase to end of line */ 1252 case 0: /* erase to end of line */
1255 col = screen.cur.col; 1253 col = screen.cur.col;
1256 num = ncol - col; 1254 num = ncol - col;
1257 min_it (line.l, col); 1255 min_it (line.l, col);
1256
1258 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1257 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1259 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1258 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1260 CLEAR_SELECTION (); 1259 CLEAR_SELECTION ();
1261 break; 1260 break;
1261
1262 case 1: /* erase to beginning of line */ 1262 case 1: /* erase to beginning of line */
1263 col = 0; 1263 col = 0;
1264 num = screen.cur.col + 1; 1264 num = screen.cur.col + 1;
1265
1265 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1266 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1266 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1267 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1267 CLEAR_SELECTION (); 1268 CLEAR_SELECTION ();
1268 break; 1269 break;
1270
1269 case 2: /* erase whole line */ 1271 case 2: /* erase whole line */
1270 col = 0; 1272 col = 0;
1271 num = ncol; 1273 num = ncol;
1272 line.l = 0; 1274 line.l = 0;
1273 if (selection.beg.row <= screen.cur.row 1275 if (selection.beg.row <= screen.cur.row
… …
1331 if (row >= nrow) /* Out Of Bounds */ 1333 if (row >= nrow) /* Out Of Bounds */
1332 return; 1334 return;
1333 1335
1334 min_it (num, nrow - row); 1336 min_it (num, nrow - row);
1335 1337
1338 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1336 if (rstyle & (RS_RVid | RS_Uline)) 1339 if (rstyle & (RS_RVid | RS_Uline))
1337 ren = (rend_t) ~RS_None; 1340 ren = (rend_t) ~RS_None;
1338 else if (GET_BASEBG (rstyle) == Color_bg) 1341 else if (GET_BASEBG (rstyle) == Color_bg)
1339 { 1342 {
1340 ren = DEFAULT_RSTYLE; 1343 ren = DEFAULT_RSTYLE;
1341 CLEAR_ROWS (row, num); 1344
1345 if (mapped)
1346 XClearArea (dpy, vt, 0,
1347 Row2Pixel (row), (unsigned int)width,
1348 (unsigned int)Height2Pixel (num), False);
1342 } 1349 }
1343 else 1350 else
1344 { 1351 {
1345 ren = rstyle & (RS_fgMask | RS_bgMask); 1352 ren = rstyle & (RS_fgMask | RS_bgMask);
1353
1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1354 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1347 XChangeGC (xdisp, gc, GCForeground, &gcvalue); 1355 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1348 ERASE_ROWS (row, num); 1356 XFillRectangle (dpy, vt, gc,
1357 0, Row2Pixel (row),
1358 (unsigned int)width,
1359 (unsigned int)Height2Pixel (num));
1349 gcvalue.foreground = pix_colors[Color_fg]; 1360 gcvalue.foreground = pix_colors[Color_fg];
1350 XChangeGC (xdisp, gc, GCForeground, &gcvalue); 1361 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1351 } 1362 }
1352 1363
1353 for (; num--; row++) 1364 for (; num--; row++)
1354 { 1365 {
1355 scr_blank_screen_mem (ROW(row), rstyle); 1366 scr_blank_screen_mem (ROW(row), rstyle);
1356 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1367 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1357 } 1368 }
1358} 1369}
1359 1370
1360#if ENABLE_FRILLS 1371#if !ENABLE_MINIMAL
1361void 1372void
1362rxvt_term::scr_erase_savelines () NOTHROW 1373rxvt_term::scr_erase_savelines () NOTHROW
1363{ 1374{
1364 want_refresh = 1; 1375 want_refresh = 1;
1365 ZERO_SCROLLBACK (); 1376 ZERO_SCROLLBACK ();
… …
1435 * Insert/Delete <count> characters from the current position 1446 * Insert/Delete <count> characters from the current position
1436 */ 1447 */
1437void 1448void
1438rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1449rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1439{ 1450{
1440 int col, row;
1441 rend_t tr;
1442
1443 want_refresh = 1; 1451 want_refresh = 1;
1444 ZERO_SCROLLBACK (); 1452 ZERO_SCROLLBACK ();
1445 1453
1446 if (count <= 0) 1454 if (count <= 0)
1447 return; 1455 return;
… …
1449 scr_do_wrap (); 1457 scr_do_wrap ();
1450 1458
1451 selection_check (1); 1459 selection_check (1);
1452 min_it (count, ncol - screen.cur.col); 1460 min_it (count, ncol - screen.cur.col);
1453 1461
1454 row = screen.cur.row; 1462 int row = screen.cur.row;
1455 1463
1456 line_t *line = &ROW(row); 1464 line_t *line = &ROW(row);
1457 1465
1458 line->touch (); 1466 line->touch ();
1459 line->is_longer (0); 1467 line->is_longer (0);
1460 1468
1461 switch (insdel) 1469 switch (insdel)
1462 { 1470 {
1463 case INSERT: 1471 case INSERT:
1464 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1472 line->l = min (line->l + count, ncol);
1473
1474 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1465 { 1475 {
1466 line->t[col] = line->t[col - count]; 1476 line->t[col] = line->t[col - count];
1467 line->r[col] = line->r[col - count]; 1477 line->r[col] = line->r[col - count];
1468 } 1478 }
1469
1470 line->l = min (line->l + count, ncol);
1471 1479
1472 if (selection.op && current_screen == selection.screen 1480 if (selection.op && current_screen == selection.screen
1473 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1481 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1474 { 1482 {
1475 if (selection.end.row != screen.cur.row 1483 if (selection.end.row != screen.cur.row
1476 || (selection.end.col + count >= ncol)) 1484 || (selection.end.col + count >= ncol))
1477 CLEAR_SELECTION (); 1485 CLEAR_SELECTION ();
1478 else 1486 else
1487 {
1479 { /* shift selection */ 1488 /* shift selection */
1480 selection.beg.col += count; 1489 selection.beg.col += count;
1481 selection.mark.col += count; /* XXX: yes? */ 1490 selection.mark.col += count; /* XXX: yes? */
1482 selection.end.col += count; 1491 selection.end.col += count;
1483 } 1492 }
1484 } 1493 }
… …
1489 case ERASE: 1498 case ERASE:
1490 screen.cur.col += count; /* don't worry if > ncol */ 1499 screen.cur.col += count; /* don't worry if > ncol */
1491 selection_check (1); 1500 selection_check (1);
1492 screen.cur.col -= count; 1501 screen.cur.col -= count;
1493 1502
1494 line->l = max (line->l - count, 0);
1495 scr_blank_line (*line, screen.cur.col, count, rstyle); 1503 scr_blank_line (*line, screen.cur.col, count, rstyle);
1496 break; 1504 break;
1497 1505
1498 case DELETE: 1506 case DELETE:
1507 {
1508 line->l = max (line->l - count, 0);
1509
1499 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1510 rend_t tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1500 1511
1501 for (col = screen.cur.col; (col + count) < ncol; col++) 1512 for (int col = screen.cur.col; (col + count) < ncol; col++)
1502 { 1513 {
1503 line->t[col] = line->t[col + count]; 1514 line->t[col] = line->t[col + count];
1504 line->r[col] = line->r[col + count]; 1515 line->r[col] = line->r[col + count];
1505 } 1516 }
1506 1517
1507 line->l = max (line->l - count, 0); 1518 // nuke wide char at the end
1519 if (line->t[screen.cur.col] == NOCHAR)
1520 scr_kill_char (*line, screen.cur.col);
1521
1508 scr_blank_line (*line, ncol - count, count, tr); 1522 scr_blank_line (*line, ncol - count, count, tr);
1509 1523
1510 if (selection.op && current_screen == selection.screen 1524 if (selection.op && current_screen == selection.screen
1511 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1525 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1512 { 1526 {
1513 if (selection.end.row != screen.cur.row 1527 if (selection.end.row != screen.cur.row
1514 || (screen.cur.col >= selection.beg.col - count) 1528 || (screen.cur.col >= selection.beg.col - count)
1515 || selection.end.col >= ncol) 1529 || selection.end.col >= ncol)
1516 CLEAR_SELECTION (); 1530 CLEAR_SELECTION ();
1517 else 1531 else
1518 { 1532 {
1519 /* shift selection */ 1533 /* shift selection */
1520 selection.beg.col -= count; 1534 selection.beg.col -= count;
1521 selection.mark.col -= count; /* XXX: yes? */ 1535 selection.mark.col -= count; /* XXX: yes? */
1522 selection.end.col -= count; 1536 selection.end.col -= count;
1523 } 1537 }
1538 }
1524 } 1539 }
1525 1540
1526 break; 1541 break;
1527 } 1542 }
1528} 1543}
… …
1623 */ 1638 */
1624void 1639void
1625rxvt_term::scr_set_tab (int mode) NOTHROW 1640rxvt_term::scr_set_tab (int mode) NOTHROW
1626{ 1641{
1627 if (mode < 0) 1642 if (mode < 0)
1628 memset (tabs, 0, ncol * sizeof (char)); 1643 memset (tabs, 0, ncol);
1629 else if (screen.cur.col < ncol) 1644 else if (screen.cur.col < ncol)
1630 tabs [screen.cur.col] = !!mode; 1645 tabs [screen.cur.col] = !!mode;
1631} 1646}
1632 1647
1633/* ------------------------------------------------------------------------- */ 1648/* ------------------------------------------------------------------------- */
… …
1648 if (rvideo_state != on) 1663 if (rvideo_state != on)
1649 { 1664 {
1650 rvideo_state = on; 1665 rvideo_state = on;
1651 1666
1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1667 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1653#if XPM_BACKGROUND 1668#ifdef HAVE_BG_PIXMAP
1654 if (bgPixmap.pixmap == None) 1669 if (bgPixmap.pixmap == None)
1655#endif 1670#endif
1656#if TRANSPARENT
1657 if (!OPTION (Opt_transparent) || am_transparent == 0)
1658#endif
1659 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); 1671 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1660 1672
1661 XGCValues gcvalue; 1673 XGCValues gcvalue;
1662 gcvalue.foreground = pix_colors[Color_fg]; 1674 gcvalue.foreground = pix_colors[Color_fg];
1663 gcvalue.background = pix_colors[Color_bg]; 1675 gcvalue.background = pix_colors[Color_bg];
1664 XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue); 1676 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1665 1677
1666 scr_clear (); 1678 scr_clear ();
1667 scr_touch (true); 1679 scr_touch (true);
1668 } 1680 }
1669} 1681}
… …
1806 for (i = PART_BEG; i < RC_COUNT; i++) 1818 for (i = PART_BEG; i < RC_COUNT; i++)
1807 { 1819 {
1808 min_it (rc[i].col, ncol - 1); 1820 min_it (rc[i].col, ncol - 1);
1809 min_it (rc[i].row, nrow - 1); 1821 min_it (rc[i].row, nrow - 1);
1810 } 1822 }
1811 1823// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1812 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1824 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1813 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1825 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1814 1826
1815 num_scr_allow = 0; 1827 num_scr_allow = 0;
1816 1828
… …
1871 return true; 1883 return true;
1872} 1884}
1873 1885
1874#ifndef NO_BELL 1886#ifndef NO_BELL
1875void 1887void
1876rxvt_term::bell_cb (time_watcher &w) 1888rxvt_term::bell_cb (ev::timer &w, int revents)
1877{ 1889{
1878 rvideo_bell = false; 1890 rvideo_bell = false;
1879 scr_rvideo_mode (rvideo_mode); 1891 scr_rvideo_mode (rvideo_mode);
1892 refresh_check ();
1880} 1893}
1881#endif 1894#endif
1882 1895
1883/* ------------------------------------------------------------------------- */ 1896/* ------------------------------------------------------------------------- */
1884void 1897void
… …
1886{ 1899{
1887#ifndef NO_BELL 1900#ifndef NO_BELL
1888 1901
1889# ifndef NO_MAPALERT 1902# ifndef NO_MAPALERT
1890# ifdef MAPALERT_OPTION 1903# ifdef MAPALERT_OPTION
1891 if (OPTION (Opt_mapAlert)) 1904 if (option (Opt_mapAlert))
1892# endif 1905# endif
1893 XMapWindow (xdisp, parent[0]); 1906 XMapWindow (dpy, parent[0]);
1894# endif 1907# endif
1895 1908
1909# if ENABLE_FRILLS
1910 if (option (Opt_urgentOnBell))
1911 set_urgency (1);
1912# endif
1913
1896 if (OPTION (Opt_visualBell)) 1914 if (option (Opt_visualBell))
1897 { 1915 {
1898 rvideo_bell = true; 1916 rvideo_bell = true;
1899 scr_rvideo_mode (rvideo_mode); 1917 scr_rvideo_mode (rvideo_mode);
1900 display->flush (); 1918 flush ();
1901 1919
1902 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1920 bell_ev.start (VISUAL_BELL_DURATION);
1903 } 1921 }
1904 else 1922 else
1905 XBell (xdisp, 0); 1923 XBell (dpy, 0);
1906
1907#endif 1924#endif
1908} 1925}
1909 1926
1910/* ------------------------------------------------------------------------- */ 1927/* ------------------------------------------------------------------------- */
1911/* ARGSUSED */ 1928/* ARGSUSED */
1912void 1929void
1913rxvt_term::scr_printscreen (int fullhist) NOTHROW 1930rxvt_term::scr_printscreen (int fullhist) NOTHROW
1914{ 1931{
1915#ifdef PRINTPIPE 1932#ifdef PRINTPIPE
1916 int nrows, row_start; 1933 int nrows, row_start;
1917 FILE *fd; 1934 FILE *fd = popen_printer ();
1918 1935
1919 if ((fd = popen_printer ()) == NULL) 1936 if (!fd)
1920 return; 1937 return;
1921 1938
1922 if (fullhist) 1939 if (fullhist)
1923 { 1940 {
1924 nrows = nrow - top_row; 1941 nrows = nrow - top_row;
… …
1969 * screen.text/screen.rend contain what the screen will change to. 1986 * screen.text/screen.rend contain what the screen will change to.
1970 */ 1987 */
1971void 1988void
1972rxvt_term::scr_refresh () NOTHROW 1989rxvt_term::scr_refresh () NOTHROW
1973{ 1990{
1974 unsigned char must_clear, /* use draw_string not draw_image_string */ 1991 unsigned char have_bg,
1975 showcursor; /* show the cursor */ 1992 showcursor; /* show the cursor */
1976 int16_t col, row, /* column/row we're processing */ 1993 int16_t col, row, /* column/row we're processing */
1977 ocrow; /* old cursor row */ 1994 ocrow; /* old cursor row */
1978 int i; /* tmp */ 1995 int i; /* tmp */
1979#ifndef NO_CURSORCOLOR 1996#ifndef NO_CURSORCOLOR
1980 rend_t cc1; /* store colours at cursor position (s) */ 1997 rend_t cc1; /* store colours at cursor position (s) */
1981#endif 1998#endif
1982 rend_t *crp; // cursor rendition pointer 1999 rend_t *crp; // cursor rendition pointer
2000 rend_t ccol1, /* Cursor colour */
2001 ccol2; /* Cursor colour2 */
1983 2002
1984 want_refresh = 0; /* screen is current */ 2003 want_refresh = 0; /* screen is current */
1985 2004
1986 if (refresh_type == NO_REFRESH || !mapped) 2005 if (refresh_type == NO_REFRESH || !mapped)
1987 return; 2006 return;
1988 2007
1989 /* 2008 /*
1990 * A: set up vars 2009 * A: set up vars
1991 */ 2010 */
1992 must_clear = 0;
1993 refresh_count = 0; 2011 refresh_count = 0;
1994 2012
1995#if XPM_BACKGROUND 2013 have_bg = 0;
2014#ifdef HAVE_BG_PIXMAP
1996 must_clear |= bgPixmap.pixmap != None; 2015 have_bg = bgPixmap.pixmap != None;
1997#endif
1998#if TRANSPARENT
1999 must_clear |= OPTION (Opt_transparent) && am_transparent;
2000#endif 2016#endif
2001 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2017 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2002 2018
2003 /* 2019 /*
2004 * B: reverse any characters which are selected 2020 * B: reverse any characters which are selected
… …
2008 /* 2024 /*
2009 * C: set the cursor character (s) 2025 * C: set the cursor character (s)
2010 */ 2026 */
2011 { 2027 {
2012 unsigned char setoldcursor; 2028 unsigned char setoldcursor;
2013 rend_t ccol1, /* Cursor colour */
2014 ccol2; /* Cursor colour2 */
2015 2029
2016 showcursor = (screen.flags & Screen_VisibleCursor); 2030 showcursor = (screen.flags & Screen_VisibleCursor);
2017#ifdef CURSOR_BLINK 2031#ifdef CURSOR_BLINK
2018 if (hidden_cursor) 2032 if (hidden_cursor)
2019 showcursor = 0; 2033 showcursor = 0;
… …
2026 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2040 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2027 col--; 2041 col--;
2028 2042
2029 crp = &ROW(screen.cur.row).r[col]; 2043 crp = &ROW(screen.cur.row).r[col];
2030 2044
2045#ifndef NO_CURSORCOLOR
2046 cc1 = *crp & (RS_fgMask | RS_bgMask);
2047 if (ISSET_PIXCOLOR (Color_cursor))
2048 ccol1 = Color_cursor;
2049 else
2050#endif
2051#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2052 ccol1 = fgcolor_of (rstyle);
2053#else
2054 ccol1 = Color_fg;
2055#endif
2056
2057#ifndef NO_CURSORCOLOR
2058 if (ISSET_PIXCOLOR (Color_cursor2))
2059 ccol2 = Color_cursor2;
2060 else
2061#endif
2062#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2063 ccol2 = bgcolor_of (rstyle);
2064#else
2065 ccol2 = Color_bg;
2066#endif
2067
2031 if (showcursor && focus) 2068 if (showcursor && focus)
2032 { 2069 {
2033 if (OPTION (Opt_cursorUnderline)) 2070 if (option (Opt_cursorUnderline))
2034 *crp ^= RS_Uline; 2071 *crp ^= RS_Uline;
2035 else 2072 else
2036 { 2073 {
2037 *crp ^= RS_RVid; 2074 *crp ^= RS_RVid;
2038
2039#ifndef NO_CURSORCOLOR
2040 cc1 = *crp & (RS_fgMask | RS_bgMask);
2041 if (ISSET_PIXCOLOR (Color_cursor))
2042 ccol1 = Color_cursor;
2043 else
2044#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2045 ccol1 = fgcolor_of (rstyle);
2046#else
2047 ccol1 = Color_fg;
2048#endif
2049 if (ISSET_PIXCOLOR (Color_cursor2))
2050 ccol2 = Color_cursor2;
2051 else
2052#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2053 ccol2 = bgcolor_of (rstyle);
2054#else
2055 ccol2 = Color_bg;
2056#endif
2057 *crp = SET_FGCOLOR (*crp, ccol1); 2075 *crp = SET_FGCOLOR (*crp, ccol1);
2058 *crp = SET_BGCOLOR (*crp, ccol2); 2076 *crp = SET_BGCOLOR (*crp, ccol2);
2059#endif
2060 } 2077 }
2061 } 2078 }
2062 } 2079 }
2063 2080
2064 /* make sure no outline cursor is left around */ 2081 /* make sure no outline cursor is left around */
… …
2103 * D: CopyArea pass - very useful for slower links 2120 * D: CopyArea pass - very useful for slower links
2104 * This has been deliberately kept simple. 2121 * This has been deliberately kept simple.
2105 */ 2122 */
2106 if (!display->is_local 2123 if (!display->is_local
2107 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2124 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2108 && abs (num_scr) < nrow && !must_clear) 2125 && abs (num_scr) < nrow && !have_bg)
2109 { 2126 {
2110 int16_t nits; 2127 int16_t nits;
2128 int i = num_scr;
2111 int j; 2129 int j;
2112 int len, wlen; 2130 int len, wlen;
2113 dLocal (int, num_scr); 2131 dLocal (int, num_scr);
2114 2132
2115 j = nrow; 2133 j = nrow;
2116 wlen = len = -1; 2134 wlen = len = -1;
2117 row = i > 0 ? 0 : j - 1; 2135 row = i > 0 ? 0 : j - 1;
2136
2118 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2137 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2119 { 2138 {
2120 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2139 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2121 { 2140 {
2122 line_t s = ROW(view_start + row); 2141 line_t s = ROW(view_start + row);
… …
2143 wlen = row; 2162 wlen = row;
2144 continue; 2163 continue;
2145 } 2164 }
2146 } 2165 }
2147 2166
2148 if (len != -1) 2167 if (len >= 0)
2149 { 2168 {
2150 /* also comes here at end if needed because of >= above */ 2169 /* also comes here at end if needed because of >= above */
2151 if (wlen < len) 2170 if (wlen < len)
2152 ::swap (wlen, len); 2171 ::swap (wlen, len);
2153 2172
2173 XGCValues gcv;
2174
2175 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2154 XCopyArea (xdisp, vt, vt, 2176 XCopyArea (dpy, vt, vt,
2155 gc, 0, Row2Pixel (len + i), 2177 gc, 0, Row2Pixel (len + i),
2156 (unsigned int)this->width, 2178 (unsigned int)this->width,
2157 (unsigned int)Height2Pixel (wlen - len + 1), 2179 (unsigned int)Height2Pixel (wlen - len + 1),
2158 0, Row2Pixel (len)); 2180 0, Row2Pixel (len));
2181 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2182
2159 len = -1; 2183 len = -1;
2160 } 2184 }
2161 } 2185 }
2162 } 2186 }
2163#endif 2187#endif
… …
2187 continue; 2211 continue;
2188 2212
2189 // redraw one or more characters 2213 // redraw one or more characters
2190 2214
2191 // seek to the beginning of wide characters 2215 // seek to the beginning of wide characters
2192 while (stp[col] == NOCHAR && col > 0) 2216 while (expect_false (stp[col] == NOCHAR && col > 0))
2193 --col; 2217 --col;
2194 2218
2195 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2219 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2196 text_t *text = stp + col; 2220 text_t *text = stp + col;
2197 int count = 1; 2221 int count = 1;
… …
2219 count++; 2243 count++;
2220 2244
2221 if (stp[col] != dtp[col] 2245 if (stp[col] != dtp[col]
2222 || !RS_SAME (srp[col], drp[col])) 2246 || !RS_SAME (srp[col], drp[col]))
2223 { 2247 {
2224 if (must_clear && (i++ > count / 2)) 2248 if (have_bg && (i++ > count / 2))
2225 break; 2249 break;
2226 2250
2227 dtp[col] = stp[col]; 2251 dtp[col] = stp[col];
2228 drp[col] = rend; 2252 drp[col] = rend;
2229 i = 0; 2253 i = 0;
2230 } 2254 }
2231 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2255 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2232 break; 2256 break;
2233 } 2257 }
2234 2258
2235 col--; /* went one too far. move back */ 2259 col--; /* went one too far. move back */
2236 count -= i; /* dump any matching trailing chars */ 2260 count -= i; /* dump any matching trailing chars */
2237 2261
2238 // sometimes we optimize away the trailing NOCHAR's, add them back 2262 // sometimes we optimize away the trailing NOCHAR's, add them back
2239 while (i && text[count] == NOCHAR) 2263 while (expect_false (i && text[count] == NOCHAR))
2240 count++, i--; 2264 count++, i--;
2241 2265
2242 /* 2266 /*
2243 * Determine the attributes for the string 2267 * Determine the attributes for the string
2244 */ 2268 */
2245 int fore = fgcolor_of (rend); // desired foreground 2269 int fore = fgcolor_of (rend); // desired foreground
2246 int back = bgcolor_of (rend); // desired background 2270 int back = bgcolor_of (rend); // desired background
2247 2271
2248 // only do special processing if any attributes are set, which is unlikely 2272 // only do special processing if any attributes are set, which is unlikely
2249 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2273 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2250 { 2274 {
2251#if ENABLE_STYLES
2252 // "careful" (too wide) character handling
2253
2254 // include previous careful character(s) if possible, looks nicer (best effort...)
2255 while (text > stp
2256 && srp[text - stp - 1] & RS_Careful
2257 && RS_SAME (rend, srp[text - stp - 1]))
2258 text--, count++, xpixel -= fwidth;
2259
2260 // force redraw after "careful" characters to avoid pixel droppings
2261 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2262 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2263
2264 // force redraw before "careful" characters to avoid pixel droppings
2265 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2266 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2267#endif
2268
2269 bool invert = rend & RS_RVid; 2275 bool invert = rend & RS_RVid;
2270 2276
2271#ifndef NO_BOLD_UNDERLINE_REVERSE 2277#ifndef NO_BOLD_UNDERLINE_REVERSE
2272 if (rend & RS_Bold
2273 && fore == Color_fg) 2278 if (rend & RS_Bold && fore == Color_fg)
2274 { 2279 {
2275 if (ISSET_PIXCOLOR (Color_BD)) 2280 if (ISSET_PIXCOLOR (Color_BD))
2276 fore = Color_BD; 2281 fore = Color_BD;
2277# if !ENABLE_STYLES 2282# if !ENABLE_STYLES
2278 else 2283 else
2279 invert = !invert; 2284 invert = !invert;
2280# endif 2285# endif
2281 } 2286 }
2282 2287
2283 if (rend & RS_Italic 2288 if (rend & RS_Italic && fore == Color_fg)
2284 && fore == Color_fg)
2285 { 2289 {
2286 if (ISSET_PIXCOLOR (Color_IT)) 2290 if (ISSET_PIXCOLOR (Color_IT))
2287 fore = Color_IT; 2291 fore = Color_IT;
2288# if !ENABLE_STYLES 2292# if !ENABLE_STYLES
2289 else 2293 else
2290 invert = !invert; 2294 invert = !invert;
2291# endif 2295# endif
2292 } 2296 }
2293 2297
2294 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2298 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2295 fore = Color_UL; 2299 fore = Color_UL;
2296#endif 2300#endif
2297 2301
2298 if (invert) 2302 if (invert)
2299 { 2303 {
2304#ifdef OPTION_HC
2305 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2306 || !ISSET_PIXCOLOR (Color_HC))
2307#endif
2308 /* invert the column if no highlightColor is set or it is the
2309 * current cursor column */
2300 ::swap (fore, back); 2310 ::swap (fore, back);
2311#ifdef OPTION_HC
2312 else if (ISSET_PIXCOLOR (Color_HC))
2313 back = Color_HC;
2314#endif
2301 2315
2302#ifndef NO_BOLD_UNDERLINE_REVERSE 2316#ifndef NO_BOLD_UNDERLINE_REVERSE
2317# ifndef OPTION_HC
2303 if (ISSET_PIXCOLOR (Color_RV)) 2318 if (ISSET_PIXCOLOR (Color_RV))
2304 back = Color_RV; 2319 back = Color_RV;
2305 2320# endif
2306 if (fore == back) 2321 if (fore == back)
2307 { 2322 {
2308 fore = Color_bg; 2323 fore = Color_bg;
2309 back = Color_fg; 2324 back = Color_fg;
2310 } 2325 }
… …
2312 } 2327 }
2313 2328
2314#ifdef TEXT_BLINK 2329#ifdef TEXT_BLINK
2315 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2330 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2316 { 2331 {
2317 if (!text_blink_ev.active) 2332 if (!text_blink_ev.is_active ())
2318 { 2333 {
2319 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2334 text_blink_ev.again ();
2320 hidden_text = 0; 2335 hidden_text = 0;
2321 } 2336 }
2322 else if (hidden_text) 2337 else if (hidden_text)
2323 fore = back; 2338 fore = back;
2324 } 2339 }
2325#endif 2340#endif
2341
2342#if ENABLE_STYLES
2343 // "careful" (too wide) character handling
2344
2345 // include previous careful character(s) if possible, looks nicer (best effort...)
2346 while (text > stp
2347 && srp[text - stp - 1] & RS_Careful
2348 && RS_SAME (rend, srp[text - stp - 1]))
2349 text--, count++, xpixel -= fwidth;
2350
2351 // force redraw after "careful" characters to avoid pixel droppings
2352 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2353 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2354
2355 // force redraw before "careful" characters to avoid pixel droppings
2356 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2357 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2358#endif
2326 } 2359 }
2327 2360
2328 /* 2361 /*
2329 * Actually do the drawing of the string here 2362 * Actually do the drawing of the string here
2330 */ 2363 */
2331 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2364 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2332 2365
2333 if (back == fore) 2366 if (expect_true (have_bg && back == Color_bg))
2334 font->clear_rect (*drawable, xpixel, ypixel,
2335 fwidth * count, fheight,
2336 back);
2337 else if (back == Color_bg)
2338 { 2367 {
2339 if (must_clear) 2368 // this is very ugly, maybe push it into ->draw?
2340 {
2341 CLEAR_CHARS (xpixel, ypixel, count);
2342 2369
2343 for (i = 0; i < count; i++) /* don't draw empty strings */ 2370 for (i = 0; i < count; i++) /* don't draw empty strings */
2344 if (text[i] != ' ') 2371 if (text[i] != ' ')
2345 { 2372 {
2346 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2373 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2347 break; 2374 goto did_clear;
2348 }
2349 } 2375 }
2350 else 2376
2351 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2377 CLEAR_CHARS (xpixel, ypixel, count);
2378 did_clear: ;
2352 } 2379 }
2353 else 2380 else
2354 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2381 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2355 2382
2356 if (rend & RS_Uline && font->descent > 1 && fore != back) 2383 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2357 { 2384 {
2358#if ENABLE_FRILLS 2385#if ENABLE_FRILLS
2359 if (ISSET_PIXCOLOR (Color_underline)) 2386 if (ISSET_PIXCOLOR (Color_underline))
2360 XSetForeground (xdisp, gc, pix_colors[Color_underline]); 2387 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2361 else 2388 else
2362#endif 2389#endif
2363 XSetForeground (xdisp, gc, pix_colors[fore]); 2390 XSetForeground (dpy, gc, pix_colors[fore]);
2364 2391
2365 XDrawLine (xdisp, drawBuffer, gc, 2392 XDrawLine (dpy, vt, gc,
2366 xpixel, ypixel + font->ascent + 1, 2393 xpixel, ypixel + font->ascent + 1,
2367 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2394 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2368 } 2395 }
2369 } /* for (col....) */ 2396 } /* for (col....) */
2370 } /* for (row....) */ 2397 } /* for (row....) */
… …
2379 */ 2406 */
2380 if (showcursor) 2407 if (showcursor)
2381 { 2408 {
2382 if (focus) 2409 if (focus)
2383 { 2410 {
2384 if (OPTION (Opt_cursorUnderline)) 2411 if (option (Opt_cursorUnderline))
2385 *crp ^= RS_Uline; 2412 *crp ^= RS_Uline;
2386 else 2413 else
2387 { 2414 {
2388 *crp ^= RS_RVid; 2415 *crp ^= RS_RVid;
2389#ifndef NO_CURSORCOLOR 2416#ifndef NO_CURSORCOLOR
… …
2403 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2430 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2404 cursorwidth++; 2431 cursorwidth++;
2405 2432
2406#ifndef NO_CURSORCOLOR 2433#ifndef NO_CURSORCOLOR
2407 if (ISSET_PIXCOLOR (Color_cursor)) 2434 if (ISSET_PIXCOLOR (Color_cursor))
2408 XSetForeground (xdisp, gc, pix_colors[Color_cursor]); 2435 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2436 else
2409#endif 2437#endif
2438 XSetForeground (dpy, gc, pix_colors[ccol1]);
2410 2439
2411 XDrawRectangle (xdisp, drawBuffer, gc, 2440 XDrawRectangle (dpy, vt, gc,
2412 Col2Pixel (col), 2441 Col2Pixel (col),
2413 Row2Pixel (oldcursor.row), 2442 Row2Pixel (oldcursor.row),
2414 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2443 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2415 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2444 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2416 } 2445 }
… …
2451} 2480}
2452 2481
2453void 2482void
2454rxvt_term::scr_recolour () NOTHROW 2483rxvt_term::scr_recolour () NOTHROW
2455{ 2484{
2456 if (1 2485#ifdef HAVE_BG_PIXMAP
2457#if TRANSPARENT 2486 bgPixmap.apply ();
2458 && !am_transparent 2487#else
2459#endif 2488
2460#if XPM_BACKGROUND
2461 && !bgPixmap.pixmap
2462#endif
2463 )
2464 {
2465 XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]); 2489 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2466 XClearWindow (xdisp, parent[0]); 2490 XClearWindow (dpy, parent[0]);
2467 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); 2491 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2468#if HAVE_SCROLLBARS 2492
2469 if (scrollBar.win) 2493 if (scrollBar.win)
2470 { 2494 {
2471 XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]); 2495 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2472 scrollBar.setIdle (); 2496 scrollBar.state = STATE_IDLE;
2473 scrollbar_show (0); 2497 scrollBar.show (0);
2474 }
2475#endif
2476 } 2498 }
2477 2499
2500#endif
2501
2502 /* bgPixmap.apply () does not do the following : */
2478 scr_clear (); 2503 scr_clear ();
2479 scr_touch (true); 2504 scr_touch (true);
2480 want_refresh = 1; 2505 want_refresh = 1;
2481} 2506}
2482 2507
… …
2489 2514
2490 num_scr_allow = 0; 2515 num_scr_allow = 0;
2491 want_refresh = 1; 2516 want_refresh = 1;
2492 2517
2493 if (really) 2518 if (really)
2494 XClearWindow (xdisp, vt); 2519 XClearWindow (dpy, vt);
2495} 2520}
2496 2521
2497void 2522void
2498rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2523rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2499{ 2524{
… …
2548{ 2573{
2549 if (selection.op 2574 if (selection.op
2550 && current_screen == selection.screen 2575 && current_screen == selection.screen
2551 && selection.end.row >= view_start) 2576 && selection.end.row >= view_start)
2552 { 2577 {
2553#if ENABLE_FRILLS 2578#if !ENABLE_MINIMAL
2554 if (selection.rect) 2579 if (selection.rect)
2555 scr_xor_rect (selection.beg.row, selection.beg.col, 2580 scr_xor_rect (selection.beg.row, selection.beg.col,
2556 selection.end.row, selection.end.col, 2581 selection.end.row, selection.end.col,
2557 RS_RVid, RS_RVid | RS_Uline); 2582 RS_RVid, RS_RVid | RS_Uline);
2558 else 2583 else
… …
2574{ 2599{
2575 int row, wrote; 2600 int row, wrote;
2576 unsigned int width, towrite; 2601 unsigned int width, towrite;
2577 char r1[] = "\n"; 2602 char r1[] = "\n";
2578 2603
2579 for (row = saveLines - nsaved; 2604 for (row = saveLines + top_row;
2580 row < saveLines + nrow - 1; row++) 2605 row < saveLines + nrow - 1; row++)
2581 { 2606 {
2582 width = row_buf[row].l >= 0 ? row_buf[row].l 2607 width = row_buf[row].l >= 0 ? row_buf[row].l
2583 : ncol; 2608 : ncol;
2584 for (towrite = width; towrite; towrite -= wrote) 2609 for (towrite = width; towrite; towrite -= wrote)
… …
2635 /* convert normal newline chars into common keyboard Return key sequence */ 2660 /* convert normal newline chars into common keyboard Return key sequence */
2636 for (unsigned int i = 0; i < len; i++) 2661 for (unsigned int i = 0; i < len; i++)
2637 if (data[i] == C0_LF) 2662 if (data[i] == C0_LF)
2638 data[i] = C0_CR; 2663 data[i] = C0_CR;
2639 2664
2665 if (priv_modes & PrivMode_BracketPaste)
2666 tt_printf ("\e[200~");
2667
2640 tt_write (data, len); 2668 tt_write (data, len);
2669
2670 if (priv_modes & PrivMode_BracketPaste)
2671 tt_printf ("\e[201~");
2641} 2672}
2642 2673
2643/* ------------------------------------------------------------------------- */ 2674/* ------------------------------------------------------------------------- */
2644/* 2675/*
2645 * Respond to a notification that a primary selection has been sent 2676 * Respond to a notification that a primary selection has been sent
… …
2674 } 2705 }
2675 2706
2676 unsigned long bytes_after; 2707 unsigned long bytes_after;
2677 XTextProperty ct; 2708 XTextProperty ct;
2678 2709
2679 if (XGetWindowProperty (xdisp, win, prop, 2710 if (XGetWindowProperty (dpy, win, prop,
2680 0, PROP_SIZE / 4, 2711 0, PROP_SIZE / 4,
2681 delete_prop, AnyPropertyType, 2712 delete_prop, AnyPropertyType,
2682 &ct.encoding, &ct.format, 2713 &ct.encoding, &ct.format,
2683 &ct.nitems, &bytes_after, 2714 &ct.nitems, &bytes_after,
2684 &ct.value) != Success) 2715 &ct.value) != Success)
… …
2693 if (bytes_after) 2724 if (bytes_after)
2694 { 2725 {
2695 // fetch and append remaining data 2726 // fetch and append remaining data
2696 XTextProperty ct2; 2727 XTextProperty ct2;
2697 2728
2698 if (XGetWindowProperty (xdisp, win, prop, 2729 if (XGetWindowProperty (dpy, win, prop,
2699 ct.nitems / 4, (bytes_after + 3) / 4, 2730 ct.nitems / 4, (bytes_after + 3) / 4,
2700 delete_prop, AnyPropertyType, 2731 delete_prop, AnyPropertyType,
2701 &ct2.encoding, &ct2.format, 2732 &ct2.encoding, &ct2.format,
2702 &ct2.nitems, &bytes_after, 2733 &ct2.nitems, &bytes_after,
2703 &ct2.value) != Success) 2734 &ct2.value) != Success)
… …
2716 2747
2717 if (ct.encoding == xa[XA_INCR]) 2748 if (ct.encoding == xa[XA_INCR])
2718 { 2749 {
2719 // INCR selection, start handshake 2750 // INCR selection, start handshake
2720 if (!delete_prop) 2751 if (!delete_prop)
2721 XDeleteProperty (xdisp, win, prop); 2752 XDeleteProperty (dpy, win, prop);
2722 2753
2723 selection_wait = Sel_incr; 2754 selection_wait = Sel_incr;
2724 incr_buf_fill = 0; 2755 incr_buf_fill = 0;
2725 incr_ev.start (NOW + 10); 2756 incr_ev.start (10);
2726 2757
2727 goto bailout; 2758 goto bailout;
2728 } 2759 }
2729 2760
2730 if (ct.nitems == 0) 2761 if (ct.nitems == 0)
… …
2739 ct.nitems = incr_buf_fill; 2770 ct.nitems = incr_buf_fill;
2740 incr_buf = 0; 2771 incr_buf = 0;
2741 incr_buf_size = 0; 2772 incr_buf_size = 0;
2742 incr_ev.stop (); 2773 incr_ev.stop ();
2743 } 2774 }
2744 else 2775 else
2745 { 2776 {
2746 if (selection_wait == Sel_normal 2777 if (selection_wait == Sel_normal
2747 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2778 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2748 { 2779 {
2749 /* 2780 /*
… …
2756 goto bailout; 2787 goto bailout;
2757 } 2788 }
2758 } 2789 }
2759 else if (selection_wait == Sel_incr) 2790 else if (selection_wait == Sel_incr)
2760 { 2791 {
2761 incr_ev.start (NOW + 10); 2792 incr_ev.start (10);
2762 2793
2763 while (incr_buf_fill + ct.nitems > incr_buf_size) 2794 while (incr_buf_fill + ct.nitems > incr_buf_size)
2764 { 2795 {
2765 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2796 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2766 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2797 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2773 } 2804 }
2774 2805
2775 char **cl; 2806 char **cl;
2776 int cr; 2807 int cr;
2777 2808
2778#if ENABLE_FRILLS 2809#if !ENABLE_MINIMAL
2779 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2810 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2780 // so recode it manually 2811 // so recode it manually
2781 if (ct.encoding == xa[XA_UTF8_STRING]) 2812 if (ct.encoding == xa[XA_UTF8_STRING])
2782 { 2813 {
2783 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2814 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2787 paste (s, strlen (s)); 2818 paste (s, strlen (s));
2788 free (s); 2819 free (s);
2789 } 2820 }
2790 else 2821 else
2791#endif 2822#endif
2792 if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0 2823 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2793 && cl) 2824 && cl)
2794 { 2825 {
2795 for (int i = 0; i < cr; i++) 2826 for (int i = 0; i < cr; i++)
2796 paste (cl[i], strlen (cl[i])); 2827 paste (cl[i], strlen (cl[i]));
2797 2828
… …
2806 if (selection_wait == Sel_normal) 2837 if (selection_wait == Sel_normal)
2807 selection_wait = Sel_none; 2838 selection_wait = Sel_none;
2808} 2839}
2809 2840
2810void 2841void
2811rxvt_term::incr_cb (time_watcher &w) NOTHROW 2842rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2812{ 2843{
2813 selection_wait = Sel_none; 2844 selection_wait = Sel_none;
2814 2845
2815 incr_buf_size = 0; 2846 incr_buf_size = 0;
2816 free (incr_buf); 2847 free (incr_buf);
… …
2827 selection_paste (win, prop, true); 2858 selection_paste (win, prop, true);
2828} 2859}
2829 2860
2830/* ------------------------------------------------------------------------- */ 2861/* ------------------------------------------------------------------------- */
2831/* 2862/*
2832 * Request the current selection: 2863 * Request the current selection:
2833 * Order: > internal selection if available 2864 * Order: > internal selection if available
2834 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2865 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2835 * > CUT_BUFFER0 2866 * > CUT_BUFFER0
2836 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2867 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2837 * will auto fallback to CUT_BUFFER0 2868 * will auto fallback to CUT_BUFFER0
… …
2839 */ 2870 */
2840void 2871void
2841rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2872rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2842{ 2873{
2843 if (selection.text && selnum == Sel_Primary) 2874 if (selection.text && selnum == Sel_Primary)
2875 {
2844 { /* internal selection */ 2876 /* internal selection */
2845 char *str = rxvt_wcstombs (selection.text, selection.len); 2877 char *str = rxvt_wcstombs (selection.text, selection.len);
2846 paste (str, strlen (str)); 2878 paste (str, strlen (str));
2847 free (str); 2879 free (str);
2848 return; 2880 return;
2849 } 2881 }
… …
2879 else if (selnum == Sel_Secondary) 2911 else if (selnum == Sel_Secondary)
2880 sel = XA_SECONDARY; 2912 sel = XA_SECONDARY;
2881 else 2913 else
2882 sel = xa[XA_CLIPBOARD]; 2914 sel = xa[XA_CLIPBOARD];
2883 2915
2884 if (XGetSelectionOwner (xdisp, sel) != None) 2916 if (XGetSelectionOwner (dpy, sel) != None)
2885 { 2917 {
2886 XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION], 2918 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2887 vt, selection_request_time); 2919 vt, selection_request_time);
2888 return 1; 2920 return 1;
2889 } 2921 }
2890 2922
2891 return 0; 2923 return 0;
… …
2954 2986
2955 int end_col; 2987 int end_col;
2956 2988
2957 for (; row <= selection.end.row; row++, col = 0) 2989 for (; row <= selection.end.row; row++, col = 0)
2958 { 2990 {
2959#if ENABLE_FRILLS 2991#if !ENABLE_MINIMAL
2960 if (selection.rect) 2992 if (selection.rect)
2961 { 2993 {
2962 col = selection.beg.col; 2994 col = selection.beg.col;
2963 end_col = ncol + 1; 2995 end_col = ncol + 1;
2964 } 2996 }
… …
2967 end_col = ROW(row).l; 2999 end_col = ROW(row).l;
2968 3000
2969 col = max (col, 0); 3001 col = max (col, 0);
2970 3002
2971 if (row == selection.end.row 3003 if (row == selection.end.row
2972#if ENABLE_FRILLS 3004#if !ENABLE_MINIMAL
2973 || selection.rect 3005 || selection.rect
2974#endif 3006#endif
2975 ) 3007 )
2976 min_it (end_col, selection.end.col); 3008 min_it (end_col, selection.end.col);
2977 3009
… …
3000#endif 3032#endif
3001 else 3033 else
3002 new_selection_text[ofs++] = *t++; 3034 new_selection_text[ofs++] = *t++;
3003 } 3035 }
3004 3036
3005#if ENABLE_FRILLS 3037#if !ENABLE_MINIMAL
3006 if (selection.rect) 3038 if (selection.rect)
3007 { 3039 {
3008 while (ofs 3040 while (ofs
3009 && new_selection_text[ofs - 1] != C0_LF 3041 && new_selection_text[ofs - 1] != C0_LF
3010 && unicode::is_space (new_selection_text[ofs - 1])) 3042 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3044bool 3076bool
3045rxvt_term::selection_grab (Time tm) NOTHROW 3077rxvt_term::selection_grab (Time tm) NOTHROW
3046{ 3078{
3047 selection_time = tm; 3079 selection_time = tm;
3048 3080
3049 XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm); 3081 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3050 if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt) 3082 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3051 { 3083 {
3052 display->set_selection_owner (this); 3084 display->set_selection_owner (this);
3053 return true; 3085 return true;
3054 } 3086 }
3055 else 3087 else
… …
3059 } 3091 }
3060 3092
3061#if 0 3093#if 0
3062 XTextProperty ct; 3094 XTextProperty ct;
3063 3095
3064 if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0) 3096 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3065 { 3097 {
3066 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3098 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3067 XFree (ct.value); 3099 XFree (ct.value);
3068 } 3100 }
3069#endif 3101#endif
… …
3115 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3147 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3116 3148
3117 while (selection.mark.col > 0 3149 while (selection.mark.col > 0
3118 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3150 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3119 --selection.mark.col; 3151 --selection.mark.col;
3120 3152
3121 if (selection.op) 3153 if (selection.op)
3154 {
3122 { /* clear the old selection */ 3155 /* clear the old selection */
3123 selection.beg.row = selection.end.row = selection.mark.row; 3156 selection.beg.row = selection.end.row = selection.mark.row;
3124 selection.beg.col = selection.end.col = selection.mark.col; 3157 selection.beg.col = selection.end.col = selection.mark.col;
3125 } 3158 }
3126 3159
3127 selection.op = SELECTION_INIT; 3160 selection.op = SELECTION_INIT;
… …
3316 * a point/word/line which is either the start or end of the selection 3349 * a point/word/line which is either the start or end of the selection
3317 * and it was decided by whichever point/word/line was `fixed' at the 3350 * and it was decided by whichever point/word/line was `fixed' at the
3318 * time of the most recent button3 press 3351 * time of the most recent button3 press
3319 */ 3352 */
3320 if (button3 && buttonpress) 3353 if (button3 && buttonpress)
3354 {
3321 { /* button3 press */ 3355 /* button3 press */
3322 /* 3356 /*
3323 * first determine which edge of the selection we are closest to 3357 * first determine which edge of the selection we are closest to
3324 */ 3358 */
3325 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3359 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3326 || (!ROWCOL_IS_AFTER (pos, selection.end) 3360 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3344 selection.mark.row = selection.beg.row; 3378 selection.mark.row = selection.beg.row;
3345 selection.mark.col = selection.beg.col; 3379 selection.mark.col = selection.beg.col;
3346 } 3380 }
3347 } 3381 }
3348 else 3382 else
3383 {
3349 { /* button1 drag or button3 drag */ 3384 /* button1 drag or button3 drag */
3350 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3385 if (ROWCOL_IS_AFTER (selection.mark, pos))
3351 { 3386 {
3352 if (selection.mark.row == selection.end.row 3387 if (selection.mark.row == selection.end.row
3353 && selection.mark.col == selection.end.col 3388 && selection.mark.col == selection.end.col
3354 && clickchange 3389 && clickchange
… …
3371 3406
3372 if (selection.clicks == 1) 3407 if (selection.clicks == 1)
3373 { 3408 {
3374 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3409 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3375 && !ROW(selection.beg.row).is_longer () 3410 && !ROW(selection.beg.row).is_longer ()
3376#if ENABLE_FRILLS 3411#if !ENABLE_MINIMAL
3377 && !selection.rect 3412 && !selection.rect
3378#endif 3413#endif
3379 ) 3414 )
3380 selection.beg.col = ncol; 3415 selection.beg.col = ncol;
3381 3416
3382 if ( 3417 if (
3383 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3418 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3384 && !ROW(selection.end.row).is_longer () 3419 && !ROW(selection.end.row).is_longer ()
3385#if ENABLE_FRILLS 3420#if !ENABLE_MINIMAL
3386 && !selection.rect 3421 && !selection.rect
3387#endif 3422#endif
3388 ) 3423 )
3389 selection.end.col = ncol; 3424 selection.end.col = ncol;
3390 } 3425 }
… …
3397 selection_delimit_word (DN, &selection.end, &selection.end); 3432 selection_delimit_word (DN, &selection.end, &selection.end);
3398 } 3433 }
3399 else if (selection.clicks == 3) 3434 else if (selection.clicks == 3)
3400 { 3435 {
3401#if ENABLE_FRILLS 3436#if ENABLE_FRILLS
3402 if (OPTION (Opt_tripleclickwords)) 3437 if (option (Opt_tripleclickwords))
3403 { 3438 {
3404 selection_delimit_word (UP, &selection.beg, &selection.beg); 3439 selection_delimit_word (UP, &selection.beg, &selection.beg);
3405 3440
3406 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3441 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3407 { 3442 {
3408 if (!ROW(end_row).is_longer ()) 3443 if (!ROW(end_row).is_longer ())
3409 { 3444 {
3410 selection.end.row = end_row; 3445 selection.end.row = end_row;
3411 selection.end.col = ROW(end_row).l; 3446 selection.end.col = ROW(end_row).l;
3447# if !ENABLE_MINIMAL
3412 selection_remove_trailing_spaces (); 3448 selection_remove_trailing_spaces ();
3449# endif
3413 break; 3450 break;
3414 } 3451 }
3415 } 3452 }
3416 } 3453 }
3417 else 3454 else
… …
3433 selection.end.row++; 3470 selection.end.row++;
3434 } 3471 }
3435 } 3472 }
3436 3473
3437 if (button3 && buttonpress) 3474 if (button3 && buttonpress)
3475 {
3438 { /* mark may need to be changed */ 3476 /* mark may need to be changed */
3439 if (closeto == LEFT) 3477 if (closeto == LEFT)
3440 { 3478 {
3441 selection.mark.row = selection.end.row; 3479 selection.mark.row = selection.end.row;
3442 selection.mark.col = selection.end.col - (selection.clicks == 2); 3480 selection.mark.col = selection.end.col - (selection.clicks == 2);
3443 } 3481 }
… …
3446 selection.mark.row = selection.beg.row; 3484 selection.mark.row = selection.beg.row;
3447 selection.mark.col = selection.beg.col; 3485 selection.mark.col = selection.beg.col;
3448 } 3486 }
3449 } 3487 }
3450 3488
3451#if ENABLE_FRILLS 3489#if !ENABLE_MINIMAL
3452 if (selection.rect && selection.beg.col > selection.end.col) 3490 if (selection.rect && selection.beg.col > selection.end.col)
3453 ::swap (selection.beg.col, selection.end.col); 3491 ::swap (selection.beg.col, selection.end.col);
3454#endif 3492#endif
3455} 3493}
3456 3494
3457#if ENABLE_FRILLS 3495#if !ENABLE_MINIMAL
3458void 3496void
3459rxvt_term::selection_remove_trailing_spaces () NOTHROW 3497rxvt_term::selection_remove_trailing_spaces () NOTHROW
3460{ 3498{
3461 int32_t end_col, end_row; 3499 int32_t end_col, end_row;
3462 text_t *stp; 3500 text_t *stp;
… …
3540 *target++ = xa[XA_COMPOUND_TEXT]; 3578 *target++ = xa[XA_COMPOUND_TEXT];
3541#if X_HAVE_UTF8_STRING 3579#if X_HAVE_UTF8_STRING
3542 *target++ = xa[XA_UTF8_STRING]; 3580 *target++ = xa[XA_UTF8_STRING];
3543#endif 3581#endif
3544 3582
3545 XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM, 3583 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3546 32, PropModeReplace, 3584 32, PropModeReplace,
3547 (unsigned char *)target_list, target - target_list); 3585 (unsigned char *)target_list, target - target_list);
3548 ev.property = rq.property; 3586 ev.property = rq.property;
3549 } 3587 }
3550#if TODO // TODO 3588#if TODO // TODO
… …
3553 /* TODO: Handle MULTIPLE */ 3591 /* TODO: Handle MULTIPLE */
3554 } 3592 }
3555#endif 3593#endif
3556 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3594 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3557 { 3595 {
3558 XChangeProperty (xdisp, rq.requestor, rq.property, rq.target, 3596 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3559 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3597 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3560 ev.property = rq.property; 3598 ev.property = rq.property;
3561 } 3599 }
3562 else if (rq.target == XA_STRING 3600 else if (rq.target == XA_STRING
3563 || rq.target == xa[XA_TEXT] 3601 || rq.target == xa[XA_TEXT]
… …
3587 style = enc_string; 3625 style = enc_string;
3588 else if (target == xa[XA_TEXT]) 3626 else if (target == xa[XA_TEXT])
3589 style = enc_text; 3627 style = enc_text;
3590 else if (target == xa[XA_COMPOUND_TEXT]) 3628 else if (target == xa[XA_COMPOUND_TEXT])
3591 style = enc_compound_text; 3629 style = enc_compound_text;
3592#if ENABLE_FRILLS 3630#if !ENABLE_MINIMAL
3593 else if (target == xa[XA_UTF8_STRING]) 3631 else if (target == xa[XA_UTF8_STRING])
3594 style = enc_utf8; 3632 style = enc_utf8;
3595#endif 3633#endif
3596 else 3634 else
3597 { 3635 {
… …
3608 { 3646 {
3609 cl = L""; 3647 cl = L"";
3610 selectlen = 0; 3648 selectlen = 0;
3611 } 3649 }
3612 3650
3613#if ENABLE_FRILLS 3651#if !ENABLE_MINIMAL
3614 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3652 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3615 // so recode it manually 3653 // so recode it manually
3616 if (style == enc_utf8) 3654 if (style == enc_utf8)
3617 { 3655 {
3618 freect = 1; 3656 freect = 1;
… …
3621 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3659 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3622 ct.nitems = strlen ((char *)ct.value); 3660 ct.nitems = strlen ((char *)ct.value);
3623 } 3661 }
3624 else 3662 else
3625#endif 3663#endif
3626 if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3664 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3627 freect = 1; 3665 freect = 1;
3628 else 3666 else
3629 { 3667 {
3630 /* if we failed to convert then send it raw */ 3668 /* if we failed to convert then send it raw */
3631 ct.value = (unsigned char *)cl; 3669 ct.value = (unsigned char *)cl;
3632 ct.nitems = selectlen; 3670 ct.nitems = selectlen;
3633 ct.encoding = target; 3671 ct.encoding = target;
3634 } 3672 }
3635 3673
3636 XChangeProperty (xdisp, rq.requestor, rq.property, 3674 XChangeProperty (dpy, rq.requestor, rq.property,
3637 ct.encoding, 8, PropModeReplace, 3675 ct.encoding, 8, PropModeReplace,
3638 ct.value, (int)ct.nitems); 3676 ct.value, (int)ct.nitems);
3639 ev.property = rq.property; 3677 ev.property = rq.property;
3640 3678
3641 if (freect) 3679 if (freect)
3642 XFree (ct.value); 3680 XFree (ct.value);
3643 } 3681 }
3644 3682
3645 XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev); 3683 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3646}
3647
3648/* ------------------------------------------------------------------------- *
3649 * MOUSE ROUTINES *
3650 * ------------------------------------------------------------------------- */
3651
3652/*
3653 * return col/row values corresponding to x/y pixel values
3654 */
3655void
3656rxvt_term::pixel_position (int *x, int *y) NOTHROW
3657{
3658 *x = Pixel2Col (*x);
3659 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3660 *y = Pixel2Row (*y);
3661 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3662} 3684}
3663 3685
3664/* ------------------------------------------------------------------------- */ 3686/* ------------------------------------------------------------------------- */
3665#ifdef USE_XIM 3687#ifdef USE_XIM
3666void 3688void
3667rxvt_term::im_set_position (XPoint &pos) NOTHROW 3689rxvt_term::im_set_position (XPoint &pos) NOTHROW
3668{ 3690{
3669 XWindowAttributes xwa; 3691 XWindowAttributes xwa;
3670 3692
3671 XGetWindowAttributes (xdisp, vt, &xwa); 3693 XGetWindowAttributes (dpy, vt, &xwa);
3672 3694
3673 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3695 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3674 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3696 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3675} 3697}
3676#endif 3698#endif

Diff Legend

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