- three remaining clist services converted into functions (Clist_MenuProcessCommand, Clist_IsDocked, Clist_MenuProcessHotkey);

- old unused junk removed from CLIST_INTERFACE with its stubs;
- all unused clist services also removed with bunch of another crap like unused params

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

3 files changed, 60 insertions, 51 deletions

diff --git a/include/delphi/m_clistint.inc b/include/delphi/m_clistint.inc
index 3b40b71055..2568903f6c 100644
--- a/include/delphi/m_clistint.inc
+++ b/include/delphi/m_clistint.inc
@@ -392,7 +392,7 @@ type
 

   (* clistmod.c *)

     pfnIconFromStatusMode       : function (szProto:PAnsiChar; status:int; hContact:TMCONTACT):int; cdecl;

-    pfnShowHide                 : function (_para1:WPARAM; _para2:LPARAM):int; cdecl;

+    pfnShowHide                 : function :int; cdecl;

     pfnGetStatusModeDescription : function (mode:int; flags:int) : PWideChar; cdecl;

 

   (* clistsettings.c *)

@@ -431,11 +431,10 @@ type
   (* docking.c *)

     pfnDocking_ProcessWindowMessage : function (wParam:WPARAM; lParam:LPARAM):int; cdecl;

 

-  (* keyboard.c *)

-    pfnHotKeysRegister       : function (hwnd:HWND):int; cdecl;

-    pfnHotKeysUnregister     : procedure (hwnd:HWND); cdecl;

-    pfnHotKeysProcess        : function (hwnd:HWND; wParam:WPARAM; lParam:LPARAM):int; cdecl;

-    pfnHotkeysProcessMessage : function (wParam:WPARAM; lParam:LPARAM):int; cdecl;

+    blablabla1 : procedure; cdecl;

+    blablabla2 : procedure; cdecl;

+    blablabla3 : procedure; cdecl;

