X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xboard.c;h=a661d53f51337679c859f8524e92112f539181fc;hb=7c9ee0544821f7981792be03e90ba15e9a8aeada;hp=f29eb15f6a9386dcee119f2c4785c80b82021a63;hpb=e70077aab0199817f37aef9ed0bdba1bbca93b45;p=xboard.git

diff --git a/xboard.c b/xboard.c
index f29eb15..a661d53 100644
--- a/xboard.c
+++ b/xboard.c
@@ -203,15 +203,13 @@ extern char *getenv();
 #include "xgamelist.h"
 #include "xhistory.h"
 #include "xedittags.h"
+#include "menus.h"
+#include "board.h"
+#include "dialogs.h"
+#include "engineoutput.h"
+#include "usystem.h"
 #include "gettext.h"
 
-// must be moved to xengineoutput.h
-
-void EngineOutputProc P((Widget w, XEvent *event,
-			 String *prms, Cardinal *nprms));
-void EvalGraphProc P((Widget w, XEvent *event,
-		      String *prms, Cardinal *nprms));
-
 
 #ifdef __EMX__
 #ifndef HAVE_USLEEP
@@ -228,263 +226,51 @@ void EvalGraphProc P((Widget w, XEvent *event,
 # define N_(s)  s
 #endif
 
-typedef struct {
-    String string;
-    String ref;
-    XtActionProc proc;
-} MenuItem;
-
-typedef struct {
-    String name;
-    String ref;
-    MenuItem *mi;
-    int textWidth;
-    Widget subMenu;
-} Menu;
-
 int main P((int argc, char **argv));
-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));
 RETSIGTYPE CmailSigHandler P((int sig));
 RETSIGTYPE IntSigHandler P((int sig));
 RETSIGTYPE TermSizeSigHandler P((int sig));
-void CreateGCs P((int redo));
-void CreateAnyPieces P((void));
+static void CreateGCs P((int redo));
+static void CreateAnyPieces P((void));
 void CreateXIMPieces P((void));
 void CreateXPMPieces P((void));
 void CreateXPMBoard P((char *s, int n));
 void CreatePieces P((void));
-void CreatePieceMenus P((void));
 Widget CreateMenuBar P((Menu *mb, int boardWidth));
-Widget CreateButtonBar P ((MenuItem *mi));
 #if ENABLE_NLS
 char *InsertPxlSize P((char *pattern, int targetPxlSize));
 XFontSet CreateFontSet P((char *base_fnt_lst));
 #else
 char *FindFont P((char *pattern, int targetPxlSize));
 #endif
-void PieceMenuPopup P((Widget w, XEvent *event,
-		       String *params, Cardinal *num_params));
-static void PieceMenuSelect P((Widget w, ChessSquare piece, caddr_t junk));
-static void DropMenuSelect P((Widget w, ChessSquare piece, caddr_t junk));
 void ReadBitmap P((Pixmap *pm, String name, unsigned char bits[],
 		   u_int wreq, u_int hreq));
 void CreateGrid P((void));
-int EventToSquare P((int x, int limit));
-void DrawSquare P((int row, int column, ChessSquare piece, int do_flash));
 void EventProc P((Widget widget, caddr_t unused, XEvent *event));
-void MoveTypeInProc P((Widget widget, caddr_t unused, XEvent *event));
-void HandleUserMove P((Widget w, XEvent *event,
-		     String *prms, Cardinal *nprms));
-void AnimateUserMove P((Widget w, XEvent * event,
-		     String * params, Cardinal * nParams));
+void DelayedDrag P((void));
+static void MoveTypeInProc P((Widget widget, caddr_t unused, XEvent *event));
 void HandlePV P((Widget w, XEvent * event,
 		     String * params, Cardinal * nParams));
-void SelectPV P((Widget w, XEvent * event,
-		     String * params, Cardinal * nParams));
-void StopPV P((Widget w, XEvent * event,
-		     String * params, Cardinal * nParams));
-void WhiteClock P((Widget w, XEvent *event,
-		   String *prms, Cardinal *nprms));
-void BlackClock P((Widget w, XEvent *event,
-		   String *prms, Cardinal *nprms));
 void DrawPositionProc P((Widget w, XEvent *event,
 		     String *prms, Cardinal *nprms));
-void XDrawPosition P((Widget w, /*Boolean*/int repaint,
-		     Board board));
 void CommentClick P((Widget w, XEvent * event,
 		   String * params, Cardinal * nParams));
-void CommentPopUp P((char *title, char *label));
-void CommentPopDown P((void));
 void ICSInputBoxPopUp P((void));
-void ICSInputBoxPopDown P((void));
-void FileNamePopUp P((char *label, char *def, char *filter,
-		      FileProc proc, char *openMode));
-void FileNamePopDown P((void));
-void FileNameCallback P((Widget w, XtPointer client_data,
-			 XtPointer call_data));
-void FileNameAction P((Widget w, XEvent *event,
-		       String *prms, Cardinal *nprms));
-void AskQuestionReplyAction P((Widget w, XEvent *event,
-			  String *prms, Cardinal *nprms));
-void AskQuestionProc P((Widget w, XEvent *event,
-			  String *prms, Cardinal *nprms));
-void AskQuestionPopDown P((void));
-void PromotionPopDown P((void));
-void PromotionCallback P((Widget w, XtPointer client_data,
-			  XtPointer call_data));
 void SelectCommand P((Widget w, XtPointer client_data, XtPointer call_data));
-void ResetProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void LoadGameProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void LoadNextGameProc P((Widget w, XEvent *event, String *prms,
-			 Cardinal *nprms));
-void LoadPrevGameProc P((Widget w, XEvent *event, String *prms,
-			 Cardinal *nprms));
-void ReloadGameProc P((Widget w, XEvent *event, String *prms,
-		       Cardinal *nprms));
-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,
-			  Cardinal *nprms));
-void CopyGameProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void CopyGameListProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void PasteGameProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void SaveGameProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void SavePositionProc P((Widget w, XEvent *event,
-			 String *prms, Cardinal *nprms));
-void MailMoveProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void ReloadCmailMsgProc P((Widget w, XEvent *event, String *prms,
-			    Cardinal *nprms));
-void QuitProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void PauseProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void MachineBlackProc P((Widget w, XEvent *event, String *prms,
-			 Cardinal *nprms));
-void MachineWhiteProc P((Widget w, XEvent *event,
-			 String *prms, Cardinal *nprms));
-void AnalyzeModeProc P((Widget w, XEvent *event,
-			 String *prms, Cardinal *nprms));
-void AnalyzeFileProc P((Widget w, XEvent *event,
-			 String *prms, Cardinal *nprms));
-void TwoMachinesProc P((Widget w, XEvent *event, String *prms,
-			Cardinal *nprms));
-void MatchProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void MatchOptionsProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void IcsClientProc P((Widget w, XEvent *event, String *prms,
-		      Cardinal *nprms));
-void EditGameProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void EditPositionProc P((Widget w, XEvent *event,
-			 String *prms, Cardinal *nprms));
-void TrainingProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void EditCommentProc P((Widget w, XEvent *event,
-			String *prms, Cardinal *nprms));
-void IcsInputBoxProc P((Widget w, XEvent *event,
-			String *prms, Cardinal *nprms));
-void AcceptProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void DeclineProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void RematchProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void CallFlagProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void DrawProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void AbortProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void AdjournProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void ResignProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void AdjuWhiteProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void AdjuBlackProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void AdjuDrawProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void TypeInProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void EnterKeyProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void UpKeyProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void DownKeyProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void StopObservingProc P((Widget w, XEvent *event, String *prms,
-			  Cardinal *nprms));
-void StopExaminingProc P((Widget w, XEvent *event, String *prms,
-			  Cardinal *nprms));
-void UploadProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void BackwardProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void ForwardProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
+void KeyBindingProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
+void QuitWrapper P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
+static void EnterKeyProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
+static void UpKeyProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
+static void DownKeyProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
 void TempBackwardProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
 void TempForwardProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
 Boolean TempBackwardActive = False;
-void ToStartProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void ToEndProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void RevertProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void AnnotateProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void TruncateGameProc P((Widget w, XEvent *event, String *prms,
-			 Cardinal *nprms));
-void RetractMoveProc P((Widget w, XEvent *event, String *prms,
-			Cardinal *nprms));
-void MoveNowProc 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 AutoflagProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void AutoflipProc 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 FlipViewProc 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 HighlightArrowProc 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 OneClickProc 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,
-			Cardinal *nprms));
-void PopupExitMessageProc P((Widget w, XEvent *event, String *prms,
-			     Cardinal *nprms));
-//void PremoveProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void ShowCoordsProc P((Widget w, XEvent *event, String *prms,
-		       Cardinal *nprms));
-void ShowThinkingProc P((Widget w, XEvent *event, String *prms,
-			 Cardinal *nprms));
-void HideThinkingProc P((Widget w, XEvent *event, String *prms,
-			 Cardinal *nprms));
-void TestLegalityProc P((Widget w, XEvent *event, String *prms,
-			  Cardinal *nprms));
-void SaveSettingsProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void SaveOnExitProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void InfoProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void ManProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void HintProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void BookProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void AboutGameProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void AboutProc 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));
+void ManInner P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
 void DisplayMove P((int moveNumber));
-void DisplayTitle P((char *title));
 void ICSInitScript P((void));
-int LoadGamePopUp P((FILE *f, int gameNumber, char *title));
-void ErrorPopUp P((char *title, char *text, int modal));
-void ErrorPopDown P((void));
-static char *ExpandPathName P((char *path));
-static void CreateAnimVars P((void));
-static void DragPieceMove P((int x, int y));
-static void DrawDragPiece P((void));
-char *ModeToWidgetName P((GameMode mode));
-void ShuffleMenuProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void EngineMenuProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void UciMenuProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void TimeControlProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void OptionsProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void NewVariantProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void IcsTextProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void LoadEngineProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void FirstSettingsProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void SecondSettingsProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void GameListOptionsPopUp P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void IcsOptionsProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void SoundOptionsProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void BoardOptionsProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void LoadOptionsProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void SaveOptionsProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
-void EditBookProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
 void SelectMove P((Widget w, XEvent * event, String * params, Cardinal * nParams));
-void GameListOptionsPopDown P(());
-void GenericPopDown P(());
 void update_ics_width P(());
-int get_term_width P(());
 int CopyMemoProc P(());
-void DrawArrowHighlight P((int fromX, int fromY, int toX,int toY));
-Boolean IsDrawArrowEnabled P(());
 
 /*
 * XBoard depends on Xt R4 or higher
@@ -495,22 +281,15 @@ int xScreen;
 Display *xDisplay;
 Window xBoardWindow;
 Pixel lightSquareColor, darkSquareColor, whitePieceColor, blackPieceColor,
-  jailSquareColor, highlightSquareColor, premoveHighlightColor;
+  highlightSquareColor, premoveHighlightColor, dialogColor, buttonColor;
 Pixel lowTimeWarningColor;
-GC lightSquareGC, darkSquareGC, jailSquareGC, lineGC, wdPieceGC, wlPieceGC,
+GC lightSquareGC, darkSquareGC, lineGC, wdPieceGC, wlPieceGC,
   bdPieceGC, blPieceGC, wbPieceGC, bwPieceGC, coordGC, highlineGC,
-  wjPieceGC, bjPieceGC, prelineGC, countGC;
+  prelineGC, countGC;
 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,
-  ICSInputShell, fileNameShell, askQuestionShell;
-Widget historyShell, evalGraphShell, gameListShell;
-int hOffset; // [HGM] dual
-XSegment secondSegments[BOARD_RANKS + BOARD_FILES + 2];
+Widget shellWidget, formWidget, boardWidget, titleWidget, dropMenu, menuBarWidget;
+Option *optList; // contains all widgets of main window
 XSegment gridSegments[BOARD_RANKS + BOARD_FILES + 2];
-XSegment jailGridSegments[BOARD_RANKS + BOARD_FILES + 6];
 #if ENABLE_NLS
 XFontSet fontSet, clockFontSet;
 #else
@@ -521,10 +300,7 @@ Font coordFontID, countFontID;
 XFontStruct *coordFontStruct, *countFontStruct;
 XtAppContext appContext;
 char *layoutName;
-char *oldICSInteractionTitle;
 
-FileProc fileProc;
-char *fileOpenMode;
 char installDir[] = "."; // [HGM] UCI: needed for UCI; probably needs run-time initializtion
 
 Position commentX = -1, commentY = -1;
@@ -534,19 +310,15 @@ BoardSize boardSize;
 Boolean chessProgram;
 
 int  minX, minY; // [HGM] placement: volatile limits on upper-left corner
-int squareSize, smallLayout = 0, tinyLayout = 0,
+int smallLayout = 0, tinyLayout = 0,
   marginW, marginH, // [HGM] for run-time resizing
-  fromX = -1, fromY = -1, toX, toY, commentUp = False, analysisUp = False,
-  ICSInputBoxUp = False, askQuestionUp = False,
-  filenameUp = False, promotionUp = False, pmFromX = -1, pmFromY = -1,
-  errorUp = False, errorExitStatus = -1, lineGap, defaultLineGap;
+  fromX = -1, fromY = -1, toX, toY, commentUp = False,
+  errorExitStatus = -1, defaultLineGap;
+Dimension textHeight;
 Pixel timerForegroundPixel, timerBackgroundPixel;
 Pixel buttonForegroundPixel, buttonBackgroundPixel;
-char *chessDir, *programName, *programVersion,
-  *gameCopyFilename, *gamePasteFilename;
+char *chessDir, *programName, *programVersion;
 Boolean alwaysOnTop = False;
-Boolean saveSettingsOnExit;
-char *settingsFileName;
 char *icsTextMenuString;
 char *icsNames;
 char *firstChessProgramNames;
@@ -561,8 +333,6 @@ WindowPlacement wpEngineOutput;
 WindowPlacement wpGameList;
 WindowPlacement wpTags;
 
-extern Widget shells[];
-extern Boolean shellUp[];
 
 #define SOLID 0
 #define OUTLINE 1
@@ -584,26 +354,6 @@ XImage *xim_Cross;
 
 #define White(piece) ((int)(piece) < (int)BlackPawn)
 
-/* Variables for doing smooth animation. This whole thing
-   would be much easier if the board was double-buffered,
-   but that would require a fairly major rewrite.	*/
-
-typedef struct {
-	Pixmap  saveBuf;
-	Pixmap	newBuf;
-	GC	blitGC, pieceGC, outlineGC;
-	XPoint	startSquare, prevFrame, mouseDelta;
-	int	startColor;
-	int	dragPiece;
-	Boolean	dragActive;
-        int     startBoardX, startBoardY;
-    } AnimState;
-
-/* There can be two pieces being animated at once: a player
-   can begin dragging a piece before the remote opponent has moved. */
-
-static AnimState game, player;
-
 /* Bitmaps for use as masks when drawing XPM pieces.
    Need one for each black and white piece.		*/
 static Pixmap xpmMask[BlackKing + 1];
@@ -615,234 +365,6 @@ static Pixmap xpmMask[BlackKing + 1];
 
 SizeDefaults sizeDefaults[] = SIZE_DEFAULTS;
 
