local StdChat structure moved back to StdChat

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

1 files changed, 111 insertions, 127 deletions

diff --git a/include/m_chat_int.h b/include/m_chat_int.h
index 87f040ea48..b79d9a2d5c 100644
--- a/include/m_chat_int.h
+++ b/include/m_chat_int.h
@@ -28,80 +28,75 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #define OPTIONS_FONTCOUNT 17

 

-#define GC_UPDATETITLE			(WM_USER+100)

-#define GC_SPLITTERMOVED		(WM_USER+101)

-#define GC_CLOSEWINDOW			(WM_USER+103)

-#define GC_GETITEMDATA			(WM_USER+104)

-#define GC_SETITEMDATA			(WM_USER+105)

-#define GC_UPDATESTATUSBAR		(WM_USER+106)

-#define GC_SETVISIBILITY		(WM_USER+107)

-#define GC_SETWNDPROPS			(WM_USER+108)

-#define GC_REDRAWLOG			(WM_USER+109)

-#define GC_FIREHOOK				(WM_USER+110)

-#define GC_FILTERFIX			(WM_USER+111)

-#define GC_CHANGEFILTERFLAG		(WM_USER+112)

-#define GC_SHOWFILTERMENU		(WM_USER+113)

-#define GC_SETWINDOWPOS			(WM_USER+114)

-#define GC_SAVEWNDPOS			(WM_USER+115)

-//#define	GC_NICKLISTCLEAR		(WM_USER+117)

-#define GC_REDRAWWINDOW			(WM_USER+118)

-#define GC_SHOWCOLORCHOOSER		(WM_USER+119)

-#define GC_ADDLOG				(WM_USER+120)

-#define GC_ACKMESSAGE			(WM_USER+121)

-//#define GC_ADDUSER				(WM_USER+122)

-//#define GC_REMOVEUSER			(WM_USER+123)

-//#define GC_NICKCHANGE			(WM_USER+124)

-#define GC_UPDATENICKLIST		(WM_USER+125)

-//#define GC_MODECHANGE			(WM_USER+126)

-#define GC_TABCHANGE			(WM_USER+127)

-#define GC_ADDTAB				(WM_USER+128)

-#define GC_SCROLLTOBOTTOM		(WM_USER+129)

-#define GC_REMOVETAB			(WM_USER+130)

-#define GC_SESSIONNAMECHANGE	(WM_USER+131)

-#define GC_FIXTABICONS			(WM_USER+132)

-#define GC_DROPPEDTAB			(WM_USER+133)

-#define GC_TABCLICKED			(WM_USER+134)

-#define GC_SWITCHNEXTTAB		(WM_USER+135)

-#define GC_SWITCHPREVTAB		(WM_USER+136)

-#define GC_SWITCHTAB			(WM_USER+137)

-#define GC_SETTABHIGHLIGHT		(WM_USER+138)

-#define GC_SETMESSAGEHIGHLIGHT	(WM_USER+139)

-#define GC_REDRAWLOG2			(WM_USER+140)

-#define GC_REDRAWLOG3			(WM_USER+141)

-

-#define EM_SUBCLASSED			(WM_USER+200)

-#define EM_UNSUBCLASSED			(WM_USER+201)

-#define EM_ACTIVATE				(WM_USER+202)

-

-#define TIMERID_FLASHWND		205

-

-#define GCW_TABROOM				10

-#define GCW_TABPRIVMSG			11

-

-#define GC_EVENT_HIGHLIGHT		0x1000

-#define STATE_TALK				0x0001

-

-#define ICON_ACTION				0

-#define ICON_ADDSTATUS			1

-#define ICON_HIGHLIGHT			2

-#define ICON_INFO				3

-#define ICON_JOIN				4

-#define ICON_KICK				5

-#define ICON_MESSAGE			6

-#define ICON_MESSAGEOUT			7

-#define ICON_NICK				8

-#define ICON_NOTICE				9

-#define ICON_PART				10

-#define ICON_QUIT				11

-#define ICON_REMSTATUS			12

-#define ICON_TOPIC				13

-

-#define ICON_STATUS1			14

-#define ICON_STATUS2			15

-#define ICON_STATUS3			16

-#define ICON_STATUS4			17

-#define ICON_STATUS0			18

-#define ICON_STATUS5			19

+#define GC_UPDATETITLE         (WM_USER+100)

+#define GC_SPLITTERMOVED       (WM_USER+101)

