fix for status line icons processing in tabSRMM

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

1 files changed, 96 insertions, 95 deletions

diff --git a/plugins/TabSRMM/src/include/functions.h b/plugins/TabSRMM/src/include/functions.h
index 49ae0f79ab..4efdc9662e 100644
--- a/plugins/TabSRMM/src/include/functions.h
+++ b/plugins/TabSRMM/src/include/functions.h
@@ -11,7 +11,7 @@
  * This program is free software; you can redistribute it and/or

  * modify it under the terms of the GNU General Public License

  * as published by the Free Software Foundation; either version 2

- * of the License, or (at your option) any later version.

+ * of the License, or(at your option) any later version.

  *

  * This program is distributed in the hope that it will be useful,

  * but WITHOUT ANY WARRANTY; without even the implied warranty of

@@ -24,7 +24,7 @@
  *

  * part of tabSRMM messaging plugin for Miranda.

  *

- * (C) 2005-2009 by silvercircle _at_ gmail _dot_ com and contributors

+ *(C) 2005-2009 by silvercircle _at_ gmail _dot_ com and contributors

  *

  * $Id: functions.h 11636 2010-04-27 22:08:16Z silvercircle $

  *

@@ -35,79 +35,81 @@
 #ifndef _TABSRMM_FUNCTIONS_H

 #define _TABSRMM_FUNCTIONS_H

 

-int 				Chat_PreShutdown			();

-int 				Chat_ModulesLoaded			(WPARAM wp, LPARAM lp);

-int					AvatarChanged				(WPARAM wParam, LPARAM lParam);

-int					MyAvatarChanged				(WPARAM wParam, LPARAM lParam);

-int 				IcoLibIconsChanged			(WPARAM wParam, LPARAM lParam);

-int 				FontServiceFontsChanged		(WPARAM wParam, LPARAM lParam);

-int 				SmileyAddOptionsChanged		(WPARAM wParam, LPARAM lParam);

-int 				IEViewOptionsChanged		(WPARAM wParam, LPARAM lParam);

-void 				RegisterFontServiceFonts	();

-int 				ModPlus_PreShutdown			(WPARAM wparam, LPARAM lparam);

-int 				ModPlus_Init				(WPARAM wparam, LPARAM lparam);

