more callbacks

got rid of the first X-menu completely.

diff --git a/callback.c b/callback.c
index 2fce80f..6fcd469 100644 (file)
--- a/callback.c
+++ b/callback.c
@@ -191,6 +191,45 @@ void ResignProc(object, user_data)
     return;
 }
 
+void StopObservingProc(object, user_data)
+     GtkObject *object;
+     gpointer user_data;
+{
+    StopObservingEvent();
+    return;
+}
+
+void StopExaminingProc(object, user_data)
+     GtkObject *object;
+     gpointer user_data;
+{
+    StopExaminingEvent();
+    return;
+}
+
+void AdjuWhiteProc(object, user_data)
+     GtkObject *object;
+     gpointer user_data;
+{
+    UserAdjudicationEvent(+1);
+    return;
+}
+
+void AdjuBlackProc(object, user_data)
+     GtkObject *object;
+     gpointer user_data;
+{
+    UserAdjudicationEvent(-1);
+    return;
+}
+
+void AdjuDrawProc(object, user_data)
+     GtkObject *object;
+     gpointer user_data;
+{
+    UserAdjudicationEvent(0);
+    return;
+}
 
 void MoveNowProc(object, user_data)
      GtkObject *object;

diff --git a/callback.h b/callback.h
index 4db01b1..5ff0095 100644 (file)
--- a/callback.h
+++ b/callback.h
@@ -10,6 +10,11 @@ void Drawroc P((GtkObject *object, gpointer user_data));
 void AbortProc P((GtkObject *object, gpointer user_data));
 void AdjournProc P((GtkObject *object, gpointer user_data));
 void ResignProc P((GtkObject *object, gpointer user_data));
+void StopObservingProc P((GtkObject *object, gpointer user_data));
+void StopExaminingProc P((GtkObject *object, gpointer user_data));
+void AdjuWhiteProc P((GtkObject *object, gpointer user_data));
+void AdjuBlackProc P((GtkObject *object, gpointer user_data));
+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));

diff --git a/gtk-interface.xml b/gtk-interface.xml
index 6692f90..e8adbf3 100644 (file)
--- a/gtk-interface.xml
+++ b/gtk-interface.xml
@@ -354,19 +354,19 @@
                           </object>
                         </child>
                         <child>
-                          <object class="GtkMenuItem" id="menuAction.Call Flag">
+                          <object class="GtkMenuItem" id="menuAction.Decline">
                             <property name="visible">True</property>
-                            <property name="label" translatable="yes">Call Flag</property>
+                            <property name="label" translatable="yes">Decline</property>
                             <property name="use_underline">True</property>
-                            <signal name="activate" handler="CallFlagProc"/>
+                            <signal name="activate" handler="DeclineProc"/>
                           </object>
                         </child>
                         <child>
-                          <object class="GtkMenuItem" id="menuAction.Decline">
+                          <object class="GtkMenuItem" id="menuAction.Rematch">
                             <property name="visible">True</property>
-                            <property name="label" translatable="yes">Decline</property>
+                            <property name="label" translatable="yes">Rematch</property>
                             <property name="use_underline">True</property>
-                            <signal name="activate" handler="DeclineProc"/>
+                            <signal name="activate" handler="RematchProc"/>
                           </object>
                         </child>
                         <child>
@@ -375,11 +375,11 @@
                           </object>
                         </child>
                         <child>
-                          <object class="GtkMenuItem" id="menuAction.Rematch">
+                          <object class="GtkMenuItem" id="menuAction.Call Flag">
                             <property name="visible">True</property>
-                            <property name="label" translatable="yes">Rematch</property>
+                            <property name="label" translatable="yes">Call Flag</property>
                             <property name="use_underline">True</property>
-                            <signal name="activate" handler="RematchProc"/>
+                            <signal name="activate" handler="CallFlagProc"/>
                           </object>
                         </child>
                         <child>
@@ -399,19 +399,19 @@
                           </object>
                         </child>
                         <child>
-                          <object class="GtkMenuItem" id="menuAction.Resign">
+                          <object class="GtkMenuItem" id="menuAction.Abort">
                             <property name="visible">True</property>
-                            <property name="label" translatable="yes">Resign</property>
+                            <property name="label" translatable="yes">Abort</property>
                             <property name="use_underline">True</property>
-                            <signal name="activate" handler="ResignProc"/>
+                            <signal name="activate" handler="AbortProc"/>
                           </object>
                         </child>
                         <child>
-                          <object class="GtkMenuItem" id="menuAction.Abort">
+                          <object class="GtkMenuItem" id="menuAction.Resign">
                             <property name="visible">True</property>
-                            <property name="label" translatable="yes">Abort</property>
+                            <property name="label" translatable="yes">Resign</property>
                             <property name="use_underline">True</property>
-                            <signal name="activate" handler="AbortProc"/>
+                            <signal name="activate" handler="ResignProc"/>
                           </object>
                         </child>
                         <child>
