converted more callbacks from mode menu

diff --git a/callback.c b/callback.c
index 0f6ce91..cd83153 100644 (file)
--- a/callback.c
+++ b/callback.c
@@ -175,6 +175,32 @@ void AboutProc (object, user_data)
 
 /* End Help Menu */
 
+/* Mode Menu */
+
+void MachineWhiteProc(object, user_data)
+     GtkObject *object;
+     gpointer user_data;
+{
+    MachineWhiteEvent();
+    return;
+}
+
+void MachineBlackProc(object, user_data)
+     GtkObject *object;
+     gpointer user_data;
+{
+    MachineBlackEvent();
+    return;
+}
+
+void TwoMachinesProc(object, user_data)
+     GtkObject *object;
+     gpointer user_data;
+{
+    TwoMachinesEvent();
+    return;
+}
+
 void IcsClientProc(object, user_data)
      GtkObject *object;
      gpointer user_data;
@@ -183,6 +209,108 @@ void IcsClientProc(object, user_data)
     return;
 }
 
+void
+AnalyzeFileProc(object, user_data)
+     GtkObject *object;
+     gpointer user_data;
+{
+  if (!first.analysisSupport)
+    {
+      char buf[MSG_SIZ];
+      snprintf(buf, sizeof(buf), _("%s does not support analysis"), first.tidy);
+      DisplayError(buf, 0);
+      return;
+    };
+  Reset(FALSE, TRUE);
+
+  if (!appData.showThinking)
+    ShowThinkingProc(NULL,NULL);
+
+  AnalyzeFileEvent();
+  FileNamePopUp(_("File to analyze"), "", LoadGamePopUp, "rb");
+  AnalysisPeriodicEvent(1);
+  return;
+}
+
+void 
+AnalyzeModeProc(object, user_data)
+     GtkObject *object;
+     gpointer user_data;
+{
+    char buf[MSG_SIZ];
+
+    if (!first.analysisSupport) 
+      {
+       snprintf(buf, sizeof(buf), _("%s does not support analysis"), first.tidy);
+       DisplayError(buf, 0);
+       return;
+      }
+    /* [DM] icsEngineAnalyze [HGM] This is horrible code; reverse the gameMode and isEngineAnalyze tests! */
+    if (appData.icsActive) 
+      {
+        if (gameMode != IcsObserving) 
+         {
+           sprintf(buf,_("You are not observing a game"));
+           DisplayError(buf, 0);
+            /* secure check */
+            if (appData.icsEngineAnalyze) 
+             {
+               if (appData.debugMode)
+                 fprintf(debugFP, _("Found unexpected active ICS engine analyze \n"));
+                ExitAnalyzeMode();
+                ModeHighlight();
+             }
+            return;
+         }
+        /* if enable, use want disable icsEngineAnalyze */
+        if (appData.icsEngineAnalyze) 
+         {
+           ExitAnalyzeMode();
+           ModeHighlight();
+           return;
+         }
+        appData.icsEngineAnalyze = TRUE;
+        if (appData.debugMode)
+         fprintf(debugFP, _("ICS engine analyze starting... \n"));
+      }
+    if (!appData.showThinking)
+      ShowThinkingProc(NULL,NULL);
+    
+    AnalyzeModeEvent();
+    return;
+}
+
+void 
+EditGameProc(object, user_data)
+     GtkObject *object;
+     gpointer user_data;
+{
+  EditGameEvent();
+  return;
+}
+
+void 
+EditPositionProc(object, user_data)
+     GtkObject *object;
+     gpointer user_data;
+{
+  EditPositionEvent();
+  return;
+}
+
+void 
+TrainingProc(object, user_data)
+     GtkObject *object;
+     gpointer user_data;
+{
+  TrainingEvent();
+  return;
+}
+
+
+
+/* End Mode Menu */
+
 /*
  * File menu
  */
@@ -277,56 +405,9 @@ SavePositionProc(object, user_data)
   return;
 }
 
-void
-AnalyzeFileProc(object, user_data)
-     GtkObject *object;
-     gpointer user_data;
-{
-  if (!first.analysisSupport)
-    {
-      char buf[MSG_SIZ];
-      snprintf(buf, sizeof(buf), _("%s does not support analysis"), first.tidy);
-      DisplayError(buf, 0);
-      return;
-    };
-  Reset(FALSE, TRUE);
-
-  if (!appData.showThinking)
-    ShowThinkingProc(NULL,NULL);
-
-  AnalyzeFileEvent();
-  FileNamePopUp(_("File to analyze"), "", LoadGamePopUp, "rb");
-  AnalysisPeriodicEvent(1);
-  return;
-}
-
 
 /* End File Menu */
 
