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.275 by sasha, Wed Aug 15 22:41:52 2007 UTC vs.
Revision 1.310 by root, Wed Jul 23 17:10:07 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.
… …
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a seperate compile!
34 34
35inline void fill_text (text_t *start, text_t value, int len) 35static inline void fill_text (text_t *start, text_t value, int len)
36{ 36{
37 while (len--) 37 while (len--)
38 *start++ = value; 38 *start++ = value;
39} 39}
40 40
… …
83 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)
84#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 84#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
85 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)
86 86
87/* 87/*
88 * CLEAR_ROWS : clear <num> rows starting from row <row>
89 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 88 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
90 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
91 */ 89 */
92#define drawBuffer vt
93
94#define CLEAR_ROWS(row, num) \
95 if (mapped) \
96 XClearArea (dpy, drawBuffer, 0, \
97 Row2Pixel (row), (unsigned int)width, \
98 (unsigned int)Height2Pixel (num), False)
99
100#define CLEAR_CHARS(x, y, num) \ 90#define CLEAR_CHARS(x, y, num) \
101 if (mapped) \ 91 if (mapped) \
102 XClearArea (dpy, drawBuffer, x, y, \ 92 XClearArea (dpy, vt, x, y, \
103 (unsigned int)Width2Pixel (num), \ 93 (unsigned int)Width2Pixel (num), \
104 (unsigned int)Height2Pixel (1), False) 94 (unsigned int)Height2Pixel (1), False)
105
106#define ERASE_ROWS(row, num) \
107 XFillRectangle (dpy, drawBuffer, gc, \
108 0, Row2Pixel (row), \
109 (unsigned int)width, \
110 (unsigned int)Height2Pixel (num))
111 95
112/* ------------------------------------------------------------------------- * 96/* ------------------------------------------------------------------------- *
113 * SCREEN `COMMON' ROUTINES * 97 * SCREEN `COMMON' ROUTINES *
114 * ------------------------------------------------------------------------- */ 98 * ------------------------------------------------------------------------- */
115 99
… …
274 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);
275 } 259 }
276 260
277 line_t *old_buf = row_buf; 261 line_t *old_buf = row_buf;
278 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));
279 263
280 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
281 int pend = MOD (term_start + top_row , prev_total_rows); 265 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 266 int q = total_rows; // rewrapped row
283 267
284 if (top_row) 268 if (top_row)
… …
328 int qcol = 0; 312 int qcol = 0;
329 313
330 // see below for cursor adjustment rationale 314 // see below for cursor adjustment rationale
331 if (p == ocur.row) 315 if (p == ocur.row)
332 screen.cur.row = q - (total_rows - nrow); 316 screen.cur.row = q - (total_rows - nrow);
333 317
334 // fill a single destination line 318 // fill a single destination line
335 while (lofs < llen && qcol < ncol) 319 while (lofs < llen && qcol < ncol)
336 { 320 {
337 int prow = lofs / prev_ncol; 321 int prow = lofs / prev_ncol;
338 int pcol = lofs % prev_ncol; 322 int pcol = lofs % prev_ncol;
… …
364 } 348 }
365 while (p != pend && q > 0); 349 while (p != pend && q > 0);
366 350
367 term_start = total_rows - nrow; 351 term_start = total_rows - nrow;
368 top_row = q - term_start; 352 top_row = q - term_start;
369 353
370 // make sure all terminal lines exist 354 // make sure all terminal lines exist
371 while (top_row > 0) 355 while (top_row > 0)
372 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 356 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
373 } 357 }
374 else 358 else
375 { 359 {
376 // if no scrollback exists (yet), wing, instead of wrap 360 // if no scrollback exists (yet), wing, instead of wrap
377 361
378 for (int row = min (nrow, prev_nrow); row--; ) 362 for (int row = min (nrow, prev_nrow); row--; )
379 { 363 {
380 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)];
381 line_t &qline = row_buf [row]; 365 line_t &qline = row_buf [row];
382 366
… …
405 CLEAR_ALL_SELECTION (); 389 CLEAR_ALL_SELECTION ();
406 390
407 prev_nrow = nrow; 391 prev_nrow = nrow;
408 prev_ncol = ncol; 392 prev_ncol = ncol;
409 393
410 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 394 tabs = (char *)rxvt_malloc (ncol);
411 395
412 for (int col = ncol; --col; ) 396 for (int col = ncol; --col; )
413 tabs [col] = col % TABSIZE == 0; 397 tabs [col] = col % TABSIZE == 0;
414 398
415 if (current_screen != PRIMARY) 399 if (current_screen != PRIMARY)
… …
596/* 580/*
597 * Change the rendition style for following text 581 * Change the rendition style for following text
598 */ 582 */
599void 583void
600rxvt_term::scr_rendition (int set, int style) NOTHROW 584rxvt_term::scr_rendition (int set, int style) NOTHROW
601 { 585{
602 if (set) 586 if (set)
603 rstyle |= style; 587 rstyle |= style;
604 else if (style == ~RS_None) 588 else if (style == ~RS_None)
605 rstyle = DEFAULT_RSTYLE; 589 rstyle = DEFAULT_RSTYLE;
606 else 590 else
607 rstyle &= ~style; 591 rstyle &= ~style;
608 } 592}
609 593
610/* ------------------------------------------------------------------------- */ 594/* ------------------------------------------------------------------------- */
611/* 595/*
612 * Scroll text between <row1> and <row2> inclusive, by <count> lines 596 * Scroll text between <row1> and <row2> inclusive, by <count> lines
613 * count positive ==> scroll up 597 * count positive ==> scroll up
… …
664 line_t &l2 = ROW(i); 648 line_t &l2 = ROW(i);
665 649
666 ::swap (l1, l2); 650 ::swap (l1, l2);
667 l2.touch (); 651 l2.touch ();
668 } 652 }
669 653
670 // move and/or clear selection, if any 654 // move and/or clear selection, if any
671 if (selection.op && current_screen == selection.screen) 655 if (selection.op && current_screen == selection.screen)
672 { 656 {
673 selection.beg.row -= count; 657 selection.beg.row -= count;
674 selection.end.row -= count; 658 selection.end.row -= count;
… …
710 { 694 {
711 /* move selected region too */ 695 /* move selected region too */
712 selection.beg.row -= count; 696 selection.beg.row -= count;
713 selection.end.row -= count; 697 selection.end.row -= count;
714 selection.mark.row -= count; 698 selection.mark.row -= count;
715 699
716 selection_check (0); 700 selection_check (0);
717 } 701 }
718 } 702 }
719 703
720 // use a simple and robust scrolling algorithm, this 704 // use a simple and robust scrolling algorithm, this
… …
787 771
788 while (str < strend) 772 while (str < strend)
789 { 773 {
790 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 774 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
791 775
792 if (c < 0x20) 776 if (expect_false (c < 0x20))
793 if (c == C0_LF) 777 if (c == C0_LF)
794 { 778 {
795 max_it (line->l, screen.cur.col); 779 max_it (line->l, screen.cur.col);
796 780
797 screen.flags &= ~Screen_WrapNext; 781 screen.flags &= ~Screen_WrapNext;
… …
816 { 800 {
817 scr_tab (1, true); 801 scr_tab (1, true);
818 continue; 802 continue;
819 } 803 }
820 804
805 if (expect_false (
821 if (checksel /* see if we're writing within selection */ 806 checksel /* see if we're writing within selection */
822 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 807 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
823 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 808 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
809 ))
824 { 810 {
825 checksel = 0; 811 checksel = 0;
826 /* 812 /*
827 * If we wrote anywhere in the selected area, kill the selection 813 * If we wrote anywhere in the selected area, kill the selection
828 * XXX: should we kill the mark too? Possibly, but maybe that 814 * XXX: should we kill the mark too? Possibly, but maybe that
829 * should be a similar check. 815 * should be a similar check.
830 */ 816 */
831 CLEAR_SELECTION (); 817 CLEAR_SELECTION ();
832 } 818 }
833 819
834 if (screen.flags & Screen_WrapNext) 820 if (expect_false (screen.flags & Screen_WrapNext))
835 { 821 {
836 scr_do_wrap (); 822 scr_do_wrap ();
837 823
838 line->l = ncol; 824 line->l = ncol;
839 line->is_longer (1); 825 line->is_longer (1);
840 826
841 row = screen.cur.row; 827 row = screen.cur.row;
842 line = &ROW(row); /* _must_ refresh */ 828 line = &ROW(row); /* _must_ refresh */
843 } 829 }
844 830
845 // some utf-8 decoders "decode" surrogate characters: let's fix this. 831 // some utf-8 decoders "decode" surrogate characters: let's fix this.
846 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 832 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
847 c = 0xfffd; 833 c = 0xfffd;
848 834
849 // 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
850 // further replacements, as wcwidth might return -1 for the line 836 // further replacements, as wcwidth might return -1 for the line
851 // drawing characters below as they might be invalid in the current 837 // drawing characters below as they might be invalid in the current
852 // locale. 838 // locale.
853 int width = WCWIDTH (c); 839 int width = WCWIDTH (c);
854 840
855 if (charsets [screen.charset] == '0') // DEC SPECIAL 841 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
856 { 842 {
857 // vt100 special graphics and line drawing 843 // vt100 special graphics and line drawing
858 // 5f-7e standard vt100 844 // 5f-7e standard vt100
859 // 40-5e rxvt extension for extra curses acs chars 845 // 40-5e rxvt extension for extra curses acs chars
860 static uint16_t vt100_0[62] = { // 41 .. 7e 846 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
873 c = vt100_0[c - 0x41]; 859 c = vt100_0[c - 0x41];
874 width = 1; // vt100 line drawing characters are always single-width 860 width = 1; // vt100 line drawing characters are always single-width
875 } 861 }
876 } 862 }
877 863
878 if (screen.flags & Screen_Insert) 864 if (expect_false (screen.flags & Screen_Insert))
879 scr_insdel_chars (width, INSERT); 865 scr_insdel_chars (width, INSERT);
880 866
881 if (width != 0) 867 if (width != 0)
882 { 868 {
883#if !UNICODE_3 869#if !UNICODE_3
… …
889 c = 0xfffd; 875 c = 0xfffd;
890# endif 876# endif
891#endif 877#endif
892 878
893 // nuke the character at this position, if required 879 // nuke the character at this position, if required
880 if (expect_false (
894 if (line->t[screen.cur.col] == NOCHAR 881 line->t[screen.cur.col] == NOCHAR
895 || (screen.cur.col < ncol - 1 882 || (screen.cur.col < ncol - 1
896 && line->t[screen.cur.col + 1] == NOCHAR)) 883 && line->t[screen.cur.col + 1] == NOCHAR)
884 ))
897 { 885 {
898 int col = screen.cur.col; 886 int col = screen.cur.col;
899 887
900 // find begin 888 // find begin
901 while (col > 0 && line->t[col] == NOCHAR) 889 while (col > 0 && line->t[col] == NOCHAR)
… …
912 } 900 }
913 901
914 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 902 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
915 903
916 // if the character doesn't fit into the remaining columns... 904 // if the character doesn't fit into the remaining columns...
917 if (screen.cur.col > ncol - width && ncol >= width) 905 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
918 { 906 {
919 // ...output spaces 907 // ...output spaces
920 c = ' '; 908 c = ' ';
921 // and try the same character next loop iteration 909 // and try the same character next loop iteration
922 --str; 910 --str;
… …
927 do 915 do
928 { 916 {
929 line->t[screen.cur.col] = c; 917 line->t[screen.cur.col] = c;
930 line->r[screen.cur.col] = rend; 918 line->r[screen.cur.col] = rend;
931 919
932 if (screen.cur.col < ncol - 1) 920 if (expect_true (screen.cur.col < ncol - 1))
933 screen.cur.col++; 921 screen.cur.col++;
934 else 922 else
935 { 923 {
936 line->l = ncol; 924 line->l = ncol;
937 if (screen.flags & Screen_Autowrap) 925 if (screen.flags & Screen_Autowrap)
… …
939 break; 927 break;
940 } 928 }
941 929
942 c = NOCHAR; 930 c = NOCHAR;
943 } 931 }
944 while (--width > 0); 932 while (expect_false (--width > 0));
945 933
946 // pad with spaces when overwriting wide character with smaller one 934 // pad with spaces when overwriting wide character with smaller one
947 if (!width) 935 if (expect_false (!width))
948 { 936 {
949 line->touch (); 937 line->touch ();
950 938
951 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++)
952 { 940 {
953 line->t[c] = ' '; 941 line->t[c] = ' ';
954 line->r[c] = rend; 942 line->r[c] = rend;
955 } 943 }
956 } 944 }
957 } 945 }
946#if ENABLE_COMBINING
958 else // width == 0 947 else // width == 0
959 { 948 {
960#if ENABLE_COMBINING 949 if (c != 0xfeff) // ignore BOM
961 // handle combining characters
962 // we just tag the accent on the previous on-screen character.
963 // this is arguably not correct, but also arguably not wrong.
964 // we don't handle double-width characters nicely yet.
965 line_t *linep;
966 text_t *tp;
967 rend_t *rp;
968
969 if (screen.cur.col > 0)
970 { 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 {
971 linep = line; 961 linep = line;
972 tp = line->t + screen.cur.col - 1; 962 tp = line->t + screen.cur.col - 1;
973 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));
974 } 987 }
975 else if (screen.cur.row > 0
976 && ROW(screen.cur.row - 1).is_longer ())
977 {
978 linep = &ROW(screen.cur.row - 1);
979 tp = line->t + ncol - 1;
980 rp = line->r + ncol - 1;
981 } 988 }
982 else
983 continue;
984
985 linep->touch ();
986
987 while (*tp == NOCHAR && tp > linep->t)
988 tp--, rp--;
989
990 // first try to find a precomposed character
991 unicode_t n = rxvt_compose (*tp, c);
992 if (n == NOCHAR)
993 n = rxvt_composite.compose (*tp, c);
994
995 *tp = n;
996 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
997#endif 989#endif
998 }
999 } 990 }
1000 991
1001 max_it (line->l, screen.cur.col); 992 max_it (line->l, screen.cur.col);
1002 993
1003#ifdef DEBUG_STRICT 994#ifdef DEBUG_STRICT
… …
1011 * XTERM_SEQ: CTRL-H 1002 * XTERM_SEQ: CTRL-H
1012 */ 1003 */
1013void 1004void
1014rxvt_term::scr_backspace () NOTHROW 1005rxvt_term::scr_backspace () NOTHROW
1015{ 1006{
1016 want_refresh = 1;
1017
1018 if (screen.cur.col == 0) 1007 if (screen.cur.col == 0)
1019 { 1008 {
1020 if (screen.cur.row > 0) 1009 if (screen.cur.row > 0)
1021 { 1010 {
1022#ifdef TERMCAP_HAS_BW 1011#ifdef TERMCAP_HAS_BW
1023 screen.cur.col = ncol - 1; 1012 screen.cur.col = ncol - 1;
1024 screen.cur.row--; 1013 --screen.cur.row;
1025 return; 1014
1015 want_refresh = 1;
1026#endif 1016#endif
1027 } 1017 }
1028 } 1018 }
1029 else if (!(screen.flags & Screen_WrapNext)) 1019 else
1030 scr_gotorc (0, -1, RELATIVE); 1020 scr_gotorc (0, -1, RELATIVE);
1031
1032 screen.flags &= ~Screen_WrapNext;
1033} 1021}
1034 1022
1035/* ------------------------------------------------------------------------- */ 1023/* ------------------------------------------------------------------------- */
1036/* 1024/*
1037 * Process Horizontal Tab 1025 * Process Horizontal Tab
… …
1060 x = i; 1048 x = i;
1061 1049
1062 if (!--count) 1050 if (!--count)
1063 break; 1051 break;
1064 } 1052 }
1065 else 1053 else
1066 ht &= l.t[i] == ' ' 1054 ht &= l.t[i] == ' '
1067 && RS_SAME (l.r[i], base_rend); 1055 && RS_SAME (l.r[i], base_rend);
1068 1056
1069 if (count) 1057 if (count)
1070 x = ncol - 1; 1058 x = ncol - 1;
… …
1186 } 1174 }
1187 } 1175 }
1188 else 1176 else
1189 { 1177 {
1190 if (screen.flags & Screen_Relative) 1178 if (screen.flags & Screen_Relative)
1179 {
1191 { /* relative origin mode */ 1180 /* relative origin mode */
1192 screen.cur.row = row + screen.tscroll; 1181 screen.cur.row = row + screen.tscroll;
1193 min_it (screen.cur.row, screen.bscroll); 1182 min_it (screen.cur.row, screen.bscroll);
1194 } 1183 }
1195 else 1184 else
1196 screen.cur.row = row; 1185 screen.cur.row = row;
… …
1229/* 1218/*
1230 * Erase part or whole of a line 1219 * Erase part or whole of a line
1231 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1220 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1232 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1221 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1233 * 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
1234 */ 1224 */
1235void 1225void
1236rxvt_term::scr_erase_line (int mode) NOTHROW 1226rxvt_term::scr_erase_line (int mode) NOTHROW
1237{ 1227{
1238 unsigned int col, num; 1228 unsigned int col, num;
… …
1247 line.touch (); 1237 line.touch ();
1248 line.is_longer (0); 1238 line.is_longer (0);
1249 1239
1250 switch (mode) 1240 switch (mode)
1251 { 1241 {
1242 case 3:
1243 if (screen.flags & Screen_WrapNext)
1244 return;
1245
1246 /* fall through */
1247
1252 case 0: /* erase to end of line */ 1248 case 0: /* erase to end of line */
1253 col = screen.cur.col; 1249 col = screen.cur.col;
1254 num = ncol - col; 1250 num = ncol - col;
1255 min_it (line.l, col); 1251 min_it (line.l, col);
1252
1256 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1253 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1257 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1254 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1258 CLEAR_SELECTION (); 1255 CLEAR_SELECTION ();
1259 break; 1256 break;
1257
1260 case 1: /* erase to beginning of line */ 1258 case 1: /* erase to beginning of line */
1261 col = 0; 1259 col = 0;
1262 num = screen.cur.col + 1; 1260 num = screen.cur.col + 1;
1261
1263 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1262 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1264 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1263 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1265 CLEAR_SELECTION (); 1264 CLEAR_SELECTION ();
1266 break; 1265 break;
1266
1267 case 2: /* erase whole line */ 1267 case 2: /* erase whole line */
1268 col = 0; 1268 col = 0;
1269 num = ncol; 1269 num = ncol;
1270 line.l = 0; 1270 line.l = 0;
1271 if (selection.beg.row <= screen.cur.row 1271 if (selection.beg.row <= screen.cur.row
… …
1329 if (row >= nrow) /* Out Of Bounds */ 1329 if (row >= nrow) /* Out Of Bounds */
1330 return; 1330 return;
1331 1331
1332 min_it (num, nrow - row); 1332 min_it (num, nrow - row);
1333 1333
1334 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1334 if (rstyle & (RS_RVid | RS_Uline)) 1335 if (rstyle & (RS_RVid | RS_Uline))
1335 ren = (rend_t) ~RS_None; 1336 ren = (rend_t) ~RS_None;
1336 else if (GET_BASEBG (rstyle) == Color_bg) 1337 else if (GET_BASEBG (rstyle) == Color_bg)
1337 { 1338 {
1338 ren = DEFAULT_RSTYLE; 1339 ren = DEFAULT_RSTYLE;
1339 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);
1340 } 1345 }
1341 else 1346 else
1342 { 1347 {
1343 ren = rstyle & (RS_fgMask | RS_bgMask); 1348 ren = rstyle & (RS_fgMask | RS_bgMask);
1349
1344 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1350 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1345 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1351 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1346 ERASE_ROWS (row, num); 1352 XFillRectangle (dpy, vt, gc,
1353 0, Row2Pixel (row),
1354 (unsigned int)width,
1355 (unsigned int)Height2Pixel (num));
1347 gcvalue.foreground = pix_colors[Color_fg]; 1356 gcvalue.foreground = pix_colors[Color_fg];
1348 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1357 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1349 } 1358 }
1350 1359
1351 for (; num--; row++) 1360 for (; num--; row++)
… …
1472 { 1481 {
1473 if (selection.end.row != screen.cur.row 1482 if (selection.end.row != screen.cur.row
1474 || (selection.end.col + count >= ncol)) 1483 || (selection.end.col + count >= ncol))
1475 CLEAR_SELECTION (); 1484 CLEAR_SELECTION ();
1476 else 1485 else
1486 {
1477 { /* shift selection */ 1487 /* shift selection */
1478 selection.beg.col += count; 1488 selection.beg.col += count;
1479 selection.mark.col += count; /* XXX: yes? */ 1489 selection.mark.col += count; /* XXX: yes? */
1480 selection.end.col += count; 1490 selection.end.col += count;
1481 } 1491 }
1482 } 1492 }
… …
1621 */ 1631 */
1622void 1632void
1623rxvt_term::scr_set_tab (int mode) NOTHROW 1633rxvt_term::scr_set_tab (int mode) NOTHROW
1624{ 1634{
1625 if (mode < 0) 1635 if (mode < 0)
1626 memset (tabs, 0, ncol * sizeof (char)); 1636 memset (tabs, 0, ncol);
1627 else if (screen.cur.col < ncol) 1637 else if (screen.cur.col < ncol)
1628 tabs [screen.cur.col] = !!mode; 1638 tabs [screen.cur.col] = !!mode;
1629} 1639}
1630 1640
1631/* ------------------------------------------------------------------------- */ 1641/* ------------------------------------------------------------------------- */
… …
1866 return true; 1876 return true;
1867} 1877}
1868 1878
1869#ifndef NO_BELL 1879#ifndef NO_BELL
1870void 1880void
1871rxvt_term::bell_cb (time_watcher &w) 1881rxvt_term::bell_cb (ev::timer &w, int revents)
1872{ 1882{
1873 rvideo_bell = false; 1883 rvideo_bell = false;
1874 scr_rvideo_mode (rvideo_mode); 1884 scr_rvideo_mode (rvideo_mode);
1885 refresh_check ();
1875} 1886}
1876#endif 1887#endif
1877 1888
1878/* ------------------------------------------------------------------------- */ 1889/* ------------------------------------------------------------------------- */
1879void 1890void
… …
1885# ifdef MAPALERT_OPTION 1896# ifdef MAPALERT_OPTION
1886 if (option (Opt_mapAlert)) 1897 if (option (Opt_mapAlert))
1887# endif 1898# endif
1888 XMapWindow (dpy, parent[0]); 1899 XMapWindow (dpy, parent[0]);
1889# endif 1900# endif
1901
1890# if ENABLE_FRILLS 1902# if ENABLE_FRILLS
1891 if (option (Opt_urgentOnBell)) 1903 if (option (Opt_urgentOnBell))
1892 { 1904 {
1893 XWMHints *h;
1894
1895 h = XGetWMHints(dpy, parent[0]); 1905 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1896 if (h != NULL)
1897 { 1906 {
1898 h->flags |= XUrgencyHint; 1907 h->flags |= XUrgencyHint;
1899 XSetWMHints(dpy, parent[0], h); 1908 XSetWMHints (dpy, parent[0], h);
1900 } 1909 }
1901 } 1910 }
1902# endif 1911# endif
1903 1912
1904 if (option (Opt_visualBell)) 1913 if (option (Opt_visualBell))
1905 { 1914 {
1906 rvideo_bell = true; 1915 rvideo_bell = true;
1907 scr_rvideo_mode (rvideo_mode); 1916 scr_rvideo_mode (rvideo_mode);
1908 display->flush (); 1917 flush ();
1909 1918
1910 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1919 bell_ev.start (VISUAL_BELL_DURATION);
1911 } 1920 }
1912 else 1921 else
1913 XBell (dpy, 0); 1922 XBell (dpy, 0);
1914#endif 1923#endif
1915} 1924}
… …
1919void 1928void
1920rxvt_term::scr_printscreen (int fullhist) NOTHROW 1929rxvt_term::scr_printscreen (int fullhist) NOTHROW
1921{ 1930{
1922#ifdef PRINTPIPE 1931#ifdef PRINTPIPE
1923 int nrows, row_start; 1932 int nrows, row_start;
1924 FILE *fd; 1933 FILE *fd = popen_printer ();
1925 1934
1926 if ((fd = popen_printer ()) == NULL) 1935 if (!fd)
1927 return; 1936 return;
1928 1937
1929 if (fullhist) 1938 if (fullhist)
1930 { 1939 {
1931 nrows = nrow - top_row; 1940 nrows = nrow - top_row;
… …
1996 return; 2005 return;
1997 2006
1998 /* 2007 /*
1999 * A: set up vars 2008 * A: set up vars
2000 */ 2009 */
2010 refresh_count = 0;
2011
2001 have_bg = 0; 2012 have_bg = 0;
2002 refresh_count = 0;
2003
2004#ifdef HAVE_BG_PIXMAP 2013#ifdef HAVE_BG_PIXMAP
2005 have_bg |= bgPixmap.pixmap != None; 2014 have_bg = bgPixmap.pixmap != None;
2006#endif 2015#endif
2007 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2016 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2008 2017
2009 /* 2018 /*
2010 * B: reverse any characters which are selected 2019 * B: reverse any characters which are selected
… …
2201 continue; 2210 continue;
2202 2211
2203 // redraw one or more characters 2212 // redraw one or more characters
2204 2213
2205 // seek to the beginning of wide characters 2214 // seek to the beginning of wide characters
2206 while (stp[col] == NOCHAR && col > 0) 2215 while (expect_false (stp[col] == NOCHAR && col > 0))
2207 --col; 2216 --col;
2208 2217
2209 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2218 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2210 text_t *text = stp + col; 2219 text_t *text = stp + col;
2211 int count = 1; 2220 int count = 1;
… …
2248 2257
2249 col--; /* went one too far. move back */ 2258 col--; /* went one too far. move back */
2250 count -= i; /* dump any matching trailing chars */ 2259 count -= i; /* dump any matching trailing chars */
2251 2260
2252 // sometimes we optimize away the trailing NOCHAR's, add them back 2261 // sometimes we optimize away the trailing NOCHAR's, add them back
2253 while (i && text[count] == NOCHAR) 2262 while (expect_false (i && text[count] == NOCHAR))
2254 count++, i--; 2263 count++, i--;
2255 2264
2256 /* 2265 /*
2257 * Determine the attributes for the string 2266 * Determine the attributes for the string
2258 */ 2267 */
2259 int fore = fgcolor_of (rend); // desired foreground 2268 int fore = fgcolor_of (rend); // desired foreground
2260 int back = bgcolor_of (rend); // desired background 2269 int back = bgcolor_of (rend); // desired background
2261 2270
2262 // only do special processing if any attributes are set, which is unlikely 2271 // only do special processing if any attributes are set, which is unlikely
2263 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2272 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2264 { 2273 {
2265 bool invert = rend & RS_RVid; 2274 bool invert = rend & RS_RVid;
2266 2275
2267#ifndef NO_BOLD_UNDERLINE_REVERSE 2276#ifndef NO_BOLD_UNDERLINE_REVERSE
2268 if (rend & RS_Bold
2269 && fore == Color_fg) 2277 if (rend & RS_Bold && fore == Color_fg)
2270 { 2278 {
2271 if (ISSET_PIXCOLOR (Color_BD)) 2279 if (ISSET_PIXCOLOR (Color_BD))
2272 fore = Color_BD; 2280 fore = Color_BD;
2273# if !ENABLE_STYLES 2281# if !ENABLE_STYLES
2274 else 2282 else
2275 invert = !invert; 2283 invert = !invert;
2276# endif 2284# endif
2277 } 2285 }
2278 2286
2279 if (rend & RS_Italic 2287 if (rend & RS_Italic && fore == Color_fg)
2280 && fore == Color_fg)
2281 { 2288 {
2282 if (ISSET_PIXCOLOR (Color_IT)) 2289 if (ISSET_PIXCOLOR (Color_IT))
2283 fore = Color_IT; 2290 fore = Color_IT;
2284# if !ENABLE_STYLES 2291# if !ENABLE_STYLES
2285 else 2292 else
… …
2319 } 2326 }
2320 2327
2321#ifdef TEXT_BLINK 2328#ifdef TEXT_BLINK
2322 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2329 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2323 { 2330 {
2324 if (!text_blink_ev.active) 2331 if (!text_blink_ev.is_active ())
2325 { 2332 {
2326 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2333 text_blink_ev.again ();
2327 hidden_text = 0; 2334 hidden_text = 0;
2328 } 2335 }
2329 else if (hidden_text) 2336 else if (hidden_text)
2330 fore = back; 2337 fore = back;
2331 } 2338 }
… …
2353 /* 2360 /*
2354 * Actually do the drawing of the string here 2361 * Actually do the drawing of the string here
2355 */ 2362 */
2356 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2363 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2357 2364
2358 if (have_bg && back == Color_bg) 2365 if (expect_true (have_bg && back == Color_bg))
2359 { 2366 {
2360 // this is very ugly, maybe push it into ->draw? 2367 // this is very ugly, maybe push it into ->draw?
2361 2368
2362 for (i = 0; i < count; i++) /* don't draw empty strings */ 2369 for (i = 0; i < count; i++) /* don't draw empty strings */
2363 if (text[i] != ' ') 2370 if (text[i] != ' ')
… …
2370 did_clear: ; 2377 did_clear: ;
2371 } 2378 }
2372 else 2379 else
2373 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2380 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2374 2381
2375 if (rend & RS_Uline && font->descent > 1 && fore != back) 2382 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2376 { 2383 {
2377#if ENABLE_FRILLS 2384#if ENABLE_FRILLS
2378 if (ISSET_PIXCOLOR (Color_underline)) 2385 if (ISSET_PIXCOLOR (Color_underline))
2379 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2386 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2380 else 2387 else
2381#endif 2388#endif
2382 XSetForeground (dpy, gc, pix_colors[fore]); 2389 XSetForeground (dpy, gc, pix_colors[fore]);
2383 2390
2384 XDrawLine (dpy, drawBuffer, gc, 2391 XDrawLine (dpy, vt, gc,
2385 xpixel, ypixel + font->ascent + 1, 2392 xpixel, ypixel + font->ascent + 1,
2386 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2393 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2387 } 2394 }
2388 } /* for (col....) */ 2395 } /* for (col....) */
2389 } /* for (row....) */ 2396 } /* for (row....) */
… …
2427 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2434 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2428 else 2435 else
2429#endif 2436#endif
2430 XSetForeground (dpy, gc, pix_colors[ccol1]); 2437 XSetForeground (dpy, gc, pix_colors[ccol1]);
2431 2438
2432 XDrawRectangle (dpy, drawBuffer, gc, 2439 XDrawRectangle (dpy, vt, gc,
2433 Col2Pixel (col), 2440 Col2Pixel (col),
2434 Row2Pixel (oldcursor.row), 2441 Row2Pixel (oldcursor.row),
2435 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2442 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2436 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2443 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2437 } 2444 }
… …
2475rxvt_term::scr_recolour () NOTHROW 2482rxvt_term::scr_recolour () NOTHROW
2476{ 2483{
2477#ifdef HAVE_BG_PIXMAP 2484#ifdef HAVE_BG_PIXMAP
2478 bgPixmap.apply (); 2485 bgPixmap.apply ();
2479#else 2486#else
2487
2480 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2488 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2481 XClearWindow (dpy, parent[0]); 2489 XClearWindow (dpy, parent[0]);
2482 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2490 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2483# if HAVE_SCROLLBARS 2491
2484 if (scrollBar.win) 2492 if (scrollBar.win)
2485 { 2493 {
2486 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2494 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2487 scrollBar.setIdle (); 2495 scrollBar.state = STATE_IDLE;
2488 scrollbar_show (0); 2496 scrollBar.show (0);
2489 } 2497 }
2498
2490# endif 2499#endif
2491#endif 2500
2492 2501 /* bgPixmap.apply () does not do the following : */
2493 scr_clear (); 2502 scr_clear ();
2494 scr_touch (true); 2503 scr_touch (true);
2495 want_refresh = 1; 2504 want_refresh = 1;
2496} 2505}
2497 2506
… …
2589{ 2598{
2590 int row, wrote; 2599 int row, wrote;
2591 unsigned int width, towrite; 2600 unsigned int width, towrite;
2592 char r1[] = "\n"; 2601 char r1[] = "\n";
2593 2602
2594 for (row = saveLines - nsaved; 2603 for (row = saveLines + top_row;
2595 row < saveLines + nrow - 1; row++) 2604 row < saveLines + nrow - 1; row++)
2596 { 2605 {
2597 width = row_buf[row].l >= 0 ? row_buf[row].l 2606 width = row_buf[row].l >= 0 ? row_buf[row].l
2598 : ncol; 2607 : ncol;
2599 for (towrite = width; towrite; towrite -= wrote) 2608 for (towrite = width; towrite; towrite -= wrote)
… …
2650 /* convert normal newline chars into common keyboard Return key sequence */ 2659 /* convert normal newline chars into common keyboard Return key sequence */
2651 for (unsigned int i = 0; i < len; i++) 2660 for (unsigned int i = 0; i < len; i++)
2652 if (data[i] == C0_LF) 2661 if (data[i] == C0_LF)
2653 data[i] = C0_CR; 2662 data[i] = C0_CR;
2654 2663
2664 if (priv_modes & PrivMode_BracketPaste)
2665 tt_printf ("\e[200~");
2666
2655 tt_write (data, len); 2667 tt_write (data, len);
2668
2669 if (priv_modes & PrivMode_BracketPaste)
2670 tt_printf ("\e[201~");
2656} 2671}
2657 2672
2658/* ------------------------------------------------------------------------- */ 2673/* ------------------------------------------------------------------------- */
2659/* 2674/*
2660 * Respond to a notification that a primary selection has been sent 2675 * Respond to a notification that a primary selection has been sent
… …
2735 if (!delete_prop) 2750 if (!delete_prop)
2736 XDeleteProperty (dpy, win, prop); 2751 XDeleteProperty (dpy, win, prop);
2737 2752
2738 selection_wait = Sel_incr; 2753 selection_wait = Sel_incr;
2739 incr_buf_fill = 0; 2754 incr_buf_fill = 0;
2740 incr_ev.start (NOW + 10); 2755 incr_ev.start (10);
2741 2756
2742 goto bailout; 2757 goto bailout;
2743 } 2758 }
2744 2759
2745 if (ct.nitems == 0) 2760 if (ct.nitems == 0)
… …
2754 ct.nitems = incr_buf_fill; 2769 ct.nitems = incr_buf_fill;
2755 incr_buf = 0; 2770 incr_buf = 0;
2756 incr_buf_size = 0; 2771 incr_buf_size = 0;
2757 incr_ev.stop (); 2772 incr_ev.stop ();
2758 } 2773 }
2759 else 2774 else
2760 { 2775 {
2761 if (selection_wait == Sel_normal 2776 if (selection_wait == Sel_normal
2762 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2777 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2763 { 2778 {
2764 /* 2779 /*
… …
2771 goto bailout; 2786 goto bailout;
2772 } 2787 }
2773 } 2788 }
2774 else if (selection_wait == Sel_incr) 2789 else if (selection_wait == Sel_incr)
2775 { 2790 {
2776 incr_ev.start (NOW + 10); 2791 incr_ev.start (10);
2777 2792
2778 while (incr_buf_fill + ct.nitems > incr_buf_size) 2793 while (incr_buf_fill + ct.nitems > incr_buf_size)
2779 { 2794 {
2780 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;
2781 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2796 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2821 if (selection_wait == Sel_normal) 2836 if (selection_wait == Sel_normal)
2822 selection_wait = Sel_none; 2837 selection_wait = Sel_none;
2823} 2838}
2824 2839
2825void 2840void
2826rxvt_term::incr_cb (time_watcher &w) NOTHROW 2841rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2827{ 2842{
2828 selection_wait = Sel_none; 2843 selection_wait = Sel_none;
2829 2844
2830 incr_buf_size = 0; 2845 incr_buf_size = 0;
2831 free (incr_buf); 2846 free (incr_buf);
… …
2842 selection_paste (win, prop, true); 2857 selection_paste (win, prop, true);
2843} 2858}
2844 2859
2845/* ------------------------------------------------------------------------- */ 2860/* ------------------------------------------------------------------------- */
2846/* 2861/*
2847 * Request the current selection: 2862 * Request the current selection:
2848 * Order: > internal selection if available 2863 * Order: > internal selection if available
2849 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2864 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2850 * > CUT_BUFFER0 2865 * > CUT_BUFFER0
2851 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2866 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2852 * will auto fallback to CUT_BUFFER0 2867 * will auto fallback to CUT_BUFFER0
… …
2854 */ 2869 */
2855void 2870void
2856rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2871rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2857{ 2872{
2858 if (selection.text && selnum == Sel_Primary) 2873 if (selection.text && selnum == Sel_Primary)
2874 {
2859 { /* internal selection */ 2875 /* internal selection */
2860 char *str = rxvt_wcstombs (selection.text, selection.len); 2876 char *str = rxvt_wcstombs (selection.text, selection.len);
2861 paste (str, strlen (str)); 2877 paste (str, strlen (str));
2862 free (str); 2878 free (str);
2863 return; 2879 return;
2864 } 2880 }
… …
3130 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3146 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3131 3147
3132 while (selection.mark.col > 0 3148 while (selection.mark.col > 0
3133 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3149 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3134 --selection.mark.col; 3150 --selection.mark.col;
3135 3151
3136 if (selection.op) 3152 if (selection.op)
3153 {
3137 { /* clear the old selection */ 3154 /* clear the old selection */
3138 selection.beg.row = selection.end.row = selection.mark.row; 3155 selection.beg.row = selection.end.row = selection.mark.row;
3139 selection.beg.col = selection.end.col = selection.mark.col; 3156 selection.beg.col = selection.end.col = selection.mark.col;
3140 } 3157 }
3141 3158
3142 selection.op = SELECTION_INIT; 3159 selection.op = SELECTION_INIT;
… …
3331 * 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
3332 * 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
3333 * time of the most recent button3 press 3350 * time of the most recent button3 press
3334 */ 3351 */
3335 if (button3 && buttonpress) 3352 if (button3 && buttonpress)
3353 {
3336 { /* button3 press */ 3354 /* button3 press */
3337 /* 3355 /*
3338 * first determine which edge of the selection we are closest to 3356 * first determine which edge of the selection we are closest to
3339 */ 3357 */
3340 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3358 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3341 || (!ROWCOL_IS_AFTER (pos, selection.end) 3359 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3359 selection.mark.row = selection.beg.row; 3377 selection.mark.row = selection.beg.row;
3360 selection.mark.col = selection.beg.col; 3378 selection.mark.col = selection.beg.col;
3361 } 3379 }
3362 } 3380 }
3363 else 3381 else
3382 {
3364 { /* button1 drag or button3 drag */ 3383 /* button1 drag or button3 drag */
3365 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3384 if (ROWCOL_IS_AFTER (selection.mark, pos))
3366 { 3385 {
3367 if (selection.mark.row == selection.end.row 3386 if (selection.mark.row == selection.end.row
3368 && selection.mark.col == selection.end.col 3387 && selection.mark.col == selection.end.col
3369 && clickchange 3388 && clickchange
… …
3450 selection.end.row++; 3469 selection.end.row++;
3451 } 3470 }
3452 } 3471 }
3453 3472
3454 if (button3 && buttonpress) 3473 if (button3 && buttonpress)
3474 {
3455 { /* mark may need to be changed */ 3475 /* mark may need to be changed */
3456 if (closeto == LEFT) 3476 if (closeto == LEFT)
3457 { 3477 {
3458 selection.mark.row = selection.end.row; 3478 selection.mark.row = selection.end.row;
3459 selection.mark.col = selection.end.col - (selection.clicks == 2); 3479 selection.mark.col = selection.end.col - (selection.clicks == 2);
3460 } 3480 }
… …
3659 XFree (ct.value); 3679 XFree (ct.value);
3660 } 3680 }
3661 3681
3662 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3682 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3663} 3683}
3664
3665/* ------------------------------------------------------------------------- *
3666 * MOUSE ROUTINES *
3667 * ------------------------------------------------------------------------- */
3668
3669/*
3670 * return col/row values corresponding to x/y pixel values
3671 */
3672void
3673rxvt_term::pixel_position (int *x, int *y) NOTHROW
3674{
3675 *x = Pixel2Col (*x);
3676 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3677 *y = Pixel2Row (*y);
3678 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3679}
3680 3684
3681/* ------------------------------------------------------------------------- */ 3685/* ------------------------------------------------------------------------- */
3682#ifdef USE_XIM 3686#ifdef USE_XIM
3683void 3687void
3684rxvt_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