dont-resize-window.patch

   1 Subject: option for disabling automatic resizing of the window
   2
   3 ---
   4
   5  source/preferences.c |    8 ++++++++
   6  source/preferences.h |    1 +
   7  source/window.c      |    2 +-
   8  3 files changed, 10 insertions(+), 1 deletion(-)
   9
  10 diff --quilt old/source/preferences.c new/source/preferences.c
  11 --- old/source/preferences.c
  12 +++ new/source/preferences.c
  13 @@ -369,10 +369,11 @@ static struct prefData {
  14      int defMenuColorLength;
  15      char bgMenuColor[MAX_COLOR_LENGTH];
  16      int bgMenuColorLength;
  17      char transMenuColor[MAX_COLOR_LENGTH];
  18      int transMenuColorLength;
  19 +    Boolean resizeWindow;
  20  } PrefData;
  21
  22  /* Temporary storage for preferences strings which are discarded after being
  23     read */
  24  static struct {
  25 @@ -1215,10 +1216,12 @@ static PrefDescripRec PrefDescrip[] = {
  26          PrefData.defMenuColor, (void *)sizeof(PrefData.defMenuColor), False},
  27      {"backgroundWinMenuColor", "BackgroundWinMenuColor", PREF_STRING, "white",
  28          PrefData.bgMenuColor, (void *)sizeof(PrefData.bgMenuColor), False},
  29      {"transientWinMenuColor", "TransientWinMenuColor", PREF_STRING, "yellow",
  30          PrefData.transMenuColor, (void *)sizeof(PrefData.transMenuColor), False},
  31 +    {"resizeWindow", "ResizeWindow", PREF_BOOLEAN, "True",
  32 +        &PrefData.resizeWindow, NULL, False},
  33  };
  34
  35  static XrmOptionDescRec OpTable[] = {
  36      {"-wrap", ".autoWrap", XrmoptionNoArg, (caddr_t)"Continuous"},
  37      {"-nowrap", ".autoWrap", XrmoptionNoArg, (caddr_t)"None"},
  38 @@ -2447,10 +2450,15 @@ void SetPrefZeroSizedMode(int mode)
  39  int GetPrefZeroSizedMode(void)
  40  {
  41      return PrefData.zeroSizedMode;
  42  }
  43
  44 +Boolean GetPrefResizeWindow(void)
  45 +{
  46 +    return (Boolean)PrefData.resizeWindow;
  47 +}
  48 +
  49  /*
  50  ** If preferences don't get saved, ask the user on exit whether to save
  51  */
  52  void MarkPrefsChanged(void)
  53  {
  54 diff --quilt old/source/preferences.h new/source/preferences.h
  55 --- old/source/preferences.h
  56 +++ new/source/preferences.h
  57 @@ -229,7 +229,8 @@ void SetPrefFocusOnRaise(Boolean);
  58  Boolean GetPrefShowScrolltip(void);
  59  void SetPrefHardlinkMode(int mode);
  60  int GetPrefHardlinkMode(void);
  61  void SetPrefZeroSizedMode(int mode);
  62  int GetPrefZeroSizedMode(void);
  63 +Boolean GetPrefResizeWindow(void);
  64
  65  #endif /* NEDIT_PREFERENCES_H_INCLUDED */
  66 diff --quilt old/source/window.c new/source/window.c
  67 --- old/source/window.c
  68 +++ new/source/window.c
  69 @@ -2779,11 +2779,11 @@ static int updateGutterWidth(WindowInfo*
  70                  reqCols = tmpReqCols;
  71              }
  72          }
  73      }
  74
  75 -    if (reqCols != maxCols) {
  76 +    if (reqCols != maxCols && GetPrefResizeWindow()) {
  77          XFontStruct *fs;
  78          Dimension windowWidth;
  79          short fontWidth;
  80
  81          newColsDiff = reqCols - maxCols;