-- Leo's gemini proxy

-- Connecting to git.thebackupbox.net:1965...

-- Connected

-- Sending request

-- Meta line: 20 text/gemini

repo: rxvt-unicode-sixel
action: commit
revision:
path_from:
revision_from: 479cee24dc150a7bb7e8d842edecef12a6132e61:
path_to:
revision_to:

git.thebackupbox.net

rxvt-unicode-sixel

git://git.thebackupbox.net/rxvt-unicode-sixel

commit 479cee24dc150a7bb7e8d842edecef12a6132e61
Author: Marc Lehmann <schmorp@schmorp.de>
Date:   Wed Dec 24 09:22:29 2003 +0000

    *** empty log message ***

diff --git a/src/main.C b/src/main.C

index 44c6b82e5cbfc71fe324998bca4bd335db8bcc5b..

index ..bb0e6034e5d07cd2553c93c6f4c211e8e352b1d0 100644

--- a/src/main.C
+++ b/src/main.C
@@ -1,7 +1,7 @@
 /*--------------------------------*-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>
@@ -957,11 +957,16 @@ rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int igno
   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();

diff --git a/src/rxvt.h b/src/rxvt.h

index 8c3fe62b95c56be72bbb390fb2c194e6ef0a2814..

index ..b5cc3baae3fae72e012e427b13e0ca27c8505267 100644

--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -1,5 +1,5 @@
 /*
- * $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 */
@@ -887,7 +887,7 @@ struct rxvt_term : rxvt_vars {
 #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;
diff --git a/src/salloc.C b/src/salloc.C

index 0595173753c3078757578dea55b1db28285fb3a1..

index ..c718a8a5843cf8d5882c2e612328b71ad6c42da0 100644

--- a/src/salloc.C
+++ b/src/salloc.C
@@ -51,7 +51,6 @@ rxvt_salloc::alloc ()
 void
 rxvt_salloc::free (void *data)
 {
-return;//D
   chain *line = (chain *)data;
   line->next = firstline;
   firstline = line;
diff --git a/src/screen.C b/src/screen.C

index 1dbd4f3905d51668659d2bcaf08499d44819ed88..

index ..a5181834d8e1a395b402f7afffad0e8c2a711bc2 100644

--- a/src/screen.C
+++ b/src/screen.C
@@ -1,7 +1,7 @@
 /*--------------------------------*-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>
  *
@@ -291,7 +291,7 @@ rxvt_term::scr_reset ()
           /* 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);

-----END OF PAGE-----

-- Response ended

-- Page fetched on Sun Jun 2 14:13:53 2024