From 4ed78aad91dbd1cd53fe03b752b09d91f54d231e Mon Sep 17 00:00:00 2001 From: Arun Persaud Date: Sat, 29 Aug 2009 11:54:00 -0700 Subject: [PATCH] more callbacks for the help menu --- callback.c | 53 ++++++++++++++++++++++++++++++++ callback.h | 13 +++++++- gtk-interface.xml | 19 ++++++++++++ xboard.c | 86 ++++------------------------------------------------ 4 files changed, 91 insertions(+), 80 deletions(-) diff --git a/callback.c b/callback.c index ca9f23e..4bc9210 100644 --- a/callback.c +++ b/callback.c @@ -1,5 +1,6 @@ #include #include "common.h" +#include "xboard.h" #include #include "backend.h" @@ -32,6 +33,44 @@ QuitProc (object, user_data) ExitEvent(0); } +/* Help Menu */ +void InfoProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + char buf[MSG_SIZ]; + snprintf(buf, sizeof(buf), "xterm -e info --directory %s --directory . -f %s &", + INFODIR, INFOFILE); + system(buf); + return; +} + +void ManProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + char buf[MSG_SIZ]; + snprintf(buf, sizeof(buf), "xterm -e man xboard &"); + system(buf); + return; +} + +void HintProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + HintEvent(); + return; +} + +void BookProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + BookEvent(); + return; +} + void AboutProc (object, user_data) GtkObject *object; gpointer user_data; @@ -79,6 +118,8 @@ void AboutProc (object, user_data) gtk_widget_destroy(about); } +/* End Help Menu */ + void IcsClientProc(object, user_data) GtkObject *object; gpointer user_data; @@ -303,6 +344,18 @@ void RetractMoveProc(object, user_data) return; } +/* Option Menu */ +void FlipViewProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + printf("DEBUG: in flip view\n"); + flipView = !flipView; + DrawPosition(True, NULL); + return; +} + + gboolean CloseWindowProc(GtkWidget *button) { gtk_widget_destroy(gtk_widget_get_toplevel(button)); diff --git a/callback.h b/callback.h index b790926..16d5c36 100644 --- a/callback.h +++ b/callback.h @@ -30,7 +30,18 @@ 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)); +/* Option Menu */ +void FlipViewProc P((GtkObject *object, gpointer user_data)); + +/* Help Menu */ + +void InfoProc P((GtkObject *object, gpointer user_data)); +void ManProc P((GtkObject *object, gpointer user_data)); +void HintProc P((GtkObject *object, gpointer user_data)); +void BookProc P((GtkObject *object, gpointer user_data)); +void AboutProc P((GtkObject *object, gpointer user_data)); + + void ShowCoordsProc P((GtkObject *object, gpointer user_data)); void ErrorPopDownProc P((GtkObject *object, gpointer user_data)); void PauseProc P((GtkObject *object, gpointer user_data)); diff --git a/gtk-interface.xml b/gtk-interface.xml index 6aa80bf..d7d22f6 100644 --- a/gtk-interface.xml +++ b/gtk-interface.xml @@ -638,6 +638,7 @@ True Flip View True + @@ -752,10 +753,27 @@ True + + True + Man XBoard + True + + + + + + True + Info XBoard + True + + + + True Hint True + @@ -763,6 +781,7 @@ True Book True + diff --git a/xboard.c b/xboard.c index a62292f..d6821c3 100644 --- a/xboard.c +++ b/xboard.c @@ -343,7 +343,6 @@ void AutosaveProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); void BlindfoldProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); void FlashMovesProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); -void FlipViewProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); void GetMoveListProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); void HighlightDraggingProc P((Widget w, XEvent *event, String *prms, @@ -370,10 +369,6 @@ void HideThinkingProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); void TestLegalityProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); -void InfoProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); -void ManProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); -void HintProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); -void BookProc 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)); @@ -705,8 +700,8 @@ MenuItem modeMenu[] = { }; MenuItem optionsMenu[] = { - {N_("Flip View"), FlipViewProc}, - {"----", NothingProc}, + // {N_("Flip View"), FlipViewProc}, + // {"----", NothingProc}, {N_("Adjudications ..."), EngineMenuProc}, {N_("General Settings ..."), UciMenuProc}, {N_("Engine #1 Settings ..."), FirstSettingsProc}, @@ -743,21 +738,10 @@ MenuItem optionsMenu[] = { {NULL, NULL} }; -MenuItem helpMenu[] = { - {N_("Info XBoard"), InfoProc}, - {N_("Man XBoard"), ManProc}, - {"----", NothingProc}, - {N_("Hint"), HintProc}, - {N_("Book"), BookProc}, - {"----", NothingProc}, - {NULL, NULL} -}; - Menu menuBar[] = { {N_("File"), fileMenu}, {N_("Mode"), modeMenu}, {N_("Options"), optionsMenu}, - {N_("Help"), helpMenu}, {NULL, NULL} }; @@ -1882,7 +1866,7 @@ XtActionsRec boardActions[] = { { "AutosaveProc", AutosaveProc }, { "BlindfoldProc", BlindfoldProc }, { "FlashMovesProc", FlashMovesProc }, - { "FlipViewProc", FlipViewProc }, + // { "FlipViewProc", FlipViewProc }, { "GetMoveListProc", GetMoveListProc }, #if HIGHDRAG { "HighlightDraggingProc", HighlightDraggingProc }, @@ -1900,10 +1884,10 @@ XtActionsRec boardActions[] = { { "ShowThinkingProc", ShowThinkingProc }, { "HideThinkingProc", HideThinkingProc }, { "TestLegalityProc", TestLegalityProc }, - { "InfoProc", InfoProc }, - { "ManProc", ManProc }, - { "HintProc", HintProc }, - { "BookProc", BookProc }, + // { "InfoProc", InfoProc }, + // { "ManProc", ManProc }, + // { "HintProc", HintProc }, + // { "BookProc", BookProc }, { "AboutGameProc", AboutGameProc }, { "DebugProc", DebugProc }, { "NothingProc", NothingProc }, @@ -5815,16 +5799,6 @@ void FlashMovesProc(w, event, prms, nprms) args, 1); } -void FlipViewProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - flipView = !flipView; - DrawPosition(True, NULL); -} - void GetMoveListProc(w, event, prms, nprms) Widget w; XEvent *event; @@ -6099,52 +6073,6 @@ void HideThinkingProc(w, event, prms, nprms) args, 1); } -void InfoProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - char buf[MSG_SIZ]; - snprintf(buf, sizeof(buf), "xterm -e info --directory %s --directory . -f %s &", - INFODIR, INFOFILE); - system(buf); -} - -void ManProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - char buf[MSG_SIZ]; - String name; - if (nprms && *nprms > 0) - name = prms[0]; - else - name = "xboard"; - snprintf(buf, sizeof(buf), "xterm -e man %s &", name); - system(buf); -} - -void HintProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - HintEvent(); -} - -void BookProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - BookEvent(); -} - void DebugProc(w, event, prms, nprms) Widget w; XEvent *event; -- 1.7.0.4