@@ -433,6 +433,35 @@
                             <property name="use_underline">True</property>
                           </object>
                         </child>
+                        <child>
+                          <object class="GtkSeparatorMenuItem" id="menuActionsep3">
+                            <property name="visible">True</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkMenuItem" id="menuAction.Adjucate to White">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">Adjucate to White</property>
+                            <property name="use_underline">True</property>
+                            <signal name="activate" handler="AdjuWhiteProc"/>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkMenuItem" id="menuAction.Adjucate to Black">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">Adjucate to Black</property>
+                            <property name="use_underline">True</property>
+                            <signal name="activate" handler="AdjuBlackProc"/>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkMenuItem" id="menuAction.Adjucate Draw">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">Adjucate Draw</property>
+                            <property name="use_underline">True</property>
+                            <signal name="activate" handler="AdjuDrawProc"/>
+                          </object>
+                        </child>
                       </object>
                     </child>
                   </object>

diff --git a/xboard.c b/xboard.c
index c0c505c..6f6a37c 100644 (file)
--- a/xboard.c
+++ b/xboard.c
@@ -327,14 +327,7 @@ void EditCommentProc P((Widget w, XEvent *event,
                        String *prms, Cardinal *nprms));
 void IcsInputBoxProc P((Widget w, XEvent *event,
                        String *prms, Cardinal *nprms));
-void AdjuWhiteProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void AdjuBlackProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void AdjuDrawProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
 void EnterKeyProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void StopObservingProc P((Widget w, XEvent *event, String *prms,
-                         Cardinal *nprms));
-void StopExaminingProc 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));
@@ -722,26 +715,6 @@ MenuItem modeMenu[] = {
     {NULL, NULL}
 };
 
-MenuItem actionMenu[] = {
-    //    {N_("Accept"), AcceptProc},
-    //    {N_("Decline"), DeclineProc},
-  //    {N_("Rematch"), RematchProc},
-  //    {"----", NothingProc},
-  //    {N_("Call Flag"), CallFlagProc},
-  //    {N_("Draw"), DrawProc},
-  //    {N_("Adjourn"), AdjournProc},
-  //    {N_("Abort"), AbortProc},
-  //    {N_("Resign"), ResignProc},
-    {"----", NothingProc},
-    {N_("Stop Observing"), StopObservingProc},
-    {N_("Stop Examining"), StopExaminingProc},
-    {"----", NothingProc},
-    {N_("Adjudicate to White"), AdjuWhiteProc},
-    {N_("Adjudicate to Black"), AdjuBlackProc},
-    {N_("Adjudicate Draw"), AdjuDrawProc},
-    {NULL, NULL}
-};
-
 MenuItem stepMenu[] = {
     {N_("Backward"), BackwardProc},
     {N_("Forward"), ForwardProc},
@@ -807,7 +780,6 @@ MenuItem helpMenu[] = {
 Menu menuBar[] = {
     {N_("File"), fileMenu},
     {N_("Mode"), modeMenu},
-    {N_("Action"), actionMenu},
     {N_("Step"), stepMenu},
     {N_("Options"), optionsMenu},
     {N_("Help"), helpMenu},
@@ -1939,12 +1911,12 @@ XtActionsRec boardActions[] = {
     //    { "AdjournProc", AdjournProc },
     //    { "AbortProc", AbortProc },
     //    { "ResignProc", ResignProc },
-    { "AdjuWhiteProc", AdjuWhiteProc },
-    { "AdjuBlackProc", AdjuBlackProc },
-    { "AdjuDrawProc", AdjuDrawProc },
+    //    { "AdjuWhiteProc", AdjuWhiteProc },
+    //    { "AdjuBlackProc", AdjuBlackProc },
+    //    { "AdjuDrawProc", AdjuDrawProc },
     { "EnterKeyProc", EnterKeyProc },
-    { "StopObservingProc", StopObservingProc },
-    { "StopExaminingProc", StopExaminingProc },
+    //    { "StopObservingProc", StopObservingProc },
+    //    { "StopExaminingProc", StopExaminingProc },
     { "BackwardProc", BackwardProc },
     { "ForwardProc", ForwardProc },
     { "ToStartProc", ToStartProc },
@@ -5651,32 +5623,6 @@ void IcsInputBoxProc(w, event, prms, nprms)
     }
 }
 
-void AdjuWhiteProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    UserAdjudicationEvent(+1);
-}
-
-void AdjuBlackProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    UserAdjudicationEvent(-1);
-}
-
-void AdjuDrawProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    UserAdjudicationEvent(0);
-}
 
 void EnterKeyProc(w, event, prms, nprms)
      Widget w;
@@ -5688,24 +5634,6 @@ void EnterKeyProc(w, event, prms, nprms)
       ICSInputSendText();
 }
 
-void StopObservingProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    StopObservingEvent();
-}
-
-void StopExaminingProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    StopExaminingEvent();
-}
-
 
 void ForwardProc(w, event, prms, nprms)
      Widget w;