[netrek-cvs] client/netrekxp/src helpwin.c, 1.4, 1.5 newwin.c, 1.41, 1.42

[Bill Balcerski]

Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv7034/src

Modified Files:
	helpwin.c newwin.c 
Log Message:
Middle mouse button now closes help window (lots of complaints about not being able to close help window due to accidentally remapping the h key when trying to close the window).

Index: newwin.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- newwin.c	23 Jun 2006 08:50:14 -0000	1.41
+++ newwin.c	9 Jul 2006 08:25:38 -0000	1.42
@@ -848,7 +848,8 @@
     else
 #endif
         W_SetWindowExposeHandler (helpWin, fillhelp);
-		W_SetWindowKeyDownHandler (helpWin, helpaction);
+    W_SetWindowKeyDownHandler (helpWin, helpaction);
+    W_SetWindowButtonHandler (helpWin, helpaction);
 
 #ifdef META
     metaWin = W_MakeMenu ("MetaServer List", 0, 0, 72, num_servers + 2,

Index: helpwin.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/helpwin.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- helpwin.c	7 May 2006 16:59:27 -0000	1.4
+++ helpwin.c	9 Jul 2006 08:25:38 -0000	1.5
@@ -215,7 +215,7 @@
     char helpmessage[MAXHELP];
 
 
-    /* 4 column help window. THis may be changed depending on font size */
+    /* 4 column help window. This may be changed depending on font size */
     for (column = 0; column < 4; column++)
     {
         for (row = 1; row < HELPMESSAGES / 4 + 2; row++)
@@ -249,6 +249,13 @@
 	int i, message_number = -1;
 	int row, column = 0;
 
+	/* Close window? */
+	if (data->key == W_MBUTTON)
+	{
+		W_UnmapWindow (helpWin);
+		return;
+	}
+
 	/* Let's find row and column from mouse coordinates */
 	row = (data->y - 4)/ W_Textheight;
 	for (i = 0; i < 4; i++)