-void MachineWhiteProc(object, user_data)
-     GtkObject *object;
-     gpointer user_data;
-{
-    MachineWhiteEvent();
-    return;
-}
-
-void MachineBlackProc(object, user_data)
-     GtkObject *object;
-     gpointer user_data;
-{
-    MachineBlackEvent();
-    return;
-}
-
-void TwoMachinesProc(object, user_data)
-     GtkObject *object;
-     gpointer user_data;
-{
-    TwoMachinesEvent();
-    return;
-}
-
 void AcceptProc(object, user_data)
      GtkObject *object;
      gpointer user_data;

diff --git a/callback.h b/callback.h
index eb795bb..4af54a1 100644 (file)
--- a/callback.h
+++ b/callback.h
@@ -1,7 +1,3 @@
-void IcsClientProc P((GtkObject *object, gpointer user_data));
-void MachineBlackProc P((GtkObject *object, gpointer user_data));
-void MachineWhiteProc P((GtkObject *object, gpointer user_data));
-void TwoMachinesProc P((GtkObject *object, gpointer user_data));
 void AcceptProc P((GtkObject *object, gpointer user_data));
 void DeclineProc P((GtkObject *object, gpointer user_data));
 void RematchProc P((GtkObject *object, gpointer user_data));
@@ -32,6 +28,17 @@ void LoadPositionProc P((GtkObject *object, gpointer user_data));
 void SaveGameProc P((GtkObject *object, gpointer user_data));
 void SavePositionProc P((GtkObject *object, gpointer user_data));
 
+/* Mode Menu */
+void AnalyzeFileProc P((GtkObject *object, gpointer user_data));
+void AnalyzeModeProc P((GtkObject *object, gpointer user_data));
+void IcsClientProc P((GtkObject *object, gpointer user_data));
+void MachineBlackProc P((GtkObject *object, gpointer user_data));
+void MachineWhiteProc P((GtkObject *object, gpointer user_data));
+void TwoMachinesProc P((GtkObject *object, gpointer user_data));
+void EditGameProc P((GtkObject *object, gpointer user_data));
+void EditPositionProc P((GtkObject *object, gpointer user_data));
+void TrainingProc P((GtkObject *object, gpointer user_data));
+
 /* Step Menu */
 void BackwardProc P((GtkObject *object, gpointer user_data));
 void ForwardProc P((GtkObject *object, gpointer user_data));

diff --git a/gtk-interface.xml b/gtk-interface.xml
index 7f294e2..604d428 100644 (file)
--- a/gtk-interface.xml
+++ b/gtk-interface.xml
@@ -350,6 +350,7 @@
                             <property name="use_underline">True</property>
                             <property name="draw_as_radio">True</property>
                             <property name="group">menuMode.Machine White</property>
+                            <signal name="activate" handler="AnalyzeModeProc"/>
                           </object>
                         </child>
                         <child>
@@ -379,6 +380,7 @@
                             <property name="use_underline">True</property>
                             <property name="draw_as_radio">True</property>
                             <property name="group">menuMode.Machine White</property>
+                            <signal name="activate" handler="EditGameProc"/>
                           </object>
                         </child>
                         <child>
@@ -388,6 +390,7 @@
                             <property name="use_underline">True</property>
                             <property name="draw_as_radio">True</property>
                             <property name="group">menuMode.Machine White</property>
+                            <signal name="activate" handler="EditPositionProc"/>
                           </object>
                         </child>
                         <child>
@@ -397,6 +400,7 @@
                             <property name="use_underline">True</property>
                             <property name="draw_as_radio">True</property>
                             <property name="group">menuMode.Machine White</property>
+                            <signal name="activate" handler="TrainingProc"/>
                           </object>
                         </child>
                         <child>

diff --git a/xboard.c b/xboard.c
index c70f96a..1665f4c 100644 (file)
--- a/xboard.c
+++ b/xboard.c
@@ -289,12 +289,6 @@ void PasteGameProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
 void MailMoveProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
 void ReloadCmailMsgProc P((Widget w, XEvent *event, String *prms,
                            Cardinal *nprms));
