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.271 by sasha, Fri Aug 3 22:40:10 2007 UTC vs.
Revision 1.309 by root, Mon Jul 21 16:51:31 2008 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <X11/Xmd.h> /* get the typedef for CARD32 */
32
33#include <inttypes.h> 31#include <inttypes.h>
34 32
35#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a seperate compile!
36 34
37inline void fill_text (text_t *start, text_t value, int len) 35static inline void fill_text (text_t *start, text_t value, int len)
38{ 36{
39 while (len--) 37 while (len--)
40 *start++ = value; 38 *start++ = value;
41} 39}
42 40
… …
85 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 83 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
86#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 84#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
87 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 85 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
88 86
89/* 87/*
90 * CLEAR_ROWS : clear <num> rows starting from row <row>
91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 88 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
93 */ 89 */
94#define drawBuffer vt
95
96#define CLEAR_ROWS(row, num) \
97 if (mapped) \
98 XClearArea (dpy, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False)
101
102#define CLEAR_CHARS(x, y, num) \ 90#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 91 if (mapped) \
104 XClearArea (dpy, drawBuffer, x, y, \ 92 XClearArea (dpy, vt, x, y, \
105 (unsigned int)Width2Pixel (num), \ 93 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 94 (unsigned int)Height2Pixel (1), False)
107
108#define ERASE_ROWS(row, num) \
109 XFillRectangle (dpy, drawBuffer, gc, \
110 0, Row2Pixel (row), \
111 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num))
113 95
114/* ------------------------------------------------------------------------- * 96/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 97 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 98 * ------------------------------------------------------------------------- */
117 99
… …
161{ 143{
162#if ENABLE_OVERLAY 144#if ENABLE_OVERLAY
163 scr_overlay_off (); 145 scr_overlay_off ();
164#endif 146#endif
165 147
148 rvideo_mode = false;
166 view_start = 0; 149 view_start = 0;
167 num_scr = 0; 150 num_scr = 0;
168 151
169 if (ncol == 0) 152 if (ncol == 0)
170 ncol = 80; 153 ncol = 80;
… …
237 selection.text = NULL; 220 selection.text = NULL;
238 selection.len = 0; 221 selection.len = 0;
239 selection.op = SELECTION_CLEAR; 222 selection.op = SELECTION_CLEAR;
240 selection.screen = PRIMARY; 223 selection.screen = PRIMARY;
241 selection.clicks = 0; 224 selection.clicks = 0;
242 rvideo_state = rvideo_mode = false;
243 } 225 }
244 else 226 else
245 { 227 {
246 /* 228 /*
247 * add or delete rows as appropriate 229 * add or delete rows as appropriate
… …
276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 258 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
277 } 259 }
278 260
279 line_t *old_buf = row_buf; 261 line_t *old_buf = row_buf;
280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 262 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
281 263
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 264 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 265 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 266 int q = total_rows; // rewrapped row
285 267
286 if (top_row) 268 if (top_row)
… …
330 int qcol = 0; 312 int qcol = 0;
331 313
332 // see below for cursor adjustment rationale 314 // see below for cursor adjustment rationale
333 if (p == ocur.row) 315 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow); 316 screen.cur.row = q - (total_rows - nrow);
335 317
336 // fill a single destination line 318 // fill a single destination line
337 while (lofs < llen && qcol < ncol) 319 while (lofs < llen && qcol < ncol)
338 { 320 {
339 int prow = lofs / prev_ncol; 321 int prow = lofs / prev_ncol;
340 int pcol = lofs % prev_ncol; 322 int pcol = lofs % prev_ncol;
… …
366 } 348 }
367 while (p != pend && q > 0); 349 while (p != pend && q > 0);
368 350
369 term_start = total_rows - nrow; 351 term_start = total_rows - nrow;
370 top_row = q - term_start; 352 top_row = q - term_start;
371 353
372 // make sure all terminal lines exist 354 // make sure all terminal lines exist
373 while (top_row > 0) 355 while (top_row > 0)
374 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 356 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
375 } 357 }
376 else 358 else
377 { 359 {
378 // if no scrollback exists (yet), wing, instead of wrap 360 // if no scrollback exists (yet), wing, instead of wrap
379 361
380 for (int row = min (nrow, prev_nrow); row--; ) 362 for (int row = min (nrow, prev_nrow); row--; )
381 { 363 {
382 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 364 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
383 line_t &qline = row_buf [row]; 365 line_t &qline = row_buf [row];
384 366
… …
407 CLEAR_ALL_SELECTION (); 389 CLEAR_ALL_SELECTION ();
408 390
409 prev_nrow = nrow; 391 prev_nrow = nrow;
410 prev_ncol = ncol; 392 prev_ncol = ncol;
411 393
412 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 394 tabs = (char *)rxvt_malloc (ncol);
413 395
414 for (int col = ncol; --col; ) 396 for (int col = ncol; --col; )
415 tabs [col] = col % TABSIZE == 0; 397 tabs [col] = col % TABSIZE == 0;
416 398
417 if (current_screen != PRIMARY) 399 if (current_screen != PRIMARY)
… …
598/* 580/*
599 * Change the rendition style for following text 581 * Change the rendition style for following text
600 */ 582 */
601void 583void
602rxvt_term::scr_rendition (int set, int style) NOTHROW 584rxvt_term::scr_rendition (int set, int style) NOTHROW
603 { 585{
604 if (set) 586 if (set)
605 rstyle |= style; 587 rstyle |= style;
606 else if (style == ~RS_None) 588 else if (style == ~RS_None)
607 rstyle = DEFAULT_RSTYLE; 589 rstyle = DEFAULT_RSTYLE;
608 else 590 else
609 rstyle &= ~style; 591 rstyle &= ~style;
610 } 592}
611 593
612/* ------------------------------------------------------------------------- */ 594/* ------------------------------------------------------------------------- */
613/* 595/*
614 * Scroll text between <row1> and <row2> inclusive, by <count> lines 596 * Scroll text between <row1> and <row2> inclusive, by <count> lines
615 * count positive ==> scroll up 597 * count positive ==> scroll up
… …
666 line_t &l2 = ROW(i); 648 line_t &l2 = ROW(i);
667 649
668 ::swap (l1, l2); 650 ::swap (l1, l2);
669 l2.touch (); 651 l2.touch ();
670 } 652 }
671 653
672 // move and/or clear selection, if any 654 // move and/or clear selection, if any
673 if (selection.op && current_screen == selection.screen) 655 if (selection.op && current_screen == selection.screen)
674 { 656 {
675 selection.beg.row -= count; 657 selection.beg.row -= count;
676 selection.end.row -= count; 658 selection.end.row -= count;
… …
712 { 694 {
713 /* move selected region too */ 695 /* move selected region too */
714 selection.beg.row -= count; 696 selection.beg.row -= count;
715 selection.end.row -= count; 697 selection.end.row -= count;
716 selection.mark.row -= count; 698 selection.mark.row -= count;
717 699
718 selection_check (0); 700 selection_check (0);
719 } 701 }
720 } 702 }
721 703
722 // use a simple and robust scrolling algorithm, this 704 // use a simple and robust scrolling algorithm, this
… …
789 771
790 while (str < strend) 772 while (str < strend)
791 { 773 {
792 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 774 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
793 775
794 if (c < 0x20) 776 if (expect_false (c < 0x20))
795 if (c == C0_LF) 777 if (c == C0_LF)
796 { 778 {
797 max_it (line->l, screen.cur.col); 779 max_it (line->l, screen.cur.col);
798 780
799 screen.flags &= ~Screen_WrapNext; 781 screen.flags &= ~Screen_WrapNext;
… …
818 { 800 {
819 scr_tab (1, true); 801 scr_tab (1, true);
820 continue; 802 continue;
821 } 803 }
822 804
805 if (expect_false (
823 if (checksel /* see if we're writing within selection */ 806 checksel /* see if we're writing within selection */
824 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 807 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
825 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 808 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
809 ))
826 { 810 {
827 checksel = 0; 811 checksel = 0;
828 /* 812 /*
829 * If we wrote anywhere in the selected area, kill the selection 813 * If we wrote anywhere in the selected area, kill the selection
830 * XXX: should we kill the mark too? Possibly, but maybe that 814 * XXX: should we kill the mark too? Possibly, but maybe that
831 * should be a similar check. 815 * should be a similar check.
832 */ 816 */
833 CLEAR_SELECTION (); 817 CLEAR_SELECTION ();
834 } 818 }
835 819
836 if (screen.flags & Screen_WrapNext) 820 if (expect_false (screen.flags & Screen_WrapNext))
837 { 821 {
838 scr_do_wrap (); 822 scr_do_wrap ();
839 823
840 line->l = ncol; 824 line->l = ncol;
841 line->is_longer (1); 825 line->is_longer (1);
842 826
843 row = screen.cur.row; 827 row = screen.cur.row;
844 line = &ROW(row); /* _must_ refresh */ 828 line = &ROW(row); /* _must_ refresh */
845 } 829 }
846 830
847 // some utf-8 decoders "decode" surrogate characters: let's fix this. 831 // some utf-8 decoders "decode" surrogate characters: let's fix this.
848 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 832 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
849 c = 0xfffd; 833 c = 0xfffd;
850 834
851 // rely on wcwidth to tell us the character width, do wcwidth before 835 // rely on wcwidth to tell us the character width, do wcwidth before
852 // further replacements, as wcwidth might return -1 for the line 836 // further replacements, as wcwidth might return -1 for the line
853 // drawing characters below as they might be invalid in the current 837 // drawing characters below as they might be invalid in the current
854 // locale. 838 // locale.
855 int width = WCWIDTH (c); 839 int width = WCWIDTH (c);
856 840
857 if (charsets [screen.charset] == '0') // DEC SPECIAL 841 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
858 { 842 {
859 // vt100 special graphics and line drawing 843 // vt100 special graphics and line drawing
860 // 5f-7e standard vt100 844 // 5f-7e standard vt100
861 // 40-5e rxvt extension for extra curses acs chars 845 // 40-5e rxvt extension for extra curses acs chars
862 static uint16_t vt100_0[62] = { // 41 .. 7e 846 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
875 c = vt100_0[c - 0x41]; 859 c = vt100_0[c - 0x41];
876 width = 1; // vt100 line drawing characters are always single-width 860 width = 1; // vt100 line drawing characters are always single-width
877 } 861 }
878 } 862 }
879 863
880 if (screen.flags & Screen_Insert) 864 if (expect_false (screen.flags & Screen_Insert))
881 scr_insdel_chars (width, INSERT); 865 scr_insdel_chars (width, INSERT);
882 866
883 if (width != 0) 867 if (width != 0)
884 { 868 {
885#if !UNICODE_3 869#if !UNICODE_3
… …
891 c = 0xfffd; 875 c = 0xfffd;
892# endif 876# endif
893#endif 877#endif
894 878
895 // nuke the character at this position, if required 879 // nuke the character at this position, if required
880 if (expect_false (
896 if (line->t[screen.cur.col] == NOCHAR 881 line->t[screen.cur.col] == NOCHAR
897 || (screen.cur.col < ncol - 1 882 || (screen.cur.col < ncol - 1
898 && line->t[screen.cur.col + 1] == NOCHAR)) 883 && line->t[screen.cur.col + 1] == NOCHAR)
884 ))
899 { 885 {
900 int col = screen.cur.col; 886 int col = screen.cur.col;
901 887
902 // find begin 888 // find begin
903 while (col > 0 && line->t[col] == NOCHAR) 889 while (col > 0 && line->t[col] == NOCHAR)
… …
914 } 900 }
915 901
916 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 902 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
917 903
918 // if the character doesn't fit into the remaining columns... 904 // if the character doesn't fit into the remaining columns...
919 if (screen.cur.col > ncol - width && ncol >= width) 905 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
920 { 906 {
921 // ...output spaces 907 // ...output spaces
922 c = ' '; 908 c = ' ';
923 // and try the same character next loop iteration 909 // and try the same character next loop iteration
924 --str; 910 --str;
… …
929 do 915 do
930 { 916 {
931 line->t[screen.cur.col] = c; 917 line->t[screen.cur.col] = c;
932 line->r[screen.cur.col] = rend; 918 line->r[screen.cur.col] = rend;
933 919
934 if (screen.cur.col < ncol - 1) 920 if (expect_true (screen.cur.col < ncol - 1))
935 screen.cur.col++; 921 screen.cur.col++;
936 else 922 else
937 { 923 {
938 line->l = ncol; 924 line->l = ncol;
939 if (screen.flags & Screen_Autowrap) 925 if (screen.flags & Screen_Autowrap)
… …
941 break; 927 break;
942 } 928 }
943 929
944 c = NOCHAR; 930 c = NOCHAR;
945 } 931 }
946 while (--width > 0); 932 while (expect_false (--width > 0));
947 933
948 // pad with spaces when overwriting wide character with smaller one 934 // pad with spaces when overwriting wide character with smaller one
949 if (!width) 935 if (expect_false (!width))
950 { 936 {
951 line->touch (); 937 line->touch ();
952 938
953 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 939 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
954 { 940 {
955 line->t[c] = ' '; 941 line->t[c] = ' ';
956 line->r[c] = rend; 942 line->r[c] = rend;
957 } 943 }
958 } 944 }
959 } 945 }
946#if ENABLE_COMBINING
960 else // width == 0 947 else // width == 0
961 { 948 {
962#if ENABLE_COMBINING 949 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 { 950 {
951 // handle combining characters
952 // we just tag the accent on the previous on-screen character.
953 // this is arguably not correct, but also arguably not wrong.
954 // we don't handle double-width characters nicely yet.
955 line_t *linep;
956 text_t *tp;
957 rend_t *rp;
958
959 if (screen.cur.col > 0)
960 {
973 linep = line; 961 linep = line;
974 tp = line->t + screen.cur.col - 1; 962 tp = line->t + screen.cur.col - 1;
975 rp = line->r + screen.cur.col - 1; 963 rp = line->r + screen.cur.col - 1;
964 }
965 else if (screen.cur.row > 0
966 && ROW(screen.cur.row - 1).is_longer ())
967 {
968 linep = &ROW(screen.cur.row - 1);
969 tp = line->t + ncol - 1;
970 rp = line->r + ncol - 1;
971 }
972 else
973 continue;
974
975 linep->touch ();
976
977 while (*tp == NOCHAR && tp > linep->t)
978 tp--, rp--;
979
980 // first try to find a precomposed character
981 unicode_t n = rxvt_compose (*tp, c);
982 if (n == NOCHAR)
983 n = rxvt_composite.compose (*tp, c);
984
985 *tp = n;
986 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
976 } 987 }
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 } 988 }
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 989#endif
1000 }
1001 } 990 }
1002 991
1003 max_it (line->l, screen.cur.col); 992 max_it (line->l, screen.cur.col);
1004 993
1005#ifdef DEBUG_STRICT 994#ifdef DEBUG_STRICT
… …
1013 * XTERM_SEQ: CTRL-H 1002 * XTERM_SEQ: CTRL-H
1014 */ 1003 */
1015void 1004void
1016rxvt_term::scr_backspace () NOTHROW 1005rxvt_term::scr_backspace () NOTHROW
1017{ 1006{
1018 want_refresh = 1;
1019
1020 if (screen.cur.col == 0) 1007 if (screen.cur.col == 0)
1021 { 1008 {
1022 if (screen.cur.row > 0) 1009 if (screen.cur.row > 0)
1023 { 1010 {
1024#ifdef TERMCAP_HAS_BW 1011#ifdef TERMCAP_HAS_BW
1025 screen.cur.col = ncol - 1; 1012 screen.cur.col = ncol - 1;
1026 screen.cur.row--; 1013 --screen.cur.row;
1027 return; 1014
1015 want_refresh = 1;
1028#endif 1016#endif
1029 } 1017 }
1030 } 1018 }
1031 else if (!(screen.flags & Screen_WrapNext)) 1019 else
1032 scr_gotorc (0, -1, RELATIVE); 1020 scr_gotorc (0, -1, RELATIVE);
1033
1034 screen.flags &= ~Screen_WrapNext;
1035} 1021}
1036 1022
1037/* ------------------------------------------------------------------------- */ 1023/* ------------------------------------------------------------------------- */
1038/* 1024/*
1039 * Process Horizontal Tab 1025 * Process Horizontal Tab
… …
1062 x = i; 1048 x = i;
1063 1049
1064 if (!--count) 1050 if (!--count)
1065 break; 1051 break;
1066 } 1052 }
1067 else 1053 else
1068 ht &= l.t[i] == ' ' 1054 ht &= l.t[i] == ' '
1069 && RS_SAME (l.r[i], base_rend); 1055 && RS_SAME (l.r[i], base_rend);
1070 1056
1071 if (count) 1057 if (count)
1072 x = ncol - 1; 1058 x = ncol - 1;
… …
1188 } 1174 }
1189 } 1175 }
1190 else 1176 else
1191 { 1177 {
1192 if (screen.flags & Screen_Relative) 1178 if (screen.flags & Screen_Relative)
1179 {
1193 { /* relative origin mode */ 1180 /* relative origin mode */
1194 screen.cur.row = row + screen.tscroll; 1181 screen.cur.row = row + screen.tscroll;
1195 min_it (screen.cur.row, screen.bscroll); 1182 min_it (screen.cur.row, screen.bscroll);
1196 } 1183 }
1197 else 1184 else
1198 screen.cur.row = row; 1185 screen.cur.row = row;
… …
1231/* 1218/*
1232 * Erase part or whole of a line 1219 * Erase part or whole of a line
1233 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1220 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1234 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1221 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1235 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1222 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1223 * extension: clear to right unless wrapped: ESC [ 3 K
1236 */ 1224 */
1237void 1225void
1238rxvt_term::scr_erase_line (int mode) NOTHROW 1226rxvt_term::scr_erase_line (int mode) NOTHROW
1239{ 1227{
1240 unsigned int col, num; 1228 unsigned int col, num;
… …
1249 line.touch (); 1237 line.touch ();
1250 line.is_longer (0); 1238 line.is_longer (0);
1251 1239
1252 switch (mode) 1240 switch (mode)
1253 { 1241 {
1242 case 3:
1243 if (screen.flags & Screen_WrapNext)
1244 return;
1245
1246 /* fall through */
1247
1254 case 0: /* erase to end of line */ 1248 case 0: /* erase to end of line */
1255 col = screen.cur.col; 1249 col = screen.cur.col;
1256 num = ncol - col; 1250 num = ncol - col;
1257 min_it (line.l, col); 1251 min_it (line.l, col);
1252
1258 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1253 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1259 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1254 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1260 CLEAR_SELECTION (); 1255 CLEAR_SELECTION ();
1261 break; 1256 break;
1257
1262 case 1: /* erase to beginning of line */ 1258 case 1: /* erase to beginning of line */
1263 col = 0; 1259 col = 0;
1264 num = screen.cur.col + 1; 1260 num = screen.cur.col + 1;
1261
1265 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1262 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1266 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1263 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1267 CLEAR_SELECTION (); 1264 CLEAR_SELECTION ();
1268 break; 1265 break;
1266
1269 case 2: /* erase whole line */ 1267 case 2: /* erase whole line */
1270 col = 0; 1268 col = 0;
1271 num = ncol; 1269 num = ncol;
1272 line.l = 0; 1270 line.l = 0;
1273 if (selection.beg.row <= screen.cur.row 1271 if (selection.beg.row <= screen.cur.row
… …
1331 if (row >= nrow) /* Out Of Bounds */ 1329 if (row >= nrow) /* Out Of Bounds */
1332 return; 1330 return;
1333 1331
1334 min_it (num, nrow - row); 1332 min_it (num, nrow - row);
1335 1333
1334 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1336 if (rstyle & (RS_RVid | RS_Uline)) 1335 if (rstyle & (RS_RVid | RS_Uline))
1337 ren = (rend_t) ~RS_None; 1336 ren = (rend_t) ~RS_None;
1338 else if (GET_BASEBG (rstyle) == Color_bg) 1337 else if (GET_BASEBG (rstyle) == Color_bg)
1339 { 1338 {
1340 ren = DEFAULT_RSTYLE; 1339 ren = DEFAULT_RSTYLE;
1341 CLEAR_ROWS (row, num); 1340
1341 if (mapped)
1342 XClearArea (dpy, vt, 0,
1343 Row2Pixel (row), (unsigned int)width,
1344 (unsigned int)Height2Pixel (num), False);
1342 } 1345 }
1343 else 1346 else
1344 { 1347 {
1345 ren = rstyle & (RS_fgMask | RS_bgMask); 1348 ren = rstyle & (RS_fgMask | RS_bgMask);
1349
1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1350 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1347 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1351 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1348 ERASE_ROWS (row, num); 1352 XFillRectangle (dpy, vt, gc,
1353 0, Row2Pixel (row),
1354 (unsigned int)width,
1355 (unsigned int)Height2Pixel (num));
1349 gcvalue.foreground = pix_colors[Color_fg]; 1356 gcvalue.foreground = pix_colors[Color_fg];
1350 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1357 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1351 } 1358 }
1352 1359
1353 for (; num--; row++) 1360 for (; num--; row++)
… …
1474 { 1481 {
1475 if (selection.end.row != screen.cur.row 1482 if (selection.end.row != screen.cur.row
1476 || (selection.end.col + count >= ncol)) 1483 || (selection.end.col + count >= ncol))
1477 CLEAR_SELECTION (); 1484 CLEAR_SELECTION ();
1478 else 1485 else
1486 {
1479 { /* shift selection */ 1487 /* shift selection */
1480 selection.beg.col += count; 1488 selection.beg.col += count;
1481 selection.mark.col += count; /* XXX: yes? */ 1489 selection.mark.col += count; /* XXX: yes? */
1482 selection.end.col += count; 1490 selection.end.col += count;
1483 } 1491 }
1484 } 1492 }
… …
1623 */ 1631 */
1624void 1632void
1625rxvt_term::scr_set_tab (int mode) NOTHROW 1633rxvt_term::scr_set_tab (int mode) NOTHROW
1626{ 1634{
1627 if (mode < 0) 1635 if (mode < 0)
1628 memset (tabs, 0, ncol * sizeof (char)); 1636 memset (tabs, 0, ncol);
1629 else if (screen.cur.col < ncol) 1637 else if (screen.cur.col < ncol)
1630 tabs [screen.cur.col] = !!mode; 1638 tabs [screen.cur.col] = !!mode;
1631} 1639}
1632 1640
1633/* ------------------------------------------------------------------------- */ 1641/* ------------------------------------------------------------------------- */
… …
1650 rvideo_state = on; 1658 rvideo_state = on;
1651 1659
1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1660 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1653#ifdef HAVE_BG_PIXMAP 1661#ifdef HAVE_BG_PIXMAP
1654 if (bgPixmap.pixmap == None) 1662 if (bgPixmap.pixmap == None)
1655#endif
1656#if ENABLE_TRANSPARENCY
1657 if (!option (Opt_transparent) || am_transparent == 0)
1658#endif 1663#endif
1659 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1664 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1660 1665
1661 XGCValues gcvalue; 1666 XGCValues gcvalue;
1662 gcvalue.foreground = pix_colors[Color_fg]; 1667 gcvalue.foreground = pix_colors[Color_fg];
… …
1806 for (i = PART_BEG; i < RC_COUNT; i++) 1811 for (i = PART_BEG; i < RC_COUNT; i++)
1807 { 1812 {
1808 min_it (rc[i].col, ncol - 1); 1813 min_it (rc[i].col, ncol - 1);
1809 min_it (rc[i].row, nrow - 1); 1814 min_it (rc[i].row, nrow - 1);
1810 } 1815 }
1811 1816// 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++) 1817 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); 1818 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1814 1819
1815 num_scr_allow = 0; 1820 num_scr_allow = 0;
1816 1821
… …
1871 return true; 1876 return true;
1872} 1877}
1873 1878
1874#ifndef NO_BELL 1879#ifndef NO_BELL
1875void 1880void
1876rxvt_term::bell_cb (time_watcher &w) 1881rxvt_term::bell_cb (ev::timer &w, int revents)
1877{ 1882{
1878 rvideo_bell = false; 1883 rvideo_bell = false;
1879 scr_rvideo_mode (rvideo_mode); 1884 scr_rvideo_mode (rvideo_mode);
1885 refresh_check ();
1880} 1886}
1881#endif 1887#endif
1882 1888
1883/* ------------------------------------------------------------------------- */ 1889/* ------------------------------------------------------------------------- */
1884void 1890void
… …
1890# ifdef MAPALERT_OPTION 1896# ifdef MAPALERT_OPTION
1891 if (option (Opt_mapAlert)) 1897 if (option (Opt_mapAlert))
1892# endif 1898# endif
1893 XMapWindow (dpy, parent[0]); 1899 XMapWindow (dpy, parent[0]);
1894# endif 1900# endif
1901
1895# if ENABLE_FRILLS 1902# if ENABLE_FRILLS
1896 if (option (Opt_urgentOnBell)) 1903 if (option (Opt_urgentOnBell))
1897 { 1904 {
1898 XWMHints *h;
1899
1900 h = XGetWMHints(dpy, parent[0]); 1905 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1901 if (h != NULL)
1902 { 1906 {
1903 h->flags |= XUrgencyHint; 1907 h->flags |= XUrgencyHint;
1904 XSetWMHints(dpy, parent[0], h); 1908 XSetWMHints (dpy, parent[0], h);
1905 } 1909 }
1906 } 1910 }
1907# endif 1911# endif
1908 1912
1909 if (option (Opt_visualBell)) 1913 if (option (Opt_visualBell))
1910 { 1914 {
1911 rvideo_bell = true; 1915 rvideo_bell = true;
1912 scr_rvideo_mode (rvideo_mode); 1916 scr_rvideo_mode (rvideo_mode);
1913 display->flush (); 1917 flush ();
1914 1918
1915 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1919 bell_ev.start (VISUAL_BELL_DURATION);
1916 } 1920 }
1917 else 1921 else
1918 XBell (dpy, 0); 1922 XBell (dpy, 0);
1919
1920#endif 1923#endif
1921} 1924}
1922 1925
1923/* ------------------------------------------------------------------------- */ 1926/* ------------------------------------------------------------------------- */
1924/* ARGSUSED */ 1927/* ARGSUSED */
1925void 1928void
1926rxvt_term::scr_printscreen (int fullhist) NOTHROW 1929rxvt_term::scr_printscreen (int fullhist) NOTHROW
1927{ 1930{
1928#ifdef PRINTPIPE 1931#ifdef PRINTPIPE
1929 int nrows, row_start; 1932 int nrows, row_start;
1930 FILE *fd; 1933 FILE *fd = popen_printer ();
1931 1934
1932 if ((fd = popen_printer ()) == NULL) 1935 if (!fd)
1933 return; 1936 return;
1934 1937
1935 if (fullhist) 1938 if (fullhist)
1936 { 1939 {
1937 nrows = nrow - top_row; 1940 nrows = nrow - top_row;
… …
2002 return; 2005 return;
2003 2006
2004 /* 2007 /*
2005 * A: set up vars 2008 * A: set up vars
2006 */ 2009 */
2010 refresh_count = 0;
2011
2007 have_bg = 0; 2012 have_bg = 0;
2008 refresh_count = 0;
2009
2010#ifdef HAVE_BG_PIXMAP 2013#ifdef HAVE_BG_PIXMAP
2011 have_bg |= bgPixmap.pixmap != None; 2014 have_bg = bgPixmap.pixmap != None;
2012#endif
2013#if ENABLE_TRANSPARENCY
2014 have_bg |= option (Opt_transparent) && am_transparent;
2015#endif 2015#endif
2016 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2016 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2017 2017
2018 /* 2018 /*
2019 * B: reverse any characters which are selected 2019 * B: reverse any characters which are selected
… …
2272 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2272 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2273 { 2273 {
2274 bool invert = rend & RS_RVid; 2274 bool invert = rend & RS_RVid;
2275 2275
2276#ifndef NO_BOLD_UNDERLINE_REVERSE 2276#ifndef NO_BOLD_UNDERLINE_REVERSE
2277 if (rend & RS_Bold
2278 && fore == Color_fg) 2277 if (rend & RS_Bold && fore == Color_fg)
2279 { 2278 {
2280 if (ISSET_PIXCOLOR (Color_BD)) 2279 if (ISSET_PIXCOLOR (Color_BD))
2281 fore = Color_BD; 2280 fore = Color_BD;
2282# if !ENABLE_STYLES 2281# if !ENABLE_STYLES
2283 else 2282 else
2284 invert = !invert; 2283 invert = !invert;
2285# endif 2284# endif
2286 } 2285 }
2287 2286
2288 if (rend & RS_Italic 2287 if (rend & RS_Italic && fore == Color_fg)
2289 && fore == Color_fg)
2290 { 2288 {
2291 if (ISSET_PIXCOLOR (Color_IT)) 2289 if (ISSET_PIXCOLOR (Color_IT))
2292 fore = Color_IT; 2290 fore = Color_IT;
2293# if !ENABLE_STYLES 2291# if !ENABLE_STYLES
2294 else 2292 else
… …
2328 } 2326 }
2329 2327
2330#ifdef TEXT_BLINK 2328#ifdef TEXT_BLINK
2331 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2329 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2332 { 2330 {
2333 if (!text_blink_ev.active) 2331 if (!text_blink_ev.is_active ())
2334 { 2332 {
2335 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2333 text_blink_ev.again ();
2336 hidden_text = 0; 2334 hidden_text = 0;
2337 } 2335 }
2338 else if (hidden_text) 2336 else if (hidden_text)
2339 fore = back; 2337 fore = back;
2340 } 2338 }
… …
2388 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2386 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2389 else 2387 else
2390#endif 2388#endif
2391 XSetForeground (dpy, gc, pix_colors[fore]); 2389 XSetForeground (dpy, gc, pix_colors[fore]);
2392 2390
2393 XDrawLine (dpy, drawBuffer, gc, 2391 XDrawLine (dpy, vt, gc,
2394 xpixel, ypixel + font->ascent + 1, 2392 xpixel, ypixel + font->ascent + 1,
2395 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2393 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2396 } 2394 }
2397 } /* for (col....) */ 2395 } /* for (col....) */
2398 } /* for (row....) */ 2396 } /* for (row....) */
… …
2436 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2434 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2437 else 2435 else
2438#endif 2436#endif
2439 XSetForeground (dpy, gc, pix_colors[ccol1]); 2437 XSetForeground (dpy, gc, pix_colors[ccol1]);
2440 2438
2441 XDrawRectangle (dpy, drawBuffer, gc, 2439 XDrawRectangle (dpy, vt, gc,
2442 Col2Pixel (col), 2440 Col2Pixel (col),
2443 Row2Pixel (oldcursor.row), 2441 Row2Pixel (oldcursor.row),
2444 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2442 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2445 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2443 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2446 } 2444 }
… …
2481} 2479}
2482 2480
2483void 2481void
2484rxvt_term::scr_recolour () NOTHROW 2482rxvt_term::scr_recolour () NOTHROW
2485{ 2483{
2486 if (1
2487#if ENABLE_TRANSPARENCY
2488 && !am_transparent
2489#endif
2490#ifdef HAVE_BG_PIXMAP 2484#ifdef HAVE_BG_PIXMAP
2491 && !bgPixmap.pixmap 2485 bgPixmap.apply ();
2492#endif 2486#else
2493 ) 2487
2494 {
2495 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2488 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2496 XClearWindow (dpy, parent[0]); 2489 XClearWindow (dpy, parent[0]);
2497 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2490 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2498#if HAVE_SCROLLBARS 2491
2499 if (scrollBar.win) 2492 if (scrollBar.win)
2500 { 2493 {
2501 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2494 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2502 scrollBar.setIdle (); 2495 scrollBar.state = STATE_IDLE;
2503 scrollbar_show (0); 2496 scrollBar.show (0);
2504 }
2505#endif
2506 } 2497 }
2507 2498
2499#endif
2500
2501 /* bgPixmap.apply () does not do the following : */
2508 scr_clear (); 2502 scr_clear ();
2509 scr_touch (true); 2503 scr_touch (true);
2510 want_refresh = 1; 2504 want_refresh = 1;
2511} 2505}
2512 2506
… …
2604{ 2598{
2605 int row, wrote; 2599 int row, wrote;
2606 unsigned int width, towrite; 2600 unsigned int width, towrite;
2607 char r1[] = "\n"; 2601 char r1[] = "\n";
2608 2602
2609 for (row = saveLines - nsaved; 2603 for (row = saveLines + top_row;
2610 row < saveLines + nrow - 1; row++) 2604 row < saveLines + nrow - 1; row++)
2611 { 2605 {
2612 width = row_buf[row].l >= 0 ? row_buf[row].l 2606 width = row_buf[row].l >= 0 ? row_buf[row].l
2613 : ncol; 2607 : ncol;
2614 for (towrite = width; towrite; towrite -= wrote) 2608 for (towrite = width; towrite; towrite -= wrote)
… …
2665 /* convert normal newline chars into common keyboard Return key sequence */ 2659 /* convert normal newline chars into common keyboard Return key sequence */
2666 for (unsigned int i = 0; i < len; i++) 2660 for (unsigned int i = 0; i < len; i++)
2667 if (data[i] == C0_LF) 2661 if (data[i] == C0_LF)
2668 data[i] = C0_CR; 2662 data[i] = C0_CR;
2669 2663
2664 if (priv_modes & PrivMode_BracketPaste)
2665 tt_printf ("\e[200~");
2666
2670 tt_write (data, len); 2667 tt_write (data, len);
2668
2669 if (priv_modes & PrivMode_BracketPaste)
2670 tt_printf ("\e[201~");
2671} 2671}
2672 2672
2673/* ------------------------------------------------------------------------- */ 2673/* ------------------------------------------------------------------------- */
2674/* 2674/*
2675 * Respond to a notification that a primary selection has been sent 2675 * Respond to a notification that a primary selection has been sent
… …
2750 if (!delete_prop) 2750 if (!delete_prop)
2751 XDeleteProperty (dpy, win, prop); 2751 XDeleteProperty (dpy, win, prop);
2752 2752
2753 selection_wait = Sel_incr; 2753 selection_wait = Sel_incr;
2754 incr_buf_fill = 0; 2754 incr_buf_fill = 0;
2755 incr_ev.start (NOW + 10); 2755 incr_ev.start (10);
2756 2756
2757 goto bailout; 2757 goto bailout;
2758 } 2758 }
2759 2759
2760 if (ct.nitems == 0) 2760 if (ct.nitems == 0)
… …
2769 ct.nitems = incr_buf_fill; 2769 ct.nitems = incr_buf_fill;
2770 incr_buf = 0; 2770 incr_buf = 0;
2771 incr_buf_size = 0; 2771 incr_buf_size = 0;
2772 incr_ev.stop (); 2772 incr_ev.stop ();
2773 } 2773 }
2774 else 2774 else
2775 { 2775 {
2776 if (selection_wait == Sel_normal 2776 if (selection_wait == Sel_normal
2777 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2777 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2778 { 2778 {
2779 /* 2779 /*
… …
2786 goto bailout; 2786 goto bailout;
2787 } 2787 }
2788 } 2788 }
2789 else if (selection_wait == Sel_incr) 2789 else if (selection_wait == Sel_incr)
2790 { 2790 {
2791 incr_ev.start (NOW + 10); 2791 incr_ev.start (10);
2792 2792
2793 while (incr_buf_fill + ct.nitems > incr_buf_size) 2793 while (incr_buf_fill + ct.nitems > incr_buf_size)
2794 { 2794 {
2795 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2795 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2796 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2796 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2836 if (selection_wait == Sel_normal) 2836 if (selection_wait == Sel_normal)
2837 selection_wait = Sel_none; 2837 selection_wait = Sel_none;
2838} 2838}
2839 2839
2840void 2840void
2841rxvt_term::incr_cb (time_watcher &w) NOTHROW 2841rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2842{ 2842{
2843 selection_wait = Sel_none; 2843 selection_wait = Sel_none;
2844 2844
2845 incr_buf_size = 0; 2845 incr_buf_size = 0;
2846 free (incr_buf); 2846 free (incr_buf);
… …
2857 selection_paste (win, prop, true); 2857 selection_paste (win, prop, true);
2858} 2858}
2859 2859
2860/* ------------------------------------------------------------------------- */ 2860/* ------------------------------------------------------------------------- */
2861/* 2861/*
2862 * Request the current selection: 2862 * Request the current selection:
2863 * Order: > internal selection if available 2863 * Order: > internal selection if available
2864 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2864 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2865 * > CUT_BUFFER0 2865 * > CUT_BUFFER0
2866 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2866 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2867 * will auto fallback to CUT_BUFFER0 2867 * will auto fallback to CUT_BUFFER0
… …
2869 */ 2869 */
2870void 2870void
2871rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2871rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2872{ 2872{
2873 if (selection.text && selnum == Sel_Primary) 2873 if (selection.text && selnum == Sel_Primary)
2874 {
2874 { /* internal selection */ 2875 /* internal selection */
2875 char *str = rxvt_wcstombs (selection.text, selection.len); 2876 char *str = rxvt_wcstombs (selection.text, selection.len);
2876 paste (str, strlen (str)); 2877 paste (str, strlen (str));
2877 free (str); 2878 free (str);
2878 return; 2879 return;
2879 } 2880 }
… …
3145 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3146 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3146 3147
3147 while (selection.mark.col > 0 3148 while (selection.mark.col > 0
3148 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3149 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3149 --selection.mark.col; 3150 --selection.mark.col;
3150 3151
3151 if (selection.op) 3152 if (selection.op)
3153 {
3152 { /* clear the old selection */ 3154 /* clear the old selection */
3153 selection.beg.row = selection.end.row = selection.mark.row; 3155 selection.beg.row = selection.end.row = selection.mark.row;
3154 selection.beg.col = selection.end.col = selection.mark.col; 3156 selection.beg.col = selection.end.col = selection.mark.col;
3155 } 3157 }
3156 3158
3157 selection.op = SELECTION_INIT; 3159 selection.op = SELECTION_INIT;
… …
3346 * a point/word/line which is either the start or end of the selection 3348 * a point/word/line which is either the start or end of the selection
3347 * and it was decided by whichever point/word/line was `fixed' at the 3349 * and it was decided by whichever point/word/line was `fixed' at the
3348 * time of the most recent button3 press 3350 * time of the most recent button3 press
3349 */ 3351 */
3350 if (button3 && buttonpress) 3352 if (button3 && buttonpress)
3353 {
3351 { /* button3 press */ 3354 /* button3 press */
3352 /* 3355 /*
3353 * first determine which edge of the selection we are closest to 3356 * first determine which edge of the selection we are closest to
3354 */ 3357 */
3355 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3358 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3356 || (!ROWCOL_IS_AFTER (pos, selection.end) 3359 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3374 selection.mark.row = selection.beg.row; 3377 selection.mark.row = selection.beg.row;
3375 selection.mark.col = selection.beg.col; 3378 selection.mark.col = selection.beg.col;
3376 } 3379 }
3377 } 3380 }
3378 else 3381 else
3382 {
3379 { /* button1 drag or button3 drag */ 3383 /* button1 drag or button3 drag */
3380 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3384 if (ROWCOL_IS_AFTER (selection.mark, pos))
3381 { 3385 {
3382 if (selection.mark.row == selection.end.row 3386 if (selection.mark.row == selection.end.row
3383 && selection.mark.col == selection.end.col 3387 && selection.mark.col == selection.end.col
3384 && clickchange 3388 && clickchange
… …
3465 selection.end.row++; 3469 selection.end.row++;
3466 } 3470 }
3467 } 3471 }
3468 3472
3469 if (button3 && buttonpress) 3473 if (button3 && buttonpress)
3474 {
3470 { /* mark may need to be changed */ 3475 /* mark may need to be changed */
3471 if (closeto == LEFT) 3476 if (closeto == LEFT)
3472 { 3477 {
3473 selection.mark.row = selection.end.row; 3478 selection.mark.row = selection.end.row;
3474 selection.mark.col = selection.end.col - (selection.clicks == 2); 3479 selection.mark.col = selection.end.col - (selection.clicks == 2);
3475 } 3480 }
… …
3674 XFree (ct.value); 3679 XFree (ct.value);
3675 } 3680 }
3676 3681
3677 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3682 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3678} 3683}
3679
3680/* ------------------------------------------------------------------------- *
3681 * MOUSE ROUTINES *
3682 * ------------------------------------------------------------------------- */
3683
3684/*
3685 * return col/row values corresponding to x/y pixel values
3686 */
3687void
3688rxvt_term::pixel_position (int *x, int *y) NOTHROW
3689{
3690 *x = Pixel2Col (*x);
3691 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3692 *y = Pixel2Row (*y);
3693 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3694}
3695 3684
3696/* ------------------------------------------------------------------------- */ 3685/* ------------------------------------------------------------------------- */
3697#ifdef USE_XIM 3686#ifdef USE_XIM
3698void 3687void
3699rxvt_term::im_set_position (XPoint &pos) NOTHROW 3688rxvt_term::im_set_position (XPoint &pos) NOTHROW

Diff Legend

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