From: root Date: Sat, 19 Feb 2005 19:37:34 +0000 (+0000) Subject: *** empty log message *** X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=fe96f7e80f5991567d23c9489c2252f8e8eb7077;p=dana%2Furxvt.git *** empty log message *** --- diff --git a/Changes b/Changes index fa12bb40..a2e95e73 100644 --- a/Changes +++ b/Changes @@ -1,5 +1,3 @@ -TODO: !! If I resize the urxvt window to be 4 chars high (or less) it seems to -> crash when scrolling with the mouse wheel. Mikael Magnusson. TODO: do font request caching, might help rxvtd on some machines TODO: manpage 900mb update TODO: safer command: keymap processing. @@ -19,6 +17,9 @@ WISH: just for fun, do shade and tint with XRender. that uses an existing pty for I/O instead of starting a command. - implement enough of XEMBED to allow for correct focus. + - fix assertioan failure ("crash") on mousewheel-scrolling + when the terminal height is small, by removing the assert. + (reported by Mikael Magnusson). - SYNCCVS. backported bugfixes done to rxvt (sourceforge bugs #1028739, #1028732), except for pts/%s fix as it seems to collide with freebsd, diff --git a/src/screen.C b/src/screen.C index 13fc6913..2027e5f9 100644 --- a/src/screen.C +++ b/src/screen.C @@ -1894,10 +1894,8 @@ rxvt_term::scr_page (enum page_dirn direction, int nlines) int n; unsigned int oldviewstart; -#ifdef DEBUG_STRICT - assert ((nlines >= 0) && (nlines <= TermWin.nrow)); -#endif oldviewstart = TermWin.view_start; + if (direction == UP) { n = TermWin.view_start + nlines; @@ -1908,6 +1906,7 @@ rxvt_term::scr_page (enum page_dirn direction, int nlines) n = TermWin.view_start - nlines; TermWin.view_start = max (n, 0); } + return scr_changeview (oldviewstart); }