more callbacks

converted step menu callbacks

diff --git a/callback.c b/callback.c
index 6fcd469..ca9f23e 100644 (file)
--- a/callback.c
+++ b/callback.c
@@ -79,6 +79,14 @@ void AboutProc (object, user_data)
   gtk_widget_destroy(about);
 }
 
+void IcsClientProc(object, user_data)
+     GtkObject *object;
+     gpointer user_data;
+{
+    IcsClientEvent();
+    return;
+}
+
 void LoadNextGameProc(object, user_data)
      GtkObject *object;
      gpointer user_data;
@@ -231,6 +239,54 @@ void AdjuDrawProc(object, user_data)
     return;
 }
 
+void BackwardProc(object, user_data)
+     GtkObject *object;
+     gpointer user_data;
+{
+    BackwardEvent();
+    return;
+}
+
+void ForwardProc(object, user_data)
+     GtkObject *object;
+     gpointer user_data;
+{
+    ForwardEvent();
+    return;
+}
+
+void ToStartProc(object, user_data)
+     GtkObject *object;
+     gpointer user_data;
+{
+    ToStartEvent();
+    return;
+}
+
+void ToEndProc(object, user_data)
+     GtkObject *object;
+     gpointer user_data;
+{
+    ToEndEvent();
+    return;
+}
+
+void RevertProc(object, user_data)
+     GtkObject *object;
+     gpointer user_data;
+{
+    RevertEvent();
+    return;
+}
+
+void TruncateGameProc(object, user_data)
+     GtkObject *object;
+     gpointer user_data;
+{
+    TruncateGameEvent();
+    return;
+}
+
 void MoveNowProc(object, user_data)
      GtkObject *object;
      gpointer user_data;
@@ -239,6 +295,13 @@ void MoveNowProc(object, user_data)
     return;
 }
 
+void RetractMoveProc(object, user_data)
+     GtkObject *object;
+     gpointer user_data;
+{
+    RetractMoveEvent();
+    return;
+}
 
 gboolean CloseWindowProc(GtkWidget *button)
 {

diff --git a/callback.h b/callback.h
index 5ff0095..b790926 100644 (file)
--- a/callback.h
+++ b/callback.h
@@ -1,4 +1,5 @@
 void QuitProc 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));
@@ -18,7 +19,17 @@ void AdjuDrawProc P((GtkObject *object, gpointer user_data));
 void ResetProc P((GtkObject *object, gpointer user_data));
 void WhiteClockProc P((GtkObject *object, gpointer user_data));
 void BlackClockProc P((GtkObject *object, gpointer user_data));
+
+/* Step Menu */
+void BackwardProc P((GtkObject *object, gpointer user_data));
+void ForwardProc P((GtkObject *object, gpointer user_data));
+void ToStartProc P((GtkObject *object, gpointer user_data));
+void ToEndProc P((GtkObject *object, gpointer user_data));
+void RevertProc P((GtkObject *object, gpointer user_data));
+void TruncateGameProc P((GtkObject *object, gpointer user_data));
 void MoveNowProc P((GtkObject *object, gpointer user_data));
+void RetractMoveProc P((GtkObject *object, gpointer user_data));
+
 void AboutProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
 void ShowCoordsProc P((GtkObject *object, gpointer user_data));
 void ErrorPopDownProc P((GtkObject *object, gpointer user_data));

diff --git a/gtk-interface.xml b/gtk-interface.xml
index e8adbf3..6aa80bf 100644 (file)
--- a/gtk-interface.xml
+++ b/gtk-interface.xml
@@ -257,6 +257,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="IcsClientProc"/>
                           </object>
                         </child>
                         <child>
@@ -479,6 +480,7 @@
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Backward</property>
                             <property name="use_underline">True</property>
+                            <signal name="activate" handler="BackwardProc"/>
                           </object>
                         </child>
                         <child>
@@ -486,6 +488,7 @@
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Forward</property>
                             <property name="use_underline">True</property>
+                            <signal name="activate" handler="ForwardProc"/>
                           </object>
                         </child>
                         <child>