+#define GC_CLOSEWINDOW         (WM_USER+103)

+#define GC_GETITEMDATA         (WM_USER+104)

+#define GC_SETITEMDATA         (WM_USER+105)

+#define GC_UPDATESTATUSBAR     (WM_USER+106)

+#define GC_SETVISIBILITY       (WM_USER+107)

+#define GC_SETWNDPROPS         (WM_USER+108)

+#define GC_REDRAWLOG           (WM_USER+109)

+#define GC_FIREHOOK            (WM_USER+110)

+#define GC_FILTERFIX           (WM_USER+111)

+#define GC_CHANGEFILTERFLAG    (WM_USER+112)

+#define GC_SHOWFILTERMENU      (WM_USER+113)

+#define GC_SETWINDOWPOS        (WM_USER+114)

+#define GC_SAVEWNDPOS          (WM_USER+115)

+#define GC_REDRAWWINDOW        (WM_USER+118)

+#define GC_SHOWCOLORCHOOSER    (WM_USER+119)

+#define GC_ADDLOG              (WM_USER+120)

+#define GC_ACKMESSAGE          (WM_USER+121)

+#define GC_UPDATENICKLIST      (WM_USER+125)

+#define GC_TABCHANGE           (WM_USER+127)

+#define GC_ADDTAB              (WM_USER+128)

+#define GC_SCROLLTOBOTTOM      (WM_USER+129)

+#define GC_REMOVETAB           (WM_USER+130)

+#define GC_SESSIONNAMECHANGE   (WM_USER+131)

+#define GC_FIXTABICONS         (WM_USER+132)

+#define GC_DROPPEDTAB          (WM_USER+133)

+#define GC_TABCLICKED          (WM_USER+134)

+#define GC_SWITCHNEXTTAB       (WM_USER+135)

+#define GC_SWITCHPREVTAB       (WM_USER+136)

+#define GC_SWITCHTAB           (WM_USER+137)

+#define GC_SETTABHIGHLIGHT     (WM_USER+138)

+#define GC_SETMESSAGEHIGHLIGHT (WM_USER+139)

+#define GC_REDRAWLOG2          (WM_USER+140)

+#define GC_REDRAWLOG3          (WM_USER+141)

+

+#define EM_SUBCLASSED          (WM_USER+200)

+#define EM_UNSUBCLASSED        (WM_USER+201)

+#define EM_ACTIVATE            (WM_USER+202)

+

+#define TIMERID_FLASHWND       205

+

+#define GCW_TABROOM            10

+#define GCW_TABPRIVMSG         11

+

+#define GC_EVENT_HIGHLIGHT     0x1000

+#define STATE_TALK             0x0001

+

+#define ICON_ACTION            0

+#define ICON_ADDSTATUS         1

+#define ICON_HIGHLIGHT         2

+#define ICON_INFO              3

+#define ICON_JOIN              4

+#define ICON_KICK              5

+#define ICON_MESSAGE           6

+#define ICON_MESSAGEOUT        7

+#define ICON_NICK              8

+#define ICON_NOTICE            9

+#define ICON_PART             10

+#define ICON_QUIT             11

+#define ICON_REMSTATUS        12

+#define ICON_TOPIC            13

+

+#define ICON_STATUS1          14

+#define ICON_STATUS2          15

+#define ICON_STATUS3          16

+#define ICON_STATUS4          17

+#define ICON_STATUS0          18

+#define ICON_STATUS5          19

 

 //structs

 

@@ -173,13 +168,6 @@ struct USERINFO
    USERINFO *next;

 };

 

-struct TABLIST

-{

-   TCHAR*  pszID;

-   char*   pszModule;

-   TABLIST *next;

-};