-LONG_PTR CALLBACK 	HotkeyHandlerDlgProc		(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

+int   Chat_PreShutdown();

+int   Chat_ModulesLoaded(WPARAM wp, LPARAM lp);

+int   AvatarChanged(WPARAM wParam, LPARAM lParam);

+int   MyAvatarChanged(WPARAM wParam, LPARAM lParam);

+int   IcoLibIconsChanged(WPARAM wParam, LPARAM lParam);

+int   FontServiceFontsChanged(WPARAM wParam, LPARAM lParam);

+int   SmileyAddOptionsChanged(WPARAM wParam, LPARAM lParam);

+int   IEViewOptionsChanged(WPARAM wParam, LPARAM lParam);

+void  RegisterFontServiceFonts();

+int   ModPlus_PreShutdown(WPARAM wparam, LPARAM lparam);

+int   ModPlus_Init(WPARAM wparam, LPARAM lparam);

 

+LONG_PTR CALLBACK HotkeyHandlerDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

 

 /*

  * nen / event popup stuff

  */

 

-int			TSAPI	NEN_ReadOptions				(NEN_OPTIONS *options);

-int			TSAPI	NEN_WriteOptions			(NEN_OPTIONS *options);

-int			TSAPI	UpdateTrayMenu				(const TWindowData *dat, WORD wStatus, const char *szProto,

-												 const TCHAR *szStatus, HANDLE hContact, DWORD fromEvent);

-static int  TSAPI	PopupPreview				(NEN_OPTIONS *pluginOptions);

-void        TSAPI	DeletePopupsForContact		(HANDLE hContact, DWORD dwMask);

+int   TSAPI NEN_ReadOptions(NEN_OPTIONS *options);

+int   TSAPI NEN_WriteOptions(NEN_OPTIONS *options);

+int   TSAPI UpdateTrayMenu(const TWindowData *dat, WORD wStatus, const char *szProto, const TCHAR *szStatus, HANDLE hContact, DWORD fromEvent);

+int   TSAPI PopupPreview(NEN_OPTIONS *pluginOptions);

+void  TSAPI DeletePopupsForContact(HANDLE hContact, DWORD dwMask);

 

 /*

  * tray stuff

  */

 

-void		TSAPI	CreateSystrayIcon			(int create);

-void		TSAPI	FlashTrayIcon				(HICON hIcon);

-void		TSAPI	UpdateTrayMenuState			(TWindowData *dat, BOOL bForced);

-void        TSAPI	LoadFavoritesAndRecent		();

-void        TSAPI	AddContactToFavorites		(HANDLE hContact, const TCHAR *szNickname, const char *szProto, TCHAR *szStatus,

-												 WORD wStatus, HICON hIcon, BOOL mode, HMENU hMenu);

-void        TSAPI	CreateTrayMenus				(int mode);

-void        TSAPI	HandleMenuEntryFromhContact	(int iSelection);

+void  TSAPI CreateSystrayIcon(int create);

+void  TSAPI FlashTrayIcon(HICON hIcon);

+void  TSAPI UpdateTrayMenuState(TWindowData *dat, BOOL bForced);

+void  TSAPI LoadFavoritesAndRecent();

+void  TSAPI AddContactToFavorites(HANDLE hContact, const TCHAR *szNickname, const char *szProto, TCHAR *szStatus,

+                                     WORD wStatus, HICON hIcon, BOOL mode, HMENU hMenu);

+void  TSAPI CreateTrayMenus(int mode);

+void  TSAPI HandleMenuEntryFromhContact(int iSelection);

 

 /*

- * gneric msgwindow functions (creation, container management etc.)

+ * gneric msgwindow functions(creation, container management etc.)

  */

 

-BOOL		TSAPI	IsUtfSendAvailable			(HANDLE hContact);

-HWND		TSAPI	CreateNewTabForContact		(TContainerData *pContainer, HANDLE hContact, int isSend,

-												 const char *pszInitialText, BOOL bActivateTAb, BOOL bPopupContainer, BOOL bWantPopup, HANDLE hdbEvent);

-int			TSAPI	ActivateTabFromHWND			(HWND hwndTab, HWND hwnd);

-void		TSAPI	FlashContainer				(TContainerData *pContainer, int iMode, int iNum);

-void		TSAPI	CreateImageList				(BOOL bInitial);

+BOOL  TSAPI IsUtfSendAvailable(HANDLE hContact);

+HWND  TSAPI CreateNewTabForContact(TContainerData *pContainer, HANDLE hContact, int isSend,

+                                     const char *pszInitialText, BOOL bActivateTAb, BOOL bPopupContainer, BOOL bWantPopup, HANDLE hdbEvent);

+int   TSAPI ActivateTabFromHWND(HWND hwndTab, HWND hwnd);

+void  TSAPI FlashContainer(TContainerData *pContainer, int iMode, int iNum);

+void  TSAPI CreateImageList(BOOL bInitial);

+

 TContainerData* TSAPI FindMatchingContainer(const TCHAR *szName, HANDLE hContact);

-TContainerData* TSAPI CreateContainer		(const TCHAR *name, int iTemp, HANDLE hContactFrom);

-TContainerData* TSAPI FindContainerByName	(const TCHAR *name);

-int			TSAPI	GetTabIndexFromHWND			(HWND hwndTab, HWND hwnd);

-int			TSAPI	GetTabItemFromMouse			(HWND hwndTab, POINT *pt);

-int			TSAPI	ActivateTabFromHWND			(HWND hwndTab, HWND hwnd);

-void 		TSAPI	AdjustTabClientRect			(TContainerData *pContainer, RECT *rc);

-void 		TSAPI	ReflashContainer			(TContainerData *pContainer);

-HMENU 		TSAPI 	BuildMCProtocolMenu			(HWND hwndDlg);

+TContainerData* TSAPI CreateContainer(const TCHAR *name, int iTemp, HANDLE hContactFrom);

+TContainerData* TSAPI FindContainerByName(const TCHAR *name);

+

+int   TSAPI GetTabIndexFromHWND(HWND hwndTab, HWND hwnd);

+int   TSAPI GetTabItemFromMouse(HWND hwndTab, POINT *pt);

+int   TSAPI ActivateTabFromHWND(HWND hwndTab, HWND hwnd);

+void  TSAPI AdjustTabClientRect(TContainerData *pContainer, RECT *rc);

+void  TSAPI ReflashContainer(TContainerData *pContainer);

+HMENU TSAPI BuildMCProtocolMenu(HWND hwndDlg);

 

 TContainerData* TSAPI AppendToContainerList(TContainerData *pContainer);

 TContainerData* TSAPI RemoveContainerFromList(TContainerData *pContainer);

 

-void        TSAPI	DeleteContainer				(int iIndex);

-void		TSAPI	RenameContainer				(int iIndex, const TCHAR *newName);

-int			TSAPI	GetContainerNameForContact	(HANDLE hContact, TCHAR *szName, int iNameLen);

-HMENU		TSAPI	BuildContainerMenu			();

-void		TSAPI	BuildCodePageList			();

-void		TSAPI	PreTranslateDates			();

-void		TSAPI	ApplyContainerSetting		(TContainerData *pContainer, DWORD flags, UINT mode, bool fForceResize);

-void		TSAPI	BroadCastContainer			(const TContainerData *pContainer, UINT message, WPARAM wParam, LPARAM lParam, BYTE iType = 0);

-void		TSAPI	GetDefaultContainerTitleFormat();

-INT_PTR     MessageWindowOpened(WPARAM wParam, LPARAM lParam);

-void		TSAPI	SetAeroMargins				(TContainerData *pContainer);

-int         		TABSRMM_FireEvent			(HANDLE hContact, HWND hwnd, unsigned int type, unsigned int subType);

+void  TSAPI DeleteContainer(int iIndex);

+void  TSAPI RenameContainer(int iIndex, const TCHAR *newName);

+int   TSAPI GetContainerNameForContact(HANDLE hContact, TCHAR *szName, int iNameLen);

+HMENU TSAPI BuildContainerMenu();

+void  TSAPI BuildCodePageList();

+void  TSAPI PreTranslateDates();

+void  TSAPI ApplyContainerSetting(TContainerData *pContainer, DWORD flags, UINT mode, bool fForceResize);

+void  TSAPI BroadCastContainer(const TContainerData *pContainer, UINT message, WPARAM wParam, LPARAM lParam, BYTE iType = 0);

+void  TSAPI GetDefaultContainerTitleFormat();

+void  TSAPI SetAeroMargins(TContainerData *pContainer);

+int   TABSRMM_FireEvent(HANDLE hContact, HWND hwnd, unsigned int type, unsigned int subType);

+

+INT_PTR MessageWindowOpened(WPARAM wParam, LPARAM lParam);

 

 LRESULT CALLBACK IEViewSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);

 LRESULT CALLBACK HPPKFSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);

@@ -115,85 +117,84 @@ LRESULT CALLBACK HPPKFSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
 /*

  * skinning engine

  */

-void		TSAPI	DrawAlpha					(HDC hdcwnd, PRECT rc, DWORD basecolor, int alpha, DWORD basecolor2,

-												 BYTE transparent, BYTE FLG_GRADIENT, BYTE FLG_CORNER, DWORD BORDERSTYLE, CImageItem *imageItem);

+void  TSAPI DrawAlpha(HDC hdcwnd, PRECT rc, DWORD basecolor, int alpha, DWORD basecolor2,

+                                     BYTE transparent, BYTE FLG_GRADIENT, BYTE FLG_CORNER, DWORD BORDERSTYLE, CImageItem *imageItem);

 // the cached message log icons

 

-void		TSAPI	CacheMsgLogIcons			();

-void		TSAPI	CacheLogFonts				();

-void 		TSAPI	InitAPI						();

-void		TSAPI	LoadIconTheme				();

-int			TSAPI	LoadFromIconLib				();

-int 		TSAPI	SetupIconLibConfig			();

-void		TSAPI	RTF_CTableInit				();

+void  TSAPI CacheMsgLogIcons();

+void  TSAPI CacheLogFonts();

+void  TSAPI InitAPI();

+void  TSAPI LoadIconTheme();

+int   TSAPI LoadFromIconLib();

+int   TSAPI SetupIconLibConfig();

+void  TSAPI RTF_CTableInit();

 

 INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

