Changeset 2

Timestamp:

Oct 26, 2012, 12:07:29 AM (12 years ago)

Author:

Andy Willis

Message:

2.61

Location:

trunk

Files:

• common.c (modified) (3 diffs)
• h/lswitch.h (modified) (3 diffs)
• hook/lswhook.c (modified) (1 diff)
• lswitch.c (modified) (6 diffs)
• lswmain.c (modified) (1 diff)
• miniwdgt.c (added)
• taskbar.c (modified) (6 diffs)
• widget/lswidget.c (modified) (6 diffs)
• widget/xwph/center.h (modified) (51 diffs)

trunk/common.c ¶

@@ -163 +163 @@
 { MENUITEM mi={0},mi1={0};
   POINTL ptl;
-  SHORT sItemId,sItemNum,sLastId,k;
+  SHORT sItemId,sItemNum,sLastId;
   UCHAR ucBuf[64];
   HWND hwndSubmenu;
@@ -171 +171 @@
     sItemId = SHORT1FROMMR(WinSendMsg(plswData->hwndMenu,MM_ITEMIDFROMPOSITION,
                                       MPFROMSHORT(sItemNum-1),0));
-    sItemNum = SHORT1FROMMR(WinSendMsg(plswData->hwndMenu,MM_DELETEITEM,
+    sItemNum = SHORT1FROMMR(WinSendMsg(plswData->hwndMenu,
+                                       sItemId==CMD_XCENTERSUBMENU?MM_REMOVEITEM:MM_DELETEITEM,
                                        MPFROM2SHORT(sItemId,FALSE),0));
   }
@@ -249 +250 @@
     WinSendMsg(plswData->hwndMenu, MM_INSERTITEM, MPFROMP(&mi), MPFROMP(ucBuf));
   }
+#else
+  WinSetPresParam(plswData->pWidget->hwndContextMenu,PP_FONTNAMESIZE,7,"8.Helv");
+
+  if (bTaskBar && iMenuAtItem >= 0) {
+  // now set the old context menu as submenu;
+    WinSendMsg(plswData->hwndMenu, MM_INSERTITEM, MPFROMP(&mi1), MPFROMP(ucBuf));
+
+    mi.afAttribute = mi.hItem = 0;
+    mi.afStyle = MIS_TEXT | MIS_SUBMENU;
+    mi.id = CMD_XCENTERSUBMENU;
+    mi.hwndSubMenu = plswData->pWidget->hwndContextMenu;
+    WinLoadString(plswData->hab,plswData->hmodRes,STRID_XCENTERSUBMENU,sizeof(ucBuf),ucBuf);
+    sItemId = SHORT1FROMMR(WinSendMsg(plswData->hwndMenu, MM_INSERTITEM, MPFROMP(&mi),MPFROMP(ucBuf)));
+  }
 #endif
 
+  WinQueryPointerPos(HWND_DESKTOP,&ptl);
 #ifdef XWORKPLACE
-// now copy the old context menu as submenu;
-// this code adapted from XCenter winlist widget
-  if (bTaskBar) {
-    if (iMenuAtItem >= 0) {
-      WinSendMsg(plswData->hwndMenu, MM_INSERTITEM, MPFROMP(&mi1), MPFROMP(ucBuf));
-
-      hwndSubmenu = WinCreateMenu(plswData->hwndMenu, NULL);
-
-//      WinSetWindowUShort(hwndSubmenu,QWS_ID,CMD_XCENTERSUBMENU);
-
-      mi.afAttribute = mi.hItem = 0;
-      mi.afStyle = MIS_TEXT | MIS_SUBMENU;
-      mi.id = CMD_XCENTERSUBMENU;
-      mi.hwndSubMenu = hwndSubmenu;
-
-      WinLoadString(plswData->hab,plswData->hmodRes,STRID_XCENTERSUBMENU,sizeof(ucBuf),ucBuf);
-
-      sItemId = SHORT1FROMMR(WinSendMsg(plswData->hwndMenu, MM_INSERTITEM, MPFROMP(&mi),MPFROMP(ucBuf)));
-    } else
-      sItemId = 0;
-
-    if (sItemId != MIT_MEMERROR && sItemId != MIT_ERROR) {
-      sItemNum = SHORT1FROMMR(WinSendMsg(plswData->pWidget->hwndContextMenu,
-                                         MM_QUERYITEMCOUNT, 0, 0));
-
-      // loop through all entries in the original menu
-      for (k = 0; k < sItemNum; k++) {
-        sItemId = SHORT1FROMMR(WinSendMsg(plswData->pWidget->hwndContextMenu,
-                               MM_ITEMIDFROMPOSITION, MPFROMSHORT(k), 0));
-      // get this menu item into mi buffer
-        WinSendMsg(plswData->pWidget->hwndContextMenu, MM_QUERYITEM,
-                   MPFROM2SHORT(sItemId, FALSE), MPFROMP(&mi));
-        if (mi.id==ID_CRMI_PROPERTIES) mi.id = CMD_SHOWSETTINGS;
-      // query text of this menu entry into our buffer
-        WinSendMsg(plswData->pWidget->hwndContextMenu, MM_QUERYITEMTEXT,
-                   MPFROM2SHORT(sItemId, sizeof(ucBuf)-1), MPFROMP(ucBuf));
-      // add this entry to our new menu
-        mi.iPosition = MIT_END;
-        WinSendMsg(iMenuAtItem < 0 ? plswData->hwndMenu : hwndSubmenu,
-                   MM_INSERTITEM, MPFROMP(&mi), MPFROMP(ucBuf));
-      }
-    }
-  }
+  WinPopupMenu(HWND_DESKTOP, bTaskBar?plswData->hwndTaskBarClient:plswData->hwndPopClient,
+               (iMenuAtItem<0&&bTaskBar)?plswData->pWidget->hwndContextMenu:plswData->hwndMenu,
+               ptl.x, ptl.y,0, PU_HCONSTRAIN | PU_VCONSTRAIN | PU_MOUSEBUTTON1 | PU_MOUSEBUTTON2 | PU_KEYBOARD);
+#else
+  WinPopupMenu(HWND_DESKTOP, bTaskBar?plswData->hwndTaskBarClient:plswData->hwndPopClient,plswData->hwndMenu,
+               ptl.x, ptl.y,0, PU_HCONSTRAIN | PU_VCONSTRAIN | PU_MOUSEBUTTON1 | PU_MOUSEBUTTON2 | PU_KEYBOARD);
 #endif
-
-  WinQueryPointerPos(HWND_DESKTOP,&ptl);
-  WinPopupMenu(HWND_DESKTOP, bTaskBar?plswData->hwndTaskBarClient:plswData->hwndPopClient, plswData->hwndMenu, ptl.x, ptl.y,
-               0, PU_HCONSTRAIN | PU_VCONSTRAIN | PU_MOUSEBUTTON1 | PU_MOUSEBUTTON2 | PU_KEYBOARD);
 }
 

trunk/h/lswitch.h ¶

@@ -39 +39 @@
   #define WIDGETMODNAME "LSWIDGET.DLL"
 
-//to be used during the popup window initialization and by the hook functions
-extern PXCENTERWIDGET pWidget;
 //the widget DLL module handle
 extern HMODULE hmodWidgetDll;
@@ -47 +45 @@
 #define VERSIONMAJOR 2
 #define VERSIONMINOR 60
-#define REVISION 8
+#define REVISION 9
 
 #define LASTINIVERMAJOROK 2
 #define LASTINIVERMINOROK 60
 #define LASTINIREVISIONOK 8
+
+#define LASTHOOKVERMAJOROK 2
+#define LASTHOOKVERMINOROK 60
+#define LASTHOOKREVISIONOK 9
 
 typedef APIENTRY RESVERPROC(UCHAR *NameString,USHORT usLen);
@@ -359 +361 @@
 LONG EXPENTRY lswHookInit(LSWDATA *plswData);
 VOID EXPENTRY lswHookTerm(LSWDATA *plswData);
-LONG SwitcherInit(HAB hab, HMQ hmq, UCHAR *ucErrMsg, USHORT usMsgLen, PVOID *ppData);
-VOID SwitcherTerm(LSWDATA *plswData);
+ULONG EXPENTRY lswHookGetVersion(void);
+LONG SwitcherInit(HAB hab, HMQ hmq, UCHAR *ucErrMsg, USHORT usMsgLen, PVOID *ppData, USHORT usFunc);
+VOID SwitcherTerm(LSWDATA *plswData,USHORT usFunc);
 VOID APIENTRY lswExitProc(VOID);
 

trunk/hook/lswhook.c ¶

@@ -316 +316 @@
 }
 
-
+ULONG EXPENTRY lswHookGetVersion(void)
+{
+  return MAKEULONG(MAKEUSHORT(VERSIONMAJOR,VERSIONMINOR),MAKEUSHORT(REVISION,0));
+}
 

trunk/lswitch.c ¶