-

 struct SESSION_INFO

 {

    HWND        hWnd;

@@ -196,10 +184,6 @@ struct SESSION_INFO
    TCHAR*      ptszStatusbarText;

    TCHAR*      ptszTopic;

 

-   // I hate m3x, Unicode, IRC, chats etc...

-   char*    pszID;      // ugly fix for returning static ANSI strings in GC_INFO

-   char*    pszName;   // just to fix a bug quickly, should die after porting IRC to Unicode

-

    int         iType;

    int         iFG;

    int         iBG;

@@ -243,7 +227,7 @@ struct LOGSTREAMDATA
    char*         buffer;

    int           bufferOffset, bufferLen;

    HWND          hwnd;

-   LOGINFO*     lin;

+   LOGINFO*      lin;

    BOOL          bStripFormat;

    BOOL          bRedraw;

    SESSION_INFO *si;

@@ -301,77 +285,77 @@ struct GlobalLogSettingsBase
 

 struct CHAT_MANAGER

 {

-	void          (*SetActiveSession)(const TCHAR *pszID, const char* pszModule);

+	void          (*SetActiveSession)(const TCHAR *pszID, const char *pszModule);

 	void          (*SetActiveSessionEx)(SESSION_INFO *si);

 	SESSION_INFO* (*GetActiveSession)(void);

-	SESSION_INFO* (*SM_AddSession)(const TCHAR *pszID, const char* pszModule);

-	int           (*SM_RemoveSession)(const TCHAR *pszID, const char* pszModule, BOOL removeContact);

-	SESSION_INFO* (*SM_FindSession)(const TCHAR *pszID, const char* pszModule);

-	USERINFO*     (*SM_AddUser)(const TCHAR *pszID, const char* pszModule, const TCHAR* pszUID, const TCHAR* pszNick, WORD wStatus);

-	BOOL          (*SM_ChangeUID)(const TCHAR *pszID, const char* pszModule, const TCHAR* pszUID, const TCHAR* pszNewUID);

-	BOOL          (*SM_ChangeNick)(const TCHAR *pszID, const char* pszModule, GCEVENT *gce);

-	BOOL          (*SM_RemoveUser)(const TCHAR *pszID, const char* pszModule, const TCHAR* pszUID);

-	BOOL          (*SM_SetOffline)(const TCHAR *pszID, const char* pszModule);

+	SESSION_INFO* (*SM_AddSession)(const TCHAR *pszID, const char *pszModule);

+	int           (*SM_RemoveSession)(const TCHAR *pszID, const char *pszModule, BOOL removeContact);

+	SESSION_INFO* (*SM_FindSession)(const TCHAR *pszID, const char *pszModule);

+	USERINFO*     (*SM_AddUser)(const TCHAR *pszID, const char *pszModule, const TCHAR *pszUID, const TCHAR *pszNick, WORD wStatus);

+	BOOL          (*SM_ChangeUID)(const TCHAR *pszID, const char *pszModule, const TCHAR *pszUID, const TCHAR* pszNewUID);

+	BOOL          (*SM_ChangeNick)(const TCHAR *pszID, const char *pszModule, GCEVENT *gce);

+	BOOL          (*SM_RemoveUser)(const TCHAR *pszID, const char *pszModule, const TCHAR *pszUID);

+	BOOL          (*SM_SetOffline)(const TCHAR *pszID, const char *pszModule);

 	BOOL          (*SM_SetTabbedWindowHwnd)(SESSION_INFO *si, HWND hwnd);

 	HICON         (*SM_GetStatusIcon)(SESSION_INFO *si, USERINFO * ui);

-	BOOL          (*SM_SetStatus)(const TCHAR *pszID, const char* pszModule, int wStatus);

-	BOOL          (*SM_SetStatusEx)(const TCHAR *pszID, const char* pszModule, const TCHAR* pszText, int flags);

-	BOOL          (*SM_SendUserMessage)(const TCHAR *pszID, const char* pszModule, const TCHAR* pszText);

-	STATUSINFO*   (*SM_AddStatus)(const TCHAR *pszID, const char* pszModule, const TCHAR* pszStatus);

+	BOOL          (*SM_SetStatus)(const TCHAR *pszID, const char *pszModule, int wStatus);

+	BOOL          (*SM_SetStatusEx)(const TCHAR *pszID, const char *pszModule, const TCHAR* pszText, int flags);

+	BOOL          (*SM_SendUserMessage)(const TCHAR *pszID, const char *pszModule, const TCHAR* pszText);

+	STATUSINFO*   (*SM_AddStatus)(const TCHAR *pszID, const char *pszModule, const TCHAR *pszStatus);

 	SESSION_INFO* (*SM_GetNextWindow)(SESSION_INFO *si);

 	SESSION_INFO* (*SM_GetPrevWindow)(SESSION_INFO *si);

 	BOOL          (*SM_AddEventToAllMatchingUID)(GCEVENT *gce);

-	BOOL          (*SM_AddEvent)(const TCHAR *pszID, const char* pszModule, GCEVENT *gce, BOOL bIsHighlighted);

-	LRESULT       (*SM_SendMessage)(const TCHAR *pszID, const char* pszModule, UINT msg, WPARAM wParam, LPARAM lParam);

-	BOOL          (*SM_PostMessage)(const TCHAR *pszID, const char* pszModule, UINT msg, WPARAM wParam, LPARAM lParam);

-	BOOL          (*SM_BroadcastMessage)(const char* pszModule, UINT msg, WPARAM wParam, LPARAM lParam, BOOL bAsync);

+	BOOL          (*SM_AddEvent)(const TCHAR *pszID, const char *pszModule, GCEVENT *gce, BOOL bIsHighlighted);

+	LRESULT       (*SM_SendMessage)(const TCHAR *pszID, const char *pszModule, UINT msg, WPARAM wParam, LPARAM lParam);

+	BOOL          (*SM_PostMessage)(const TCHAR *pszID, const char *pszModule, UINT msg, WPARAM wParam, LPARAM lParam);

+	BOOL          (*SM_BroadcastMessage)(const char *pszModule, UINT msg, WPARAM wParam, LPARAM lParam, BOOL bAsync);

 	BOOL          (*SM_RemoveAll)(void);

-	BOOL          (*SM_GiveStatus)(const TCHAR *pszID, const char* pszModule, const TCHAR* pszUID, const TCHAR* pszStatus);

-	BOOL          (*SM_SetContactStatus)(const TCHAR *pszID, const char* pszModule, const TCHAR* pszUID, WORD pszStatus);

-	BOOL          (*SM_TakeStatus)(const TCHAR *pszID, const char* pszModule, const TCHAR* pszUID, const TCHAR* pszStatus);

-	BOOL          (*SM_MoveUser)(const TCHAR *pszID, const char* pszModule, const TCHAR* pszUID);

-	void          (*SM_AddCommand)(const TCHAR *pszID, const char* pszModule, const char* lpNewCommand);

-	char*         (*SM_GetPrevCommand)(const TCHAR *pszID, const char* pszModule);

-	char*         (*SM_GetNextCommand)(const TCHAR *pszID, const char* pszModule);

-	int           (*SM_GetCount)(const char* pszModule);

-	SESSION_INFO* (*SM_FindSessionByIndex)(const char* pszModule, int iItem);

+	BOOL          (*SM_GiveStatus)(const TCHAR *pszID, const char *pszModule, const TCHAR *pszUID, const TCHAR *pszStatus);

+	BOOL          (*SM_SetContactStatus)(const TCHAR *pszID, const char *pszModule, const TCHAR *pszUID, WORD pszStatus);

+	BOOL          (*SM_TakeStatus)(const TCHAR *pszID, const char *pszModule, const TCHAR *pszUID, const TCHAR *pszStatus);

+	BOOL          (*SM_MoveUser)(const TCHAR *pszID, const char *pszModule, const TCHAR *pszUID);

+	void          (*SM_AddCommand)(const TCHAR *pszID, const char *pszModule, const char* lpNewCommand);

+	char*         (*SM_GetPrevCommand)(const TCHAR *pszID, const char *pszModule);

+	char*         (*SM_GetNextCommand)(const TCHAR *pszID, const char *pszModule);

+	int           (*SM_GetCount)(const char *pszModule);

+	SESSION_INFO* (*SM_FindSessionByIndex)(const char *pszModule, int iItem);

 	char*         (*SM_GetUsers)(SESSION_INFO *si);

-	USERINFO*     (*SM_GetUserFromIndex)(const TCHAR *pszID, const char* pszModule, int index);

+	USERINFO*     (*SM_GetUserFromIndex)(const TCHAR *pszID, const char *pszModule, int index);

 

-	MODULEINFO*   (*MM_AddModule)(const char* pszModule);

-	MODULEINFO*   (*MM_FindModule)(const char* pszModule);

+	MODULEINFO*   (*MM_AddModule)(const char *pszModule);

+	MODULEINFO*   (*MM_FindModule)(const char *pszModule);

 	void          (*MM_FixColors)();

 	void          (*MM_FontsChanged)(void);

 	void          (*MM_IconsChanged)(void);

 	BOOL          (*MM_RemoveAll)(void);

 

-	STATUSINFO*   (*TM_AddStatus)(STATUSINFO** ppStatusList, const TCHAR* pszStatus, int* iCount);

-	STATUSINFO*   (*TM_FindStatus)(STATUSINFO* pStatusList, const TCHAR* pszStatus);

-	WORD          (*TM_StringToWord)(STATUSINFO* pStatusList, const TCHAR* pszStatus);

+	STATUSINFO*   (*TM_AddStatus)(STATUSINFO** ppStatusList, const TCHAR *pszStatus, int* iCount);

+	STATUSINFO*   (*TM_FindStatus)(STATUSINFO* pStatusList, const TCHAR *pszStatus);

+	WORD          (*TM_StringToWord)(STATUSINFO* pStatusList, const TCHAR *pszStatus);

 	TCHAR*        (*TM_WordToString)(STATUSINFO* pStatusList, WORD Status);

 	BOOL          (*TM_RemoveAll)(STATUSINFO** pStatusList);

 

 	BOOL          (*UM_SetStatusEx)(USERINFO* pUserList, const TCHAR* pszText, int onlyMe);

-	USERINFO*     (*UM_AddUser)(STATUSINFO* pStatusList, USERINFO** pUserList, const TCHAR* pszUID, const TCHAR* pszNick, WORD wStatus);

-	USERINFO*     (*UM_SortUser)(USERINFO** ppUserList, const TCHAR* pszUID);

-	USERINFO*     (*UM_FindUser)(USERINFO* pUserList, const TCHAR* pszUID);

+	USERINFO*     (*UM_AddUser)(STATUSINFO* pStatusList, USERINFO** pUserList, const TCHAR *pszUID, const TCHAR *pszNick, WORD wStatus);

+	USERINFO*     (*UM_SortUser)(USERINFO** ppUserList, const TCHAR *pszUID);

+	USERINFO*     (*UM_FindUser)(USERINFO* pUserList, const TCHAR *pszUID);

 	USERINFO*     (*UM_FindUserFromIndex)(USERINFO* pUserList, int index);

-	USERINFO*     (*UM_GiveStatus)(USERINFO* pUserList, const TCHAR* pszUID, WORD status);

-	USERINFO*     (*UM_SetContactStatus)(USERINFO* pUserList, const TCHAR* pszUID, WORD status);

-	USERINFO*     (*UM_TakeStatus)(USERINFO* pUserList, const TCHAR* pszUID, WORD status);

+	USERINFO*     (*UM_GiveStatus)(USERINFO* pUserList, const TCHAR *pszUID, WORD status);

+	USERINFO*     (*UM_SetContactStatus)(USERINFO* pUserList, const TCHAR *pszUID, WORD status);

+	USERINFO*     (*UM_TakeStatus)(USERINFO* pUserList, const TCHAR *pszUID, WORD status);

 	TCHAR*        (*UM_FindUserAutoComplete)(USERINFO* pUserList, const TCHAR* pszOriginal, const TCHAR* pszCurrent);

-	BOOL          (*UM_RemoveUser)(USERINFO** pUserList, const TCHAR* pszUID);

+	BOOL          (*UM_RemoveUser)(USERINFO** pUserList, const TCHAR *pszUID);

 	BOOL          (*UM_RemoveAll)(USERINFO** ppUserList);

 

 	LOGINFO*      (*LM_AddEvent)(LOGINFO** ppLogListStart, LOGINFO** ppLogListEnd);

 	BOOL          (*LM_TrimLog)(LOGINFO** ppLogListStart, LOGINFO** ppLogListEnd, int iCount);

 	BOOL          (*LM_RemoveAll)(LOGINFO** ppLogListStart, LOGINFO** ppLogListEnd);

 

-	HANDLE        (*AddRoom)(const char* pszModule, const TCHAR* pszRoom, const TCHAR* pszDisplayName, int iType);

+	HANDLE        (*AddRoom)(const char *pszModule, const TCHAR* pszRoom, const TCHAR* pszDisplayName, int iType);

 	BOOL          (*SetOffline)(HANDLE hContact, BOOL bHide);

 	BOOL          (*SetAllOffline)(BOOL bHide, const char *pszModule);

 	BOOL          (*AddEvent)(HANDLE hContact, HICON hIcon, HANDLE hEvent, int type, TCHAR* fmt, ...);

-	HANDLE        (*FindRoom)(const char* pszModule, const TCHAR* pszRoom);

+	HANDLE        (*FindRoom)(const char *pszModule, const TCHAR* pszRoom);

 	void          (*ShowRoom)(SESSION_INFO *si, WPARAM wp, BOOL bSetForeground);

 

 	char*         (*Log_CreateRTF)(LOGSTREAMDATA *streamData);