+INT_PTR    CALLBACK DlgProcContainer(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

 

-int			TSAPI	InitOptions					(void);

-INT_PTR 	CALLBACK DlgProcContainer			(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

-int			TSAPI	DbEventIsShown				(TWindowData *dat, DBEVENTINFO *dbei);

-void		TSAPI	StreamInEvents				(HWND hwndDlg,HANDLE hDbEventFirst,int count,int fAppend, DBEVENTINFO *dbei_s);

-void		TSAPI	LoadLogfont					(int i,LOGFONTA *lf,COLORREF *colour, char *szModule);

-

+int   TSAPI InitOptions(void);

+int   TSAPI DbEventIsShown(TWindowData *dat, DBEVENTINFO *dbei);

+void  TSAPI StreamInEvents(HWND hwndDlg,HANDLE hDbEventFirst,int count,int fAppend, DBEVENTINFO *dbei_s);

+void  TSAPI LoadLogfont(int i,LOGFONTA *lf,COLORREF *colour, char *szModule);

 

 // custom tab control

 

-void		TSAPI	ReloadTabConfig				();

-void		TSAPI	FreeTabConfig				();

-int			TSAPI	RegisterTabCtrlClass		(void);

+void  TSAPI ReloadTabConfig();

+void  TSAPI FreeTabConfig();

+int   TSAPI RegisterTabCtrlClass(void);

 

 // buttons

 

-int			TSAPI	LoadTSButtonModule			(void);

-int			TSAPI	UnloadTSButtonModule		();

+int   TSAPI LoadTSButtonModule(void);

+int   TSAPI UnloadTSButtonModule();

 

 

 /*

  * debugging support

  */

 

-int         _DebugTraceW(const wchar_t *fmt, ...);

-int         _DebugTraceA(const char *fmt, ...);

-int         _DebugPopup(HANDLE hContact, const TCHAR *fmt, ...);

-int         _DebugMessage(HWND hwndDlg, struct TWindowData *dat, const char *fmt, ...);

+int   _DebugTraceW(const wchar_t *fmt, ...);

+int   _DebugTraceA(const char *fmt, ...);

+int   _DebugPopup(HANDLE hContact, const TCHAR *fmt, ...);

+int   _DebugMessage(HWND hwndDlg, struct TWindowData *dat, const char *fmt, ...);

 

 // themes

 

-const TCHAR* TSAPI	GetThemeFileName			(int iMode);

-void 		TSAPI	LoadLogfontFromINI			(int i, char *szKey, LOGFONTA *lf, COLORREF *colour, const char *szIniFilename);

-int			TSAPI	CheckThemeVersion			(const TCHAR *szIniFilename);

-void		TSAPI	WriteThemeToINI				(const TCHAR *szIniFilename, TWindowData *dat);

-void		TSAPI	ReadThemeFromINI			(const TCHAR *szIniFilename, TContainerData *dat, int noAdvanced, DWORD dwFlags);

+const TCHAR* TSAPI GetThemeFileName(int iMode);

+void  TSAPI LoadLogfontFromINI(int i, char *szKey, LOGFONTA *lf, COLORREF *colour, const char *szIniFilename);

+int   TSAPI CheckThemeVersion(const TCHAR *szIniFilename);

+void  TSAPI WriteThemeToINI(const TCHAR *szIniFilename, TWindowData *dat);

+void  TSAPI ReadThemeFromINI(const TCHAR *szIniFilename, TContainerData *dat, int noAdvanced, DWORD dwFlags);

 

 // compatibility

 

 // user prefs

 

-int			TSAPI	LoadLocalFlags				(HWND hwnd, TWindowData *dat);

+int   TSAPI LoadLocalFlags(HWND hwnd, TWindowData *dat);

 

 //TypingNotify

-int			TN_ModuleInit						();

-int			TN_OptionsInitialize				(WPARAM wParam, LPARAM lParam);

-int			TN_ModuleDeInit						();

-int			TN_TypingMessage					(WPARAM wParam, LPARAM lParam);

+int   TN_ModuleInit();

+int   TN_OptionsInitialize(WPARAM wParam, LPARAM lParam);

+int   TN_ModuleDeInit();

+int   TN_TypingMessage(WPARAM wParam, LPARAM lParam);

 

 // mod plus

 

-int			ChangeClientIconInStatusBar			(const TWindowData *dat);

+int   ChangeClientIconInStatusBar(const TWindowData *dat);

 

 // hotkeys

 

-LRESULT 	ProcessHotkeysByMsgFilter			(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, UINT_PTR ctrlId);

+LRESULT ProcessHotkeysByMsgFilter(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, UINT_PTR ctrlId);

 

-void 		TSAPI	DrawMenuItem				(DRAWITEMSTRUCT *dis, HICON hIcon, DWORD dwIdle);

+void TSAPI DrawMenuItem(DRAWITEMSTRUCT *dis, HICON hIcon, DWORD dwIdle);

 

 /*

  * dialog procedures

  */

 

-INT_PTR 	CALLBACK SelectContainerDlgProc		(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

-INT_PTR 	CALLBACK DlgProcContainerOptions	(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

-INT_PTR 	CALLBACK DlgProcAbout				(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

+INT_PTR CALLBACK SelectContainerDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

+INT_PTR CALLBACK DlgProcContainerOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

+INT_PTR CALLBACK DlgProcAbout(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

 

 

 #endif /* _TABSRMM_FUNCTIONS_H */