X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwchat.c;h=13d8d283ca073e6bce5ddf51a36507a201979b9d;hb=refs%2Ftags%2Fgtk-20100206;hp=363bebdf9800026997bd2cda103711419425d7bf;hpb=891e6ae6b61cb387401b79ad75ae5b2c1d58da5e;p=xboard.git

diff --git a/winboard/wchat.c b/winboard/wchat.c
index 363bebd..13d8d28 100644
--- a/winboard/wchat.c
+++ b/winboard/wchat.c
@@ -3,6 +3,8 @@
  *
  * Author: H.G.Muller (August 2009)
  *
+ * Copyright 2009, 2010 Free Software Foundation, Inc.
+ *
  * ------------------------------------------------------------------------
  *
  * GNU XBoard is free software: you can redistribute it and/or modify
@@ -136,6 +138,7 @@ LRESULT CALLBACK ChatProc( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
     static SnapData sd;
     char buf[MSG_SIZ], mess[MSG_SIZ];
     int partner = -1, i;
+    static BOOL filterHasFocus[MAX_CHAT];
 
     for(i=0; i<MAX_CHAT; i++) if(hDlg == chatHandle[i]) { partner = i; break; }
 
@@ -148,10 +151,33 @@ LRESULT CALLBACK ChatProc( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
 		SetWindowText(hDlg, buf);
         }
 	chatPartner[partner][0] = 0;
+	filterHasFocus[partner] = FALSE;
 
         return FALSE;
 
     case WM_COMMAND:
+      /* 
+        [AS]
+        If <Enter> is pressed while editing the filter, it's better to apply
+        the filter rather than selecting the current game.
+      */
+      if( LOWORD(wParam) == IDC_ChatPartner ) {
+          switch( HIWORD(wParam) ) {
+          case EN_SETFOCUS:
+              filterHasFocus[partner] = TRUE;
+              break;
+          case EN_KILLFOCUS:
+              filterHasFocus[partner] = FALSE;
+              break;
+          }
+      }
+
+      if( filterHasFocus[partner] && (LOWORD(wParam) == IDC_Send) ) {
+	  SetFocus(GetDlgItem(hDlg, OPT_ChatInput));
+          wParam = IDC_Change;
+      }
+      /* [AS] End command replacement */
+
         switch (LOWORD(wParam)) {
 
 	case IDCANCEL: