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.217 by root, Mon Jan 9 19:01:56 2006 UTC vs.
Revision 1.234 by root, Mon Jan 16 08:57:02 2006 UTC

… …
115 * SCREEN `COMMON' ROUTINES * 115 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 116 * ------------------------------------------------------------------------- */
117 117
118/* Fill part/all of a line with blanks. */ 118/* Fill part/all of a line with blanks. */
119void 119void
120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) 120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const
121{ 121{
122 if (!l.t) 122 if (!l.t)
123 { 123 {
124 lalloc (l); 124 lalloc (l);
125 col = 0; 125 col = 0;
… …
142} 142}
143 143
144/* ------------------------------------------------------------------------- */ 144/* ------------------------------------------------------------------------- */
145/* Fill a full line with blanks - make sure it is allocated first */ 145/* Fill a full line with blanks - make sure it is allocated first */
146void 146void
147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const
148{ 148{
149 scr_blank_line (l, 0, ncol, efs); 149 scr_blank_line (l, 0, ncol, efs);
150 150
151 l.l = 0; 151 l.l = 0;
152 l.f = 0; 152 l.f = 0;
… …
179 if (nrow + saveLines < 2) 179 if (nrow + saveLines < 2)
180 { 180 {
181 //TODO//FIXME 181 //TODO//FIXME
182 saveLines++; 182 saveLines++;
183 prev_nrow--; 183 prev_nrow--;
184 nsaved++; 184 top_row--;
185 } 185 }
186 186
187 want_refresh = 1; 187 want_refresh = 1;
188 188
189 int prev_total_rows = prev_nrow + saveLines; 189 int prev_total_rows = prev_nrow + saveLines;
… …
195 if (!row_buf) 195 if (!row_buf)
196 { 196 {
197 /* 197 /*
198 * first time called so just malloc everything: don't rely on realloc 198 * first time called so just malloc everything: don't rely on realloc
199 */ 199 */
200 nsaved = 0; /* no saved lines */ 200 top_row = 0; /* no saved lines */
201 term_start = 0; 201 term_start = 0;
202 202
203 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205 205
… …
276 276
277 line_t *old_buf = row_buf; 277 line_t *old_buf = row_buf;
278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
279 279
280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281 int pend = MOD (term_start - nsaved , prev_total_rows); 281 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 282 int q = total_rows; // rewrapped row
283 283
284 if (nsaved) 284 if (top_row)
285 { 285 {
286 // re-wrap lines, this is rather ugly, possibly because I am too dumb 286 // re-wrap lines, this is rather ugly, possibly because I am too dumb
287 // to come up with a lean and mean algorithm. 287 // to come up with a lean and mean algorithm.
288 288
289 row_col_t ocur = screen.cur; 289 row_col_t ocur = screen.cur;
… …
362 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 362 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
363 } 363 }
364 while (p != pend && q > 0); 364 while (p != pend && q > 0);
365 365
366 term_start = total_rows - nrow; 366 term_start = total_rows - nrow;
367 nsaved = term_start - q; 367 top_row = q - term_start;
368 368
369 // make sure all terminal lines exist 369 // make sure all terminal lines exist
370 while (nsaved < 0) 370 while (top_row > 0)
371 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); 371 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
372 } 372 }
373 else 373 else
374 { 374 {
375 // if no scrollback exists (yet), wing, instead of wrap 375 // if no scrollback exists (yet), wing, instead of wrap
376 376
… …
390 390
391 term_start = 0; 391 term_start = 0;
392 } 392 }
393 393
394#ifdef DEBUG_STRICT //TODO: remove 394#ifdef DEBUG_STRICT //TODO: remove
395 for (int i = -nsaved; i < nrow; i++) 395 for (int i = top_row; i < nrow; i++)
396 assert (ROW (i).t); 396 assert (ROW (i).t);
397#endif 397#endif
398 398
399 free (old_buf); 399 free (old_buf);
400 delete old_ta; 400 delete old_ta;
… …
572 * Change the colour for following text 572 * Change the colour for following text
573 */ 573 */
574void 574void
575rxvt_term::scr_color (unsigned int color, int fgbg) 575rxvt_term::scr_color (unsigned int color, int fgbg)
576{ 576{
577 if (color > maxTermCOLOR) 577 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
578 color = fgbg; 578 color = fgbg;
579 579
580 if (fgbg == Color_fg) 580 if (fgbg == Color_fg)
581 rstyle = SET_FGCOLOR (rstyle, color); 581 rstyle = SET_FGCOLOR (rstyle, color);
582 else 582 else
… …
613 want_refresh = 1; 613 want_refresh = 1;
614 num_scr += count; 614 num_scr += count;
615 615
616 if (count > 0 616 if (count > 0
617 && row1 == 0 617 && row1 == 0
618 && row2 == nrow - 1
619 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 618 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
620 { 619 {
621 nsaved = min (nsaved + count, saveLines); 620 top_row = max (top_row - count, -saveLines);
622 621
623 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END)); 622 // scroll everything up 'count' lines
623 term_start = (term_start + count) % total_rows;
624
625 {
626 // severe bottommost scrolled line
627 line_t &l = ROW(row2 - count);
628 l.touch ();
629 l.is_longer (0);
630 }
631
632 // erase newly scorlled-in lines
633 for (int i = count; i; --i )
634 {
635 // basically this is a slightly optimized scr_blank_screen_mem
636 // it is worth the effort on slower machines
637 line_t &l = ROW(nrow - i);
638
639 scr_blank_line (l, 0, l.l, rstyle);
640
641 l.l = 0;
642 l.f = 0;
643 }
644
645 // now copy lines below the scroll region bottom to the
646 // bottom of the screen again, so they look as if they
647 // hadn't moved.
648 for (int i = nrow; --i > row2; )
649 {
650 line_t &l1 = ROW(i - count);
651 line_t &l2 = ROW(i);
652
653 ::swap (l1, l2);
654 l2.touch ();
655 }
624 656
625 term_start = (term_start + count) % total_rows; 657 // move and/or clear selection, if any
626
627 if (selection.op && current_screen == selection.screen) 658 if (selection.op && current_screen == selection.screen)
628 { 659 {
629 selection.beg.row -= count; 660 selection.beg.row -= count;
630 selection.end.row -= count; 661 selection.end.row -= count;
631 selection.mark.row -= count; 662 selection.mark.row -= count;
632 663
633 if (selection.beg.row < -nsaved 664 if (selection.beg.row < top_row
634 || selection.end.row < -nsaved 665 || selection.end.row < top_row
635 || selection.mark.row < -nsaved) 666 || selection.mark.row < top_row)
636 { 667 {
637 CLEAR_ALL_SELECTION (); 668 CLEAR_ALL_SELECTION ();
638 selection.op = SELECTION_CLEAR; 669 selection.op = SELECTION_CLEAR;
639 } 670 }
640 } 671 }
641 672
642 for (int i = count; i--; ) 673 // finally move the view window, if desired
643 {
644 // basically thi is a slightly optimized scr_blank_screen_mem
645 // it is worth the effort on slower machines
646 line_t &l = ROW(row2 - i);
647
648 scr_blank_line (l, 0, l.l, rstyle);
649
650 l.l = 0;
651 l.f = 0;
652 }
653
654 if (OPTION (Opt_scrollWithBuffer) 674 if (OPTION (Opt_scrollWithBuffer)
655 && view_start != 0 675 && view_start != 0
656 && view_start != saveLines) 676 && view_start != -saveLines)
657 scr_page (UP, count); 677 scr_page (UP, count);
678
679 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
680 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
658 } 681 }
659 else 682 else
660 { 683 {
661 if (selection.op && current_screen == selection.screen) 684 if (selection.op && current_screen == selection.screen)
662 { 685 {
… …
738 } 761 }
739 762
740#ifdef DEBUG_STRICT 763#ifdef DEBUG_STRICT
741 assert (screen.cur.col < ncol); 764 assert (screen.cur.col < ncol);
742 assert (screen.cur.row < nrow 765 assert (screen.cur.row < nrow
743 && screen.cur.row >= -nsaved); 766 && screen.cur.row >= top_row);
744#endif 767#endif
745 int row = screen.cur.row; 768 int row = screen.cur.row;
746 769
747 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 770 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
748 771
… …
1323rxvt_term::scr_erase_savelines () 1346rxvt_term::scr_erase_savelines ()
1324{ 1347{
1325 want_refresh = 1; 1348 want_refresh = 1;
1326 ZERO_SCROLLBACK (); 1349 ZERO_SCROLLBACK ();
1327 1350
1328 nsaved = 0; 1351 top_row = 0;
1329} 1352}
1330#endif 1353#endif
1331 1354
1332/* ------------------------------------------------------------------------- */ 1355/* ------------------------------------------------------------------------- */
1333/* 1356/*
… …
1786/* ------------------------------------------------------------------------- */ 1809/* ------------------------------------------------------------------------- */
1787/* 1810/*
1788 * Move the display so that the line represented by scrollbar value Y is at 1811 * Move the display so that the line represented by scrollbar value Y is at
1789 * the top of the screen 1812 * the top of the screen
1790 */ 1813 */
1791int 1814void
1792rxvt_term::scr_move_to (int y, int len) 1815rxvt_term::scr_move_to (int y, int len)
1793{ 1816{
1794 long p = 0; 1817 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1795 unsigned int oldviewstart;
1796
1797 oldviewstart = view_start;
1798
1799 if (y < len)
1800 {
1801 p = (nrow + nsaved) * (len - y) / len;
1802 p -= (long) (nrow - 1);
1803 p = max (p, 0);
1804 }
1805
1806 view_start = (unsigned int)min (p, nsaved);
1807
1808 return scr_changeview (oldviewstart);
1809} 1818}
1810 1819
1811/* ------------------------------------------------------------------------- */ 1820/* ------------------------------------------------------------------------- */
1812/* 1821/*
1813 * Page the screen up/down nlines 1822 * Page the screen up/down nlines
1814 * direction should be UP or DN 1823 * direction should be UP or DN
1815 */ 1824 */
1816int 1825bool
1817rxvt_term::scr_page (enum page_dirn direction, int nlines) 1826rxvt_term::scr_page (enum page_dirn direction, int nlines)
1818{ 1827{
1819 int n; 1828 int new_view_start =
1820 unsigned int oldviewstart;
1821
1822 oldviewstart = view_start;
1823
1824 if (direction == UP)
1825 {
1826 n = view_start + nlines;
1827 view_start = min (n, nsaved);
1828 }
1829 else
1830 {
1831 n = view_start - nlines; 1829 direction == UP ? view_start - nlines
1832 view_start = max (n, 0); 1830 : view_start + nlines;
1833 }
1834 1831
1835 return scr_changeview (oldviewstart); 1832 return scr_changeview (new_view_start);
1836} 1833}
1837 1834
1838int 1835bool
1839rxvt_term::scr_changeview (unsigned int oldviewstart) 1836rxvt_term::scr_changeview (int new_view_start)
1840{ 1837{
1838 clamp_it (new_view_start, top_row, 0);
1839
1841 if (view_start != oldviewstart) 1840 if (new_view_start == view_start)
1842 { 1841 return false;
1842
1843 num_scr += new_view_start - view_start;
1844 view_start = new_view_start;
1845 want_refresh = 1;
1846
1843 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1847 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1844 1848
1845 want_refresh = 1; 1849 return true;
1846 num_scr -= (view_start - oldviewstart);
1847 }
1848
1849 return (int)view_start - (int)oldviewstart;
1850} 1850}
1851 1851
1852/* ------------------------------------------------------------------------- */ 1852/* ------------------------------------------------------------------------- */
1853void 1853void
1854rxvt_term::scr_bell () 1854rxvt_term::scr_bell ()
… …
1863# endif 1863# endif
1864 1864
1865 if (OPTION (Opt_visualBell)) 1865 if (OPTION (Opt_visualBell))
1866 { 1866 {
1867 scr_rvideo_mode (!rvideo); /* refresh also done */ 1867 scr_rvideo_mode (!rvideo); /* refresh also done */
1868 display->flush ();
1868 rxvt_usleep (VISUAL_BELL_DURATION); 1869 rxvt_usleep (VISUAL_BELL_DURATION);
1869 scr_rvideo_mode (!rvideo); /* refresh also done */ 1870 scr_rvideo_mode (!rvideo); /* refresh also done */
1870 } 1871 }
1871 else 1872 else
1872 XBell (display->display, 0); 1873 XBell (display->display, 0);
… …
1886 if ((fd = popen_printer ()) == NULL) 1887 if ((fd = popen_printer ()) == NULL)
1887 return; 1888 return;
1888 1889
1889 if (fullhist) 1890 if (fullhist)
1890 { 1891 {
1891 nrows = nrow + nsaved; 1892 nrows = nrow - top_row;
1892 row_start = -nsaved; 1893 row_start = top_row;
1893 } 1894 }
1894 else 1895 else
1895 { 1896 {
1896 nrows = nrow; 1897 nrows = nrow;
1897 row_start = -view_start; 1898 row_start = view_start;
1898 } 1899 }
1899 1900
1900 wctomb (0, 0); 1901 wctomb (0, 0);
1901 1902
1902 for (int r1 = 0; r1 < nrows; r1++) 1903 for (int r1 = 0; r1 < nrows; r1++)
… …
2030 2031
2031 /* make sure no outline cursor is left around */ 2032 /* make sure no outline cursor is left around */
2032 setoldcursor = 0; 2033 setoldcursor = 0;
2033 if (ocrow != -1) 2034 if (ocrow != -1)
2034 { 2035 {
2035 if (screen.cur.row + view_start != ocrow 2036 if (screen.cur.row - view_start != ocrow
2036 || screen.cur.col != oldcursor.col) 2037 || screen.cur.col != oldcursor.col)
2037 { 2038 {
2038 if (ocrow < nrow 2039 if (ocrow < nrow
2039 && oldcursor.col < ncol) 2040 && oldcursor.col < ncol)
2040 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2041 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2048 else if (!focus) 2049 else if (!focus)
2049 setoldcursor = 1; 2050 setoldcursor = 1;
2050 2051
2051 if (setoldcursor) 2052 if (setoldcursor)
2052 { 2053 {
2053 if (screen.cur.row + view_start >= nrow) 2054 if (screen.cur.row - view_start >= nrow)
2054 oldcursor.row = -1; 2055 oldcursor.row = -1;
2055 else 2056 else
2056 { 2057 {
2057 oldcursor.row = screen.cur.row + view_start; 2058 oldcursor.row = screen.cur.row - view_start;
2058 oldcursor.col = screen.cur.col; 2059 oldcursor.col = screen.cur.col;
2059 } 2060 }
2060 } 2061 }
2061 } 2062 }
2062 2063
… …
2084 row = i > 0 ? 0 : j - 1; 2085 row = i > 0 ? 0 : j - 1;
2085 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2086 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2086 { 2087 {
2087 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2088 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2088 { 2089 {
2089 line_t s = ROW(row - view_start); 2090 line_t s = ROW(view_start + row);
2090 line_t d = drawn_buf[row]; 2091 line_t d = drawn_buf[row];
2091 line_t d2 = drawn_buf[row + i]; 2092 line_t d2 = drawn_buf[row + i];
2092 2093
2093 for (nits = 0, col = ncol; col--; ) 2094 for (nits = 0, col = ncol; col--; )
2094 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2095 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2132 /* 2133 /*
2133 * E: main pass across every character 2134 * E: main pass across every character
2134 */ 2135 */
2135 for (row = 0; row < nrow; row++) 2136 for (row = 0; row < nrow; row++)
2136 { 2137 {
2137 text_t *stp = ROW(row - view_start).t; 2138 text_t *stp = ROW(view_start + row).t;
2138 rend_t *srp = ROW(row - view_start).r; 2139 rend_t *srp = ROW(view_start + row).r;
2139 text_t *dtp = drawn_buf[row].t; 2140 text_t *dtp = drawn_buf[row].t;
2140 rend_t *drp = drawn_buf[row].r; 2141 rend_t *drp = drawn_buf[row].r;
2141 2142
2142 /* 2143 /*
2143 * E2: OK, now the real pass 2144 * E2: OK, now the real pass
… …
2380 /* 2381 /*
2381 * H: cleanup selection 2382 * H: cleanup selection
2382 */ 2383 */
2383 scr_reverse_selection (); 2384 scr_reverse_selection ();
2384 2385
2385 if (refresh_type & SMOOTH_REFRESH)
2386 XFlush (display->display);
2387
2388 num_scr = 0; 2386 num_scr = 0;
2389 num_scr_allow = 1; 2387 num_scr_allow = 1;
2390} 2388}
2391 2389
2392void 2390void
… …
2456 2454
2457 if (really) 2455 if (really)
2458 XClearWindow (display->display, vt); 2456 XClearWindow (display->display, vt);
2459} 2457}
2460 2458
2459void
2460rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)
2461{
2462 int view_end = view_start + nrow;
2463 int row, col;
2464
2465 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2466 {
2467 text_t *stp = ROW(row).t;
2468 rend_t *srp = ROW(row).r;
2469
2470 for (col = beg_col; col < end_col; col++)
2471 srp[col] ^= rstyle1;
2472
2473 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2474 srp[col] ^= rstyle2;
2475
2476 if (++col < end_col)
2477 srp[col] ^= rstyle2;
2478 }
2479}
2480
2481void
2482rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)
2483{
2484 int view_end = view_start + nrow;
2485 int row, col;
2486
2487 if (beg_row >= view_start)
2488 {
2489 col = beg_col;
2490 row = beg_row;
2491 }
2492 else
2493 {
2494 col = 0;
2495 row = view_start;
2496 }
2497
2498 for (; row < min (end_row, view_end); row++, col = 0)
2499 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2500 srp[col] ^= rstyle;
2501
2502 if (row == end_row)
2503 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2504 srp[col] ^= rstyle;
2505}
2506
2461/* ------------------------------------------------------------------------- */ 2507/* ------------------------------------------------------------------------- */
2462void 2508void
2463rxvt_term::scr_reverse_selection () 2509rxvt_term::scr_reverse_selection ()
2464{ 2510{
2465 if (selection.op 2511 if (selection.op
2466 && current_screen == selection.screen 2512 && current_screen == selection.screen
2467 && selection.end.row >= -view_start) 2513 && selection.end.row >= view_start)
2468 { 2514 {
2469 int view_end = -view_start + nrow;
2470 int row, col;
2471
2472#if ENABLE_FRILLS 2515#if ENABLE_FRILLS
2473 if (selection.rect) 2516 if (selection.rect)
2474 { 2517 scr_xor_rect (selection.beg.row, selection.beg.col,
2475 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2518 selection.end.row, selection.end.col,
2476 { 2519 RS_RVid, RS_RVid | RS_Uline);
2477 text_t *stp = ROW(row).t;
2478 rend_t *srp = ROW(row).r;
2479
2480 for (col = selection.beg.col; col < selection.end.col; col++)
2481 srp[col] ^= RS_RVid;
2482
2483 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2484 srp[col] ^= RS_RVid | RS_Uline;
2485
2486 if (++col < selection.end.col)
2487 srp[col] ^= RS_RVid | RS_Uline;
2488 }
2489 }
2490 else 2520 else
2491#endif 2521#endif
2492 { 2522 scr_xor_span (selection.beg.row, selection.beg.col,
2493 if (selection.beg.row >= -view_start) 2523 selection.end.row, selection.end.col,
2494 { 2524 RS_RVid);
2495 col = selection.beg.col;
2496 row = selection.beg.row;
2497 }
2498 else
2499 {
2500 col = 0;
2501 row = -view_start;
2502 }
2503
2504 for (; row < min (selection.end.row, view_end); row++, col = 0)
2505 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2506 srp[col] ^= RS_RVid;
2507
2508 if (row == selection.end.row)
2509 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2510 srp[col] ^= RS_RVid;
2511 }
2512 } 2525 }
2513} 2526}
2514 2527
2515/* ------------------------------------------------------------------------- */ 2528/* ------------------------------------------------------------------------- */
2516/* 2529/*
… …
2554 2567
2555 if (!selection.op) 2568 if (!selection.op)
2556 return; 2569 return;
2557 2570
2558 pos.row = pos.col = 0; 2571 pos.row = pos.col = 0;
2559 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2572 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2560 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2573 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2561 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2574 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2562 || (check_more == 1 2575 || (check_more == 1
2563 && current_screen == selection.screen 2576 && current_screen == selection.screen
2564 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2577 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2565 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2578 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2566 || (check_more == 2 2579 || (check_more == 2
… …
3008 { 3021 {
3009 display->set_selection_owner (this); 3022 display->set_selection_owner (this);
3010 return true; 3023 return true;
3011 } 3024 }
3012 else 3025 else
3026 {
3027 selection_clear ();
3013 return false; 3028 return false;
3029 }
3014 3030
3015#if 0 3031#if 0
3016 XTextProperty ct; 3032 XTextProperty ct;
3017 3033
3018 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3034 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
… …
3032rxvt_term::selection_click (int clicks, int x, int y) 3048rxvt_term::selection_click (int clicks, int x, int y)
3033{ 3049{
3034 clicks = ((clicks - 1) % 3) + 1; 3050 clicks = ((clicks - 1) % 3) + 1;
3035 selection.clicks = clicks; /* save clicks so extend will work */ 3051 selection.clicks = clicks; /* save clicks so extend will work */
3036 3052
3053 if (clicks == 2 && !selection.rect
3054 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3055 {
3056 MEvent.clicks = 1; // what a mess
3057 selection.screen = current_screen;
3058 selection.op = SELECTION_CONT;
3059 return;
3060 }
3061
3037 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3062 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3038 3063
3039 if (clicks == 2 || clicks == 3) 3064 if (clicks == 2 || clicks == 3)
3040 selection_extend_colrow (selection.mark.col, 3065 selection_extend_colrow (selection.mark.col,
3041 selection.mark.row + view_start, 3066 selection.mark.row - view_start,
3042 0, /* button 3 */ 3067 0, /* button 3 */
3043 1, /* button press */ 3068 1, /* button press */
3044 0); /* click change */ 3069 0); /* click change */
3045} 3070}
3046 3071
… …
3051void 3076void
3052rxvt_term::selection_start_colrow (int col, int row) 3077rxvt_term::selection_start_colrow (int col, int row)
3053{ 3078{
3054 want_refresh = 1; 3079 want_refresh = 1;
3055 3080
3056 selection.mark.row = row - view_start; 3081 selection.mark.row = row + view_start;
3057 selection.mark.col = col; 3082 selection.mark.col = col;
3058 3083
3059 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3084 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3060 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3085 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3061 3086
3062 while (selection.mark.col > 0 3087 while (selection.mark.col > 0
3063 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3088 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3064 --selection.mark.col; 3089 --selection.mark.col;
… …
3092 text_t *stp; 3117 text_t *stp;
3093 rend_t *srp; 3118 rend_t *srp;
3094 3119
3095 if (dirn == UP) 3120 if (dirn == UP)
3096 { 3121 {
3097 bound.row = - nsaved - 1; 3122 bound.row = top_row - 1;
3098 bound.col = 0; 3123 bound.col = 0;
3099 dirnadd = -1; 3124 dirnadd = -1;
3100 } 3125 }
3101 else 3126 else
3102 { 3127 {
… …
3180 * select nothing. Otherwise, if we're to the right of the mark, you have to 3205 * select nothing. Otherwise, if we're to the right of the mark, you have to
3181 * be _past_ a character for it to be selected. 3206 * be _past_ a character for it to be selected.
3182 */ 3207 */
3183 if (((selection.clicks % 3) == 1) && !flag 3208 if (((selection.clicks % 3) == 1) && !flag
3184 && (col == selection.mark.col 3209 && (col == selection.mark.col
3185 && (row == selection.mark.row + view_start))) 3210 && (row == selection.mark.row - view_start)))
3186 { 3211 {
3187 /* select nothing */ 3212 /* select nothing */
3188 selection.beg.row = selection.end.row = 0; 3213 selection.beg.row = selection.end.row = 0;
3189 selection.beg.col = selection.end.col = 0; 3214 selection.beg.col = selection.end.col = 0;
3190 selection.clicks = 4; 3215 selection.clicks = 4;
… …
3245 selection.beg.col = selection.end.col = selection.mark.col; 3270 selection.beg.col = selection.end.col = selection.mark.col;
3246 selection.beg.row = selection.end.row = selection.mark.row; 3271 selection.beg.row = selection.end.row = selection.mark.row;
3247 } 3272 }
3248 3273
3249 pos.col = col; 3274 pos.col = col;
3250 pos.row = row - view_start; 3275 pos.row = view_start + row;
3251 3276
3252 /* 3277 /*
3253 * This is mainly xterm style selection with a couple of differences, mainly 3278 * This is mainly xterm style selection with a couple of differences, mainly
3254 * in the way button3 drag extension works. 3279 * in the way button3 drag extension works.
3255 * We're either doing: button1 drag; button3 press; or button3 drag 3280 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3336 else if (selection.clicks == 2) 3361 else if (selection.clicks == 2)
3337 { 3362 {
3338 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3363 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3339 selection.end.col--; 3364 selection.end.col--;
3340 3365
3341 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3342 {
3343 selection_delimit_word (UP, &selection.beg, &selection.beg); 3366 selection_delimit_word (UP, &selection.beg, &selection.beg);
3344 selection_delimit_word (DN, &selection.end, &selection.end); 3367 selection_delimit_word (DN, &selection.end, &selection.end);
3345 }
3346 } 3368 }
3347 else if (selection.clicks == 3) 3369 else if (selection.clicks == 3)
3348 { 3370 {
3349#if ENABLE_FRILLS 3371#if ENABLE_FRILLS
3350 if (OPTION (Opt_tripleclickwords)) 3372 if (OPTION (Opt_tripleclickwords))
… …
3743 for (int y = ov_h; y--; ) 3765 for (int y = ov_h; y--; )
3744 { 3766 {
3745 text_t *t1 = ov_text[y]; 3767 text_t *t1 = ov_text[y];
3746 rend_t *r1 = ov_rend[y]; 3768 rend_t *r1 = ov_rend[y];
3747 3769
3748 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; 3770 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3749 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; 3771 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3750 3772
3751 for (int x = ov_w; x--; ) 3773 for (int x = ov_w; x--; )
3752 { 3774 {
3753 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3775 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3754 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3776 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));

Diff Legend

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