From 10afc1ded386e911703abd99f56843cab6a266e3 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 26 Mar 2017 18:03:09 +0300 Subject: common code from WndProc_Log moved to mir_app --- plugins/Scriver/src/chat_window.cpp | 36 +++++++++--------------------------- plugins/TabSRMM/src/chat_window.cpp | 30 ++++++------------------------ 2 files changed, 15 insertions(+), 51 deletions(-) (limited to 'plugins') diff --git a/plugins/Scriver/src/chat_window.cpp b/plugins/Scriver/src/chat_window.cpp index 314daf7696..88f1ac6d72 100644 --- a/plugins/Scriver/src/chat_window.cpp +++ b/plugins/Scriver/src/chat_window.cpp @@ -830,16 +830,6 @@ LRESULT CChatRoomDlg::WndProc_Log(UINT msg, WPARAM wParam, LPARAM lParam) SetFocus(m_message.GetHwnd()); break; - case WM_ACTIVATE: - if (LOWORD(wParam) == WA_INACTIVE) { - m_message.SendMsg(EM_EXGETSEL, 0, (LPARAM)&sel); - if (sel.cpMin != sel.cpMax) { - sel.cpMin = sel.cpMax; - m_message.SendMsg(EM_EXSETSEL, 0, (LPARAM)&sel); - } - } - break; - case WM_CONTEXTMENU: POINT pt; POINTL ptl; @@ -859,10 +849,9 @@ LRESULT CChatRoomDlg::WndProc_Log(UINT msg, WPARAM wParam, LPARAM lParam) ptrW pszWord(GetRichTextWord(m_log.GetHwnd(), &ptl)); inMenu = TRUE; - SESSION_INFO *si = m_si; CHARRANGE all = { 0, -1 }; HMENU hMenu = GetSubMenu(g_hMenu, 1); - UINT uID = Chat_CreateGCMenu(m_log.GetHwnd(), hMenu, pt, si, nullptr, pszWord); + UINT uID = Chat_CreateGCMenu(m_log.GetHwnd(), hMenu, pt, m_si, nullptr, pszWord); inMenu = FALSE; switch (uID) { case 0: @@ -878,13 +867,11 @@ LRESULT CChatRoomDlg::WndProc_Log(UINT msg, WPARAM wParam, LPARAM lParam) break; case IDM_CLEAR: - if (si) { - m_log.SetText(L""); - pci->LM_RemoveAll(&si->pLog, &si->pLogEnd); - si->iEventCount = 0; - si->LastTime = 0; - PostMessage(m_hwnd, WM_MOUSEACTIVATE, 0, 0); - } + m_log.SetText(L""); + pci->LM_RemoveAll(&m_si->pLog, &m_si->pLogEnd); + m_si->iEventCount = 0; + m_si->LastTime = 0; + PostMessage(m_hwnd, WM_MOUSEACTIVATE, 0, 0); break; case IDM_SEARCH_GOOGLE: @@ -907,11 +894,6 @@ LRESULT CChatRoomDlg::WndProc_Log(UINT msg, WPARAM wParam, LPARAM lParam) Chat_DestroyGCMenu(hMenu, 5); } break; - - case WM_CHAR: - SetFocus(m_message.GetHwnd()); - m_message.SendMsg(WM_CHAR, wParam, lParam); - break; } return CSuper::WndProc_Log(msg, wParam, lParam); @@ -942,13 +924,13 @@ LRESULT CChatRoomDlg::WndProc_Nicklist(UINT msg, WPARAM wParam, LPARAM lParam) } else ScreenToClient(m_nickList.GetHwnd(), &hti.pt); - DWORD item = (DWORD)(m_nickList.SendMsg(LB_ITEMFROMPOINT, 0, MAKELPARAM(hti.pt.x, hti.pt.y))); + int item = m_nickList.SendMsg(LB_ITEMFROMPOINT, 0, MAKELPARAM(hti.pt.x, hti.pt.y)); if (HIWORD(item) == 1) - item = (DWORD)(-1); + item = -1; else item &= 0xFFFF; - USERINFO *ui = pci->SM_GetUserFromIndex(m_si->ptszID, m_si->pszModule, (int)item); + USERINFO *ui = pci->SM_GetUserFromIndex(m_si->ptszID, m_si->pszModule, item); if (ui) { HMENU hMenu = GetSubMenu(g_hMenu, 0); USERINFO uinew; diff --git a/plugins/TabSRMM/src/chat_window.cpp b/plugins/TabSRMM/src/chat_window.cpp index d5af7d9743..b92e24d9cf 100644 --- a/plugins/TabSRMM/src/chat_window.cpp +++ b/plugins/TabSRMM/src/chat_window.cpp @@ -1090,25 +1090,11 @@ LRESULT CChatRoomDlg::WndProc_Log(UINT msg, WPARAM wParam, LPARAM lParam) } break; - case WM_ACTIVATE: - if (LOWORD(wParam) == WA_INACTIVE) { - CHARRANGE sel; - SendMessage(m_log.GetHwnd(), EM_EXGETSEL, 0, (LPARAM)&sel); - if (sel.cpMin != sel.cpMax) { - sel.cpMin = sel.cpMax; - SendMessage(m_log.GetHwnd(), EM_EXSETSEL, 0, (LPARAM)&sel); - } - } - break; - case WM_CHAR: bool isCtrl, isShift, isAlt; KbdState(isShift, isCtrl, isAlt); if (wParam == 0x03 && isCtrl) // Ctrl+C return Utils::WMCopyHandler(m_log.GetHwnd(), nullptr, msg, wParam, lParam); - - SetFocus(m_message.GetHwnd()); - m_message.SendMsg(WM_CHAR, wParam, lParam); break; } @@ -1581,10 +1567,6 @@ LRESULT CChatRoomDlg::WndProc_Nicklist(UINT msg, WPARAM wParam, LPARAM lParam) case WM_CONTEXTMENU: { - SESSION_INFO *si = m_si; - if (si == nullptr) - break; - int height = 0; TVHITTESTINFO hti; hti.pt.x = GET_X_LPARAM(lParam); @@ -1598,13 +1580,13 @@ LRESULT CChatRoomDlg::WndProc_Nicklist(UINT msg, WPARAM wParam, LPARAM lParam) } else ScreenToClient(m_nickList.GetHwnd(), &hti.pt); - int item = (DWORD)(m_nickList.SendMsg(LB_ITEMFROMPOINT, 0, MAKELPARAM(hti.pt.x, hti.pt.y))); + int item = m_nickList.SendMsg(LB_ITEMFROMPOINT, 0, MAKELPARAM(hti.pt.x, hti.pt.y)); if (HIWORD(item) == 1) - item = (DWORD)(-1); + item = -1; else item &= 0xFFFF; - USERINFO *ui = pci->SM_GetUserFromIndex(si->ptszID, si->pszModule, item); + USERINFO *ui = pci->SM_GetUserFromIndex(m_si->ptszID, m_si->pszModule, item); if (ui) { HMENU hMenu = GetSubMenu(g_hMenu, 0); USERINFO uinew; @@ -1613,14 +1595,14 @@ LRESULT CChatRoomDlg::WndProc_Nicklist(UINT msg, WPARAM wParam, LPARAM lParam) hti.pt.y += height - 4; ClientToScreen(m_nickList.GetHwnd(), &hti.pt); - UINT uID = Chat_CreateGCMenu(m_nickList.GetHwnd(), hMenu, hti.pt, si, uinew.pszUID, uinew.pszNick); + UINT uID = Chat_CreateGCMenu(m_nickList.GetHwnd(), hMenu, hti.pt, m_si, uinew.pszUID, uinew.pszNick); switch (uID) { case 0: break; case 20020: // add to highlight... { - THighLightEdit the = { THighLightEdit::CMD_ADD, si, ui }; + THighLightEdit the = { THighLightEdit::CMD_ADD, m_si, ui }; HWND hwndDlg = CreateDialogParam(g_hInst, MAKEINTRESOURCE(IDD_ADDHIGHLIGHT), m_pContainer->m_hwnd, CMUCHighlight::dlgProcAdd, (LPARAM)&the); TranslateDialogDefault(hwndDlg); @@ -2175,7 +2157,7 @@ INT_PTR CChatRoomDlg::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam) } HMENU hMenu = GetSubMenu(g_hMenu, 1); - UINT uID = Chat_CreateGCMenu(m_hwnd, hMenu, pt, m_si, nullptr, pszWord); + UINT uID = Chat_CreateGCMenu(m_log.GetHwnd(), hMenu, pt, m_si, nullptr, pszWord); switch (uID) { case 0: PostMessage(m_hwnd, WM_MOUSEACTIVATE, 0, 0); -- cgit v1.2.3