-MenuItem fileMenu[] = {
-    {N_("New Game        Ctrl+N"),        "New Game", ResetProc},
-    {N_("New Shuffle Game ..."),          "New Shuffle Game", ShuffleMenuProc},
-    {N_("New Variant ...   Alt+Shift+V"), "New Variant", NewVariantProc},      // [HGM] variant: not functional yet
-    {"----", NULL, NothingProc},
-    {N_("Load Game       Ctrl+O"),        "Load Game", LoadGameProc},
-    {N_("Load Position    Ctrl+Shift+O"), "Load Position", LoadPositionProc},
-//    {N_("Load Next Game"), "Load Next Game", LoadNextGameProc},
-//    {N_("Load Previous Game"), "Load Previous Game", LoadPrevGameProc},
-//    {N_("Reload Same Game"), "Reload Same Game", ReloadGameProc},
-    {N_("Next Position     Shift+PgDn"), "Load Next Position", LoadNextPositionProc},
-    {N_("Prev Position     Shift+PgUp"), "Load Previous Position", LoadPrevPositionProc},
-    {"----", NULL, NothingProc},
-//    {N_("Reload Same Position"), "Reload Same Position", ReloadPositionProc},
-    {N_("Save Game       Ctrl+S"),        "Save Game", SaveGameProc},
-    {N_("Save Position    Ctrl+Shift+S"), "Save Position", SavePositionProc},
-    {"----", NULL, NothingProc},
-    {N_("Mail Move"),            "Mail Move", MailMoveProc},
-    {N_("Reload CMail Message"), "Reload CMail Message", ReloadCmailMsgProc},
-    {"----", NULL, NothingProc},
-    {N_("Quit                 Ctr+Q"), "Exit", QuitProc},
-    {NULL, NULL, NULL}
-};
-
-MenuItem editMenu[] = {
-    {N_("Copy Game    Ctrl+C"),        "Copy Game", CopyGameProc},
-    {N_("Copy Position Ctrl+Shift+C"), "Copy Position", CopyPositionProc},
-    {N_("Copy Game List"),        "Copy Game List", CopyGameListProc},
-    {"----", NULL, NothingProc},
-    {N_("Paste Game    Ctrl+V"),        "Paste Game", PasteGameProc},
-    {N_("Paste Position Ctrl+Shift+V"), "Paste Position", PastePositionProc},
-    {"----", NULL, NothingProc},
-    {N_("Edit Game      Ctrl+E"),        "Edit Game", EditGameProc},
-    {N_("Edit Position   Ctrl+Shift+E"), "Edit Position", EditPositionProc},
-    {N_("Edit Tags"),                    "Edit Tags", EditTagsProc},
-    {N_("Edit Comment"),                 "Edit Comment", EditCommentProc},
-    {N_("Edit Book"),                    "Edit Book", EditBookProc},
-    {"----", NULL, NothingProc},
-    {N_("Revert              Home"), "Revert", RevertProc},
-    {N_("Annotate"),                 "Annotate", AnnotateProc},
-    {N_("Truncate Game  End"),       "Truncate Game", TruncateGameProc},
-    {"----", NULL, NothingProc},
-    {N_("Backward         Alt+Left"),   "Backward", BackwardProc},
-    {N_("Forward           Alt+Right"), "Forward", ForwardProc},
-    {N_("Back to Start     Alt+Home"),  "Back to Start", ToStartProc},
-    {N_("Forward to End Alt+End"),      "Forward to End", ToEndProc},
-    {NULL, NULL, NULL}
-};
-
-MenuItem viewMenu[] = {
-    {N_("Flip View             F2"),         "Flip View", FlipViewProc},
-    {"----", NULL, NothingProc},
-    {N_("Engine Output      Alt+Shift+O"),   "Show Engine Output", EngineOutputProc},
-    {N_("Move History       Alt+Shift+H"),   "Show Move History", HistoryShowProc}, // [HGM] hist: activate 4.2.7 code
-    {N_("Evaluation Graph  Alt+Shift+E"),    "Show Evaluation Graph", EvalGraphProc},
-    {N_("Game List            Alt+Shift+G"), "Show Game List", ShowGameListProc},
-    {N_("ICS text menu"), "ICStex", IcsTextProc},
-    {"----", NULL, NothingProc},
-    {N_("Tags"),             "Show Tags", EditTagsProc},
-    {N_("Comments"),         "Show Comments", EditCommentProc},
-    {N_("ICS Input Box"),    "ICS Input Box", IcsInputBoxProc},
-    {"----", NULL, NothingProc},
-    {N_("Board..."),          "Board Options", BoardOptionsProc},
-    {N_("Game List Tags..."), "Game List", GameListOptionsPopUp},
-    {NULL, NULL, NULL}
-};
-
-MenuItem modeMenu[] = {
-    {N_("Machine White  Ctrl+W"), "Machine White", MachineWhiteProc},
-    {N_("Machine Black  Ctrl+B"), "Machine Black", MachineBlackProc},
-    {N_("Two Machines   Ctrl+T"), "Two Machines", TwoMachinesProc},
-    {N_("Analysis Mode  Ctrl+A"), "Analysis Mode", AnalyzeModeProc},
-    {N_("Analyze Game   Ctrl+G"), "Analyze File", AnalyzeFileProc },
-    {N_("Edit Game         Ctrl+E"), "Edit Game", EditGameProc},
-    {N_("Edit Position      Ctrl+Shift+E"), "Edit Position", EditPositionProc},
-    {N_("Training"),      "Training", TrainingProc},
-    {N_("ICS Client"),    "ICS Client", IcsClientProc},
-    {"----", NULL, NothingProc},
-    {N_("Machine Match"),         "Machine Match", MatchProc},
-    {N_("Pause               Pause"),         "Pause", PauseProc},
-    {NULL, NULL, NULL}
-};
-
-MenuItem actionMenu[] = {
-    {N_("Accept             F3"), "Accept", AcceptProc},
-    {N_("Decline            F4"), "Decline", DeclineProc},
-    {N_("Rematch           F12"), "Rematch", RematchProc},
-    {"----", NULL, NothingProc},
-    {N_("Call Flag          F5"), "Call Flag", CallFlagProc},
-    {N_("Draw                F6"), "Draw", DrawProc},
-    {N_("Adjourn            F7"),  "Adjourn", AdjournProc},
-    {N_("Abort                F8"),"Abort", AbortProc},
-    {N_("Resign              F9"), "Resign", ResignProc},
-    {"----", NULL, NothingProc},
-    {N_("Stop Observing  F10"), "Stop Observing", StopObservingProc},
-    {N_("Stop Examining  F11"), "Stop Examining", StopExaminingProc},
-    {N_("Upload to Examine"),   "Upload to Examine", UploadProc},
-    {"----", NULL, NothingProc},
-    {N_("Adjudicate to White"), "Adjudicate to White", AdjuWhiteProc},
-    {N_("Adjudicate to Black"), "Adjudicate to Black", AdjuBlackProc},
-    {N_("Adjudicate Draw"),     "Adjudicate Draw", AdjuDrawProc},
-    {NULL, NULL, NULL}
-};
-
-MenuItem engineMenu[] = {
-    {N_("Load New Engine ..."), "Load Engine", LoadEngineProc},
-    {"----", NULL, NothingProc},
-    {N_("Engine #1 Settings ..."), "Engine #1 Settings", FirstSettingsProc},
-    {N_("Engine #2 Settings ..."), "Engine #2 Settings", SecondSettingsProc},
-    {"----", NULL, NothingProc},
-    {N_("Hint"), "Hint", HintProc},
-    {N_("Book"), "Book", BookProc},
-    {"----", NULL, NothingProc},
-    {N_("Move Now     Ctrl+M"),     "Move Now", MoveNowProc},
-    {N_("Retract Move  Ctrl+X"), "Retract Move", RetractMoveProc},
-    {NULL, NULL, NULL}
-};
-
-MenuItem optionsMenu[] = {
-#define OPTIONSDIALOG
-#ifdef OPTIONSDIALOG
-    {N_("General ..."), "General", OptionsProc},
-#endif
-    {N_("Time Control ...       Alt+Shift+T"), "Time Control", TimeControlProc},
-    {N_("Common Engine ...  Alt+Shift+U"),     "Common Engine", UciMenuProc},
-    {N_("Adjudications ...      Alt+Shift+J"), "Adjudications", EngineMenuProc},
-    {N_("ICS ..."),    "ICS", IcsOptionsProc},
-    {N_("Match ..."), "Match", MatchOptionsProc},
-    {N_("Load Game ..."),    "Load Game", LoadOptionsProc},
-    {N_("Save Game ..."),    "Save Game", SaveOptionsProc},
-//    {N_(" ..."),    "", OptionsProc},
-    {N_("Game List ..."),    "Game List", GameListOptionsPopUp},
-    {N_("Sounds ..."),    "Sounds", SoundOptionsProc},
-    {"----", NULL, NothingProc},
-#ifndef OPTIONSDIALOG
-    {N_("Always Queen        Ctrl+Shift+Q"),   "Always Queen", AlwaysQueenProc},
-    {N_("Animate Dragging"), "Animate Dragging", AnimateDraggingProc},
-    {N_("Animate Moving      Ctrl+Shift+A"),   "Animate Moving", AnimateMovingProc},
-    {N_("Auto Flag               Ctrl+Shift+F"), "Auto Flag", AutoflagProc},
-    {N_("Auto Flip View"),   "Auto Flip View", AutoflipProc},
-    {N_("Blindfold"),        "Blindfold", BlindfoldProc},
-    {N_("Flash Moves"),      "Flash Moves", FlashMovesProc},
-#if HIGHDRAG
-    {N_("Highlight Dragging"),    "Highlight Dragging", HighlightDraggingProc},
-#endif
-    {N_("Highlight Last Move"),   "Highlight Last Move", HighlightLastMoveProc},
-    {N_("Highlight With Arrow"),  "Arrow", HighlightArrowProc},
-    {N_("Move Sound"),            "Move Sound", MoveSoundProc},
-//    {N_("ICS Alarm"),             "ICS Alarm", IcsAlarmProc},
-    {N_("One-Click Moving"),      "OneClick", OneClickProc},
-    {N_("Periodic Updates"),      "Periodic Updates", PeriodicUpdatesProc},
-    {N_("Ponder Next Move  Ctrl+Shift+P"), "Ponder Next Move", PonderNextMoveProc},
-    {N_("Popup Exit Message"),    "Popup Exit Message", PopupExitMessageProc},
-    {N_("Popup Move Errors"),     "Popup Move Errors", PopupMoveErrorsProc},
-//    {N_("Premove"),               "Premove", PremoveProc},
-    {N_("Show Coords"),           "Show Coords", ShowCoordsProc},
-    {N_("Hide Thinking        Ctrl+Shift+H"),   "Hide Thinking", HideThinkingProc},
-    {N_("Test Legality          Ctrl+Shift+L"), "Test Legality", TestLegalityProc},
-    {"----", NULL, NothingProc},
-#endif
-    {N_("Save Settings Now"),     "Save Settings Now", SaveSettingsProc},
-    {N_("Save Settings on Exit"), "Save Settings on Exit", SaveOnExitProc},
-    {NULL, NULL, NULL}
-};
-
-MenuItem helpMenu[] = {
-    {N_("Info XBoard"),     "Info XBoard", InfoProc},
-    {N_("Man XBoard   F1"), "Man XBoard", ManProc},
-    {"----", NULL, NothingProc},
-    {N_("About XBoard"), "About XBoard", AboutProc},
-    {NULL, NULL, NULL}
-};
-
-Menu menuBar[] = {
-    {N_("File"),    "File", fileMenu},
-    {N_("Edit"),    "Edit", editMenu},
-    {N_("View"),    "View", viewMenu},
-    {N_("Mode"),    "Mode", modeMenu},
-    {N_("Action"),  "Action", actionMenu},
-    {N_("Engine"),  "Engine", engineMenu},
-    {N_("Options"), "Options", optionsMenu},
-    {N_("Help"),    "Help", helpMenu},
-    {NULL, NULL, NULL}
-};
-
-#define PAUSE_BUTTON "P"
-MenuItem buttonBar[] = {
-    {"<<", "<<", ToStartProc},
-    {"<", "<", BackwardProc},
-    {N_(PAUSE_BUTTON), PAUSE_BUTTON, PauseProc},
-    {">", ">", ForwardProc},
-    {">>", ">>", ToEndProc},
-    {NULL, NULL, NULL}
-};
-
-#define PIECE_MENU_SIZE 18
-String pieceMenuStrings[2][PIECE_MENU_SIZE] = {
-    { N_("White"), "----", N_("Pawn"), N_("Knight"), N_("Bishop"), N_("Rook"),
-      N_("Queen"), N_("King"), "----", N_("Elephant"), N_("Cannon"),
-      N_("Archbishop"), N_("Chancellor"), "----", N_("Promote"), N_("Demote"),
-      N_("Empty square"), N_("Clear board") },
-    { N_("Black"), "----", N_("Pawn"), N_("Knight"), N_("Bishop"), N_("Rook"),
-      N_("Queen"), N_("King"), "----", N_("Elephant"), N_("Cannon"),
-      N_("Archbishop"), N_("Chancellor"), "----", N_("Promote"), N_("Demote"),
-      N_("Empty square"), N_("Clear board") }
-};
-/* must be in same order as pieceMenuStrings! */
-ChessSquare pieceMenuTranslation[2][PIECE_MENU_SIZE] = {
-    { WhitePlay, (ChessSquare) 0, WhitePawn, WhiteKnight, WhiteBishop,
-	WhiteRook, WhiteQueen, WhiteKing, (ChessSquare) 0, WhiteAlfil,
-	WhiteCannon, WhiteAngel, WhiteMarshall, (ChessSquare) 0,
-	PromotePiece, DemotePiece, EmptySquare, ClearBoard },
-    { BlackPlay, (ChessSquare) 0, BlackPawn, BlackKnight, BlackBishop,
-	BlackRook, BlackQueen, BlackKing, (ChessSquare) 0, BlackAlfil,
-	BlackCannon, BlackAngel, BlackMarshall, (ChessSquare) 0,
-	PromotePiece, DemotePiece, EmptySquare, ClearBoard },
-};
-
-#define DROP_MENU_SIZE 6
-String dropMenuStrings[DROP_MENU_SIZE] = {
-    "----", N_("Pawn"), N_("Knight"), N_("Bishop"), N_("Rook"), N_("Queen")
-  };
-/* must be in same order as dropMenuStrings! */
-ChessSquare dropMenuTranslation[DROP_MENU_SIZE] = {
-    (ChessSquare) 0, WhitePawn, WhiteKnight, WhiteBishop,
-    WhiteRook, WhiteQueen
-};
-
 typedef struct {
     char piece;
     char* widget;
@@ -865,41 +387,6 @@ Arg shellArgs[] = {
     { XtNmaxHeight, 0 }
 };
 
-Arg layoutArgs[] = {
-    { XtNborderWidth, 0 },
-    { XtNdefaultDistance, 0 },
-};
-
-Arg formArgs[] = {
-    { XtNborderWidth, 0 },
-    { XtNresizable, (XtArgVal) True },
-};
-
-Arg boardArgs[] = {
-    { XtNborderWidth, 0 },
-    { XtNwidth, 0 },
-    { XtNheight, 0 }
-};
-
-Arg titleArgs[] = {
-    { XtNjustify, (XtArgVal) XtJustifyRight },
-    { XtNlabel, (XtArgVal) "..." },
-    { XtNresizable, (XtArgVal) True },
-    { XtNresize, (XtArgVal) False }
-};
-
-Arg messageArgs[] = {
-    { XtNjustify, (XtArgVal) XtJustifyLeft },
-    { XtNlabel, (XtArgVal) "..." },
-    { XtNresizable, (XtArgVal) True },
-    { XtNresize, (XtArgVal) False }
-};
-
-Arg timerArgs[] = {
-    { XtNborderWidth, 0 },
-    { XtNjustify, (XtArgVal) XtJustifyLeft }
-};
-
 XtResource clientResources[] = {
     { "flashCount", "flashCount", XtRInt, sizeof(int),
 	XtOffset(AppDataPtr, flashCount), XtRImmediate,
@@ -914,236 +401,98 @@ XrmOptionDescRec shellOptions[] = {
 
 XtActionsRec boardActions[] = {
     { "DrawPosition", DrawPositionProc },
-    { "HandleUserMove", HandleUserMove },
-    { "AnimateUserMove", AnimateUserMove },
     { "HandlePV", HandlePV },
     { "SelectPV", SelectPV },
     { "StopPV", StopPV },
-    { "FileNameAction", FileNameAction },
-    { "AskQuestionProc", AskQuestionProc },
-    { "AskQuestionReplyAction", AskQuestionReplyAction },
-    { "PieceMenuPopup", PieceMenuPopup },
-    { "WhiteClock", WhiteClock },
-    { "BlackClock", BlackClock },
-    { "ResetProc", ResetProc },
-    { "NewVariantProc", NewVariantProc },
-    { "LoadGameProc", LoadGameProc },
-    { "LoadNextGameProc", LoadNextGameProc },
-    { "LoadPrevGameProc", LoadPrevGameProc },
-    { "LoadSelectedProc", LoadSelectedProc },
-    { "SetFilterProc", SetFilterProc },
-    { "ReloadGameProc", ReloadGameProc },
-    { "LoadPositionProc", LoadPositionProc },
-    { "LoadNextPositionProc", LoadNextPositionProc },
-    { "LoadPrevPositionProc", LoadPrevPositionProc },
-    { "ReloadPositionProc", ReloadPositionProc },
-    { "CopyPositionProc", CopyPositionProc },
-    { "PastePositionProc", PastePositionProc },
-    { "CopyGameProc", CopyGameProc },
-    { "CopyGameListProc", CopyGameListProc },
-    { "PasteGameProc", PasteGameProc },
-    { "SaveGameProc", SaveGameProc },
-    { "SavePositionProc", SavePositionProc },
-    { "MailMoveProc", MailMoveProc },
-    { "ReloadCmailMsgProc", ReloadCmailMsgProc },
-    { "QuitProc", QuitProc },
-    { "MachineWhiteProc", MachineWhiteProc },
-    { "MachineBlackProc", MachineBlackProc },
-    { "AnalysisModeProc", AnalyzeModeProc },
-    { "AnalyzeFileProc", AnalyzeFileProc },
-    { "TwoMachinesProc", TwoMachinesProc },
-    { "IcsClientProc", IcsClientProc },
-    { "EditGameProc", EditGameProc },
-    { "EditPositionProc", EditPositionProc },
-    { "TrainingProc", EditPositionProc },
-    { "EngineOutputProc", EngineOutputProc}, // [HGM] Winboard_x engine-output window
-    { "EvalGraphProc", EvalGraphProc},       // [HGM] Winboard_x avaluation graph window
-    { "ShowGameListProc", ShowGameListProc },
-    { "ShowMoveListProc", HistoryShowProc},
-    { "EditTagsProc", EditCommentProc },
-    { "EditBookProc", EditBookProc },
-    { "EditCommentProc", EditCommentProc },
-    { "IcsInputBoxProc", IcsInputBoxProc },
-    { "PauseProc", PauseProc },
-    { "AcceptProc", AcceptProc },
-    { "DeclineProc", DeclineProc },
-    { "RematchProc", RematchProc },
-    { "CallFlagProc", CallFlagProc },
-    { "DrawProc", DrawProc },
-    { "AdjournProc", AdjournProc },
-    { "AbortProc", AbortProc },
-    { "ResignProc", ResignProc },
-    { "AdjuWhiteProc", AdjuWhiteProc },
-    { "AdjuBlackProc", AdjuBlackProc },
-    { "AdjuDrawProc", AdjuDrawProc },
-    { "TypeInProc", TypeInProc },
-    { "EnterKeyProc", EnterKeyProc },
-    { "UpKeyProc", UpKeyProc },
-    { "DownKeyProc", DownKeyProc },
-    { "StopObservingProc", StopObservingProc },
-    { "StopExaminingProc", StopExaminingProc },
-    { "UploadProc", UploadProc },
-    { "BackwardProc", BackwardProc },
-    { "ForwardProc", ForwardProc },
+    { "MenuItem", KeyBindingProc }, // [HGM] generic handler for key bindings
+    { "QuitProc", QuitWrapper },
+    { "ManProc", ManInner },
     { "TempBackwardProc", TempBackwardProc },
     { "TempForwardProc", TempForwardProc },
-    { "ToStartProc", ToStartProc },
-    { "ToEndProc", ToEndProc },
-    { "RevertProc", RevertProc },
-    { "AnnotateProc", AnnotateProc },
-    { "TruncateGameProc", TruncateGameProc },
-    { "MoveNowProc", MoveNowProc },
-    { "RetractMoveProc", RetractMoveProc },
-    { "EngineMenuProc", (XtActionProc) EngineMenuProc },
-    { "UciMenuProc", (XtActionProc) UciMenuProc },
-    { "TimeControlProc", (XtActionProc) TimeControlProc },
-    { "FlipViewProc", FlipViewProc },
-    { "PonderNextMoveProc", PonderNextMoveProc },
-#ifndef OPTIONSDIALOG
-    { "AlwaysQueenProc", AlwaysQueenProc },
-    { "AnimateDraggingProc", AnimateDraggingProc },
-    { "AnimateMovingProc", AnimateMovingProc },
-    { "AutoflagProc", AutoflagProc },
-    { "AutoflipProc", AutoflipProc },
-    { "BlindfoldProc", BlindfoldProc },
-    { "FlashMovesProc", FlashMovesProc },
-#if HIGHDRAG
-    { "HighlightDraggingProc", HighlightDraggingProc },
-#endif
-    { "HighlightLastMoveProc", HighlightLastMoveProc },
-//    { "IcsAlarmProc", IcsAlarmProc },
-    { "MoveSoundProc", MoveSoundProc },
-    { "PeriodicUpdatesProc", PeriodicUpdatesProc },
-    { "PopupExitMessageProc", PopupExitMessageProc },
-    { "PopupMoveErrorsProc", PopupMoveErrorsProc },
-//    { "PremoveProc", PremoveProc },
-    { "ShowCoordsProc", ShowCoordsProc },
-    { "ShowThinkingProc", ShowThinkingProc },
-    { "HideThinkingProc", HideThinkingProc },
-    { "TestLegalityProc", TestLegalityProc },
-#endif
-    { "SaveSettingsProc", SaveSettingsProc },
-    { "SaveOnExitProc", SaveOnExitProc },
-    { "InfoProc", InfoProc },
-    { "ManProc", ManProc },
-    { "HintProc", HintProc },
-    { "BookProc", BookProc },
-    { "AboutGameProc", AboutGameProc },
-    { "AboutProc", AboutProc },
-    { "DebugProc", DebugProc },
-    { "NothingProc", NothingProc },
     { "CommentClick", (XtActionProc) CommentClick },
-    { "CommentPopDown", (XtActionProc) CommentPopDown },
-    { "TagsPopDown", (XtActionProc) TagsPopDown },
-    { "ErrorPopDown", (XtActionProc) ErrorPopDown },
-    { "ICSInputBoxPopDown", (XtActionProc) ICSInputBoxPopDown },
-    { "FileNamePopDown", (XtActionProc) FileNamePopDown },
-    { "AskQuestionPopDown", (XtActionProc) AskQuestionPopDown },
-    { "GameListPopDown", (XtActionProc) GameListPopDown },
-    { "GameListOptionsPopDown", (XtActionProc) GameListOptionsPopDown },
-    { "PromotionPopDown", (XtActionProc) PromotionPopDown },
-    { "EngineOutputPopDown", (XtActionProc) EngineOutputPopDown },
-    { "EvalGraphPopDown", (XtActionProc) EvalGraphPopDown },
     { "GenericPopDown", (XtActionProc) GenericPopDown },
+    { "ErrorPopDown", (XtActionProc) ErrorPopDown },
     { "CopyMemoProc", (XtActionProc) CopyMemoProc },
     { "SelectMove", (XtActionProc) SelectMove },
+    { "LoadSelectedProc", LoadSelectedProc },
+    { "SetFilterProc", SetFilterProc },
+    { "TypeInProc", TypeInProc },
+    { "EnterKeyProc", EnterKeyProc },
+    { "UpKeyProc", UpKeyProc },
+    { "DownKeyProc", DownKeyProc },
+    { "WheelProc", WheelProc },
+    { "TabProc", TabProc },
 };
 
 char globalTranslations[] =
-  ":<Key>F9: ResignProc() \n \
-   :Ctrl<Key>n: ResetProc() \n \
-   :Meta<Key>V: NewVariantProc() \n \
-   :Ctrl<Key>o: LoadGameProc() \n \
-   :Meta<Key>Next: LoadNextGameProc() \n \
-   :Meta<Key>Prior: LoadPrevGameProc() \n \
+  ":<Key>F9: MenuItem(Actions.Resign) \n \
+   :Ctrl<Key>n: MenuItem(File.NewGame) \n \
+   :Meta<Key>V: MenuItem(File.NewVariant) \n \
+   :Ctrl<Key>o: MenuItem(File.LoadGame) \n \
+   :Meta<Key>Next: MenuItem(LoadNextGameProc) \n \
+   :Meta<Key>Prior: MenuItem(LoadPrevGameProc) \n \
    :Ctrl<Key>Down: LoadSelectedProc(3) \n \
    :Ctrl<Key>Up: LoadSelectedProc(-3) \n \
-   :Ctrl<Key>s: SaveGameProc() \n \
-   :Ctrl<Key>c: CopyGameProc() \n \
-   :Ctrl<Key>v: PasteGameProc() \n \
-   :Ctrl<Key>O: LoadPositionProc() \n \
-   :Shift<Key>Next: LoadNextPositionProc() \n \
-   :Shift<Key>Prior: LoadPrevPositionProc() \n \
-   :Ctrl<Key>S: SavePositionProc() \n \
-   :Ctrl<Key>C: CopyPositionProc() \n \
-   :Ctrl<Key>V: PastePositionProc() \n \
-   :Ctrl<Key>q: QuitProc() \n \
-   :Ctrl<Key>w: MachineWhiteProc() \n \
-   :Ctrl<Key>b: MachineBlackProc() \n \
-   :Ctrl<Key>t: TwoMachinesProc() \n \
-   :Ctrl<Key>a: AnalysisModeProc() \n \
-   :Ctrl<Key>g: AnalyzeFileProc() \n \
-   :Ctrl<Key>e: EditGameProc() \n \
-   :Ctrl<Key>E: EditPositionProc() \n \
-   :Meta<Key>O: EngineOutputProc() \n \
-   :Meta<Key>E: EvalGraphProc() \n \
-   :Meta<Key>G: ShowGameListProc() \n \
-   :Meta<Key>H: ShowMoveListProc() \n \
-   :<Key>Pause: PauseProc() \n \
-   :<Key>F3: AcceptProc() \n \
-   :<Key>F4: DeclineProc() \n \
-   :<Key>F12: RematchProc() \n \
-   :<Key>F5: CallFlagProc() \n \
-   :<Key>F6: DrawProc() \n \
-   :<Key>F7: AdjournProc() \n \
-   :<Key>F8: AbortProc() \n \
-   :<Key>F10: StopObservingProc() \n \
-   :<Key>F11: StopExaminingProc() \n \
-   :Meta Ctrl<Key>F12: DebugProc() \n \
-   :Meta<Key>End: ToEndProc() \n \
-   :Meta<Key>Right: ForwardProc() \n \
-   :Meta<Key>Home: ToStartProc() \n \
-   :Meta<Key>Left: BackwardProc() \n \
-   :<Key>Left: BackwardProc() \n \
-   :<Key>Right: ForwardProc() \n \
-   :<Key>Home: RevertProc() \n \
-   :<Key>End: TruncateGameProc() \n \
-   :Ctrl<Key>m: MoveNowProc() \n \
-   :Ctrl<Key>x: RetractMoveProc() \n \
-   :Meta<Key>J: EngineMenuProc() \n \
-   :Meta<Key>U: UciMenuProc() \n \
-   :Meta<Key>T: TimeControlProc() \n \
-   :Ctrl<Key>P: PonderNextMoveProc() \n "
+   :Ctrl<Key>s: MenuItem(File.SaveGame) \n \
+   :Ctrl<Key>c: MenuItem(Edit.CopyGame) \n \
+   :Ctrl<Key>v: MenuItem(Edit.PasteGame) \n \
+   :Ctrl<Key>O: MenuItem(File.LoadPosition) \n \
+   :Shift<Key>Next: MenuItem(LoadNextPositionProc) \n \
+   :Shift<Key>Prior: MenuItem(LoadPrevPositionProc) \n \
+   :Ctrl<Key>S: MenuItem(File.SavePosition) \n \
+   :Ctrl<Key>C: MenuItem(Edit.CopyPosition) \n \
+   :Ctrl<Key>V: MenuItem(Edit.PastePosition) \n \
+   :Ctrl<Key>q: MenuItem(File.Quit) \n \
+   :Ctrl<Key>w: MenuItem(Mode.MachineWhite) \n \
+   :Ctrl<Key>b: MenuItem(Mode.MachineBlack) \n \
+   :Ctrl<Key>t: MenuItem(Mode.TwoMachines) \n \
+   :Ctrl<Key>a: MenuItem(Mode.AnalysisMode) \n \
+   :Ctrl<Key>g: MenuItem(Mode.AnalyzeFile) \n \
+   :Ctrl<Key>e: MenuItem(Mode.EditGame) \n \
+   :Ctrl<Key>E: MenuItem(Mode.EditPosition) \n \
+   :Meta<Key>O: MenuItem(View.EngineOutput) \n \
+   :Meta<Key>E: MenuItem(View.EvaluationGraph) \n \
+   :Meta<Key>G: MenuItem(View.GameList) \n \
+   :Meta<Key>H: MenuItem(View.MoveHistory) \n \
+   :<Key>Pause: MenuItem(Mode.Pause) \n \
+   :<Key>F3: MenuItem(Action.Accept) \n \
+   :<Key>F4: MenuItem(Action.Decline) \n \
+   :<Key>F12: MenuItem(Action.Rematch) \n \
+   :<Key>F5: MenuItem(Action.CallFlag) \n \
+   :<Key>F6: MenuItem(Action.Draw) \n \
+   :<Key>F7: MenuItem(Action.Adjourn) \n \
+   :<Key>F8: MenuItem(Action.Abort) \n \
+   :<Key>F10: MenuItem(Action.StopObserving) \n \
+   :<Key>F11: MenuItem(Action.StopExamining) \n \
+   :Ctrl<Key>d: MenuItem(DebugProc) \n \
+   :Meta Ctrl<Key>F12: MenuItem(DebugProc) \n \
+   :Meta<Key>End: MenuItem(Edit.ForwardtoEnd) \n \
+   :Meta<Key>Right: MenuItem(Edit.Forward) \n \
+   :Meta<Key>Home: MenuItem(Edit.BacktoStart) \n \
+   :Meta<Key>Left: MenuItem(Edit.Backward) \n \
+   :<Key>Left: MenuItem(Edit.Backward) \n \
+   :<Key>Right: MenuItem(Edit.Forward) \n \
+   :<Key>Home: MenuItem(Edit.Revert) \n \
+   :<Key>End: MenuItem(Edit.TruncateGame) \n \
+   :Ctrl<Key>m: MenuItem(Engine.MoveNow) \n \
+   :Ctrl<Key>x: MenuItem(Engine.RetractMove) \n \
+   :Meta<Key>J: MenuItem(Options.Adjudications) \n \
+   :Meta<Key>U: MenuItem(Options.CommonEngine) \n \
+   :Meta<Key>T: MenuItem(Options.TimeControl) \n \
+   :Ctrl<Key>P: MenuItem(PonderNextMove) \n "
 #ifndef OPTIONSDIALOG
     "\
-   :Ctrl<Key>Q: AlwaysQueenProc() \n \
-   :Ctrl<Key>F: AutoflagProc() \n \
-   :Ctrl<Key>A: AnimateMovingProc() \n \
-   :Ctrl<Key>L: TestLegalityProc() \n \
-   :Ctrl<Key>H: HideThinkingProc() \n "
+   :Ctrl<Key>Q: MenuItem(AlwaysQueenProc) \n \
+   :Ctrl<Key>F: MenuItem(AutoflagProc) \n \
+   :Ctrl<Key>A: MenuItem(AnimateMovingProc) \n \
+   :Ctrl<Key>L: MenuItem(TestLegalityProc) \n \
+   :Ctrl<Key>H: MenuItem(HideThinkingProc) \n "
 #endif
    "\
-   :<Key>F1: ManProc() \n \
-   :<Key>F2: FlipViewProc() \n \
+   :<Key>F1: MenuItem(Help.ManXBoard) \n \
+   :<Key>F2: MenuItem(View.FlipView) \n \
    :<KeyDown>Return: TempBackwardProc() \n \
-   :<KeyUp>Return: TempForwardProc() \n \
-   :Ctrl<Key>1: AskQuestionProc(\"Direct command\",\
-                                \"Send to chess program:\",,1) \n \
-   :Ctrl<Key>2: AskQuestionProc(\"Direct command\",\
-                                \"Send to second chess program:\",,2) \n";
-
-char boardTranslations[] =
-   "<Btn1Down>: HandleUserMove(0) \n \
-   Shift<Btn1Up>: HandleUserMove(1) \n \
-   <Btn1Up>: HandleUserMove(0) \n \
-   <Btn1Motion>: AnimateUserMove() \n \
-   <Btn3Motion>: HandlePV() \n \
-   <Btn3Up>: PieceMenuPopup(menuB) \n \
-   Shift<Btn2Down>: XawPositionSimpleMenu(menuB) XawPositionSimpleMenu(menuD)\
-                 PieceMenuPopup(menuB) \n \
-   Any<Btn2Down>: XawPositionSimpleMenu(menuW) XawPositionSimpleMenu(menuD) \
-                 PieceMenuPopup(menuW) \n \
-   Shift<Btn3Down>: XawPositionSimpleMenu(menuW) XawPositionSimpleMenu(menuD)\
-                 PieceMenuPopup(menuW) \n \
-   Any<Btn3Down>: XawPositionSimpleMenu(menuB) XawPositionSimpleMenu(menuD) \
-                 PieceMenuPopup(menuB) \n";
-
-char whiteTranslations[] =
-   "Shift<BtnDown>: WhiteClock(1)\n \
-   <BtnDown>: WhiteClock(0)\n";
-char blackTranslations[] =
-   "Shift<BtnDown>: BlackClock(1)\n \
-   <BtnDown>: BlackClock(0)\n";
+   :<KeyUp>Return: TempForwardProc() \n";
 
 char ICSInputTranslations[] =
     "<Key>Up: UpKeyProc() \n "
@@ -1155,9 +504,7 @@ char ICSInputTranslations[] =
 char commentTranslations[] = "<Btn3Down>: extend-end() select-start() CommentClick() \n";
 
 String xboardResources[] = {
-    "*fileName*value.translations: #override\\n <Key>Return: FileNameAction()",
-    "*question*value.translations: #override\\n <Key>Return: AskQuestionReplyAction()",
-    "*errorpopup*translations: #override\\n <Key>Return: ErrorPopDown()",
+    "*Error*translations: #override\\n <Key>Return: ErrorPopDown()",
     NULL
   };
 
@@ -1171,10 +518,7 @@ static int xpm_avail[MAXSQSIZE];
 
 /* Extract piece size from filename */
 static int
-xpm_getsize(name, len, ext)
-     char *name;
-     int len;
-     char *ext;
+xpm_getsize (char *name, int len, char *ext)
 {
     char *p, *d;
     char buf[10];
@@ -1198,9 +542,7 @@ xpm_getsize(name, len, ext)
 
 /* Setup xpm_avail */
 static int
-xpm_getavail(dirname, ext)
-     char *dirname;
-     char *ext;
+xpm_getavail (char *dirname, char *ext)
 {
     DIR *dir;
     struct dirent *ent;
@@ -1232,9 +574,7 @@ xpm_getavail(dirname, ext)
 }
 
 void
-xpm_print_avail(fp, ext)
-     FILE *fp;
-     char *ext;
+xpm_print_avail (FILE *fp, char *ext)
 {
     int i;
 
@@ -1247,10 +587,7 @@ xpm_print_avail(fp, ext)
 
 /* Return XPM piecesize closest to size */
 int
-xpm_closest_to(dirname, size, ext)
-     char *dirname;
-     int size;
-     char *ext;
+xpm_closest_to (char *dirname, int size, char *ext)
 {
     int i;
     int sm_diff = MAXSQSIZE;
@@ -1285,10 +622,7 @@ xpm_closest_to(dirname, size, ext)
    read the directory, so we can't collect a list of
    filenames, etc., so we can't do any size-fitting. */
 int
-xpm_closest_to(dirname, size, ext)
-     char *dirname;
-     int size;
-     char *ext;
+xpm_closest_to (char *dirname, int size, char *ext)
 {
     fprintf(stderr, _("\
 Warning: No DIR structure found on this system --\n\
@@ -1299,86 +633,11 @@ Warning: No DIR structure found on this system --\n\
 }
 #endif /* HAVE_DIR_STRUCT */
 
-static char *cnames[9] = { "black", "red", "green", "yellow", "blue",
-			     "magenta", "cyan", "white" };
-typedef struct {
-    int attr, bg, fg;
-} TextColors;
-TextColors textColors[(int)NColorClasses];
-
-/* String is: "fg, bg, attr". Which is 0, 1, 2 */
-static int
-parse_color(str, which)
-     char *str;
-     int which;
-{
-    char *p, buf[100], *d;
-    int i;
-
-    if (strlen(str) > 99)	/* watch bounds on buf */
-      return -1;
-
-    p = str;
-    d = buf;
-    for (i=0; i<which; ++i) {
-	p = strchr(p, ',');
-	if (!p)
-	  return -1;
-	++p;
-    }
-
-    /* Could be looking at something like:
-       black, , 1
-       .. in which case we want to stop on a comma also */
-    while (*p && *p != ',' && !isalpha(*p) && !isdigit(*p))
-      ++p;
-
-    if (*p == ',') {
-	return -1;		/* Use default for empty field */
-    }
-
-    if (which == 2 || isdigit(*p))
-      return atoi(p);
-
-    while (*p && isalpha(*p))
-      *(d++) = *(p++);
-
-    *d = 0;
-
-    for (i=0; i<8; ++i) {
-	if (!StrCaseCmp(buf, cnames[i]))
-	  return which? (i+40) : (i+30);
-    }
-    if (!StrCaseCmp(buf, "default")) return -1;
-
-    fprintf(stderr, _("%s: unrecognized color %s\n"), programName, buf);
-    return -2;
-}
-
-static int
-parse_cpair(cc, str)
-     ColorClass cc;
-     char *str;
-{
-    if ((textColors[(int)cc].fg=parse_color(str, 0)) == -2) {
-	fprintf(stderr, _("%s: can't parse foreground color in `%s'\n"),
-		programName, str);
-	return -1;
-    }
-
-    /* bg and attr are optional */
-    textColors[(int)cc].bg = parse_color(str, 1);
-    if ((textColors[(int)cc].attr = parse_color(str, 2)) < 0) {
-	textColors[(int)cc].attr = 0;
-    }
-    return 0;
-}
-
 
 /* Arrange to catch delete-window events */
 Atom wm_delete_window;
 void
-CatchDeleteWindow(Widget w, String procname)
+CatchDeleteWindow (Widget w, String procname)
 {
   char buf[MSG_SIZ];
   XSetWMProtocols(xDisplay, XtWindow(w), &wm_delete_window, 1);
@@ -1387,7 +646,7 @@ CatchDeleteWindow(Widget w, String procname)
 }
 
 void
-BoardToTop()
+BoardToTop ()
 {
   Arg args[16];
   XtSetArg(args[0], XtNiconic, False);
@@ -1408,9 +667,6 @@ BoardToTop()
 #define OPTCHAR "-"
 #define SEPCHAR " "
 
-// these two must some day move to frontend.h, when they are implemented
-Boolean GameListIsUp();
-
 // The option definition and parsing code common to XBoard and WinBoard is collected in this file
 #include "args.h"
 
@@ -1445,7 +701,7 @@ Boolean fontIsSet[NUM_FONTS], fontValid[NUM_FONTS][MAX_SIZE];
 char *fontTable[NUM_FONTS][MAX_SIZE];
 
 void
-ParseFont(char *name, int number)
+ParseFont (char *name, int number)
 { // in XBoard, only 2 of the fonts are currently implemented, and we just copy their name
   int size;
   if(sscanf(name, "size%d:", &size)) {
@@ -1474,7 +730,7 @@ ParseFont(char *name, int number)
 }
 
 void
-SetFontDefaults()
+SetFontDefaults ()
 { // only 2 fonts currently
   appData.clockFont = CLOCK_FONT_NAME;
   appData.coordFont = COORD_FONT_NAME;
@@ -1482,41 +738,41 @@ SetFontDefaults()
 }
 
 void
-CreateFonts()
+CreateFonts ()
 { // no-op, until we identify the code for this already in XBoard and move it here
 }
 
 void
-ParseColor(int n, char *name)
+ParseColor (int n, char *name)
 { // in XBoard, just copy the color-name string
   if(colorVariable[n]) *(char**)colorVariable[n] = strdup(name);
 }
 
 void
-ParseTextAttribs(ColorClass cc, char *s)
+ParseTextAttribs (ColorClass cc, char *s)
 {
     (&appData.colorShout)[cc] = strdup(s);
 }
 
 void
-ParseBoardSize(void *addr, char *name)
+ParseBoardSize (void *addr, char *name)
 {
     appData.boardSize = strdup(name);
 }
 
 void
-LoadAllSounds()
+LoadAllSounds ()
 { // In XBoard the sound-playing program takes care of obtaining the actual sound
 }
 
 void
-SetCommPortDefaults()
+SetCommPortDefaults ()
 { // for now, this is a no-op, as the corresponding option does not exist in XBoard
 }
 
 // [HGM] args: these three cases taken out to stay in front-end
 void
-SaveFontArg(FILE *f, ArgDescriptor *ad)
+SaveFontArg (FILE *f, ArgDescriptor *ad)
 {
   char *name;
   int i, n = (int)(intptr_t)ad->argLoc;
@@ -1544,115 +800,103 @@ SaveFontArg(FILE *f, ArgDescriptor *ad)
 }
 
 void
-ExportSounds()
+ExportSounds ()
 { // nothing to do, as the sounds are at all times represented by their text-string names already
 }
 
 void
-SaveAttribsArg(FILE *f, ArgDescriptor *ad)
+SaveAttribsArg (FILE *f, ArgDescriptor *ad)
 {	// here the "argLoc" defines a table index. It could have contained the 'ta' pointer itself, though
 	fprintf(f, OPTCHAR "%s" SEPCHAR "%s\n", ad->argName, (&appData.colorShout)[(int)(intptr_t)ad->argLoc]);
 }
 
 void
-SaveColor(FILE *f, ArgDescriptor *ad)
+SaveColor (FILE *f, ArgDescriptor *ad)
 {	// in WinBoard the color is an int and has to be converted to text. In X it would be a string already?
 	if(colorVariable[(int)(intptr_t)ad->argLoc])
 	fprintf(f, OPTCHAR "%s" SEPCHAR "%s\n", ad->argName, *(char**)colorVariable[(int)(intptr_t)ad->argLoc]);
 }
 
 void
-SaveBoardSize(FILE *f, char *name, void *addr)
+SaveBoardSize (FILE *f, char *name, void *addr)
 { // wrapper to shield back-end from BoardSize & sizeInfo
   fprintf(f, OPTCHAR "%s" SEPCHAR "%s\n", name, appData.boardSize);
 }
 
 void
-ParseCommPortSettings(char *s)
+ParseCommPortSettings (char *s)
 { // no such option in XBoard (yet)
 }
 
-extern Widget engineOutputShell;
+int frameX, frameY;
 
 void
-GetActualPlacement(Widget wg, WindowPlacement *wp)
+GetActualPlacement (Widget wg, WindowPlacement *wp)
 {
-  Arg args[16];
-  Dimension w, h;
-  Position x, y;
-  int i;
+  XWindowAttributes winAt;
+  Window win, dummy;
+  int rx, ry;
 
   if(!wg) return;
 
-    i = 0;
-    XtSetArg(args[i], XtNx, &x); i++;
-    XtSetArg(args[i], XtNy, &y); i++;
-    XtSetArg(args[i], XtNwidth, &w); i++;
-    XtSetArg(args[i], XtNheight, &h); i++;
-    XtGetValues(wg, args, i);
-    wp->x = x - 4;
-    wp->y = y - 23;
-    wp->height = h;
-    wp->width = w;
+  win = XtWindow(wg);
+  XGetWindowAttributes(xDisplay, win, &winAt); // this works, where XtGetValues on XtNx, XtNy does not!
+  XTranslateCoordinates (xDisplay, win, winAt.root, -winAt.border_width, -winAt.border_width, &rx, &ry, &dummy);
+  wp->x = rx - winAt.x;
+  wp->y = ry - winAt.y;
+  wp->height = winAt.height;
+  wp->width = winAt.width;
+  frameX = winAt.x; frameY = winAt.y; // remember to decide if windows touch
 }
 
 void
-GetWindowCoords()
+GetWindowCoords ()
 { // wrapper to shield use of window handles from back-end (make addressible by number?)
   // In XBoard this will have to wait until awareness of window parameters is implemented
   GetActualPlacement(shellWidget, &wpMain);
-  if(EngineOutputIsUp()) GetActualPlacement(engineOutputShell, &wpEngineOutput);
-  if(MoveHistoryIsUp()) GetActualPlacement(shells[7], &wpMoveHistory);
-  if(EvalGraphIsUp()) GetActualPlacement(evalGraphShell, &wpEvalGraph);
-  if(GameListIsUp()) GetActualPlacement(gameListShell, &wpGameList);
-  if(shellUp[1]) GetActualPlacement(shells[1], &wpComment);
-  if(shellUp[2]) GetActualPlacement(shells[2], &wpTags);
+  if(shellUp[EngOutDlg]) GetActualPlacement(shells[EngOutDlg], &wpEngineOutput);
+  if(shellUp[HistoryDlg]) GetActualPlacement(shells[HistoryDlg], &wpMoveHistory);
+  if(shellUp[EvalGraphDlg]) GetActualPlacement(shells[EvalGraphDlg], &wpEvalGraph);
+  if(shellUp[GameListDlg]) GetActualPlacement(shells[GameListDlg], &wpGameList);
+  if(shellUp[CommentDlg]) GetActualPlacement(shells[CommentDlg], &wpComment);
+  if(shellUp[TagsDlg]) GetActualPlacement(shells[TagsDlg], &wpTags);
 }
 
 void
-PrintCommPortSettings(FILE *f, char *name)
+PrintCommPortSettings (FILE *f, char *name)
 { // This option does not exist in XBoard
 }
 
-int
-MySearchPath(char *installDir, char *name, char *fullname)
-{ // just append installDir and name. Perhaps ExpandPath should be used here?
-  name = ExpandPathName(name);
-  if(name && name[0] == '/')
-    safeStrCpy(fullname, name, MSG_SIZ );
-  else {
-    sprintf(fullname, "%s%c%s", installDir, '/', name);
-  }
-  return 1;
-}
-
-int
-MyGetFullPathName(char *name, char *fullname)
-{ // should use ExpandPath?
-  name = ExpandPathName(name);
-  safeStrCpy(fullname, name, MSG_SIZ );
-  return 1;
-}
-
 void
-EnsureOnScreen(int *x, int *y, int minX, int minY)
+EnsureOnScreen (int *x, int *y, int minX, int minY)
 {
   return;
 }
 
 int
-MainWindowUp()
+MainWindowUp ()
 { // [HGM] args: allows testing if main window is realized from back-end
   return xBoardWindow != 0;
 }
 
 void
-PopUpStartupDialog()
+SwitchWindow ()
+{
+    extern Option dualOptions[];
+    static Window dual;
+    Window tmp = xBoardWindow;
+    if(!dual) dual = XtWindow(dualOptions[3].handle); // must be first call
+    xBoardWindow = dual; // swap them
+    dual = tmp;
+}
+
+void
+PopUpStartupDialog ()
 {  // start menu not implemented in XBoard
 }
 
 char *
-ConvertToLine(int argc, char **argv)
+ConvertToLine (int argc, char **argv)
 {
   static char line[128*1024], buf[1024];
   int i;
@@ -1674,94 +918,41 @@ ConvertToLine(int argc, char **argv)
 
 //--------------------------------------------------------------------------------------------
 
-extern Boolean twoBoards, partnerUp;
-
-#ifdef IDSIZES
-  // eventually, all layout determining code should go into a subroutine, but until then IDSIZE remains undefined
-#else
 #define BoardSize int
-void InitDrawingSizes(BoardSize boardSize, int flags)
+void
+InitDrawingSizes (BoardSize boardSize, int flags)
 {   // [HGM] resize is functional now, but for board format changes only (nr of ranks, files)
-    Dimension timerWidth, boardWidth, boardHeight, w, h, sep, bor, wr, hr;
-    Arg args[16];
-    XtGeometryResult gres;
+    Dimension boardWidth, boardHeight, w, h;
     int i;
     static Dimension oldWidth, oldHeight;
     static VariantClass oldVariant;
-    static int oldDual = -1, oldMono = -1;
+    static int oldMono = -1, oldTwoBoards = 0;
 
     if(!formWidget) return;
 
+    if(oldTwoBoards && !twoBoards) PopDown(DummyDlg);
+    oldTwoBoards = twoBoards;
+
     if(appData.overrideLineGap >= 0) lineGap = appData.overrideLineGap;
     boardWidth = lineGap + BOARD_WIDTH * (squareSize + lineGap);
     boardHeight = lineGap + BOARD_HEIGHT * (squareSize + lineGap);
 
-  if(boardWidth != oldWidth || boardHeight != oldHeight || oldDual != twoBoards) { // do resizing stuff only if size actually changed
-    /*
-     * Enable shell resizing.
-     */
-    shellArgs[0].value = (XtArgVal) &w;
-    shellArgs[1].value = (XtArgVal) &h;
-    XtGetValues(shellWidget, shellArgs, 2);
-
-    shellArgs[4].value = 3*w; shellArgs[2].value = 10;
-    shellArgs[5].value = 2*h; shellArgs[3].value = 10;
-    XtSetValues(shellWidget, &shellArgs[2], 4);
-
-    XtSetArg(args[0], XtNdefaultDistance, &sep);
-    XtGetValues(formWidget, args, 1);
+  if(boardWidth != oldWidth || boardHeight != oldHeight) { // do resizing stuff only if size actually changed
 
-    oldWidth = boardWidth; oldHeight = boardHeight; oldDual = twoBoards;
+    oldWidth = boardWidth; oldHeight = boardHeight;
     CreateGrid();
-    hOffset = boardWidth + 10;
-    for(i=0; i<BOARD_WIDTH+BOARD_HEIGHT+2; i++) { // [HGM] dual: grid for second board
-	secondSegments[i] = gridSegments[i];
-	secondSegments[i].x1 += hOffset;
-	secondSegments[i].x2 += hOffset;
-    }
-
-    XtSetArg(args[0], XtNwidth, boardWidth);
-    XtSetArg(args[1], XtNheight, boardHeight);
-    XtSetValues(boardWidget, args, 2);
-
-    timerWidth = (boardWidth - sep) / 2;
-    XtSetArg(args[0], XtNwidth, timerWidth);
-    XtSetValues(whiteTimerWidget, args, 1);
-    XtSetValues(blackTimerWidget, args, 1);
-
-    XawFormDoLayout(formWidget, False);
-
-    if (appData.titleInWindow) {
-	i = 0;
-	XtSetArg(args[i], XtNborderWidth, &bor); i++;
-	XtSetArg(args[i], XtNheight, &h);  i++;
-	XtGetValues(titleWidget, args, i);
-	if (smallLayout) {
-	    w = boardWidth - 2*bor;
-	} else {
-	    XtSetArg(args[0], XtNwidth, &w);
-	    XtGetValues(menuBarWidget, args, 1);
-	    w = boardWidth - w - sep - 2*bor - 2; // WIDTH_FUDGE
-	}
-
-	gres = XtMakeResizeRequest(titleWidget, w, h, &wr, &hr);
-	if (gres != XtGeometryYes && appData.debugMode) {
-	    fprintf(stderr,
-		    _("%s: titleWidget geometry error %d %d %d %d %d\n"),
-		    programName, gres, w, h, wr, hr);
-	}
-    }
-
-    XawFormDoLayout(formWidget, True);
 
     /*
      * Inhibit shell resizing.
      */
-    shellArgs[0].value = w = (XtArgVal) boardWidth + marginW + twoBoards*hOffset; // [HGM] dual
+    shellArgs[0].value = w = (XtArgVal) boardWidth + marginW ;
     shellArgs[1].value = h = (XtArgVal) boardHeight + marginH;
     shellArgs[4].value = shellArgs[2].value = w;
     shellArgs[5].value = shellArgs[3].value = h;
     XtSetValues(shellWidget, &shellArgs[0], 6);
+
+    XSync(xDisplay, False);
+    DelayedDrag();
   }
 
     // [HGM] pieces: tailor piece bitmaps to needs of specific variant
@@ -1835,115 +1026,55 @@ void InitDrawingSizes(BoardSize boardSize, int flags)
 	}
       }
     }
+    oldMono = -10; // kludge to force recreation of animation masks
+    oldVariant = gameInfo.variant;
   }
 #if HAVE_LIBXPM
-  if(appData.monoMode == oldMono)
+  if(appData.monoMode != oldMono)
     CreateAnimVars();
 #endif
   oldMono = appData.monoMode;
 }
-#endif
 
-void ParseIcsTextColors()
-{   // [HGM] tken out of main(), so it can be called from ICS-Options dialog
-    if (parse_cpair(ColorShout, appData.colorShout) < 0 ||
-	parse_cpair(ColorSShout, appData.colorSShout) < 0 ||
-	parse_cpair(ColorChannel1, appData.colorChannel1) < 0  ||
-	parse_cpair(ColorChannel, appData.colorChannel) < 0  ||
-	parse_cpair(ColorKibitz, appData.colorKibitz) < 0 ||
-	parse_cpair(ColorTell, appData.colorTell) < 0 ||
-	parse_cpair(ColorChallenge, appData.colorChallenge) < 0  ||
-	parse_cpair(ColorRequest, appData.colorRequest) < 0  ||
-	parse_cpair(ColorSeek, appData.colorSeek) < 0  ||
-	parse_cpair(ColorNormal, appData.colorNormal) < 0)
-      {
-	  if (appData.colorize) {
-	      fprintf(stderr,
-		      _("%s: can't parse color names; disabling colorization\n"),
-		      programName);
-	  }
-	  appData.colorize = FALSE;
-      }
-}
-
-int MakeColors()
-{   // [HGM] taken out of main(), so it can be called from BoardOptions dialog
+static int
+MakeOneColor (char *name, Pixel *color)
+{
     XrmValue vFrom, vTo;
-    int forceMono = False;
-
-    if (!appData.monoMode) {
-	vFrom.addr = (caddr_t) appData.lightSquareColor;
-	vFrom.size = strlen(appData.lightSquareColor);
-	XtConvert(shellWidget, XtRString, &vFrom, XtRPixel, &vTo);
-	if (vTo.addr == NULL) {
-	  appData.monoMode = True;
-	  forceMono = True;
-	} else {
-	  lightSquareColor = *(Pixel *) vTo.addr;
-	}
-    }
-    if (!appData.monoMode) {
-	vFrom.addr = (caddr_t) appData.darkSquareColor;
-	vFrom.size = strlen(appData.darkSquareColor);
-	XtConvert(shellWidget, XtRString, &vFrom, XtRPixel, &vTo);
-	if (vTo.addr == NULL) {
-	  appData.monoMode = True;
-	  forceMono = True;
-	} else {
-	  darkSquareColor = *(Pixel *) vTo.addr;
-	}
-    }
-    if (!appData.monoMode) {
-	vFrom.addr = (caddr_t) appData.whitePieceColor;
-	vFrom.size = strlen(appData.whitePieceColor);
-	XtConvert(shellWidget, XtRString, &vFrom, XtRPixel, &vTo);
-	if (vTo.addr == NULL) {
-	  appData.monoMode = True;
-	  forceMono = True;
-	} else {
-	  whitePieceColor = *(Pixel *) vTo.addr;
-	}
-    }
     if (!appData.monoMode) {
-	vFrom.addr = (caddr_t) appData.blackPieceColor;
-	vFrom.size = strlen(appData.blackPieceColor);
+	vFrom.addr = (caddr_t) name;
+	vFrom.size = strlen(name);
 	XtConvert(shellWidget, XtRString, &vFrom, XtRPixel, &vTo);
 	if (vTo.addr == NULL) {
 	  appData.monoMode = True;
-	  forceMono = True;
+	  return True;
 	} else {
-	  blackPieceColor = *(Pixel *) vTo.addr;
+	  *color = *(Pixel *) vTo.addr;
 	}
     }
+    return False;
+}
 
-    if (!appData.monoMode) {
-	vFrom.addr = (caddr_t) appData.highlightSquareColor;
-	vFrom.size = strlen(appData.highlightSquareColor);
-	XtConvert(shellWidget, XtRString, &vFrom, XtRPixel, &vTo);
-	if (vTo.addr == NULL) {
-	  appData.monoMode = True;
-	  forceMono = True;
-	} else {
-	  highlightSquareColor = *(Pixel *) vTo.addr;
-	}
-    }
+static int
+MakeColors ()
+{   // [HGM] taken out of main(), so it can be called from BoardOptions dialog
+    int forceMono = False;
+
+    forceMono |= MakeOneColor(appData.lightSquareColor, &lightSquareColor);
+    forceMono |= MakeOneColor(appData.darkSquareColor, &darkSquareColor);
+    forceMono |= MakeOneColor(appData.whitePieceColor, &whitePieceColor);
+    forceMono |= MakeOneColor(appData.blackPieceColor, &blackPieceColor);
+    forceMono |= MakeOneColor(appData.highlightSquareColor, &highlightSquareColor);
+    forceMono |= MakeOneColor(appData.premoveHighlightColor, &premoveHighlightColor);
+    if (appData.lowTimeWarning)
+	forceMono |= MakeOneColor(appData.lowTimeWarningColor, &lowTimeWarningColor);
+    if(appData.dialogColor[0]) MakeOneColor(appData.dialogColor, &dialogColor);
+    if(appData.buttonColor[0]) MakeOneColor(appData.buttonColor, &buttonColor);
 
-    if (!appData.monoMode) {
-	vFrom.addr = (caddr_t) appData.premoveHighlightColor;
-	vFrom.size = strlen(appData.premoveHighlightColor);
-	XtConvert(shellWidget, XtRString, &vFrom, XtRPixel, &vTo);
-	if (vTo.addr == NULL) {
-	  appData.monoMode = True;
-	  forceMono = True;
-	} else {
-	  premoveHighlightColor = *(Pixel *) vTo.addr;
-	}
-    }
     return forceMono;
 }
 
-void
-CreateAnyPieces()
+static void
+CreateAnyPieces ()
 {   // [HGM] taken out of main
 #if HAVE_LIBXPM
     if (appData.monoMode && // [HGM] no sense to go on to certain doom
@@ -1964,19 +1095,76 @@ CreateAnyPieces()
 #endif
 }
 
+void
+InitDrawingParams ()
+{
+    MakeColors(); CreateGCs(True);
+    CreateAnyPieces();
+}
+
+void
+InitializeFonts (int clockFontPxlSize, int coordFontPxlSize, int fontPxlSize)
+{   // detervtomine what fonts to use, and create them
+    XrmValue vTo;
+    XrmDatabase xdb;
+
+    if(!fontIsSet[CLOCK_FONT] && fontValid[CLOCK_FONT][squareSize])
+	appData.clockFont = fontTable[CLOCK_FONT][squareSize];
+    if(!fontIsSet[MESSAGE_FONT] && fontValid[MESSAGE_FONT][squareSize])
+	appData.font = fontTable[MESSAGE_FONT][squareSize];
+    if(!fontIsSet[COORD_FONT] && fontValid[COORD_FONT][squareSize])
+	appData.coordFont = fontTable[COORD_FONT][squareSize];
+
+#if ENABLE_NLS
+    appData.font = InsertPxlSize(appData.font, fontPxlSize);
+    appData.clockFont = InsertPxlSize(appData.clockFont, clockFontPxlSize);
+    appData.coordFont = InsertPxlSize(appData.coordFont, coordFontPxlSize);
+    fontSet = CreateFontSet(appData.font);
+    clockFontSet = CreateFontSet(appData.clockFont);
+    {
+      /* For the coordFont, use the 0th font of the fontset. */
+      XFontSet coordFontSet = CreateFontSet(appData.coordFont);
+      XFontStruct **font_struct_list;
+      XFontSetExtents *fontSize;
+      char **font_name_list;
+      XFontsOfFontSet(coordFontSet, &font_struct_list, &font_name_list);
+      coordFontID = XLoadFont(xDisplay, font_name_list[0]);
+      coordFontStruct = XQueryFont(xDisplay, coordFontID);
+      fontSize = XExtentsOfFontSet(fontSet); // [HGM] figure out how much vertical space font takes
+      textHeight = fontSize->max_logical_extent.height + 5; // add borderWidth
+    }
+#else
+    appData.font = FindFont(appData.font, fontPxlSize);
+    appData.clockFont = FindFont(appData.clockFont, clockFontPxlSize);
+    appData.coordFont = FindFont(appData.coordFont, coordFontPxlSize);
+    clockFontID = XLoadFont(xDisplay, appData.clockFont);
+    clockFontStruct = XQueryFont(xDisplay, clockFontID);
+    coordFontID = XLoadFont(xDisplay, appData.coordFont);
+    coordFontStruct = XQueryFont(xDisplay, coordFontID);
+    // textHeight in !NLS mode!
+#endif
+    countFontID = coordFontID;  // [HGM] holdings
+    countFontStruct = coordFontStruct;
+
+    xdb = XtDatabase(xDisplay);
+#if ENABLE_NLS
+    XrmPutLineResource(&xdb, "*international: True");
+    vTo.size = sizeof(XFontSet);
+    vTo.addr = (XtPointer) &fontSet;
+    XrmPutResource(&xdb, "*fontSet", XtRFontSet, &vTo);
+#else
+    XrmPutStringResource(&xdb, "*font", appData.font);
+#endif
+}
+
 int
-main(argc, argv)
-     int argc;
-     char **argv;
+main (int argc, char **argv)
 {
-    int i, j, clockFontPxlSize, coordFontPxlSize, fontPxlSize;
+    int i, clockFontPxlSize, coordFontPxlSize, fontPxlSize;
     XSetWindowAttributes window_attributes;
     Arg args[16];
-    Dimension timerWidth, boardWidth, boardHeight, w, h, sep, bor, wr, hr;
-    XrmValue vFrom, vTo;
-    XtGeometryResult gres;
+    Dimension boardWidth, boardHeight, w, h;
     char *p;
-    XrmDatabase xdb;
     int forceMono = False;
 
     srandom(time(0)); // [HGM] book: make random truly random
@@ -1998,14 +1186,14 @@ main(argc, argv)
 
 #ifdef ENABLE_NLS
     XtSetLanguageProc(NULL, NULL, NULL);
+    if (appData.debugMode) {
+      fprintf(debugFP, "locale = %s\n", setlocale(LC_ALL, NULL));
+    }
+
     bindtextdomain(PACKAGE, LOCALEDIR);
     textdomain(PACKAGE);
 #endif
 
-    shellWidget =
-      XtAppInitialize(&appContext, "XBoard", shellOptions,
-		      XtNumber(shellOptions),
-		      &argc, argv, xboardResources, NULL, 0);
     appData.boardSize = "";
     InitAppData(ConvertToLine(argc, argv));
     p = getenv("HOME");
@@ -2016,10 +1204,6 @@ main(argc, argv)
     snprintf(gameCopyFilename,i, "%s/.xboard%05uc.pgn", p, getpid());
     snprintf(gamePasteFilename,i, "%s/.xboard%05up.pgn", p, getpid());
 
-    XtGetApplicationResources(shellWidget, (XtPointer) &appData,
-			      clientResources, XtNumber(clientResources),
-			      NULL, 0);
-
     { // [HGM] initstring: kludge to fix bad bug. expand '\n' characters in init string and computer string.
 	static char buf[MSG_SIZ];
 	EscapeExpand(buf, appData.firstInitString);
@@ -2051,12 +1235,6 @@ main(argc, argv)
         setbuf(debugFP, NULL);
     }
 
-#if ENABLE_NLS
-    if (appData.debugMode) {
-      fprintf(debugFP, "locale = %s\n", setlocale(LC_ALL, NULL));
-    }
-#endif
-
     /* [HGM,HR] make sure board size is acceptable */
     if(appData.NrFiles > BOARD_FILES ||
        appData.NrRanks > BOARD_RANKS   )
@@ -2068,16 +1246,25 @@ main(argc, argv)
 #endif
     InitBackEnd1();
 
+	gameInfo.variant = StringToVariant(appData.variant);
+	InitPosition(FALSE);
+
+    shellWidget =
+      XtAppInitialize(&appContext, "XBoard", shellOptions,
+		      XtNumber(shellOptions),
+		      &argc, argv, xboardResources, NULL, 0);
+
+    XtGetApplicationResources(shellWidget, (XtPointer) &appData,
+			      clientResources, XtNumber(clientResources),
+			      NULL, 0);
+
     xDisplay = XtDisplay(shellWidget);
     xScreen = DefaultScreen(xDisplay);
     wm_delete_window = XInternAtom(xDisplay, "WM_DELETE_WINDOW", True);
 
-	gameInfo.variant = StringToVariant(appData.variant);
-	InitPosition(FALSE);
-
-#ifdef IDSIZE
-    InitDrawingSizes(-1, 0); // [HGM] initsize: make this into a subroutine
-#else
+    /*
+     * determine size, based on supplied or remembered -size, or screen size
+     */
     if (isdigit(appData.boardSize[0])) {
         i = sscanf(appData.boardSize, "%d,%d,%d,%d,%d,%d,%d", &squareSize,
 		   &lineGap, &clockFontPxlSize, &coordFontPxlSize,
@@ -2134,12 +1321,6 @@ main(argc, argv)
 	tinyLayout = szd->tinyLayout;
 	// [HGM] font: use defaults from settings file if available and not overruled
     }
-    if(!fontIsSet[CLOCK_FONT] && fontValid[CLOCK_FONT][squareSize])
-	appData.clockFont = fontTable[CLOCK_FONT][squareSize];
-    if(!fontIsSet[MESSAGE_FONT] && fontValid[MESSAGE_FONT][squareSize])
-	appData.font = fontTable[MESSAGE_FONT][squareSize];
-    if(!fontIsSet[COORD_FONT] && fontValid[COORD_FONT][squareSize])
-	appData.coordFont = fontTable[COORD_FONT][squareSize];
 
     /* Now, using squareSize as a hint, find a good XPM/XIM set size */
     if (strlen(appData.pixmapDirectory) > 0) {
@@ -2165,61 +1346,11 @@ XBoard square size (hint): %d\n\
     /* [HR] height treated separately (hacked) */
     boardWidth = lineGap + BOARD_WIDTH * (squareSize + lineGap);
     boardHeight = lineGap + BOARD_HEIGHT * (squareSize + lineGap);
-    if (appData.showJail == 1) {
-	/* Jail on top and bottom */
-	XtSetArg(boardArgs[1], XtNwidth, boardWidth);
-	XtSetArg(boardArgs[2], XtNheight,
-		 boardHeight + 2*(lineGap + squareSize));
-    } else if (appData.showJail == 2) {
-	/* Jail on sides */
-	XtSetArg(boardArgs[1], XtNwidth,
-		 boardWidth + 2*(lineGap + squareSize));
-	XtSetArg(boardArgs[2], XtNheight, boardHeight);
-    } else {
-	/* No jail */
-	XtSetArg(boardArgs[1], XtNwidth, boardWidth);
-	XtSetArg(boardArgs[2], XtNheight, boardHeight);
-    }
 
     /*
      * Determine what fonts to use.
      */
-#if ENABLE_NLS
-    appData.font = InsertPxlSize(appData.font, fontPxlSize);
-    appData.clockFont = InsertPxlSize(appData.clockFont, clockFontPxlSize);
-    appData.coordFont = InsertPxlSize(appData.coordFont, coordFontPxlSize);
-    fontSet = CreateFontSet(appData.font);
-    clockFontSet = CreateFontSet(appData.clockFont);
-    {
-      /* For the coordFont, use the 0th font of the fontset. */
-      XFontSet coordFontSet = CreateFontSet(appData.coordFont);
-      XFontStruct **font_struct_list;
-      char **font_name_list;
-      XFontsOfFontSet(coordFontSet, &font_struct_list, &font_name_list);
-      coordFontID = XLoadFont(xDisplay, font_name_list[0]);
-      coordFontStruct = XQueryFont(xDisplay, coordFontID);
-    }
-#else
-    appData.font = FindFont(appData.font, fontPxlSize);
-    appData.clockFont = FindFont(appData.clockFont, clockFontPxlSize);
-    appData.coordFont = FindFont(appData.coordFont, coordFontPxlSize);
-    clockFontID = XLoadFont(xDisplay, appData.clockFont);
-    clockFontStruct = XQueryFont(xDisplay, clockFontID);
-    coordFontID = XLoadFont(xDisplay, appData.coordFont);
-    coordFontStruct = XQueryFont(xDisplay, coordFontID);
-#endif
-    countFontID = coordFontID;  // [HGM] holdings
-    countFontStruct = coordFontStruct;
-
-    xdb = XtDatabase(xDisplay);
-#if ENABLE_NLS
-    XrmPutLineResource(&xdb, "*international: True");
-    vTo.size = sizeof(XFontSet);
-    vTo.addr = (XtPointer) &fontSet;
-    XrmPutResource(&xdb, "*fontSet", XtRFontSet, &vTo);
-#else
-    XrmPutStringResource(&xdb, "*font", appData.font);
-#endif
+    InitializeFonts(clockFontPxlSize, coordFontPxlSize, fontPxlSize);
 
     /*
      * Detect if there are not enough colors available and adapt.
@@ -2236,16 +1367,6 @@ XBoard square size (hint): %d\n\
 	appData.monoMode = True;
     }
 
-    if (appData.lowTimeWarning && !appData.monoMode) {
-      vFrom.addr = (caddr_t) appData.lowTimeWarningColor;
-      vFrom.size = strlen(appData.lowTimeWarningColor);
-      XtConvert(shellWidget, XtRString, &vFrom, XtRPixel, &vTo);
-      if (vTo.addr == NULL)
-		appData.monoMode = True;
-      else
-		lowTimeWarningColor = *(Pixel *) vTo.addr;
-    }
-
     if (appData.monoMode && appData.debugMode) {
 	fprintf(stderr, _("white pixel = 0x%lx, black pixel = 0x%lx\n"),
 		(unsigned long) XWhitePixel(xDisplay, xScreen),
@@ -2253,8 +1374,6 @@ XBoard square size (hint): %d\n\
     }
 
     ParseIcsTextColors();
-    textColors[ColorNone].fg = textColors[ColorNone].bg = -1;
-    textColors[ColorNone].attr = 0;
 
     XtAppAddActions(appContext, boardActions, XtNumber(boardActions));
 
@@ -2268,353 +1387,39 @@ XBoard square size (hint): %d\n\
     } else {
 	layoutName = "normalLayout";
     }
-    /* Outer layoutWidget is there only to provide a name for use in
-       resources that depend on the layout style */
-    layoutWidget =
-      XtCreateManagedWidget(layoutName, formWidgetClass, shellWidget,
-			    layoutArgs, XtNumber(layoutArgs));
-    formWidget =
-      XtCreateManagedWidget("form", formWidgetClass, layoutWidget,
-			    formArgs, XtNumber(formArgs));
-    XtSetArg(args[0], XtNdefaultDistance, &sep);
-    XtGetValues(formWidget, args, 1);
-
-    j = 0;
-    widgetList[j++] = menuBarWidget = CreateMenuBar(menuBar, boardWidth);
-    XtSetArg(args[0], XtNtop,    XtChainTop);
-    XtSetArg(args[1], XtNbottom, XtChainTop);
-    XtSetArg(args[2], XtNright,  XtChainLeft);
-    XtSetValues(menuBarWidget, args, 3);
-
-    widgetList[j++] = whiteTimerWidget =
-      XtCreateWidget("whiteTime", labelWidgetClass,
-		     formWidget, timerArgs, XtNumber(timerArgs));
-#if ENABLE_NLS
-    XtSetArg(args[0], XtNfontSet, clockFontSet);
-#else
-    XtSetArg(args[0], XtNfont, clockFontStruct);
-#endif
-    XtSetArg(args[1], XtNtop,    XtChainTop);
-    XtSetArg(args[2], XtNbottom, XtChainTop);
-    XtSetValues(whiteTimerWidget, args, 3);
 
-    widgetList[j++] = blackTimerWidget =
-      XtCreateWidget("blackTime", labelWidgetClass,
-		     formWidget, timerArgs, XtNumber(timerArgs));
+    optList = BoardPopUp(squareSize, lineGap, (void*)
 #if ENABLE_NLS
-    XtSetArg(args[0], XtNfontSet, clockFontSet);
+						&clockFontSet);
 #else
-    XtSetArg(args[0], XtNfont, clockFontStruct);
+						&clockFonStruct);
 #endif
-    XtSetArg(args[1], XtNtop,    XtChainTop);
-    XtSetArg(args[2], XtNbottom, XtChainTop);
-    XtSetValues(blackTimerWidget, args, 3);
-
-    if (appData.titleInWindow) {
-	widgetList[j++] = titleWidget =
-	  XtCreateWidget("title", labelWidgetClass, formWidget,
-			 titleArgs, XtNumber(titleArgs));
-	XtSetArg(args[0], XtNtop,    XtChainTop);
-	XtSetArg(args[1], XtNbottom, XtChainTop);
-	XtSetValues(titleWidget, args, 2);
-    }
-
-    if (appData.showButtonBar) {
-      widgetList[j++] = buttonBarWidget = CreateButtonBar(buttonBar);
-      XtSetArg(args[0], XtNleft,  XtChainRight); // [HGM] glue to right window edge
-      XtSetArg(args[1], XtNright, XtChainRight); //       for good run-time sizing
-      XtSetArg(args[2], XtNtop,    XtChainTop);
-      XtSetArg(args[3], XtNbottom, XtChainTop);
-      XtSetValues(buttonBarWidget, args, 4);
-    }
-
-    widgetList[j++] = messageWidget =
-      XtCreateWidget("message", labelWidgetClass, formWidget,
-		     messageArgs, XtNumber(messageArgs));
-    XtSetArg(args[0], XtNtop,    XtChainTop);
-    XtSetArg(args[1], XtNbottom, XtChainTop);
-    XtSetValues(messageWidget, args, 2);
-
-    widgetList[j++] = boardWidget =
-      XtCreateWidget("board", widgetClass, formWidget, boardArgs,
-		     XtNumber(boardArgs));
-
-    XtManageChildren(widgetList, j);
-
-    timerWidth = (boardWidth - sep) / 2;
-    XtSetArg(args[0], XtNwidth, timerWidth);
-    XtSetValues(whiteTimerWidget, args, 1);
-    XtSetValues(blackTimerWidget, args, 1);
-
+    boardWidget      = optList[W_BOARD].handle;
+    menuBarWidget    = optList[W_MENU].handle;
+    dropMenu         = optList[W_DROP].handle;
+    titleWidget = optList[optList[W_TITLE].type != -1 ? W_TITLE : W_SMALL].handle;
+    formWidget  = XtParent(boardWidget);
     XtSetArg(args[0], XtNbackground, &timerBackgroundPixel);
     XtSetArg(args[1], XtNforeground, &timerForegroundPixel);
-    XtGetValues(whiteTimerWidget, args, 2);
-
-    if (appData.showButtonBar) {
+    XtGetValues(optList[W_WHITE].handle, args, 2);
+    if (appData.showButtonBar) { // can't we use timer pixels for this? (Or better yet, just black & white?)
       XtSetArg(args[0], XtNbackground, &buttonBackgroundPixel);
       XtSetArg(args[1], XtNforeground, &buttonForegroundPixel);
-      XtGetValues(XtNameToWidget(buttonBarWidget, PAUSE_BUTTON), args, 2);
+      XtGetValues(optList[W_PAUSE].handle, args, 2);
     }
-
-    /*
-     * formWidget uses these constraints but they are stored
-     * in the children.
-     */
-    i = 0;
-    XtSetArg(args[i], XtNfromHoriz, 0); i++;
-    XtSetValues(menuBarWidget, args, i);
-    if (appData.titleInWindow) {
-	if (smallLayout) {
-	    i = 0;
-	    XtSetArg(args[i], XtNfromVert, menuBarWidget); i++;
-	    XtSetValues(whiteTimerWidget, args, i);
-	    i = 0;
-	    XtSetArg(args[i], XtNfromVert, menuBarWidget); i++;
-	    XtSetArg(args[i], XtNfromHoriz, whiteTimerWidget); i++;
-	    XtSetValues(blackTimerWidget, args, i);
-	    i = 0;
-	    XtSetArg(args[i], XtNfromVert, whiteTimerWidget); i++;
-            XtSetArg(args[i], XtNjustify, XtJustifyLeft); i++;
-	    XtSetValues(titleWidget, args, i);
-	    i = 0;
-	    XtSetArg(args[i], XtNfromVert, titleWidget); i++;
-	    XtSetArg(args[i], XtNresizable, (XtArgVal) True); i++;
-	    XtSetValues(messageWidget, args, i);
-	    if (appData.showButtonBar) {
-	      i = 0;
-	      XtSetArg(args[i], XtNfromVert, titleWidget); i++;
-	      XtSetArg(args[i], XtNfromHoriz, messageWidget); i++;
-	      XtSetValues(buttonBarWidget, args, i);
-	    }
-	} else {
-	    i = 0;
-	    XtSetArg(args[i], XtNfromVert, titleWidget); i++;
-	    XtSetValues(whiteTimerWidget, args, i);
-	    i = 0;
-	    XtSetArg(args[i], XtNfromVert, titleWidget); i++;
-	    XtSetArg(args[i], XtNfromHoriz, whiteTimerWidget); i++;
-	    XtSetValues(blackTimerWidget, args, i);
-	    i = 0;
-	    XtSetArg(args[i], XtNfromHoriz, menuBarWidget); i++;
-	    XtSetValues(titleWidget, args, i);
-	    i = 0;
-	    XtSetArg(args[i], XtNfromVert, whiteTimerWidget); i++;
-	    XtSetArg(args[i], XtNresizable, (XtArgVal) True); i++;
-	    XtSetValues(messageWidget, args, i);
-	    if (appData.showButtonBar) {
-	      i = 0;
-	      XtSetArg(args[i], XtNfromVert, whiteTimerWidget); i++;
-	      XtSetArg(args[i], XtNfromHoriz, messageWidget); i++;
-	      XtSetValues(buttonBarWidget, args, i);
-	    }
-	}
-    } else {
-	i = 0;
-	XtSetArg(args[i], XtNfromVert, menuBarWidget); i++;
-	XtSetValues(whiteTimerWidget, args, i);
-	i = 0;
-	XtSetArg(args[i], XtNfromVert, menuBarWidget); i++;
-	XtSetArg(args[i], XtNfromHoriz, whiteTimerWidget); i++;
-	XtSetValues(blackTimerWidget, args, i);
-	i = 0;
-	XtSetArg(args[i], XtNfromVert, whiteTimerWidget); i++;
-	XtSetArg(args[i], XtNresizable, (XtArgVal) True); i++;
-	XtSetValues(messageWidget, args, i);
-	if (appData.showButtonBar) {
-	  i = 0;
-	  XtSetArg(args[i], XtNfromVert, whiteTimerWidget); i++;
-	  XtSetArg(args[i], XtNfromHoriz, messageWidget); i++;
-	  XtSetValues(buttonBarWidget, args, i);
-	}
-    }
-    i = 0;
-    XtSetArg(args[0], XtNfromVert, messageWidget);
-    XtSetArg(args[1], XtNtop,    XtChainTop);
-    XtSetArg(args[2], XtNbottom, XtChainBottom);
-    XtSetArg(args[3], XtNleft,   XtChainLeft);
-    XtSetArg(args[4], XtNright,  XtChainRight);
-    XtSetValues(boardWidget, args, 5);
-
-    XtRealizeWidget(shellWidget);
-
-    if(wpMain.x > 0) {
-      XtSetArg(args[0], XtNx, wpMain.x);
-      XtSetArg(args[1], XtNy, wpMain.y);
-      XtSetValues(shellWidget, args, 2);
-    }
-
-    /*
-     * Correct the width of the message and title widgets.
-     * It is not known why some systems need the extra fudge term.
-     * The value "2" is probably larger than needed.
-     */
-    XawFormDoLayout(formWidget, False);
-
-#define WIDTH_FUDGE 2
-    i = 0;
-    XtSetArg(args[i], XtNborderWidth, &bor);  i++;
-    XtSetArg(args[i], XtNheight, &h);  i++;
-    XtGetValues(messageWidget, args, i);
-    if (appData.showButtonBar) {
-      i = 0;
-      XtSetArg(args[i], XtNwidth, &w);  i++;
-      XtGetValues(buttonBarWidget, args, i);
-      w = boardWidth - w - sep - 2*bor - WIDTH_FUDGE;
-    } else {
-      w = boardWidth - 2*bor + 1; /*!! +1 compensates for kludge below */
-    }
-
-    gres = XtMakeResizeRequest(messageWidget, w, h, &wr, &hr);
-    if (gres != XtGeometryYes && appData.debugMode) {
-      fprintf(stderr, _("%s: messageWidget geometry error %d %d %d %d %d\n"),
-	      programName, gres, w, h, wr, hr);
-    }
-
-    /* !! Horrible hack to work around bug in XFree86 4.0.1 (X11R6.4.3) */
-    /* The size used for the child widget in layout lags one resize behind
-       its true size, so we resize a second time, 1 pixel smaller.  Yeech! */
-    w--;
-    gres = XtMakeResizeRequest(messageWidget, w, h, &wr, &hr);
-    if (gres != XtGeometryYes && appData.debugMode) {
-      fprintf(stderr, _("%s: messageWidget geometry error %d %d %d %d %d\n"),
-	      programName, gres, w, h, wr, hr);
-    }
-    /* !! end hack */
-    XtSetArg(args[0], XtNleft,  XtChainLeft);  // [HGM] glue ends for good run-time sizing
-    XtSetArg(args[1], XtNright, XtChainRight);
-    XtSetValues(messageWidget, args, 2);
-
-    if (appData.titleInWindow) {
-	i = 0;
-	XtSetArg(args[i], XtNborderWidth, &bor); i++;
-	XtSetArg(args[i], XtNheight, &h);  i++;
-	XtGetValues(titleWidget, args, i);
-	if (smallLayout) {
-	    w = boardWidth - 2*bor;
-	} else {
-	    XtSetArg(args[0], XtNwidth, &w);
-	    XtGetValues(menuBarWidget, args, 1);
-	    w = boardWidth - w - sep - 2*bor - WIDTH_FUDGE;
-	}
-
-	gres = XtMakeResizeRequest(titleWidget, w, h, &wr, &hr);
-	if (gres != XtGeometryYes && appData.debugMode) {
-	    fprintf(stderr,
-		    _("%s: titleWidget geometry error %d %d %d %d %d\n"),
-		    programName, gres, w, h, wr, hr);
-	}
-    }
-    XawFormDoLayout(formWidget, True);
+    AppendEnginesToMenu(appData.recentEngineList);
 
     xBoardWindow = XtWindow(boardWidget);
 
     // [HGM] it seems the layout code ends here, but perhaps the color stuff is size independent and would
     //       not need to go into InitDrawingSizes().
-#endif
 
     /*
      * Create X checkmark bitmap and initialize option menu checks.
      */
     ReadBitmap(&xMarkPixmap, "checkmark.bm",
 	       checkmark_bits, checkmark_width, checkmark_height);
-    XtSetArg(args[0], XtNleftBitmap, xMarkPixmap);
-#ifndef OPTIONSDIALOG
-    if (appData.alwaysPromoteToQueen) {
-	XtSetValues(XtNameToWidget(menuBarWidget, "menuOptions.Always Queen"),
-		    args, 1);
-    }
-    if (appData.animateDragging) {
-	XtSetValues(XtNameToWidget(menuBarWidget,
-				   "menuOptions.Animate Dragging"),
-		    args, 1);
-    }
-    if (appData.animate) {
-	XtSetValues(XtNameToWidget(menuBarWidget, "menuOptions.Animate Moving"),
-		    args, 1);
-    }
-    if (appData.autoCallFlag) {
-	XtSetValues(XtNameToWidget(menuBarWidget, "menuOptions.Auto Flag"),
-		    args, 1);
-    }
-    if (appData.autoFlipView) {
-	XtSetValues(XtNameToWidget(menuBarWidget,"menuOptions.Auto Flip View"),
-		    args, 1);
-    }
-    if (appData.blindfold) {
-	XtSetValues(XtNameToWidget(menuBarWidget,
-				   "menuOptions.Blindfold"), args, 1);
-    }
-    if (appData.flashCount > 0) {
-	XtSetValues(XtNameToWidget(menuBarWidget,
-				   "menuOptions.Flash Moves"),
-		    args, 1);
-    }
-#if HIGHDRAG
-    if (appData.highlightDragging) {
-	XtSetValues(XtNameToWidget(menuBarWidget,
-				   "menuOptions.Highlight Dragging"),
-		    args, 1);
-    }
-#endif
-    if (appData.highlightLastMove) {
-	XtSetValues(XtNameToWidget(menuBarWidget,
-				   "menuOptions.Highlight Last Move"),
-		    args, 1);
-    }
-    if (appData.highlightMoveWithArrow) {
-	XtSetValues(XtNameToWidget(menuBarWidget,
-				   "menuOptions.Arrow"),
-		    args, 1);
-    }
-//    if (appData.icsAlarm) {
-//	XtSetValues(XtNameToWidget(menuBarWidget, "menuOptions.ICS Alarm"),
-//		    args, 1);
-//    }
-    if (appData.ringBellAfterMoves) {
-	XtSetValues(XtNameToWidget(menuBarWidget, "menuOptions.Move Sound"),
-		    args, 1);
-    }
-    if (appData.oneClick) {
-	XtSetValues(XtNameToWidget(menuBarWidget,
-				   "menuOptions.OneClick"), args, 1);
-    }
-    if (appData.periodicUpdates) {
-	XtSetValues(XtNameToWidget(menuBarWidget,
-				   "menuOptions.Periodic Updates"), args, 1);
-    }
-    if (appData.ponderNextMove) {
-	XtSetValues(XtNameToWidget(menuBarWidget,
-				   "menuOptions.Ponder Next Move"), args, 1);
-    }
-    if (appData.popupExitMessage) {
-	XtSetValues(XtNameToWidget(menuBarWidget,
-				   "menuOptions.Popup Exit Message"), args, 1);
-    }
-    if (appData.popupMoveErrors) {
-	XtSetValues(XtNameToWidget(menuBarWidget,
-				   "menuOptions.Popup Move Errors"), args, 1);
-    }
-//    if (appData.premove) {
-//	XtSetValues(XtNameToWidget(menuBarWidget,
-//				   "menuOptions.Premove"), args, 1);
-//    }
-    if (appData.showCoords) {
-	XtSetValues(XtNameToWidget(menuBarWidget, "menuOptions.Show Coords"),
-		    args, 1);
-    }
-    if (appData.hideThinkingFromHuman) {
-	XtSetValues(XtNameToWidget(menuBarWidget, "menuOptions.Hide Thinking"),
-		    args, 1);
-    }
-    if (appData.testLegality) {
-	XtSetValues(XtNameToWidget(menuBarWidget,"menuOptions.Test Legality"),
-		    args, 1);
-    }
-#endif
-    if (saveSettingsOnExit) {
-	XtSetValues(XtNameToWidget(menuBarWidget,"menuOptions.Save Settings on Exit"),
-		    args, 1);
-    }
+    InitMenuMarkers();
 
     /*
      * Create an icon.
@@ -2653,27 +1458,16 @@ XBoard square size (hint): %d\n\
     CreateGrid();
     CreateAnyPieces();
 
-    CreatePieceMenus();
-
     if (appData.animate || appData.animateDragging)
       CreateAnimVars();
 
     XtAugmentTranslations(formWidget,
 			  XtParseTranslationTable(globalTranslations));
-    XtAugmentTranslations(boardWidget,
-			  XtParseTranslationTable(boardTranslations));
-    XtAugmentTranslations(whiteTimerWidget,
-			  XtParseTranslationTable(whiteTranslations));
-    XtAugmentTranslations(blackTimerWidget,
-			  XtParseTranslationTable(blackTranslations));
-
-    /* Why is the following needed on some versions of X instead
-     * of a translation? */
-    XtAddEventHandler(boardWidget, ExposureMask|PointerMotionMask, False,
-		      (XtEventHandler) EventProc, NULL);
-    /* end why */
+
     XtAddEventHandler(formWidget, KeyPressMask, False,
 		      (XtEventHandler) MoveTypeInProc, NULL);
+    XtAddEventHandler(shellWidget, StructureNotifyMask, False,
+		      (XtEventHandler) EventProc, NULL);
 
     /* [AS] Restore layout */
     if( wpMoveHistory.visible ) {
@@ -2708,6 +1502,7 @@ XBoard square size (hint): %d\n\
 	    signal(SIGUSR1, CmailSigHandler);
 	}
     }
+
     gameInfo.boardWidth = 0; // [HGM] pieces: kludge to ensure InitPosition() calls InitDrawingSizes()
     InitPosition(TRUE);
 //    XtSetKeyboardFocus(shellWidget, formWidget);
@@ -2718,35 +1513,20 @@ XBoard square size (hint): %d\n\
     return 0;
 }
 
-static Boolean noEcho;
-
-void
-ShutDownFrontEnd()
-{
-    if (appData.icsActive && oldICSInteractionTitle != NULL) {
-        DisplayIcsInteractionTitle(oldICSInteractionTitle);
-    }
-    if (saveSettingsOnExit) SaveSettings(settingsFileName);
-    unlink(gameCopyFilename);
-    unlink(gamePasteFilename);
-    if(noEcho) EchoOn();
-}
-
-RETSIGTYPE TermSizeSigHandler(int sig)
+RETSIGTYPE
+TermSizeSigHandler (int sig)
 {
     update_ics_width();
 }
 
 RETSIGTYPE
-IntSigHandler(sig)
-     int sig;
+IntSigHandler (int sig)
 {
     ExitEvent(sig);
 }
 
 RETSIGTYPE
-CmailSigHandler(sig)
-     int sig;
+CmailSigHandler (int sig)
 {
     int dummy = 0;
     int error;
@@ -2760,12 +1540,7 @@ CmailSigHandler(sig)
 }
 
 void
-CmailSigHandlerCallBack(isr, closure, message, count, error)
-     InputSourceRef isr;
-     VOIDSTAR closure;
-     char *message;
-     int count;
-     int error;
+CmailSigHandlerCallBack (InputSourceRef isr, VOIDSTAR closure, char *message, int count, int error)
 {
     BoardToTop();
     ReloadCmailMsgEvent(TRUE);	/* Reload cmail msg  */
@@ -2773,387 +1548,11 @@ CmailSigHandlerCallBack(isr, closure, message, count, error)
 /**** end signal code ****/
 
 
-void
-ICSInitScript()
-{
-  /* try to open the icsLogon script, either in the location given
-   * or in the users HOME directory
-   */
-
-  FILE *f;
-  char buf[MSG_SIZ];
-  char *homedir;
-
-  f = fopen(appData.icsLogon, "r");
-  if (f == NULL)
-    {
-      homedir = getenv("HOME");
-      if (homedir != NULL)
-	{
-	  safeStrCpy(buf, homedir, sizeof(buf)/sizeof(buf[0]) );
-	  strncat(buf, "/", MSG_SIZ - strlen(buf) - 1);
-	  strncat(buf, appData.icsLogon,  MSG_SIZ - strlen(buf) - 1);
-	  f = fopen(buf, "r");
-	}
-    }
-
-  if (f != NULL)
-    ProcessICSInitScript(f);
-  else
-    printf("Warning: Couldn't open icsLogon file (checked %s and %s).\n", appData.icsLogon, buf);
-
-  return;
-}
-
-void
-ResetFrontEnd()
-{
-    CommentPopDown();
-    TagsPopDown();
-    return;
-}
-
-typedef struct {
-    char *name;
-    Boolean value;
-} Enables;
-
-void
-GreyRevert(grey)
-     Boolean grey;
-{
-    Widget w;
-    if (!menuBarWidget) return;
-    w = XtNameToWidget(menuBarWidget, "menuEdit.Revert");
-    if (w == NULL) {
-      DisplayError("menuEdit.Revert", 0);
-    } else {
-      XtSetSensitive(w, !grey);
-    }
-    w = XtNameToWidget(menuBarWidget, "menuEdit.Annotate");
-    if (w == NULL) {
-      DisplayError("menuEdit.Annotate", 0);
-    } else {
-      XtSetSensitive(w, !grey);
-    }
-}
-
-void
-SetMenuEnables(enab)
-     Enables *enab;
-{
-  Widget w;
-  if (!menuBarWidget) return;
-  while (enab->name != NULL) {
-    w = XtNameToWidget(menuBarWidget, enab->name);
-    if (w == NULL) {
-      DisplayError(enab->name, 0);
-    } else {
-      XtSetSensitive(w, enab->value);
-    }
-    enab++;
-  }
-}
-
-Enables icsEnables[] = {
-    { "menuFile.Mail Move", False },
-    { "menuFile.Reload CMail Message", False },
-    { "menuMode.Machine Black", False },
-    { "menuMode.Machine White", False },
-    { "menuMode.Analysis Mode", False },
-    { "menuMode.Analyze File", False },
-    { "menuMode.Two Machines", False },
-    { "menuMode.Machine Match", False },
-#ifndef ZIPPY
-    { "menuEngine.Hint", False },
-    { "menuEngine.Book", False },
-    { "menuEngine.Move Now", False },
-#ifndef OPTIONSDIALOG
-    { "menuOptions.Periodic Updates", False },
-    { "menuOptions.Hide Thinking", False },
-    { "menuOptions.Ponder Next Move", False },
-#endif
-#endif
-    { "menuEngine.Engine #1 Settings", False },
-    { "menuEngine.Engine #2 Settings", False },
-    { "menuEngine.Load Engine", False },
-    { "menuEdit.Annotate", False },
-    { "menuOptions.Match", False },
-    { NULL, False }
-};
-
-Enables ncpEnables[] = {
-    { "menuFile.Mail Move", False },
-    { "menuFile.Reload CMail Message", False },
-    { "menuMode.Machine White", False },
-    { "menuMode.Machine Black", False },
-    { "menuMode.Analysis Mode", False },
-    { "menuMode.Analyze File", False },
-    { "menuMode.Two Machines", False },
-    { "menuMode.Machine Match", False },
-    { "menuMode.ICS Client", False },
-    { "menuView.ICStex", False },
-    { "menuView.ICS Input Box", False },
-    { "Action", False },
-    { "menuEdit.Revert", False },
-    { "menuEdit.Annotate", False },
-    { "menuEngine.Engine #1 Settings", False },
-    { "menuEngine.Engine #2 Settings", False },
-    { "menuEngine.Move Now", False },
-    { "menuEngine.Retract Move", False },
-    { "menuOptions.ICS", False },
-#ifndef OPTIONSDIALOG
-    { "menuOptions.Auto Flag", False },
-    { "menuOptions.Auto Flip View", False },
-//    { "menuOptions.ICS Alarm", False },
-    { "menuOptions.Move Sound", False },
-    { "menuOptions.Hide Thinking", False },
-    { "menuOptions.Periodic Updates", False },
-    { "menuOptions.Ponder Next Move", False },
-#endif
-    { "menuEngine.Hint", False },
-    { "menuEngine.Book", False },
-    { NULL, False }
-};
-
-Enables gnuEnables[] = {
-    { "menuMode.ICS Client", False },
-    { "menuView.ICStex", False },
-    { "menuView.ICS Input Box", False },
-    { "menuAction.Accept", False },
-    { "menuAction.Decline", False },
-    { "menuAction.Rematch", False },
-    { "menuAction.Adjourn", False },
-    { "menuAction.Stop Examining", False },
-    { "menuAction.Stop Observing", False },
-    { "menuAction.Upload to Examine", False },
-    { "menuEdit.Revert", False },
-    { "menuEdit.Annotate", False },
-    { "menuOptions.ICS", False },
-
-    /* The next two options rely on SetCmailMode being called *after*    */
-    /* SetGNUMode so that when GNU is being used to give hints these     */
-    /* menu options are still available                                  */
-
-    { "menuFile.Mail Move", False },
-    { "menuFile.Reload CMail Message", False },
-    // [HGM] The following have been added to make a switch from ncp to GNU mode possible
-    { "menuMode.Machine White", True },
-    { "menuMode.Machine Black", True },
-    { "menuMode.Analysis Mode", True },
-    { "menuMode.Analyze File", True },
-    { "menuMode.Two Machines", True },
-    { "menuMode.Machine Match", True },
-    { "menuEngine.Engine #1 Settings", True },
-    { "menuEngine.Engine #2 Settings", True },
-    { "menuEngine.Hint", True },
-    { "menuEngine.Book", True },
-    { "menuEngine.Move Now", True },
-    { "menuEngine.Retract Move", True },
-    { "Action", True },
-    { NULL, False }
-};
-
-Enables cmailEnables[] = {
-    { "Action", True },
-    { "menuAction.Call Flag", False },
-    { "menuAction.Draw", True },
-    { "menuAction.Adjourn", False },
-    { "menuAction.Abort", False },
-    { "menuAction.Stop Observing", False },
-    { "menuAction.Stop Examining", False },
-    { "menuFile.Mail Move", True },
-    { "menuFile.Reload CMail Message", True },
-    { NULL, False }
-};
-
-Enables trainingOnEnables[] = {
-  { "menuMode.Edit Comment", False },
-  { "menuMode.Pause", False },
-  { "menuEdit.Forward", False },
-  { "menuEdit.Backward", False },
-  { "menuEdit.Forward to End", False },
-  { "menuEdit.Back to Start", False },
-  { "menuEngine.Move Now", False },
-  { "menuEdit.Truncate Game", False },
-  { NULL, False }
-};
-
-Enables trainingOffEnables[] = {
-  { "menuMode.Edit Comment", True },
-  { "menuMode.Pause", True },
-  { "menuEdit.Forward", True },
-  { "menuEdit.Backward", True },
-  { "menuEdit.Forward to End", True },
-  { "menuEdit.Back to Start", True },
-  { "menuEngine.Move Now", True },
-  { "menuEdit.Truncate Game", True },
-  { NULL, False }
-};
-
-Enables machineThinkingEnables[] = {
-  { "menuFile.Load Game", False },
-//  { "menuFile.Load Next Game", False },
-//  { "menuFile.Load Previous Game", False },
-//  { "menuFile.Reload Same Game", False },
-  { "menuEdit.Paste Game", False },
-  { "menuFile.Load Position", False },
-//  { "menuFile.Load Next Position", False },
-//  { "menuFile.Load Previous Position", False },
-//  { "menuFile.Reload Same Position", False },
-  { "menuEdit.Paste Position", False },
-  { "menuMode.Machine White", False },
-  { "menuMode.Machine Black", False },
-  { "menuMode.Two Machines", False },
-//  { "menuMode.Machine Match", False },
-  { "menuEngine.Retract Move", False },
-  { NULL, False }
-};
-
-Enables userThinkingEnables[] = {
-  { "menuFile.Load Game", True },
-//  { "menuFile.Load Next Game", True },
-//  { "menuFile.Load Previous Game", True },
-//  { "menuFile.Reload Same Game", True },
-  { "menuEdit.Paste Game", True },
-  { "menuFile.Load Position", True },
-//  { "menuFile.Load Next Position", True },
-//  { "menuFile.Load Previous Position", True },
-//  { "menuFile.Reload Same Position", True },
-  { "menuEdit.Paste Position", True },
-  { "menuMode.Machine White", True },
-  { "menuMode.Machine Black", True },
-  { "menuMode.Two Machines", True },
-//  { "menuMode.Machine Match", True },
-  { "menuEngine.Retract Move", True },
-  { NULL, False }
-};
-
-void SetICSMode()
-{
-  SetMenuEnables(icsEnables);
-
-#if ZIPPY
-  if (appData.zippyPlay && !appData.noChessProgram) { /* [DM] icsEngineAnalyze */
-     XtSetSensitive(XtNameToWidget(menuBarWidget, "menuMode.Analysis Mode"), True);
-     XtSetSensitive(XtNameToWidget(menuBarWidget, "menuEngine.Engine #1 Settings"), True);
-  }
-#endif
-}
-
-void
-SetNCPMode()
-{
-  SetMenuEnables(ncpEnables);
-}
-
-void
-SetGNUMode()
-{
-  SetMenuEnables(gnuEnables);
-}
-
-void
-SetCmailMode()
-{
-  SetMenuEnables(cmailEnables);
-}
-
-void
-SetTrainingModeOn()
-{
-  SetMenuEnables(trainingOnEnables);
-  if (appData.showButtonBar) {
-    XtSetSensitive(buttonBarWidget, False);
-  }
-  CommentPopDown();
-}
-
-void
-SetTrainingModeOff()
-{
-  SetMenuEnables(trainingOffEnables);
-  if (appData.showButtonBar) {
-    XtSetSensitive(buttonBarWidget, True);
-  }
-}
-
-void
-SetUserThinkingEnables()
-{
-  if (appData.noChessProgram) return;
-  SetMenuEnables(userThinkingEnables);
-}
-
-void
-SetMachineThinkingEnables()
-{
-  if (appData.noChessProgram) return;
-  SetMenuEnables(machineThinkingEnables);
-  switch (gameMode) {
-  case MachinePlaysBlack:
-  case MachinePlaysWhite:
-  case TwoMachinesPlay:
-    XtSetSensitive(XtNameToWidget(menuBarWidget,
-				  ModeToWidgetName(gameMode)), True);
-    break;
-  default:
-    break;
-  }
-}
-
-// [HGM] code borrowed from winboard.c (which should thus go to backend.c!)
-#define HISTORY_SIZE 64
-static char *history[HISTORY_SIZE];
-int histIn = 0, histP = 0;
-
-void
-SaveInHistory(char *cmd)
-{
-  if (history[histIn] != NULL) {
-    free(history[histIn]);
-    history[histIn] = NULL;
-  }
-  if (*cmd == NULLCHAR) return;
-  history[histIn] = StrSave(cmd);
-  histIn = (histIn + 1) % HISTORY_SIZE;
-  if (history[histIn] != NULL) {
-    free(history[histIn]);
-    history[histIn] = NULL;
-  }
-  histP = histIn;
-}
-
-char *
-PrevInHistory(char *cmd)
-{
-  int newhp;
-  if (histP == histIn) {
-    if (history[histIn] != NULL) free(history[histIn]);
-    history[histIn] = StrSave(cmd);
-  }
-  newhp = (histP - 1 + HISTORY_SIZE) % HISTORY_SIZE;
-  if (newhp == histIn || history[newhp] == NULL) return NULL;
-  histP = newhp;
-  return history[histP];
-}
-
-char *
-NextInHistory()
-{
-  if (histP == histIn) return NULL;
-  histP = (histP + 1) % HISTORY_SIZE;
-  return history[histP];   
-}
-// end of borrowed code
-
 #define Abs(n) ((n)<0 ? -(n) : (n))
 
 #ifdef ENABLE_NLS
 char *
-InsertPxlSize(pattern, targetPxlSize)
-     char *pattern;
-     int targetPxlSize;
+InsertPxlSize (char *pattern, int targetPxlSize)
 {
     char *base_fnt_lst, strInt[12], *p, *q;
     int alternatives, i, len, strIntLen;
@@ -3204,8 +1603,7 @@ InsertPxlSize(pattern, targetPxlSize)
 }
 
 XFontSet
-CreateFontSet(base_fnt_lst)
-     char *base_fnt_lst;
+CreateFontSet (char *base_fnt_lst)
 {
     XFontSet fntSet;
     char **missing_list;
@@ -3249,9 +1647,7 @@ CreateFontSet(base_fnt_lst)
  * longer needed.
  */
 char *
-FindFont(pattern, targetPxlSize)
-     char *pattern;
-     int targetPxlSize;
+FindFont (char *pattern, int targetPxlSize)
 {
     char **fonts, *p, *best, *scalable, *scalableTail;
     int i, j, nfonts, minerr, err, pxlSize;
@@ -3308,7 +1704,8 @@ FindFont(pattern, targetPxlSize)
 }
 #endif
 
-void DeleteGCs()
+void
+DeleteGCs ()
 {   // [HGM] deletes GCs that are to be remade, to prevent resource leak;
     // must be called before all non-first callse to CreateGCs()
     XtReleaseGC(shellWidget, highlineGC);
@@ -3323,22 +1720,30 @@ void DeleteGCs()
 	}
     } else {
 	XtReleaseGC(shellWidget, prelineGC);
-	XtReleaseGC(shellWidget, jailSquareGC);
 	XtReleaseGC(shellWidget, wdPieceGC);
 	XtReleaseGC(shellWidget, wlPieceGC);
-	XtReleaseGC(shellWidget, wjPieceGC);
 	XtReleaseGC(shellWidget, bdPieceGC);
 	XtReleaseGC(shellWidget, blPieceGC);
-	XtReleaseGC(shellWidget, bjPieceGC);
     }
 }
 
-void CreateGCs(int redo)
+static GC
+CreateOneGC (XGCValues *gc_values, Pixel foreground, Pixel background)
 {
     XtGCMask value_mask = GCLineWidth | GCLineStyle | GCForeground
       | GCBackground | GCFunction | GCPlaneMask;
+    gc_values->foreground = foreground;
+    gc_values->background = background;
+    return XtGetGC(shellWidget, value_mask, gc_values);
+}
+
+static void
+CreateGCs (int redo)
+{
     XGCValues gc_values;
     GC copyInvertedGC;
+    Pixel white = XWhitePixel(xDisplay, xScreen);
+    Pixel black = XBlackPixel(xDisplay, xScreen);
 
     gc_values.plane_mask = AllPlanes;
     gc_values.line_width = lineGap;
@@ -3348,40 +1753,25 @@ void CreateGCs(int redo)
   if(redo) {
     DeleteGCs(); // called a second time; clean up old GCs first
   } else { // [HGM] grid and font GCs created on first call only
-    gc_values.foreground = XBlackPixel(xDisplay, xScreen);
-    gc_values.background = XWhitePixel(xDisplay, xScreen);
-    coordGC = XtGetGC(shellWidget, value_mask, &gc_values);
+    coordGC = CreateOneGC(&gc_values, black, white);
     XSetFont(xDisplay, coordGC, coordFontID);
 
     // [HGM] make font for holdings counts (white on black)
-    gc_values.foreground = XWhitePixel(xDisplay, xScreen);
-    gc_values.background = XBlackPixel(xDisplay, xScreen);
-    countGC = XtGetGC(shellWidget, value_mask, &gc_values);
+    countGC = CreateOneGC(&gc_values, white, black);
     XSetFont(xDisplay, countGC, countFontID);
   }
-    gc_values.foreground = XBlackPixel(xDisplay, xScreen);
-    gc_values.background = XBlackPixel(xDisplay, xScreen);
-    lineGC = XtGetGC(shellWidget, value_mask, &gc_values);
+    lineGC = CreateOneGC(&gc_values, black, black);
 
     if (appData.monoMode) {
-	gc_values.foreground = XWhitePixel(xDisplay, xScreen);
-	gc_values.background = XWhitePixel(xDisplay, xScreen);
-	highlineGC = XtGetGC(shellWidget, value_mask, &gc_values);
-
-	gc_values.foreground = XWhitePixel(xDisplay, xScreen);
-	gc_values.background = XBlackPixel(xDisplay, xScreen);
-	lightSquareGC = wbPieceGC
-	  = XtGetGC(shellWidget, value_mask, &gc_values);
 
-	gc_values.foreground = XBlackPixel(xDisplay, xScreen);
-	gc_values.background = XWhitePixel(xDisplay, xScreen);
-	darkSquareGC = bwPieceGC
-	  = XtGetGC(shellWidget, value_mask, &gc_values);
+	highlineGC = CreateOneGC(&gc_values, white, white);
+	lightSquareGC = wbPieceGC = CreateOneGC(&gc_values, white, black);
+	darkSquareGC = bwPieceGC = CreateOneGC(&gc_values, black, white);
 
 	if (DefaultDepth(xDisplay, xScreen) == 1) {
 	    /* Avoid XCopyPlane on 1-bit screens to work around Sun bug */
 	    gc_values.function = GXcopyInverted;
-	    copyInvertedGC = XtGetGC(shellWidget, value_mask, &gc_values);
+	    copyInvertedGC = CreateOneGC(&gc_values, black, white);
 	    gc_values.function = GXcopy;
 	    if (XBlackPixel(xDisplay, xScreen) == 1) {
 		bwPieceGC = darkSquareGC;
@@ -3392,58 +1782,20 @@ void CreateGCs(int redo)
 	    }
 	}
     } else {
-	gc_values.foreground = highlightSquareColor;
-	gc_values.background = highlightSquareColor;
-	highlineGC = XtGetGC(shellWidget, value_mask, &gc_values);
-
-	gc_values.foreground = premoveHighlightColor;
-	gc_values.background = premoveHighlightColor;
-	prelineGC = XtGetGC(shellWidget, value_mask, &gc_values);
-
-	gc_values.foreground = lightSquareColor;
-	gc_values.background = darkSquareColor;
-	lightSquareGC = XtGetGC(shellWidget, value_mask, &gc_values);
-
-	gc_values.foreground = darkSquareColor;
-	gc_values.background = lightSquareColor;
-	darkSquareGC = XtGetGC(shellWidget, value_mask, &gc_values);
-
-	gc_values.foreground = jailSquareColor;
-	gc_values.background = jailSquareColor;
-	jailSquareGC = XtGetGC(shellWidget, value_mask, &gc_values);
 
-	gc_values.foreground = whitePieceColor;
-	gc_values.background = darkSquareColor;
-	wdPieceGC = XtGetGC(shellWidget, value_mask, &gc_values);
-
-	gc_values.foreground = whitePieceColor;
-	gc_values.background = lightSquareColor;
-	wlPieceGC = XtGetGC(shellWidget, value_mask, &gc_values);
-
-	gc_values.foreground = whitePieceColor;
-	gc_values.background = jailSquareColor;
-	wjPieceGC = XtGetGC(shellWidget, value_mask, &gc_values);
-
-	gc_values.foreground = blackPieceColor;
-	gc_values.background = darkSquareColor;
-	bdPieceGC = XtGetGC(shellWidget, value_mask, &gc_values);
-
-	gc_values.foreground = blackPieceColor;
-	gc_values.background = lightSquareColor;
-	blPieceGC = XtGetGC(shellWidget, value_mask, &gc_values);
-
-	gc_values.foreground = blackPieceColor;
-	gc_values.background = jailSquareColor;
-	bjPieceGC = XtGetGC(shellWidget, value_mask, &gc_values);
+	highlineGC = CreateOneGC(&gc_values, highlightSquareColor, highlightSquareColor);
+	prelineGC = CreateOneGC(&gc_values, premoveHighlightColor, premoveHighlightColor);
+	lightSquareGC = CreateOneGC(&gc_values, lightSquareColor, darkSquareColor);
+	darkSquareGC = CreateOneGC(&gc_values, darkSquareColor, lightSquareColor);
+	wdPieceGC = CreateOneGC(&gc_values, whitePieceColor, darkSquareColor);
+	wlPieceGC = CreateOneGC(&gc_values, whitePieceColor, lightSquareColor);
+	bdPieceGC = CreateOneGC(&gc_values, blackPieceColor, darkSquareColor);
+	blPieceGC = CreateOneGC(&gc_values, blackPieceColor, lightSquareColor);
     }
 }
 
-void loadXIM(xim, xmask, filename, dest, mask)
-     XImage *xim;
-     XImage *xmask;
-     char *filename;
-     Pixmap *dest;
-     Pixmap *mask;
+void
+loadXIM (XImage *xim, XImage *xmask, char *filename, Pixmap *dest, Pixmap *mask)
 {
     int x, y, w, h, p;
     FILE *fp;
@@ -3526,7 +1878,8 @@ void loadXIM(xim, xmask, filename, dest, mask)
 
 char pieceBitmapNames[] = "pnbrqfeacwmohijgdvlsukpnsl";
 
-void CreateXIMPieces()
+void
+CreateXIMPieces ()
 {
     int piece, kind;
     char buf[MSG_SIZ];
@@ -3614,7 +1967,8 @@ void CreateXIMPieces()
 static VariantClass oldVariant = (VariantClass) -1; // [HGM] pieces: redo every time variant changes
 
 #if HAVE_LIBXPM
-void CreateXPMBoard(char *s, int kind)
+void
+CreateXPMBoard (char *s, int kind)
 {
     XpmAttributes attr;
     attr.valuemask = 0;
@@ -3624,7 +1978,8 @@ void CreateXPMBoard(char *s, int kind)
     }
 }
 
-void FreeXPMPieces()
+void
+FreeXPMPieces ()
 {   // [HGM] to prevent resoucre leak on calling CreaeXPMPieces() a second time,
     // thisroutine has to be called t free the old piece pixmaps
     int piece, kind;
@@ -3636,7 +1991,8 @@ void FreeXPMPieces()
     }
 }
 
-void CreateXPMPieces()
+void
+CreateXPMPieces ()
 {
     int piece, kind, r;
     char buf[MSG_SIZ];
@@ -3804,7 +2160,8 @@ void CreatePieces()
 }
 #else
 /* With built-in bitmaps */
-void CreatePieces()
+void
+CreatePieces ()
 {
     BuiltInBits* bib = builtInBits;
     int piece, kind;
@@ -3833,11 +2190,8 @@ void CreatePieces()
 }
 #endif
 
-void ReadBitmap(pm, name, bits, wreq, hreq)
-     Pixmap *pm;
-     String name;
-     unsigned char bits[];
-     u_int wreq, hreq;
+void
+ReadBitmap (Pixmap *pm, String name, unsigned char bits[], u_int wreq, u_int hreq)
 {
     int x_hot, y_hot;
     u_int w, h;
@@ -3884,7 +2238,8 @@ void ReadBitmap(pm, name, bits, wreq, hreq)
     }
 }
 
-void CreateGrid()
+void
+CreateGrid ()
 {
     int i, j;
 
@@ -3909,203 +2264,65 @@ void CreateGrid()
     }
 }
 
-static void MenuBarSelect(w, addr, index)
-     Widget w;
-     caddr_t addr;
-     caddr_t index;
+void
+MarkMenuItem (char *menuRef, int state)
 {
-    XtActionProc proc = (XtActionProc) addr;
+    MenuItem *item = MenuNameToItem(menuRef);
 
-    (proc)(NULL, NULL, NULL, NULL);
+    if(item) {
+	Arg args[2];
+	XtSetArg(args[0], XtNleftBitmap, state ? xMarkPixmap : None);
+	XtSetValues(item->handle, args, 1);
+    }
 }
 
-void CreateMenuBarPopup(parent, name, mb)
-     Widget parent;
-     String name;
-     Menu *mb;
+void
+EnableNamedMenuItem (char *menuRef, int state)
 {
-    int j;
-    Widget menu, entry;
-    MenuItem *mi;
-    Arg args[16];
+    MenuItem *item = MenuNameToItem(menuRef);
 
-    menu = XtCreatePopupShell(name, simpleMenuWidgetClass,
-			      parent, NULL, 0);
-    j = 0;
-    XtSetArg(args[j], XtNleftMargin, 20);   j++;
-    XtSetArg(args[j], XtNrightMargin, 20);  j++;
-    mi = mb->mi;
-    while (mi->string != NULL) {
-	if (strcmp(mi->string, "----") == 0) {
-	  entry = XtCreateManagedWidget(_(mi->string), smeLineObjectClass,
-					  menu, args, j);
-	} else {
-          XtSetArg(args[j], XtNlabel, XtNewString(_(mi->string)));
-	    entry = XtCreateManagedWidget(mi->ref, smeBSBObjectClass,
-					  menu, args, j+1);
-	    XtAddCallback(entry, XtNcallback,
-			  (XtCallbackProc) MenuBarSelect,
-			  (caddr_t) mi->proc);
-	}
-	mi++;
-    }
+    if(item) XtSetSensitive(item->handle, state);
 }
 
-Widget CreateMenuBar(mb, boardWidth)
-     Menu *mb;
-     int boardWidth;
+void
+EnableButtonBar (int state)
 {
-    int i, j, nr = 0, wtot = 0, widths[10];
-    Widget menuBar;
-    Arg args[16];
-    char menuName[MSG_SIZ];
-    Dimension w;
-    Menu *ma = mb;
-
-    j = 0;
-    XtSetArg(args[j], XtNorientation, XtorientHorizontal);  j++;
-    XtSetArg(args[j], XtNvSpace, 0);                        j++;
-    XtSetArg(args[j], XtNborderWidth, 0);                   j++;
-    menuBar = XtCreateWidget("menuBar", boxWidgetClass,
-			     formWidget, args, j);
-
-    while (mb->name != NULL) {
-        safeStrCpy(menuName, "menu", sizeof(menuName)/sizeof(menuName[0]) );
-	strncat(menuName, mb->ref, MSG_SIZ - strlen(menuName) - 1);
-	j = 0;
-	XtSetArg(args[j], XtNmenuName, XtNewString(menuName));  j++;
-	XtSetArg(args[j], XtNlabel, XtNewString(_(mb->name)));  j++;
-	XtSetArg(args[j], XtNborderWidth, 0);                   j++;
-	mb->subMenu = XtCreateManagedWidget(mb->name, menuButtonWidgetClass,
-				       menuBar, args, j);
-	CreateMenuBarPopup(menuBar, menuName, mb);
-	j = 0;
-	XtSetArg(args[j], XtNwidth, &w);                   j++;
-	XtGetValues(mb->subMenu, args, j);
-	wtot += mb->textWidth = widths[nr++] = w;
-	mb++;
-    }
-    while(wtot > boardWidth - 40) {
-	int wmax=0, imax=0;
-	for(i=0; i<nr; i++) if(widths[i] > wmax) wmax = widths[imax=i];
-	widths[imax]--;
-	wtot--;
-    }
-    for(i=0; i<nr; i++) if(widths[i] != ma[i].textWidth) {
-	j = 0;
-	XtSetArg(args[j], XtNwidth, widths[i]);                   j++;
-	XtSetValues(ma[i].subMenu, args, j);
-    }
-    return menuBar;
+    XtSetSensitive(optList[W_BUTTON].handle, state);
 }
 
-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);
+void
+SetMenuEnables (Enables *enab)
+{
+  while (enab->name != NULL) {
+    EnableNamedMenuItem(enab->name, enab->value);
+    enab++;
+  }
+}
 
-    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;
+void
+KeyBindingProc (Widget w, XEvent *event, String *prms, Cardinal *nprms)
+{   // [HGM] new method of key binding: specify MenuItem(FlipView) in stead of FlipViewProc in translation string
+    MenuItem *item;
+    if(*nprms == 0) return;
+    item = MenuNameToItem(prms[0]);
+    if(item) ((MenuProc *) item->proc) ();
 }
 
-Widget
-CreatePieceMenu(name, color)
-     char *name;
-     int color;
+static void
+MenuEngineSelect (Widget w, caddr_t addr, caddr_t index)
 {
-    int i;
-    Widget entry, menu;
-    Arg args[16];
-    ChessSquare selection;
-
-    menu = XtCreatePopupShell(name, simpleMenuWidgetClass,
-			      boardWidget, args, 0);
-
-    for (i = 0; i < PIECE_MENU_SIZE; i++) {
-	String item = pieceMenuStrings[color][i];
-
-	if (strcmp(item, "----") == 0) {
-	    entry = XtCreateManagedWidget(item, smeLineObjectClass,
-					  menu, NULL, 0);
-	} else {
-          XtSetArg(args[0], XtNlabel, XtNewString(_(item)));
-	    entry = XtCreateManagedWidget(item, smeBSBObjectClass,
-                                menu, args, 1);
-	    selection = pieceMenuTranslation[color][i];
-	    XtAddCallback(entry, XtNcallback,
-			  (XtCallbackProc) PieceMenuSelect,
-			  (caddr_t) selection);
-	    if (selection == WhitePawn || selection == BlackPawn) {
-		XtSetArg(args[0], XtNpopupOnEntry, entry);
-		XtSetValues(menu, args, 1);
-	    }
-	}
-    }
-    return menu;
+    RecentEngineEvent((int) (intptr_t) addr);
 }
 
 void
-CreatePieceMenus()
+AppendMenuItem (char *msg, int n)
 {
-    int i;
-    Widget entry;
-    Arg args[16];
-    ChessSquare selection;
-
-    whitePieceMenu = CreatePieceMenu("menuW", 0);
-    blackPieceMenu = CreatePieceMenu("menuB", 1);
-
-    XtRegisterGrabAction(PieceMenuPopup, True,
-			 (unsigned)(ButtonPressMask|ButtonReleaseMask),
-			 GrabModeAsync, GrabModeAsync);
-
-    XtSetArg(args[0], XtNlabel, _("Drop"));
-    dropMenu = XtCreatePopupShell("menuD", simpleMenuWidgetClass,
-				  boardWidget, args, 1);
-    for (i = 0; i < DROP_MENU_SIZE; i++) {
-	String item = dropMenuStrings[i];
-
-	if (strcmp(item, "----") == 0) {
-	    entry = XtCreateManagedWidget(item, smeLineObjectClass,
-					  dropMenu, NULL, 0);
-	} else {
-          XtSetArg(args[0], XtNlabel, XtNewString(_(item)));
-	    entry = XtCreateManagedWidget(item, smeBSBObjectClass,
-                                dropMenu, args, 1);
-	    selection = dropMenuTranslation[i];
-	    XtAddCallback(entry, XtNcallback,
-			  (XtCallbackProc) DropMenuSelect,
-			  (caddr_t) selection);
-	}
-    }
+    CreateMenuItem((Widget) optList[W_ENGIN].textValue, msg, (XtCallbackProc) MenuEngineSelect, n);
 }
 
-void SetupDropMenu()
+void
+SetupDropMenu ()
 {
     int i, j, count;
     char label[32];
@@ -4129,189 +2346,26 @@ void SetupDropMenu()
     }
 }
 
-void PieceMenuPopup(w, event, params, num_params)
-     Widget w;
-     XEvent *event;
-     String *params;
-     Cardinal *num_params;
-{
-    String whichMenu; int menuNr = -2;
-    shiftKey = strcmp(params[0], "menuW"); // used to indicate black
-    if (event->type == ButtonRelease)
-        menuNr = RightClick(Release, event->xbutton.x, event->xbutton.y, &pmFromX, &pmFromY);
-    else if (event->type == ButtonPress)
-        menuNr = RightClick(Press,   event->xbutton.x, event->xbutton.y, &pmFromX, &pmFromY);
-    switch(menuNr) {
-      case 0: whichMenu = params[0]; break;
-      case 1: SetupDropMenu(); whichMenu = "menuD"; break;
-      case 2:
-      case -1: if (errorUp) ErrorPopDown();
-      default: return;
-    }
-    XtPopupSpringLoaded(XtNameToWidget(boardWidget, whichMenu));
-}
 
-static void PieceMenuSelect(w, piece, junk)
-     Widget w;
-     ChessSquare piece;
-     caddr_t junk;
-{
-    if (pmFromX < 0 || pmFromY < 0) return;
-    EditPositionMenuEvent(piece, pmFromX, pmFromY);
-}
-
-static void DropMenuSelect(w, piece, junk)
-     Widget w;
-     ChessSquare piece;
-     caddr_t junk;
-{
-    if (pmFromX < 0 || pmFromY < 0) return;
-    DropMenuEvent(piece, pmFromX, pmFromY);
-}
-
-void WhiteClock(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    shiftKey = prms[0][0] & 1;
-    ClockClick(0);
-}
-
-void BlackClock(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    shiftKey = prms[0][0] & 1;
-    ClockClick(1);
-}
-
-
-/*
- * If the user selects on a border boundary, return -1; if off the board,
- *   return -2.  Otherwise map the event coordinate to the square.
- */
-int EventToSquare(x, limit)
-     int x;
-{
-    if (x <= 0)
-      return -2;
-    if (x < lineGap)
-      return -1;
-    x -= lineGap;
-    if ((x % (squareSize + lineGap)) >= squareSize)
-      return -1;
-    x /= (squareSize + lineGap);
-    if (x >= limit)
-      return -2;
-    return x;
-}
-
-static void do_flash_delay(msec)
-     unsigned long msec;
+static void
+do_flash_delay (unsigned long msec)
 {
     TimeDelay(msec);
 }
 
-static void drawHighlight(file, rank, gc)
-     int file, rank;
-     GC gc;
+void
+DrawBorder (int x, int y, int type)
 {
-    int x, y;
-
-    if (lineGap == 0) return;
+    GC gc = lineGC;
 
-    if (flipView) {
-	x = lineGap/2 + ((BOARD_WIDTH-1)-file) *
-	  (squareSize + lineGap);
-	y = lineGap/2 + rank * (squareSize + lineGap);
-    } else {
-	x = lineGap/2 + file * (squareSize + lineGap);
-	y = lineGap/2 + ((BOARD_HEIGHT-1)-rank) *
-	  (squareSize + lineGap);
-    }
+    if(type == 1) gc = highlineGC; else if(type == 2) gc = prelineGC;
 
     XDrawRectangle(xDisplay, xBoardWindow, gc, x, y,
 		   squareSize+lineGap, squareSize+lineGap);
 }
 
-int hi1X = -1, hi1Y = -1, hi2X = -1, hi2Y = -1;
-int pm1X = -1, pm1Y = -1, pm2X = -1, pm2Y = -1;
-
-void
-SetHighlights(fromX, fromY, toX, toY)
-     int fromX, fromY, toX, toY;
-{
-    if (hi1X != fromX || hi1Y != fromY) {
-	if (hi1X >= 0 && hi1Y >= 0) {
-	    drawHighlight(hi1X, hi1Y, lineGC);
-	}
-    } // [HGM] first erase both, then draw new!
-    if (hi2X != toX || hi2Y != toY) {
-	if (hi2X >= 0 && hi2Y >= 0) {
-	    drawHighlight(hi2X, hi2Y, lineGC);
-	}
-    }
-    if (hi1X != fromX || hi1Y != fromY) {
-	if (fromX >= 0 && fromY >= 0) {
-	    drawHighlight(fromX, fromY, highlineGC);
-	}
-    }
-    if (hi2X != toX || hi2Y != toY) {
-	if (toX >= 0 && toY >= 0) {
-	    drawHighlight(toX, toY, highlineGC);
-	}
-    }
-    hi1X = fromX;
-    hi1Y = fromY;
-    hi2X = toX;
-    hi2Y = toY;
-}
-
-void
-ClearHighlights()
-{
-    SetHighlights(-1, -1, -1, -1);
-}
-
-
-void
-SetPremoveHighlights(fromX, fromY, toX, toY)
-     int fromX, fromY, toX, toY;
-{
-    if (pm1X != fromX || pm1Y != fromY) {
-	if (pm1X >= 0 && pm1Y >= 0) {
-	    drawHighlight(pm1X, pm1Y, lineGC);
-	}
-	if (fromX >= 0 && fromY >= 0) {
-	    drawHighlight(fromX, fromY, prelineGC);
-	}
-    }
-    if (pm2X != toX || pm2Y != toY) {
-	if (pm2X >= 0 && pm2Y >= 0) {
-	    drawHighlight(pm2X, pm2Y, lineGC);
-	}
-	if (toX >= 0 && toY >= 0) {
-	    drawHighlight(toX, toY, prelineGC);
-	}
-    }
-    pm1X = fromX;
-    pm1Y = fromY;
-    pm2X = toX;
-    pm2Y = toY;
-}
-
-void
-ClearPremoveHighlights()
-{
-  SetPremoveHighlights(-1, -1, -1, -1);
-}
-
-static int CutOutSquare(x, y, x0, y0, kind)
-     int x, y, *x0, *y0, kind;
+static int
+CutOutSquare (int x, int y, int *x0, int *y0, int  kind)
 {
     int W = BOARD_WIDTH, H = BOARD_HEIGHT;
     int nx = x/(squareSize + lineGap), ny = y/(squareSize + lineGap);
@@ -4328,10 +2382,8 @@ static int CutOutSquare(x, y, x0, y0, kind)
     return 1;
 }
 
-static void BlankSquare(x, y, color, piece, dest, fac)
-     int x, y, color, fac;
-     ChessSquare piece;
-     Drawable dest;
+static void
+BlankSquare (int x, int y, int color, ChessSquare piece, Drawable dest, int fac)
 {   // [HGM] extra param 'fac' for forcing destination to (0,0) for copying to animation buffer
     int x0, y0;
     if (useImages && color != 2 && (useTexture & color+1) && CutOutSquare(x, y, &x0, &y0, color)) {
@@ -4349,7 +2401,7 @@ static void BlankSquare(x, y, color, piece, dest, fac)
 	    break;
 	  case 2: /* neutral */
 	  default:
-	    pm = xpmJailSquare;
+	    pm = xpmJailSquare; // [HGM] this is wrong, but apparently never used?
 	    break;
 	}
 	XCopyArea(xDisplay, pm, dest, wlPieceGC, 0, 0,
@@ -4365,7 +2417,7 @@ static void BlankSquare(x, y, color, piece, dest, fac)
 	    break;
 	  case 2: /* neutral */
 	  default:
-	    gc = jailSquareGC;
+	    gc = lineGC;
 	    break;
 	}
 	XFillRectangle(xDisplay, dest, gc, x*fac, y*fac, squareSize, squareSize);
@@ -4376,10 +2428,8 @@ static void BlankSquare(x, y, color, piece, dest, fac)
    I split out the routines to draw a piece so that I could
    make a generic flash routine.
 */
-static void monoDrawPiece_1bit(piece, square_color, x, y, dest)
-     ChessSquare piece;
-     int square_color, x, y;
-     Drawable dest;
+static void
+monoDrawPiece_1bit (ChessSquare piece, int square_color, int x, int y, Drawable dest)
 {
     /* Avoid XCopyPlane on 1-bit screens to work around Sun bug */
     switch (square_color) {
@@ -4402,10 +2452,8 @@ static void monoDrawPiece_1bit(piece, square_color, x, y, dest)
     }
 }
 
-static void monoDrawPiece(piece, square_color, x, y, dest)
-     ChessSquare piece;
-     int square_color, x, y;
-     Drawable dest;
+static void
+monoDrawPiece (ChessSquare piece, int square_color, int x, int y, Drawable dest)
 {
     switch (square_color) {
       case 1: /* light */
@@ -4427,10 +2475,8 @@ static void monoDrawPiece(piece, square_color, x, y, dest)
     }
 }
 
-static void colorDrawPiece(piece, square_color, x, y, dest)
-     ChessSquare piece;
-     int square_color, x, y;
-     Drawable dest;
+static void
+colorDrawPiece (ChessSquare piece, int square_color, int x, int y, Drawable dest)
 {
     if(pieceToSolid(piece) == NULL) return; // [HGM] bitmaps: make it non-fatal if we have no bitmap;
     switch (square_color) {
@@ -4448,18 +2494,12 @@ static void colorDrawPiece(piece, square_color, x, y, dest)
 	break;
       case 2: /* neutral */
       default:
-	XCopyPlane(xDisplay, *pieceToSolid(piece),
-		   dest, (int) piece < (int) BlackPawn
-		   ? wjPieceGC : bjPieceGC, 0, 0,
-		   squareSize, squareSize, x, y, 1);
-	break;
+	break; // should never contain pieces
     }
 }
 
-static void colorDrawPieceImage(piece, square_color, x, y, dest)
-     ChessSquare piece;
-     int square_color, x, y;
-     Drawable dest;
+static void
+colorDrawPieceImage (ChessSquare piece, int square_color, int x, int y, Drawable dest)
 {
     int kind, p = piece;
 
@@ -4499,7 +2539,8 @@ static void colorDrawPieceImage(piece, square_color, x, y, dest)
 
 typedef void (*DrawFunc)();
 
-DrawFunc ChooseDrawFunc()
+DrawFunc
+ChooseDrawFunc ()
 {
     if (appData.monoMode) {
 	if (DefaultDepth(xDisplay, xScreen) == 1) {
@@ -4515,273 +2556,171 @@ DrawFunc ChooseDrawFunc()
     }
 }
 
-/* [HR] determine square color depending on chess variant. */
-static int SquareColor(row, column)
-     int row, column;
+void
+DrawDot (int marker, int x, int y, int r)
 {
-    int square_color;
-
-    if (gameInfo.variant == VariantXiangqi) {
-        if (column >= 3 && column <= 5 && row >= 0 && row <= 2) {
-            square_color = 1;
-        } else if (column >= 3 && column <= 5 && row >= 7 && row <= 9) {
-            square_color = 0;
-        } else if (row <= 4) {
-            square_color = 0;
-        } else {
-            square_color = 1;
-        }
-    } else {
-        square_color = ((column + row) % 2) == 1;
-    }
-
-    /* [hgm] holdings: next line makes all holdings squares light */
-    if(column < BOARD_LEFT || column >= BOARD_RGHT) square_color = 1;
-
-    return square_color;
+	if(appData.monoMode) {
+	    XFillArc(xDisplay, xBoardWindow, marker == 2 ? darkSquareGC : lightSquareGC,
+		    x, y, r, r, 0, 64*360);
+	    XDrawArc(xDisplay, xBoardWindow, marker == 2 ? lightSquareGC : darkSquareGC,
+		    x, y, r, r, 0, 64*360);
+	} else
+	XFillArc(xDisplay, xBoardWindow, marker == 2 ? prelineGC : highlineGC,
+		    x, y, r, r, 0, 64*360);
 }
 
-void DrawSquare(row, column, piece, do_flash)
-     int row, column, do_flash;
-     ChessSquare piece;
-{
-    int square_color, x, y, direction, font_ascent, font_descent;
-    int i;
-    char string[2];
+void
+DrawOneSquare (int x, int y, ChessSquare piece, int square_color, int marker, char *string, int align)
+{   // basic front-end board-draw function: takes care of everything that can be in square:
+    // piece, background, coordinate/count, marker dot
+    int direction, font_ascent, font_descent;
     XCharStruct overall;
     DrawFunc drawfunc;
-    int flash_delay;
-
-    /* Calculate delay in milliseconds (2-delays per complete flash) */
-    flash_delay = 500 / appData.flashRate;
-
-    if (flipView) {
-	x = lineGap + ((BOARD_WIDTH-1)-column) *
-	  (squareSize + lineGap);
-	y = lineGap + row * (squareSize + lineGap);
-    } else {
-	x = lineGap + column * (squareSize + lineGap);
-	y = lineGap + ((BOARD_HEIGHT-1)-row) *
-	  (squareSize + lineGap);
-    }
 
-    if(twoBoards && partnerUp) x += hOffset; // [HGM] dual: draw second board
-
-    square_color = SquareColor(row, column);
-
-    if ( // [HGM] holdings: blank out area between board and holdings
-                 column == BOARD_LEFT-1 ||  column == BOARD_RGHT
-              || (column == BOARD_LEFT-2 && row < BOARD_HEIGHT-gameInfo.holdingsSize)
-	          || (column == BOARD_RGHT+1 && row >= gameInfo.holdingsSize) ) {
-			BlankSquare(x, y, 2, EmptySquare, xBoardWindow, 1);
-
-			// [HGM] print piece counts next to holdings
-			string[1] = NULLCHAR;
-			if (column == (flipView ? BOARD_LEFT-1 : BOARD_RGHT) && piece > 1 ) {
-			    string[0] = '0' + piece;
-			    XTextExtents(countFontStruct, string, 1, &direction,
-				 &font_ascent, &font_descent, &overall);
-			    if (appData.monoMode) {
-				XDrawImageString(xDisplay, xBoardWindow, countGC,
-						 x + squareSize - overall.width - 2,
-						 y + font_ascent + 1, string, 1);
-			    } else {
-				XDrawString(xDisplay, xBoardWindow, countGC,
-					    x + squareSize - overall.width - 2,
-					    y + font_ascent + 1, string, 1);
-			    }
-			}
-			if (column == (flipView ? BOARD_RGHT : BOARD_LEFT-1) && piece > 1) {
-			    string[0] = '0' + piece;
-			    XTextExtents(countFontStruct, string, 1, &direction,
-					 &font_ascent, &font_descent, &overall);
-			    if (appData.monoMode) {
-				XDrawImageString(xDisplay, xBoardWindow, countGC,
-						 x + 2, y + font_ascent + 1, string, 1);
-			    } else {
-				XDrawString(xDisplay, xBoardWindow, countGC,
-					    x + 2, y + font_ascent + 1, string, 1);
-			    }
-			}
-    } else {
-	    if (piece == EmptySquare || appData.blindfold) {
-			BlankSquare(x, y, square_color, piece, xBoardWindow, 1);
-	    } else {
-			drawfunc = ChooseDrawFunc();
-
-			if (do_flash && appData.flashCount > 0) {
-			    for (i=0; i<appData.flashCount; ++i) {
-					drawfunc(piece, square_color, x, y, xBoardWindow);
-					XSync(xDisplay, False);
-					do_flash_delay(flash_delay);
-
-					BlankSquare(x, y, square_color, piece, xBoardWindow, 1);
-					XSync(xDisplay, False);
-					do_flash_delay(flash_delay);
-			    }
-			}
-			drawfunc(piece, square_color, x, y, xBoardWindow);
-    	}
-	}
-
-    string[1] = NULLCHAR;
-    if (appData.showCoords && row == (flipView ? BOARD_HEIGHT-1 : 0)
-		&& column >= BOARD_LEFT && column < BOARD_RGHT) {
-	string[0] = 'a' + column - BOARD_LEFT;
-	XTextExtents(coordFontStruct, string, 1, &direction,
-		     &font_ascent, &font_descent, &overall);
+    if (piece == EmptySquare) {
+	BlankSquare(x, y, square_color, piece, xBoardWindow, 1);
+    } else {
+	drawfunc = ChooseDrawFunc();
+	drawfunc(piece, square_color, x, y, xBoardWindow);
+    }
+
+    if(align) { // square carries inscription (coord or piece count)
+	int xx = x, yy = y;
+	GC hGC = align < 3 ? coordGC : countGC;
+	// first calculate where it goes
+	XTextExtents(countFontStruct, string, 1, &direction,
+			 &font_ascent, &font_descent, &overall);
+	if (align == 1) {
+	    xx += squareSize - overall.width - 2;
+	    yy += squareSize - font_descent - 1;
+	} else if (align == 2) {
+	    xx += 2, yy += font_ascent + 1;
+	} else if (align == 3) {
+	    xx += squareSize - overall.width - 2;
+	    yy += font_ascent + 1;
+	} else if (align == 4) {
+	    xx += 2, yy += font_ascent + 1;
+	}
+	// then draw it
 	if (appData.monoMode) {
-	    XDrawImageString(xDisplay, xBoardWindow, coordGC,
-			     x + squareSize - overall.width - 2,
-			     y + squareSize - font_descent - 1, string, 1);
+	    XDrawImageString(xDisplay, xBoardWindow, hGC, xx, yy, string, 1);
 	} else {
-	    XDrawString(xDisplay, xBoardWindow, coordGC,
-			x + squareSize - overall.width - 2,
-			y + squareSize - font_descent - 1, string, 1);
+	    XDrawString(xDisplay, xBoardWindow, hGC, xx, yy, string, 1);
 	}
     }
-    if (appData.showCoords && column == (flipView ? BOARD_RGHT-1 : BOARD_LEFT)) {
-	string[0] = ONE + row;
-	XTextExtents(coordFontStruct, string, 1, &direction,
-		     &font_ascent, &font_descent, &overall);
-	if (appData.monoMode) {
-	    XDrawImageString(xDisplay, xBoardWindow, coordGC,
-			     x + 2, y + font_ascent + 1, string, 1);
-	} else {
-	    XDrawString(xDisplay, xBoardWindow, coordGC,
-			x + 2, y + font_ascent + 1, string, 1);
-	}
-    }
-    if(!partnerUp && marker[row][column]) {
-	if(appData.monoMode) {
-	    XFillArc(xDisplay, xBoardWindow, marker[row][column] == 2 ? darkSquareGC : lightSquareGC,
-		    x + squareSize/4, y+squareSize/4, squareSize/2, squareSize/2, 0, 64*360);
-	    XDrawArc(xDisplay, xBoardWindow, marker[row][column] == 2 ? lightSquareGC : darkSquareGC,
-		    x + squareSize/4, y+squareSize/4, squareSize/2, squareSize/2, 0, 64*360);
-	} else
-	XFillArc(xDisplay, xBoardWindow, marker[row][column] == 2 ? prelineGC : highlineGC,
-		x + squareSize/4, y+squareSize/4, squareSize/2, squareSize/2, 0, 64*360);
+
+    if(marker) { // print fat marker dot, if requested
+	DrawDot(marker, x + squareSize/4, y+squareSize/4, squareSize/2);
     }
 }
 
-
-/* Why is this needed on some versions of X? */
-void EventProc(widget, unused, event)
-     Widget widget;
-     caddr_t unused;
-     XEvent *event;
+void
+FlashDelay (int flash_delay)
 {
-    if (!XtIsRealized(widget))
-      return;
-
-    switch (event->type) {
-      case Expose:
-	if (event->xexpose.count > 0) return;  /* no clipping is done */
-	XDrawPosition(widget, True, NULL);
-	if(twoBoards) { // [HGM] dual: draw other board in other orientation
-	    flipView = !flipView; partnerUp = !partnerUp;
-	    XDrawPosition(widget, True, NULL);
-	    flipView = !flipView; partnerUp = !partnerUp;
-	}
-	break;
-      case MotionNotify:
-        if(SeekGraphClick(Press, event->xbutton.x, event->xbutton.y, 1)) break;
-      default:
-	return;
-    }
+	XSync(xDisplay, False);
+	if(flash_delay) do_flash_delay(flash_delay);
 }
-/* end why */
 
-void DrawPosition(fullRedraw, board)
-     /*Boolean*/int fullRedraw;
-     Board board;
+double
+Fraction (int x, int start, int stop)
 {
-    XDrawPosition(boardWidget, fullRedraw, board);
+   double f = ((double) x - start)/(stop - start);
+   if(f > 1.) f = 1.; else if(f < 0.) f = 0.;
+   return f;
 }
 
-/* Returns 1 if there are "too many" differences between b1 and b2
-   (i.e. more than 1 move was made) */
-static int too_many_diffs(b1, b2)
-     Board b1, b2;
-{
-    int i, j;
-    int c = 0;
+static WindowPlacement wpNew;
 
-    for (i=0; i<BOARD_HEIGHT; ++i) {
-	for (j=0; j<BOARD_WIDTH; ++j) {
-	    if (b1[i][j] != b2[i][j]) {
-		if (++c > 4)	/* Castling causes 4 diffs */
-		  return 1;
-	    }
-	}
+void
+CoDrag (Widget sh, WindowPlacement *wp)
+{
+    Arg args[16];
+    int j=0, touch=0, fudge = 2;
+    GetActualPlacement(sh, wp);
+    if(abs(wpMain.x + wpMain.width + 2*frameX - wp->x)         < fudge) touch = 1; else // right touch
+    if(abs(wp->x + wp->width + 2*frameX - wpMain.x)            < fudge) touch = 2; else // left touch
+    if(abs(wpMain.y + wpMain.height + frameX + frameY - wp->y) < fudge) touch = 3; else // bottom touch
+    if(abs(wp->y + wp->height + frameX + frameY - wpMain.y)    < fudge) touch = 4;      // top touch
+    if(!touch ) return; // only windows that touch co-move
+    if(touch < 3 && wpNew.height != wpMain.height) { // left or right and height changed
+	int heightInc = wpNew.height - wpMain.height;
+	double fracTop = Fraction(wp->y, wpMain.y, wpMain.y + wpMain.height + frameX + frameY);
+	double fracBot = Fraction(wp->y + wp->height + frameX + frameY + 1, wpMain.y, wpMain.y + wpMain.height + frameX + frameY);
+	wp->y += fracTop * heightInc;
+	heightInc = (int) (fracBot * heightInc) - (int) (fracTop * heightInc);
+	if(heightInc) XtSetArg(args[j], XtNheight, wp->height + heightInc), j++;
+    } else if(touch > 2 && wpNew.width != wpMain.width) { // top or bottom and width changed
+	int widthInc = wpNew.width - wpMain.width;
+	double fracLeft = Fraction(wp->x, wpMain.x, wpMain.x + wpMain.width + 2*frameX);
+	double fracRght = Fraction(wp->x + wp->width + 2*frameX + 1, wpMain.x, wpMain.x + wpMain.width + 2*frameX);
+	wp->y += fracLeft * widthInc;
+	widthInc = (int) (fracRght * widthInc) - (int) (fracLeft * widthInc);
+	if(widthInc) XtSetArg(args[j], XtNwidth, wp->width + widthInc), j++;
     }
-    return 0;
+    wp->x += wpNew.x - wpMain.x;
+    wp->y += wpNew.y - wpMain.y;
+    if(touch == 1) wp->x += wpNew.width - wpMain.width; else
+    if(touch == 3) wp->y += wpNew.height - wpMain.height;
+    XtSetArg(args[j], XtNx, wp->x); j++;
+    XtSetArg(args[j], XtNy, wp->y); j++;
+    XtSetValues(sh, args, j);
 }
 
-/* Matrix describing castling maneuvers */
-/* Row, ColRookFrom, ColKingFrom, ColRookTo, ColKingTo */
-static int castling_matrix[4][5] = {
-    { 0, 0, 4, 3, 2 },		/* 0-0-0, white */
-    { 0, 7, 4, 5, 6 },		/* 0-0,   white */
-    { 7, 0, 4, 3, 2 },		/* 0-0-0, black */
-    { 7, 7, 4, 5, 6 }		/* 0-0,   black */
-};
+static XtIntervalId delayedDragID = 0;
 
-/* Checks whether castling occurred. If it did, *rrow and *rcol
-   are set to the destination (row,col) of the rook that moved.
+void
+DragProc ()
+{
+	GetActualPlacement(shellWidget, &wpNew);
+	if(wpNew.x == wpMain.x && wpNew.y == wpMain.y && // not moved
+	   wpNew.width == wpMain.width && wpNew.height == wpMain.height) // not sized
+	    return; // false alarm
+	if(shellUp[EngOutDlg]) CoDrag(shells[EngOutDlg], &wpEngineOutput);
+	if(shellUp[HistoryDlg]) CoDrag(shells[HistoryDlg], &wpMoveHistory);
+	if(shellUp[EvalGraphDlg]) CoDrag(shells[EvalGraphDlg], &wpEvalGraph);
+	if(shellUp[GameListDlg]) CoDrag(shells[GameListDlg], &wpGameList);
+	wpMain = wpNew;
+	DrawPosition(True, NULL);
+	delayedDragID = 0; // now drag executed, make sure next DelayedDrag will not cancel timer event (which could now be used by other)
+}
 
-   Returns 1 if castling occurred, 0 if not.
 
-   Note: Only handles a max of 1 castling move, so be sure
-   to call too_many_diffs() first.
-   */
-static int check_castle_draw(newb, oldb, rrow, rcol)
-     Board newb, oldb;
-     int *rrow, *rcol;
+void
+DelayedDrag ()
 {
-    int i, *r, j;
-    int match;
-
-    /* For each type of castling... */
-    for (i=0; i<4; ++i) {
-	r = castling_matrix[i];
-
-	/* Check the 4 squares involved in the castling move */
-	match = 0;
-	for (j=1; j<=4; ++j) {
-	    if (newb[r[0]][r[j]] == oldb[r[0]][r[j]]) {
-		match = 1;
-		break;
-	    }
-	}
+    if(delayedDragID) XtRemoveTimeOut(delayedDragID); // cancel pending
+    delayedDragID =
+      XtAppAddTimeOut(appContext, 50, (XtTimerCallbackProc) DragProc, (XtPointer) 0); // and schedule new one 50 msec later
+}
 
-	if (!match) {
-	    /* All 4 changed, so it must be a castling move */
-	    *rrow = r[0];
-	    *rcol = r[3];
-	    return 1;
-	}
-    }
-    return 0;
+void
+EventProc (Widget widget, caddr_t unused, XEvent *event)
+{
+    if(XtIsRealized(widget) && event->type == ConfigureNotify || appData.useStickyWindows)
+	DelayedDrag(); // as long as events keep coming in faster than 50 msec, they destroy each other
 }
 
 // [HGM] seekgraph: some low-level drawing routines cloned from xevalgraph
-void DrawSeekAxis( int x, int y, int xTo, int yTo )
+void
+DrawSeekAxis (int x, int y, int xTo, int yTo)
 {
       XDrawLine(xDisplay, xBoardWindow, lineGC, x, y, xTo, yTo);
 }
 
-void DrawSeekBackground( int left, int top, int right, int bottom )
+void
+DrawSeekBackground (int left, int top, int right, int bottom)
 {
     XFillRectangle(xDisplay, xBoardWindow, lightSquareGC, left, top, right-left, bottom-top);
 }
 
-void DrawSeekText(char *buf, int x, int y)
+void
+DrawSeekText (char *buf, int x, int y)
 {
     XDrawString(xDisplay, xBoardWindow, coordGC, x, y+4, buf, strlen(buf));
 }
 
-void DrawSeekDot(int x, int y, int colorNr)
+void
+DrawSeekDot (int x, int y, int colorNr)
 {
     int square = colorNr & 0x80;
     GC color;
@@ -4795,183 +2734,34 @@ void DrawSeekDot(int x, int y, int colorNr)
 		x-squareSize/8, y-squareSize/8, squareSize/4, squareSize/4, 0, 64*360);
 }
 
-static int damage[2][BOARD_RANKS][BOARD_FILES];
-
-/*
- * event handler for redrawing the board
- */
-void XDrawPosition(w, repaint, board)
-     Widget w;
-     /*Boolean*/int repaint;
-     Board board;
+void
+DrawGrid ()
 {
-    int i, j, do_flash;
-    static int lastFlipView = 0;
-    static int lastBoardValid[2] = {0, 0};
-    static Board lastBoard[2];
-    Arg args[16];
-    int rrow, rcol;
-    int nr = twoBoards*partnerUp;
-
-    if(DrawSeekGraph()) return; // [HGM] seekgraph: suppress any drawing if seek graph up
-
-    if (board == NULL) {
-	if (!lastBoardValid[nr]) return;
-	board = lastBoard[nr];
-    }
-    if (!lastBoardValid[nr] || (nr == 0 && lastFlipView != flipView)) {
-	XtSetArg(args[0], XtNleftBitmap, (flipView ? xMarkPixmap : None));
-	XtSetValues(XtNameToWidget(menuBarWidget, "menuView.Flip View"),
-		    args, 1);
-    }
-
-    /*
-     * It would be simpler to clear the window with XClearWindow()
-     * but this causes a very distracting flicker.
-     */
-
-    if (!repaint && lastBoardValid[nr] && (nr == 1 || lastFlipView == flipView)) {
-
-	if ( lineGap && IsDrawArrowEnabled())
-	    XDrawSegments(xDisplay, xBoardWindow, lineGC,
-			gridSegments, BOARD_HEIGHT + BOARD_WIDTH + 2);
-
-	/* If too much changes (begin observing new game, etc.), don't
-	   do flashing */
-	do_flash = too_many_diffs(board, lastBoard[nr]) ? 0 : 1;
-
-	/* Special check for castling so we don't flash both the king
-	   and the rook (just flash the king). */
-	if (do_flash) {
-	    if (check_castle_draw(board, lastBoard[nr], &rrow, &rcol)) {
-		/* Draw rook with NO flashing. King will be drawn flashing later */
-		DrawSquare(rrow, rcol, board[rrow][rcol], 0);
-		lastBoard[nr][rrow][rcol] = board[rrow][rcol];
-	    }
-	}
-
-	/* First pass -- Draw (newly) empty squares and repair damage.
-	   This prevents you from having a piece show up twice while it
-	   is flashing on its new square */
-	for (i = 0; i < BOARD_HEIGHT; i++)
-	  for (j = 0; j < BOARD_WIDTH; j++)
-	    if ((board[i][j] != lastBoard[nr][i][j] && board[i][j] == EmptySquare)
-		|| damage[nr][i][j]) {
-		DrawSquare(i, j, board[i][j], 0);
-		damage[nr][i][j] = False;
-	    }
-
-	/* Second pass -- Draw piece(s) in new position and flash them */
-	for (i = 0; i < BOARD_HEIGHT; i++)
-	  for (j = 0; j < BOARD_WIDTH; j++)
-	    if (board[i][j] != lastBoard[nr][i][j]) {
-		DrawSquare(i, j, board[i][j], do_flash);
-	    }
-    } else {
-	if (lineGap > 0)
 	  XDrawSegments(xDisplay, xBoardWindow, lineGC,
-			twoBoards & partnerUp ? secondSegments : // [HGM] dual
 			gridSegments, BOARD_HEIGHT + BOARD_WIDTH + 2);
-
-	for (i = 0; i < BOARD_HEIGHT; i++)
-	  for (j = 0; j < BOARD_WIDTH; j++) {
-	      DrawSquare(i, j, board[i][j], 0);
-	      damage[nr][i][j] = False;
-	  }
-    }
-
-    CopyBoard(lastBoard[nr], board);
-    lastBoardValid[nr] = 1;
-  if(nr == 0) { // [HGM] dual: no highlights on second board yet
-    lastFlipView = flipView;
-
-    /* Draw highlights */
-    if (pm1X >= 0 && pm1Y >= 0) {
-      drawHighlight(pm1X, pm1Y, prelineGC);
-    }
-    if (pm2X >= 0 && pm2Y >= 0) {
-      drawHighlight(pm2X, pm2Y, prelineGC);
-    }
-    if (hi1X >= 0 && hi1Y >= 0) {
-      drawHighlight(hi1X, hi1Y, highlineGC);
-    }
-    if (hi2X >= 0 && hi2Y >= 0) {
-      drawHighlight(hi2X, hi2Y, highlineGC);
-    }
-    DrawArrowHighlight(hi1X, hi1Y, hi2X, hi2Y);
-  }
-    /* If piece being dragged around board, must redraw that too */
-    DrawDragPiece();
-
-    XSync(xDisplay, False);
 }
 
 
 /*
  * event handler for redrawing the board
  */
-void DrawPositionProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    XDrawPosition(w, True, NULL);
-}
-
-
-/*
- * event handler for parsing user moves
- */
-// [HGM] This routine will need quite some reworking. Although the backend still supports the old
-//       way of doing things, by calling UserMoveEvent() to test the legality of the move and then perform
-//       it at the end, and doing all kind of preliminary tests here (e.g. to weed out self-captures), it
-//       should be made to use the new way, of calling UserMoveTest early  to determine the legality of the
-//       move, (which will weed out the illegal selfcaptures and moves into the holdings, and flag promotions),
-//       and at the end FinishMove() to perform the move after optional promotion popups.
-//       For now I patched it to allow self-capture with King, and suppress clicks between board and holdings.
-void HandleUserMove(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
+void
+DrawPositionProc (Widget w, XEvent *event, String *prms, Cardinal *nprms)
 {
-    if (w != boardWidget || errorExitStatus != -1) return;
-    if(nprms) shiftKey = !strcmp(prms[0], "1");
-
-    if (promotionUp) {
-	if (event->type == ButtonPress) {
-	    XtPopdown(promotionShell);
-	    XtDestroyWidget(promotionShell);
-	    promotionUp = False;
-	    ClearHighlights();
-	    fromX = fromY = -1;
-	} else {
-	    return;
-	}
-    }
-
-    // [HGM] mouse: the rest of the mouse handler is moved to the backend, and called here
-    if(event->type == ButtonPress)   LeftClick(Press,   event->xbutton.x, event->xbutton.y);
-    if(event->type == ButtonRelease) LeftClick(Release, event->xbutton.x, event->xbutton.y);
+    DrawPosition(True, NULL);
 }
 
-void AnimateUserMove (Widget w, XEvent * event,
-		      String * params, Cardinal * nParams)
-{
-    if(!PromoScroll(event->xmotion.x, event->xmotion.y))
-    DragPieceMove(event->xmotion.x, event->xmotion.y);
-}
 
-void HandlePV (Widget w, XEvent * event,
-		      String * params, Cardinal * nParams)
+void
+HandlePV (Widget w, XEvent * event, String * params, Cardinal * nParams)
 {   // [HGM] pv: walk PV
     MovePV(event->xmotion.x, event->xmotion.y, lineGap + BOARD_HEIGHT * (squareSize + lineGap));
 }
 
 static int savedIndex;  /* gross that this is global */
 
-void CommentClick (Widget w, XEvent * event, String * params, Cardinal * nParams)
+void
+CommentClick (Widget w, XEvent * event, String * params, Cardinal * nParams)
 {
 	String val;
 	XawTextPosition index, dummy;
@@ -4985,419 +2775,51 @@ void CommentClick (Widget w, XEvent * event, String * params, Cardinal * nParams
 	LoadVariation( index, val ); // [HGM] also does the actual moving to it, now
 }
 
-void EditCommentPopUp(index, title, text)
-     int index;
-     char *title, *text;
+void
+EditCommentPopUp (int index, char *title, char *text)
 {
     savedIndex = index;
     if (text == NULL) text = "";
     NewCommentPopup(title, text, index);
 }
 
-void ICSInputBoxPopUp()
-{
-    InputBoxPopup();
-}
-
-extern Option boxOptions[];
-
-void ICSInputSendText()
-{
-    Widget edit;
-    int j;
-    Arg args[16];
-    String val;
-
-    edit = boxOptions[0].handle;
-    j = 0;
-    XtSetArg(args[j], XtNstring, &val); j++;
-    XtGetValues(edit, args, j);
-    SaveInHistory(val);
-    SendMultiLineToICS(val);
-    XtCallActionProc(edit, "select-all", NULL, NULL, 0);
-    XtCallActionProc(edit, "kill-selection", NULL, NULL, 0);
-}
-
-void ICSInputBoxPopDown()
-{
-    PopDown(4);
-}
-
-void CommentPopUp(title, text)
-     char *title, *text;
+void
+CommentPopUp (char *title, char *text)
 {
     savedIndex = currentMove; // [HGM] vari
     NewCommentPopup(title, text, currentMove);
 }
 
-void CommentPopDown()
-{
-    PopDown(1);
-}
-
-static char *openName;
-FILE *openFP;
-
-void DelayedLoad()
-{
-  (void) (*fileProc)(openFP, 0, openName);
-}
-
-void FileNamePopUp(label, def, filter, proc, openMode)
-     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
-	if(openFP = XsraSelFile(shellWidget, label, NULL, NULL, _("could not open: "),
-			   (def[0] ? def : NULL), filter, openMode, NULL, &openName))
-	  // [HGM] delay to give expose event opportunity to redraw board after browser-dialog popdown before lengthy load starts
-	  ScheduleDelayedEvent(&DelayedLoad, 50);
-    }
-}
-
-void FileNamePopDown()
-{
-    if (!filenameUp) return;
-    XtPopdown(fileNameShell);
-    XtDestroyWidget(fileNameShell);
-    filenameUp = False;
-    ModeHighlight();
-}
-
-void FileNameCallback(w, client_data, call_data)
-     Widget w;
-     XtPointer client_data, call_data;
-{
-    String name;
-    Arg args[16];
-
-    XtSetArg(args[0], XtNlabel, &name);
-    XtGetValues(w, args, 1);
-
-    if (strcmp(name, _("cancel")) == 0) {
-        FileNamePopDown();
-        return;
-    }
-
-    FileNameAction(w, NULL, NULL, NULL);
-}
-
-void FileNameAction(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    char buf[MSG_SIZ];
-    String name;
-    FILE *f;
-    char *p, *fullname;
-    int index;
-
-    name = XawDialogGetValueString(w = XtParent(w));
-
-    if ((name != NULL) && (*name != NULLCHAR)) {
-        safeStrCpy(buf, name, sizeof(buf)/sizeof(buf[0]) );
-	XtPopdown(w = XtParent(XtParent(w)));
-	XtDestroyWidget(w);
-	filenameUp = False;
-
-	p = strrchr(buf, ' ');
-	if (p == NULL) {
-	    index = 0;
-	} else {
-	    *p++ = NULLCHAR;
-	    index = atoi(p);
-	}
-	fullname = ExpandPathName(buf);
-	if (!fullname) {
-	    ErrorPopUp(_("Error"), _("Can't open file"), FALSE);
-	}
-	else {
-	    f = fopen(fullname, fileOpenMode);
-	    if (f == NULL) {
-		DisplayError(_("Failed to open file"), errno);
-	    } else {
-		(void) (*fileProc)(f, index, buf);
-	    }
-	}
-	ModeHighlight();
-	return;
-    }
-
-    XtPopdown(w = XtParent(XtParent(w)));
-    XtDestroyWidget(w);
-    filenameUp = False;
-    ModeHighlight();
-}
-
-void PromotionPopUp()
-{
-    Arg args[16];
-    Widget dialog, layout;
-    Position x, y;
-    Dimension bw_width, pw_width;
-    int j;
-    char *PromoChars = "wglcqrbnkac+=\0";
-
-    j = 0;
-    XtSetArg(args[j], XtNwidth, &bw_width); j++;
-    XtGetValues(boardWidget, args, j);
-
-    j = 0;
-    XtSetArg(args[j], XtNresizable, True); j++;
-    XtSetArg(args[j], XtNtitle, XtNewString(_("Promotion"))); j++;
-    promotionShell =
-      XtCreatePopupShell("Promotion", transientShellWidgetClass,
-			 shellWidget, args, j);
-    layout =
-      XtCreateManagedWidget(layoutName, formWidgetClass, promotionShell,
-			    layoutArgs, XtNumber(layoutArgs));
-
-    j = 0;
-    XtSetArg(args[j], XtNlabel, _("Promote to what?")); j++;
-    XtSetArg(args[j], XtNborderWidth, 0); j++;
-    dialog = XtCreateManagedWidget("promotion", dialogWidgetClass,
-				   layout, args, j);
-
-  if(gameInfo.variant != VariantShogi) {
-   if(gameInfo.variant == VariantSpartan && !WhiteOnMove(currentMove)) {
-      XawDialogAddButton(dialog, _("Warlord"), PromotionCallback, PromoChars + 0);
-      XawDialogAddButton(dialog, _("General"), PromotionCallback, PromoChars + 1);
-      XawDialogAddButton(dialog, _("Lieutenant"), PromotionCallback, PromoChars + 2);
-      XawDialogAddButton(dialog, _("Captain"), PromotionCallback, PromoChars + 3);
-    } else {
-    XawDialogAddButton(dialog, _("Queen"), PromotionCallback, PromoChars + 4);
-    XawDialogAddButton(dialog, _("Rook"), PromotionCallback, PromoChars + 5);
-    XawDialogAddButton(dialog, _("Bishop"), PromotionCallback, PromoChars + 6);
-    XawDialogAddButton(dialog, _("Knight"), PromotionCallback, PromoChars + 7);
-    }
-    if (!appData.testLegality || gameInfo.variant == VariantSuicide ||
-        gameInfo.variant == VariantSpartan && !WhiteOnMove(currentMove) ||
-        gameInfo.variant == VariantGiveaway) {
-      XawDialogAddButton(dialog, _("King"), PromotionCallback, PromoChars + 8);
-    }
-    if(gameInfo.variant == VariantCapablanca ||
-       gameInfo.variant == VariantGothic ||
-       gameInfo.variant == VariantCapaRandom) {
-      XawDialogAddButton(dialog, _("Archbishop"), PromotionCallback, PromoChars + 9);
-      XawDialogAddButton(dialog, _("Chancellor"), PromotionCallback, PromoChars + 10);
-    }
-  } else // [HGM] shogi
-  {
-      XawDialogAddButton(dialog, _("Promote"), PromotionCallback, PromoChars + 11);
-      XawDialogAddButton(dialog, _("Defer"), PromotionCallback, PromoChars + 12);
-  }
-    XawDialogAddButton(dialog, _("cancel"), PromotionCallback, PromoChars + 13);
-
-    XtRealizeWidget(promotionShell);
-    CatchDeleteWindow(promotionShell, "PromotionPopDown");
-
-    j = 0;
-    XtSetArg(args[j], XtNwidth, &pw_width); j++;
-    XtGetValues(promotionShell, args, j);
-
-    XtTranslateCoords(boardWidget, (bw_width - pw_width) / 2,
-		      lineGap + squareSize/3 +
-		      ((toY == BOARD_HEIGHT-1) ^ (flipView) ?
-		       0 : 6*(squareSize + lineGap)), &x, &y);
-
-    j = 0;
-    XtSetArg(args[j], XtNx, x); j++;
-    XtSetArg(args[j], XtNy, y); j++;
-    XtSetValues(promotionShell, args, j);
-
-    XtPopup(promotionShell, XtGrabNone);
-
-    promotionUp = True;
-}
-
-void PromotionPopDown()
-{
-    if (!promotionUp) return;
-    XtPopdown(promotionShell);
-    XtDestroyWidget(promotionShell);
-    promotionUp = False;
-}
-
-void PromotionCallback(w, client_data, call_data)
-     Widget w;
-     XtPointer client_data, call_data;
-{
-    int promoChar = * (const char *) client_data;
-
-    PromotionPopDown();
-
-    if (fromX == -1) return;
-
-    if (! promoChar) {
-	fromX = fromY = -1;
-	ClearHighlights();
-	return;
-    }
-    UserMoveEvent(fromX, fromY, toX, toY, promoChar);
-
-    if (!appData.highlightLastMove || gotPremove) ClearHighlights();
-    if (gotPremove) SetPremoveHighlights(fromX, fromY, toX, toY);
-    fromX = fromY = -1;
-}
-
-
-void ErrorCallback(w, client_data, call_data)
-     Widget w;
-     XtPointer client_data, call_data;
-{
-    errorUp = False;
-    XtPopdown(w = XtParent(XtParent(XtParent(w))));
-    XtDestroyWidget(w);
-    if (errorExitStatus != -1) ExitEvent(errorExitStatus);
-}
-
-
-void ErrorPopDown()
+void
+CommentPopDown ()
 {
-    if (!errorUp) return;
-    errorUp = False;
-    XtPopdown(errorShell);
-    XtDestroyWidget(errorShell);
-    if (errorExitStatus != -1) ExitEvent(errorExitStatus);
+    PopDown(CommentDlg);
 }
 
-void ErrorPopUp(title, label, modal)
-     char *title, *label;
-     int modal;
-{
-    Arg args[16];
-    Widget dialog, layout;
-    Position x, y;
-    int xx, yy;
-    Window junk;
-    Dimension bw_width, pw_width;
-    Dimension pw_height;
-    int i;
-
-    i = 0;
-    XtSetArg(args[i], XtNresizable, True);  i++;
-    XtSetArg(args[i], XtNtitle, title); i++;
-    errorShell =
-      XtCreatePopupShell("errorpopup", transientShellWidgetClass,
-			 shellWidget, args, i);
-    layout =
-      XtCreateManagedWidget(layoutName, formWidgetClass, errorShell,
-			    layoutArgs, XtNumber(layoutArgs));
-
-    i = 0;
-    XtSetArg(args[i], XtNlabel, label); i++;
-    XtSetArg(args[i], XtNborderWidth, 0); i++;
-    dialog = XtCreateManagedWidget("dialog", dialogWidgetClass,
-				   layout, args, i);
-
-    XawDialogAddButton(dialog, _("ok"), ErrorCallback, (XtPointer) dialog);
-
-    XtRealizeWidget(errorShell);
-    CatchDeleteWindow(errorShell, "ErrorPopDown");
-
-    i = 0;
-    XtSetArg(args[i], XtNwidth, &bw_width);  i++;
-    XtGetValues(boardWidget, args, i);
-    i = 0;
-    XtSetArg(args[i], XtNwidth, &pw_width);  i++;
-    XtSetArg(args[i], XtNheight, &pw_height);  i++;
-    XtGetValues(errorShell, args, i);
-
-#ifdef NOTDEF
-    /* This code seems to tickle an X bug if it is executed too soon
-       after xboard starts up.  The coordinates get transformed as if
-       the main window was positioned at (0, 0).
-       */
-    XtTranslateCoords(boardWidget, (bw_width - pw_width) / 2,
-		      0 - pw_height + squareSize / 3, &x, &y);
-#else
-    XTranslateCoordinates(xDisplay, XtWindow(boardWidget),
-			  RootWindowOfScreen(XtScreen(boardWidget)),
-			  (bw_width - pw_width) / 2,
-			  0 - pw_height + squareSize / 3, &xx, &yy, &junk);
-    x = xx;
-    y = yy;
-#endif
-    if (y < 0) y = 0; /*avoid positioning top offscreen*/
-
-    i = 0;
-    XtSetArg(args[i], XtNx, x);  i++;
-    XtSetArg(args[i], XtNy, y);  i++;
-    XtSetValues(errorShell, args, i);
-
-    errorUp = True;
-    XtPopup(errorShell, modal ? XtGrabExclusive : XtGrabNone);
-}
 
 /* Disable all user input other than deleting the window */
 static int frozen = 0;
-void FreezeUI()
+
+void
+FreezeUI ()
 {
   if (frozen) return;
   /* Grab by a widget that doesn't accept input */
-  XtAddGrab(messageWidget, TRUE, FALSE);
+  XtAddGrab(optList[W_MESSG].handle, TRUE, FALSE);
   frozen = 1;
 }
 
 /* Undo a FreezeUI */
-void ThawUI()
+void
+ThawUI ()
 {
   if (!frozen) return;
-  XtRemoveGrab(messageWidget);
+  XtRemoveGrab(optList[W_MESSG].handle);
   frozen = 0;
 }
 
-char *ModeToWidgetName(mode)
-     GameMode mode;
-{
-    switch (mode) {
-      case BeginningOfGame:
-	if (appData.icsActive)
-	  return "menuMode.ICS Client";
-	else if (appData.noChessProgram ||
-		 *appData.cmailGameName != NULLCHAR)
-	  return "menuMode.Edit Game";
-	else
-	  return "menuMode.Machine Black";
-      case MachinePlaysBlack:
-	return "menuMode.Machine Black";
-      case MachinePlaysWhite:
-	return "menuMode.Machine White";
-      case AnalyzeMode:
-	return "menuMode.Analysis Mode";
-      case AnalyzeFile:
-	return "menuMode.Analyze File";
-      case TwoMachinesPlay:
-	return "menuMode.Two Machines";
-      case EditGame:
-	return "menuMode.Edit Game";
-      case PlayFromGameFile:
-	return "menuFile.Load Game";
-      case EditPosition:
-	return "menuMode.Edit Position";
-      case Training:
-	return "menuMode.Training";
-      case IcsPlayingWhite:
-      case IcsPlayingBlack:
-      case IcsObserving:
-      case IcsIdle:
-      case IcsExamining:
-	return "menuMode.ICS Client";
-      default:
-      case EndOfGame:
-	return NULL;
-    }
-}
-
-void ModeHighlight()
+void
+ModeHighlight ()
 {
     Arg args[16];
     static int oldPausing = FALSE;
@@ -5408,13 +2830,7 @@ void ModeHighlight()
 
     if (pausing != oldPausing) {
 	oldPausing = pausing;
-	if (pausing) {
-	    XtSetArg(args[0], XtNleftBitmap, xMarkPixmap);
-	} else {
-	    XtSetArg(args[0], XtNleftBitmap, None);
-	}
-	XtSetValues(XtNameToWidget(menuBarWidget, "menuMode.Pause"),
-		    args, 1);
+	MarkMenuItem("Mode.Pause", pausing);
 
 	if (appData.showButtonBar) {
 	  /* Always toggle, don't set.  Previous code messes up when
@@ -5424,205 +2840,70 @@ void ModeHighlight()
 	    Pixel oldbg, oldfg;
 	    XtSetArg(args[0], XtNbackground, &oldbg);
 	    XtSetArg(args[1], XtNforeground, &oldfg);
-	    XtGetValues(XtNameToWidget(buttonBarWidget, PAUSE_BUTTON),
+	    XtGetValues(optList[W_PAUSE].handle,
 			args, 2);
 	    XtSetArg(args[0], XtNbackground, oldfg);
 	    XtSetArg(args[1], XtNforeground, oldbg);
 	  }
-	  XtSetValues(XtNameToWidget(buttonBarWidget, PAUSE_BUTTON), args, 2);
+	  XtSetValues(optList[W_PAUSE].handle, args, 2);
 	}
     }
 
     wname = ModeToWidgetName(oldmode);
     if (wname != NULL) {
-	XtSetArg(args[0], XtNleftBitmap, None);
-	XtSetValues(XtNameToWidget(menuBarWidget, wname), args, 1);
+	MarkMenuItem(wname, False);
     }
     wname = ModeToWidgetName(gameMode);
     if (wname != NULL) {
-	XtSetArg(args[0], XtNleftBitmap, xMarkPixmap);
-	XtSetValues(XtNameToWidget(menuBarWidget, wname), args, 1);
+	MarkMenuItem(wname, True);
     }
     oldmode = gameMode;
-    XtSetArg(args[0], XtNleftBitmap, matchMode && matchGame < appData.matchGames ? xMarkPixmap : None);
-    XtSetValues(XtNameToWidget(menuBarWidget, "menuMode.Machine Match"), args, 1);
+    MarkMenuItem("Mode.MachineMatch", matchMode && matchGame < appData.matchGames);
 
     /* Maybe all the enables should be handled here, not just this one */
-    XtSetSensitive(XtNameToWidget(menuBarWidget, "menuMode.Training"),
-		   gameMode == Training || gameMode == PlayFromGameFile);
+    EnableNamedMenuItem("Mode.Training", gameMode == Training || gameMode == PlayFromGameFile);
 }
 
 
 /*
  * Button/menu procedures
  */
-void ResetProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    ResetGameEvent();
-}
-
-int LoadGamePopUp(f, gameNumber, title)
-     FILE *f;
-     int gameNumber;
-     char *title;
-{
-    cmailMsgLoaded = FALSE;
-    if (gameNumber == 0) {
-	int error = GameListBuild(f);
-	if (error) {
-	    DisplayError(_("Cannot build game list"), error);
-	} else if (!ListEmpty(&gameList) &&
-		   ((ListGame *) gameList.tailPred)->number > 1) {
-	    GameListPopUp(f, title);
-	    return TRUE;
-	}
-	GameListDestroy();
-	gameNumber = 1;
-    }
-    return LoadGame(f, gameNumber, title, FALSE);
-}
-
-void LoadGameProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    if (gameMode == AnalyzeMode || gameMode == AnalyzeFile) {
-	Reset(FALSE, TRUE);
-    }
-    FileNamePopUp(_("Load game file name?"), "", ".pgn .game", LoadGamePopUp, "rb");
-}
-
-void LoadNextGameProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    ReloadGame(1);
-}
-
-void LoadPrevGameProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    ReloadGame(-1);
-}
-
-void ReloadGameProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    ReloadGame(0);
-}
-
-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;
-     String *prms;
-     Cardinal *nprms;
-{
-    if (gameMode == AnalyzeMode || gameMode == AnalyzeFile) {
-	Reset(FALSE, TRUE);
-    }
-    FileNamePopUp(_("Load position file name?"), "", ".fen .epd .pos", LoadPosition, "rb");
-}
-
-void SaveGameProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    FileNamePopUp(_("Save game file name?"),
-		  DefaultFileName(appData.oldSaveStyle ? "game" : "pgn"),
-		  appData.oldSaveStyle ? ".game" : ".pgn",
-		  SaveGame, "a");
-}
-
-void SavePositionProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    FileNamePopUp(_("Save position file name?"),
-		  DefaultFileName(appData.oldSaveStyle ? "pos" : "fen"),
-		  appData.oldSaveStyle ? ".pos" : ".fen",
-		  SavePosition, "a");
-}
-
-void ReloadCmailMsgProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    ReloadCmailMsgEvent(FALSE);
-}
-
-void MailMoveProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    MailMoveEvent();
-}
 
 /* this variable is shared between CopyPositionProc and SendPositionSelection */
 char *selected_fen_position=NULL;
 
 Boolean
-SendPositionSelection(Widget w, Atom *selection, Atom *target,
-		 Atom *type_return, XtPointer *value_return,
-		 unsigned long *length_return, int *format_return)
+SendPositionSelection (Widget w, Atom *selection, Atom *target,
+		       Atom *type_return, XtPointer *value_return,
+		       unsigned long *length_return, int *format_return)
 {
   char *selection_tmp;
 
-  if (!selected_fen_position) return False; /* should never happen */
+//  if (!selected_fen_position) return False; /* should never happen */
   if (*target == XA_STRING || *target == XA_UTF8_STRING(xDisplay)){
+   if (!selected_fen_position) { // since it never happens, we use it for indicating a game is being sent
+    FILE* f = fopen(gameCopyFilename, "r"); // This code, taken from SendGameSelection, now merges the two
+    long len;
+    size_t count;
+    if (f == NULL) return False;
+    fseek(f, 0, 2);
+    len = ftell(f);
+    rewind(f);
+    selection_tmp = XtMalloc(len + 1);
+    count = fread(selection_tmp, 1, len, f);
+    fclose(f);
+    if (len != count) {
+      XtFree(selection_tmp);
+      return False;
+    }
+    selection_tmp[len] = NULLCHAR;
+   } else {
     /* note: since no XtSelectionDoneProc was registered, Xt will
      * automatically call XtFree on the value returned.  So have to
      * make a copy of it allocated with XtMalloc */
     selection_tmp= XtMalloc(strlen(selected_fen_position)+16);
     safeStrCpy(selection_tmp, selected_fen_position, strlen(selected_fen_position)+16 );
+   }
 
     *value_return=selection_tmp;
     *length_return=strlen(selection_tmp);
@@ -5658,21 +2939,15 @@ SendPositionSelection(Widget w, Atom *selection, Atom *target,
 /* note: when called from menu all parameters are NULL, so no clue what the
  * Widget which was clicked on was, or what the click event was
  */
-void CopyPositionProc(w, event, prms, nprms)
-  Widget w;
-  XEvent *event;
-  String *prms;
-  Cardinal *nprms;
-  {
+void
+CopySomething (char *src)
+{
+    selected_fen_position = src;
     /*
      * Set both PRIMARY (the selection) and CLIPBOARD, since we don't
      * have a notion of a position that is selected but not copied.
      * See http://www.freedesktop.org/wiki/Specifications/ClipboardsWiki
      */
-    if(gameMode == EditPosition) EditPositionDone(TRUE);
-    if (selected_fen_position) free(selected_fen_position);
-    selected_fen_position = (char *)PositionToFEN(currentMove, NULL);
-    if (!selected_fen_position) return;
     XtOwnSelection(menuBarWidget, XA_PRIMARY,
 		   CurrentTime,
 		   SendPositionSelection,
@@ -5683,12 +2958,12 @@ void CopyPositionProc(w, event, prms, nprms)
 		   SendPositionSelection,
 		   NULL/* lose_ownership_proc */ ,
 		   NULL/* transfer_done_proc */);
-  }
+}
 
 /* function called when the data to Paste is ready */
 static void
-PastePositionCB(Widget w, XtPointer client_data, Atom *selection,
-	   Atom *type, XtPointer value, unsigned long *len, int *format)
+PastePositionCB (Widget w, XtPointer client_data, Atom *selection,
+		 Atom *type, XtPointer value, unsigned long *len, int *format)
 {
   char *fenstr=value;
   if (value==NULL || *len==0) return; /* nothing had been selected to copy */
@@ -5699,11 +2974,8 @@ PastePositionCB(Widget w, XtPointer client_data, Atom *selection,
 
 /* called when Paste Position button is pressed,
  * all parameters will be NULL */
-void PastePositionProc(w, event, prms, nprms)
-  Widget w;
-  XEvent *event;
-  String *prms;
-  Cardinal *nprms;
+void
+PastePositionProc ()
 {
     XtGetSelectionValue(menuBarWidget,
       appData.pasteSelection ? XA_PRIMARY: XA_CLIPBOARD(xDisplay), XA_STRING,
@@ -5718,110 +2990,13 @@ void PastePositionProc(w, event, prms, nprms)
     return;
 }
 
-static Boolean
-SendGameSelection(Widget w, Atom *selection, Atom *target,
-		  Atom *type_return, XtPointer *value_return,
-		  unsigned long *length_return, int *format_return)
-{
-  char *selection_tmp;
-
-  if (*target == XA_STRING || *target == XA_UTF8_STRING(xDisplay)){
-    FILE* f = fopen(gameCopyFilename, "r");
-    long len;
-    size_t count;
-    if (f == NULL) return False;
-    fseek(f, 0, 2);
-    len = ftell(f);
-    rewind(f);
-    selection_tmp = XtMalloc(len + 1);
-    count = fread(selection_tmp, 1, len, f);
-    fclose(f);
-    if (len != count) {
-      XtFree(selection_tmp);
-      return False;
-    }
-    selection_tmp[len] = NULLCHAR;
-    *value_return = selection_tmp;
-    *length_return = len;
-    *type_return = *target;
-    *format_return = 8; /* bits per byte */
-    return True;
-  } else if (*target == XA_TARGETS(xDisplay)) {
-    Atom *targets_tmp = (Atom *) XtMalloc(2 * sizeof(Atom));
-    targets_tmp[0] = XA_UTF8_STRING(xDisplay);
-    targets_tmp[1] = XA_STRING;
-    *value_return = targets_tmp;
-    *type_return = XA_ATOM;
-    *length_return = 2;
-#if 0
-    // This code leads to a read of value_return out of bounds on 64-bit systems.
-    // Other code which I have seen always sets *format_return to 32 independent of
-    // sizeof(Atom) without adjusting *length_return. For instance see TextConvertSelection()
-    // at http://cgit.freedesktop.org/xorg/lib/libXaw/tree/src/Text.c -- BJ
-    *format_return = 8 * sizeof(Atom);
-    if (*format_return > 32) {
-      *length_return *= *format_return / 32;
-      *format_return = 32;
-    }
-#else
-    *format_return = 32;
-#endif
-    return True;
-  } else {
-    return False;
-  }
-}
-
-void CopySomething()
-{
-  /*
-   * Set both PRIMARY (the selection) and CLIPBOARD, since we don't
-   * have a notion of a game that is selected but not copied.
-   * See http://www.freedesktop.org/wiki/Specifications/ClipboardsWiki
-   */
-  XtOwnSelection(menuBarWidget, XA_PRIMARY,
-		 CurrentTime,
-		 SendGameSelection,
-		 NULL/* lose_ownership_proc */ ,
-		 NULL/* transfer_done_proc */);
-  XtOwnSelection(menuBarWidget, XA_CLIPBOARD(xDisplay),
-		 CurrentTime,
-		 SendGameSelection,
-		 NULL/* lose_ownership_proc */ ,
-		 NULL/* transfer_done_proc */);
-}
-
 /* note: when called from menu all parameters are NULL, so no clue what the
  * Widget which was clicked on was, or what the click event was
  */
-void CopyGameProc(w, event, prms, nprms)
-  Widget w;
-  XEvent *event;
-  String *prms;
-  Cardinal *nprms;
-{
-  int ret;
-
-  ret = SaveGameToFile(gameCopyFilename, FALSE);
-  if (!ret) return;
-
-  CopySomething();
-}
-
-void CopyGameListProc(w, event, prms, nprms)
-  Widget w;
-  XEvent *event;
-  String *prms;
-  Cardinal *nprms;
-{
-  if(!SaveGameListAsText(fopen(gameCopyFilename, "w"))) return;
-  CopySomething();
-}
-
 /* function called when the data to Paste is ready */
 static void
-PasteGameCB(Widget w, XtPointer client_data, Atom *selection,
-	    Atom *type, XtPointer value, unsigned long *len, int *format)
+PasteGameCB (Widget w, XtPointer client_data, Atom *selection,
+	     Atom *type, XtPointer value, unsigned long *len, int *format)
 {
   FILE* f;
   if (value == NULL || *len == 0) {
@@ -5840,11 +3015,8 @@ PasteGameCB(Widget w, XtPointer client_data, Atom *selection,
 
 /* called when Paste Game button is pressed,
  * all parameters will be NULL */
-void PasteGameProc(w, event, prms, nprms)
-  Widget w;
-  XEvent *event;
-  String *prms;
-  Cardinal *nprms;
+void
+PasteGameProc ()
 {
     XtGetSelectionValue(menuBarWidget,
       appData.pasteSelection ? XA_PRIMARY: XA_CLIPBOARD(xDisplay), XA_STRING,
@@ -5860,406 +3032,58 @@ void PasteGameProc(w, event, prms, nprms)
 }
 
 
-void AutoSaveGame()
-{
-    SaveGameProc(NULL, NULL, NULL, NULL);
-}
-
-
-void QuitProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    ExitEvent(0);
-}
-
-void PauseProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    PauseEvent();
-}
-
-
-void MachineBlackProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    MachineBlackEvent();
-}
-
-void MachineWhiteProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    MachineWhiteEvent();
-}
-
-void AnalyzeModeProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
+void
+QuitWrapper (Widget w, XEvent *event, String *prms, Cardinal *nprms)
 {
-    char buf[MSG_SIZ];
-
-    if (!first.analysisSupport) {
-      snprintf(buf, sizeof(buf), _("%s does not support analysis"), first.tidy);
-      DisplayError(buf, 0);
-      return;
-    }
-    /* [DM] icsEngineAnalyze [HGM] This is horrible code; reverse the gameMode and isEngineAnalyze tests! */
-    if (appData.icsActive) {
-        if (gameMode != IcsObserving) {
-	  snprintf(buf, MSG_SIZ, _("You are not observing a game"));
-            DisplayError(buf, 0);
-            /* secure check */
-            if (appData.icsEngineAnalyze) {
-                if (appData.debugMode)
-                    fprintf(debugFP, _("Found unexpected active ICS engine analyze \n"));
-                ExitAnalyzeMode();
-                ModeHighlight();
-            }
-            return;
-        }
-        /* if enable, use want disable icsEngineAnalyze */
-        if (appData.icsEngineAnalyze) {
-                ExitAnalyzeMode();
-                ModeHighlight();
-                return;
-        }
-        appData.icsEngineAnalyze = TRUE;
-        if (appData.debugMode)
-            fprintf(debugFP, _("ICS engine analyze starting... \n"));
-    }
-#ifndef OPTIONSDIALOG
-    if (!appData.showThinking)
-      ShowThinkingProc(w,event,prms,nprms);
-#endif
-
-    AnalyzeModeEvent();
+    QuitProc();
 }
 
-void AnalyzeFileProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    if (!first.analysisSupport) {
-      char buf[MSG_SIZ];
-      snprintf(buf, sizeof(buf), _("%s does not support analysis"), first.tidy);
-      DisplayError(buf, 0);
-      return;
+int
+ShiftKeys ()
+{   // bassic primitive for determining if modifier keys are pressed
+    long int codes[] = { XK_Meta_L, XK_Meta_R, XK_Control_L, XK_Control_R, XK_Shift_L, XK_Shift_R };
+    char keys[32];
+    int i,j,  k=0;
+    XQueryKeymap(xDisplay,keys);
+    for(i=0; i<6; i++) {
+	k <<= 1;
+	j = XKeysymToKeycode(xDisplay, codes[i]);
+	k += ( (keys[j>>3]&1<<(j&7)) != 0 );
     }
-//    Reset(FALSE, TRUE);
-#ifndef OPTIONSDIALOG
-    if (!appData.showThinking)
-      ShowThinkingProc(w,event,prms,nprms);
-#endif
-    AnalyzeFileEvent();
-//    FileNamePopUp(_("File to analyze"), "", ".pgn .game", LoadGamePopUp, "rb");
-    AnalysisPeriodicEvent(1);
-}
-
-void TwoMachinesProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    TwoMachinesEvent();
-}
-
-void MatchProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    MatchEvent(2);
-}
-
-void IcsClientProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    IcsClientEvent();
-}
-
-void EditGameProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    EditGameEvent();
-}
-
-void EditPositionProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    EditPositionEvent();
-}
-
-void TrainingProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    TrainingEvent();
+    return k;
 }
 
-void EditCommentProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    Arg args[5];
-    int j;
-    if (PopDown(1)) { // popdown succesful
-	j = 0;
-	XtSetArg(args[j], XtNleftBitmap, None); j++;
-	XtSetValues(XtNameToWidget(menuBarWidget, "menuEdit.Edit Comment"), args, j);
-	XtSetValues(XtNameToWidget(menuBarWidget, "menuView.Show Comments"), args, j);
-    } else // was not up
-	EditCommentEvent();
-}
-
-void IcsInputBoxProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    if (!PopDown(4)) ICSInputBoxPopUp();
-}
-
-void AcceptProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    AcceptEvent();
-}
-
-void DeclineProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    DeclineEvent();
-}
-
-void RematchProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    RematchEvent();
-}
-
-void CallFlagProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    CallFlagEvent();
-}
-
-void DrawProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    DrawEvent();
-}
-
-void AbortProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    AbortEvent();
-}
-
-void AdjournProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    AdjournEvent();
-}
-
-void ResignProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    ResignEvent();
-}
-
-void AdjuWhiteProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    UserAdjudicationEvent(+1);
-}
-
-void AdjuBlackProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    UserAdjudicationEvent(-1);
-}
-
-void AdjuDrawProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    UserAdjudicationEvent(0);
-}
-
-void EnterKeyProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
+static void
+MoveTypeInProc (Widget widget, caddr_t unused, XEvent *event)
 {
-    if (shellUp[4] == True)
-      ICSInputSendText();
+    char buf[10];
+    KeySym sym;
+    int n = XLookupString(&(event->xkey), buf, 10, &sym, NULL);
+    if ( n == 1 && *buf >= 32 // printable
+	 && !(ShiftKeys() & 0x3C) // no Alt, Ctrl
+	) BoxAutoPopUp (buf);
 }
 
