moved some more items from the options menu into gtk

diff --git a/callback.c b/callback.c
index d961305..0f6ce91 100644 (file)
--- a/callback.c
+++ b/callback.c
@@ -717,6 +717,54 @@ PeriodicUpdatesProc(object, user_data)
   return;
 }
 
+void 
+PremoveProc(object, user_data)
+     GtkObject *object;
+     gpointer user_data;
+{
+  appData.premove = !appData.premove;
+  return;
+}
+
+void 
+QuietPlayProc(object, user_data)
+     GtkObject *object;
+     gpointer user_data;
+{
+  appData.quietPlay = !appData.quietPlay;
+  return;
+}
+
+
+void 
+PonderNextMoveProc(object, user_data)
+     GtkObject *object;
+     gpointer user_data;
+{
+  PonderNextMoveEvent(!appData.ponderNextMove);
+  return;
+}
+
+void 
+PopupExitMessageProc(object, user_data)
+     GtkObject *object;
+     gpointer user_data;
+{
+  appData.popupExitMessage = !appData.popupExitMessage;
+  return;
+}
+
+void 
+PopupMoveErrorsProc(object, user_data)
+     GtkObject *object;
+     gpointer user_data;
+{
+  appData.popupMoveErrors = !appData.popupMoveErrors;
+  return;
+}
+
+
+
 /* end option menu */
 
 gboolean CloseWindowProc(GtkWidget *button)

diff --git a/callback.h b/callback.h
index 6f67e26..eb795bb 100644 (file)
--- a/callback.h
+++ b/callback.h
@@ -66,6 +66,11 @@ void IcsAlarmProc P((GtkObject *object, gpointer user_data));
 void MoveSoundProc P((GtkObject *object, gpointer user_data));
 void OldSaveStyleProc P((GtkObject *object, gpointer user_data));
 void PeriodicUpdatesProc P((GtkObject *object, gpointer user_data));
+void PremoveProc P((GtkObject *object, gpointer user_data));
+void QuietPlayProc P((GtkObject *object, gpointer user_data));
+void PonderNextMoveProc P((GtkObject *object, gpointer user_data));
+void PopupExitMessageProc P((GtkObject *object, gpointer user_data));
+void PopupMoveErrorsProc P((GtkObject *object, gpointer user_data));
 
 /* Help Menu */
 

diff --git a/xboard.c b/xboard.c
index 27fbf15..c70f96a 100644 (file)
--- a/xboard.c
+++ b/xboard.c
@@ -260,8 +260,6 @@ static void PieceMenuSelect P((Widget w, ChessSquare piece, caddr_t junk));
 static void DropMenuSelect P((Widget w, ChessSquare piece, caddr_t junk));
 int EventToSquare P((int x, int limit));
 void DrawSquare P((int row, int column, ChessSquare piece, int do_flash));
-void HandleUserMove P((Widget w, XEvent *event,
-                    String *prms, Cardinal *nprms));
 void AnimateUserMove P((Widget w, XEvent * event,
                     String * params, Cardinal * nParams));
 void CommentPopUp P((char *title, char *label));
@@ -302,14 +300,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 PonderNextMoveProc P((Widget w, XEvent *event, String *prms,
-                          Cardinal *nprms));
-void PopupMoveErrorsProc P((Widget w, XEvent *event, String *prms,
-                       Cardinal *nprms));
-void PopupExitMessageProc P((Widget w, XEvent *event, String *prms,
-                            Cardinal *nprms));
-void PremoveProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void QuietPlayProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
 void AboutGameProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
 void DebugProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
 void NothingProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
