diff --git a/ChangeLog b/ChangeLog index 9450457..22abc6c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3662,3 +3662,10 @@ Thu Jun 1 20:05:49 PDT 2000 Michael Jennings stupid part is that I already KNEW that! *slaps self* ------------------------------------------------------------------------------- +Fri Jun 9 22:33:29 PDT 2000 Michael Jennings + + Fixed a seg fault when resizing to one row while on the secondary + screen. I have no clue how that bug crept in there all of a sudden, + but thanks to Marius Gedminas for pointing it out. + +------------------------------------------------------------------------------- diff --git a/doc/Eterm.1.in b/doc/Eterm.1.in index 3da740a..bf85b62 100644 --- a/doc/Eterm.1.in +++ b/doc/Eterm.1.in @@ -504,8 +504,8 @@ rather than a shell. .SH THEMES Eterm is built on the philosophy of Freedom of Choice. Each user should be -able to choose the environment in which he wishes to exist, and the tools he -uses should support that. In accordance with that philosophy, Eterm is +able to choose the environment in which he or she wishes to exist, and the tools +used should support that. In accordance with that philosophy, Eterm is extremely configurable. Eterm supports a concept called "themes," which should be familiar to users of Enlightenment, icewm, or Microsoft Windows 95/98/NT. The general concept of a theme is a collection of resources that change as many diff --git a/src/screen.c b/src/screen.c index 3b8cb63..441804d 100644 --- a/src/screen.c +++ b/src/screen.c @@ -319,7 +319,6 @@ scr_reset(void) prev_ncol = TermWin.ncol; tt_resize(); - if (chscr) { scr_change_screen(chscr); } @@ -466,6 +465,7 @@ scr_change_screen(int scrn) } # endif #endif + return scrn; } @@ -1660,6 +1660,9 @@ scr_refresh(int type) draw_string = XDrawString; draw_image_string = XDrawImageString; + BOUND(screen.row, 0, TermWin.nrow - 1); + BOUND(screen.col, 0, TermWin.ncol - 1); + row = screen.row + TermWin.saveLines; col = screen.col; if (screen.flags & Screen_VisibleCursor) { diff --git a/src/scrollbar.h b/src/scrollbar.h index 08642eb..ba902c8 100644 --- a/src/scrollbar.h +++ b/src/scrollbar.h @@ -70,7 +70,7 @@ /* Scrollbar dimensions */ #define scrollbar_scrollarea_height() (scrollbar.scrollarea_end - scrollbar.scrollarea_start) #define scrollbar_anchor_width() ((scrollbar.type == SCROLLBAR_XTERM) ? (scrollbar.win_width) : (scrollbar.width)) -#define scrollbar_anchor_height() (scrollbar.anchor_bottom - scrollbar.anchor_top) +#define scrollbar_anchor_height() (MAX((scrollbar.anchor_bottom - scrollbar.anchor_top), 2)) #define scrollbar_trough_width() (scrollbar.win_width) #define scrollbar_trough_height() (scrollbar.win_height) #define scrollbar_arrow_width() (scrollbar.width)