/*--------------------------------*-C-*---------------------------------*
* File: main.c
*----------------------------------------------------------------------*
- * $Id: main.C,v 1.18 2003-12-19 06:17:03 pcg Exp $
+ * $Id: main.C,v 1.19 2003-12-24 09:22:29 pcg Exp $
*
* All portions of code are copyright by their respective author/s.
* Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
if (fix_screen || old_height == 0)
{
int curr_screen = -1;
- uint16_t old_ncol = prev_ncol;
+ int old_ncol = prev_ncol;
/* scr_reset only works on the primary screen */
if (old_height) /* this is not the first time through */
- curr_screen = rxvt_scr_change_screen (this, PRIMARY);
+ {
+ unsigned int ncol = TermWin.ncol;
+ TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
+ curr_screen = rxvt_scr_change_screen (this, PRIMARY);
+ TermWin.ncol = ncol;
+ }
scr_reset();
/*
- * $Id: rxvt.h,v 1.19 2003-12-19 09:41:09 pcg Exp $
+ * $Id: rxvt.h,v 1.20 2003-12-24 09:22:29 pcg Exp $
*/
#ifndef _RXVT_H_ /* include once only */
#endif
short rvideo;
int16_t num_scr; /* screen: number lines scrolled */
- uint16_t prev_ncol, /* screen: previous number of columns */
+ unsigned int prev_ncol, /* screen: previous number of columns */
prev_nrow; /* screen: previous number of rows */
#ifdef RXVT_GRAPHICS
uint16_t gr_prev_start;
void
rxvt_salloc::free (void *data)
{
-return;//D
chain *line = (chain *)data;
line->next = firstline;
firstline = line;
/*--------------------------------*-C-*--------------------------------------*
* File: screen.c
*---------------------------------------------------------------------------*
- * $Id: screen.C,v 1.12 2003-12-18 14:11:47 pcg Exp $
+ * $Id: screen.C,v 1.13 2003-12-24 09:22:29 pcg Exp $
*
* Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
*
/* add rows */
scr_reset_realloc (); /* realloc _first_ */
- TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
+ TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
k = min (TermWin.nscrolled, nrow - prev_nrow);
-#define VERSION "1.1"
-#define VSTRING "10100"
-#define DATE "2003-18-12"
-#define LSMDATE "18DEC03"
-#define LIBVERSION "1:1:0"
+#define VERSION "1.2"
+#define VSTRING "10200"
+#define DATE "2003-24-12"
+#define LSMDATE "24DEC03"
+#define LIBVERSION "1:2:0"