X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xboard.c;h=a661d53f51337679c859f8524e92112f539181fc;hb=25a2de7c48d693f8dd3ecc8dd9b794b140f2bdaf;hp=cf6beec5b26a647c27c5eceb95980fd3b0c04ed3;hpb=26897ecf6be30b8ccc64285e1e293ab76df38ab9;p=xboard.git diff --git a/xboard.c b/xboard.c index cf6beec..a661d53 100644 --- a/xboard.c +++ b/xboard.c @@ -256,8 +256,6 @@ void DrawPositionProc P((Widget w, XEvent *event, void CommentClick P((Widget w, XEvent * event, String * params, Cardinal * nParams)); void ICSInputBoxPopUp P((void)); -void FileNamePopUp P((char *label, char *def, char *filter, - FileProc proc, char *openMode)); void SelectCommand P((Widget w, XtPointer client_data, XtPointer call_data)); void KeyBindingProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); void QuitWrapper P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); @@ -272,9 +270,7 @@ void DisplayMove P((int moveNumber)); void ICSInitScript P((void)); void SelectMove P((Widget w, XEvent * event, String * params, Cardinal * nParams)); void update_ics_width P(()); -int get_term_width P(()); int CopyMemoProc P(()); -void SetupDropMenu P((void)); /* * XBoard depends on Xt R4 or higher @@ -305,8 +301,6 @@ XFontStruct *coordFontStruct, *countFontStruct; XtAppContext appContext; char *layoutName; -FileProc fileProc; -char *fileOpenMode; char installDir[] = "."; // [HGM] UCI: needed for UCI; probably needs run-time initializtion Position commentX = -1, commentY = -1; @@ -885,7 +879,8 @@ MainWindowUp () return xBoardWindow != 0; } -void SwitchWindow() +void +SwitchWindow () { extern Option dualOptions[]; static Window dual; @@ -941,7 +936,7 @@ InitDrawingSizes (BoardSize boardSize, int flags) if(appData.overrideLineGap >= 0) lineGap = appData.overrideLineGap; boardWidth = lineGap + BOARD_WIDTH * (squareSize + lineGap); boardHeight = lineGap + BOARD_HEIGHT * (squareSize + lineGap); -fprintf(debugFP, "BOARD %d x %d\n",boardWidth, boardHeight); + if(boardWidth != oldWidth || boardHeight != oldHeight) { // do resizing stuff only if size actually changed oldWidth = boardWidth; oldHeight = boardHeight; @@ -2282,7 +2277,7 @@ MarkMenuItem (char *menuRef, int state) } void -EnableMenuItem (char *menuRef, int state) +EnableNamedMenuItem (char *menuRef, int state) { MenuItem *item = MenuNameToItem(menuRef); @@ -2300,7 +2295,7 @@ void SetMenuEnables (Enables *enab) { while (enab->name != NULL) { - EnableMenuItem(enab->name, enab->value); + EnableNamedMenuItem(enab->name, enab->value); enab++; } } @@ -2315,14 +2310,6 @@ KeyBindingProc (Widget w, XEvent *event, String *prms, Cardinal *nprms) } static void -MenuBarSelect (Widget w, caddr_t addr, caddr_t index) -{ - MenuProc *proc = (MenuProc *) addr; - - (proc)(); -} - -static void MenuEngineSelect (Widget w, caddr_t addr, caddr_t index) { RecentEngineEvent((int) (intptr_t) addr); @@ -2809,26 +2796,6 @@ CommentPopDown () PopDown(CommentDlg); } -static char *openName; -FILE *openFP; - -void -DelayedLoad () -{ - (void) (*fileProc)(openFP, 0, openName); -} - -void -FileNamePopUp (char *label, char *def, char *filter, FileProc proc, char *openMode) -{ - fileProc = proc; /* I can't see a way not */ - fileOpenMode = openMode; /* to use globals here */ - { // [HGM] use file-selector dialog stolen from Ghostview - // int index; // this is not supported yet - Browse(BoardWindow, label, (def[0] ? def : NULL), filter, False, openMode, &openName, &openFP); - } -} - /* Disable all user input other than deleting the window */ static int frozen = 0; @@ -2894,7 +2861,7 @@ ModeHighlight () MarkMenuItem("Mode.MachineMatch", matchMode && matchGame < appData.matchGames); /* Maybe all the enables should be handled here, not just this one */ - EnableMenuItem("Mode.Training", gameMode == Training || gameMode == PlayFromGameFile); + EnableNamedMenuItem("Mode.Training", gameMode == Training || gameMode == PlayFromGameFile); } @@ -3154,6 +3121,12 @@ ManInner (Widget w, XEvent *event, String *prms, Cardinal *nprms) } void +ManProc () +{ // called from menu + ManInner(NULL, NULL, NULL, NULL); +} + +void SetWindowTitle (char *text, char *title, char *icon) { Arg args[16];