@@ -493,6 +496,7 @@
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Back to Start</property>
                             <property name="use_underline">True</property>
+                            <signal name="activate" handler="ToStartProc"/>
                           </object>
                         </child>
                         <child>
@@ -500,6 +504,7 @@
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Forward to End</property>
                             <property name="use_underline">True</property>
+                            <signal name="activate" handler="ToEndProc"/>
                           </object>
                         </child>
                         <child>
@@ -507,6 +512,7 @@
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Revert</property>
                             <property name="use_underline">True</property>
+                            <signal name="activate" handler="RevertProc"/>
                           </object>
                         </child>
                         <child>
@@ -514,6 +520,7 @@
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Truncate Game</property>
                             <property name="use_underline">True</property>
+                            <signal name="activate" handler="TruncateGameProc"/>
                           </object>
                         </child>
                         <child>
@@ -534,6 +541,7 @@
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Retract Move</property>
                             <property name="use_underline">True</property>
+                            <signal name="activate" handler="RetractMoveProc"/>
                           </object>
                         </child>
                       </object>
@@ -833,11 +841,12 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkButton" id="button1">
+                  <object class="GtkButton" id="buttonbar.ToStart">
                     <property name="label" translatable="yes">&lt;&lt;</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
+                    <signal name="activate" handler="ToStartProc"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -846,11 +855,12 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkButton" id="button2">
+                  <object class="GtkButton" id="buttonbar.Backward">
                     <property name="label" translatable="yes">&lt;</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
+                    <signal name="activate" handler="BackwardProc"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -873,7 +883,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkButton" id="button4">
+                  <object class="GtkButton" id="buttonbar.Forward">
                     <property name="label" translatable="yes">&gt;</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -886,11 +896,12 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkButton" id="button5">
+                  <object class="GtkButton" id="buttonbar.ToEnd">
                     <property name="label" translatable="yes">&gt;&gt;</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
+                    <signal name="activate" handler="ToEndProc"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>

diff --git a/xboard.c b/xboard.c
index 2859a26..a62292f 100644 (file)
--- a/xboard.c
+++ b/xboard.c
@@ -317,8 +317,6 @@ void AnalyzeModeProc P((Widget w, XEvent *event,
                         String *prms, Cardinal *nprms));
 void AnalyzeFileProc P((Widget w, XEvent *event,
                         String *prms, Cardinal *nprms));