-void UpKeyProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
+static void
+UpKeyProc (Widget w, XEvent *event, String *prms, Cardinal *nprms)
 {   // [HGM] input: let up-arrow recall previous line from history
-    Widget edit;
-    int j;
-    Arg args[16];
-    String val;
-    XawTextBlock t;
-
-    if (!shellUp[4]) return;
-    edit = boxOptions[0].handle;
-    j = 0;
-    XtSetArg(args[j], XtNstring, &val); j++;
-    XtGetValues(edit, args, j);
-    val = PrevInHistory(val);
-    XtCallActionProc(edit, "select-all", NULL, NULL, 0);
-    XtCallActionProc(edit, "kill-selection", NULL, NULL, 0);
-    if(val) {
-	t.ptr = val; t.firstPos = 0; t.length = strlen(val); t.format = XawFmt8Bit;
-	XawTextReplace(edit, 0, 0, &t);
-	XawTextSetInsertionPoint(edit, 9999);
-    }
+    IcsKey(1);
 }
 
-void DownKeyProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
+static void
+DownKeyProc (Widget w, XEvent *event, String *prms, Cardinal *nprms)
 {   // [HGM] input: let down-arrow recall next line from history
-    Widget edit;
-    String val;
-    XawTextBlock t;
-
-    if (!shellUp[4]) return;
-    edit = boxOptions[0].handle;
-    val = NextInHistory();
-    XtCallActionProc(edit, "select-all", NULL, NULL, 0);
-    XtCallActionProc(edit, "kill-selection", NULL, NULL, 0);
-    if(val) {
-	t.ptr = val; t.firstPos = 0; t.length = strlen(val); t.format = XawFmt8Bit;
-	XawTextReplace(edit, 0, 0, &t);
-	XawTextSetInsertionPoint(edit, 9999);
-    }
-}
-
-void StopObservingProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    StopObservingEvent();
-}
-
-void StopExaminingProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    StopExaminingEvent();
-}
-
-void UploadProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    UploadGameEvent();
+    IcsKey(-1);
 }
 
