- Srmm_ModifyIcon helper applied instead of CallService(MS_MSG_MODIFYICON)

- various fixes related to SRMM icons;
- code cleaning

git-svn-id: http://svn.miranda-ng.org/main/trunk@4426 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

5 files changed, 92 insertions, 238 deletions

diff --git a/plugins/MirOTR/MirOTR/src/dbfilter.cpp b/plugins/MirOTR/MirOTR/src/dbfilter.cpp
index 790de635c6..e3d992817a 100644
--- a/plugins/MirOTR/MirOTR/src/dbfilter.cpp
+++ b/plugins/MirOTR/MirOTR/src/dbfilter.cpp
@@ -246,7 +246,6 @@ int WindowEvent(WPARAM wParam, LPARAM lParam) {
 	}

 

 	if(mwd->uType != MSG_WINDOW_EVT_OPEN) return 0;

-	if (!options.bHaveSRMMIcons) return 0;

 

 	HANDLE hContact = mwd->hContact, hTemp;

 	if(options.bHaveMetaContacts && (hTemp = (HANDLE)CallService(MS_MC_GETMOSTONLINECONTACT, (WPARAM)hContact, 0)) != 0)

diff --git a/plugins/MirOTR/MirOTR/src/dllmain.cpp b/plugins/MirOTR/MirOTR/src/dllmain.cpp
index 84499c11c6..f8eb373fec 100644
--- a/plugins/MirOTR/MirOTR/src/dllmain.cpp
+++ b/plugins/MirOTR/MirOTR/src/dllmain.cpp
@@ -60,20 +60,6 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) {
 		SaveOptions();

 		MessageBox(0, TranslateT(LANG_OTR_SECUREIM_TEXT), TranslateT(LANG_OTR_SECUREIM_TITLE), 0x30);

 	}

-	if (!options.bHaveSRMMIcons) {

-		MessageBox(NULL, TranslateT("OTR Info"), TranslateT("Your SRMM plugin does not support status icons. Not all OTR-functions are available!"), 0x30);

-	}

-

-	// HookEvent(ME_OPT_INITIALISE, OptInit);

-

-	// hook setting changed to monitor status

-	//hSettingChanged = HookEvent(ME_DB_CONTACT_SETTINGCHANGED, SettingChanged);

-

-	// hook status mode changes to terminate sessions when we go offline

-	// (this would be hooked as the ME_CLIST_STATUSMODECHANGE handler except that event is sent *after* the proto goes offline)

-	// (instead, it's called from the SettingChanged handler for protocol status db setting changes)

-	//HookEvent(ME_CLIST_STATUSMODECHANGE, StatusModeChange);

-

 	return 0;

 }

 

diff --git a/plugins/MirOTR/MirOTR/src/options.cpp b/plugins/MirOTR/MirOTR/src/options.cpp
index 41ea5f8209..f4a04006f3 100644
--- a/plugins/MirOTR/MirOTR/src/options.cpp
+++ b/plugins/MirOTR/MirOTR/src/options.cpp
@@ -89,11 +89,10 @@ void LoadOptions() {
 	options.end_offline = (db_get_b(0, MODULENAME, "EndOffline", 1) == 1);

 	options.end_window_close = (db_get_b(0, MODULENAME, "EndWindowClose", 0) == 1);

 

-	options.bHaveMetaContacts = 0!=ServiceExists(MS_MC_GETMETACONTACT);

-	options.bHavePopups = 0!=ServiceExists(MS_POPUP_ADDPOPUPT) && ServiceExists(MS_POPUP_SHOWMESSAGE);

-	options.bHaveSRMMIcons = 0!=ServiceExists(MS_MSG_MODIFYICON);

-	options.bHaveSecureIM = 0!=ServiceExists("SecureIM/IsContactSecured");

-	options.bHaveButtonsBar = 0!=ServiceExists(MS_BB_ADDBUTTON);

+	options.bHaveMetaContacts = 0 != ServiceExists(MS_MC_GETMETACONTACT);

+	options.bHavePopups = 0 != ServiceExists(MS_POPUP_ADDPOPUPT) && ServiceExists(MS_POPUP_SHOWMESSAGE);

+	options.bHaveSecureIM = 0 != ServiceExists("SecureIM/IsContactSecured");

+	options.bHaveButtonsBar = 0 != ServiceExists(MS_BB_ADDBUTTON);

 

 	LoadFilenames();

 }

