X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=fb983363cb723f40e3c2de76aa5bf5c5ebfbe22e;hb=21b2748b7e01ca15af0c2dce7102df401dc2666f;hp=9cc844c82f8b1ae56fcb91f7cb2336bc3013b33e;hpb=3cc03b735ac2bff48a80937827a2ddcf22878959;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index 9cc844c..fb98336 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -1,11 +1,13 @@
 /*
  * WinBoard.c -- Windows NT front end to XBoard
- * $Id: winboard.c,v 2.3 2003/11/25 05:25:20 mann Exp $
  *
  * Copyright 1991 by Digital Equipment Corporation, Maynard,
- * Massachusetts.  Enhancements Copyright
- * 1992-2001,2002,2003,2004,2005,2006,2007,2008,2009 Free Software
- * Foundation, Inc.
+ * Massachusetts. 
+ *
+ * Enhancements Copyright 1992-2001, 2002, 2003, 2004, 2005, 2006,
+ * 2007, 2008, 2009 Free Software Foundation, Inc.
+ *
+ * Enhancements Copyright 2005 Alessandro Scotti
  *
  * XBoard borrows its colors and the bitmaps.xchess bitmap set from XChess,
  * which was written and is copyrighted by Wayne Christopher.
@@ -88,7 +90,7 @@
 #include "woptions.h"
 #include "wsockerr.h"
 #include "defaults.h"
-
+#include "help.h"
 #include "wsnap.h"
 
 //void InitEngineUCI( const char * iniDir, ChessProgramState * cps );
@@ -106,12 +108,6 @@ int FinishMove P((ChessMove moveType, int fromX, int fromY, int toX, int toY,
 void AnimateAtomicCapture(int fromX, int fromY, int toX, int toY, int nFrames);
 void DisplayMove P((int moveNumber));
 Boolean ParseFEN P((Board board, int *blackPlaysFirst, char *fen));
-#ifdef VISTA
-#include "htmlhelp.h"
-#else
-HWND WINAPI HtmlHelp( HWND hwnd, LPCSTR helpFile, UINT action, DWORD_PTR data );
-#endif
-
 typedef struct {
   ChessSquare piece;  
   POINT pos;      /* window coordinates of current pos */
@@ -313,7 +309,7 @@ MyButtonDesc buttonDesc[N_BUTTONS] =
 };
 
 int tinyLayout = 0, smallLayout = 0;
-#define MENU_BAR_ITEMS 6
+#define MENU_BAR_ITEMS 7
 char *menuBarText[2][MENU_BAR_ITEMS+1] = {
   { "&File", "&Mode", "&Action", "&Step", "&Options", "&Help", NULL },
   { "&F", "&M", "&A", "&S", "&O", "&H", NULL },
@@ -501,6 +497,8 @@ static int fromX = -1, fromY = -1, toX, toY; // [HGM] moved upstream, so JAWS ca
 #define JAWS_MENU_ITEMS
 #define JAWS_SILENCE
 #define JAWS_REPLAY
+#define JAWS_ACCEL
+#define JAWS_COPYRIGHT
 #define JAWS_DELETE(X) X
 #define SAYMACHINEMOVE()
 #define SAY(X)
@@ -626,7 +624,7 @@ WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
 	  !(editTagsDialog && IsDialogMessage(editTagsDialog, &msg)) &&
 	  !(gameListDialog && IsDialogMessage(gameListDialog, &msg)) &&
 	  !(errorDialog && IsDialogMessage(errorDialog, &msg)) &&
-	  !(!frozen && TranslateAccelerator(hwndMain, hAccelMain, &msg)) &&
+	  !(!frozen && TranslateAccelerator(hwndMain, hAccelMain, &msg)) && JAWS_ACCEL
           !(!hwndConsole && TranslateAccelerator(hwndMain, hAccelNoICS, &msg)) &&
 	  !(!hwndConsole && TranslateAccelerator(hwndMain, hAccelNoAlt, &msg))) {
 	TranslateMessage(&msg);	/* Translates virtual key codes */
@@ -2302,7 +2300,7 @@ SaveSettings(char* name)
     return;
   }
   fprintf(f, ";\n");
-  fprintf(f, "; %s %s.%s Save Settings file\n", PRODUCT, VERSION, PATCHLEVEL);
+  fprintf(f, "; %s Save Settings file\n", PACKAGE_STRING);
   fprintf(f, ";\n");
   fprintf(f, "; You can edit the values of options that are already set in this file,\n");
   fprintf(f, "; but if you add other options, the next Save Settings will not save them.\n");
@@ -5663,7 +5661,8 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
     } else if(lParam != KF_REPEAT) {
 	if (isalpha((char)wParam) || isdigit((char)wParam)) {
 		PopUpMoveDialog((char)wParam);
-	}
+	} else if((char)wParam == 003) CopyGameToClipboard();
+	 else if((char)wParam == 026) PasteGameOrFENFromClipboard();
     }
 
     break;
@@ -6665,7 +6664,7 @@ BOOLEAN
 MyPlaySound(MySound *ms)
 {
   BOOLEAN ok = FALSE;
-	if(appData.debugMode) fprintf(debugFP, "make sound %s %x %d\n", ms->name, ms, ms->name[0]);
+
   switch (ms->name[0]) {
   case NULLCHAR:
 	if(appData.debugMode) fprintf(debugFP, "silence\n");
@@ -7190,6 +7189,7 @@ About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
     /* Center the dialog over the application window */
     CenterWindow (hDlg, GetWindow (hDlg, GW_OWNER));
     SetDlgItemText(hDlg, ABOUTBOX_Version, programVersion);
+    JAWS_COPYRIGHT
     return (TRUE);
 
   case WM_COMMAND: /* message: received a command */