@@ -668,11 +658,11 @@ MenuItem optionsMenu[] = {
     //    {N_("ICS Alarm"), IcsAlarmProc},
     //    {N_("Old Save Style"), OldSaveStyleProc},
     //    {N_("Periodic Updates"), PeriodicUpdatesProc},
-    {N_("Ponder Next Move"), PonderNextMoveProc},
-    {N_("Popup Exit Message"), PopupExitMessageProc},
-    {N_("Popup Move Errors"), PopupMoveErrorsProc},
-    {N_("Premove"), PremoveProc},
-    {N_("Quiet Play"), QuietPlayProc},
+    //    {N_("Ponder Next Move"), PonderNextMoveProc},
+    //    {N_("Popup Exit Message"), PopupExitMessageProc},
+    //    {N_("Popup Move Errors"), PopupMoveErrorsProc},
+    //    {N_("Premove"), PremoveProc},
+    //    {N_("Quiet Play"), QuietPlayProc},
     //    {N_("Hide Thinking"), HideThinkingProc},
     //    {N_("Test Legality"), TestLegalityProc},
     {NULL, NULL}
@@ -1761,7 +1751,7 @@ XrmOptionDescRec shellOptions[] = {
 };
 
 XtActionsRec boardActions[] = {
-    { "HandleUserMove", HandleUserMove },
+    //    { "HandleUserMove", HandleUserMove },
     { "AnimateUserMove", AnimateUserMove },
     //    { "FileNameAction", FileNameAction },
     { "AskQuestionProc", AskQuestionProc },
@@ -1841,11 +1831,11 @@ XtActionsRec boardActions[] = {
     //    { "MoveSoundProc", MoveSoundProc },
     //    { "OldSaveStyleProc", OldSaveStyleProc },
     //    { "PeriodicUpdatesProc", PeriodicUpdatesProc },
-    { "PonderNextMoveProc", PonderNextMoveProc },
-    { "PopupExitMessageProc", PopupExitMessageProc },
-    { "PopupMoveErrorsProc", PopupMoveErrorsProc },
-    { "PremoveProc", PremoveProc },
-    { "QuietPlayProc", QuietPlayProc },
+    //    { "PonderNextMoveProc", PonderNextMoveProc },
+    //    { "PopupExitMessageProc", PopupExitMessageProc },
+    //    { "PopupMoveErrorsProc", PopupMoveErrorsProc },
+    //    { "PremoveProc", PremoveProc },
+    //    { "QuietPlayProc", QuietPlayProc },
     //    { "ShowThinkingProc", ShowThinkingProc },
     //    { "HideThinkingProc", HideThinkingProc },
     { "TestLegalityProc", TestLegalityProc },
@@ -3976,41 +3966,6 @@ void DrawPosition( repaint, board)
   return;
 }
 
-/*
- * event handler for parsing user moves
- */
-// [HGM] This routine will need quite some reworking. Although the backend still supports the old
-//       way of doing things, by calling UserMoveEvent() to test the legality of the move and then perform
-//       it at the end, and doing all kind of preliminary tests here (e.g. to weed out self-captures), it
-//       should be made to use the new way, of calling UserMoveTest early  to determine the legality of the
-//       move, (which will weed out the illegal selfcaptures and moves into the holdings, and flag promotions),
-//       and at the end FinishMove() to perform the move after optional promotion popups.
-//       For now I patched it to allow self-capture with King, and suppress clicks between board and holdings.
-void HandleUserMove(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    if (w != boardWidget || errorExitStatus != -1) return;
-
-    if (promotionUp) {
-       if (event->type == ButtonPress) {
-//         XtPopdown(promotionShell);
-//         XtDestroyWidget(promotionShell);
-           promotionUp = False;
-           ClearHighlights();
-           fromX = fromY = -1;
-       } else {
-           return;
-       }
-    }
-
-    // [HGM] mouse: the rest of the mouse handler is moved to the backend, and called here
-    if(event->type == ButtonPress)   LeftClick(Press,   event->xbutton.x, event->xbutton.y);
-    if(event->type == ButtonRelease) LeftClick(Release, event->xbutton.x, event->xbutton.y);
-}
-
 void AnimateUserMove (Widget w, XEvent * event,
                      String * params, Cardinal * nParams)
 {
@@ -5150,101 +5105,6 @@ void EnterKeyProc(w, event, prms, nprms)
 }
 
 
-void PonderNextMoveProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    Arg args[16];
-
-    PonderNextMoveEvent(!appData.ponderNextMove);
-
-    if (appData.ponderNextMove) {
-       XtSetArg(args[0], XtNleftBitmap, xMarkPixmap);
-    } else {
-       XtSetArg(args[0], XtNleftBitmap, None);
-    }
-    XtSetValues(XtNameToWidget(menuBarWidget, "menuOptions.Ponder Next Move"),
-               args, 1);
-}
-
-void PopupExitMessageProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    Arg args[16];
-
-    appData.popupExitMessage = !appData.popupExitMessage;
-
-    if (appData.popupExitMessage) {
-       XtSetArg(args[0], XtNleftBitmap, xMarkPixmap);
-    } else {
-       XtSetArg(args[0], XtNleftBitmap, None);
-    }
-    XtSetValues(XtNameToWidget(menuBarWidget,
-                              "menuOptions.Popup Exit Message"), args, 1);
-}
-
-void PopupMoveErrorsProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    Arg args[16];
-
-    appData.popupMoveErrors = !appData.popupMoveErrors;
-
-    if (appData.popupMoveErrors) {
-       XtSetArg(args[0], XtNleftBitmap, xMarkPixmap);
-    } else {
-       XtSetArg(args[0], XtNleftBitmap, None);
-    }
-    XtSetValues(XtNameToWidget(menuBarWidget, "menuOptions.Popup Move Errors"),
-               args, 1);
-}
-
-void PremoveProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    Arg args[16];
-
-    appData.premove = !appData.premove;
-
-    if (appData.premove) {
-       XtSetArg(args[0], XtNleftBitmap, xMarkPixmap);
-    } else {
-       XtSetArg(args[0], XtNleftBitmap, None);
-    }
-    XtSetValues(XtNameToWidget(menuBarWidget,
-                              "menuOptions.Premove"), args, 1);
-}
-
-void QuietPlayProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    Arg args[16];
-
-    appData.quietPlay = !appData.quietPlay;
-
-    if (appData.quietPlay) {
-       XtSetArg(args[0], XtNleftBitmap, xMarkPixmap);
-    } else {
-       XtSetArg(args[0], XtNleftBitmap, None);
-    }
-    XtSetValues(XtNameToWidget(menuBarWidget, "menuOptions.Quiet Play"),
-               args, 1);
-}
-
 void DebugProc(w, event, prms, nprms)
      Widget w;
      XEvent *event;