diff --git a/plugins/MirOTR/MirOTR/src/options.h b/plugins/MirOTR/MirOTR/src/options.h
index e849f50581..7625eef247 100644
--- a/plugins/MirOTR/MirOTR/src/options.h
+++ b/plugins/MirOTR/MirOTR/src/options.h
@@ -32,7 +32,7 @@ typedef struct {
 	bool end_offline, end_window_close;

 

 	// temporary options

-	bool bHaveMetaContacts, bHavePopups, bHaveSRMMIcons, bHaveSecureIM, bHaveButtonsBar;

+	bool bHaveMetaContacts, bHavePopups, bHaveSecureIM, bHaveButtonsBar;

 

 } Options;

 

diff --git a/plugins/MirOTR/MirOTR/src/svcs_srmm.cpp b/plugins/MirOTR/MirOTR/src/svcs_srmm.cpp
index 854619d689..f203f7d246 100644
--- a/plugins/MirOTR/MirOTR/src/svcs_srmm.cpp
+++ b/plugins/MirOTR/MirOTR/src/svcs_srmm.cpp
@@ -1,38 +1,10 @@
 #include "stdafx.h"

 

-HANDLE hEventIconPressed;

 HICON hIconNotSecure, hIconFinished, hIconPrivate, hIconUnverified;

 BBButton OTRButton;

 

-/* Plugin init and deinit */

-// int WindowEvent(WPARAM wParam, LPARAM lParam) {

-// 	MessageWindowEventData *mwd = (MessageWindowEventData *)lParam;

-// 	

-// 	if(mwd->uType == MSG_WINDOW_EVT_CLOSE && options.end_window_close) {

-// 		FinishSession(mwd->hContact);

-// 		return 0;

-// 	}

-// 

-// 	if(mwd->uType != MSG_WINDOW_EVT_OPEN) return 0;

-// 	if (!options.bHaveSRMMIcons) return 0;

-// 	

-// 	HANDLE hContact = mwd->hContact, hTemp;

-// 	if(options.bHaveMetaContacts && (hTemp = (HANDLE)CallService(MS_MC_GETMOSTONLINECONTACT, (WPARAM)hContact, 0)) != 0)

-// 		hContact = hTemp;

-// 	

-// 	if (!CallService(MS_PROTO_ISPROTOONCONTACT, (WPARAM)hContact, (LPARAM)MODULENAME))

-// 		return 0;

-// 	

-// 	lib_cs_lock();

-// 	ConnContext *context = otrl_context_find_miranda(otr_user_state, hContact);

-// 	lib_cs_unlock();

-// 	

-// 	SetEncryptionStatus(hContact, otr_context_get_trust(context));

-// 	

-// 	return 0;

-// }

-

