Changeset 21591 for trunk/src/shell32/systray_os2.c

Timestamp:

Mar 16, 2011, 4:52:43 PM (14 years ago)

Author:

dmik

Message:

shell32: Prepared to the xsystray integration (keeping the old Systray/WPS based implementation).

File:

• trunk/src/shell32/systray_os2.c (modified) (10 diffs)

trunk/src/shell32/systray_os2.c

@@ -6 +6 @@
  *  date: 1 May 2004
  *
- *  Notes: what's about HAB at lines 113, 118 ?
- *
  */
-
 
 #define  INCL_WIN
@@ -19 +16 @@
 #include <winconst.h>
 
+#include "systray_os2.h"
 
 #define WM_TRAYADDME (WM_USER+1)
@@ -28 +26 @@
 #define SZTOPIC     "TRAY"
 
-
-BOOL DoWin32PostMessage(HWND, ULONG, MPARAM, MPARAM);
-BOOL DoWin32CharToOem(const char *s, char *t);
-
 static HWND hwndTrayServer = 0;
 
-
-typedef struct _NOTIFYICONDATAA
-{   ULONG    cbSize;
-    HWND     hWnd;
-    ULONG    uID;
-    ULONG    uFlags;
-    ULONG    uCallbackMessage;
-    HPOINTER hIcon;
-    CHAR     szTip[64];
-} NOTIFYICONDATAA, *PNOTIFYICONDATAA;
-
-
-typedef struct SystrayItem {
-  HWND                  hWndFrame;
-  HWND                  hWndClient;
-  NOTIFYICONDATAA       notifyIcon;
-  struct SystrayItem    *nextTrayItem;
-} SystrayItem;
-
-
-
-
-static MRESULT EXPENTRY SYSTRAY_WndProc(HWND hWnd, ULONG msg, MPARAM mp1, MPARAM mp2)
+static MRESULT EXPENTRY SYSTRAY_Old_WndProc(HWND hWnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
     SystrayItem *ptrayItem = (SystrayItem *)WinQueryWindowULong(hWnd, QWL_USER);
@@ -111 +83 @@
 }
 
-//extern HAB hab;
-const char * const systraysupclass = "Odin32SystraySupport";
+static const char * const systraysupclass = "Odin32SystraySupport";
 
-BOOL SYSTRAY_RegisterClass(void)
+static BOOL SYSTRAY_Old_RegisterClass(void)
 {
-    //WinRegisterClass( hab, systraysupclass, SYSTRAY_WndProc, 0, sizeof(ULONG) );
-    WinRegisterClass(0, systraysupclass, SYSTRAY_WndProc, 0, sizeof(ULONG) );
+    //WinRegisterClass( hab, systraysupclass, SYSTRAY_Old_WndProc, 0, sizeof(ULONG) );
+    WinRegisterClass(0, systraysupclass, SYSTRAY_Old_WndProc, 0, sizeof(ULONG) );
     return TRUE;
 }
 
 
-BOOL SYSTRAY_ItemInit(SystrayItem *ptrayItem)
+static BOOL SYSTRAY_Old_ItemInit(SystrayItem *ptrayItem)
 {
     ULONG fcf = FCF_TITLEBAR;
 
-    if ( !SYSTRAY_RegisterClass() )
+    if ( !SYSTRAY_Old_RegisterClass() )
     {
         return FALSE;
@@ -152 +123 @@
 }
 
-void SYSTRAY_ItemTerm(SystrayItem *ptrayItem)
+static void SYSTRAY_Old_ItemTerm(SystrayItem *ptrayItem)
 {
     HPOINTER hIcon = (HPOINTER)WinSendMsg(ptrayItem->hWndFrame, WM_QUERYICON, NULL, NULL);
@@ -162 +133 @@
 
 
-void SYSTRAY_ItemSetMessage(SystrayItem *ptrayItem, ULONG uCallbackMessage)
+static void SYSTRAY_Old_ItemSetMessage(SystrayItem *ptrayItem, ULONG uCallbackMessage)
 {
   ptrayItem->notifyIcon.uCallbackMessage = uCallbackMessage;
@@ -168 +139 @@
 
 
-void SYSTRAY_ItemSetIcon(SystrayItem *ptrayItem, HPOINTER hIcon)
+static void SYSTRAY_Old_ItemSetIcon(SystrayItem *ptrayItem, HPOINTER hIcon)
 {
     // Windows seems to make a copy of icons displayed in the tray area. At
@@ -174 +145 @@
     // Shell_NotifyIcon() doesn't harm the icon displayed in the tray. Behave
     // similarly on OS/2 (some applications do call DestroyIcon()). The copy is
-    // deleted in SYSTRAY_ItemTerm().
+    // deleted in SYSTRAY_Old_ItemTerm().
 
     POINTERINFO Info;
@@ -193 +164 @@
 
 
-void SYSTRAY_ItemSetTip(SystrayItem *ptrayItem, CHAR* szTip, int modify)
+static void SYSTRAY_Old_ItemSetTip(SystrayItem *ptrayItem, CHAR* szTip, int modify)
 {
         char tmp[ 64 ];
@@ -204 +175 @@
 }
 
+
+BOOL SYSTRAY_Init(void)
+{
+    // try the new xsystray API first
+    if (SYSTRAY_Ex_Init())
+        return TRUE;
+
+    // fallback to the old API
+    SYSTRAY_ItemInit = SYSTRAY_Old_ItemInit;
+    SYSTRAY_ItemTerm = SYSTRAY_Old_ItemTerm;
+    SYSTRAY_ItemSetMessage = SYSTRAY_Old_ItemSetMessage;
+    SYSTRAY_ItemSetIcon = SYSTRAY_Old_ItemSetIcon;
+    SYSTRAY_ItemSetTip = SYSTRAY_Old_ItemSetTip;
+
+    return TRUE;
+}
+