X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xboard.c;h=6058ec1d7c8e904143cb421e3543496118a0cd4c;hb=4213fe0ecdc947c528a7c6f23f9c56fca7e1eea4;hp=4793a1d4272e74df35efb32ac7288a260860d00c;hpb=8397d76a8208a09ba3722754c04a2fddaf04713a;p=xboard.git diff --git a/xboard.c b/xboard.c index 4793a1d..6058ec1 100644 --- a/xboard.c +++ b/xboard.c @@ -251,7 +251,6 @@ void CreateXPMPieces P((void)); void CreatePieces P((void)); void CreatePieceMenus P((void)); Widget CreateMenuBar P((Menu *mb)); -Widget CreateButtonBar P ((MenuItem *mi)); char *FindFont P((char *pattern, int targetPxlSize)); void PieceMenuPopup P((Widget w, XEvent *event, String *params, Cardinal *num_params)); @@ -295,12 +294,6 @@ void EditCommentCallback P((Widget w, XtPointer client_data, void SelectCommand P((Widget w, XtPointer client_data, XtPointer call_data)); void LoadPositionProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); -void LoadNextPositionProc P((Widget w, XEvent *event, String *prms, - Cardinal *nprms)); -void LoadPrevPositionProc P((Widget w, XEvent *event, String *prms, - Cardinal *nprms)); -void ReloadPositionProc P((Widget w, XEvent *event, String *prms, - Cardinal *nprms)); void CopyPositionProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); void PastePositionProc P((Widget w, XEvent *event, String *prms, @@ -420,7 +413,7 @@ Pixmap iconPixmap, wIconPixmap, bIconPixmap, xMarkPixmap; Widget shellWidget, layoutWidget, formWidget, boardWidget, messageWidget, whiteTimerWidget, blackTimerWidget, titleWidget, widgetList[16], commentShell, promotionShell, whitePieceMenu, blackPieceMenu, dropMenu, - menuBarWidget, buttonBarWidget, editShell, errorShell, analysisShell, + menuBarWidget, editShell, errorShell, analysisShell, ICSInputShell, fileNameShell, askQuestionShell; Font clockFontID, coordFontID, countFontID; XFontStruct *clockFontStruct, *coordFontStruct, *countFontStruct; @@ -657,9 +650,9 @@ MenuItem fileMenu[] = { {N_("Paste Game"), PasteGameProc}, {"----", NothingProc}, {N_("Load Position"), LoadPositionProc}, - {N_("Load Next Position"), LoadNextPositionProc}, - {N_("Load Previous Position"), LoadPrevPositionProc}, - {N_("Reload Same Position"), ReloadPositionProc}, + // {N_("Load Next Position"), LoadNextPositionProc}, + // {N_("Load Previous Position"), LoadPrevPositionProc}, + // {N_("Reload Same Position"), ReloadPositionProc}, {N_("Save Position"), SavePositionProc}, {"----", NothingProc}, {N_("Copy Position"), CopyPositionProc}, @@ -739,16 +732,6 @@ Menu menuBar[] = { {NULL, NULL} }; -#define PAUSE_BUTTON N_("P") -MenuItem buttonBar[] = { - // {"<<", ToStartProc}, - // {"<", BackwardProc}, - // {PAUSE_BUTTON, PauseProc}, - // {">", ForwardProc}, - // {">>", ToEndProc}, - {NULL, NULL} -}; - #define PIECE_MENU_SIZE 18 String pieceMenuStrings[2][PIECE_MENU_SIZE] = { { N_("White"), "----", N_("Pawn"), N_("Knight"), N_("Bishop"), N_("Rook"), @@ -1813,9 +1796,9 @@ XtActionsRec boardActions[] = { { "Iconify", Iconify }, { "LoadSelectedProc", LoadSelectedProc }, { "LoadPositionProc", LoadPositionProc }, - { "LoadNextPositionProc", LoadNextPositionProc }, - { "LoadPrevPositionProc", LoadPrevPositionProc }, - { "ReloadPositionProc", ReloadPositionProc }, + // { "LoadNextPositionProc", LoadNextPositionProc }, + // { "LoadPrevPositionProc", LoadPrevPositionProc }, + // { "ReloadPositionProc", ReloadPositionProc }, { "CopyPositionProc", CopyPositionProc }, { "PastePositionProc", PastePositionProc }, { "CopyGameProc", CopyGameProc }, @@ -3013,6 +2996,8 @@ char *FindFont(pattern, targetPxlSize) void CreateGCs() { + /* GCs are not needed anymore for GTK just left them in here for the moment, since there is a lot of X-code still around that's wants them*/ + XtGCMask value_mask = GCLineWidth | GCLineStyle | GCForeground | GCBackground | GCFunction | GCPlaneMask; XGCValues gc_values; @@ -3215,39 +3200,6 @@ Widget CreateMenuBar(mb) return menuBar; } -Widget CreateButtonBar(mi) - MenuItem *mi; -{ - int j; - Widget button, buttonBar; - Arg args[16]; - - j = 0; - XtSetArg(args[j], XtNorientation, XtorientHorizontal); j++; - if (tinyLayout) { - XtSetArg(args[j], XtNhSpace, 0); j++; - } - XtSetArg(args[j], XtNborderWidth, 0); j++; - XtSetArg(args[j], XtNvSpace, 0); j++; - buttonBar = XtCreateWidget("buttonBar", boxWidgetClass, - formWidget, args, j); - - while (mi->string != NULL) { - j = 0; - if (tinyLayout) { - XtSetArg(args[j], XtNinternalWidth, 2); j++; - XtSetArg(args[j], XtNborderWidth, 0); j++; - } - XtSetArg(args[j], XtNlabel, XtNewString(_(mi->string))); j++; - button = XtCreateManagedWidget(mi->string, commandWidgetClass, - buttonBar, args, j); - XtAddCallback(button, XtNcallback, - (XtCallbackProc) MenuBarSelect, - (caddr_t) mi->proc); - mi++; - } - return buttonBar; -} Widget CreatePieceMenu(name, color) @@ -5216,34 +5168,6 @@ int LoadGamePopUp(f, gameNumber, title) return LoadGame(f, gameNumber, title, FALSE); } - -void LoadNextPositionProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - ReloadPosition(1); -} - -void LoadPrevPositionProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - ReloadPosition(-1); -} - -void ReloadPositionProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - ReloadPosition(0); -} - void LoadPositionProc(w, event, prms, nprms) Widget w; XEvent *event;