@@ -810 +810 @@
 
   case WM_CREATE: {
-#ifndef XWORKPLACE
     DosGetNamedSharedMem((PVOID*)&plswData,SHAREMEM_NAME,PAG_READ | PAG_WRITE);
-#else
-    plswData=pWidget->pUser;
-#endif
 
     WinStartTimer(plswData->hab, hwnd, 0, BUBBLETIMERINTERVAL);
@@ -841 +837 @@
 #ifndef XWORKPLACE
     WinSetWindowPtr(hwnd, 0, plswData);
+#else
+    WinSetWindowPtr(hwnd, 0, plswData->pWidget);
+#endif
     DosFreeMem(plswData);
-#else
-    WinSetWindowPtr(hwnd, 0, pWidget);
-#endif
+
   }
   case WM_SYSVALUECHANGED:
@@ -1037 +1034 @@
 
 
-LONG SwitcherInit(HAB hab, HMQ hmq, UCHAR *ucErrMsg, USHORT usMsgLen, PVOID *ppData)
-{ ULONG flFrameFlags;
+LONG SwitcherInit(HAB hab, HMQ hmq, UCHAR *ucErrMsg, USHORT usMsgLen, PVOID *ppData, USHORT usFunc)
+{ ULONG flFrameFlags,ulHookVer;
   LONG rc,rc1 = 0;
   LSWDATA *plswData;
-  UCHAR ucFName[CCHMAXPATH];
+  UCHAR ucFName[CCHMAXPATH], ucResLang,ucFound=0,ucLangStr[32];
   SWCNTRL swctl;
 
-
-  DosSetPriority(PRTYS_THREAD,PRTYC_TIMECRITICAL,+31,0);
-
-  if ((rc = DosAllocSharedMem((VOID*)&plswData,SHAREMEM_NAME,sizeof(LSWDATA),PAG_COMMIT | PAG_READ | PAG_WRITE))!=0) {
+// usFunc is 0 for app initialization, 1 and for widget phases 1 and 2 initialization
+  if (usFunc != 1)
+    DosSetPriority(PRTYS_THREAD,PRTYC_TIMECRITICAL,+31,0);
+
+  if (usFunc !=2) {
+//need to loop so that search handle is closed
+    while (FindResDll(ucFName, sizeof(ucFName), &ucResLang, ucLangStr, sizeof(ucLangStr)))
+      if (ucResLang!=0) ucFound=1;
+    if (!ucFound) {
+      strncpy(ucErrMsg,"Could not find resource DLL or resource DLL invalid",usMsgLen);
+      return 1;
+    }
+
+    ulHookVer = lswHookGetVersion();
+    if (LOUCHAR(LOUSHORT(ulHookVer)) < LASTHOOKVERMAJOROK ||
+                HIUCHAR(LOUSHORT(ulHookVer)) < LASTHOOKVERMINOROK ||
+                LOUCHAR(HIUSHORT(ulHookVer)) < LASTHOOKREVISIONOK) {
+      strncpy(ucErrMsg,"Wrong hook DLL version",usMsgLen);
+      return 1;
+    }
+
+    if (!WinRegisterClass(hab,LSWPOPUPCLASS,PopupWndProc,CS_SAVEBITS|CS_SYNCPAINT,sizeof(PLSWDATA))) {
+      strncpy(ucErrMsg,"WinRegisterClass(lswPopupClass)",usMsgLen);
+      return WinGetLastError(hab);
+    }
+
+    if ((rc = DosAllocSharedMem((VOID*)&plswData,SHAREMEM_NAME,sizeof(LSWDATA),PAG_COMMIT | PAG_READ | PAG_WRITE))!=0) {
+      strncpy(ucErrMsg,"DosAllocSharedMem",usMsgLen);
+      return rc;
+    }
+    memset(plswData,0,sizeof(LSWDATA));
+    *ppData = (PVOID)plswData;
+
 #ifdef XWORKPLACE
-    *ppData = NULL;
+    plswData->bWidget = TRUE;
 #endif
-    strncpy(ucErrMsg,"DosAllocSharedMem",usMsgLen);
-    return rc;
-  }
-
-  memset(plswData,0,sizeof(LSWDATA));
-
-#ifdef XWORKPLACE
-  plswData->bWidget = TRUE;
-//  plswData->hmodRes = hmodWidgetDll;
-  pWidget = (PXCENTERWIDGET)(*ppData);
-  pWidget->pUser = plswData;
+
+    plswData->hab = hab;
+    plswData->hmq = hmq;
+
+    GetIniFileName(ucFName,sizeof(ucFName));
+    if (LoadSettings(hab,ucFName,&plswData->Settings)!=0) rc1=LSWERRCANTLOADSETTINGS;
+    if (rc1==0 && !CheckSettings(&plswData->Settings)) rc1=LSWERROLDSETTINGS;
+
+    if (rc1 < 0) InitSettings(&plswData->Settings);
+  }
+
+  if (usFunc != 1) {
+    if (usFunc==2)
+      plswData=(PLSWDATA)(*ppData);
+
+    if ((plswData->hmodRes=LoadResource(plswData->Settings.ucLanguage, plswData, TRUE))==0) {
+      strncpy(ucErrMsg,"Could not load resources ",usMsgLen);
+      return 1;
+    }
+
+    if ((rc = DosCreateEventSem(SEMRUNNINGNAME,&plswData->hevRunning,0,0)) ||
+        (rc = DosCreateEventSem(SEMCTRLTABNAME,&plswData->hevCtrlTab,0,plswData->Settings.bUseCtrl))) {
+      strncpy(ucErrMsg,"DosCreateEventSem",usMsgLen);
+      return rc;
+    }
+
+    flFrameFlags = FCF_DLGBORDER;
+#ifndef XWORKPLACE
+    flFrameFlags |= FCF_TASKLIST | FCF_ICON;
 #endif
-
-  *ppData = (PVOID)plswData;
-
-  plswData->hab = hab;
-  plswData->hmq = hmq;
-
-  GetIniFileName(ucFName,sizeof(ucFName));
-  if (LoadSettings(hab,ucFName,&plswData->Settings)!=0) rc1=LSWERRCANTLOADSETTINGS;
-  if (rc1==0 && !CheckSettings(&plswData->Settings)) rc1=LSWERROLDSETTINGS;
-
-  if (rc1 < 0) InitSettings(&plswData->Settings);
-
-  if ((plswData->hmodRes=LoadResource(plswData->Settings.ucLanguage, plswData, TRUE))==0) {
-    strncpy(ucErrMsg,"Could not find resource DLL or resource DLL invalid",usMsgLen);
-    return 1;
-  }
-
-  if ((rc = DosCreateEventSem(SEMRUNNINGNAME,&plswData->hevRunning,0,0)) ||
-      (rc = DosCreateEventSem(SEMCTRLTABNAME,&plswData->hevCtrlTab,0,plswData->Settings.bUseCtrl))) {
-    strncpy(ucErrMsg,"DosCreateEventSem",usMsgLen);
-    return rc;
-  }
-
-  if (!WinRegisterClass(hab,LSWPOPUPCLASS,PopupWndProc,CS_SAVEBITS|CS_SYNCPAINT,sizeof(PLSWDATA))) {
-    strncpy(ucErrMsg,"WinRegisterClass(lswPopupClass)",usMsgLen);
-    return WinGetLastError(hab);
-  }
-
-  flFrameFlags = FCF_DLGBORDER;
-#ifndef XWORKPLACE
-  flFrameFlags |= FCF_TASKLIST | FCF_ICON;
-#endif
-  plswData->hwndPopup = WinCreateStdWindow(HWND_DESKTOP,0,&flFrameFlags,
+    plswData->hwndPopup = WinCreateStdWindow(HWND_DESKTOP,0,&flFrameFlags,
                           LSWPOPUPCLASS,"",
                           0,0,ID_POPUPWIN,&plswData->hwndPopClient);
 
-  if (plswData->hwndPopup==NULLHANDLE) {
-    strncpy(ucErrMsg,"WinCreateStdWin(lswPopupWin)",usMsgLen);
-    return WinGetLastError(hab);
-  }
-
-  WinSetWindowPos(plswData->hwndPopup,HWND_BOTTOM, POPUPWINHIDEPOSX, POPUPWINHIDEPOSY,
-                  0, 0, SWP_MOVE | SWP_SIZE | SWP_SHOW | SWP_DEACTIVATE | SWP_ZORDER);
-
-  WinSetWindowPtr(plswData->hwndPopup, 0, (VOID *)WinSubclassWindow(plswData->hwndPopup, FrameWndProc));
-
-  if ((plswData->itidFSDispat = _beginthread(FSMonDispat,NULL,0x4000,plswData))<0) {
-    strncpy(ucErrMsg,"_beginthread",usMsgLen);
-    return plswData->itidFSDispat;
-  }
-
-  if ((rc = lswHookInit(plswData)) < 0) {
-    strncpy(ucErrMsg,"lswHookInit",usMsgLen);
-    return (-rc);
-  } else if (LOUCHAR(LOUSHORT(rc)) < LASTINIVERMAJOROK ||
-             HIUCHAR(LOUSHORT(rc)) < LASTINIVERMINOROK ||
-             LOUCHAR(HIUSHORT(rc)) < LASTINIREVISIONOK) {
-    strncpy(ucErrMsg,"Wrong hook DLL version",usMsgLen);
-    return 1;
-  }
+    if (plswData->hwndPopup==NULLHANDLE) {
+      strncpy(ucErrMsg,"WinCreateStdWin(lswPopupWin)",usMsgLen);
+      return WinGetLastError(hab);
+    }
+
+    WinSetWindowPos(plswData->hwndPopup,HWND_BOTTOM, POPUPWINHIDEPOSX, POPUPWINHIDEPOSY,
+                    0, 0, SWP_MOVE | SWP_SIZE | SWP_SHOW | SWP_DEACTIVATE | SWP_ZORDER);
+
+    WinSetWindowPtr(plswData->hwndPopup, 0, (VOID *)WinSubclassWindow(plswData->hwndPopup, FrameWndProc));
+
+    if ((plswData->itidFSDispat = _beginthread(FSMonDispat,NULL,0x4000,plswData))<0) {
+      strncpy(ucErrMsg,"_beginthread",usMsgLen);
+      return plswData->itidFSDispat;
+    }
+
+    if ((rc = lswHookInit(plswData)) < 0) {
+      strncpy(ucErrMsg,"lswHookInit",usMsgLen);
+      return (-rc);
+    } 
 
 #ifndef XWORKPLACE
-  plswData->hswitch = WinQuerySwitchHandle(plswData->hwndPopup, 0);
-  WinQuerySwitchEntry(plswData->hswitch, &swctl);
-  swctl.uchVisibility = plswData->Settings.bShowInWinList ? SWL_VISIBLE : SWL_INVISIBLE;
-  WinChangeSwitchEntry(plswData->hswitch, &swctl);
-
-  if (plswData->Settings.bTaskBarOn)
-    if ((rc = InitTaskBar(plswData,ucErrMsg,usMsgLen)) != 0)
+    plswData->hswitch = WinQuerySwitchHandle(plswData->hwndPopup, 0);
+    WinQuerySwitchEntry(plswData->hswitch, &swctl);
+    swctl.uchVisibility = plswData->Settings.bShowInWinList ? SWL_VISIBLE : SWL_INVISIBLE;
+    WinChangeSwitchEntry(plswData->hswitch, &swctl);
+
+    if (plswData->Settings.bTaskBarOn)
+      if ((rc = InitTaskBar(plswData,ucErrMsg,usMsgLen)) != 0)
+        return rc;
+
+    if ((rc = DosExitList(EXLST_ADD, (PFNEXITLIST)lswExitProc)) !=0 ) {
+      strncpy(ucErrMsg,"DosExitList",usMsgLen);
       return rc;
-
-  if ((rc = DosExitList(EXLST_ADD, (PFNEXITLIST)lswExitProc)) !=0 ) {
-    strncpy(ucErrMsg,"DosExitList",usMsgLen);
-    return rc;
-  }
+    }
 #else
-  if (pWidget->pGlobals!=NULL) plswData->hswitch = WinQuerySwitchHandle(pWidget->pGlobals->hwndFrame, 0);
+    if (plswData->pWidget->pGlobals!=NULL) plswData->hswitch = WinQuerySwitchHandle(plswData->pWidget->pGlobals->hwndFrame, 0);
 #endif
+  }
 
   return rc1;
@@ -1146 +1154 @@
 
 
-VOID SwitcherTerm(LSWDATA *plswData)
+VOID SwitcherTerm(LSWDATA *plswData,USHORT usFunc)
 {
-
-  lswHookTerm(plswData);
-
-  DosPostEventSem(plswData->hevRunning);
-
-  DosSleep(500);
+// usFunc is 0 for app termination, 1 and for widget phases 1 and 2 termination
+
+  if (usFunc!=2) {
+    lswHookTerm(plswData);
+
+    DosPostEventSem(plswData->hevRunning);
+    DosSleep(500);
 
 #ifndef XWORKPLACE
-  DoneTaskBar(plswData);
+    DoneTaskBar(plswData);
 #endif
 
-  DosCloseEventSem(plswData->hevShift);
-  DosCloseEventSem(plswData->hevPopup);
-  DosCloseEventSem(plswData->hevRunning);
-  DosCloseEventSem(plswData->hevCtrlTab);
-
-  WinDestroyWindow(plswData->hwndPopup);
-  if (plswData->bSettingsDlgOn) WinDestroyWindow(plswData->hwndParamDlg);
-
-  DosFreeModule(plswData->hmodRes);
+    DosCloseEventSem(plswData->hevShift);
+    DosCloseEventSem(plswData->hevPopup);
+    DosCloseEventSem(plswData->hevRunning);
+    DosCloseEventSem(plswData->hevCtrlTab);
+
+    WinDestroyWindow(plswData->hwndPopup);
+    if (plswData->bSettingsDlgOn) WinDestroyWindow(plswData->hwndParamDlg);
+
+    DosFreeModule(plswData->hmodRes);
+  }
 
 #ifndef XWORKPLACE
@@ -1173 +1183 @@
   WinTerminate(plswData->hab);
 #endif
-  DosFreeMem(plswData);
+
+  if (usFunc!=1)
+    DosFreeMem(plswData);
 }
 
@@ -1182 +1194 @@
   DosGetNamedSharedMem((PVOID*)&plswData,SHAREMEM_NAME,PAG_READ | PAG_WRITE);
 
-  if (plswData!=NULL) SwitcherTerm(plswData);
+  if (plswData!=NULL) SwitcherTerm(plswData,0);
 
   DosExitList(EXLST_EXIT, (PFNEXITLIST)lswExitProc);

trunk/lswmain.c ¶

@@ -63 +63 @@
   }
 
-  lErrCode=SwitcherInit(hab, hmq, ucMsg, sizeof(ucMsg), (PPVOID)(&plswData));
+  lErrCode=SwitcherInit(hab, hmq, ucMsg, sizeof(ucMsg), (PPVOID)(&plswData),0);
   if (lErrCode > 0) {
     WinLoadString(hab,plswData->hmodRes,MSG_ERROR,sizeof(ucErrStr),ucErrStr);

trunk/taskbar.c ¶

@@ -549 +549 @@
 
   case WM_CREATE: {
-#ifndef XWORKPLACE
+#ifdef XWORKPLACE
+    VOID *pData;
+    PXCENTERWIDGET pWidget;
+    LONG lrc;
+#endif
     DosGetNamedSharedMem((PVOID*)&plswData,SHAREMEM_NAME,PAG_READ | PAG_WRITE);
     if (plswData==NULL) {
@@ -556 +560 @@
     }
     WinSetWindowPtr(hwnd, 0, plswData);
-    DosFreeMem(plswData);
-#else
-    VOID *pData;
-    PXCENTERWIDGET pWidget;
-    LONG lrc;
-
+#ifdef XWORKPLACE
     pWidget = (PXCENTERWIDGET)mp1;
     if (pWidget==NULL || pWidget->pfnwpDefWidgetProc==NULL) {
@@ -568 +567 @@
     }
 
-    pData = (PVOID)pWidget;
-    lrc = SwitcherInit(WinQueryAnchorBlock(hwnd), 0, NULL, 0, &pData);
+    pWidget->pUser=plswData;
+    plswData->pWidget = pWidget; plswData->hwndTaskBarClient = hwnd;
+
+    pData = (PVOID)plswData;
+    lrc = SwitcherInit(plswData->hab, 0, NULL, 0, &pData, 2);
     if (lrc > 0) {
-      if (pData != NULL) SwitcherTerm((PLSWDATA)pData);
+      if (pData != NULL) SwitcherTerm(plswData,1);
       mrc = (MRESULT)TRUE;
       break;
@@ -577 +579 @@
     }
 
-    plswData = (PLSWDATA)pData; pWidget->pUser=plswData;
-    plswData->pWidget = pWidget; plswData->hwndTaskBarClient = hwnd;
-
     WinSetWindowPtr(hwnd, 0, pWidget);
 #endif
 
-    WinStartTimer(WinQueryAnchorBlock(hwnd), hwnd, 0, BUBBLETIMERINTERVAL);
+    DosFreeMem(plswData);
+    WinStartTimer(plswData->hab, hwnd, 0, BUBBLETIMERINTERVAL);
     WinPostMsg(hwnd,LSWM_INITBUTTONS,0,0);
   }
@@ -618 +618 @@
 #ifdef XWORKPLACE
     DefWgtWndProc=plswData->pWidget->pfnwpDefWidgetProc;
-    SwitcherTerm(plswData);
+    SwitcherTerm(plswData,1);
     return DefWgtWndProc(hwnd, msg, mp1, mp2);
 #endif
@@ -814 +814 @@
       WinPostMsg(plswData->hwndPopClient,msg,mp1,mp2);
 #ifdef XWORKPLACE
-    else
+    else 
       mrc=plswData->pWidget->pfnwpDefWidgetProc(hwnd, msg, mp1, mp2);
 #endif

trunk/widget/lswidget.c ¶

@@ -58 +58 @@
   "lSwitcher",                // widget class name displayed to user
   WGTF_UNIQUEPERXCENTER,      // widget class flags
-  NULL//lswShowSettings          // no settings dialog
+  lswShowSettings          // no settings dialog
 };
 
 
 //global variable used by lSwitcher code
-//to be used during the popup window initialization
-PXCENTERWIDGET pWidget;
 //the widget DLL module handle
 HMODULE hmodWidgetDll;
@@ -92 +90 @@
 
 VOID EXPENTRY lswShowSettings(PWIDGETSETTINGSDLGDATA pData)
-{
+{ LSWDATA *plswData;
+
+  DosGetNamedSharedMem((PVOID*)&plswData,SHAREMEM_NAME,PAG_READ | PAG_WRITE);
 /*    HWND hwnd = WinLoadDlg(HWND_DESKTOP,         // parent
                            pData->hwndOwner,
@@ -105 +105 @@
         WinDestroyWindow(hwnd);
     }*/
-  WinDlgBox(HWND_DESKTOP, HWND_DESKTOP, ParmDlgProc,
-            hmodWidgetDll, DLG_PARAMS, (PLSWDATA)pWidget->pUser);
+  if (plswData!=NULL)
+    WinDlgBox(HWND_DESKTOP, HWND_DESKTOP, ParmDlgProc,
+              plswData->hmodRes, DLG_PARAMS, plswData);
+  DosFreeMem(plswData);
 }
 
@@ -168 +170 @@
                              PSZ pszErrorMsg)  // if 0 is returned, 500 bytes of error msg
 { PVOID pData;
-  PXCENTERWIDGET pWidget;
   LONG lrc;
 
@@ -177 +178 @@
 
   hmodWidgetDll = hmodPlugin;
-
-  pWidget = malloc(sizeof(XCENTERWIDGET));
-  if (pWidget == NULL) {
-    strcpy(pszErrorMsg,"Memory allocation error");
-    return 0;
-  }
-
-  pWidget->pGlobals = NULL;
-
-  pData = (PXCENTERWIDGET)pWidget;
-  lrc = SwitcherInit(hab, 0, pszErrorMsg, 500, &pData);
-  if (pData != NULL) SwitcherTerm((PLSWDATA)pData);
-  free(pWidget);
+  lrc = SwitcherInit(hab, 0, pszErrorMsg, 500, &pData, 1);
 
   if (lrc > 0) return 0;
@@ -217 +206 @@
 
 VOID EXPENTRY WgtUnInitModule(VOID)
-{
+{ LSWDATA *plswData;
+
+  DosGetNamedSharedMem((PVOID*)&plswData,SHAREMEM_NAME,PAG_READ | PAG_WRITE);
+
+  if (plswData!=NULL) SwitcherTerm(plswData,2);
+
+  DosFreeMem(plswData);
 }
 

trunk/widget/xwph/center.h ¶

@@ -2 +2 @@
 /*
  *@@sourcefile center.h:
- *      public header file for the XCenter.
+ *      public header file for the XCenter and plugins.
+ *
  *      This contains all declarations which are needed by
  *      all parts of the XCenter and to implement widget
@@ -8 +9 @@
  *
  *      WARNING: The XCenter is still work in progress. The
- *      definitions in this file are still subject to change.
+ *      definitions in this file are still subject to change,
+ *      even though I try to maintain backwards compatibility.
  *
  *      If you are looking at this file from the "toolkit\shared"
@@ -19 +21 @@
 
 /*
- *      Copyright (C) 2000-2001 Ulrich M”ller.
+ *      Copyright (C) 2000-2002 Ulrich M”ller.
  *      This file is part of the XWorkplace source package.
  *      XWorkplace is free software; you can redistribute it and/or modify
@@ -41 +43 @@
 
     // PM window class name for XCenter client (needed by XWPDaemon)
-    #define WC_XCENTER_CLIENT     "XWPCenterClient"
+    // #define WC_XCENTER_CLIENT     "XWPCenterClient"
+        // moved this to kernel.h because xwpdaemn.c includes this too
+        // and we don't want the stupid daemon to be recompiled every
+        // time this header changes
+        // V0.9.13 (2001-06-19) [umoeller]
 
     // button types (src\xcenter\w_objbutton.c)
@@ -47 +53 @@
     #define BTF_XBUTTON         2
 
-    // position flags (XCENTERGLOBALS.ulPosition)
-    #define XCENTER_BOTTOM          0
-    #define XCENTER_TOP             1
-
-    // display style (XCENTERGLOBALS.flDisplayStyle)
-    #define XCS_FLATBUTTONS         0x0001
-    #define XCS_SUNKBORDERS         0x0002
-    #define XCS_SIZINGBARS          0x0004
-    #define XCS_ALL3DBORDERS        0x0008
-
     /*
      *@@ XCENTERGLOBALS:
      *      global data for a running XCenter instance.
-     *      A pointer to this structure exists in each
+     *      This is created once per open XCenter.
+     *
+     *      A pointer to this one structure exists in each
      *      XCENTERWIDGET instance so that the widgets
-     *      can access some of the global data.
+     *      can access some of the data of the XCenter
+     *      they belong to.
      *
      *      In this structure, an XCenter instance
@@ -70 +69 @@
      *      is fully initialized at the time the widgets
      *      are created, but values may change while the
-     *      XCenter is open.
+     *      XCenter is open (e.g. if the user changes
+     *      view settings in the XCenter settings notebook).
      *
      *      "Globals" isn't really a good name since
@@ -82 +82 @@
     {
         HAB                 hab;
-                    // anchor block of frame and client (constant)
+                    // anchor block of the XCenter thread and thus
+                    // all XCenter windows (including widgets)
         HWND                hwndFrame,
-                    // XCenter frame window (constant)
+                    // be XCenter frame window (constant)
                             hwndClient;
-                    // client (child of XCenter frame) (constant)
+                    // XCenter client (child of XCenter frame) (constant)
 
         PVOID               pCountrySettings;
-                    // country settings; this points to a COUNTRYSETTINGS
-                    // structure (prfh.h) (constant)
+                    // country settings; this really points to a
+                    // COUNTRYSETTINGS structure (include\helpers\prfh.h)
+                    // and might be useful if you want to use settings
+                    // from the "Country" object (constant)
 
         ULONG               cyInnerClient;
@@ -97 +100 @@
                     // resized the XCenter, but it will always be >= cyWidgetMax.
                     // The "inner client" plus the 3D border width plus the
-                    // border spacing make up the full height of the client.
+                    // border spacing make up the full height of the XCenter.
 
                     // This can change while the XCenter is open.
@@ -121 +124 @@
                     // Can be changed by the user while the XCenter is open.
                     // These flags can be any combination of the following:
+
+                    #define XCS_FLATBUTTONS         0x0001
                     // -- XCS_FLATBUTTONS: paint buttons flat. If not set,
                     //      paint them raised.
+
+                    #define XCS_SUNKBORDERS         0x0002
                     // -- XCS_SUNKBORDERS: paint static controls (e.g. CPU meter)
                     //      with a "sunk" 3D frame. If not set, do not.
+
+                    #define XCS_SIZINGBARS          0x0004
                     // -- XCS_SIZINGBARS: XCenter should automatically paint
                     //      sizing bars for sizeable widgets.
+
+                    #define XCS_ALL3DBORDERS        0x0008
                     // -- XCS_ALL3DBORDERS: XCenter should draw all four 3D
                     //      borders around itself. If not set, it will only
                     //      draw one border (the one towards the screen).
 
+                    #define XCS_SPACINGLINES        0x0010      // added V0.9.13 (2001-06-19) [umoeller]
+                    // -- XCS_SPACINGLINES: XCenter should draw small 3D lines
+                    //      between the widgets too (V0.9.13 (2001-06-19) [umoeller]).
+
+                    #define XCS_NOHATCHINUSE        0x0020      // added V0.9.16 (2001-10-24) [umoeller]
+                    // -- XCS_NOHATCHINUSE: XCenter should not add hatching to
+                    //      object widgets which represent open objects
+                    //      (V0.9.16 (2001-10-24) [umoeller])
+
         ULONG               ulPosition;
                     // XCenter position on screen, if a widget cares...
-                    // Can be changed by the user while the XCenter is open.
+                    // can be changed by the user while the XCenter is open.
                     // This is _one_ of the following:
-                    // -- XCENTER_BOTTOM
-                    // -- XCENTER_TOP
+                    #define XCENTER_BOTTOM          0
+                    #define XCENTER_TOP             1
                     // Left and right are not yet supported.
 
         ULONG               ul3DBorderWidth;
-                    // 3D border width; can change
+                    // 3D border width; can be changed by user at any time
         ULONG               ulBorderSpacing;
-                    // border spacing (added to 3D border width); can change
-        ULONG               ulSpacing;
-                    // spacing between widgets; can change
+                    // border spacing (added to 3D border width);
+                    // can be changed by user at any time
+        ULONG               ulWidgetSpacing;
+                    // spacing between widgets; can be changed by user at any time;
+                    // if flDisplayStyle also has XCS_SPACINGLINES set,
+                    // an extra 2 pixels will be added internally to this
+                    // value
 
         /*
@@ -169 +193 @@
                     // height of tallest widget == minimum height of client
                     // V0.9.9 (2001-03-09) [umoeller]
-                    // This may change while the XCenter is open.
+                    // This may change while the XCenter is open if
+                    // widgets are added or removed.
+
+        LONG                lcolClientBackground;
+                    // background color of the XCenter client area,
+                    // in case a widget is interested.
+                    // V0.9.13 (2001-06-19) [umoeller]
+
+        PVOID               pvSomSelf;
+                    // XCenter's somSelf object pointer. This is a
+                    // XCenter* pointer really, but has been declared
+                    // as PVOID so you won't have to include the WPS
+                    // SOM headers.
+                    // V0.9.13 (2001-06-19) [umoeller]
+
+        HWND                hwndTooltip;
+                    // XCenter's tooltip control (comctl.c). This is
+                    // the one tooltip that is created for all widgets.
+                    // This member has been made public so widgets may
+                    // choose to work with the tooltip... but do not
+                    // mess with this unless you know what you're doing,
+                    // since all widgets share this one tooltip.
+                    // V0.9.13 (2001-06-21) [umoeller]
 
     } XCENTERGLOBALS, *PXCENTERGLOBALS;
+
+    typedef const struct _XCENTERGLOBALS *PCXCENTERGLOBALS;
 
     // forward declaration
     typedef struct _XCENTERWIDGET *PXCENTERWIDGET;
 
-    BOOL APIENTRY ctrSetSetupString(LHANDLE hSetting, const char *pcszNewSetupString);
-    typedef BOOL APIENTRY CTRSETSETUPSTRING(LHANDLE hSetting, const char *pcszNewSetupString);
+    BOOL APIENTRY ctrSetSetupString(LHANDLE hSetting, PCSZ pcszNewSetupString);
+    typedef BOOL APIENTRY CTRSETSETUPSTRING(LHANDLE hSetting, PCSZ pcszNewSetupString);
     typedef CTRSETSETUPSTRING *PCTRSETSETUPSTRING;
 
@@ -189 +237 @@
      *      work as follows:
      *
-     *      1.  You must a function that displays a modal
+     *      1.  You must write a function that displays a modal
      *          dialog. This function must have the following
      *          prototype:
@@ -195 +243 @@
      +              VOID EXPENTRY ShowSettingsDlg(PWIDGETSETTINGSDLGDATA pData)
      *
-     *      2.  Store that function in the
-     *          XCENTERWIDGETCLASS.pShowSettingsDlg field for
-     *          your widget class.
+     *      2.  In the "init module" export, store that function
+     *          in the XCENTERWIDGETCLASS.pShowSettingsDlg field
+     *          for your widget class.
      *
      *          This will enable the "Properties" menu item
@@ -238 +286 @@
                     // DO NOT CHANGE
 
-        PXCENTERGLOBALS         pGlobals;
+        PCXCENTERGLOBALS        pGlobals;
                     // if != NULL, currently open XCenter
                     // for which widget data is being changed.
@@ -277 +325 @@
     typedef WGTSHOWSETTINGSDLG *PWGTSHOWSETTINGSDLG;
 
-    // widget class flags
-    #define WGTF_SIZEABLE               0x0001
-    #define WGTF_NOUSERCREATE           0x0002
-    #define WGTF_UNIQUEPERXCENTER       0x0004
-    #define WGTF_UNIQUEGLOBAL          (0x0008 + 0x0004)
-    #define WGTF_TOOLTIP                0x0010
-    #define WGTF_TOOLTIP_AT_MOUSE      (0x0020 + 0x0010)
-    #define WGTF_TRANSPARENT            0x0040
-    #define WGTF_CONTAINER              0x0080
-    #define WGTF_NONFOCUSTRAVERSABLE    0x0100
-
     /*
      *@@ XCENTERWIDGETCLASS:
@@ -293 +330 @@
      *      used in an XCenter. Such a class can either
      *      be internal or in a widget plugin DLL.
+     *
+     *      This structure _must_ have the same layout as
+     *      PLUGINCLASS.  It can redefine the ulUser* fields
+     *      to its liking, though.
+     *
+     *      The window procedure which implements the widget
+     *      class must be registered by a plug-in DLL when
+     *      its INIT callback gets called by the XCenter.
+     *
+     *      There are a few rules which must be followed
+     *      with the window procedures of the widget classes:
+     *
+     *      -- At the very least, the widget's window proc must
+     *         implement WM_CREATE, WM_PAINT, and (if cleanup
+     *         is necessary) WM_DESTROY. WM_PRESPARAMCHANGED
+     *         would also be nice to support fonts and colors
+     *         dropped on the widget.
+     *
+     *      -- On WM_CREATE, the widget receives a pointer to
+     *         its XCENTERWIDGET structure in mp1.
+     *
+     *         The first thing the widget _must_ do on WM_CREATE
+     *         is to store the XCENTERWIDGET pointer (from mp1)
+     *         in its QWL_USER window word by calling:
+     *
+     +              WinSetWindowPtr(hwnd, QWL_USER, mp1);
+     *
+     *      -- The XCenter communicates with the widget using
+     *         WM_CONTROL messages. SHORT1FROMMP(mp1), the
+     *         source window ID, is always ID_XCENTER_CLIENT.
+     *         SHORT2FROMMP(mp1), the notification code, can
+     *         be:
+     *
+     *         --  XN_QUERYSIZE: the XCenter wants to know the
+     *             widget's size.
+     *
+     *         --  XN_SETUPCHANGED: widget's setup string has
+     *             changed.
+     *
+     *         --  XN_BEGINANIMATE: the widget is about to be
+     *             shown/hidden.
+     *
+     *         --  XN_ENDANIMATE: the widget is now fully shown/hidden.
+     *
+     *         --  XN_HITTEST:  for transparent widgets, the XCenter
+     *             wants to know if the specified location is covered.
+     *
+     *      -- All unprocessed notifications must be routed
+     *         to ctrDefWidgetProc instead of WinDefWindowProc.
+     *         Do not swallow unprocessed messages.
+     *
+     *      -- You must never use WinSetWindowPos on your widget
+     *         window yourself because this will solidly confuse
+     *         the XCenter widget formatting. If you want your
+     *         widget window to be resized, post XCM_SETWIDGETSIZE
+     *         to the widget's parent instead, which will resize
+     *         your widget properly and also reformat the other
+     *         widgets, if necessary.
+     *
+     *      -- All unprocessed messages should be routed
+     *         to ctrDefWidgetProc instead of WinDefWindowProc.
+     *
+     *      -- WM_MENUEND must _always_ be passed on after your
+     *         own processing (if any) to remove source emphasis
+     *         for popup menus.
+     *
+     *      -- WM_DESTROY must _always_ be passed on after
+     *         your own cleanup code to avoid memory leaks,
+     *         because this function performs important cleanup
+     *         as well.
+     *
+     *      -- WM_COMMAND command values above 0x7f00 are reserved.
+     *         If you extend the context menu given to you in
+     *         XCENTERWIDGET.hwndContextMenu, you must use
+     *         menu item IDs < 0x7f00. This has been changed
+     *         with V0.9.11 (2001-04-25) [umoeller] to avoid
+     *         conflicts with the WPS menu item IDs, sorry.
+     *
+     *      <B>Resource management</B>
+     *
+     *      You should always be aware that your widget is a PM
+     *      window in the WPS process. As a result, all resource
+     *      leaks that you produce in your widget code will affect
+     *      the entire WPS, and all crashes will too.
+     *
+     *      As a general rule, the XCenter will free all widget
+     *      resources that it has allocated itself (such as the
+     *      structures that were created for it). By contrast,
+     *      if you allocate something yourself, it is your
+     *      responsibility to free it. This applies especially
+     *      to XCENTERWIDGET.pUser, which is your general pointer
+     *      to store widget-specific things.
+     *
+     *      Of course the same rules apply to PM resources such
+     *      as icons, bitmaps, regions, memory PS's etc. You can
+     *      quickly bring down the WPS if you forget to free those.
+     *      Same thing if you start additional threads in your
+     *      widget code.
+     *
+     *      This is especially important because widget windows
+     *      can be created and destroyed without the widgets
+     *      cooperation. For example, if the widget is in a tray,
+     *      it will be created and destroyed when the current
+     *      tray changes. If you leak something in this situation,
+     *      this can quickly become a major problem.
+     *
+     *      I also recommend to use exception handling in your
+     *      widget code to properly clean up things if something
+     *      goes wrong. As said in center.c, do not use exit
+     *      lists because that will cause DLL unloading to fail.
+     *
+     *      <B>Tooltip support</B>
+     *
+     *      If your widget class has the WGTF_TOOLTIP flag set,
+     *      it will receive WM_CONTROL with TTN_* notifications
+     *      and the source window ID set to ID_XCENTER_TOOLTIP.
+     *      If it responds to TTN_NEEDTEXT, it must fill the
+     *      TOOLTIPTEXT pointed to by mp2. See include\helpers\comctl.h
+     *      for details.
+     *
+     *      In addition, the widget will also receive the TTN_SHOW
+     *      and TTN_POP notifications when the tooltip is being
+     *      shown or hidden above it.
+     *
+     *      <B>Trayable widgets</B>
+     *
+     *      If your widget is supposed to be trayable (i.e.
+     *      the WGTF_TRAYABLE flag is set in the XCENTERWIDGETCLASS),
+     *      it must conform to a few extra rules:
+     *
+     *      -- Trayable widgets cannot be sizeable or greedy
+     *         because the tray widget itself is sizeable.
+     *
+     *      -- You must never assume that the parent window of
+     *         your widget really is the XCenter client. It can
+     *         also be a tray widget. Always use
+     *         WinQueryWindow(hwndWidget, QW_PARENT) to find your
+     *         parent window, which will properly give you either
+     *         the XCenter client or the tray widget.
+     *
+     *      -- If you use XCM_* messages, never post them to the
+     *         XCenter client window (whose handle is available
+     *         thru XCENTERGLOBALS). All XCM_* essages are understood
+     *         by the tray widget also, and if your widget is in a tray,
+     *         it must post them to the tray instead of the client.
+     *
+     *      -- Your widget must be prepared for being created or
+     *         destroyed at times other than XCenter creation or
+     *         destruction because the tray widget will do this
+     *         when the current tray is switched.
      */
 
@@ -301 +488 @@
                 // several widget classes). A plugin DLL is responsible for
                 // registering this window class when it's loaded.
+                // Naturally, this must be unique on the system.
 
         ULONG           ulExtra;
@@ -309 +497 @@
                 // widget classes in the same window proc. You must copy this
                 // to your private widget data then.
+                // For example, MONITORS.DLL uses this to differentiate
+                // between the various monitor widget classes.
 
         const char      *pcszWidgetClass;
                 // internal widget class name; this is used to identify
-                // the class. This must be unique on the system and should
-                // not contain any spaces (e.g.: "MySampleClass").
+                // the class. This must be unique on the system and must
+                // not contain special characters like commas, brackets,
+                // etc. Besides, since this must work with all codepages,
+                // use only ASCII characters <= 127, and use an English
+                // name always.
+                // A valid name would be "MySampleClass".
+                // This is stored internally in the XCenter data and is
+                // used whenever the XCenter is opened to create all the
+                // widgets from the respective widget classes. In other
+                // words, this is the class identifier and must never
+                // change between several releases or different NLS versions
+                // of your plugin DLL, or otherwise widget creation will fail.
+                // Choose this name carefully.
 
         const char      *pcszClassTitle;
-                // widget class title (shown to user in "Add widget" popup
-                // menu). Example: "Sample widget".
+                // explanatory widget class title, which is shown to the
+                // user in the "Add widget" popup menu. Example: "Sample widget".
+                // This is not used to identify the class internally and may
+                // change between releases and NLS versions. So you can set
+                // this to a language-specific string.
+                // Note: If this has the highest bit set, it is assumed to
+                // be a string resource ID in the XWorkplace NLS DLL instead
+                // of a real string:
+                #define XCENTER_STRING_RESOURCE     0x80000000
+                            // V0.9.19 (2002-05-07) [umoeller]
 
         ULONG           ulClassFlags;
                 // WGTF_* flags; any combination of the following:
+
+                #define WGTF_SIZEABLE               0x0001
                 // -- WGTF_SIZEABLE: widget window can be resized with
-                //    the mouse by the user.
+                //    the mouse by the user. A sizing bar is automatically
+                //    painted by the XCenter engine then.
+
+                #define WGTF_NOUSERCREATE           0x0002
                 // -- WGTF_NOUSERCREATE: do not show this class in
                 //    the "add widget" menu, and do not allow creating
                 //    instances of this in the XCenter settings notebook.
+                //    This is used for the object button widget, which
+                //    can only be created through drag'n'drop. This flag
+                //    isn't terribly useful for plug-in DLLs because
+                //    without support in the XCenter engine the widget
+                //    could then not be created at all.
+
+                #define WGTF_UNIQUEPERXCENTER       0x0004
                 // -- WGTF_UNIQUEPERXCENTER: only one widget of this class
                 //    should be created per XCenter.
+
+                #define WGTF_UNIQUEGLOBAL          (0x0008 + 0x0004)
                 // -- WGTF_UNIQUEGLOBAL: only one widget of this class
                 //    should be created in all XCenters on the system.
-                //    This includes WGTF_UNIQUEPERXCENTER.
+                //    This implies WGTF_UNIQUEPERXCENTER.
+
+                #define WGTF_TOOLTIP                0x0010
                 // -- WGTF_TOOLTIP: if set, the widget has a tooltip
                 //    and will receive WM_CONTROL messages with the
-                //    TTN_NEEDTEXT notification code (see helpers\comctl.h).
+                //    TTN_NEEDTEXT, TTN_SHOW, or TTN_POP notification codes
+                //    (see helpers\comctl.h).
                 //    The window ID of the tooltip control is ID_XCENTER_TOOLTIP.
+                //    See XCENTERWIDGETCLASS for tooltip handling.
+
+                #define WGTF_TOOLTIP_AT_MOUSE      (0x0020 + 0x0010)
                 // -- WGTF_TOOLTIP_AT_MOUSE: like WGTF_TOOPTIP, but the
                 //    tooltip is not centered above the widget, but put
                 //    at the mouse position instead.
-                //    This includes WGTF_TOOLTIP.
+                //    This implies WGTF_TOOLTIP.
+
+                #define WGTF_TRANSPARENT            0x0040
+                // -- WGTF_TRANSPARENT: some parts of the widget window
+                //    are transparent.  The widget will receive WM_CONTROL
+                //    messages with the XN_HITTEST notification code.
+                //    If the widget returns FALSE to the notification,
+                //    the action will be forwarded to its parent (the
+                //    XCenter client or a tray widget).
+
+                #define WGTF_NONFOCUSTRAVERSABLE    0x0100
+                //    Reserved for future use.
+
+                #define WGTF_TRAYABLE               0x0200
+                // -- WGTF_TRAYABLE: widget is "trayable", that is, it
+                //    supports being created inside a tray widget.
+                //    Note: Restrictions apply if you want your widget
+                //    to be trayable. See above.
+
+                #define WGTF_CANTAKECENTERHOTKEY    0x0400
+                // -- WGTF_CANTAKECENTERHOTKEY: signals that the widget is
+                //    willing to take action when the XCenter gets
+                //    resurfaced via its object hotkey.
+                //    The widget will then receive WM_CONTROL with
+                //    the XN_CENTERHOTKEYPRESSED code; see remarks for
+                //    XN_CENTERHOTKEYPRESSED.
+                //    V0.9.19 (2002-04-17) [umoeller]
+
+                #define WGTF_CONFIRMREMOVE          0x0800
+                // -- WGTF_CONFIRMREMOVE: adds "..." to the "Remove widget"
+                //    context menu item and confirms removal if the user
+                //    selects that.
+                //    V0.9.20 (2002-08-08) [umoeller]
 
         PWGTSHOWSETTINGSDLG pShowSettingsDlg;
@@ -351 +612 @@
     } XCENTERWIDGETCLASS, *PXCENTERWIDGETCLASS;
 
+    typedef const struct _XCENTERWIDGETCLASS *PCXCENTERWIDGETCLASS;
+
     /*
      *@@ XCENTERWIDGETSETTING:
@@ -357 +620 @@
      *      user has configured for a widget.
      *
+     *      An array of these is stored in packed form in the
+     *      XCenter instance data and describes all widgets
+     *      in the XCenter. Widget classes normally don't need
+     *      this.
+     *
      *      An array of these is returned by XCenter::xwpQueryWidgets.
      */
@@ -362 +630 @@
     typedef struct _XCENTERWIDGETSETTING
     {
-        PSZ                 pszWidgetClass;   // widget class name;
+        PSZ             pszWidgetClass;   // widget class name;
                     // we cannot use the binary PXCENTERWIDGETCLASS pointer
                     // here because these structures are dynamically unloaded...
                     // use ctrpFindClass to find the XCENTERWIDGETCLASS ptr.
-        PSZ                 pszSetupString;
+        PSZ             pszSetupString;
                     // widget-class-specific setup string; can be NULL
 
@@ -384 +652 @@
      *      being a child window of the XCenter client,
      *      which in turn is a child of the XCenter frame.
+     *      The exception is a widget in a tray, which is
+     *      a child of a tray widget, which in turn is a
+     *      child of the XCenter client.
      *
      *      This structure is created once for each widget
@@ -393 +664 @@
      *      The widget can allocate another widget-specific
      *      buffer and store its pointer into the pUser
-     *      field.
+     *      field. This is strongly recommended because
+     *      otherwise your widget will have no place to
+     *      store its instance data.
      *
      *      This structure is automatically freed by the
@@ -401 +674 @@
      *      General rule: The widget must clean up what it
      *      allocated itself.
+     *
+     *      See XCENTERWIDGETCLASS for rules that a widget
+     *      window proc must conform to.
      */
 
@@ -424 +700 @@
                 // proc must pass all unprocessed messages (and a
                 // few more) to this instead of WinDefWindowProc.
-                // See ctrDefWidgetProc for details.
-
-        const XCENTERGLOBALS *pGlobals;
+                // See XCENTERWIDGETCLASS for details.
+
+        PCXCENTERGLOBALS pGlobals;
                 // ptr to client/frame window data (do not change)
 
-        PXCENTERWIDGETCLASS pWidgetClass;
+        PCXCENTERWIDGETCLASS pWidgetClass;
                 // widget class this widget was created from;
                 // this ptr is only valid during WM_CREATE and
                 // always NULL afterwards
 
-        const char  *pcszWidgetClass;
+        PCSZ        pcszWidgetClass;
                 // internal name of the widget's class; this
                 // is the same as pWidgetClass->pcszWidgetClass,
@@ -442 +718 @@
                 // class flags copied from XCENTERWIDGETCLASS.
 
-        const char  *pcszSetupString;
+        PCSZ        pcszSetupString;
                 // class-specific setup string. This field
                 // is only valid during WM_CREATE and then holds
@@ -449 +725 @@
                 // setup string exists. After WM_CREATE, the
                 // pointer is set to NULL always.
+                // The widget should use this string to initialize
+                // itself. When its instance data changes, it
+                // should send XCM_SAVESETUP to its parent
+                // so that the XCenter can record the new setup
+                // string.
 
         /*
@@ -470 +751 @@
                 // all remaining size on the XCenter bar (by
                 // returning -1 for cx with WM_CONTROL and
-                //
+                // XCN_QUERYSIZE), it cannot be sizeable.
 
         HWND        hwndContextMenu;
@@ -485 +766 @@
                 // This is only valid after WM_CREATE.
 
-        const char  *pcszHelpLibrary;
+        PCSZ        pcszHelpLibrary;
         ULONG       ulHelpPanelID;
                 // if these two are specified, the XCenter will
@@ -501 +782 @@
                 // own data (which you must clean up yourself on
                 // WM_DESTROY).
+
+        PVOID       pvWidgetSetting;
+                // private pointer for tray widget. DO NOT USE THIS.
+                // V0.9.13 (2001-06-21) [umoeller]
+
     } XCENTERWIDGET;
 
@@ -509 +795 @@
      ********************************************************************/
 
-    PSZ APIENTRY ctrScanSetupString(const char *pcszSetupString,
-                                    const char *pcszKeyword);
-    typedef PSZ APIENTRY CTRSCANSETUPSTRING(const char *pcszSetupString,
-                                            const char *pcszKeyword);
+    // All these are specified as both simple prototypes and
+    // function pointer declarations so that widget classes
+    // can import these functions from XFLDR.DLL in the init
+    // export.
+
+    PSZ APIENTRY ctrScanSetupString(PCSZ pcszSetupString,
+                                    PCSZ pcszKeyword);
+    typedef PSZ APIENTRY CTRSCANSETUPSTRING(PCSZ pcszSetupString,
+                                            PCSZ pcszKeyword);
     typedef CTRSCANSETUPSTRING *PCTRSCANSETUPSTRING;
 
-    LONG APIENTRY ctrParseColorString(const char *p);
-    typedef LONG APIENTRY CTRPARSECOLORSTRING(const char *p);
+    LONG APIENTRY ctrParseColorString(PCSZ p);
+    typedef LONG APIENTRY CTRPARSECOLORSTRING(PCSZ p);
     typedef CTRPARSECOLORSTRING *PCTRPARSECOLORSTRING;
 
@@ -525 +816 @@
     // ctrSetSetupString has been defined above
 
-    BOOL APIENTRY ctrDisplayHelp(PXCENTERGLOBALS pGlobals,
-                        const char *pcszHelpFile,
-                        ULONG ulHelpPanelID);
-    typedef BOOL APIENTRY CTRDISPLAYHELP(PXCENTERGLOBALS pGlobals,
-                        const char *pcszHelpFile,
-                        ULONG ulHelpPanelID);
+    BOOL APIENTRY ctrDisplayHelp(PCXCENTERGLOBALS pGlobals,
+                                 PCSZ pcszHelpFile,
+                                 ULONG ulHelpPanelID);
+    typedef BOOL APIENTRY CTRDISPLAYHELP(PCXCENTERGLOBALS pGlobals,
+                                         PCSZ pcszHelpFile,
+                                         ULONG ulHelpPanelID);
     typedef CTRDISPLAYHELP *PCTRDISPLAYHELP;
 
@@ -541 +832 @@
     typedef CTRPAINTSTATICWIDGETBORDER *PCTRPAINTSTATICWIDGETBORDER;
 
+    VOID APIENTRY ctrDrawWidgetEmphasis(PXCENTERWIDGET pWidget, BOOL fRemove);
+    typedef VOID APIENTRY CTRDRAWWIDGETEMPHASIS(PXCENTERWIDGET pWidget, BOOL fRemove);
+    typedef CTRDRAWWIDGETEMPHASIS *PCTRDRAWWIDGETEMPHASIS;
+
+    VOID APIENTRY ctrPlaceAndPopupMenu(HWND hwndOwner, HWND hwndMenu, BOOL fAbove);
+    typedef VOID APIENTRY CTRPLACEANDPOPUPMENU(HWND hwndOwner, HWND hwndMenu, BOOL fAbove);
+    typedef CTRPLACEANDPOPUPMENU *PCTRPLACEANDPOPUPMENU;
+
     MRESULT EXPENTRY ctrDefWidgetProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
                 // a pointer to this is in XCENTERWIDGET if the widget
                 // is a non-container widget
-
-    MRESULT EXPENTRY ctrDefContainerWidgetProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
-                // a pointer to this is in XCENTERWIDGET if the widget
-                // is a container widget
+    typedef MRESULT EXPENTRY CTRDEFWIDGETPROC(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
+    typedef CTRDEFWIDGETPROC *PCTRDEFWIDGETPROC;
+
+    /* ******************************************************************
+     *
+     *   Open XCenter views
+     *
+     ********************************************************************/
+
+    BOOL APIENTRY ctrIsXCenterView(HWND hwndFrame);
+    typedef BOOL APIENTRY CTRISXCENTERVIEW(HWND hwndFrame);
+    typedef CTRISXCENTERVIEW *PCTRISXCENTERVIEW;
+                // this function was added with V0.9.16
 
     /* ******************************************************************
@@ -658 +966 @@
 
     /*
-     *@@ XN_QUERYSETUP:
+     * XN_QUERYSETUP:
      *      notification code for WM_CONTROL sent to a widget
      *      when the sender needs to know the widget's setup string.
@@ -677 +985 @@
      *      to store the setup string (even if mp2 is NULL).
      *
-     *@@added V0.9.9 (2001-03-01) [lafaix]
-     */
-
-    #define XN_QUERYSETUP               4
+     *added V0.9.9 (2001-03-01) [lafaix]
+     */
+
+    // #define XN_QUERYSETUP               4
 
     // flags for XN_BEGINANIMATE and XN_ENDANIMATE
@@ -743 +1051 @@
 
     /*
-     *@@ XN_QUERYWIDGETCOUNT:
+     * XN_QUERYWIDGETCOUNT:
      *      notification code for WM_CONTROL sent from the XCenter
      *      to a widget when it needs to know how many elements a
@@ -765 +1073 @@
      *      for the count.
      *
-     *@@added V0.9.9 (2001-02-23) [lafaix]
-     *@@changed V0.9.9 (2001-03-11) [lafaix]: uses a PULONG to return the count.
-     */
-
-    #define XN_QUERYWIDGETCOUNT         7
-
-    /*
-     *@@ XN_QUERYWIDGET:
+     *added V0.9.9 (2001-02-23) [lafaix]
+     *changed V0.9.9 (2001-03-11) [lafaix]: uses a PULONG to return the count.
+     */
+
+    // #define XN_QUERYWIDGETCOUNT         7
+
+    /*
+     * XN_QUERYWIDGET:
      *      notification code for WM_CONTROL sent from the XCenter
      *      to a widget when it needs to know the widget present at
@@ -789 +1097 @@
      *      XCENTERWIDGET structure.
      *
-     *@@added V0.9.9 (2001-02-23) [lafaix]
-     */
-
-    #define XN_QUERYWIDGET              8
+     *added V0.9.9 (2001-02-23) [lafaix]
+     */
+
+    // #define XN_QUERYWIDGET              8
 
     // structure needed for XN_INSERTWIDGET
@@ -808 +1116 @@
 
     /*
-     *@@ XN_INSERTWIDGET:
+     * XN_INSERTWIDGET:
      *      notification code for WM_CONTROL sent from the XCenter
      *      to a widget when it needs to add a widget at a specified
@@ -826 +1134 @@
      *      the inserted one.
      *
-     *@@added V0.9.9 (2001-02-23) [lafaix]
-     */
-
-    #define XN_INSERTWIDGET             9
-
-    /*
-     *@@ XN_DELETEWIDGET:
+     *added V0.9.9 (2001-02-23) [lafaix]
+     */
+
+    // #define XN_INSERTWIDGET             9
+
+    /*
+     * XN_DELETEWIDGET:
      *      notification code for WM_CONTROL sent from the XCenter
      *      to a widget when it needs to remove a widget at a specified
@@ -847 +1155 @@
      *      The widget must return the count of remaining widgets.
      *
-     *@@added V0.9.9 (2001-02-23) [lafaix]
-     */
-
-    #define XN_DELETEWIDGET             10
+     *added V0.9.9 (2001-02-23) [lafaix]
+     */
+
+    // #define XN_DELETEWIDGET             10
+
+    /*
+     *@@ XN_HITTEST:
+     *      notification code for WM_CONTROL sent from the XCenter
+     *      to a widget when it needs to know whether a specific
+     *      location is covered by the widget.
+     *
+     *      Parameters:
+     *
+     *      -- SHORT1FROMMP(mp1): ID, always ID_XCENTER_CLIENT.
+     *
+     *      -- SHORT2FROMMP(mp1): notify code (XN_HITTEST).
+     *
+     *      -- POINTS mp2: the location to test.
+     *
+     *      The widget must return TRUE if the location is covered, or
+     *      FALSE otherwise.
+     *
+     *@@added V0.9.13 (2001-06-23) [umoeller]
+     */
+
+    #define XN_HITTEST                  11
+
+    /*
+     *@@ XN_DISPLAYSTYLECHANGED:
+     *      notification code for WM_CONTROL sent (!)
+     *      to all widgets whenever an XCenter display
+     *      style changes.
+     *
+     *      If your widget caches data from XCENTERGLOBALS
+     *      locally somewhere, or needs to rearrange its
+     *      display based on those settings, you should
+     *      intercept this and reformat yourself.
+     *
+     *      It is not necessary to invalidate your widget
+     *      display though since this will be done
+     *      automatically by the XCenter when display
+     *      styles change. So after this notification,
+     *      you can be sure that WM_PAINT will come in
+     *      anyway.
+     *
+     *      Parameters:
+     *
+     *      -- SHORT1FROMMP(mp1): ID, always ID_XCENTER_CLIENT.
+     *
+     *      -- SHORT2FROMMP(mp1): notify code (XN_DISPLAYSTYLECHANGED).
+     *
+     *      -- mp2: unused, always NULL.
+     *
+     *@@added V0.9.13 (2001-06-21) [umoeller]
+     */
+
+    #define XN_DISPLAYSTYLECHANGED      12
+
+    /*
+     *@@ XN_INUSECHANGED:
+     *      notification code for WM_CONTROL posted (!)
+     *      to a widget if it has registered itself with
+     *      XFldObject::xwpSetWidgetNotify.
+     *
+     *      This is posted from XFldObject::wpCnrSetEmphasis
+     *      when the object's in-use emphasis changes.
+     *
+     *      Parameters:
+     *
+     *      -- SHORT1FROMMP(mp1): ID, always ID_XCENTER_CLIENT.
+     *
+     *      -- SHORT2FROMMP(mp1): notify code (XN_INUSECHANGED).
+     *
+     *      -- WPObject* mp2: SOM object pointer of object whose
+     *                  emphasis changed.
+     *
+     *@@added V0.9.13 (2001-06-21) [umoeller]
+     */
+
+    #define XN_INUSECHANGED             13
+
+    /*
+     *@@ XN_CENTERHOTKEYPRESSED:
+     *      notification code for WM_CONTROL sent (!)
+     *      to the first widget that has the WGTF_CANTAKECENTERHOTKEY
+     *      class flag when the XCenter hotkey is pressed.
+     *
+     *      Presently this is only used by the X-button to
+     *      open its menu when the XCenter gets activated via
+     *      hotkey, but other widget classes could behave
+     *      accordingly.
+     *
+     *      Parameters:
+     *
+     *      -- SHORT1FROMMP(mp1): ID, always ID_XCENTER_CLIENT.
+     *
+     *      -- SHORT2FROMMP(mp1): notify code (XN_CENTERHOTKEYPRESSED).
+     *
+     *      -- mp2: unused, always NULL.
+     *
+     *@@added V0.9.19 (2002-04-17) [umoeller]
+     */
+
+    #define XN_CENTERHOTKEYPRESSED      14
 
     /* ******************************************************************
@@ -860 +1268 @@
     /*
      *@@ XCM_SETWIDGETSIZE:
-     *      this msg can be posted to the client
-     *      from a widget if it wants to change
+     *      this msg can be posted by a widget
+     *      to its parent if it wants to change
      *      its size, e.g. because its display
      *      has changed and it needs more room.
      *
+     *      The widget's parent will usually be
+     *      the XCenter client. However, if you
+     *      want your widget to be trayable, you
+     *      should never use XCENTERGLOBALS.hwndClient
+     *      but use WinQueryWindow(hwndWidget, QW_PARENT)
+     *      instead, because if your widget is in
+     *      a tray, its parent will be a tray widget,
+     *      which understands this message as well.
+     *
      *      Parameters:
      *
@@ -872 +1289 @@
      *         widget wants to have.
      *
-     *      Note: _Post_, do not send this message
-     *      to the client. This causes excessive
-     *      redraw of possibly all widgets.
+     *      Note: _Post_, do not send this message.
+     *      This causes excessive redraw of possibly
+     *      all widgets and will cause a flurry of
+     *      messages being sent back to your widget.
+     *
+     *      Restrictions: This doesn't work during WM_CREATE
+     *      of your widget.
      */
 
@@ -886 +1307 @@
     #define XFMF_SHOWWIDGETS            0x0010
     #define XFMF_RESURFACE              0x0020
+    #define XFMF_FOCUS2FIRSTWIDGET      0x0040
 
     /*
      *@@ XCM_REFORMAT:
-     *      reformats the XCenter and all widgets. This
-     *      gets posted by ctrDefWidgetProc when a widget
+     *      posted by a widget to its parent to reformat
+     *      the XCenter (or a tray) and all sibling widgets.
+     *      This gets posted by ctrDefWidgetProc when a widget
      *      gets destroyed, but can be posted by anyone.
      *
-     *      Parameters:
-     *
-     *      -- HWND mp1: reformat flags. Any combination
+     *      The widget's parent will usually be
+     *      the XCenter client. However, if you
+     *      want your widget to be trayable, you
+     *      should never use XCENTERGLOBALS.hwndClient
+     *      but use WinQueryWindow(hwndWidget, QW_PARENT)
+     *      instead, because if your widget is in
+     *      a tray, its parent will be a tray widget,
+     *      which understands this message as well.
+     *
+     *      Parameters:
+     *
+     *      -- ULONG mp1: reformat flags. Any combination
      *         of the following:
      *
@@ -916 +1348 @@
      *          --  XFMF_RESURFACE: resurface XCenter to HWND_TOP.
      *
+     *          --  XFMF_FOCUS2FIRSTWIDGET: implies XFMF_RESURFACE,
+     *              but will open the X-Button widget's menu, if
+     *              appplicable.
+     *
      *          Even if you specify 0, the XCenter will be re-shown
      *          if it is currently auto-hidden.
@@ -921 +1357 @@
      *      -- mp2: reserved, must be 0.
      *
-     *      NOTE: This msg must be POSTED, not sent, to the XCenter
-     *      client. It causes excessive redraw.
+     *      Note: _Post_, do not send this message.
+     *      This causes excessive redraw of possibly
+     *      all widgets and will cause a flurry of
+     *      messages being sent back to your widget.
+     *
+     *      Restrictions: This doesn't work during WM_CREATE
+     *      of your widget.
      */
 
@@ -929 +1370 @@
     /*
      *@@ XCM_SAVESETUP:
-     *      this msg can be sent (!) to the client
-     *      by a widget if its settings have been
+     *      this msg can be sent (!) by a widget to
+     *      its parent if its settings have been
      *      changed and it wants these settings to
      *      be saved with the XCenter instance data.
+     *
+     *      The widget's parent will usually be
+     *      the XCenter client. However, if you
+     *      want your widget to be trayable, you
+     *      should never use XCENTERGLOBALS.hwndClient
+     *      but use WinQueryWindow(hwndWidget, QW_PARENT)
+     *      instead, because if your widget is in
+     *      a tray, its parent will be a tray widget,
+     *      which understands this message as well.
      *
      *      This is useful when fonts or colors have
@@ -939 +1389 @@
      *      therefore won't work).
      *
+     *      Note: Saving widget setup strings in the XCenter
+     *      data is a possibly expensive operation. Use
+     *      this message economically.
+     *
+     *      Restrictions: This doesn't work during WM_CREATE
+     *      of your widget.
+     *
      *      Parameters:
      *
@@ -945 +1402 @@
      *      -- const char* mp2: zero-terminated setup string.
      *
+     *      Returns: TRUE if the setup string was successfully
+     *      saved.
+     *
      *@@added V0.9.7 (2000-12-04) [umoeller]
      */
@@ -950 +1410 @@
     #define XCM_SAVESETUP               (WM_USER + 2)
 
-    // WM_USER + 3 and WM_USER + 4 are reserved
+    // WM_USER + 3 to WM_USER + 10 are reserved
 
     /* ******************************************************************
@@ -964 +1424 @@
     typedef ULONG EXPENTRY FNWGTINITMODULE_OLD(HAB hab,
                                                HMODULE hmodXFLDR,
-                                               PXCENTERWIDGETCLASS *ppaClasses,
+                                               PCXCENTERWIDGETCLASS *ppaClasses,
                                                PSZ pszErrorMsg);
     typedef FNWGTINITMODULE_OLD *PFNWGTINITMODULE_OLD;
@@ -971 +1431 @@
                                                HMODULE hmodPlugin,
                                                HMODULE hmodXFLDR,
-                                               PXCENTERWIDGETCLASS *ppaClasses,
+                                               PCXCENTERWIDGETCLASS *ppaClasses,
                                                PSZ pszErrorMsg);
     typedef FNWGTINITMODULE_099 *PFNWGTINITMODULE_099;