Fix some warnings and header-file improvement

Ther were lot of 'extern' declarations in the x-files, so called
'imports from xboard.c', (sometimes backend.c) which logically belonged
in xboard.h (backend.h) to ensure their uniform definition. These have
now been moved there. Some prototypes have been added in xboard.h as
well, for functions that needed calling from xoptions.c.

diff --git a/backend.h b/backend.h
index 0331f38..fe3faeb 100644 (file)
--- a/backend.h
+++ b/backend.h
@@ -278,6 +278,7 @@ typedef struct _ListGame {
     GameInfo gameInfo;      /*  Note that some entries may be NULL. */
 } ListGame;
  
+extern int opponentKibitzes;
 extern ChessSquare gatingPiece;
 extern List gameList;
 extern int lastLoadGameNumber;

diff --git a/xboard.h b/xboard.h
index 158bada..0263df6 100644 (file)
--- a/xboard.h
+++ b/xboard.h
@@ -117,9 +117,38 @@ typedef struct {
 #define COLOR_BKGD              "white"
 
 typedef int (*FileProc) P((FILE *f, int n, char *title));
+
+int PopDown P((int n));
+int InpuBoxPopUp P((void));
 void CatchDeleteWindow(Widget w, String procname);
+void PlaySound P((char *name));
+void ParseIcsTextColors P((void));
+void InitDrawingSizes P((int i, int j));
+void SendToICS P((char *buf));
+void SendToProgram P((char *message, ChessProgramState *cps));
+FILE * XsraSelFile P((Widget w, char *prompt, char *ok, char *cancel, char *failed,
+               char *init_path, char *filter, char *mode, int (*show_entry)(), char **name_return));
+
 extern Widget shells[];
 extern Boolean shellUp[];
+extern Widget formWidget, shellWidget, boardWidget, menuBarWidget, gameListShell, historyShell;
+extern Display *xDisplay;
+extern Window xBoardWindow;
+extern int squareSize;
+extern Pixmap xMarkPixmap, wIconPixmap, bIconPixmap;
+extern char *layoutName;
+extern Arg layoutArgs[2], formArgs[2], messageArgs[4];
+extern Pixel timerForegroundPixel, timerBackgroundPixel;
+extern int searchTime;
+extern Atom wm_delete_window;
+extern int squareSize, lineGap, defaultLineGap, useImages, useImageSqs;
+extern int shuffleOpenings;
+extern int startedFromPositionFile;
+extern char *icsTextMenuString;
+extern char ICSInputTranslations[];
+extern char *selected_fen_position;
+extern GC coordGC;
+
 
 #define TOPLEVEL 1 /* preference item; 1 = make popup windows toplevel */
 

diff --git a/xedittags.c b/xedittags.c
index 09d2288..27bb722 100644 (file)
--- a/xedittags.c
+++ b/xedittags.c
@@ -91,11 +91,6 @@ extern char *getenv();
 # define N_(s)  s
 #endif
 
-extern Widget formWidget, shellWidget, boardWidget, menuBarWidget;
-extern Display *xDisplay;
-extern int squareSize;
-extern Pixmap xMarkPixmap;
-
 Position tagsX = -1, tagsY = -1;
 
 void TagsPopUp(tags, msg)

diff --git a/xengineoutput.c b/xengineoutput.c
index 980b639..5a85d7d 100644 (file)
--- a/xengineoutput.c
+++ b/xengineoutput.c
@@ -100,14 +100,6 @@ extern char *getenv();
 
 #define _LL_ 100
 
-// imports from xboard.c
-extern Widget formWidget, shellWidget, boardWidget, menuBarWidget;
-extern Display *xDisplay;
-extern Window xBoardWindow;
-extern int squareSize;
-extern Pixmap xMarkPixmap, wIconPixmap, bIconPixmap;
-extern char *layoutName;
-
 Pixmap icons[8]; // [HGM] this front-end array translates back-end icon indicator to handle
 Widget outputField[2][7]; // [HGM] front-end array to translate output field to window handle
 
@@ -116,12 +108,6 @@ void engineOutputPopUp();
 int  EngineOutputIsUp();
 void SetEngineColorIcon( int which );
 
-/* Imports from backend.c */
-extern int opponentKibitzes;
-
-/* Imports from xboard.c */
-extern Arg layoutArgs[2], formArgs[2], messageArgs[4];
-
 //extern WindowPlacement wpEngineOutput;
 
 Position engineOutputX = -1, engineOutputY = -1;
@@ -221,8 +207,6 @@ void DoClearMemo(int which)
 
 // cloned from CopyPositionProc. Abuse selected_fen_position to hold selection
 
-extern char *selected_fen_position;
-
 Boolean SendPositionSelection(Widget w, Atom *selection, Atom *target,
                 Atom *type_return, XtPointer *value_return,
                 unsigned long *length_return, int *format_return); // from xboard.c

diff --git a/xevalgraph.c b/xevalgraph.c
index 47656b0..79e38d6 100644 (file)
--- a/xevalgraph.c
+++ b/xevalgraph.c
@@ -90,23 +90,9 @@ extern char *getenv();
 
 #define _LL_ 100
 
-// imports from xboard.c
-extern Widget formWidget, shellWidget, boardWidget, menuBarWidget;
-extern Display *xDisplay;
-extern Window xBoardWindow;
-extern int squareSize;
-extern Pixmap xMarkPixmap, wIconPixmap, bIconPixmap;
-extern char *layoutName;
-
 Pixmap icons[8]; // [HGM] this front-end array translates back-end icon indicator to handle
 Widget outputField[2][7]; // [HGM] front-end array to translate output field to window handle
 
-/* Imports from backend.c */
-
-/* Imports from xboard.c */
-extern Arg layoutArgs[2], formArgs[2], messageArgs[4];
-extern GC coordGC;
-
 //extern WindowPlacement wpEvalGraph;
 
 Position evalGraphX = -1, evalGraphY = -1;

diff --git a/xgamelist.c b/xgamelist.c
index 41a43ce..4f86718 100644 (file)
--- a/xgamelist.c
+++ b/xgamelist.c
@@ -93,12 +93,6 @@ extern char *getenv();
 
 void SetFocus P((Widget w, XtPointer data, XEvent *event, Boolean *b));
 
-extern Widget formWidget, shellWidget, boardWidget, menuBarWidget, gameListShell;
-extern Display *xDisplay;
-extern int squareSize;
-extern Pixmap xMarkPixmap;
-extern char *layoutName;
-
 static Widget filterText;
 static char filterString[MSG_SIZ];
 static int listLength;
@@ -126,11 +120,6 @@ typedef struct {
 } GameListClosure;
 static GameListClosure *glc = NULL;
 
-static Arg layoutArgs[] = {
-    { XtNborderWidth, 0 },
-    { XtNdefaultDistance, 0 }
-};
-
 Widget
 GameListCreate(name, callback, client_data)
      char *name;

diff --git a/xhistory.c b/xhistory.c
index fc5a88d..c00a9b8 100644 (file)
--- a/xhistory.c
+++ b/xhistory.c
@@ -79,12 +79,6 @@ extern char *getenv();
 
 #define _LL_ 100
 
-extern Widget formWidget, shellWidget, boardWidget, menuBarWidget, historyShell;
-extern Display *xDisplay;
-extern int squareSize;
-extern Pixmap xMarkPixmap;
-extern char *layoutName;
-
 struct History{
   String *Nr,*white,*black;
   int     aNr;  /* space actually alocated */

diff --git a/xoptions.c b/xoptions.c
index b8b1ee8..a5aac22 100644 (file)
--- a/xoptions.c
+++ b/xoptions.c
@@ -80,22 +80,6 @@ extern char *getenv();
 # define N_(s)  s
 #endif
 
-extern void SendToProgram P((char *message, ChessProgramState *cps));
-FILE * XsraSelFile P((Widget w, char *prompt, char *ok, char *cancel, char *failed,
-               char *init_path, char *filter, char *mode, int (*show_entry)(), char **name_return));
-
-extern Widget formWidget, shellWidget, boardWidget, menuBarWidget;
-extern Display *xDisplay;
-extern int squareSize;
-extern Pixmap xMarkPixmap;
-extern char *layoutName;
-extern Window xBoardWindow;
-extern Arg layoutArgs[2], formArgs[2];
-Pixel timerForegroundPixel, timerBackgroundPixel;
-extern int searchTime;
-extern Atom wm_delete_window;
-extern int lineGap;
-
 // [HGM] the following code for makng menu popups was cloned from the FileNamePopUp routines
 
 static Widget previous = NULL;
@@ -119,8 +103,6 @@ void SetFocus(Widget w, XtPointer data, XEvent *event, Boolean *b)
 }
 
 //--------------------------- New Shuffle Game --------------------------------------------
-extern int shuffleOpenings;
-extern int startedFromPositionFile;
 int shuffleUp;
 Widget shuffleShell;
 
@@ -332,7 +314,7 @@ void TimeControlCallback(w, client_data, call_data)
         return;
     }
     if (strcmp(name, _(" OK ")) == 0) {
-       int inc, mps, ok;
+       int inc, mps, ok=0;
        XtSetArg(args[0], XtNstring, &txt);
        XtGetValues(tcData, args, 1);
        switch(tcInc) {
@@ -623,7 +605,6 @@ void TimeControlProc(w, event, prms, nprms)
 int values[MAX_OPTIONS];
 ChessProgramState *currentCps;
 static Option *currentOption;
-extern Widget shells[];
 static Boolean browserUp;
 
 void CheckCallback(Widget ww, XtPointer data, XEvent *event, Boolean *b)
@@ -787,7 +768,6 @@ void GenericPopDown(w, event, prms, nprms)
      String *prms;
      Cardinal *nprms;
 {
-    int n;
     if(browserUp) return; // prevent closing dialog when it has an open file-browse daughter
     PopDown(prms[0][0] - '0');
 }
@@ -1093,7 +1073,7 @@ void SetColor(char *colorName, Widget box)
            } else {
                buttonColor = *(Pixel *) vTo.addr;
            }
-       }
+       } else buttonColor = (Pixel) 0;
        XtSetArg(args[0], XtNbackground, buttonColor);;
        XtSetValues(box, args, 1);
 }
