From ebbd3101235b8a04c34b30eb9a037bb6bae71123 Mon Sep 17 00:00:00 2001 From: H.G. Muller Date: Tue, 17 Apr 2012 15:10:54 +0200 Subject: [PATCH] Shuffle prototypes to correct header, or add them there --- backend.c | 1 - backend.h | 1 + board.h | 3 +++ dialogs.h | 7 +++++-- frontend.h | 2 ++ menus.h | 7 +++++-- usystem.c | 4 +++- usystem.h | 5 +++-- xboard.c | 5 ++--- xboard.h | 3 --- 10 files changed, 24 insertions(+), 14 deletions(-) diff --git a/backend.c b/backend.c index e110e38..a8e342d 100644 --- a/backend.c +++ b/backend.c @@ -152,7 +152,6 @@ void read_from_player P((InputSourceRef isr, VOIDSTAR closure, char *buf, int count, int error)); void read_from_ics P((InputSourceRef isr, VOIDSTAR closure, char *buf, int count, int error)); -void ics_printf P((char *format, ...)); void SendToICS P((char *s)); void SendToICSDelayed P((char *s, long msdelay)); void SendMoveToICS P((ChessMove moveType, int fromX, int fromY, int toX, int toY, char promoChar)); diff --git a/backend.h b/backend.h index e53bb45..c6c7d41 100644 --- a/backend.h +++ b/backend.h @@ -243,6 +243,7 @@ int PackGame P((Board board)); Boolean ParseFEN P((Board board, int *blackPlaysFirst, char *fen)); void ApplyMove P((int fromX, int fromY, int toX, int toY, int promoChar, Board board)); void PackMove P((int fromX, int fromY, int toX, int toY, ChessSquare promoPiece)); +void ics_printf P((char *format, ...)); char *StrStr P((char *string, char *match)); char *StrCaseStr P((char *string, char *match)); diff --git a/board.h b/board.h index 9fc8f59..c95e54a 100644 --- a/board.h +++ b/board.h @@ -90,6 +90,9 @@ void DrawBlank P((AnimNr anr, int x, int y, int startColor)); void CopyRectangle P((AnimNr anr, int srcBuf, int destBuf, int srcX, int srcY, int width, int height, int destX, int destY)); void SetDragPiece P((AnimNr anr, ChessSquare piece)); void DragPieceMove P((int x, int y)); +void DrawBorder P((int x, int y, int type)); +void FlashDelay P((int flash_delay)); +void SwitchWindow P((void)); extern int damage[2][BOARD_RANKS][BOARD_FILES]; diff --git a/dialogs.h b/dialogs.h index 746ad5a..111e8bd 100644 --- a/dialogs.h +++ b/dialogs.h @@ -135,6 +135,7 @@ int DialogExists P((DialogClass n)); int GenericPopUp P((Option *option, char *title, DialogClass dlgNr, DialogClass parent, int modal, int topLevel)); int GenericReadout P((Option *currentOption, int selected)); int PopDown P((DialogClass n)); +void MarkMenu P((char *item, int dlgNr)); int AppendText P((Option *opt, char *s)); void SetColor P((char *colorName, Option *box)); void ColorChanged P((Widget w, XtPointer data, XEvent *event, Boolean *b)); @@ -162,11 +163,12 @@ void Browse P((DialogClass dlg, char *label, char *proposed, char *ext, Boolean pathFlag, char *mode, char **name, FILE **fp)); void InitDrawingParams P(()); // in xboard.c -void ErrorPopUp P((char *title, char *text, int modal)); int ShiftKeys P((void)); void SetClockIcon P((int color)); void DelayedLoad P((void)); void DisplayTimerLabel P((Option *opt, char *color, long timer, int highlight)); +void SetWindowTitle P((char *text, char *title, char *icon)); +void SetupDropMenu P((void)); Option *BoardPopUp P((int squareSize, int lineGap, void *clockFontThingy)); int SetCurrentComboSelection P((Option *opt)); @@ -175,10 +177,11 @@ void IcsKey P((int n)); void ICSInputBoxPopUp P((void)); void LoadOptionsPopUp P((DialogClass parent)); void GameListOptionsPopUp P((DialogClass parent)); +void RefreshColor P((int source, int n)); +void SendString P((char *p)); // in ngamelist.c int GameListClicks P((int direction)); void SetFilter P((void)); -int SaveGameListAsText P((FILE *f)); diff --git a/frontend.h b/frontend.h index 33496d4..913dd55 100644 --- a/frontend.h +++ b/frontend.h @@ -140,6 +140,7 @@ typedef enum { Press, Release } ClickType; void PromotionPopUp P((void)); void DragPieceBegin P((int x, int y, Boolean instantly)); void DragPieceEnd P((int x, int y)); +void DragPieceMove P((int x, int y)); void LeftClick P((ClickType c, int x, int y)); int RightClick P((ClickType c, int x, int y, int *col, int *row)); @@ -240,6 +241,7 @@ int EngineOutputDialogExists P((void)); void EvalGraphPopUp P((void)); Boolean EvalGraphIsUp P((void)); int EvalGraphDialogExists P((void)); +void SlavePopUp P((void)); /* these are in xhistory.c */ Boolean MoveHistoryIsUp P((void)); diff --git a/menus.h b/menus.h index 47920a7..ddf942e 100644 --- a/menus.h +++ b/menus.h @@ -73,6 +73,7 @@ typedef struct { extern Menu menuBar[]; +void ErrorPopUp P((char *title, char *text, int modal)); void AppendEnginesToMenu P((char *list)); void LoadGameProc P((void)); void LoadNextGameProc P((void)); @@ -154,6 +155,7 @@ void SoundOptionsProc P((void)); void BoardOptionsProc P((void)); void LoadOptionsProc P((void)); void SaveOptionsProc P((void)); +void SaveSettings P((char *)); void EditBookProc P((void)); void InitMenuMarkers P((void)); void ShowGameListProc P((void)); // in ngamelist.c @@ -164,14 +166,15 @@ void ShowGameListProc P((void)); // in ngamelist.c void EngineOutputProc P((void)); void EvalGraphProc P((void)); -void CreateMainMenus P((Menu *mb)); +int SaveGameListAsText P((FILE *f)); + void AppendMenuItem P((char *text, int n)); -void CreateMenuButton P((char *name, Menu *mb)); MenuItem *MenuNameToItem P((char *menuName)); void SetMenuEnables P((Enables *enab)); void EnableButtonBar P((int state)); char *ModeToWidgetName P((GameMode mode)); void CreateAnimVars P((void)); +void CopySomething P((char *s)); extern char *gameCopyFilename, *gamePasteFilename; diff --git a/usystem.c b/usystem.c index a24d04f..d2571df 100644 --- a/usystem.c +++ b/usystem.c @@ -170,6 +170,8 @@ extern char *getenv(); # define N_(s) s #endif +static int get_term_width P(()); + static char *cnames[9] = { "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white" }; TextColors textColors[(int)NColorClasses]; @@ -751,7 +753,7 @@ ResetFrontEnd () } #include -int +static int get_term_width () { int fd, default_width; diff --git a/usystem.h b/usystem.h index 43ba9ee..51fd307 100644 --- a/usystem.h +++ b/usystem.h @@ -83,6 +83,7 @@ typedef struct { extern char *oldICSInteractionTitle; char *ExpandPathName P((char *path)); -int MySearchPath(char *installDir, char *name, char *fullname); -int MyGetFullPathName(char *name, char *fullname); +int MySearchPath P((char *installDir, char *name, char *fullname)); +int MyGetFullPathName P((char *name, char *fullname)); +void PlaySoundForColor P((ColorClass cc)); diff --git a/xboard.c b/xboard.c index 719585c..5877c3a 100644 --- a/xboard.c +++ b/xboard.c @@ -272,9 +272,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 @@ -885,7 +883,8 @@ MainWindowUp () return xBoardWindow != 0; } -void SwitchWindow() +void +SwitchWindow () { extern Option dualOptions[]; static Window dual; diff --git a/xboard.h b/xboard.h index ea285d4..c9a68ce 100644 --- a/xboard.h +++ b/xboard.h @@ -135,9 +135,6 @@ typedef int (*FileProc) P((FILE *f, int n, char *title)); void NewTagsPopup P((char *text, char *msg)); int AppendText P((Option *opt, char *s)); void NewCommentPopup P((char *title, char *text, int index)); -void MarkMenu P((char *item, int dlgNr)); -void GetWidgetText P((Option *opt, char **buf)); -void ClearTextWidget P((Option *opt)); void CatchDeleteWindow(Widget w, String procname); void GenericPopDown P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); void InitDrawingSizes P((int i, int j)); -- 1.7.0.4