ColoredWinMenu-transient.patch

   1 Subject: "transient" support for ColoredWinMenu patch
   2
   3 ---
   4
   5  doc/help.etx         |    6 +++++-
   6  source/menu.c        |    5 +++++
   7  source/preferences.c |   16 ++++++++++++++++
   8  source/preferences.h |    2 ++
   9  4 files changed, 28 insertions(+), 1 deletion(-)
  10
  11 diff --quilt old/doc/help.etx new/doc/help.etx
  12 --- old/doc/help.etx
  13 +++ new/doc/help.etx
  14 @@ -4623,14 +4623,18 @@ X Resources
  15
  16  **nedit.readOnlyWinMenuColor**: blue
  17
  18    Defines the color of read-only files in the Windows menu.
  19
  20 +**nedit.transientWinMenuColor**: yellow
  21 +
  22 +  Defines the color of transient files in the Windows menu.
  23 +
  24  **nedit.backgroundWinMenuColor**: white
  25
  26    Defines the color of the background used for colored Windows menu items
  27 -  when using either the modified or read-only foreground color.
  28 +  when using either the modified, read-only or transient foreground color.
  29
  30  **nedit.multiClickTime**: (system specific)
  31
  32    Maximum time in milliseconds allowed between mouse clicks within double and
  33    triple click actions.
  34 diff --quilt old/source/menu.c new/source/menu.c
  35 --- old/source/menu.c
  36 +++ new/source/menu.c
  37 @@ -4450,10 +4450,11 @@ static void setTransientAP(Widget text,
  38          XmToggleButtonSetState(window->transientItem, window->transient, False);
  39      }
  40
  41      UpdateWindowTitle(window);
  42      RefreshTabState(window);
  43 +    InvalidateWindowMenus();
  44  }
  45
  46  static void setTabDistAP(Widget w, XEvent *event, String *args,
  47      Cardinal *nArgs)
  48  {
  49 @@ -4845,10 +4846,14 @@ static void colorWindowMenuEntries(const
  50          int colorLength;
  51          if (IS_ANY_LOCKED(window->lockReasons)) {
  52              color = GetPrefRoMenuColor(&colorLength);
  53              bgcolor = GetPrefBgMenuColor(&bgcolorLength);
  54          }
  55 +        else if (window->transient == TRUE) {
  56 +            color = GetPrefTransMenuColor(&colorLength);
  57 +            bgcolor = GetPrefBgMenuColor(&bgcolorLength);
  58 +        }
  59          else if (window->fileChanged == TRUE) {
  60              color = GetPrefModMenuColor(&colorLength);
  61              bgcolor = GetPrefBgMenuColor(&bgcolorLength);
  62          }
  63          else {
  64 diff --quilt old/source/preferences.c new/source/preferences.c
  65 --- old/source/preferences.c
  66 +++ new/source/preferences.c
  67 @@ -367,10 +367,12 @@ static struct prefData {
  68      int roMenuColorLength;
  69      char defMenuColor[MAX_COLOR_LENGTH];
  70      int defMenuColorLength;
  71      char bgMenuColor[MAX_COLOR_LENGTH];
  72      int bgMenuColorLength;
  73 +    char transMenuColor[MAX_COLOR_LENGTH];
  74 +    int transMenuColorLength;
  75  } PrefData;
  76
  77  /* Temporary storage for preferences strings which are discarded after being
  78     read */
  79  static struct {
  80 @@ -1211,10 +1213,12 @@ static PrefDescripRec PrefDescrip[] = {
  81          PrefData.roMenuColor, (void *)sizeof(PrefData.roMenuColor), False},
  82      {"defaultWinMenuColor", "DefaultWinMenuColor", PREF_STRING, "black",
  83          PrefData.defMenuColor, (void *)sizeof(PrefData.defMenuColor), False},
  84      {"backgroundWinMenuColor", "BackgroundWinMenuColor", PREF_STRING, "white",
  85          PrefData.bgMenuColor, (void *)sizeof(PrefData.bgMenuColor), False},
  86 +    {"transientWinMenuColor", "TransientWinMenuColor", PREF_STRING, "yellow",
  87 +        PrefData.transMenuColor, (void *)sizeof(PrefData.transMenuColor), False},
  88  };
  89
  90  static XrmOptionDescRec OpTable[] = {
  91      {"-wrap", ".autoWrap", XrmoptionNoArg, (caddr_t)"Continuous"},
  92      {"-nowrap", ".autoWrap", XrmoptionNoArg, (caddr_t)"None"},
  93 @@ -1579,10 +1583,11 @@ static void translatePrefFormats(int con
  94      /* For efficiency, precalculate the lengths of window menu colors */
  95      SetPrefModMenuColorLength(PrefData.modMenuColor);
  96      SetPrefRoMenuColorLength(PrefData.roMenuColor);
  97      SetPrefDefMenuColorLength(PrefData.defMenuColor);
  98      SetPrefBgMenuColorLength(PrefData.bgMenuColor);
  99 +    SetPrefTransMenuColorLength(PrefData.transMenuColor);
 100
 101      /* setup language mode dependent info of user menus (to increase
 102         performance when switching between documents of different
 103         language modes) */
 104      SetupUserMenuInfo();
 105 @@ -2385,10 +2390,21 @@ const char *GetPrefBgMenuColor(int* leng
 106  void SetPrefBgMenuColorLength(const char* string)
 107  {
 108      PrefData.bgMenuColorLength = strlen(string);
 109  }
 110
 111 +const char *GetPrefTransMenuColor(int* length)
 112 +{
 113 +    *length = PrefData.transMenuColorLength;
 114 +    return PrefData.transMenuColor;
 115 +}
 116 +
 117 +void SetPrefTransMenuColorLength(const char* string)
 118 +{
 119 +    PrefData.transMenuColorLength = strlen(string);
 120 +}
 121 +
 122  int GetPrefOverrideVirtKeyBindings(void)
 123  {
 124      return PrefData.virtKeyOverride;
 125  }
 126
 127 diff --quilt old/source/preferences.h new/source/preferences.h
 128 --- old/source/preferences.h
 129 +++ new/source/preferences.h
 130 @@ -201,10 +201,12 @@ const char *GetPrefRoMenuColor(int* leng
 131  void SetPrefRoMenuColorLength(const char* string);
 132  const char *GetPrefDefMenuColor(int* length);
 133  void SetPrefDefMenuColorLength(const char* string);
 134  const char *GetPrefBgMenuColor(int* length);
 135  void SetPrefBgMenuColorLength(const char* string);
 136 +const char *GetPrefTransMenuColor(int* length);
 137 +void SetPrefTransMenuColorLength(const char* string);
 138  void SetPrefFindReplaceUsesSelection(int state);
 139  int GetPrefFindReplaceUsesSelection(void);
 140  int GetPrefStickyCaseSenseBtn(void);
 141  void SetPrefBeepOnSearchWrap(int state);
 142  int GetPrefBeepOnSearchWrap(void);