+    blablabla4 : procedure; cdecl;

 

   (*************************************************************************************

   * version 2 - events processing

diff --git a/include/m_clist.h b/include/m_clist.h
index 182682b359..ccd6820d49 100644
--- a/include/m_clist.h
+++ b/include/m_clist.h
@@ -44,11 +44,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // wParam = new status, from statusmodes.h

 // lParam = protocol name, NULL if for all protocols

 // also sent due to a ms_clist_setstatusmode call

+

 #define ME_CLIST_STATUSMODECHANGE       "CList/StatusModeChange"

 

 /////////////////////////////////////////////////////////////////////////////////////////

 // force a change of status mode

 // wParam = new status, from statusmodes.h

+

 #define MS_CLIST_SETSTATUSMODE			"CList/SetStatusMode"

 

 /////////////////////////////////////////////////////////////////////////////////////////

@@ -57,37 +59,44 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // returns the current status

 // This is the status *as set by the user*, not any protocol-specific status

 // All protocol modules will attempt to conform to this setting at all times

+

 #define MS_CLIST_GETSTATUSMODE			"CList/GetStatusMode"

 

 /////////////////////////////////////////////////////////////////////////////////////////

 // MAIN MENU

 

 // adds a new element into main menu

+

 EXTERN_C MIR_APP_DLL(HGENMENU) Menu_AddMainMenuItem(TMO_MenuItem *pmi);

 

 // gets a handle to the main Miranda menu

 // returns a HMENU. This need not to be freed since it's owned by clist

+

 EXTERN_C MIR_APP_DLL(HMENU) Menu_GetMainMenu(void);

 

 /////////////////////////////////////////////////////////////////////////////////////////

 // the main menu is about to be built

 // wParam = lParam = 0

+

 #define ME_CLIST_PREBUILDMAINMENU "CList/PreBuildMainMenu"

 

 /////////////////////////////////////////////////////////////////////////////////////////

 // CONTACT MENU

 

 // adds a new element into contact menu

+

 EXTERN_C MIR_APP_DLL(HGENMENU) Menu_AddContactMenuItem(TMO_MenuItem *pmi, const char *pszProto = NULL);

 

 // builds the context menu for a specific contact

 // returns a HMENU identifying the menu. This should be DestroyMenu()ed when

 // finished with.

+

 EXTERN_C MIR_APP_DLL(HMENU) Menu_BuildContactMenu(MCONTACT hContact);

 

 // the context menu for a contact is about to be built

 // modules should use this to change menu items that are specific to the

 // contact that has them

+

 #define ME_CLIST_PREBUILDCONTACTMENU "CList/PreBuildContactMenu"

 

 /////////////////////////////////////////////////////////////////////////////////////////

@@ -95,19 +104,23 @@ EXTERN_C MIR_APP_DLL(HMENU) Menu_BuildContactMenu(MCONTACT hContact);
 

 // get a handle to the Miranda status menu

 // returns a HMENU. This need not be freed since it's owned by clist

+

 EXTERN_C MIR_APP_DLL(HMENU) Menu_GetStatusMenu(void);

 

 // adds an item to a status menu

+

 EXTERN_C MIR_APP_DLL(HGENMENU) Menu_AddStatusMenuItem(TMO_MenuItem *pmi, const char *pszProto = NULL);

 

 // the status menu is about to be built

 // wParam = lParam = 0

+

 #define ME_CLIST_PREBUILDSTATUSMENU "CList/PreBuildStatusMenu"

 

 /////////////////////////////////////////////////////////////////////////////////////////

 // PROTOCOL MENU

 

 // adds an item to status or main menu, according to the option

+

 EXTERN_C MIR_APP_DLL(HGENMENU) Menu_AddProtoMenuItem(TMO_MenuItem *pmi, const char *pszProto = NULL);

 

 /////////////////////////////////////////////////////////////////////////////////////////

@@ -121,13 +134,16 @@ struct GroupMenuParam
 

 // builds the Group menu

 // returns a HMENU identifying the menu.

+

 EXTERN_C MIR_APP_DLL(HMENU) Menu_BuildGroupMenu(void);

 

 // adds a new item to the Group menus

+

 EXTERN_C MIR_APP_DLL(HGENMENU) Menu_AddGroupMenuItem(TMO_MenuItem *pmi, GroupMenuParam *gmp = NULL);

 

 // the Group menu is about to be built

 // wParam = lParam = 0

+

 #define ME_CLIST_PREBUILDGROUPMENU "CList/PreBuildGroupMenu"

 

 /////////////////////////////////////////////////////////////////////////////////////////

@@ -135,15 +151,18 @@ EXTERN_C MIR_APP_DLL(HGENMENU) Menu_AddGroupMenuItem(TMO_MenuItem *pmi, GroupMen
 

 // builds the SubGroup menu

 // returns a HMENU identifying the menu.

+

 EXTERN_C MIR_APP_DLL(HMENU) Menu_BuildSubGroupMenu(struct ClcGroup *group);

 

 // adds a new item to the SubGroup menus

 // wParam=GroupMenuParam*, params to call when exec menuitem

 // lParam=(LPARAM)(TMO_MenuItem*)&mi

+

 EXTERN_C MIR_APP_DLL(HGENMENU) Menu_AddSubGroupMenuItem(TMO_MenuItem *pmi, GroupMenuParam *gmp = NULL);

 

 // the SubGroup menu is about to be built

 // wParam = lParam = 0

+

 #define ME_CLIST_PREBUILDSUBGROUPMENU "CList/PreBuildSubGroupMenu"

 

 /////////////////////////////////////////////////////////////////////////////////////////

@@ -242,7 +261,9 @@ typedef struct {
 // wParam = lParam = 0

 // returns a HIMAGELIST

 // the members of this image list are opaque, and you should trust what you are given

+

 #define MS_CLIST_GETICONSIMAGELIST    "CList/GetIconsImageList"

+

 #define IMAGE_GROUPOPEN     11

 #define IMAGE_GROUPSHUT     12

 

@@ -251,24 +272,21 @@ typedef struct {
 // wParam = (MCONTACT)hContact

 // lParam = iconId

 // iconId is an offset into the clist's imagelist. See clist/geticonsimagelist

+

 #define ME_CLIST_CONTACTICONCHANGED   "CList/ContactIconChanged"

 

 /////////////////////////////////////////////////////////////////////////////////////////

-//processes a menu selection from a menu

-//wParam = MAKEWPARAM(LOWORD(wParam from WM_COMMAND), flags)

-//lParam = (LPARAM)(MCONTACT)hContact

-//returns TRUE if it processed the command, FALSE otherwise

-//hContact is the currently selected contact. It it not used if this is a main

-//menu command. If this is NULL and the command is a contact menu one, the

-//command is ignored

-

-#define CLISTMENUIDMIN	0x4000	  // reserved range for clist menu ids

-#define CLISTMENUIDMAX	0x7fff

-

+// processes a menu selection from a menu

+// wParam = MAKEWPARAM(LOWORD(wParam from WM_COMMAND), flags)

+// lParam = (LPARAM)(MCONTACT)hContact

+// returns TRUE if it processed the command, FALSE otherwise

+// hContact is the currently selected contact. It it not used if this is a main

+// menu command. If this is NULL and the command is a contact menu one, the

+// command is ignored

 /////////////////////////////////////////////////////////////////////////////////////////

 // Due to it is generic practice to handle menu command via WM_COMMAND

-// window message handle and practice to process it via calling service

-// in form: CallService(MS_CLIST_MENUPROCESSCOMMAND, MAKEWPARAM(LOWORD(wParam), MPCF_CONTACTMENU), (LPARAM) hContact))

+// window message handle and practice to process it via calling

+// Clist_MenuProcessCommand(LOWORD(wParam), MPCF_CONTACTMENU, hContact);

 // to ensure that WM_COMMAND was really from clist menu not from other menu

 // it is reserved range of menu ids from CLISTMENUIDMIN to CLISTMENUIDMAX

 // the menu items with ids outside from such range will not be processed by service.

@@ -276,12 +294,15 @@ typedef struct {
 // please be sure that you will not call service for non-clist menu items.

 // The simplest way is to ensure that your menus are not use item ids from such range.

 // Otherwise, you HAVE TO distinguish WM_COMMAND from clist menus and from youê internal menu and

-// DO NOT call MS_CLIST_MENUPROCESSCOMMAND for non clist menus.

+// DO NOT call Clist_MenuProcessCommand for non clist menus.

+

+#define CLISTMENUIDMIN	0x4000	  // reserved range for clist menu ids

+#define CLISTMENUIDMAX	0x7fff

 

 #define MPCF_CONTACTMENU   1	//test commands from a contact menu

 #define MPCF_MAINMENU      2	//test commands from the main menu

 

-#define MS_CLIST_MENUPROCESSCOMMAND "CList/MenuProcessCommand"

+EXTERN_C MIR_APP_DLL(BOOL) Clist_MenuProcessCommand(int menu_id, int flags, MCONTACT hContact);

 

 /////////////////////////////////////////////////////////////////////////////////////////

 // processes a menu hotkey

@@ -289,60 +310,44 @@ typedef struct {
 // lParam = MPCF_ flags

 // returns TRUE if it processed the command, FALSE otherwise

 // this should be called in WM_KEYDOWN

-#define MS_CLIST_MENUPROCESSHOTKEY "CList/MenuProcessHotkey"

 

-/////////////////////////////////////////////////////////////////////////////////////////

-// process all the messages required for docking

-// wParam = (WPARAM)(MSG*)&msg

-// lParam = (LPARAM)(LRESULT*)&lResult

-// returns TRUE if the message should not be processed further, FALSE otherwise

-// only msg.hwnd, msg.message, msg.wParam and msg.lParam are used

-// your wndproc should return lResult if and only if TRUE is returned

-#define MS_CLIST_DOCKINGPROCESSMESSAGE  "CList/DockingProcessMessage"

+EXTERN_C MIR_APP_DLL(BOOL) Clist_MenuProcessHotkey(unsigned hotkey);

 

 /////////////////////////////////////////////////////////////////////////////////////////

 // determines whether the contact list is docked

 // wParam = lParam = 0

 // returns nonzero if the contact list is docked, of 0 if it is not

-#define MS_CLIST_DOCKINGISDOCKED        "CList/DockingIsDocked"

 

-/////////////////////////////////////////////////////////////////////////////////////////

-// process all the messages required for hotkeys

-// wParam = (WPARAM)(MSG*)&msg

-// lParam = (LPARAM)(LRESULT*)&lResult

-// returns TRUE if the message should not be processed further, FALSE otherwise

-// only msg.hwnd, msg.message, msg.wParam and msg.lParam are used

-// your wndproc should return lResult if and only if TRUE is returned

-#define MS_CLIST_HOTKEYSPROCESSMESSAGE  "CList/HotkeysProcessMessage"

+EXTERN_C MIR_APP_DLL(BOOL) Clist_IsDocked(void);

 

 /////////////////////////////////////////////////////////////////////////////////////////

-// toggles the show/hide status of the contact list

-// wParam = lParam = 0

-// returns 0 on success, nonzero on failure

-#define MS_CLIST_SHOWHIDE "CList/ShowHide"

-

+// Clist-related buttons management

 /////////////////////////////////////////////////////////////////////////////////////////

 // toggles the use groups mode of the contact list

 // wParam = lParam = 0

 // returns new groups mode

+

 #define MS_CLIST_TOGGLEGROUPS "CList/ToggleGroups"

 

 /////////////////////////////////////////////////////////////////////////////////////////

 // toggles the empty groups display mode

 // wParam = lParam = 0

 // returns new empty groups mode

+

 #define MS_CLIST_TOGGLEEMPTYGROUPS "CList/ToggleEmptyGroups"

 

 /////////////////////////////////////////////////////////////////////////////////////////

 // toggles the hidden users display mode

 // wParam = lParam = 0

 // returns new hidden users mode

+

 #define MS_CLIST_TOGGLEHIDEOFFLINE "CList/ToggleHideOffline"

 

 /////////////////////////////////////////////////////////////////////////////////////////

 // toggles the hidden users display mode

 // wParam = lParam = 0

 // returns new hidden users mode

+

 #define MS_CLIST_TOGGLEHIDEOFFLINEROOT "CList/ToggleHideOfflineRoot"

 

 /////////////////////////////////////////////////////////////////////////////////////////

@@ -451,6 +456,7 @@ EXTERN_C MIR_APP_DLL(void) Clist_EndRebuild(void);
 // wParam = (MCONTACT)hContact

 // lParam = 0

 // returns 0 on success, nonzero on failure

+

 #define MS_CLIST_CONTACTDOUBLECLICKED "CList/ContactDoubleClicked"

 

 /////////////////////////////////////////////////////////////////////////////////////////

@@ -459,6 +465,7 @@ EXTERN_C MIR_APP_DLL(void) Clist_EndRebuild(void);
 // lParam = (LPARAM)(char**)ppFiles

 // returns 0 on success, nonzero on failure

 // ppFiles is an array of fully qualified filenames, ending with a NULL.

+

 #define MS_CLIST_CONTACTFILESDROPPED   "CList/ContactFilesDropped"

 

 /////////////////////////////////////////////////////////////////////////////////////////

@@ -467,6 +474,7 @@ EXTERN_C MIR_APP_DLL(void) Clist_EndRebuild(void);
 // lParam = (LPARAM)(MGROUP)hGroup

 // returns 0 on success, nonzero on failure

 // use hGroup = NULL to put the contact in no group

+

 #define MS_CLIST_CONTACTCHANGEGROUP   "CList/ContactChangeGroup"

 

 /////////////////////////////////////////////////////////////////////////////////////////

@@ -476,6 +484,7 @@ EXTERN_C MIR_APP_DLL(void) Clist_EndRebuild(void);
 // returns 0 if hContact1 is the same as hContact2

 // returns +1 if hContact2 should be displayed after hContact1

 // returns -1 if hContact1 should be displayed after hContact2

+

 #define MS_CLIST_CONTACTSCOMPARE      "CList/ContactsCompare"

 

 /////////////////////////////////////////////////////////////////////////////////////////

@@ -485,6 +494,7 @@ EXTERN_C MIR_APP_DLL(void) Clist_EndRebuild(void);
 // wParam = (MCONTACT)hContact

 // lParam = MAKELPARAM(screenX, screenY)

 // return nonzero to make the cursor a 'can drop here', or zero for 'no'

+

 #define ME_CLUI_CONTACTDRAGGING     "CLUI/ContactDragging"

 

 /////////////////////////////////////////////////////////////////////////////////////////

@@ -492,6 +502,7 @@ EXTERN_C MIR_APP_DLL(void) Clist_EndRebuild(void);
 // wParam = (MCONTACT)hContact

 // lParam = MAKELPARAM(screenX, screenY)

 // return nonzero if your hook processed this, so no other hooks get it

+

 #define ME_CLUI_CONTACTDROPPED      "CLUI/ContactDropped"

 

 /////////////////////////////////////////////////////////////////////////////////////////

@@ -499,6 +510,7 @@ EXTERN_C MIR_APP_DLL(void) Clist_EndRebuild(void);
 // wParam = (MCONTACT)hContact

 // lParam = 0

 // always returns zero

+

 #define ME_CLUI_CONTACTDRAGSTOP     "CLUI/ContactDragStop"

 

 /////////////////////////////////////////////////////////////////////////////////////////

@@ -518,7 +530,6 @@ EXTERN_C MIR_APP_DLL(void) Clist_EndRebuild(void);
 #define NIIF_NOSOUND        0x00000010

 #define NIIF_INTERN_UNICODE 0x00000100

 

-

 typedef struct {

 	int cbSize;			// sizeof(MIRANDASYSTRAY)

 	char *szProto;		// protocol to show under (may have no effect)

diff --git a/include/m_clistint.h b/include/m_clistint.h
index 749188c444..daa37cc59e 100644
--- a/include/m_clistint.h
+++ b/include/m_clistint.h
@@ -359,7 +359,7 @@ struct CLIST_INTERFACE
 

 	/* clistmod.c */

 	int    (*pfnIconFromStatusMode)(const char *szProto, int status, MCONTACT hContact);

-	int    (*pfnShowHide)(WPARAM, LPARAM);

+	int    (*pfnShowHide)(void);

 	

 	#define GSMDF_UNTRANSLATED 4 // don't tranlate the result

 	wchar_t* (*pfnGetStatusModeDescription)(int mode, int flags);

@@ -403,11 +403,10 @@ struct CLIST_INTERFACE
 	/* docking.c */

 	int (*pfnDocking_ProcessWindowMessage)(WPARAM wParam, LPARAM lParam);

 

-	/* keyboard.c */

-	int   (*pfnHotKeysRegister)(HWND hwnd);

-	void  (*pfnHotKeysUnregister)(HWND hwnd);

-	int   (*pfnHotKeysProcess)(HWND hwnd, WPARAM wParam, LPARAM lParam);

-	int   (*pfnHotkeysProcessMessage)(WPARAM wParam, LPARAM lParam);

+	int   (*blablabla1)();

+	int   (*blablabla2)();

+	int   (*blablabla3)();

+	int   (*blablabla4)();

 

 	/*************************************************************************************

 	 * version 2 - events processing