make most features as always built in from now on

removed #define SIMPLESCREEN and it's #defines
also removed #define DETACH and RXVT_SOC
all of this options are now default

1 files changed, 3 insertions, 68 deletions

diff --git a/src/resize.c b/src/resize.c
index 5f5e8ac..a285ae8 100644
--- a/src/resize.c
+++ b/src/resize.c
@@ -67,16 +67,10 @@ struct winsize glwz;
 
 static struct mline mline_zero = {
  (unsigned char *)0,
+ (unsigned char *)0,
+ (unsigned char *)0,
+ (unsigned char *)0,
  (unsigned char *)0
-#ifdef FONT
- ,(unsigned char *)0
-#endif
-#ifdef COLOR
- ,(unsigned char *)0
-# ifdef COLORS256
- ,(unsigned char *)0
-# endif
-#endif
 };
 
 /*
@@ -126,9 +120,7 @@ CheckScreenSize(int change_flag)
       debug("CheckScreenSize: No change -> return.\n");
       return;
     }
-#ifdef BLANKER_PRG
   KillBlanker();
-#endif
   ResetIdle();
   ChangeScreenSize(wi, he, change_flag);
 }
@@ -395,20 +387,14 @@ FreeMline(struct mline *ml)
     free(ml->image);
   if (ml->attr && ml->attr != null)
     free(ml->attr);
-#ifdef FONT
   if (ml->font && ml->font != null)
     free(ml->font);
   if (ml->fontx && ml->fontx != null)
     free(ml->fontx);
-#endif
-#ifdef COLOR
   if (ml->color && ml->color != null)
     free(ml->color);
-# ifdef COLORS256
   if (ml->colorx && ml->colorx != null)
     free(ml->colorx);
-# endif
-#endif
   *ml = mline_zero;
 }
 
@@ -417,16 +403,10 @@ AllocMline(struct mline *ml, int w)
 {
   ml->image = malloc(w);
   ml->attr  = null;
-#ifdef FONT
   ml->font  = null;
   ml->fontx = null;
-#endif
-#ifdef COLOR
   ml->color = null;
-# ifdef COLORS256
   ml->colorx = null;
-# endif
-#endif
   if (ml->image == 0)
     return -1;
   return 0;
@@ -446,7 +426,6 @@ BcopyMline(struct mline *mlf, int xf, struct mline *mlt, int xt, int l, int w)
     }
   if (mlt->attr != null)
     bcopy((char *)mlf->attr + xf, (char *)mlt->attr + xt, l);
-#ifdef FONT
   if (mlf->font != null && mlt->font == null)
     {
       if ((mlt->font = (unsigned char *)calloc(w, 1)) == 0)
@@ -461,8 +440,6 @@ BcopyMline(struct mline *mlf, int xf, struct mline *mlt, int xt, int l, int w)
     }
   if (mlt->fontx != null)
     bcopy((char *)mlf->fontx + xf, (char *)mlt->fontx + xt, l);
-#endif
-#ifdef COLOR
   if (mlf->color != null && mlt->color == null)
     {
       if ((mlt->color = (unsigned char *)calloc(w, 1)) == 0)
@@ -470,7 +447,6 @@ BcopyMline(struct mline *mlf, int xf, struct mline *mlt, int xt, int l, int w)
     }
   if (mlt->color != null)
     bcopy((char *)mlf->color + xf, (char *)mlt->color + xt, l);
-# ifdef COLORS256
   if (mlf->colorx != null && mlt->colorx == null)
     {
       if ((mlt->colorx = (unsigned char *)calloc(w, 1)) == 0)
@@ -478,8 +454,6 @@ BcopyMline(struct mline *mlf, int xf, struct mline *mlt, int xt, int l, int w)
     }
   if (mlt->colorx != null)
     bcopy((char *)mlf->colorx + xf, (char *)mlt->colorx + xt, l);
-# endif
-#endif
   return r;
 }
 
@@ -505,16 +479,10 @@ CheckMaxSize(int wi)
   null = (unsigned char *)xrealloc((char *)null, maxwidth);
   mline_old.image = (unsigned char *)xrealloc((char *)mline_old.image, maxwidth);
   mline_old.attr = (unsigned char *)xrealloc((char *)mline_old.attr, maxwidth);
-#ifdef FONT
   mline_old.font = (unsigned char *)xrealloc((char *)mline_old.font, maxwidth);
   mline_old.fontx = (unsigned char *)xrealloc((char *)mline_old.fontx, maxwidth);
-#endif
-#ifdef COLOR
   mline_old.color = (unsigned char *)xrealloc((char *)mline_old.color, maxwidth);
-# ifdef COLORS256
   mline_old.colorx = (unsigned char *)xrealloc((char *)mline_old.colorx, maxwidth);
-# endif
-#endif
   if (!(blank && null && mline_old.image && mline_old.attr IFFONT(&& mline_old.font) IFFONTX(&& mline_old.fontx) IFCOLOR(&& mline_old.color) IFCOLORX(&& mline_old.colorx)))
     Panic(0, "%s", strnomem);
 
@@ -525,20 +493,14 @@ CheckMaxSize(int wi)
   mline_blank.attr  = null;
   mline_null.image = null;
   mline_null.attr  = null;
-#ifdef FONT
   mline_blank.font  = null;
   mline_null.font   = null;
   mline_blank.fontx = null;
   mline_null.fontx  = null;
-#endif
-#ifdef COLOR
   mline_blank.color = null;
   mline_null.color = null;
-# ifdef COLORS256
   mline_blank.colorx = null;
   mline_null.colorx = null;
-# endif
-#endif
 
 #define RESET_AFC(x, bl) do { if (x == old##bl) x = bl; } while (0)
 
@@ -563,10 +525,8 @@ CheckMaxSize(int wi)
     {
       RESET_LINES(p->w_mlines, p->w_height);
 
-#ifdef COPY_PASTE
       RESET_LINES(p->w_hlines, p->w_histheight);
       RESET_LINES(p->w_alt.hlines, p->w_alt.histheight);
-#endif
 
       RESET_LINES(p->w_alt.mlines, p->w_alt.height);
     }
@@ -594,23 +554,12 @@ MakeBlankLine(register unsigned char *p, register int n)
 }
 
 
-
-
-#ifdef COPY_PASTE
-
 #define OLDWIN(y) ((y < p->w_histheight) \
         ? &p->w_hlines[(p->w_histidx + y) % p->w_histheight] \
         : &p->w_mlines[y - p->w_histheight])
 
 #define NEWWIN(y) ((y < hi) ? &nhlines[y] : &nmlines[y - hi])
 	
-#else
-
-#define OLDWIN(y) (&p->w_mlines[y])
-#define NEWWIN(y) (&nmlines[y])
-
-#endif
-
 
 int
 ChangeWindowSize(struct win *p, int wi, int he, int hi)
@@ -680,7 +629,6 @@ ChangeWindowSize(struct win *p, int wi, int he, int hi)
 	  naka = p->w_autoaka;
 	}
     }
-#ifdef COPY_PASTE
   if (hi)
     {
       if ((nhlines = (struct mline *)calloc(hi, sizeof(struct mline))) == 0)
@@ -690,7 +638,6 @@ ChangeWindowSize(struct win *p, int wi, int he, int hi)
 	  ty = he - 1;
 	}
     }
-#endif
 
   /* special case: cursor is at magic margin position */
   addone = 0;