-int SVC_IconPressed(WPARAM wParam, LPARAM lParam) {

+int SVC_IconPressed(WPARAM wParam, LPARAM lParam)

+{

 	HANDLE hContact = (HANDLE)wParam;

 	StatusIconClickData *sicd = (StatusIconClickData *)lParam;

 	if(sicd->cbSize < (int)sizeof(StatusIconClickData))

@@ -43,184 +15,84 @@ int SVC_IconPressed(WPARAM wParam, LPARAM lParam) {
 		if(proto && db_get_b(hContact, proto, "ChatRoom", 0))

 			return 0;

 		ShowOTRMenu(hContact, sicd->clickLocation);

-		/*

-		HMENU hMenu = LoadMenu(hInst, MAKEINTRESOURCE(IDR_CONTEXT));

-		CallService(MS_LANGPACK_TRANSLATEMENU, (WPARAM)hMenu, 0);

-		TrustLevel level = (TrustLevel) db_get_dw(hContact, MODULENAME, "TrustLevel", TRUST_NOT_PRIVATE);

-		MENUITEMINFO minfo = {0};

-		minfo.cbSize = sizeof(MENUITEMINFO);

-		minfo.fMask = MIIM_STRING|MIIM_STATE|MIIM_BITMAP;

-		minfo.fState = MF_DISABLED;

-

-		HWND wnd = GetFocus();

-		HDC dc = GetDC(wnd), hdc = CreateCompatibleDC(dc);

-		HBITMAP bmpIconPrivate = CreateCompatibleBitmap(dc, 16, 16);

-		HGDIOBJ old = SelectObject(hdc, bmpIconPrivate);

-		DrawIconEx(hdc, 0, 0, hIconPrivate,16, 16, 0, GetSysColorBrush(COLOR_MENU), DI_NORMAL);

-

-		HBITMAP bmpIconUnverified = CreateCompatibleBitmap(dc, 16, 16);

-		SelectObject(hdc, bmpIconUnverified);

-		DrawIconEx(hdc, 0, 0, hIconUnverified,16, 16, 0, GetSysColorBrush(COLOR_MENU), DI_NORMAL);

-

-		HBITMAP bmpIconFinished = CreateCompatibleBitmap(dc, 16, 16);

-		SelectObject(hdc, bmpIconFinished);

-		DrawIconEx(hdc, 0, 0, hIconFinished,16, 16, 0, GetSysColorBrush(COLOR_MENU), DI_NORMAL);

-

-		HBITMAP bmpIconNotSecure = CreateCompatibleBitmap(dc, 16, 16);

-		SelectObject(hdc, bmpIconNotSecure);

-		DrawIconEx(hdc, 0, 0, hIconNotSecure,16, 16, 0, GetSysColorBrush(COLOR_MENU), DI_NORMAL);

-

-		switch (level) {

-			case TRUST_PRIVATE:

-				minfo.hbmpItem = bmpIconPrivate;

-				minfo.dwTypeData = TranslateT(LANG_STATUS_PRIVATE);

-				break;

-			case TRUST_UNVERIFIED:

-				minfo.hbmpItem = bmpIconUnverified;

-				minfo.dwTypeData = TranslateT(LANG_STATUS_UNVERIFIED);

-				break;

-			case TRUST_FINISHED:

-				minfo.hbmpItem = bmpIconFinished;

-				minfo.dwTypeData = TranslateT(LANG_STATUS_FINISHED);

-				break;

-			default:

-				minfo.hbmpItem = bmpIconNotSecure;

-				minfo.dwTypeData = TranslateT(LANG_STATUS_DISABLED);

-		}

-

-		SelectObject(hdc, old);

-		DeleteDC(hdc);

-		ReleaseDC(wnd, dc);

-

-		SetMenuItemInfo(hMenu, IDM_OTR_STATUS, FALSE, &minfo);

-

-			minfo.fMask = MIIM_STATE|MIIM_BITMAP;

-			minfo.fState = (level==TRUST_NOT_PRIVATE)?MF_ENABLED:MF_GRAYED;

-			minfo.hbmpItem = bmpIconUnverified;

-			SetMenuItemInfo(hMenu, IDM_OTR_START, FALSE, &minfo);

-

-			minfo.fState = (level==TRUST_NOT_PRIVATE)?MF_GRAYED:MF_ENABLED;

-			minfo.hbmpItem = bmpIconNotSecure;

-			SetMenuItemInfo(hMenu, IDM_OTR_STOP, FALSE, &minfo);

-

-			minfo.fState = (level==TRUST_NOT_PRIVATE)?MF_GRAYED:MF_ENABLED;

-			minfo.hbmpItem = bmpIconFinished;

-			SetMenuItemInfo(hMenu, IDM_OTR_REFRESH, FALSE, &minfo);

-

-			minfo.fState = (level==TRUST_NOT_PRIVATE||level==TRUST_FINISHED)?MF_GRAYED:MF_ENABLED;

-			minfo.hbmpItem = bmpIconPrivate;

-			SetMenuItemInfo(hMenu, IDM_OTR_VERIFY, FALSE, &minfo);

-

-		switch ( (DWORD) TrackPopupMenu(GetSubMenu(hMenu, 0), TPM_NONOTIFY|TPM_RETURNCMD, sicd->clickLocation.x, sicd->clickLocation.y, 0, GetFocus(), 0) )

-		{

-			case IDM_OTR_START:

-				SVC_StartOTR(wParam, 0);

-				break;

-			case IDM_OTR_REFRESH:

-				SVC_RefreshOTR(wParam, 0);

-				break;

-			case IDM_OTR_STOP:

-				SVC_StopOTR(wParam, 0);

-				break;

-			case IDM_OTR_VERIFY:

-				ConnContext *context = otrl_context_find_miranda(otr_user_state, (HANDLE)wParam);

-				if (context) VerifyContextDialog(context);

-				break;

-		}

-		DeleteObject(bmpIconPrivate);

-		DeleteObject(bmpIconFinished);

-		DeleteObject(bmpIconNotSecure);

-		DeleteObject(bmpIconUnverified);

-		*/

 	}

 	

 	return 0;

 }

 

 // set SRMM icon status, if applicable

-void SetEncryptionStatus(HANDLE hContact, TrustLevel level) {

-	//char dbg_msg[2048];

-	//dbg_msg[0] = 0;

-

-	//strcat(dbg_msg, "Set encyption status: ");

-	//strcat(dbg_msg, (encrypted ? "true" : "false"));

-

+void SetEncryptionStatus(HANDLE hContact, TrustLevel level)

+{

 	char *proto = GetContactProto(hContact);

 	bool chat_room = (proto && db_get_b(hContact, proto, "ChatRoom", 0));

 

-	// if (!chat_room) db_set_b(hContact, MODULENAME, "Encrypted", (encrypted ? 1 : 0));

+	BBButton button = OTRButton;

 

-	if(options.bHaveSRMMIcons || options.bHaveButtonsBar) {

-		//strcat(dbg_msg, "\nchanging icon");

-		BBButton button = OTRButton;

-		StatusIconData sid = {0}, sid2={0};

-		sid.cbSize = sizeof(sid);

-		sid.szModule = MODULENAME;

-		sid.dwId = 0;

-		sid.flags = MBF_HIDDEN;

+	StatusIconData sid = { sizeof(sid) }, sid2 = { sizeof(sid) };

+	sid.szModule = MODULENAME;

+	sid.dwId = 0;

+	sid.flags = MBF_HIDDEN;

 

-		sid2.cbSize = sid.cbSize;

-		sid2.szModule = MODULENAME;

-		sid2.dwId = 1;

-		sid2.flags = MBF_HIDDEN;

-		if (!chat_room) {

-			switch (level) {

-				case TRUST_FINISHED:

-					sid.flags = 0;

-					button.ptszTooltip = TranslateT(LANG_STATUS_FINISHED);

-					button.hIcon = GetIconHandle(ICON_FINISHED);

-					break;

-				case TRUST_UNVERIFIED:

-					sid2.flags = MBF_DISABLED;

-					button.ptszTooltip = TranslateT(LANG_STATUS_UNVERIFIED);

-					button.hIcon = GetIconHandle(ICON_UNVERIFIED);

-					break;

-				case TRUST_PRIVATE:

-					sid2.flags = 0;

-					button.ptszTooltip = TranslateT(LANG_STATUS_PRIVATE);

-					button.hIcon = GetIconHandle(ICON_PRIVATE);

-					break;

-				default:

-					sid.flags = MBF_DISABLED;

-					button.ptszTooltip = TranslateT(LANG_STATUS_DISABLED);

-					button.hIcon = GetIconHandle(ICON_NOT_PRIVATE);

-					break;

-			}

-			button.bbbFlags = 0;

-		} else {

-			button.bbbFlags = BBSF_HIDDEN;

-		}

-		if (options.bHaveSRMMIcons) {

-			CallService(MS_MSG_MODIFYICON, (WPARAM)hContact, (LPARAM)&sid);

-			CallService(MS_MSG_MODIFYICON, (WPARAM)hContact, (LPARAM)&sid2);

+	sid2.szModule = MODULENAME;

+	sid2.dwId = 1;

+	sid2.flags = MBF_HIDDEN;

+

+	if (!chat_room) {

+		switch (level) {

+		case TRUST_FINISHED:

+			sid.flags = 0;

+			button.ptszTooltip = TranslateT(LANG_STATUS_FINISHED);

+			button.hIcon = GetIconHandle(ICON_FINISHED);

+			break;

+		case TRUST_UNVERIFIED:

+			sid2.flags = MBF_DISABLED;

+			button.ptszTooltip = TranslateT(LANG_STATUS_UNVERIFIED);

+			button.hIcon = GetIconHandle(ICON_UNVERIFIED);

+			break;

+		case TRUST_PRIVATE:

+			sid2.flags = 0;

+			button.ptszTooltip = TranslateT(LANG_STATUS_PRIVATE);

+			button.hIcon = GetIconHandle(ICON_PRIVATE);

+			break;

+		default:

+			sid.flags = MBF_DISABLED;

+			button.ptszTooltip = TranslateT(LANG_STATUS_DISABLED);

+			button.hIcon = GetIconHandle(ICON_NOT_PRIVATE);

+			break;

 		}

-		if (options.bHaveButtonsBar) CallService(MS_BB_SETBUTTONSTATE, (WPARAM)hContact, (LPARAM)&button);

-		db_set_dw(hContact, MODULENAME, "TrustLevel", level);

+		button.bbbFlags = 0;

+	}

+	else button.bbbFlags = BBSF_HIDDEN;

+

+	Srmm_ModifyIcon(hContact, &sid);

+	Srmm_ModifyIcon(hContact, &sid2);

+

+	if (options.bHaveButtonsBar) CallService(MS_BB_SETBUTTONSTATE, (WPARAM)hContact, (LPARAM)&button);

+	db_set_dw(hContact, MODULENAME, "TrustLevel", level);

 

-		if (!chat_room && options.bHaveMetaContacts) {

-			HANDLE hMeta = (HANDLE)CallService(MS_MC_GETMETACONTACT, (WPARAM)hContact, 0);

-			HANDLE hMostOnline = (HANDLE)CallService(MS_MC_GETMOSTONLINECONTACT, (WPARAM)hMeta, 0);

-			if(hMeta && hContact == hMostOnline) {

-				//strcat(dbg_msg, "\nrecursing for meta");

-				SetEncryptionStatus(hMeta, level);

-			}

-			else if(hMeta) {

+	if (!chat_room && options.bHaveMetaContacts) {

+		HANDLE hMeta = (HANDLE)CallService(MS_MC_GETMETACONTACT, (WPARAM)hContact, 0);

+		HANDLE hMostOnline = (HANDLE)CallService(MS_MC_GETMOSTONLINECONTACT, (WPARAM)hMeta, 0);

+		if(hMeta && hContact == hMostOnline)

+			SetEncryptionStatus(hMeta, level);

+		else if(hMeta) {

 			/* in case the new most online contact has changed

-			   (e.g. when the otr subcontact goes offline) */

+			(e.g. when the otr subcontact goes offline) */

 			ConnContext *context = otrl_context_find_miranda(otr_user_state, hMostOnline);

 			TrustLevel encrypted = otr_context_get_trust(context);

 			SetEncryptionStatus(hMeta, encrypted);

-			}

 		}

 	}

-	//PUShowMessage(dbg_msg, SM_NOTIFY);

 }

 

-int SVC_ButtonsBarLoaded(WPARAM, LPARAM) {

+int SVC_ButtonsBarLoaded(WPARAM, LPARAM)

+{

 	CallService(MS_BB_ADDBUTTON, 0, (LPARAM)&OTRButton);

 	return 0;

 }

-int SVC_ButtonsBarPressed(WPARAM w, LPARAM l) {

+

+int SVC_ButtonsBarPressed(WPARAM w, LPARAM l)

+{

 	CustomButtonClickData* cbcd = (CustomButtonClickData *)l;

 	if (cbcd->cbSize == (int)sizeof(CustomButtonClickData) && cbcd->dwButtonId == 0 && strcmp(cbcd->pszModule, MODULENAME)==0) {

 		HANDLE hContact = (HANDLE)w;

@@ -234,34 +106,33 @@ int SVC_ButtonsBarPressed(WPARAM w, LPARAM l) {
 	return 0;

 }

 

-void InitSRMM() {

+void InitSRMM()

+{

 	// add icon to srmm status icons

 	InitMirOTRMenu();

-	if(options.bHaveSRMMIcons) {

-		hIconNotSecure = LoadIcon(ICON_NOT_PRIVATE, 0);

-		hIconFinished = LoadIcon(ICON_FINISHED, 0);

-		hIconPrivate = LoadIcon(ICON_PRIVATE, 0);

-		hIconUnverified = LoadIcon(ICON_UNVERIFIED, 0);

-

-		StatusIconData sid = {0};

-		sid.cbSize = sizeof(sid);

-		sid.szModule = MODULENAME;

-		sid.dwId = 0;

-		sid.hIcon = hIconFinished;

-		sid.hIconDisabled = hIconNotSecure;

-		sid.flags = MBF_DISABLED | MBF_HIDDEN;

-		sid.szTooltip = LANG_OTR_TOOLTIP;

-		Srmm_AddIcon(&sid);

 

-		sid.dwId = 1;

-		sid.hIcon = hIconPrivate;

-		sid.hIconDisabled = hIconUnverified;

-		Srmm_AddIcon(&sid);

+	hIconNotSecure = LoadIcon(ICON_NOT_PRIVATE, 0);

+	hIconFinished = LoadIcon(ICON_FINISHED, 0);

+	hIconPrivate = LoadIcon(ICON_PRIVATE, 0);

+	hIconUnverified = LoadIcon(ICON_UNVERIFIED, 0);

+

+	StatusIconData sid = { sizeof(sid) };

+	sid.szModule = MODULENAME;

+	sid.dwId = 0;

+	sid.hIcon = hIconFinished;

+	sid.hIconDisabled = hIconNotSecure;

+	sid.flags = MBF_DISABLED | MBF_HIDDEN;

+	sid.szTooltip = LANG_OTR_TOOLTIP;

+	Srmm_AddIcon(&sid);

+

+	sid.dwId = 1;

+	sid.hIcon = hIconPrivate;

+	sid.hIconDisabled = hIconUnverified;

+	Srmm_AddIcon(&sid);

 		

-		// hook the window events so that we can can change the status of the icon

-		

-		hEventIconPressed = HookEvent(ME_MSG_ICONPRESSED, SVC_IconPressed);

-	}

+	// hook the window events so that we can can change the status of the icon

+	HookEvent(ME_MSG_ICONPRESSED, SVC_IconPressed);

+

 	if (options.bHaveButtonsBar) {

 		ZeroMemory(&OTRButton, sizeof(OTRButton));

 		OTRButton.cbSize = sizeof(OTRButton);

@@ -275,14 +146,13 @@ void InitSRMM() {
 		HookEvent(ME_MSG_BUTTONPRESSED, SVC_ButtonsBarPressed);

 	}

 }

-void DeinitSRMM() {

-	if(options.bHaveSRMMIcons) {

-		UnhookEvent(hEventIconPressed);

-		ReleaseIcon(ICON_NOT_PRIVATE, 0);

-		ReleaseIcon(ICON_FINISHED, 0);

-		ReleaseIcon(ICON_PRIVATE, 0);

-		ReleaseIcon(ICON_UNVERIFIED, 0);

-		hIconNotSecure = hIconFinished = hIconPrivate = hIconUnverified =0;

-	}

+void DeinitSRMM()

+{

+	ReleaseIcon(ICON_NOT_PRIVATE, 0);

+	ReleaseIcon(ICON_FINISHED, 0);

+	ReleaseIcon(ICON_PRIVATE, 0);

+	ReleaseIcon(ICON_UNVERIFIED, 0);

+	hIconNotSecure = hIconFinished = hIconPrivate = hIconUnverified =0;

+

 	UninitMirOTRMenu();

 }
\ No newline at end of file