-
-void ForwardProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    ForwardEvent();
-}
-
-
-void BackwardProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
+static void
+EnterKeyProc (Widget w, XEvent *event, String *prms, Cardinal *nprms)
 {
-    BackwardEvent();
+    IcsKey(0);
 }
 
-void TempBackwardProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
+void
+TempBackwardProc (Widget w, XEvent *event, String *prms, Cardinal *nprms)
 {
 	if (!TempBackwardActive) {
 		TempBackwardActive = True;
@@ -6267,11 +3091,8 @@ void TempBackwardProc(w, event, prms, nprms)
 	}
 }
 
-void TempForwardProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
+void
+TempForwardProc (Widget w, XEvent *event, String *prms, Cardinal *nprms)
 {
 	/* Check to see if triggered by a key release event for a repeating key.
 	 * If so the next queued event will be a key press of the same key at the same time */
@@ -6286,554 +3107,9 @@ void TempForwardProc(w, event, prms, nprms)
 	TempBackwardActive = False;
 }
 
-void ToStartProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    ToStartEvent();
-}
-
-void ToEndProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    ToEndEvent();
-}
-
-void RevertProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    RevertEvent(False);
-}
-
-void AnnotateProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    RevertEvent(True);
-}
-
-void TruncateGameProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    TruncateGameEvent();
-}
-void RetractMoveProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    RetractMoveEvent();
-}
-
-void MoveNowProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    MoveNowEvent();
-}
-
-void FlipViewProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    flipView = !flipView;
-    DrawPosition(True, NULL);
-}
-
-void PonderNextMoveProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    Arg args[16];
-
-    PonderNextMoveEvent(!appData.ponderNextMove);
-#ifndef OPTIONSDIALOG
-    if (appData.ponderNextMove) {
-	XtSetArg(args[0], XtNleftBitmap, xMarkPixmap);
-    } else {
-	XtSetArg(args[0], XtNleftBitmap, None);
-    }
-    XtSetValues(XtNameToWidget(menuBarWidget, "menuOptions.Ponder Next Move"),
-		args, 1);
-#endif
-}
-
-#ifndef OPTIONSDIALOG
-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 AutoflagProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    Arg args[16];
-
-    appData.autoCallFlag = !appData.autoCallFlag;
-
-    if (appData.autoCallFlag) {
-	XtSetArg(args[0], XtNleftBitmap, xMarkPixmap);
-    } else {
-	XtSetArg(args[0], XtNleftBitmap, None);
-    }
-    XtSetValues(XtNameToWidget(menuBarWidget, "menuOptions.Auto Flag"),
-		args, 1);
-}
-
-void AutoflipProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    Arg args[16];
-
-    appData.autoFlipView = !appData.autoFlipView;
-
-    if (appData.autoFlipView) {
-	XtSetArg(args[0], XtNleftBitmap, xMarkPixmap);
-    } else {
-	XtSetArg(args[0], XtNleftBitmap, None);
-    }
-    XtSetValues(XtNameToWidget(menuBarWidget, "menuOptions.Auto Flip View"),
-		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 HighlightArrowProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    Arg args[16];
-
-    appData.highlightMoveWithArrow = !appData.highlightMoveWithArrow;
-
-    if (appData.highlightMoveWithArrow) {
-	XtSetArg(args[0], XtNleftBitmap, xMarkPixmap);
-    } else {
-	XtSetArg(args[0], XtNleftBitmap, None);
-    }
-    XtSetValues(XtNameToWidget(menuBarWidget,
-			       "menuOptions.Arrow"), args, 1);
-}
-
-#if 0
-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);
-}
-#endif
-
-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 OneClickProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    Arg args[16];
-
-    appData.oneClick = !appData.oneClick;
-
-    if (appData.oneClick) {
-	XtSetArg(args[0], XtNleftBitmap, xMarkPixmap);
-    } else {
-	XtSetArg(args[0], XtNleftBitmap, None);
-    }
-    XtSetValues(XtNameToWidget(menuBarWidget, "menuOptions.OneClick"),
-		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 PopupExitMessageProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    Arg args[16];
-
-    appData.popupExitMessage = !appData.popupExitMessage;
-
-    if (appData.popupExitMessage) {
-	XtSetArg(args[0], XtNleftBitmap, xMarkPixmap);
-    } else {
-	XtSetArg(args[0], XtNleftBitmap, None);
-    }
-    XtSetValues(XtNameToWidget(menuBarWidget,
-			       "menuOptions.Popup Exit Message"), args, 1);
-}
-
-void PopupMoveErrorsProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    Arg args[16];
-
-    appData.popupMoveErrors = !appData.popupMoveErrors;
-
-    if (appData.popupMoveErrors) {
-	XtSetArg(args[0], XtNleftBitmap, xMarkPixmap);
-    } else {
-	XtSetArg(args[0], XtNleftBitmap, None);
-    }
-    XtSetValues(XtNameToWidget(menuBarWidget, "menuOptions.Popup Move Errors"),
-		args, 1);
-}
-
-#if 0
-void PremoveProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    Arg args[16];
-
-    appData.premove = !appData.premove;
-
-    if (appData.premove) {
-	XtSetArg(args[0], XtNleftBitmap, xMarkPixmap);
-    } else {
-	XtSetArg(args[0], XtNleftBitmap, None);
-    }
-    XtSetValues(XtNameToWidget(menuBarWidget,
-			       "menuOptions.Premove"), args, 1);
-}
-#endif
-
-void ShowCoordsProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    Arg args[16];
-
-    appData.showCoords = !appData.showCoords;
-
-    if (appData.showCoords) {
-	XtSetArg(args[0], XtNleftBitmap, xMarkPixmap);
-    } else {
-	XtSetArg(args[0], XtNleftBitmap, None);
-    }
-    XtSetValues(XtNameToWidget(menuBarWidget, "menuOptions.Show Coords"),
-		args, 1);
-
-    DrawPosition(True, NULL);
-}
-
-void ShowThinkingProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    appData.showThinking = !appData.showThinking; // [HGM] thinking: tken out of ShowThinkingEvent
-    ShowThinkingEvent();
-}
-
-void HideThinkingProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    Arg args[16];
-
-    appData.hideThinkingFromHuman = !appData.hideThinkingFromHuman; // [HGM] thinking: tken out of ShowThinkingEvent
-    ShowThinkingEvent();
-
-    if (appData.hideThinkingFromHuman) {
-	XtSetArg(args[0], XtNleftBitmap, xMarkPixmap);
-    } else {
-	XtSetArg(args[0], XtNleftBitmap, None);
-    }
-    XtSetValues(XtNameToWidget(menuBarWidget, "menuOptions.Hide Thinking"),
-		args, 1);
-}
-#endif
-
-void SaveOnExitProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    Arg args[16];
-
-    saveSettingsOnExit = !saveSettingsOnExit;
-
-    if (saveSettingsOnExit) {
-	XtSetArg(args[0], XtNleftBitmap, xMarkPixmap);
-    } else {
-	XtSetArg(args[0], XtNleftBitmap, None);
-    }
-    XtSetValues(XtNameToWidget(menuBarWidget, "menuOptions.Save Settings on Exit"),
-		args, 1);
-}
-
-void SaveSettingsProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-     SaveSettings(settingsFileName);
-}
-
-void InfoProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    char buf[MSG_SIZ];
-    snprintf(buf, sizeof(buf), "xterm -e info --directory %s --directory . -f %s &",
-	    INFODIR, INFOFILE);
-    system(buf);
-}
-
-void ManProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
+void
+ManInner (Widget w, XEvent *event, String *prms, Cardinal *nprms)
+{   // called as key binding
     char buf[MSG_SIZ];
     String name;
     if (nprms && *nprms > 0)
@@ -6844,152 +3120,22 @@ void ManProc(w, event, prms, nprms)
     system(buf);
 }
 