@@ -868,11 +815,9 @@ ChangeWindowSize(struct win *p, int wi, int he, int hi)
   if (p->w_mlines && p->w_mlines != nmlines)
     free((char *)p->w_mlines);
   p->w_mlines = nmlines;
-#ifdef COPY_PASTE
   if (p->w_hlines && p->w_hlines != nhlines)
     free((char *)p->w_hlines);
   p->w_hlines = nhlines;
-#endif
 
   /* change tabs */
   if (p->w_width != wi)
@@ -893,10 +838,8 @@ ChangeWindowSize(struct win *p, int wi, int he, int hi)
 		    }
 		  if (nmlines && p->w_mlines != nmlines)
 		    free((char *)nmlines);
-#ifdef COPY_PASTE
 		  if (nhlines && p->w_hlines != nhlines)
 		    free((char *)nhlines);
-#endif
 		}
 	      KillWindow(p);
 	      Msg(0, "%s", strnomem);
@@ -964,10 +907,8 @@ ChangeWindowSize(struct win *p, int wi, int he, int hi)
   /* store new size */
   p->w_width = wi;
   p->w_height = he;
-#ifdef COPY_PASTE
   p->w_histidx = 0;
   p->w_histheight = hi;
-#endif
 
 #ifdef BUILTIN_TELNET
   if (p->w_type == W_TYPE_TELNET)
@@ -980,14 +921,12 @@ ChangeWindowSize(struct win *p, int wi, int he, int hi)
     {
       ml = OLDWIN(fy);
       ASSERT(ml->image);
-# ifdef UTF8
       if (p->w_encoding == UTF8)
 	{
 	  for (l = 0; l < p->w_width; l++)
 	    ASSERT(ml->image[l] >= ' ' || ml->font[l] || ml->fontx);
 	}
       else
-#endif
         for (l = 0; l < p->w_width; l++)
           ASSERT(ml->image[l] >= ' ');
     }
@@ -1009,7 +948,6 @@ FreeAltScreen(struct win *p)
   p->w_alt.mlines = 0;
   p->w_alt.width = 0;
   p->w_alt.height = 0;
-#ifdef COPY_PASTE
   if (p->w_alt.hlines)
     {
       for (i = 0; i < p->w_alt.histheight; i++)
@@ -1019,7 +957,6 @@ FreeAltScreen(struct win *p)
   p->w_alt.hlines = 0;
   p->w_alt.histidx = 0;
   p->w_alt.histheight = 0;
-#endif
 }
 
 static void
@@ -1034,11 +971,9 @@ SwapAltScreen(struct win *p)
   SWAP(width, t);
   SWAP(height, t);
 
-#ifdef COPY_PASTE
   SWAP(histheight, t);
   SWAP(hlines, ml);
   SWAP(histidx, t);
-#endif
 #undef SWAP
 }