@@ -1150,7 +1130,6 @@ void AdjustColor(int i)
 
 void BoardOptionsOK(int n)
 {
-    extern int defaultLineGap, useImages, useImageSqs;
     if(appData.overrideLineGap >= 0) lineGap = appData.overrideLineGap; else lineGap = defaultLineGap;
     useImages = useImageSqs = 0;
     MakeColors(); CreateGCs(True);
@@ -1210,7 +1189,7 @@ Option boardOptions[] = {
 void GenericReadout(int selected)
 {
     int i, j;
-    String name, val;
+    String val;
     Arg args[16];
     char buf[MSG_SIZ], **dest;
     float x;
@@ -1293,10 +1272,9 @@ void GenericCallback(w, client_data, call_data)
      Widget w;
      XtPointer client_data, call_data;
 {
-    String name, val;
+    String name;
     Arg args[16];
     char buf[MSG_SIZ];
-    int i, j;
     int data = (intptr_t) client_data;
 
     currentOption = dialogOptions[data>>16]; data &= 0xFFFF;
@@ -1326,7 +1304,7 @@ int
 GenericPopUp(Option *option, char *title, int dlgNr)
 {
     Arg args[16];
-    Widget popup, layout, dialog, edit=NULL, form,  last, b_ok, b_cancel, leftMargin = NULL, textField = NULL;
+    Widget popup, layout, dialog=NULL, edit=NULL, form,  last, b_ok, b_cancel, leftMargin = NULL, textField = NULL;
     Window root, child;
     int x, y, i, j, height=999, width=1, h, c, w;
     int win_x, win_y, maxWidth, maxTextWidth;
@@ -1741,10 +1719,9 @@ void MatchOptionsProc(w, event, prms, nprms)
 }
 
 Option textOptions[100];
-extern char *icsTextMenuString;
 void PutText P((char *text, int pos));
 
-SendString(char *p)
+void SendString(char *p)
 {
     char buf[MSG_SIZ], *q;
     if(q = strstr(p, "$input")) {
@@ -1907,7 +1884,6 @@ void NewTagsPopup(char *text, char *msg)
     GenericPopUp(tagsOptions, _("Tags"), 2);
 }
 
-extern char ICSInputTranslations[];
 char *icsText;
 
 Option boxOptions[] = {
@@ -1917,7 +1893,6 @@ Option boxOptions[] = {
 
 void PutText(char *text, int pos)
 {
-    Widget edit;
     Arg args[16];
     char buf[MSG_SIZ], *p;