-void HintProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    HintEvent();
-}
-
-void BookProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    BookEvent();
-}
-
-void AboutProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    char buf[MSG_SIZ];
-#if ZIPPY
-    char *zippy = _(" (with Zippy code)");
-#else
-    char *zippy = "";
-#endif
-    snprintf(buf, sizeof(buf), 
-_("%s%s\n\n"
-"Copyright 1991 Digital Equipment Corporation\n"
-"Enhancements Copyright 1992-2009 Free Software Foundation\n"
-"Enhancements Copyright 2005 Alessandro Scotti\n\n"
-"%s is free software and carries NO WARRANTY;"
-"see the file COPYING for more information."),
-	    programVersion, zippy, PACKAGE);
-    ErrorPopUp(_("About XBoard"), buf, FALSE);
-}
-
-void DebugProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    appData.debugMode = !appData.debugMode;
-}
-
-void AboutGameProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    AboutGameEvent();
-}
-
-void NothingProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    return;
-}
-
-void DisplayMessage(message, extMessage)
-     char *message, *extMessage;
-{
-  /* display a message in the message widget */
-
-  char buf[MSG_SIZ];
-  Arg arg;
-
-  if (extMessage)
-    {
-      if (*message)
-	{
-	  snprintf(buf, sizeof(buf), "%s  %s", message, extMessage);
-	  message = buf;
-	}
-      else
-	{
-	  message = extMessage;
-	};
-    };
-
-    safeStrCpy(lastMsg, message, MSG_SIZ); // [HGM] make available
-
-  /* need to test if messageWidget already exists, since this function
-     can also be called during the startup, if for example a Xresource
-     is not set up correctly */
-  if(messageWidget)
-    {
-      XtSetArg(arg, XtNlabel, message);
-      XtSetValues(messageWidget, &arg, 1);
-    };
-
-  return;
+void
+ManProc ()
+{   // called from menu
+    ManInner(NULL, NULL, NULL, NULL);
 }
 
-void DisplayTitle(text)
-     char *text;
+void
+SetWindowTitle (char *text, char *title, char *icon)
 {
     Arg args[16];
     int i;
-    char title[MSG_SIZ];
-    char icon[MSG_SIZ];
-
-    if (text == NULL) text = "";
-
     if (appData.titleInWindow) {
 	i = 0;
 	XtSetArg(args[i], XtNlabel, text);   i++;
 	XtSetValues(titleWidget, args, i);
     }
-
-    if (*text != NULLCHAR) {
-      safeStrCpy(icon, text, sizeof(icon)/sizeof(icon[0]) );
-      safeStrCpy(title, text, sizeof(title)/sizeof(title[0]) );
-    } else if (appData.icsActive) {
-        snprintf(icon, sizeof(icon), "%s", appData.icsHost);
-	snprintf(title, sizeof(title), "%s: %s", programName, appData.icsHost);
-    } else if (appData.cmailGameName[0] != NULLCHAR) {
-        snprintf(icon, sizeof(icon), "%s", "CMail");
-	snprintf(title,sizeof(title), "%s: %s", programName, "CMail");
-#ifdef GOTHIC
-    // [HGM] license: This stuff should really be done in back-end, but WinBoard already had a pop-up for it
-    } else if (gameInfo.variant == VariantGothic) {
-      safeStrCpy(icon,  programName, sizeof(icon)/sizeof(icon[0]) );
-      safeStrCpy(title, GOTHIC,     sizeof(title)/sizeof(title[0]) );
-#endif
-#ifdef FALCON
-    } else if (gameInfo.variant == VariantFalcon) {
-      safeStrCpy(icon, programName, sizeof(icon)/sizeof(icon[0]) );
-      safeStrCpy(title, FALCON, sizeof(title)/sizeof(title[0]) );
-#endif
-    } else if (appData.noChessProgram) {
-      safeStrCpy(icon, programName, sizeof(icon)/sizeof(icon[0]) );
-      safeStrCpy(title, programName, sizeof(title)/sizeof(title[0]) );
-    } else {
-      safeStrCpy(icon, first.tidy, sizeof(icon)/sizeof(icon[0]) );
-	snprintf(title,sizeof(title), "%s: %s", programName, first.tidy);
-    }
     i = 0;
     XtSetArg(args[i], XtNiconName, (XtArgVal) icon);    i++;
     XtSetArg(args[i], XtNtitle, (XtArgVal) title);      i++;
@@ -6998,92 +3144,14 @@ void DisplayTitle(text)
 }
 
 
-void
-DisplayError(message, error)
-     String message;
-     int error;
-{
-    char buf[MSG_SIZ];
-
-    if (error == 0) {
-	if (appData.debugMode || appData.matchMode) {
-	    fprintf(stderr, "%s: %s\n", programName, message);
-	}
-    } else {
-	if (appData.debugMode || appData.matchMode) {
-	    fprintf(stderr, "%s: %s: %s\n",
-		    programName, message, strerror(error));
-	}
-	snprintf(buf, sizeof(buf), "%s: %s", message, strerror(error));
-	message = buf;
-    }
-    ErrorPopUp(_("Error"), message, FALSE);
-}
-
-
-void DisplayMoveError(message)
-     String message;
-{
-    fromX = fromY = -1;
-    ClearHighlights();
-    DrawPosition(FALSE, NULL);
-    if (appData.debugMode || appData.matchMode) {
-	fprintf(stderr, "%s: %s\n", programName, message);
-    }
-    if (appData.popupMoveErrors) {
-	ErrorPopUp(_("Error"), message, FALSE);
-    } else {
-	DisplayMessage(message, "");
-    }
-}
-
-
-void DisplayFatalError(message, error, status)
-     String message;
-     int error, status;
-{
-    char buf[MSG_SIZ];
-
-    errorExitStatus = status;
-    if (error == 0) {
-	fprintf(stderr, "%s: %s\n", programName, message);
-    } else {
-	fprintf(stderr, "%s: %s: %s\n",
-		programName, message, strerror(error));
-	snprintf(buf, sizeof(buf), "%s: %s", message, strerror(error));
-	message = buf;
-    }
-    if (appData.popupExitMessage && boardWidget && XtIsRealized(boardWidget)) {
-      ErrorPopUp(status ? _("Fatal Error") : _("Exiting"), message, TRUE);
-    } else {
-      ExitEvent(status);
-    }
-}
-
-void DisplayInformation(message)
-     String message;
-{
-    ErrorPopDown();
-    ErrorPopUp(_("Information"), message, TRUE);
-}
-
-void DisplayNote(message)
-     String message;
-{
-    ErrorPopDown();
-    ErrorPopUp(_("Note"), message, FALSE);
-}
-
 static int
-NullXErrorCheck(dpy, error_event)
-     Display *dpy;
-     XErrorEvent *error_event;
+NullXErrorCheck (Display *dpy, XErrorEvent *error_event)
 {
     return 0;
 }
 
-void DisplayIcsInteractionTitle(message)
-     String message;
+void
+DisplayIcsInteractionTitle (String message)
 {
   if (oldICSInteractionTitle == NULL) {
     /* Magic to find the old window title, adapted from vim */
@@ -7111,349 +3179,19 @@ void DisplayIcsInteractionTitle(message)
   fflush(stdout);
 }
 
-char pendingReplyPrefix[MSG_SIZ];
-ProcRef pendingReplyPR;
-
-void AskQuestionProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    if (*nprms != 4) {
-	fprintf(stderr, _("AskQuestionProc needed 4 parameters, got %d\n"),
-		*nprms);
-	return;
-    }
-    AskQuestionEvent(prms[0], prms[1], prms[2], prms[3]);
-}
-
-void AskQuestionPopDown()
-{
-    if (!askQuestionUp) return;
-    XtPopdown(askQuestionShell);
-    XtDestroyWidget(askQuestionShell);
-    askQuestionUp = False;
-}
-
-void AskQuestionReplyAction(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    char buf[MSG_SIZ];
-    int err;
-    String reply;
-
-    reply = XawDialogGetValueString(w = XtParent(w));
-    safeStrCpy(buf, pendingReplyPrefix, sizeof(buf)/sizeof(buf[0]) );
-    if (*buf) strncat(buf, " ", MSG_SIZ - strlen(buf) - 1);
-    strncat(buf, reply, MSG_SIZ - strlen(buf) - 1);
-    strncat(buf, "\n",  MSG_SIZ - strlen(buf) - 1);
-    OutputToProcess(pendingReplyPR, buf, strlen(buf), &err);
-    AskQuestionPopDown();
-
-    if (err) DisplayFatalError(_("Error writing to chess program"), err, 0);
-}
-
-void AskQuestionCallback(w, client_data, call_data)
-     Widget w;
-     XtPointer client_data, call_data;
-{
-    String name;
-    Arg args[16];
-
-    XtSetArg(args[0], XtNlabel, &name);
-    XtGetValues(w, args, 1);
-
-    if (strcmp(name, _("cancel")) == 0) {
-        AskQuestionPopDown();
-    } else {
-	AskQuestionReplyAction(w, NULL, NULL, NULL);
-    }
-}
-
-void AskQuestion(title, question, replyPrefix, pr)
-     char *title, *question, *replyPrefix;
-     ProcRef pr;
-{
-    Arg args[16];
-    Widget popup, layout, dialog, edit;
-    Window root, child;
-    int x, y, i;
-    int win_x, win_y;
-    unsigned int mask;
-
-    safeStrCpy(pendingReplyPrefix, replyPrefix, sizeof(pendingReplyPrefix)/sizeof(pendingReplyPrefix[0]) );
-    pendingReplyPR = pr;
-
-    i = 0;
-    XtSetArg(args[i], XtNresizable, True); i++;
-    XtSetArg(args[i], XtNwidth, DIALOG_SIZE); i++;
-    askQuestionShell = popup =
-      XtCreatePopupShell(title, transientShellWidgetClass,
-			 shellWidget, args, i);
-
-    layout =
-      XtCreateManagedWidget(layoutName, formWidgetClass, popup,
-			    layoutArgs, XtNumber(layoutArgs));
-
-    i = 0;
-    XtSetArg(args[i], XtNlabel, question); i++;
-    XtSetArg(args[i], XtNvalue, ""); i++;
-    XtSetArg(args[i], XtNborderWidth, 0); i++;
-    dialog = XtCreateManagedWidget("question", dialogWidgetClass,
-				   layout, args, i);
-
-    XawDialogAddButton(dialog, _("enter"), AskQuestionCallback,
-		       (XtPointer) dialog);
-    XawDialogAddButton(dialog, _("cancel"), AskQuestionCallback,
-		       (XtPointer) dialog);
-
-    XtRealizeWidget(popup);
-    CatchDeleteWindow(popup, "AskQuestionPopDown");
-
-    XQueryPointer(xDisplay, xBoardWindow, &root, &child,
-		  &x, &y, &win_x, &win_y, &mask);
-
-    XtSetArg(args[0], XtNx, x - 10);
-    XtSetArg(args[1], XtNy, y - 30);
-    XtSetValues(popup, args, 2);
-
-    XtPopup(popup, XtGrabExclusive);
-    askQuestionUp = True;
-
-    edit = XtNameToWidget(dialog, "*value");
-    XtSetKeyboardFocus(popup, edit);
-}
-
-
-void
-PlaySound(name)
-     char *name;
-{
-  if (*name == NULLCHAR) {
-    return;
-  } else if (strcmp(name, "$") == 0) {
-    putc(BELLCHAR, stderr);
-  } else {
-    char buf[2048];
-    char *prefix = "", *sep = "";
-    if(appData.soundProgram[0] == NULLCHAR) return;
-    if(!strchr(name, '/')) { prefix = appData.soundDirectory; sep = "/"; }
-    snprintf(buf, sizeof(buf), "%s '%s%s%s' &", appData.soundProgram, prefix, sep, name);
-    system(buf);
-  }
-}
-
-void
-RingBell()
-{
-  PlaySound(appData.soundMove);
-}
-
-void
-PlayIcsWinSound()
-{
-  PlaySound(appData.soundIcsWin);
-}
-
-void
-PlayIcsLossSound()
-{
-  PlaySound(appData.soundIcsLoss);
-}
-
-void
-PlayIcsDrawSound()
-{
-  PlaySound(appData.soundIcsDraw);
-}
-
-void
-PlayIcsUnfinishedSound()
-{
-  PlaySound(appData.soundIcsUnfinished);
-}
-
-void
-PlayAlarmSound()
-{
-  PlaySound(appData.soundIcsAlarm);
-}
-
-void
-PlayTellSound()
-{
-  PlaySound(appData.soundTell);
-}
-
-void
-EchoOn()
-{
-    system("stty echo");
-    noEcho = False;
-}
-
-void
-EchoOff()
-{
-    system("stty -echo");
-    noEcho = True;
-}
-
-void
-RunCommand(char *buf)
-{
-    system(buf);
-}
-
-void
-Colorize(cc, continuation)
-     ColorClass cc;
-     int continuation;
-{
-    char buf[MSG_SIZ];
-    int count, outCount, error;
-
-    if (textColors[(int)cc].bg > 0) {
-	if (textColors[(int)cc].fg > 0) {
-	  snprintf(buf, MSG_SIZ, "\033[0;%d;%d;%dm", textColors[(int)cc].attr,
-		   textColors[(int)cc].fg, textColors[(int)cc].bg);
-	} else {
-	  snprintf(buf, MSG_SIZ, "\033[0;%d;%dm", textColors[(int)cc].attr,
-		   textColors[(int)cc].bg);
-	}
-    } else {
-	if (textColors[(int)cc].fg > 0) {
-	  snprintf(buf, MSG_SIZ, "\033[0;%d;%dm", textColors[(int)cc].attr,
-		    textColors[(int)cc].fg);
-	} else {
-	  snprintf(buf, MSG_SIZ, "\033[0;%dm", textColors[(int)cc].attr);
-	}
-    }
-    count = strlen(buf);
-    outCount = OutputToProcess(NoProc, buf, count, &error);
-    if (outCount < count) {
-	DisplayFatalError(_("Error writing to display"), error, 1);
-    }
-
-    if (continuation) return;
-    switch (cc) {
-    case ColorShout:
-      PlaySound(appData.soundShout);
-      break;
-    case ColorSShout:
-      PlaySound(appData.soundSShout);
-      break;
-    case ColorChannel1:
-      PlaySound(appData.soundChannel1);
-      break;
-    case ColorChannel:
-      PlaySound(appData.soundChannel);
-      break;
-    case ColorKibitz:
-      PlaySound(appData.soundKibitz);
-      break;
-    case ColorTell:
-      PlaySound(appData.soundTell);
-      break;
-    case ColorChallenge:
-      PlaySound(appData.soundChallenge);
-      break;
-    case ColorRequest:
-      PlaySound(appData.soundRequest);
-      break;
-    case ColorSeek:
-      PlaySound(appData.soundSeek);
-      break;
-    case ColorNormal:
-    case ColorNone:
-    default:
-      break;
-    }
-}
-
-char *UserName()
-{
-    return getpwuid(getuid())->pw_name;
-}
-
-static char *
-ExpandPathName(path)
-     char *path;
-{
-    static char static_buf[4*MSG_SIZ];
-    char *d, *s, buf[4*MSG_SIZ];
-    struct passwd *pwd;
-
-    s = path;
-    d = static_buf;
-
-    while (*s && isspace(*s))
-      ++s;
-
-    if (!*s) {
-	*d = 0;
-	return static_buf;
-    }
-
-    if (*s == '~') {
-	if (*(s+1) == '/') {
-	  safeStrCpy(d, getpwuid(getuid())->pw_dir, 4*MSG_SIZ );
-	  strcat(d, s+1);
-	}
-	else {
-	  safeStrCpy(buf, s+1, sizeof(buf)/sizeof(buf[0]) );
-	  { char *p; if(p = strchr(buf, '/')) *p = 0; }
-	  pwd = getpwnam(buf);
-	  if (!pwd)
-	    {
-	      fprintf(stderr, _("ERROR: Unknown user %s (in path %s)\n"),
-		      buf, path);
-	      return NULL;
-	    }
-	  safeStrCpy(d, pwd->pw_dir, 4*MSG_SIZ );
-	  strcat(d, strchr(s+1, '/'));
-	}
-    }
-    else
-      safeStrCpy(d, s, 4*MSG_SIZ );
-
-    return static_buf;
-}
-
-char *HostName()
-{
-    static char host_name[MSG_SIZ];
-
-#if HAVE_GETHOSTNAME
-    gethostname(host_name, MSG_SIZ);
-    return host_name;
-#else  /* not HAVE_GETHOSTNAME */
-# if HAVE_SYSINFO && HAVE_SYS_SYSTEMINFO_H
-    sysinfo(SI_HOSTNAME, host_name, MSG_SIZ);
-    return host_name;
-# else /* not (HAVE_SYSINFO && HAVE_SYS_SYSTEMINFO_H) */
-    return "localhost";
-# endif/* not (HAVE_SYSINFO && HAVE_SYS_SYSTEMINFO_H) */
-#endif /* not HAVE_GETHOSTNAME */
-}
 
 XtIntervalId delayedEventTimerXID = 0;
 DelayedEventCallback delayedEventCallback = 0;
 
 void
-FireDelayedEvent()
+FireDelayedEvent ()
 {
     delayedEventTimerXID = 0;
     delayedEventCallback();
 }
 
 void
-ScheduleDelayedEvent(cb, millisec)
-     DelayedEventCallback cb; long millisec;
+ScheduleDelayedEvent (DelayedEventCallback cb, long millisec)
 {
     if(delayedEventTimerXID && delayedEventCallback == cb)
 	// [HGM] alive: replace, rather than add or flush identical event
@@ -7465,7 +3203,7 @@ ScheduleDelayedEvent(cb, millisec)
 }
 
 DelayedEventCallback
-GetDelayedEvent()
+GetDelayedEvent ()
 {
   if (delayedEventTimerXID) {
     return delayedEventCallback;
@@ -7475,7 +3213,7 @@ GetDelayedEvent()
 }
 
 void
-CancelDelayedEvent()
+CancelDelayedEvent ()
 {
   if (delayedEventTimerXID) {
     XtRemoveTimeOut(delayedEventTimerXID);
@@ -7485,12 +3223,14 @@ CancelDelayedEvent()
 
 XtIntervalId loadGameTimerXID = 0;
 
-int LoadGameTimerRunning()
+int
+LoadGameTimerRunning ()
 {
     return loadGameTimerXID != 0;
 }
 
-int StopLoadGameTimer()
+int
+StopLoadGameTimer ()
 {
     if (loadGameTimerXID != 0) {
 	XtRemoveTimeOut(loadGameTimerXID);
@@ -7502,17 +3242,14 @@ int StopLoadGameTimer()
 }
 
 void
-LoadGameTimerCallback(arg, id)
-     XtPointer arg;
-     XtIntervalId *id;
+LoadGameTimerCallback (XtPointer arg, XtIntervalId *id)
 {
     loadGameTimerXID = 0;
     AutoPlayGameLoop();
 }
 
 void
-StartLoadGameTimer(millisec)
-     long millisec;
+StartLoadGameTimer (long millisec)
 {
     loadGameTimerXID =
       XtAppAddTimeOut(appContext, millisec,
@@ -7523,9 +3260,7 @@ StartLoadGameTimer(millisec)
 XtIntervalId analysisClockXID = 0;
 
 void
-AnalysisClockCallback(arg, id)
-     XtPointer arg;
-     XtIntervalId *id;
+AnalysisClockCallback (XtPointer arg, XtIntervalId *id)
 {
     if (gameMode == AnalyzeMode || gameMode == AnalyzeFile
          || appData.icsEngineAnalyze) { // [DM]
@@ -7535,7 +3270,7 @@ AnalysisClockCallback(arg, id)
 }
 
 void
-StartAnalysisClock()
+StartAnalysisClock ()
 {
     analysisClockXID =
       XtAppAddTimeOut(appContext, 2000,
@@ -7545,12 +3280,14 @@ StartAnalysisClock()
 
 XtIntervalId clockTimerXID = 0;
 
-int ClockTimerRunning()
+int
+ClockTimerRunning ()
 {
     return clockTimerXID != 0;
 }
 
-int StopClockTimer()
+int
+StopClockTimer ()
 {
     if (clockTimerXID != 0) {
 	XtRemoveTimeOut(clockTimerXID);
@@ -7562,17 +3299,14 @@ int StopClockTimer()
 }
 
 void
-ClockTimerCallback(arg, id)
-     XtPointer arg;
-     XtIntervalId *id;
+ClockTimerCallback (XtPointer arg, XtIntervalId *id)
 {
     clockTimerXID = 0;
     DecrementClocks();
 }
 
 void
-StartClockTimer(millisec)
-     long millisec;
+StartClockTimer (long millisec)
 {
     clockTimerXID =
       XtAppAddTimeOut(appContext, millisec,
@@ -7581,14 +3315,11 @@ StartClockTimer(millisec)
 }
 
 void
-DisplayTimerLabel(w, color, timer, highlight)
-     Widget w;
-     char *color;
-     long timer;
-     int highlight;
+DisplayTimerLabel (Option *opt, char *color, long timer, int highlight)
 {
     char buf[MSG_SIZ];
     Arg args[16];
+    Widget w = (Widget) opt->handle;
 
     /* check for low time warning */
     Pixel foregroundOrWarningColor = timerForegroundPixel;
@@ -7618,305 +3349,22 @@ DisplayTimerLabel(w, color, timer, highlight)
     XtSetValues(w, args, 3);
 }
 
-void
-DisplayWhiteClock(timeRemaining, highlight)
-     long timeRemaining;
-     int highlight;
-{
-    Arg args[16];
-
-    if(appData.noGUI) return;
-    DisplayTimerLabel(whiteTimerWidget, _("White"), timeRemaining, highlight);
-    if (highlight && iconPixmap == bIconPixmap) {
-	iconPixmap = wIconPixmap;
-	XtSetArg(args[0], XtNiconPixmap, iconPixmap);
-	XtSetValues(shellWidget, args, 1);
-    }
-}
+static Pixmap *clockIcons[] = { &wIconPixmap, &bIconPixmap };
 
 void
-DisplayBlackClock(timeRemaining, highlight)
-     long timeRemaining;
-     int highlight;
+SetClockIcon (int color)
 {
     Arg args[16];
-
-    if(appData.noGUI) return;
-    DisplayTimerLabel(blackTimerWidget, _("Black"), timeRemaining, highlight);
-    if (highlight && iconPixmap == wIconPixmap) {
-	iconPixmap = bIconPixmap;
+    Pixmap pm = *clockIcons[color];
+    if (iconPixmap != pm) {
+	iconPixmap = pm;
 	XtSetArg(args[0], XtNiconPixmap, iconPixmap);
 	XtSetValues(shellWidget, args, 1);
     }
 }
 
-#define CPNone 0
-#define CPReal 1
-#define CPComm 2
-#define CPSock 3
-#define CPLoop 4
-typedef int CPKind;
-
-typedef struct {
-    CPKind kind;
-    int pid;
-    int fdTo, fdFrom;
-} ChildProc;
-
-
-int StartChildProcess(cmdLine, dir, pr)
-     char *cmdLine;
-     char *dir;
-     ProcRef *pr;
-{
-    char *argv[64], *p;
-    int i, pid;
-    int to_prog[2], from_prog[2];
-    ChildProc *cp;
-    char buf[MSG_SIZ];
-
-    if (appData.debugMode) {
-	fprintf(stderr, "StartChildProcess (dir=\"%s\") %s\n",dir, cmdLine);
-    }
-
-    /* We do NOT feed the cmdLine to the shell; we just
-       parse it into blank-separated arguments in the
-       most simple-minded way possible.
-       */
-    i = 0;
-    safeStrCpy(buf, cmdLine, sizeof(buf)/sizeof(buf[0]) );
-    p = buf;
-    for (;;) {
-	while(*p == ' ') p++;
-	argv[i++] = p;
-	if(*p == '"' || *p == '\'')
-	     p = strchr(++argv[i-1], *p);
-	else p = strchr(p, ' ');
-	if (p == NULL) break;
-	*p++ = NULLCHAR;
-    }
-    argv[i] = NULL;
-
-    SetUpChildIO(to_prog, from_prog);
-
-    if ((pid = fork()) == 0) {
-	/* Child process */
-	// [HGM] PSWBTM: made order resistant against case where fd of created pipe was 0 or 1
-	close(to_prog[1]);     // first close the unused pipe ends
-	close(from_prog[0]);
-	dup2(to_prog[0], 0);   // to_prog was created first, nd is the only one to use 0 or 1
-	dup2(from_prog[1], 1);
-	if(to_prog[0] >= 2) close(to_prog[0]); // if 0 or 1, the dup2 already cosed the original
-	close(from_prog[1]);                   // and closing again loses one of the pipes!
-	if(fileno(stderr) >= 2) // better safe than sorry...
-		dup2(1, fileno(stderr)); /* force stderr to the pipe */
-
-	if (dir[0] != NULLCHAR && chdir(dir) != 0) {
-	    perror(dir);
-	    exit(1);
-	}
-
-	nice(appData.niceEngines); // [HGM] nice: adjust priority of engine proc
-
-        execvp(argv[0], argv);
-
-	/* If we get here, exec failed */
-	perror(argv[0]);
-	exit(1);
-    }
-
-    /* Parent process */
-    close(to_prog[0]);
-    close(from_prog[1]);
-
-    cp = (ChildProc *) calloc(1, sizeof(ChildProc));
-    cp->kind = CPReal;
-    cp->pid = pid;
-    cp->fdFrom = from_prog[0];
-    cp->fdTo = to_prog[1];
-    *pr = (ProcRef) cp;
-    return 0;
-}
-
-// [HGM] kill: implement the 'hard killing' of AS's Winboard_x
-static RETSIGTYPE AlarmCallBack(int n)
-{
-    return;
-}
-
-void
-DestroyChildProcess(pr, signalType)
-     ProcRef pr;
-     int signalType;
-{
-    ChildProc *cp = (ChildProc *) pr;
-
-    if (cp->kind != CPReal) return;
-    cp->kind = CPNone;
-    if (signalType == 10) { // [HGM] kill: if it does not terminate in 3 sec, kill
-	signal(SIGALRM, AlarmCallBack);
-	alarm(3);
-	if(wait((int *) 0) == -1) { // process does not terminate on its own accord
-	    kill(cp->pid, SIGKILL); // kill it forcefully
-	    wait((int *) 0);        // and wait again
-	}
-    } else {
-	if (signalType) {
-	    kill(cp->pid, signalType == 9 ? SIGKILL : SIGTERM); // [HGM] kill: use hard kill if so requested
-	}
-	/* Process is exiting either because of the kill or because of
-	   a quit command sent by the backend; either way, wait for it to die.
-	*/
-	wait((int *) 0);
-    }
-    close(cp->fdFrom);
-    close(cp->fdTo);
-}
-
-void
-InterruptChildProcess(pr)
-     ProcRef pr;
-{
-    ChildProc *cp = (ChildProc *) pr;
-
-    if (cp->kind != CPReal) return;
-    (void) kill(cp->pid, SIGINT); /* stop it thinking */
-}
-
-int OpenTelnet(host, port, pr)
-     char *host;
-     char *port;
-     ProcRef *pr;
-{
-    char cmdLine[MSG_SIZ];
-
-    if (port[0] == NULLCHAR) {
-      snprintf(cmdLine, sizeof(cmdLine), "%s %s", appData.telnetProgram, host);
-    } else {
-      snprintf(cmdLine, sizeof(cmdLine), "%s %s %s", appData.telnetProgram, host, port);
-    }
-    return StartChildProcess(cmdLine, "", pr);
-}
-
-int OpenTCP(host, port, pr)
-     char *host;
-     char *port;
-     ProcRef *pr;
-{
-#if OMIT_SOCKETS
-    DisplayFatalError(_("Socket support is not configured in"), 0, 2);
-#else  /* !OMIT_SOCKETS */
-    struct addrinfo hints;
-    struct addrinfo *ais, *ai;
-    int error;
-    int s=0;
-    ChildProc *cp;
-
-    memset(&hints, 0, sizeof(hints));
-    hints.ai_family = AF_UNSPEC;
-    hints.ai_socktype = SOCK_STREAM;
-
-    error = getaddrinfo(host, port, &hints, &ais);
-    if (error != 0) {
-      /* a getaddrinfo error is not an errno, so can't return it */
-      fprintf(debugFP, "getaddrinfo(%s, %s): %s\n",
-	      host, port, gai_strerror(error));
-      return ENOENT;
-    }
-     
-    for (ai = ais; ai != NULL; ai = ai->ai_next) {
-      if ((s = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol)) < 0) {
-	error = errno;
-	continue;
-      }
-      if (connect(s, ai->ai_addr, ai->ai_addrlen) < 0) {
-	error = errno;
-	continue;
-      }
-      error = 0;
-      break;
-    }
-    freeaddrinfo(ais);
-
-    if (error != 0) {
-      return error;
-    }
-
-    cp = (ChildProc *) calloc(1, sizeof(ChildProc));
-    cp->kind = CPSock;
-    cp->pid = 0;
-    cp->fdFrom = s;
-    cp->fdTo = s;
-    *pr = (ProcRef) cp;
-#endif /* !OMIT_SOCKETS */
-
-    return 0;
-}
-
-int OpenCommPort(name, pr)
-     char *name;
-     ProcRef *pr;
-{
-    int fd;
-    ChildProc *cp;
-
-    fd = open(name, 2, 0);
-    if (fd < 0) return errno;
-
-    cp = (ChildProc *) calloc(1, sizeof(ChildProc));
-    cp->kind = CPComm;
-    cp->pid = 0;
-    cp->fdFrom = fd;
-    cp->fdTo = fd;
-    *pr = (ProcRef) cp;
-
-    return 0;
-}
-
-int OpenLoopback(pr)
-     ProcRef *pr;
-{
-    ChildProc *cp;
-    int to[2], from[2];
-
-    SetUpChildIO(to, from);
-
-    cp = (ChildProc *) calloc(1, sizeof(ChildProc));
-    cp->kind = CPLoop;
-    cp->pid = 0;
-    cp->fdFrom = to[0];		/* note not from[0]; we are doing a loopback */
-    cp->fdTo = to[1];
-    *pr = (ProcRef) cp;
-
-    return 0;
-}
-
-int OpenRcmd(host, user, cmd, pr)
-     char *host, *user, *cmd;
-     ProcRef *pr;
-{
-    DisplayFatalError(_("internal rcmd not implemented for Unix"), 0, 1);
-    return -1;
-}
-
-#define INPUT_SOURCE_BUF_SIZE 8192
-
-typedef struct {
-    CPKind kind;
-    int fd;
-    int lineByLine;
-    char *unused;
-    InputCallback func;
-    XtInputId xid;
-    char buf[INPUT_SOURCE_BUF_SIZE];
-    VOIDSTAR closure;
-} InputSource;
-
 void
-DoInputCallback(closure, source, xid)
-     caddr_t closure;
-     int *source;
-     XtInputId *xid;
+DoInputCallback (caddr_t closure, int *source, XtInputId *xid)
 {
     InputSource *is = (InputSource *) closure;
     int count;
@@ -7954,11 +3402,8 @@ DoInputCallback(closure, source, xid)
     }
 }
 
-InputSourceRef AddInputSource(pr, lineByLine, func, closure)
-     ProcRef pr;
-     int lineByLine;
-     InputCallback func;
-     VOIDSTAR closure;
+InputSourceRef
+AddInputSource (ProcRef pr, int lineByLine, InputCallback func, VOIDSTAR closure)
 {
     InputSource *is;
     ChildProc *cp = (ChildProc *) pr;
@@ -7986,8 +3431,7 @@ InputSourceRef AddInputSource(pr, lineByLine, func, closure)
 }
 
 void
-RemoveInputSource(isr)
-     InputSourceRef isr;
+RemoveInputSource (InputSourceRef isr)
 {
     InputSource *is = (InputSource *) isr;
 
@@ -7996,91 +3440,7 @@ RemoveInputSource(isr)
     is->xid = 0;
 }
 
-int OutputToProcess(pr, message, count, outError)
-     ProcRef pr;
-     char *message;
-     int count;
-     int *outError;
-{
-    static int line = 0;
-    ChildProc *cp = (ChildProc *) pr;
-    int outCount;
-
-    if (pr == NoProc)
-    {
-        if (appData.noJoin || !appData.useInternalWrap)
-            outCount = fwrite(message, 1, count, stdout);
-        else
-        {
-            int width = get_term_width();
-            int len = wrap(NULL, message, count, width, &line);
-            char *msg = malloc(len);
-            int dbgchk;
-
-            if (!msg)
-                outCount = fwrite(message, 1, count, stdout);
-            else
-            {
-                dbgchk = wrap(msg, message, count, width, &line);
-                if (dbgchk != len && appData.debugMode)
-                    fprintf(debugFP, "wrap(): dbgchk(%d) != len(%d)\n", dbgchk, len);
-                outCount = fwrite(msg, 1, dbgchk, stdout);
-                free(msg);
-            }
-        }
-    }
-    else
-      outCount = write(cp->fdTo, message, count);
-
-    if (outCount == -1)
-      *outError = errno;
-    else
-      *outError = 0;
-
-    return outCount;
-}
-
-/* Output message to process, with "ms" milliseconds of delay
-   between each character. This is needed when sending the logon
-   script to ICC, which for some reason doesn't like the
-   instantaneous send. */
-int OutputToProcessDelayed(pr, message, count, outError, msdelay)
-     ProcRef pr;
-     char *message;
-     int count;
-     int *outError;
-     long msdelay;
-{
-    ChildProc *cp = (ChildProc *) pr;
-    int outCount = 0;
-    int r;
-
-    while (count--) {
-	r = write(cp->fdTo, message++, 1);
-	if (r == -1) {
-	    *outError = errno;
-	    return outCount;
-	}
-	++outCount;
-	if (msdelay >= 0)
-	  TimeDelay(msdelay);
-    }
-
-    return outCount;
-}
-
-/****	Animation code by Hugh Fisher, DCS, ANU.
-
-	Known problem: if a window overlapping the board is
-	moved away while a piece is being animated underneath,
-	the newly exposed area won't be updated properly.
-	I can live with this.
-
-	Known problem: if you look carefully at the animation
-	of pieces in mono mode, they are being drawn as solid
-	shapes without interior detail while moving. Fixing
-	this would be a major complication for minimal return.
-****/
+/****	Animation code by Hugh Fisher, DCS, ANU. ****/
 
 /*	Masks for XPM pieces. Black and white pieces can have
 	different shapes, but in the interest of retaining my
@@ -8089,10 +3449,11 @@ int OutputToProcessDelayed(pr, message, count, outError, msdelay)
 	background square colors/images.		*/
 
 static int xpmDone = 0;
+static Pixmap animBufs[3*NrOfAnims]; // newBuf, saveBuf
+static GC animGCs[3*NrOfAnims]; // blitGC, pieceGC, outlineGC;
 
 static void
-CreateAnimMasks (pieceDepth)
-     int pieceDepth;
+CreateAnimMasks (int pieceDepth)
 {
   ChessSquare   piece;
   Pixmap	buf;
@@ -8170,17 +3531,16 @@ CreateAnimMasks (pieceDepth)
 }
 
 static void
-InitAnimState (anim, info)
-  AnimState * anim;
-  XWindowAttributes * info;
+InitAnimState (AnimNr anr, XWindowAttributes *info)
 {
   XtGCMask  mask;
   XGCValues values;
 
   /* Each buffer is square size, same depth as window */
-  anim->saveBuf = XCreatePixmap(xDisplay, xBoardWindow,
+  animBufs[anr+4] = xBoardWindow;
+  animBufs[anr+2] = XCreatePixmap(xDisplay, xBoardWindow,
 			squareSize, squareSize, info->depth);
-  anim->newBuf = XCreatePixmap(xDisplay, xBoardWindow,
+  animBufs[anr] = XCreatePixmap(xDisplay, xBoardWindow,
 			squareSize, squareSize, info->depth);
 
   /* Create a plain GC for blitting */
@@ -8191,17 +3551,17 @@ InitAnimState (anim, info)
   values.function   = GXcopy;
   values.plane_mask = AllPlanes;
   values.graphics_exposures = False;
-  anim->blitGC = XCreateGC(xDisplay, xBoardWindow, mask, &values);
+  animGCs[anr] = XCreateGC(xDisplay, xBoardWindow, mask, &values);
 
   /* Piece will be copied from an existing context at
      the start of each new animation/drag. */
-  anim->pieceGC = XCreateGC(xDisplay, xBoardWindow, 0, &values);
+  animGCs[anr+2] = XCreateGC(xDisplay, xBoardWindow, 0, &values);
 
   /* Outline will be a read-only copy of an existing */
-  anim->outlineGC = None;
+  animGCs[anr+4] = None;
 }
 
-static void
+void
 CreateAnimVars ()
 {
   XWindowAttributes info;
@@ -8210,8 +3570,8 @@ CreateAnimVars ()
   if(xpmDone) oldVariant = gameInfo.variant; // first time pieces might not be created yet
   XGetWindowAttributes(xDisplay, xBoardWindow, &info);
 
-  InitAnimState(&game, &info);
-  InitAnimState(&player, &info);
+  InitAnimState(Game, &info);
+  InitAnimState(Player, &info);
 
   /* For XPM pieces, we need bitmaps to use as masks. */
   if (useImages)
@@ -8222,17 +3582,16 @@ CreateAnimVars ()
 
 static Boolean frameWaiting;
 
-static RETSIGTYPE FrameAlarm (sig)
-     int sig;
+static RETSIGTYPE
+FrameAlarm (int sig)
 {
   frameWaiting = False;
   /* In case System-V style signals.  Needed?? */
   signal(SIGALRM, FrameAlarm);
 }
 
-static void
-FrameDelay (time)
-     int time;
+void
+FrameDelay (int time)
 {
   struct itimerval delay;
 
@@ -8255,9 +3614,8 @@ FrameDelay (time)
 
 #else
 
-static void
-FrameDelay (time)
-     int time;
+void
+FrameDelay (int time)
 {
   XSync(xDisplay, False);
   if (time > 0)
@@ -8266,172 +3624,8 @@ FrameDelay (time)
 
 #endif
 
-void
-DoSleep(int n)
-{
-    FrameDelay(n);
-}
-
-/*	Convert board position to corner of screen rect and color	*/
-
 static void
-ScreenSquare(column, row, pt, color)
-     int column; int row; XPoint * pt; int * color;
-{
-  if (flipView) {
-    pt->x = lineGap + ((BOARD_WIDTH-1)-column) * (squareSize + lineGap);
-    pt->y = lineGap + row * (squareSize + lineGap);
-  } else {
-    pt->x = lineGap + column * (squareSize + lineGap);
-    pt->y = lineGap + ((BOARD_HEIGHT-1)-row) * (squareSize + lineGap);
-  }
-  *color = SquareColor(row, column);
-}
-
-/*	Convert window coords to square			*/
-
-static void
-BoardSquare(x, y, column, row)
-     int x; int y; int * column; int * row;
-{
-  *column = EventToSquare(x, BOARD_WIDTH);
-  if (flipView && *column >= 0)
-    *column = BOARD_WIDTH - 1 - *column;
-  *row = EventToSquare(y, BOARD_HEIGHT);
-  if (!flipView && *row >= 0)
-    *row = BOARD_HEIGHT - 1 - *row;
-}
-
-/*   Utilities	*/
-
-#undef Max  /* just in case */
-#undef Min
-#define Max(a, b) ((a) > (b) ? (a) : (b))
-#define Min(a, b) ((a) < (b) ? (a) : (b))
-
-static void
-SetRect(rect, x, y, width, height)
-     XRectangle * rect; int x; int y; int width; int height;
-{
-  rect->x = x;
-  rect->y = y;
-  rect->width  = width;
-  rect->height = height;
-}
-
-/*	Test if two frames overlap. If they do, return
-	intersection rect within old and location of
-	that rect within new. */
-
-static Boolean
-Intersect(old, new, size, area, pt)
-     XPoint * old; XPoint * new;
-     int size; XRectangle * area; XPoint * pt;
-{
-  if (old->x > new->x + size || new->x > old->x + size ||
-      old->y > new->y + size || new->y > old->y + size) {
-    return False;
-  } else {
-    SetRect(area, Max(new->x - old->x, 0), Max(new->y - old->y, 0),
-            size - abs(old->x - new->x), size - abs(old->y - new->y));
-    pt->x = Max(old->x - new->x, 0);
-    pt->y = Max(old->y - new->y, 0);
-    return True;
-  }
-}
-
-/*	For two overlapping frames, return the rect(s)
-	in the old that do not intersect with the new.   */
-
-static void
-CalcUpdateRects(old, new, size, update, nUpdates)
-     XPoint * old; XPoint * new; int size;
-     XRectangle update[]; int * nUpdates;
-{
-  int	     count;
-
-  /* If old = new (shouldn't happen) then nothing to draw */
-  if (old->x == new->x && old->y == new->y) {
-    *nUpdates = 0;
-    return;
-  }
-  /* Work out what bits overlap. Since we know the rects
-     are the same size we don't need a full intersect calc. */
-  count = 0;
-  /* Top or bottom edge? */
-  if (new->y > old->y) {
-    SetRect(&(update[count]), old->x, old->y, size, new->y - old->y);
-    count ++;
-  } else if (old->y > new->y) {
-    SetRect(&(update[count]), old->x, old->y + size - (old->y - new->y),
-			      size, old->y - new->y);
-    count ++;
-  }
-  /* Left or right edge - don't overlap any update calculated above. */
-  if (new->x > old->x) {
-    SetRect(&(update[count]), old->x, Max(new->y, old->y),
-			      new->x - old->x, size - abs(new->y - old->y));
-    count ++;
-  } else if (old->x > new->x) {
-    SetRect(&(update[count]), new->x + size, Max(new->y, old->y),
-			      old->x - new->x, size - abs(new->y - old->y));
-    count ++;
-  }
-  /* Done */
-  *nUpdates = count;
-}
-
-/*	Generate a series of frame coords from start->mid->finish.
-	The movement rate doubles until the half way point is
-	reached, then halves back down to the final destination,
-	which gives a nice slow in/out effect. The algorithmn
-	may seem to generate too many intermediates for short
-	moves, but remember that the purpose is to attract the
-	viewers attention to the piece about to be moved and
-	then to where it ends up. Too few frames would be less
-	noticeable.						*/
-
-static void
-Tween(start, mid, finish, factor, frames, nFrames)
-     XPoint * start; XPoint * mid;
-     XPoint * finish; int factor;
-     XPoint frames[]; int * nFrames;
-{
-  int fraction, n, count;
-
-  count = 0;
-
-  /* Slow in, stepping 1/16th, then 1/8th, ... */
-  fraction = 1;
-  for (n = 0; n < factor; n++)
-    fraction *= 2;
-  for (n = 0; n < factor; n++) {
-    frames[count].x = start->x + (mid->x - start->x) / fraction;
-    frames[count].y = start->y + (mid->y - start->y) / fraction;
-    count ++;
-    fraction = fraction / 2;
-  }
-
-  /* Midpoint */
-  frames[count] = *mid;
-  count ++;
-
-  /* Slow out, stepping 1/2, then 1/4, ... */
-  fraction = 2;
-  for (n = 0; n < factor; n++) {
-    frames[count].x = finish->x - (finish->x - mid->x) / fraction;
-    frames[count].y = finish->y - (finish->y - mid->y) / fraction;
-    count ++;
-    fraction = fraction * 2;
-  }
-  *nFrames = count;
-}
-
-/*	Draw a piece on the screen without disturbing what's there	*/
-
-static void
-SelectGCMask(piece, clip, outline, mask)
-     ChessSquare piece; GC * clip; GC * outline; Pixmap * mask;
+SelectGCMask (ChessSquare piece, GC *clip, GC *outline, Pixmap *mask)
 {
   GC source;
 
@@ -8471,8 +3665,7 @@ SelectGCMask(piece, clip, outline, mask)
 }
 
 static void
-OverlayPiece(piece, clip, outline,  dest)
-     ChessSquare piece; GC clip; GC outline; Drawable dest;
+OverlayPiece (ChessSquare piece, GC clip, GC outline,  Drawable dest)
 {
   int	kind;
 
@@ -8499,588 +3692,48 @@ OverlayPiece(piece, clip, outline,  dest)
   }
 }
 
-/* Animate the movement of a single piece */
-
-static void
-BeginAnimation(anim, piece, startColor, start)
-     AnimState *anim;
-     ChessSquare piece;
-     int startColor;
-     XPoint * start;
-{
-  Pixmap mask;
-
-  if(appData.upsideDown && flipView) piece += piece < BlackPawn ? BlackPawn : -BlackPawn;
-  /* The old buffer is initialised with the start square (empty) */
-  BlankSquare(start->x, start->y, startColor, EmptySquare, anim->saveBuf, 0);
-  anim->prevFrame = *start;
-
-  /* The piece will be drawn using its own bitmap as a matte	*/
-  SelectGCMask(piece, &anim->pieceGC, &anim->outlineGC, &mask);
-  XSetClipMask(xDisplay, anim->pieceGC, mask);
-}
-
-static void
-AnimationFrame(anim, frame, piece)
-     AnimState *anim;
-     XPoint *frame;
-     ChessSquare piece;
-{
-  XRectangle updates[4];
-  XRectangle overlap;
-  XPoint     pt;
-  int	     count, i;
-
-  /* Save what we are about to draw into the new buffer */
-  XCopyArea(xDisplay, xBoardWindow, anim->newBuf, anim->blitGC,
-	    frame->x, frame->y, squareSize, squareSize,
-	    0, 0);
-
-  /* Erase bits of the previous frame */
-  if (Intersect(&anim->prevFrame, frame, squareSize, &overlap, &pt)) {
-    /* Where the new frame overlapped the previous,
-       the contents in newBuf are wrong. */
-    XCopyArea(xDisplay, anim->saveBuf, anim->newBuf, anim->blitGC,
-	      overlap.x, overlap.y,
-	      overlap.width, overlap.height,
-	      pt.x, pt.y);
-    /* Repaint the areas in the old that don't overlap new */
-    CalcUpdateRects(&anim->prevFrame, frame, squareSize, updates, &count);
-    for (i = 0; i < count; i++)
-      XCopyArea(xDisplay, anim->saveBuf, xBoardWindow, anim->blitGC,
-		updates[i].x - anim->prevFrame.x,
-		updates[i].y - anim->prevFrame.y,
-		updates[i].width, updates[i].height,
-		updates[i].x, updates[i].y);
-  } else {
-    /* Easy when no overlap */
-    XCopyArea(xDisplay, anim->saveBuf, xBoardWindow, anim->blitGC,
-		  0, 0, squareSize, squareSize,
-		  anim->prevFrame.x, anim->prevFrame.y);
-  }
-
-  /* Save this frame for next time round */
-  XCopyArea(xDisplay, anim->newBuf, anim->saveBuf, anim->blitGC,
-		0, 0, squareSize, squareSize,
-		0, 0);
-  anim->prevFrame = *frame;
-
-  /* Draw piece over original screen contents, not current,
-     and copy entire rect. Wipes out overlapping piece images. */
-  OverlayPiece(piece, anim->pieceGC, anim->outlineGC, anim->newBuf);
-  XCopyArea(xDisplay, anim->newBuf, xBoardWindow, anim->blitGC,
-		0, 0, squareSize, squareSize,
-		frame->x, frame->y);
-}
-
-static void
-EndAnimation (anim, finish)
-     AnimState *anim;
-     XPoint *finish;
-{
-  XRectangle updates[4];
-  XRectangle overlap;
-  XPoint     pt;
-  int	     count, i;
-
-  /* The main code will redraw the final square, so we
-     only need to erase the bits that don't overlap.	*/
-  if (Intersect(&anim->prevFrame, finish, squareSize, &overlap, &pt)) {
-    CalcUpdateRects(&anim->prevFrame, finish, squareSize, updates, &count);
-    for (i = 0; i < count; i++)
-      XCopyArea(xDisplay, anim->saveBuf, xBoardWindow, anim->blitGC,
-		updates[i].x - anim->prevFrame.x,
-		updates[i].y - anim->prevFrame.y,
-		updates[i].width, updates[i].height,
-		updates[i].x, updates[i].y);
-  } else {
-    XCopyArea(xDisplay, anim->saveBuf, xBoardWindow, anim->blitGC,
-		0, 0, squareSize, squareSize,
-		anim->prevFrame.x, anim->prevFrame.y);
-  }
-}
-
-static void
-FrameSequence(anim, piece, startColor, start, finish, frames, nFrames)
-     AnimState *anim;
-     ChessSquare piece; int startColor;
-     XPoint * start; XPoint * finish;
-     XPoint frames[]; int nFrames;
-{
-  int n;
-
-  BeginAnimation(anim, piece, startColor, start);
-  for (n = 0; n < nFrames; n++) {
-    AnimationFrame(anim, &(frames[n]), piece);
-    FrameDelay(appData.animSpeed);
-  }
-  EndAnimation(anim, finish);
-}
-
 void
-AnimateAtomicCapture(Board board, int fromX, int fromY, int toX, int toY)
+InsertPiece (AnimNr anr, ChessSquare piece)
 {
-    int i, x, y;
-    ChessSquare piece = board[fromY][toY];
-    board[fromY][toY] = EmptySquare;
-    DrawPosition(FALSE, board);
-    if (flipView) {
-	x = lineGap + ((BOARD_WIDTH-1)-toX) * (squareSize + lineGap);
-	y = lineGap + toY * (squareSize + lineGap);
-    } else {
-	x = lineGap + toX * (squareSize + lineGap);
-	y = lineGap + ((BOARD_HEIGHT-1)-toY) * (squareSize + lineGap);
-    }
-    for(i=1; i<4*kFactor; i++) {
-	int r = squareSize * 9 * i/(20*kFactor - 5);
-	XFillArc(xDisplay, xBoardWindow, highlineGC,
-		x + squareSize/2 - r, y+squareSize/2 - r, 2*r, 2*r, 0, 64*360);
-	FrameDelay(appData.animSpeed);
-    }
-    board[fromY][toY] = piece;
+  OverlayPiece(piece, animGCs[anr+2], animGCs[anr+4], animBufs[anr]);
 }
 
-/* Main control logic for deciding what to animate and how */
-
 void
-AnimateMove(board, fromX, fromY, toX, toY)
-     Board board;
-     int fromX;
-     int fromY;
-     int toX;
-     int toY;
+DrawBlank (AnimNr anr, int x, int y, int startColor)
 {
-  ChessSquare piece;
-  int hop;
-  XPoint      start, finish, mid;
-  XPoint      frames[kFactor * 2 + 1];
-  int	      nFrames, startColor, endColor;
-
-  /* Are we animating? */
-  if (!appData.animate || appData.blindfold)
-    return;
-
-  if(board[toY][toX] == WhiteRook && board[fromY][fromX] == WhiteKing ||
-     board[toY][toX] == BlackRook && board[fromY][fromX] == BlackKing)
-	return; // [HGM] FRC: no animtion of FRC castlings, as to-square is not true to-square
-
-  if (fromY < 0 || fromX < 0 || toX < 0 || toY < 0) return;
-  piece = board[fromY][fromX];
-  if (piece >= EmptySquare) return;
-
-#if DONT_HOP
-  hop = FALSE;
-#else
-  hop = abs(fromX-toX) == 1 && abs(fromY-toY) == 2 || abs(fromX-toX) == 2 && abs(fromY-toY) == 1;
-#endif
-
-  if (appData.debugMode) {
-      fprintf(debugFP, hop ? _("AnimateMove: piece %d hops from %d,%d to %d,%d \n") :
-                             _("AnimateMove: piece %d slides from %d,%d to %d,%d \n"),
-             piece, fromX, fromY, toX, toY);  }
-
-  ScreenSquare(fromX, fromY, &start, &startColor);
-  ScreenSquare(toX, toY, &finish, &endColor);
-
-  if (hop) {
-    /* Knight: make straight movement then diagonal */
-    if (abs(toY - fromY) < abs(toX - fromX)) {
-       mid.x = start.x + (finish.x - start.x) / 2;
-       mid.y = start.y;
-     } else {
-       mid.x = start.x;
-       mid.y = start.y + (finish.y - start.y) / 2;
-     }
-  } else {
-    mid.x = start.x + (finish.x - start.x) / 2;
-    mid.y = start.y + (finish.y - start.y) / 2;
-  }
-
-  /* Don't use as many frames for very short moves */
-  if (abs(toY - fromY) + abs(toX - fromX) <= 2)
-    Tween(&start, &mid, &finish, kFactor - 1, frames, &nFrames);
-  else
-    Tween(&start, &mid, &finish, kFactor, frames, &nFrames);
-  FrameSequence(&game, piece, startColor, &start, &finish, frames, nFrames);
-  if(Explode(board, fromX, fromY, toX, toY)) { // mark as damaged
-    int i,j;
-    for(i=0; i<BOARD_WIDTH; i++) for(j=0; j<BOARD_HEIGHT; j++)
-      if((i-toX)*(i-toX) + (j-toY)*(j-toY) < 6) damage[0][j][i] = True;
-  }
-
-  /* Be sure end square is redrawn */
-  damage[0][toY][toX] = True;
+    BlankSquare(x, y, startColor, EmptySquare, animBufs[anr+2], 0);
 }
 
-void
-DragPieceBegin(x, y, instantly)
-     int x; int y; Boolean instantly;
+void CopyRectangle (AnimNr anr, int srcBuf, int destBuf,
+		 int srcX, int srcY, int width, int height, int destX, int destY)
 {
-    int	 boardX, boardY, color;
-    XPoint corner;
-
-    /* Are we animating? */
-    if (!appData.animateDragging || appData.blindfold)
-      return;
-
-    /* Figure out which square we start in and the
-       mouse position relative to top left corner. */
-    BoardSquare(x, y, &boardX, &boardY);
-    player.startBoardX = boardX;
-    player.startBoardY = boardY;
-    ScreenSquare(boardX, boardY, &corner, &color);
-    player.startSquare  = corner;
-    player.startColor   = color;
-    /* As soon as we start dragging, the piece will jump slightly to
-       be centered over the mouse pointer. */
-    player.mouseDelta.x = squareSize/2;
-    player.mouseDelta.y = squareSize/2;
-    /* Initialise animation */
-    player.dragPiece = PieceForSquare(boardX, boardY);
-    /* Sanity check */
-    if (player.dragPiece >= 0 && player.dragPiece < EmptySquare) {
-	player.dragActive = True;
-	BeginAnimation(&player, player.dragPiece, color, &corner);
-	/* Mark this square as needing to be redrawn. Note that
-	   we don't remove the piece though, since logically (ie
-	   as seen by opponent) the move hasn't been made yet. */
-           if(boardX == BOARD_RGHT+1 && PieceForSquare(boardX-1, boardY) > 1 ||
-              boardX == BOARD_LEFT-2 && PieceForSquare(boardX+1, boardY) > 1)
-           XCopyArea(xDisplay, xBoardWindow, player.saveBuf, player.blitGC,
-	             corner.x, corner.y, squareSize, squareSize,
-	             0, 0); // [HGM] zh: unstack in stead of grab
-           if(gatingPiece != EmptySquare) {
-               /* Kludge alert: When gating we want the introduced
-                  piece to appear on the from square. To generate an
-                  image of it, we draw it on the board, copy the image,
-                  and draw the original piece again. */
-               ChessSquare piece = boards[currentMove][boardY][boardX];
-               DrawSquare(boardY, boardX, gatingPiece, 0);
-               XCopyArea(xDisplay, xBoardWindow, player.saveBuf, player.blitGC,
-	             corner.x, corner.y, squareSize, squareSize, 0, 0);
-               DrawSquare(boardY, boardX, piece, 0);
-           }
-	damage[0][boardY][boardX] = True;
-    } else {
-	player.dragActive = False;
-    }
+    XCopyArea(xDisplay, animBufs[anr+srcBuf], animBufs[anr+destBuf], animGCs[anr],
+		srcX, srcY, width, height, destX, destY);
 }
 
 void
-ChangeDragPiece(ChessSquare piece)
+SetDragPiece (AnimNr anr, ChessSquare piece)
 {
   Pixmap mask;
-  player.dragPiece = piece;
   /* The piece will be drawn using its own bitmap as a matte	*/
-  SelectGCMask(piece, &player.pieceGC, &player.outlineGC, &mask);
-  XSetClipMask(xDisplay, player.pieceGC, mask);
+  SelectGCMask(piece, &animGCs[anr+2], &animGCs[anr+4], &mask);
+  XSetClipMask(xDisplay, animGCs[anr+2], mask);
 }
 
-static void
-DragPieceMove(x, y)
-     int x; int y;
-{
-    XPoint corner;
-
-    /* Are we animating? */
-    if (!appData.animateDragging || appData.blindfold)
-      return;
-
-    /* Sanity check */
-    if (! player.dragActive)
-      return;
-    /* Move piece, maintaining same relative position
-       of mouse within square	 */
-    corner.x = x - player.mouseDelta.x;
-    corner.y = y - player.mouseDelta.y;
-    AnimationFrame(&player, &corner, player.dragPiece);
-#if HIGHDRAG*0
-    if (appData.highlightDragging) {
-	int boardX, boardY;
-	BoardSquare(x, y, &boardX, &boardY);
-	SetHighlights(fromX, fromY, boardX, boardY);
-    }
-#endif
-}
+/* [AS] Arrow highlighting support */
 
 void
-DragPieceEnd(x, y)
-     int x; int y;
-{
-    int boardX, boardY, color;
-    XPoint corner;
-
-    /* Are we animating? */
-    if (!appData.animateDragging || appData.blindfold)
-      return;
-
-    /* Sanity check */
-    if (! player.dragActive)
-      return;
-    /* Last frame in sequence is square piece is
-       placed on, which may not match mouse exactly. */
-    BoardSquare(x, y, &boardX, &boardY);
-    ScreenSquare(boardX, boardY, &corner, &color);
-    EndAnimation(&player, &corner);
-
-    /* Be sure end square is redrawn */
-    damage[0][boardY][boardX] = True;
-
-    /* This prevents weird things happening with fast successive
-       clicks which on my Sun at least can cause motion events
-       without corresponding press/release. */
-    player.dragActive = False;
-}
-
-/* Handle expose event while piece being dragged */
-
-static void
-DrawDragPiece ()
-{
-  if (!player.dragActive || appData.blindfold)
-    return;
-
-  /* What we're doing: logically, the move hasn't been made yet,
-     so the piece is still in it's original square. But visually
-     it's being dragged around the board. So we erase the square
-     that the piece is on and draw it at the last known drag point. */
-  BlankSquare(player.startSquare.x, player.startSquare.y,
-		player.startColor, EmptySquare, xBoardWindow, 1);
-  AnimationFrame(&player, &player.prevFrame, player.dragPiece);
-  damage[0][player.startBoardY][player.startBoardX] = TRUE;
-}
-
-#include <sys/ioctl.h>
-int get_term_width()
+DrawPolygon (Pnt arrow[], int nr)
 {
-    int fd, default_width;
-
-    fd = STDIN_FILENO;
-    default_width = 79; // this is FICS default anyway...
-
-#if !defined(TIOCGWINSZ) && defined(TIOCGSIZE)
-    struct ttysize win;
-    if (!ioctl(fd, TIOCGSIZE, &win))
-        default_width = win.ts_cols;
-#elif defined(TIOCGWINSZ)
-    struct winsize win;
-    if (!ioctl(fd, TIOCGWINSZ, &win))
-        default_width = win.ws_col;
-#endif
-    return default_width;
+    XPoint pts[10];
+    int i;
+    for(i=0; i<10; i++) pts[i].x = arrow[i].x, pts[i].y = arrow[i].y;
+    XFillPolygon(xDisplay, xBoardWindow, highlineGC, pts, nr, Nonconvex, CoordModeOrigin);
+    if(appData.monoMode) arrow[nr] = arrow[0], XDrawLines(xDisplay, xBoardWindow, darkSquareGC, pts, nr+1, CoordModeOrigin);
 }
 
 void
-update_ics_width()
-{
-  static int old_width = 0;
-  int new_width = get_term_width();
-
-  if (old_width != new_width)
-    ics_printf("set width %d\n", new_width);
-  old_width = new_width;
-}
-
-void NotifyFrontendLogin()
-{
-    update_ics_width();
-}
-
-/* [AS] Arrow highlighting support */
-
-static double A_WIDTH = 5; /* Width of arrow body */
-
-#define A_HEIGHT_FACTOR 6   /* Length of arrow "point", relative to body width */
-#define A_WIDTH_FACTOR  3   /* Width of arrow "point", relative to body width */
-
-static double Sqr( double x )
-{
-    return x*x;
-}
-
-static int Round( double x )
-{
-    return (int) (x + 0.5);
-}
-
-void SquareToPos(int rank, int file, int *x, int *y)
-{
-    if (flipView) {
-	*x = lineGap + ((BOARD_WIDTH-1)-file) * (squareSize + lineGap);
-	*y = lineGap + rank * (squareSize + lineGap);
-    } else {
-	*x = lineGap + file * (squareSize + lineGap);
-	*y = lineGap + ((BOARD_HEIGHT-1)-rank) * (squareSize + lineGap);
-    }
-}
-
-/* Draw an arrow between two points using current settings */
-void DrawArrowBetweenPoints( int s_x, int s_y, int d_x, int d_y )
-{
-    XPoint arrow[8];
-    double dx, dy, j, k, x, y;
-
-    if( d_x == s_x ) {
-        int h = (d_y > s_y) ? +A_WIDTH*A_HEIGHT_FACTOR : -A_WIDTH*A_HEIGHT_FACTOR;
-
-        arrow[0].x = s_x + A_WIDTH + 0.5;
-        arrow[0].y = s_y;
-
-        arrow[1].x = s_x + A_WIDTH + 0.5;
-        arrow[1].y = d_y - h;
-
-        arrow[2].x = arrow[1].x + A_WIDTH*(A_WIDTH_FACTOR-1) + 0.5;
-        arrow[2].y = d_y - h;
-
-        arrow[3].x = d_x;
-        arrow[3].y = d_y;
-
-        arrow[5].x = arrow[1].x - 2*A_WIDTH + 0.5;
-        arrow[5].y = d_y - h;
-
-        arrow[4].x = arrow[5].x - A_WIDTH*(A_WIDTH_FACTOR-1) + 0.5;
-        arrow[4].y = d_y - h;
-
-        arrow[6].x = arrow[1].x - 2*A_WIDTH + 0.5;
-        arrow[6].y = s_y;
-    }
-    else if( d_y == s_y ) {
-        int w = (d_x > s_x) ? +A_WIDTH*A_HEIGHT_FACTOR : -A_WIDTH*A_HEIGHT_FACTOR;
-
-        arrow[0].x = s_x;
-        arrow[0].y = s_y + A_WIDTH + 0.5;
-
-        arrow[1].x = d_x - w;
-        arrow[1].y = s_y + A_WIDTH + 0.5;
-
-        arrow[2].x = d_x - w;
-        arrow[2].y = arrow[1].y + A_WIDTH*(A_WIDTH_FACTOR-1) + 0.5;
-
-        arrow[3].x = d_x;
-        arrow[3].y = d_y;
-
-        arrow[5].x = d_x - w;
-        arrow[5].y = arrow[1].y - 2*A_WIDTH + 0.5;
-
-        arrow[4].x = d_x - w;
-        arrow[4].y = arrow[5].y - A_WIDTH*(A_WIDTH_FACTOR-1) + 0.5;
-
-        arrow[6].x = s_x;
-        arrow[6].y = arrow[1].y - 2*A_WIDTH + 0.5;
-    }
-    else {
-        /* [AS] Needed a lot of paper for this! :-) */
-        dy = (double) (d_y - s_y) / (double) (d_x - s_x);
-        dx = (double) (s_x - d_x) / (double) (s_y - d_y);
-
-        j = sqrt( Sqr(A_WIDTH) / (1.0 + Sqr(dx)) );
-
-        k = sqrt( Sqr(A_WIDTH*A_HEIGHT_FACTOR) / (1.0 + Sqr(dy)) );
-
-        x = s_x;
-        y = s_y;
-
-        arrow[0].x = Round(x - j);
-        arrow[0].y = Round(y + j*dx);
-
-        arrow[1].x = Round(arrow[0].x + 2*j);   // [HGM] prevent width to be affected by rounding twice
-        arrow[1].y = Round(arrow[0].y - 2*j*dx);
-
-        if( d_x > s_x ) {
-            x = (double) d_x - k;
-            y = (double) d_y - k*dy;
-        }
-        else {
-            x = (double) d_x + k;
-            y = (double) d_y + k*dy;
-        }
-
-        x = Round(x); y = Round(y); // [HGM] make sure width of shaft is rounded the same way on both ends
-
-        arrow[6].x = Round(x - j);
-        arrow[6].y = Round(y + j*dx);
-
-        arrow[2].x = Round(arrow[6].x + 2*j);
-        arrow[2].y = Round(arrow[6].y - 2*j*dx);
-
-        arrow[3].x = Round(arrow[2].x + j*(A_WIDTH_FACTOR-1));
-        arrow[3].y = Round(arrow[2].y - j*(A_WIDTH_FACTOR-1)*dx);
-
-        arrow[4].x = d_x;
-        arrow[4].y = d_y;
-
-        arrow[5].x = Round(arrow[6].x - j*(A_WIDTH_FACTOR-1));
-        arrow[5].y = Round(arrow[6].y + j*(A_WIDTH_FACTOR-1)*dx);
-    }
-
-    XFillPolygon(xDisplay, xBoardWindow, highlineGC, arrow, 7, Nonconvex, CoordModeOrigin);
-    if(appData.monoMode) arrow[7] = arrow[0], XDrawLines(xDisplay, xBoardWindow, darkSquareGC, arrow, 8, CoordModeOrigin);
-//    Polygon( hdc, arrow, 7 );
-}
-
-/* [AS] Draw an arrow between two squares */
-void DrawArrowBetweenSquares( int s_col, int s_row, int d_col, int d_row )
-{
-    int s_x, s_y, d_x, d_y, hor, vert, i;
-
-    if( s_col == d_col && s_row == d_row ) {
-        return;
-    }
-
-    /* Get source and destination points */
-    SquareToPos( s_row, s_col, &s_x, &s_y);
-    SquareToPos( d_row, d_col, &d_x, &d_y);
-
-    if( d_y > s_y ) {
-        d_y += squareSize / 2 - squareSize / 4; // [HGM] round towards same centers on all sides!
-    }
-    else if( d_y < s_y ) {
-        d_y += squareSize / 2 + squareSize / 4;
-    }
-    else {
-        d_y += squareSize / 2;
-    }
-
-    if( d_x > s_x ) {
-        d_x += squareSize / 2 - squareSize / 4;
-    }
-    else if( d_x < s_x ) {
-        d_x += squareSize / 2 + squareSize / 4;
-    }
-    else {
-        d_x += squareSize / 2;
-    }
-
-    s_x += squareSize / 2;
-    s_y += squareSize / 2;
-
-    /* Adjust width */
-    A_WIDTH = squareSize / 14.; //[HGM] make float
-
-    DrawArrowBetweenPoints( s_x, s_y, d_x, d_y );
-
-    hor = 64*s_col + 32; vert = 64*s_row + 32;
-    for(i=0; i<= 64; i++) {
-            damage[0][vert+6>>6][hor+6>>6] = True;
-            damage[0][vert-6>>6][hor+6>>6] = True;
-            damage[0][vert+6>>6][hor-6>>6] = True;
-            damage[0][vert-6>>6][hor-6>>6] = True;
-            hor += d_col - s_col; vert += d_row - s_row;
-    }
-}
-
-Boolean IsDrawArrowEnabled()
-{
-    return appData.highlightMoveWithArrow && squareSize >= 32;
-}
-
-void DrawArrowHighlight(int fromX, int fromY, int toX,int toY)
-{
-    if( IsDrawArrowEnabled() && fromX >= 0 && fromY >= 0 && toX >= 0 && toY >= 0)
-        DrawArrowBetweenSquares(fromX, fromY, toX, toY);
-}
-
-void UpdateLogos(int displ)
+UpdateLogos (int displ)
 {
     return; // no logos in XBoard yet
 }