-void IcsClientProc 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));
@@ -328,15 +326,6 @@ void EditCommentProc P((Widget w, XEvent *event,
 void IcsInputBoxProc P((Widget w, XEvent *event,
                        String *prms, Cardinal *nprms));
 void EnterKeyProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void BackwardProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void ForwardProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void ToStartProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void ToEndProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void RevertProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void TruncateGameProc P((Widget w, XEvent *event, String *prms,
-                        Cardinal *nprms));
-void RetractMoveProc P((Widget w, XEvent *event, String *prms,
-                       Cardinal *nprms));
 void AlwaysQueenProc P((Widget w, XEvent *event, String *prms,
                        Cardinal *nprms));
 void AnimateDraggingProc P((Widget w, XEvent *event, String *prms,
@@ -699,7 +688,7 @@ MenuItem modeMenu[] = {
   //    {N_("Two Machines"), TwoMachinesProc},
     {N_("Analysis Mode"), AnalyzeModeProc},
     {N_("Analyze File"), AnalyzeFileProc },
-    {N_("ICS Client"), IcsClientProc},
+    //    {N_("ICS Client"), IcsClientProc},
     {N_("Edit Game"), EditGameProc},
     {N_("Edit Position"), EditPositionProc},
     {N_("Training"), TrainingProc},
@@ -715,19 +704,6 @@ MenuItem modeMenu[] = {
     {NULL, NULL}
 };
 
-MenuItem stepMenu[] = {
-    {N_("Backward"), BackwardProc},
-    {N_("Forward"), ForwardProc},
-    {N_("Back to Start"), ToStartProc},
-    {N_("Forward to End"), ToEndProc},
-    {N_("Revert"), RevertProc},
-    {N_("Truncate Game"), TruncateGameProc},
-    {"----", NothingProc},
-    //    {N_("Move Now"), MoveNowProc},
-    {N_("Retract Move"), RetractMoveProc},
-    {NULL, NULL}
-};
-
 MenuItem optionsMenu[] = {
     {N_("Flip View"), FlipViewProc},
     {"----", NothingProc},
@@ -780,7 +756,6 @@ MenuItem helpMenu[] = {
 Menu menuBar[] = {
     {N_("File"), fileMenu},
     {N_("Mode"), modeMenu},
-    {N_("Step"), stepMenu},
     {N_("Options"), optionsMenu},
     {N_("Help"), helpMenu},
     {NULL, NULL}
@@ -788,11 +763,11 @@ Menu menuBar[] = {
 
 #define PAUSE_BUTTON N_("P")
 MenuItem buttonBar[] = {
-    {"<<", ToStartProc},
-    {"<", BackwardProc},
+  //    {"<<", ToStartProc},
+    //    {"<", BackwardProc},
     //    {PAUSE_BUTTON, PauseProc},
-    {">", ForwardProc},
-    {">>", ToEndProc},
+    //    {">", ForwardProc},
+  //    {">>", ToEndProc},
     {NULL, NULL}
 };
 
@@ -1864,7 +1839,7 @@ XtActionsRec boardActions[] = {
     { "AnalysisModeProc", AnalyzeModeProc },
     { "AnalyzeFileProc", AnalyzeFileProc },
     //    { "TwoMachinesProc", TwoMachinesProc },
-    { "IcsClientProc", IcsClientProc },
+    //    { "IcsClientProc", IcsClientProc },
     { "EditGameProc", EditGameProc },
     { "EditPositionProc", EditPositionProc },
     { "TrainingProc", EditPositionProc },
@@ -1889,14 +1864,14 @@ XtActionsRec boardActions[] = {
     { "EnterKeyProc", EnterKeyProc },
     //    { "StopObservingProc", StopObservingProc },
     //    { "StopExaminingProc", StopExaminingProc },
-    { "BackwardProc", BackwardProc },
-    { "ForwardProc", ForwardProc },
-    { "ToStartProc", ToStartProc },
-    { "ToEndProc", ToEndProc },
-    { "RevertProc", RevertProc },
-    { "TruncateGameProc", TruncateGameProc },
+    //    { "BackwardProc", BackwardProc },
+    //    { "ForwardProc", ForwardProc },
+    //    { "ToStartProc", ToStartProc },
+    //    { "ToEndProc", ToEndProc },
+    //    { "RevertProc", RevertProc },
+    //    { "TruncateGameProc", TruncateGameProc },
     //    { "MoveNowProc", MoveNowProc },
-    { "RetractMoveProc", RetractMoveProc },
+    //    { "RetractMoveProc", RetractMoveProc },
     { "AlwaysQueenProc", AlwaysQueenProc },
     { "AnimateDraggingProc", AnimateDraggingProc },
     { "AnimateMovingProc", AnimateMovingProc },
@@ -5537,14 +5512,6 @@ void AnalyzeFileProc(w, event, prms, nprms)
     AnalysisPeriodicEvent(1);
 }
 
-void IcsClientProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    IcsClientEvent();
-}
 
 void EditGameProc(w, event, prms, nprms)
      Widget w;
@@ -5610,70 +5577,6 @@ void EnterKeyProc(w, event, prms, nprms)
       ICSInputSendText();
 }
 
-
-void ForwardProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    ForwardEvent();
-}
-
-
-void BackwardProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    BackwardEvent();
-}
-
-void ToStartProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    ToStartEvent();
-}
-
-void ToEndProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    ToEndEvent();
-}
-
-void RevertProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    RevertEvent();
-}
-
-void TruncateGameProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    TruncateGameEvent();
-}
-void RetractMoveProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    RetractMoveEvent();
-}
-
 void AlwaysQueenProc(w, event, prms, nprms)
      Widget w;
      XEvent *event;