menunextarea config file token

golded3/gccfgg.cpp

@@ -740,6 +740,7 @@ CfgGed::CfgGed() {
   keybmode = KEYB_POLL;
   logformat = 0;
   menumarked = MODE_DONT;
+  menunextarea = YES;
   msglistdate = MSGLISTDATE_WRITTEN;
   msglistfast = true;
   msglistfirst = false;

golded3/gccfgg.h

@@ -253,6 +253,7 @@ const word CRC_MAPPATH          = 0x74E6;
 const word CRC_MEMBER           = 0xF703;
 const word CRC_MENUDROPMSG      = 0x9645;
 const word CRC_MENUMARKED       = 0x7198;
+const word CRC_MENUNEXTAREA     = 0x82B4;
 const word CRC_MOUSE            = 0x1B1B;
 const word CRC_MSGLISTDATE      = 0xBFF5;
 const word CRC_MSGLISTFAST      = 0xDE86;

golded3/gccfgg0.cpp

@@ -425,6 +425,7 @@ SwitchM:
     case CRC_MAPPATH          :  CfgMappath          ();  break;
     case CRC_MEMBER           :  CfgMember           ();  break;
     case CRC_MENUMARKED       :  CfgMenumarked       ();  break;
+    case CRC_MENUNEXTAREA     :  CfgMenunextarea     ();  break;
     case CRC_MSGLISTDATE      :  CfgMsglistdate      ();  break;
     case CRC_MSGLISTFAST      :  CfgMsglistfast      ();  break;
     case CRC_MSGLISTFIRST     :  CfgMsglistfirst     ();  break;

golded3/gccfgg5.cpp

@@ -426,6 +426,16 @@ void CfgMenumarked() {
 
 //  ------------------------------------------------------------------
 
+void CfgMenunextarea()
+{
+  if (strieql(val, "Unread"))
+    CFG->menunextarea = ALWAYS;
+  else 
+    CFG->menunextarea = GetYesno(val);
+}
+
+//  ------------------------------------------------------------------
+
 void CfgMsglistdate() {
 
   int flag;

golded3/gcprot.h

@@ -242,6 +242,7 @@ void CfgMappath          ();
 void CfgMember           ();
 void CfgMenudropmsg      ();
 void CfgMenumarked       ();
+void CfgMenunextarea     ();
 void CfgMouse            ();
 void CfgMsglistdate      ();
 void CfgMsglistfast      ();

golded3/gecfgg.h

@@ -261,6 +261,7 @@ public:
   std::vector<MailList> mailinglist;
   std::vector< std::pair<std::string, std::string> > mappath;
   int         menumarked;
+  int         menunextarea;
   int         msglistdate;
   bool        msglistfast;
   bool        msglistfirst;

golded3/gemnus.cpp

@@ -216,7 +216,7 @@ static void PressY() { if(gkbd.kbuf == NULL) kbput(*LNG->GotoNextYes); }
 static void PressN() { if(gkbd.kbuf == NULL) kbput(*LNG->GotoNextNo);  }
 
 int GMenuNewarea::Run() {
-                                    
+
   enum { TAG_NO=100, TAG_YES, TAG_JUMP };
 
   HandleGEvent(EVTT_ENDOFMSGS);
@@ -229,8 +229,8 @@ int GMenuNewarea::Run() {
     _temp = AA->Mark.Find(AA->Msgn.CvtReln(AA->lastread()));
 
   if(_temp <= 1) {
-    _yeskey = Key_Rgt;
-    _nokey  = Key_Lft;
+    _yeskey = Key_Lft;
+    _nokey  = Key_Rgt;
   }
 
   AskInit(6, 0, LNG->GotoNext, H_AskNextArea);
@@ -239,8 +239,7 @@ int GMenuNewarea::Run() {
     Item(TAG_YES,  LNG->GotoNextYes, M_CLOSE, PressY, _yeskey);
     Item(TAG_NO,   LNG->GotoNextNo,  M_CLOSE, PressN, _nokey);
     Item(TAG_JUMP, LNG->GotoNextNew);
-    SetTag(TAG_YES);
-    // Dirk: YES must be default for backward comp. Make it configurable.
+    SetTag(CFG->menunextarea + TAG_NO);
   End();
 
   Start();
@@ -249,8 +248,10 @@ int GMenuNewarea::Run() {
   if(finaltag != -1 and finaltag != TAG_JUMP)
     getxch();
 
-  if(finaltag == -1)
+  if (finaltag == -1)
     finaltag = TAG_NO;
+  else if ((finaltag != overtag) && (finaltag == TAG_YES))
+    finaltag = overtag;
 
   return (int) (finaltag - TAG_NO);
 }