From 3990747f9bf2f88dba5071eecadac28474edd293 Mon Sep 17 00:00:00 2001 From: Arun Persaud Date: Tue, 13 Oct 2009 23:21:27 -0700 Subject: [PATCH] moved a lot of function from the option menu to gtk --- callback.c | 181 ++++++++++++++++++++++++- callback.h | 16 +++ gtk-interface.xml | 14 ++ xboard.c | 385 +++++------------------------------------------------ 4 files changed, 237 insertions(+), 359 deletions(-) diff --git a/callback.c b/callback.c index 652db01..dcf4779 100644 --- a/callback.c +++ b/callback.c @@ -496,7 +496,8 @@ void RetractMoveProc(object, user_data) } /* Option Menu */ -void AutocommProc(object, user_data) +void +AutocommProc(object, user_data) GtkObject *object; gpointer user_data; { @@ -504,7 +505,8 @@ void AutocommProc(object, user_data) return; } -void AutoflagProc(object, user_data) +void +AutoflagProc(object, user_data) GtkObject *object; gpointer user_data; { @@ -512,7 +514,8 @@ void AutoflagProc(object, user_data) return; } -void AutoflipProc(object, user_data) +void +AutoflipProc(object, user_data) GtkObject *object; gpointer user_data; { @@ -520,7 +523,8 @@ void AutoflipProc(object, user_data) return; } -void ShowThinkingProc(object, user_data) +void +ShowThinkingProc(object, user_data) GtkObject *object; gpointer user_data; { @@ -530,7 +534,8 @@ void ShowThinkingProc(object, user_data) return; } -void HideThinkingProc(object, user_data) +void +HideThinkingProc(object, user_data) GtkObject *object; gpointer user_data; { @@ -540,7 +545,8 @@ void HideThinkingProc(object, user_data) return; } -void FlipViewProc(object, user_data) +void +FlipViewProc(object, user_data) GtkObject *object; gpointer user_data; { @@ -549,6 +555,169 @@ void FlipViewProc(object, user_data) return; } +void +AlwaysQueenProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + appData.alwaysPromoteToQueen = !appData.alwaysPromoteToQueen; + return; +} + +void +AnimateDraggingProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + appData.animateDragging = !appData.animateDragging; + + if (appData.animateDragging) + { + // TODO convert to gtk + // CreateAnimVars(); + }; + + return; +} + +void +AnimateMovingProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + appData.animate = !appData.animate; + + if (appData.animate) + { + // TODO convert to gtk + // CreateAnimVars(); + }; + + return; +} + +void +AutobsProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + appData.autoObserve = !appData.autoObserve; + return; +} + +void +AutoraiseProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + appData.autoRaiseBoard = !appData.autoRaiseBoard; + return; +} + +void +AutosaveProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + appData.autoSaveGames = !appData.autoSaveGames; + return; +} + +void +BlindfoldProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + appData.blindfold = !appData.blindfold; + DrawPosition(True, NULL); + return; +} + +void +TestLegalityProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + appData.testLegality = !appData.testLegality; + return; +} + +void +FlashMovesProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + if (appData.flashCount == 0) + { + appData.flashCount = 3; + } + else + { + appData.flashCount = -appData.flashCount; + }; + + // TODO: check if this is working correct*/ + return; +} + +#if HIGHDRAG +void +HighlightDraggingProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + /* TODO: connect to option menu */ + appData.highlightDragging = !appData.highlightDragging; + return; +} +#endif + +void +HighlightLastMoveProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + appData.highlightLastMove = !appData.highlightLastMove; + return; +} + +void +IcsAlarmProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + appData.icsAlarm = !appData.icsAlarm; + return; +} + +void +MoveSoundProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + appData.ringBellAfterMoves = !appData.ringBellAfterMoves; + return; +} + +void +OldSaveStyleProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + appData.oldSaveStyle = !appData.oldSaveStyle; + return; +} + +void +PeriodicUpdatesProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + PeriodicUpdatesEvent(!appData.periodicUpdates); + return; +} + +/* end option menu */ gboolean CloseWindowProc(GtkWidget *button) { diff --git a/callback.h b/callback.h index 4862238..6f67e26 100644 --- a/callback.h +++ b/callback.h @@ -51,6 +51,22 @@ void HideThinkingProc P((GtkObject *object, gpointer user_data)); void FlipViewProc P((GtkObject *object, gpointer user_data)); void GetMoveListProc P((GtkObject *object, gpointer user_data)); +void AlwaysQueenProc P((GtkObject *object, gpointer user_data)); +void AnimateDraggingProc P((GtkObject *object, gpointer user_data)); +void AnimateMovingProc P((GtkObject *object, gpointer user_data)); +void AutobsProc P((GtkObject *object, gpointer user_data)); +void AutoraiseProc P((GtkObject *object, gpointer user_data)); +void AutosaveProc P((GtkObject *object, gpointer user_data)); +void BlindfoldProc P((GtkObject *object, gpointer user_data)); +void TestLegalityProc P((GtkObject *object, gpointer user_data)); +void FlashMovesProc P((GtkObject *object, gpointer user_data)); +void HighlightDraggingProc P((GtkObject *object, gpointer user_data)); +void HighlightLastMoveProc P((GtkObject *object, gpointer user_data)); +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)); + /* Help Menu */ void InfoProc P((GtkObject *object, gpointer user_data)); diff --git a/gtk-interface.xml b/gtk-interface.xml index 3e1a345..45d509d 100644 --- a/gtk-interface.xml +++ b/gtk-interface.xml @@ -674,6 +674,7 @@ True Always Queen True + @@ -681,6 +682,7 @@ True Animate Dragging True + @@ -688,6 +690,7 @@ True Animate Moving True + @@ -716,6 +719,7 @@ True Auto Observe True + @@ -723,6 +727,7 @@ True Auto Raise Board True + @@ -730,6 +735,7 @@ True Auto Save True + @@ -737,6 +743,7 @@ True Blindfold True + @@ -744,6 +751,7 @@ True Flash Moves True + @@ -767,6 +775,7 @@ True Highlight Last Move True + @@ -774,6 +783,7 @@ True Move Sound True + @@ -781,6 +791,7 @@ True ICS Alarm True + @@ -788,6 +799,7 @@ True Old Save Style True + @@ -795,6 +807,7 @@ True Periodic Updates True + @@ -853,6 +866,7 @@ True Test Legality True + diff --git a/xboard.c b/xboard.c index 77e58ae..7893a4f 100644 --- a/xboard.c +++ b/xboard.c @@ -302,29 +302,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 AlwaysQueenProc P((Widget w, XEvent *event, String *prms, - Cardinal *nprms)); -void AnimateDraggingProc P((Widget w, XEvent *event, String *prms, - Cardinal *nprms)); -void AnimateMovingProc P((Widget w, XEvent *event, String *prms, - Cardinal *nprms)); -void AutobsProc P((Widget w, XEvent *event, String *prms, - Cardinal *nprms)); -void AutoraiseProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); -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 HighlightDraggingProc P((Widget w, XEvent *event, String *prms, - Cardinal *nprms)); -void HighlightLastMoveProc P((Widget w, XEvent *event, String *prms, - Cardinal *nprms)); -void MoveSoundProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); -void IcsAlarmProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); -void OldSaveStyleProc P((Widget w, XEvent *event, String *prms, - Cardinal *nprms)); -void PeriodicUpdatesProc 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, @@ -333,8 +310,6 @@ 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 TestLegalityProc 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)); @@ -675,33 +650,33 @@ MenuItem optionsMenu[] = { {N_("Engine #2 Settings ..."), SecondSettingsProc}, {N_("Time Control ..."), TimeControlProc}, {"----", NothingProc}, - {N_("Always Queen"), AlwaysQueenProc}, - {N_("Animate Dragging"), AnimateDraggingProc}, - {N_("Animate Moving"), AnimateMovingProc}, + // {N_("Always Queen"), AlwaysQueenProc}, + // {N_("Animate Dragging"), AnimateDraggingProc}, + // {N_("Animate Moving"), AnimateMovingProc}, // {N_("Auto Comment"), AutocommProc}, // {N_("Auto Flag"), AutoflagProc}, // {N_("Auto Flip View"), AutoflipProc}, - {N_("Auto Observe"), AutobsProc}, - {N_("Auto Raise Board"), AutoraiseProc}, - {N_("Auto Save"), AutosaveProc}, - {N_("Blindfold"), BlindfoldProc}, - {N_("Flash Moves"), FlashMovesProc}, + // {N_("Auto Observe"), AutobsProc}, + // {N_("Auto Raise Board"), AutoraiseProc}, + // {N_("Auto Save"), AutosaveProc}, + // {N_("Blindfold"), BlindfoldProc}, + // {N_("Flash Moves"), FlashMovesProc}, // {N_("Get Move List"), GetMoveListProc}, -#if HIGHDRAG - {N_("Highlight Dragging"), HighlightDraggingProc}, -#endif - {N_("Highlight Last Move"), HighlightLastMoveProc}, - {N_("Move Sound"), MoveSoundProc}, - {N_("ICS Alarm"), IcsAlarmProc}, - {N_("Old Save Style"), OldSaveStyleProc}, - {N_("Periodic Updates"), PeriodicUpdatesProc}, + //#if HIGHDRAG + // {N_("Highlight Dragging"), HighlightDraggingProc}, + //#endif + // {N_("Highlight Last Move"), HighlightLastMoveProc}, + // {N_("Move Sound"), MoveSoundProc}, + // {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_("Hide Thinking"), HideThinkingProc}, - {N_("Test Legality"), TestLegalityProc}, + // {N_("Test Legality"), TestLegalityProc}, {NULL, NULL} }; @@ -1805,7 +1780,7 @@ XtActionsRec boardActions[] = { // { "ShowMoveListProc", HistoryShowProc}, { "EditTagsProc", EditCommentProc }, { "EditCommentProc", EditCommentProc }, - { "IcsAlarmProc", IcsAlarmProc }, + // { "IcsAlarmProc", IcsAlarmProc }, { "IcsInputBoxProc", IcsInputBoxProc }, // { "AcceptProc", AcceptProc }, // { "DeclineProc", DeclineProc }, @@ -1829,26 +1804,26 @@ XtActionsRec boardActions[] = { // { "TruncateGameProc", TruncateGameProc }, // { "MoveNowProc", MoveNowProc }, // { "RetractMoveProc", RetractMoveProc }, - { "AlwaysQueenProc", AlwaysQueenProc }, - { "AnimateDraggingProc", AnimateDraggingProc }, - { "AnimateMovingProc", AnimateMovingProc }, + // { "AlwaysQueenProc", AlwaysQueenProc }, + // { "AnimateDraggingProc", AnimateDraggingProc }, + // { "AnimateMovingProc", AnimateMovingProc }, // { "AutoflagProc", AutoflagProc }, // { "AutoflipProc", AutoflipProc }, - { "AutobsProc", AutobsProc }, - { "AutoraiseProc", AutoraiseProc }, - { "AutosaveProc", AutosaveProc }, - { "BlindfoldProc", BlindfoldProc }, - { "FlashMovesProc", FlashMovesProc }, + // { "AutobsProc", AutobsProc }, + // { "AutoraiseProc", AutoraiseProc }, + // { "AutosaveProc", AutosaveProc }, + // { "BlindfoldProc", BlindfoldProc }, + // { "FlashMovesProc", FlashMovesProc }, // { "FlipViewProc", FlipViewProc }, // { "GetMoveListProc", GetMoveListProc }, #if HIGHDRAG - { "HighlightDraggingProc", HighlightDraggingProc }, + // { "HighlightDraggingProc", HighlightDraggingProc }, #endif - { "HighlightLastMoveProc", HighlightLastMoveProc }, - { "IcsAlarmProc", IcsAlarmProc }, - { "MoveSoundProc", MoveSoundProc }, - { "OldSaveStyleProc", OldSaveStyleProc }, - { "PeriodicUpdatesProc", PeriodicUpdatesProc }, + // { "HighlightLastMoveProc", HighlightLastMoveProc }, + // { "IcsAlarmProc", IcsAlarmProc }, + // { "MoveSoundProc", MoveSoundProc }, + // { "OldSaveStyleProc", OldSaveStyleProc }, + // { "PeriodicUpdatesProc", PeriodicUpdatesProc }, { "PonderNextMoveProc", PonderNextMoveProc }, { "PopupExitMessageProc", PopupExitMessageProc }, { "PopupMoveErrorsProc", PopupMoveErrorsProc }, @@ -5271,302 +5246,6 @@ void EnterKeyProc(w, event, prms, nprms) ICSInputSendText(); } -void AlwaysQueenProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - Arg args[16]; - - appData.alwaysPromoteToQueen = !appData.alwaysPromoteToQueen; - - if (appData.alwaysPromoteToQueen) { - XtSetArg(args[0], XtNleftBitmap, xMarkPixmap); - } else { - XtSetArg(args[0], XtNleftBitmap, None); - } - XtSetValues(XtNameToWidget(menuBarWidget, "menuOptions.Always Queen"), - args, 1); -} - -void AnimateDraggingProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - Arg args[16]; - - appData.animateDragging = !appData.animateDragging; - - if (appData.animateDragging) { - XtSetArg(args[0], XtNleftBitmap, xMarkPixmap); - CreateAnimVars(); - } else { - XtSetArg(args[0], XtNleftBitmap, None); - } - XtSetValues(XtNameToWidget(menuBarWidget, "menuOptions.Animate Dragging"), - args, 1); -} - -void AnimateMovingProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - Arg args[16]; - - appData.animate = !appData.animate; - - if (appData.animate) { - XtSetArg(args[0], XtNleftBitmap, xMarkPixmap); - CreateAnimVars(); - } else { - XtSetArg(args[0], XtNleftBitmap, None); - } - XtSetValues(XtNameToWidget(menuBarWidget, "menuOptions.Animate Moving"), - args, 1); -} - -void AutobsProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - Arg args[16]; - - appData.autoObserve = !appData.autoObserve; - - if (appData.autoObserve) { - XtSetArg(args[0], XtNleftBitmap, xMarkPixmap); - } else { - XtSetArg(args[0], XtNleftBitmap, None); - } - XtSetValues(XtNameToWidget(menuBarWidget, "menuOptions.Auto Observe"), - args, 1); -} - -void AutoraiseProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - Arg args[16]; - - appData.autoRaiseBoard = !appData.autoRaiseBoard; - - if (appData.autoRaiseBoard) { - XtSetArg(args[0], XtNleftBitmap, xMarkPixmap); - } else { - XtSetArg(args[0], XtNleftBitmap, None); - } - XtSetValues(XtNameToWidget(menuBarWidget, "menuOptions.Auto Raise Board"), - args, 1); -} - -void AutosaveProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - Arg args[16]; - - appData.autoSaveGames = !appData.autoSaveGames; - - if (appData.autoSaveGames) { - XtSetArg(args[0], XtNleftBitmap, xMarkPixmap); - } else { - XtSetArg(args[0], XtNleftBitmap, None); - } - XtSetValues(XtNameToWidget(menuBarWidget, "menuOptions.Auto Save"), - args, 1); -} - -void BlindfoldProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - Arg args[16]; - - appData.blindfold = !appData.blindfold; - - if (appData.blindfold) { - XtSetArg(args[0], XtNleftBitmap, xMarkPixmap); - } else { - XtSetArg(args[0], XtNleftBitmap, None); - } - XtSetValues(XtNameToWidget(menuBarWidget, "menuOptions.Blindfold"), - args, 1); - - DrawPosition(True, NULL); -} - -void TestLegalityProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - Arg args[16]; - - appData.testLegality = !appData.testLegality; - - if (appData.testLegality) { - XtSetArg(args[0], XtNleftBitmap, xMarkPixmap); - } else { - XtSetArg(args[0], XtNleftBitmap, None); - } - XtSetValues(XtNameToWidget(menuBarWidget, "menuOptions.Test Legality"), - args, 1); -} - - -void FlashMovesProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - Arg args[16]; - - if (appData.flashCount == 0) { - appData.flashCount = 3; - } else { - appData.flashCount = -appData.flashCount; - } - - if (appData.flashCount > 0) { - XtSetArg(args[0], XtNleftBitmap, xMarkPixmap); - } else { - XtSetArg(args[0], XtNleftBitmap, None); - } - XtSetValues(XtNameToWidget(menuBarWidget, "menuOptions.Flash Moves"), - args, 1); -} - -#if HIGHDRAG -void HighlightDraggingProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - Arg args[16]; - - appData.highlightDragging = !appData.highlightDragging; - - if (appData.highlightDragging) { - XtSetArg(args[0], XtNleftBitmap, xMarkPixmap); - } else { - XtSetArg(args[0], XtNleftBitmap, None); - } - XtSetValues(XtNameToWidget(menuBarWidget, - "menuOptions.Highlight Dragging"), args, 1); -} -#endif - -void HighlightLastMoveProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - Arg args[16]; - - appData.highlightLastMove = !appData.highlightLastMove; - - if (appData.highlightLastMove) { - XtSetArg(args[0], XtNleftBitmap, xMarkPixmap); - } else { - XtSetArg(args[0], XtNleftBitmap, None); - } - XtSetValues(XtNameToWidget(menuBarWidget, - "menuOptions.Highlight Last Move"), args, 1); -} - -void IcsAlarmProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - Arg args[16]; - - appData.icsAlarm = !appData.icsAlarm; - - if (appData.icsAlarm) { - XtSetArg(args[0], XtNleftBitmap, xMarkPixmap); - } else { - XtSetArg(args[0], XtNleftBitmap, None); - } - XtSetValues(XtNameToWidget(menuBarWidget, - "menuOptions.ICS Alarm"), args, 1); -} - -void MoveSoundProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - Arg args[16]; - - appData.ringBellAfterMoves = !appData.ringBellAfterMoves; - - if (appData.ringBellAfterMoves) { - XtSetArg(args[0], XtNleftBitmap, xMarkPixmap); - } else { - XtSetArg(args[0], XtNleftBitmap, None); - } - XtSetValues(XtNameToWidget(menuBarWidget, "menuOptions.Move Sound"), - args, 1); -} - - -void OldSaveStyleProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - Arg args[16]; - - appData.oldSaveStyle = !appData.oldSaveStyle; - - if (appData.oldSaveStyle) { - XtSetArg(args[0], XtNleftBitmap, xMarkPixmap); - } else { - XtSetArg(args[0], XtNleftBitmap, None); - } - XtSetValues(XtNameToWidget(menuBarWidget, "menuOptions.Old Save Style"), - args, 1); -} - -void PeriodicUpdatesProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - Arg args[16]; - - PeriodicUpdatesEvent(!appData.periodicUpdates); - - if (appData.periodicUpdates) { - XtSetArg(args[0], XtNleftBitmap, xMarkPixmap); - } else { - XtSetArg(args[0], XtNleftBitmap, None); - } - XtSetValues(XtNameToWidget(menuBarWidget, "menuOptions.Periodic Updates"), - args, 1); -} void PonderNextMoveProc(w, event, prms, nprms) Widget w; -- 1.7.0.4