updated year in copyright info

[xboard.git] / winboard / wchat.c

diff --git a/winboard/wchat.c b/winboard/wchat.c
index db9ebf1..d6dc502 100644 (file)
--- a/winboard/wchat.c
+++ b/winboard/wchat.c
@@ -3,6 +3,8 @@
  *\r
  * Author: H.G.Muller (August 2009)\r
  *\r
+ * Copyright 2009, 2010 Free Software Foundation, Inc. \r
+ *\r
  * ------------------------------------------------------------------------\r
  *\r
  * GNU XBoard is free software: you can redistribute it and/or modify\r
@@ -32,8 +34,8 @@
 #include <dlgs.h>\r
 \r
 #include "common.h"\r
-#include "winboard.h"\r
 #include "frontend.h"\r
+#include "winboard.h"\r
 #include "backend.h"\r
 \r
 #include "wsnap.h"\r
@@ -47,7 +49,6 @@ void ChatPopUp();
 void ChatPopDown();\r
 \r
 /* Imports from backend.c */\r
-char * SavePart(char *str);\r
 extern int opponentKibitzes;\r
 \r
 /* Imports from winboard.c */\r
@@ -137,6 +138,7 @@ LRESULT CALLBACK ChatProc( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
     static SnapData sd;\r
     char buf[MSG_SIZ], mess[MSG_SIZ];\r
     int partner = -1, i;\r
+    static BOOL filterHasFocus[MAX_CHAT];\r
 \r
     for(i=0; i<MAX_CHAT; i++) if(hDlg == chatHandle[i]) { partner = i; break; }\r
 \r
@@ -149,10 +151,33 @@ LRESULT CALLBACK ChatProc( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
                SetWindowText(hDlg, buf);\r
         }\r
        chatPartner[partner][0] = 0;\r
+       filterHasFocus[partner] = FALSE;\r
 \r
         return FALSE;\r
 \r
     case WM_COMMAND:\r
+      /* \r
+        [AS]\r
+        If <Enter> is pressed while editing the filter, it's better to apply\r
+        the filter rather than selecting the current game.\r
+      */\r
+      if( LOWORD(wParam) == IDC_ChatPartner ) {\r
+          switch( HIWORD(wParam) ) {\r
+          case EN_SETFOCUS:\r
+              filterHasFocus[partner] = TRUE;\r
+              break;\r
+          case EN_KILLFOCUS:\r
+              filterHasFocus[partner] = FALSE;\r
+              break;\r
+          }\r
+      }\r
+\r
+      if( filterHasFocus[partner] && (LOWORD(wParam) == IDC_Send) ) {\r
+         SetFocus(GetDlgItem(hDlg, OPT_ChatInput));\r
+          wParam = IDC_Change;\r
+      }\r
+      /* [AS] End command replacement */\r
+\r
         switch (LOWORD(wParam)) {\r
 \r
        case IDCANCEL:\r
@@ -180,7 +205,8 @@ LRESULT CALLBACK ChatProc( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
                if(!atoi(chatPartner[partner])) {\r
                    sprintf(buf, "> %s\n", mess); // echo only tells to handle, not channel\r
                InsertIntoMemo(hDlg, buf);\r
-               }\r
+               sprintf(buf, "xtell %s %s\n", chatPartner[partner], mess);\r
+               } else\r
                sprintf(buf, "tell %s %s\n", chatPartner[partner], mess);\r
            }\r
            SendToICS(buf);\r