From 42be46c5b517694f1af4ff2d6b8f425ba5d0b6bb Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 9 Apr 2015 17:13:07 +0000 Subject: - unused code removed; - code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@12708 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/core/stdchat/src/window.cpp | 48 ++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 27 deletions(-) (limited to 'src/core/stdchat') diff --git a/src/core/stdchat/src/window.cpp b/src/core/stdchat/src/window.cpp index d89dc41914..10498ac8de 100644 --- a/src/core/stdchat/src/window.cpp +++ b/src/core/stdchat/src/window.cpp @@ -365,50 +365,49 @@ static LRESULT CALLBACK MessageSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, if (wParam == VK_TAB && !isCtrl && !isShift) { //tab-autocomplete TCHAR* pszText = NULL; - int iLen; - GETTEXTLENGTHEX gtl = {0}; - GETTEXTEX gt = {0}; LRESULT lResult = (LRESULT)SendMessage(hwnd, EM_GETSEL, 0, 0); SendMessage(hwnd, WM_SETREDRAW, FALSE, 0); - start = LOWORD(lResult); + int start = LOWORD(lResult); end = HIWORD(lResult); SendMessage(hwnd, EM_SETSEL, end, end); + + GETTEXTLENGTHEX gtl = { 0 }; gtl.flags = GTL_PRECISE; gtl.codepage = CP_ACP; - iLen = SendMessage(hwnd, EM_GETTEXTLENGTHEX, (WPARAM)>l, 0); - if (iLen >0) { - TCHAR *pszName = NULL; - TCHAR *pszSelName = NULL; - pszText = (TCHAR *)mir_alloc(sizeof(TCHAR)*(iLen+100)); + int iLen = SendMessage(hwnd, EM_GETTEXTLENGTHEX, (WPARAM)>l, 0); + if (iLen > 0) { + pszText = (TCHAR *)mir_alloc(sizeof(TCHAR)*(iLen + 100)); - gt.cb = iLen+99; + GETTEXTEX gt = { 0 }; + gt.cb = iLen + 99; gt.flags = GT_DEFAULT; gt.codepage = 1200; SendMessage(hwnd, EM_GETTEXTEX, (WPARAM)>, (LPARAM)pszText); - while ( start >0 && pszText[start-1] != ' ' && pszText[start-1] != 13 && pszText[start-1] != VK_TAB) + while (start > 0 && pszText[start - 1] != ' ' && pszText[start - 1] != 13 && pszText[start - 1] != VK_TAB) start--; - while (end < iLen && pszText[end] != ' ' && pszText[end] != 13 && pszText[end-1] != VK_TAB) - end ++; + while (end < iLen && pszText[end] != ' ' && pszText[end] != 13 && pszText[end - 1] != VK_TAB) + end++; - if ( dat->szTabSave[0] =='\0') - mir_tstrncpy( dat->szTabSave, pszText+start, end-start+1 ); + if (dat->szTabSave[0] == '\0') + mir_tstrncpy(dat->szTabSave, pszText + start, end - start + 1); - pszSelName = (TCHAR *)mir_alloc( sizeof(TCHAR)*( end-start+1 )); - mir_tstrncpy( pszSelName, pszText+start, end-start+1); - pszName = pci->UM_FindUserAutoComplete(Parentsi->pUsers, dat->szTabSave, pszSelName); + TCHAR *pszSelName = (TCHAR *)mir_alloc(sizeof(TCHAR)*(end - start + 1)); + mir_tstrncpy(pszSelName, pszText + start, end - start + 1); + + TCHAR *pszName = pci->UM_FindUserAutoComplete(Parentsi->pUsers, dat->szTabSave, pszSelName); if (pszName == NULL) { pszName = dat->szTabSave; SendMessage(hwnd, EM_SETSEL, start, end); if (end != start) - SendMessage(hwnd, EM_REPLACESEL, FALSE, (LPARAM) pszName); + SendMessage(hwnd, EM_REPLACESEL, FALSE, (LPARAM)pszName); dat->szTabSave[0] = '\0'; } else { SendMessage(hwnd, EM_SETSEL, start, end); - if (end !=start) - SendMessage(hwnd, EM_REPLACESEL, FALSE, (LPARAM) pszName); + if (end != start) + SendMessage(hwnd, EM_REPLACESEL, FALSE, (LPARAM)pszName); } mir_free(pszText); mir_free(pszSelName); @@ -419,9 +418,7 @@ static LRESULT CALLBACK MessageSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, return 0; } - if (dat->szTabSave[0] != '\0' && wParam != VK_RIGHT && wParam != VK_LEFT && - wParam != VK_SPACE && wParam != VK_RETURN && wParam != VK_BACK && wParam != VK_DELETE) - { + if (dat->szTabSave[0] != '\0' && wParam != VK_RIGHT && wParam != VK_LEFT && wParam != VK_SPACE && wParam != VK_RETURN && wParam != VK_BACK && wParam != VK_DELETE) { if (g_Settings.bAddColonToAutoComplete && start == 0) SendMessageA(hwnd, EM_REPLACESEL, FALSE, (LPARAM) ": "); @@ -565,9 +562,6 @@ static LRESULT CALLBACK MessageSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, dat->lastEnterTime = 0; return TRUE; } - - if (wParam == VK_RETURN) - break; } //fall through -- cgit v1.2.3