Changeset 545

Timestamp:

05/08/09 00:00:39 (15 months ago)

Author:

zoogie

Message:

Initial implementation of automatic linking of URLs in chat text:

• The chat area is now a rich edit control; we can do more interesting things with formatting now.
• Using the built-in link finding for now; we'll probably want to implement our own URL detection later since the built-in recognizes more protocols than we want to safely support.

Location:

trunk/client/Game2

Files:

• Game2.rc (modified) (2 diffs, 1 prop)
• InternetRoom.cpp (modified) (3 diffs)
• resource.h (modified) (2 diffs)

trunk/client/Game2/Game2.rc

@@ -527 +527 @@
                     LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | WS_BORDER | 
                     WS_TABSTOP,3,108,113,124
-    EDITTEXT        IDC_CHAT_OUT,120,108,265,110,ES_MULTILINE | ES_READONLY | 
-                    WS_VSCROLL | NOT WS_TABSTOP
     LTEXT           "Chat section",IDC_CHAT_SECTION_C,120,100,45,8
     LTEXT           "Game list",IDC_GAME_LIST_C,3,1,30,8
@@ -551 +549 @@
     PUSHBUTTON      "",IDC_PUB,3,234,382,42,BS_BITMAP | BS_FLAT | NOT 
                     WS_TABSTOP,WS_EX_TRANSPARENT
+    CONTROL         "",IDC_CHAT_OUT,"RichEdit20W",WS_BORDER | WS_VSCROLL | 
+                    WS_TABSTOP | 0x8c4,120,108,265,108
 END
 

trunk/client/Game2/InternetRoom.cpp

@@ -946 +946 @@
     SetWindowTextW(pDest, Str::UW(mChatBuffer));
 
-    SendMessage(pDest, EM_LINESCROLL, 0, 1000);
-    // SendMessage( pDest, WM_VSCROLL, SB_BOTTOM, 0 );
+    //SendMessage(pDest, EM_LINESCROLL, 0, 1000);
+    SendMessage(pDest, WM_VSCROLL, SB_BOTTOM, 0);
 }
 
@@ -1351 +1351 @@
                 SetDlgItemTextW(pWindow, IDCANCEL, Str::UW(_("Quit")));
 
+                DWORD mask = SendDlgItemMessageW(pWindow, IDC_CHAT_OUT, EM_GETEVENTMASK, 0, 0);
+                SendDlgItemMessageW(pWindow, IDC_CHAT_OUT, EM_SETEVENTMASK, 0, mask | ENM_LINK);
+                SendDlgItemMessageW(pWindow, IDC_CHAT_OUT, EM_AUTOURLDETECT, TRUE, 0);
+
                 RECT lRect;
                 HWND lList;
@@ -1699 +1703 @@
                         break;
 
-                case IDC_USER_LIST:
-                    if(lNotMessage->code == LVN_ITEMCHANGED) {
-                        lReturnValue = TRUE;
-
-                        // Select the game corresponding to the selected
-                        mThis->SelectGameForUser(pWindow);
-                    }
-                    break;
-            }
-        }
-        break;
+                    case IDC_USER_LIST:
+                        if(lNotMessage->code == LVN_ITEMCHANGED) {
+                            lReturnValue = TRUE;
+
+                            // Select the game corresponding to the selected
+                            mThis->SelectGameForUser(pWindow);
+                        }
+                        break;
+
+                    case IDC_CHAT_OUT:
+                        // User clicked on a link.
+                        if (lNotMessage->code == EN_LINK) {
+                            ENLINK *linkInfo = (ENLINK*)pLParam;
+                            if (linkInfo->msg == WM_LBUTTONUP) {
+                                CHARRANGE *chrg = &linkInfo->chrg;
+                                int len = chrg->cpMax - chrg->cpMin;
+                                wchar_t url[512] = { 0 };
+                                TEXTRANGEW range;
+                                range.chrg.cpMin = chrg->cpMin;
+                                range.chrg.cpMax = (len > 511) ? chrg->cpMin + 511 : chrg->cpMax;
+                                range.lpstrText = url;
+                                SendDlgItemMessageW(pWindow, IDC_CHAT_OUT, EM_GETTEXTRANGE, 0, (LPARAM)&range);
+
+                                // Open the URL in the browser.
+                                //TODO: Move this to Util::OS.
+                                //FIXME: Need to make sure we're only handling "http:", "https:", and "ftp:".
+                                OutputDebugStringW(L"Opening URL: ");
+                                OutputDebugStringW(range.lpstrText);
+                                OutputDebugStringW(L"\n");
+                                ShellExecuteW(NULL, L"open", range.lpstrText, NULL, NULL, SW_SHOWNORMAL);
+                            }
+                        }
+                        break;
+                }
+            }
+            break;
 
         case WM_COMMAND:

trunk/client/Game2/resource.h

@@ -180 +180 @@
 #define IDC_GAMMA_LBL                   1245
 #define IDC_DLTRACK                     1333
+#define IDC_CHAT_TXT                    1335
 #define ID_VIEW_3DACTION                32775
 #define ID_SETTING_WINDOW               32784
@@ -397 +398 @@
 #define _APS_NEXT_RESOURCE_VALUE        166
 #define _APS_NEXT_COMMAND_VALUE         40049
-#define _APS_NEXT_CONTROL_VALUE         1334
+#define _APS_NEXT_CONTROL_VALUE         1336
 #define _APS_NEXT_SYMED_VALUE           101
 #endif