-void AnalyzeModeProc P((Widget w, XEvent *event,
-                        String *prms, Cardinal *nprms));
-void EditGameProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void EditPositionProc P((Widget w, XEvent *event,
-                        String *prms, Cardinal *nprms));
-void TrainingProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
 void EditCommentProc P((Widget w, XEvent *event,
                        String *prms, Cardinal *nprms));
 void IcsInputBoxProc P((Widget w, XEvent *event,
@@ -611,18 +605,18 @@ MenuItem modeMenu[] = {
   //    {N_("Machine White"), MachineWhiteProc},
   //    {N_("Machine Black"), MachineBlackProc},
   //    {N_("Two Machines"), TwoMachinesProc},
-    {N_("Analysis Mode"), AnalyzeModeProc},
+  //    {N_("Analysis Mode"), AnalyzeModeProc},
     //    {N_("Analyze File"), AnalyzeFileProc },
     //    {N_("ICS Client"), IcsClientProc},
-    {N_("Edit Game"), EditGameProc},
-    {N_("Edit Position"), EditPositionProc},
-    {N_("Training"), TrainingProc},
-    {"----", NothingProc},
+  //    {N_("Edit Game"), EditGameProc},
+  //    {N_("Edit Position"), EditPositionProc},
+  //    {N_("Training"), TrainingProc},
+    //    {"----", NothingProc},
     {N_("Show Engine Output"), EngineOutputProc},
     {N_("Show Evaluation Graph"), NothingProc}, // [HGM] evalgr: not functional yet
     {N_("Show Game List"), ShowGameListProc},
     //    {"Show Move History", HistoryShowProc}, // [HGM] hist: activate 4.2.7 code
-    {"----", NothingProc},
+    //    {"----", NothingProc},
     //    {N_("Edit Tags"), EditTagsProc},
     {N_("Edit Comment"), EditCommentProc},
     {N_("ICS Input Box"), IcsInputBoxProc},
@@ -1775,13 +1769,13 @@ XtActionsRec boardActions[] = {
     { "ReloadCmailMsgProc", ReloadCmailMsgProc },
     //    { "MachineWhiteProc", MachineWhiteProc },
     //    { "MachineBlackProc", MachineBlackProc },
-    { "AnalysisModeProc", AnalyzeModeProc },
+    //    { "AnalysisModeProc", AnalyzeModeProc },
     //    { "AnalyzeFileProc", AnalyzeFileProc },
     //    { "TwoMachinesProc", TwoMachinesProc },
     //    { "IcsClientProc", IcsClientProc },
-    { "EditGameProc", EditGameProc },
-    { "EditPositionProc", EditPositionProc },
-    { "TrainingProc", EditPositionProc },
+    //    { "EditGameProc", EditGameProc },
+    //    { "EditPositionProc", EditPositionProc },
+    //    { "TrainingProc", EditPositionProc },
     { "EngineOutputProc", EngineOutputProc}, // [HGM] Winboard_x engine-output window
     { "ShowGameListProc", ShowGameListProc },
     //    { "ShowMoveListProc", HistoryShowProc},
@@ -4997,75 +4991,6 @@ void AutoSaveGame()
   return;
 }
 
-void AnalyzeModeProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    char buf[MSG_SIZ];
-
-    if (!first.analysisSupport) {
-      snprintf(buf, sizeof(buf), _("%s does not support analysis"), first.tidy);
-      DisplayError(buf, 0);
-      return;
-    }
-    /* [DM] icsEngineAnalyze [HGM] This is horrible code; reverse the gameMode and isEngineAnalyze tests! */
-    if (appData.icsActive) {
-        if (gameMode != IcsObserving) {
-            sprintf(buf,_("You are not observing a game"));
-            DisplayError(buf, 0);
-            /* secure check */
-            if (appData.icsEngineAnalyze) {
-                if (appData.debugMode)
-                    fprintf(debugFP, _("Found unexpected active ICS engine analyze \n"));
-                ExitAnalyzeMode();
-                ModeHighlight();
-            }
-            return;
-        }
-        /* if enable, use want disable icsEngineAnalyze */
-        if (appData.icsEngineAnalyze) {
-                ExitAnalyzeMode();
-                ModeHighlight();
-                return;
-        }
-        appData.icsEngineAnalyze = TRUE;
-        if (appData.debugMode)
-            fprintf(debugFP, _("ICS engine analyze starting... \n"));
-    }
-    if (!appData.showThinking)
-      ShowThinkingProc(NULL,NULL);
-
-    AnalyzeModeEvent();
-}
-
-void EditGameProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    EditGameEvent();
-}
-
-void EditPositionProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    EditPositionEvent();
-}
-
-void TrainingProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    TrainingEvent();
-}
 
 void EditCommentProc(w, event, prms, nprms)
      Widget w;