From ccc50332684d14dccef9c9afe9c05c73c37b688c Mon Sep 17 00:00:00 2001 From: mataes2007 Date: Sun, 24 Apr 2011 18:13:42 +0000 Subject: popup: removed process CL events git-svn-id: http://miranda-plugins.googlecode.com/svn/trunk@27 e753b5eb-9565-29b2-b5c5-2cc6f99dfbcb --- popup/src/config.h | 1 - popup/src/main.cpp | 8 +----- popup/src/opt_gen.cpp | 9 ------- popup/src/services.cpp | 73 -------------------------------------------------- popup/src/services.h | 3 --- 5 files changed, 1 insertion(+), 93 deletions(-) (limited to 'popup/src') diff --git a/popup/src/config.h b/popup/src/config.h index 277a94d..ace3060 100644 --- a/popup/src/config.h +++ b/popup/src/config.h @@ -54,7 +54,6 @@ typedef struct tagPOPUPOPTIONS { int gapRight; int spacing; //Miscellaneous - BYTE EnableHookClistEvents; BYTE ReorderPopUps; BYTE ReorderPopUpsWarning; //Disable when diff --git a/popup/src/main.cpp b/popup/src/main.cpp index 6b0d6bb..494a7e4 100644 --- a/popup/src/main.cpp +++ b/popup/src/main.cpp @@ -446,7 +446,7 @@ static int ModulesLoaded(WPARAM wParam,LPARAM lParam) //hook TopToolBar hTTBLoaded = HookEvent(ME_TTB_MODULELOADED, TTBLoaded); //Folder plugin support - LPTSTR pszPath = mir_a2t(FOLDER_CUSTOMIZE_SKINS "\\popup"); + LPTSTR pszPath = mir_a2t(MIRANDA_PATH "\\Skins\\PopUp"); folderId = FoldersRegisterCustomPathT(MODULNAME_LONG, "Skins", pszPath); mir_free(pszPath); //load skin @@ -543,8 +543,6 @@ MIRAPI int Load(PLUGINLINK *link) char ver[1024]; pluginLink=link; - SetCallServiceHook(); - g_popup.isOsUnicode = (GetVersion() & 0x80000000) == 0; CallService(MS_SYSTEM_GETVERSIONTEXT, (WPARAM) sizeof(ver), (LPARAM) ver); @@ -698,16 +696,12 @@ MIRAPI int Load(PLUGINLINK *link) MIRAPI int Unload(void) { int i; - RemoveCallServiceHook(); - -// UnloadNotifyImp(); //deprecatet stuff for (i = SIZEOF(popupServices); i--; ) DestroyServiceFunction(popupServices[i].handle); SrmmMenu_Unload(); -// UnhookEvent(hNotifyOptionsInitialize); deprecatet UnhookEvent(hOptionsInitialize); UnhookEvent(hModulesLoaded); UnhookEvent(hOkToExit); diff --git a/popup/src/opt_gen.cpp b/popup/src/opt_gen.cpp index c487d41..d9ea27d 100644 --- a/popup/src/opt_gen.cpp +++ b/popup/src/opt_gen.cpp @@ -119,7 +119,6 @@ void LoadOption_General() { PopUpOptions.Spreading = DBGetContactSettingRangedByte(NULL, MODULNAME, "Spreading", SPREADING_VERTICAL, SPREADING_MINVALUE, SPREADING_MAXVALUE); //miscellaneous - PopUpOptions.EnableHookClistEvents = DBGetContactSettingByte(NULL, MODULNAME, "EnableHookClistEvents", TRUE); PopUpOptions.ReorderPopUps = DBGetContactSettingByte(NULL, MODULNAME, "ReorderPopUps", TRUE); PopUpOptions.ReorderPopUpsWarning = DBGetContactSettingByte(NULL, MODULNAME, "ReorderPopUpsWarning", TRUE); //disable When @@ -205,7 +204,6 @@ INT_PTR CALLBACK DlgProcPopUpGeneral(HWND hwnd, UINT msg, WPARAM wParam, LPARAM } //miscellaneous { - CheckDlgButton(hwnd, IDC_HOOK_CLIST, PopUpOptions.EnableHookClistEvents); CheckDlgButton(hwnd, IDC_REORDERPOPUPS, PopUpOptions.ReorderPopUps); } //Popup enabled @@ -378,12 +376,6 @@ INT_PTR CALLBACK DlgProcPopUpGeneral(HWND hwnd, UINT msg, WPARAM wParam, LPARAM SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0); } break; - case IDC_HOOK_CLIST: - { - PopUpOptions.EnableHookClistEvents = !PopUpOptions.EnableHookClistEvents; - SendMessage(GetParent(hwnd), PSM_CHANGED,0,0); - } - break; case IDC_REORDERPOPUPS: { PopUpOptions.ReorderPopUps = !PopUpOptions.ReorderPopUps; @@ -573,7 +565,6 @@ INT_PTR CALLBACK DlgProcPopUpGeneral(HWND hwnd, UINT msg, WPARAM wParam, LPARAM //Spreading DBWriteContactSettingByte(NULL, MODULNAME, "Spreading", (BYTE)PopUpOptions.Spreading); //miscellaneous - DBWriteContactSettingByte(NULL, MODULNAME, "EnableHookClistEvents", PopUpOptions.EnableHookClistEvents); //DBWriteContactSettingByte(NULL, MODULNAME, "ReorderPopUps", PopUpOptions.ReorderPopUps); Check_ReorderPopUps(hwnd); //this save also PopUpOptions.ReorderPopUps //disable When diff --git a/popup/src/services.cpp b/popup/src/services.cpp index d9f950a..416ce64 100644 --- a/popup/src/services.cpp +++ b/popup/src/services.cpp @@ -147,79 +147,6 @@ static bool isFullScreen() //===== Hook clist services static LRESULT CALLBACK ClistEventPopupWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam); -INT_PTR (*pfnRealCallService)(const char *,WPARAM,LPARAM); -static INT_PTR HookCallService(const char *svc, WPARAM wParam, LPARAM lParam) -{ - if (PopUpOptions.EnableHookClistEvents) { - if (!lstrcmpA(svc, MS_CLIST_ADDEVENT)) { - CLISTEVENT *pCle = (CLISTEVENT *)lParam; - if (pCle->cbSize == sizeof(CLISTEVENT)) { - CLISTEVENT *data = (CLISTEVENT *)mir_alloc(sizeof(CLISTEVENT)); - *data = *pCle; - data->pszService = mir_strdup(data->pszService); - - if (g_popup.isOsUnicode && (pCle->flags & CLEF_UNICODE)) { - data->pszTooltip = (char *)mir_wstrdup((WCHAR *)data->pszTooltip); - - POPUPDATAW_V2 pd = {0}; - pd.lchContact = pCle->hContact; - pd.lchIcon = pCle->hIcon; - if (pCle->hContact) { - lstrcpynW(pd.lpwzContactName, - (WCHAR *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)pCle->hContact, GCDNF_UNICODE), - SIZEOF(pd.lpwzContactName)); - } - else { - lstrcpynW(pd.lpwzContactName, L"Incoming Event", SIZEOF(pd.lpwzContactName)); - } - lstrcpynW(pd.lpwzText, (WCHAR *)pCle->pszTooltip, SIZEOF(pd.lpwzText)); - pd.PluginData = data; - pd.PluginWindowProc = ClistEventPopupWndProc; - pd.iSeconds = (pCle->flags & CLEF_ONLYAFEW) ? 0 : -1; - CallService(MS_POPUP_ADDPOPUPW, (WPARAM)&pd, 0); - } - else { - data->pszTooltip = mir_strdup(data->pszTooltip); - - POPUPDATAEX_V2 pd = {0}; - pd.lchContact = pCle->hContact; - pd.lchIcon = pCle->hIcon; - if (pCle->hContact) { - lstrcpynA(pd.lpzContactName, - (char *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)pCle->hContact, 0), - SIZEOF(pd.lpzContactName)); - } - else { - lstrcpynA(pd.lpzContactName, "Incoming Event", SIZEOF(pd.lpzContactName)); - } - lstrcpynA(pd.lpzText, pCle->pszTooltip, SIZEOF(pd.lpzText)); - pd.PluginData = data; - pd.PluginWindowProc = ClistEventPopupWndProc; - pd.iSeconds = (pCle->flags & CLEF_ONLYAFEW) ? 0 : -1; - CallService(MS_POPUP_ADDPOPUPEX, (WPARAM)&pd, 0); - } - } - } -/* else if (!lstrcmp(svc, MS_CLIST_REMOVEEVENT)) { - ; - } -*/ - } - - return pfnRealCallService(svc, wParam, lParam); -} - -void SetCallServiceHook() -{ - pfnRealCallService = pluginLink->CallService; - pluginLink->CallService = HookCallService; -} - -void RemoveCallServiceHook() -{ - pluginLink->CallService = pfnRealCallService; -} - static LRESULT CALLBACK ClistEventPopupWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch (msg) diff --git a/popup/src/services.h b/popup/src/services.h index b21b000..462d203 100644 --- a/popup/src/services.h +++ b/popup/src/services.h @@ -35,9 +35,6 @@ Last change by : $Author: Merlin_de $ extern int num_classes; //for core class api support -void SetCallServiceHook(); -void RemoveCallServiceHook(); - INT_PTR PopUp_AddPopUp(WPARAM, LPARAM); INT_PTR PopUp_AddPopUpW(WPARAM, LPARAM); -- cgit v1.2.3