Windows taskbar/system tray balloon notifications work! On to integrating TkTray in X11...

1 files changed, 784 insertions, 792 deletions

diff --git a/win/tkWinSysTray.c b/win/tkWinSysTray.c
index 1df6e88..cb1323a 100644
--- a/win/tkWinSysTray.c
+++ b/win/tkWinSysTray.c
@@ -15,30 +15,28 @@
 /* 
  * Based extensively on the winico extension and sample code from Microsoft. 
  * Some of the code was adapted into tkWinWM.c to implement the "wm iconphoto" 
- * command (TIP 159). Here we are removing obsolete parts of the winico extension, 
- * and implementing the Shell_Notification API to add balloon/system notifications.  
+ * command (TIP 159). Here we are removing obsolete parts of the 
+   winico extension, and implementing more of the Shell_Notification API 
+ * to add balloon/system notifications.  
  */
 
-
 #include <windows.h>
 #include <shellapi.h>
-
 #include <tk.h>
 #include <tkPlatDecls.h>
-
 #include "tkWinIco.h"
 #include "tkWinInt.h"
 
 #define GETHINSTANCE Tk_GetHINSTANCE()
-static int isWin32s=-1;
-#define ISWIN32S  isWin32s
+static int isWin32s = -1;
+#define ISWIN32S isWin32s
+
+#ifdef HAVE_STDLIB_H#include <stdlib.h>
 
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
 #endif
 
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
+#ifdef HAVE_STDINT_H#include <stdint.h>
+
 #endif
 
 /* Deal with Tcl 8.4 constificiation */
@@ -46,62 +44,59 @@ static int isWin32s=-1;
 #define CONST84
 #endif
 
-static BOOL AdjustICONIMAGEPointers( LPICONIMAGE lpImage );
+static BOOL AdjustICONIMAGEPointers(LPICONIMAGE lpImage);
 
 typedef struct IcoInfo {
-    HICON hIcon;           /* icon handle returned by LoadIcon*/
+    HICON hIcon; /* icon handle returned by LoadIcon*/
     int itype;
-    int id;                /* Integer identifier for command;  used to
-                             cancel it. */
-    LPICONRESOURCE lpIR;   /* IconresourcePtr if type==ICO_FILE */
-    int iconpos;           /* hIcon is the nth Icon*/
-    char* taskbar_txt;     /* malloced text to display in the taskbar*/
-    char* taskbar_title;   /* title of balloon notification in taskbar */
-    char* taskbar_info;    /* text in body of balloon notification */
-    Tcl_Interp* interp;    /* interp which created the icon*/
-    char* taskbar_command; /* command to eval if events in the taskbar arrive*/
-    int taskbar_flags;     /* taskbar related flags*/
+    int id;
+    /* Integer identifier for command;  used to
+                 cancel it. */
+    LPICONRESOURCE lpIR; /* IconresourcePtr if type==ICO_FILE */
+    int iconpos; /* hIcon is the nth Icon*/
+    char * taskbar_txt; /* malloced text to display in the taskbar*/
+    Tcl_Interp * interp; /* interp which created the icon*/
+    char * taskbar_command; /* command to eval if events in the taskbar arrive*/
+    int taskbar_flags; /* taskbar related flags*/
     HWND hwndFocus;
-    struct IcoInfo *nextPtr;
+    struct IcoInfo * nextPtr;
 } IcoInfo;
 
-static IcoInfo* firstIcoPtr = NULL;
-#define ICO_LOAD   1
-#define ICO_FILE   2
+static IcoInfo * firstIcoPtr = NULL;
+#define ICO_LOAD 1
+#define ICO_FILE 2
 
 #define TASKBAR_ICON 1
-#define ICON_MESSAGE WM_USER+1234
+#define ICON_MESSAGE WM_USER + 1234
 
 #define HANDLER_CLASS "Wtk_TaskbarHandler"
 static HWND CreateTaskbarHandlerWindow(void);
 
-typedef BOOL (FAR WINAPI * LPFN_SHELLNOTIFYICONW)(DWORD, PNOTIFYICONDATAW);
-typedef BOOL (FAR WINAPI * LPFN_SHELLNOTIFYICONA)(DWORD, PNOTIFYICONDATAA);
+typedef BOOL(FAR WINAPI * LPFN_SHELLNOTIFYICONW)(DWORD, PNOTIFYICONDATAW);
+typedef BOOL(FAR WINAPI * LPFN_SHELLNOTIFYICONA)(DWORD, PNOTIFYICONDATAA);
 
 static LPFN_SHELLNOTIFYICONA notify_funcA = NULL;
-static LPFN_SHELLNOTIFYICONW notify_funcW  = NULL;
-static HMODULE hmod          = NULL;
-static HWND    handlerWindow = NULL;
-
+static LPFN_SHELLNOTIFYICONW notify_funcW = NULL;
+static HMODULE hmod = NULL;
+static HWND handlerWindow = NULL;
 
 /* 
  * This function tries to swap the lines of the bitmap in various formats. 
  */
-static void 
-swaplines(unsigned char *bits,int width,int height,int bpp)
-{
-#define MAX_LINE 512
+static void
+swaplines(unsigned char * bits, int width, int height, int bpp) {
+    #define MAX_LINE 512
     unsigned char line[MAX_LINE];
-    unsigned char* pline;
-    int i,BytesPerLine,middle,end;
-    if(bpp>8){
-        BytesPerLine=width*(bpp/8);
+    unsigned char * pline;
+    int i, BytesPerLine, middle, end;
+    if (bpp > 8) {
+        BytesPerLine = width * (bpp / 8);
         /* for size 16  bpp 16 BytesPerLine 32 */
         /* for size 32  bpp 16 BytesPerLine 64 */
         /* for size 16  bpp 24 BytesPerLine 48 */
         /* for size 32  bpp 24 BytesPerLine 96 */
     } else {
-        BytesPerLine=width/(8/bpp);
+        BytesPerLine = width / (8 / bpp);
         /* for size 16  bpp 8  BytesPerLine 16 */
         /* for size 32  bpp 8  BytesPerLine 32 */
         /* for size 16  bpp 4  BytesPerLine 8 */
@@ -109,114 +104,112 @@ swaplines(unsigned char *bits,int width,int height,int bpp)
         /* for size 16  bpp 1  BytesPerLine 2 */
         /* for size 32  bpp 1  BytesPerLine 4 */
     }
-    if (BytesPerLine<MAX_LINE)
-        pline=line;
+    if (BytesPerLine < MAX_LINE)
+        pline = line;
     else
-        pline = (unsigned char*)ckalloc(BytesPerLine);
+        pline = (unsigned char * ) ckalloc(BytesPerLine);
     middle = (height * BytesPerLine) / 2;
     end = (height - 1) * BytesPerLine;
-    for (i = 0; i < middle ; i+= BytesPerLine) {
-            memcpy(pline, bits + i, BytesPerLine);
+    for (i = 0; i < middle; i += BytesPerLine) {
+        memcpy(pline, bits + i, BytesPerLine);
         memcpy(bits + i, bits + (end - i), BytesPerLine);
         memcpy(bits + (end - i), pline, BytesPerLine);
     }
     if (pline != line) {
-        ckfree((char*)pline);
+        ckfree((char * ) pline);
     }
 }
 
 /*
  * Create icon from 16-bit resource.
  */
-static HICON 
-MakeIconFromResource16(LPICONIMAGE lpIcon)
-{
+static HICON
+MakeIconFromResource16(LPICONIMAGE lpIcon) {
     HICON hIcon;
     UINT cb;
     HBITMAP hBmp;
     BITMAP bm;
     LPBYTE lpbDst;
     HDC hdc;
-    int width=(*(LPBITMAPINFOHEADER)(lpIcon->lpBits)).biWidth;
-    int height=(*(LPBITMAPINFOHEADER)(lpIcon->lpBits)).biHeight/2;
-    int bitCount=(*(LPBITMAPINFOHEADER)(lpIcon->lpBits)).biBitCount;
-    if( lpIcon == NULL )
+    int width = ( * (LPBITMAPINFOHEADER)(lpIcon -> lpBits)).biWidth;
+    int height = ( * (LPBITMAPINFOHEADER)(lpIcon -> lpBits)).biHeight / 2;
+    int bitCount = ( * (LPBITMAPINFOHEADER)(lpIcon -> lpBits)).biBitCount;
+    if (lpIcon == NULL)
         return NULL;
-    if( lpIcon->lpBits == NULL )
+    if (lpIcon -> lpBits == NULL)
         return NULL;
-    swaplines(lpIcon->lpAND,width,height,1);
-    hdc=GetDC(NULL);
-    if ( bitCount==1 || bitCount > 8)
-        hBmp=CreateBitmap((UINT)width, (UINT)height, 1, 1, NULL);
+    swaplines(lpIcon -> lpAND, width, height, 1);
+    hdc = GetDC(NULL);
+    if (bitCount == 1 || bitCount > 8)
+        hBmp = CreateBitmap((UINT) width, (UINT) height, 1, 1, NULL);
     else
-        hBmp=CreateCompatibleBitmap(hdc, (UINT)width, (UINT)height);
+        hBmp = CreateCompatibleBitmap(hdc, (UINT) width, (UINT) height);
 
-    if(!hBmp){
-        ReleaseDC(NULL,hdc);
+    if (!hBmp) {
+        ReleaseDC(NULL, hdc);
         return NULL;
     }
-    (*(LPBITMAPINFOHEADER)(lpIcon->lpBits)).biHeight /= 2;
-    if (!SetDIBits(hdc, hBmp, 0, (UINT)height, (LPVOID)lpIcon->lpXOR,
-        (LPBITMAPINFO)lpIcon->lpBits, DIB_RGB_COLORS)) {
+    ( * (LPBITMAPINFOHEADER)(lpIcon -> lpBits)).biHeight /= 2;
+    if (!SetDIBits(hdc, hBmp, 0, (UINT) height, (LPVOID) lpIcon -> lpXOR,
+            (LPBITMAPINFO) lpIcon -> lpBits, DIB_RGB_COLORS)) {
         DeleteObject(hBmp);
-        ReleaseDC(NULL,hdc);
+        ReleaseDC(NULL, hdc);
         return NULL;
     }
-    ReleaseDC(NULL,hdc);
-    (*(LPBITMAPINFOHEADER)(lpIcon->lpBits)).biHeight *= 2;
-    GetObject(hBmp, sizeof(bm), &bm);
-    cb=bm.bmHeight*bm.bmWidthBytes * bm.bmPlanes;
+    ReleaseDC(NULL, hdc);
+    ( * (LPBITMAPINFOHEADER)(lpIcon -> lpBits)).biHeight *= 2;
+    GetObject(hBmp, sizeof(bm), & bm);
+    cb = bm.bmHeight * bm.bmWidthBytes * bm.bmPlanes;
     /* if (cb % 4 != 0)        // dword align */
     /* cb += 4 - (cb % 4); */
-    lpbDst=(LPBYTE)ckalloc(cb);
-    if(!GetBitmapBits(hBmp, cb, (LPVOID)lpbDst)){
+    lpbDst = (LPBYTE) ckalloc(cb);
+    if (!GetBitmapBits(hBmp, cb, (LPVOID) lpbDst)) {
         DeleteObject(hBmp);
-        ckfree((char*)lpbDst);
+        ckfree((char * ) lpbDst);
         return NULL;
     }
-    hIcon = CreateIcon(GETHINSTANCE,width,height,
-        (BYTE)bm.bmPlanes,(BYTE)bm.bmBitsPixel,
-        lpIcon->lpAND,lpbDst);
+    hIcon = CreateIcon(GETHINSTANCE, width, height,
+        (BYTE) bm.bmPlanes, (BYTE) bm.bmBitsPixel,
+        lpIcon -> lpAND, lpbDst);
     DeleteObject(hBmp);
-    ckfree((char*)lpbDst);
+    ckfree((char * ) lpbDst);
     return hIcon;
 }
 
 /*
-* Create icon from 32-bit resource.
-*/
-static HICON 
-MakeIconFromResource32(LPICONIMAGE lpIcon)
-{
+ * Create icon from 32-bit resource.
+ */
+static HICON
+MakeIconFromResource32(LPICONIMAGE lpIcon) {
     HICON hIcon;
-    static FARPROC pfnCreateIconFromResourceEx=NULL;
-    static int initinfo=0;
+    static FARPROC pfnCreateIconFromResourceEx = NULL;
+    static int initinfo = 0;
     /* Sanity Check */
-    if( lpIcon == NULL )
+    if (lpIcon == NULL)
         return NULL;
-    if( lpIcon->lpBits == NULL )
+    if (lpIcon -> lpBits == NULL)
         return NULL;
-    if(!initinfo){
+    if (!initinfo) {
         HMODULE hMod = GetModuleHandleA("USER32.DLL");
-        initinfo=1;
-        if(hMod){
-            pfnCreateIconFromResourceEx = GetProcAddress(hMod,"CreateIconFromResourceEx");
+        initinfo = 1;
+        if (hMod) {
+            pfnCreateIconFromResourceEx = GetProcAddress(hMod, "CreateIconFromResourceEx");
         }
     }
     /* Let the OS do the real work :) */
-    if(pfnCreateIconFromResourceEx!=NULL) {
-        hIcon = (HICON) (pfnCreateIconFromResourceEx)
-            (lpIcon->lpBits, lpIcon->dwNumBytes, TRUE, 0x00030000,
-                (*(LPBITMAPINFOHEADER)(lpIcon->lpBits)).biWidth,
-                (*(LPBITMAPINFOHEADER)(lpIcon->lpBits)).biHeight/2, 0 );
+    if (pfnCreateIconFromResourceEx != NULL) {
+        hIcon = (HICON)(pfnCreateIconFromResourceEx)
+            (lpIcon -> lpBits, lpIcon -> dwNumBytes, TRUE, 0x00030000,
+                ( * (LPBITMAPINFOHEADER)(lpIcon -> lpBits)).biWidth,
+                ( * (LPBITMAPINFOHEADER)(lpIcon -> lpBits)).biHeight / 2, 0);
     } else {
         hIcon = NULL;
     }
     /* It failed, odds are good we're on NT so try the non-Ex way */
-    if( hIcon == NULL )    {
+    if (hIcon == NULL) {
         /* We would break on NT if we try with a 16bpp image */
-        if(lpIcon->lpbi->bmiHeader.biBitCount != 16) {
-            hIcon = CreateIconFromResource( lpIcon->lpBits, lpIcon->dwNumBytes, TRUE, 0x00030000 );
+        if (lpIcon -> lpbi -> bmiHeader.biBitCount != 16) {
+            hIcon = CreateIconFromResource(lpIcon -> lpBits, lpIcon -> dwNumBytes, TRUE, 0x00030000);
         }
     }
     return hIcon;
@@ -226,9 +219,8 @@ MakeIconFromResource32(LPICONIMAGE lpIcon)
  * Wrapper function to create icon.
  */
 
-static HICON 
-MakeIconFromResource( LPICONIMAGE lpIcon )
-{
+static HICON
+MakeIconFromResource(LPICONIMAGE lpIcon) {
     if (ISWIN32S)
         return MakeIconFromResource16(lpIcon);
     else
@@ -238,136 +230,130 @@ MakeIconFromResource( LPICONIMAGE lpIcon )
 /*
  * Free memory.
  */
- 
-static void 
-FreeIconResource(LPICONRESOURCE lpIR)
-{
+
+static void
+FreeIconResource(LPICONRESOURCE lpIR) {
     int i;
-    if( lpIR == NULL )
+    if (lpIR == NULL)
         return;
     /* Free all the bits */
-    for( i=0; i< lpIR->nNumImages; i++ ) {
-        if( lpIR->IconImages[i].lpBits != NULL )
-            ckfree((char*)lpIR->IconImages[i].lpBits );
-        if( lpIR->IconImages[i].hIcon != NULL )
-            DestroyIcon(lpIR->IconImages[i].hIcon);
+    for (i = 0; i < lpIR -> nNumImages; i++) {
+        if (lpIR -> IconImages[i].lpBits != NULL)
+            ckfree((char * ) lpIR -> IconImages[i].lpBits);
+        if (lpIR -> IconImages[i].hIcon != NULL)
+            DestroyIcon(lpIR -> IconImages[i].hIcon);
     }
-    ckfree( (char*)lpIR );
+    ckfree((char * ) lpIR);
 }
 
 /*
  * Read icon resource from an ICO file.
  */
 
-LPICONRESOURCE 
-ReadIconFromICOFile(Tcl_Interp* interp, LPCSTR szFileName)
-{
-    LPICONRESOURCE   lpIR = NULL, lpNew = NULL;
-    int              i = 0;
-    DWORD            dwBytesRead = 0;
-    LPICONDIRENTRY   lpIDE = NULL;
-    Tcl_Obj         *oPath = NULL;
-    Tcl_Channel      channel;
-    
+LPICONRESOURCE
+ReadIconFromICOFile(Tcl_Interp * interp, LPCSTR szFileName) {
+    LPICONRESOURCE lpIR = NULL, lpNew = NULL;
+    int i = 0;
+    DWORD dwBytesRead = 0;
+    LPICONDIRENTRY lpIDE = NULL;
+    Tcl_Obj * oPath = NULL;
+    Tcl_Channel channel;
+
     Tcl_ResetResult(interp);
-    
+
     /*
      * Access the icon file. We use Tcl_FS* methods to support virtual 
      * filesystems.
      */
     oPath = Tcl_NewStringObj(szFileName, -1);
     Tcl_IncrRefCount(oPath);
-    
+
     channel = Tcl_FSOpenFileChannel(interp, oPath, "r", 0644);
     if (channel == NULL) {
         return NULL;
     }
-    
-    if (Tcl_SetChannelOption(interp, channel, 
-        "-translation", "binary") != TCL_OK) {
+
+    if (Tcl_SetChannelOption(interp, channel,
+            "-translation", "binary") != TCL_OK) {
         return NULL;
     }
-    
+
     /* Allocate memory for the resource structure */
-    if ((lpIR = (LPICONRESOURCE) ckalloc( sizeof(ICONRESOURCE) )) == NULL ) {
-        Tcl_AppendResult(interp, "Error Allocating Memory", (char *)NULL);
+    if ((lpIR = (LPICONRESOURCE) ckalloc(sizeof(ICONRESOURCE))) == NULL) {
+        Tcl_AppendResult(interp, "Error Allocating Memory", (char * ) NULL);
         goto close_error;
     }
     /* Read in the header */
-    if ((lpIR->nNumImages = ReadICOHeader(channel)) == -1 ) {
-        Tcl_AppendResult(interp, "Error Reading File Header", (char*)NULL);
+    if ((lpIR -> nNumImages = ReadICOHeader(channel)) == -1) {
+        Tcl_AppendResult(interp, "Error Reading File Header", (char * ) NULL);
         goto close_error;
     }
     /* Adjust the size of the struct to account for the images */
-    if( (lpNew = (LPICONRESOURCE) ckrealloc( (char*)lpIR, sizeof(ICONRESOURCE) + ((lpIR->nNumImages-1) * sizeof(LPICONIMAGE)) )) == NULL )    {
-        Tcl_AppendResult(interp,"Error Allocating Memory",(char*)NULL);
+    if ((lpNew = (LPICONRESOURCE) ckrealloc((char * ) lpIR, sizeof(ICONRESOURCE) + ((lpIR -> nNumImages - 1) * sizeof(LPICONIMAGE)))) == NULL) {
+        Tcl_AppendResult(interp, "Error Allocating Memory", (char * ) NULL);
         goto close_error;
     }
 
     lpIR = lpNew;
     /* Store the original name */
-    lstrcpy( lpIR->szOriginalICOFileName, szFileName );
-    lstrcpy( lpIR->szOriginalDLLFileName, "" );
+    lstrcpy(lpIR -> szOriginalICOFileName, szFileName);
+    lstrcpy(lpIR -> szOriginalDLLFileName, "");
     /* Allocate enough memory for the icon directory entries */
-    if( (lpIDE = (LPICONDIRENTRY) ckalloc( lpIR->nNumImages * sizeof( ICONDIRENTRY ) ) ) == NULL )     {
-        Tcl_AppendResult(interp,"Error Allocating Memory",(char*)NULL);
+    if ((lpIDE = (LPICONDIRENTRY) ckalloc(lpIR -> nNumImages * sizeof(ICONDIRENTRY))) == NULL) {
+        Tcl_AppendResult(interp, "Error Allocating Memory", (char * ) NULL);
         goto close_error;
     }
     /* Read in the icon directory entries */
-    if ((dwBytesRead = Tcl_Read(channel, (char*)lpIDE,
-        lpIR->nNumImages * sizeof(ICONDIRENTRY))) < 0) {
-        Tcl_AppendResult(interp,"Error Reading File",(char*)NULL);
+    if ((dwBytesRead = Tcl_Read(channel, (char * ) lpIDE,
+            lpIR -> nNumImages * sizeof(ICONDIRENTRY))) < 0) {
+        Tcl_AppendResult(interp, "Error Reading File", (char * ) NULL);
         goto close_error;
     }
-    if( dwBytesRead != lpIR->nNumImages * sizeof( ICONDIRENTRY ) )    {
-        Tcl_AppendResult(interp,"Error Reading File",(char*)NULL);
+    if (dwBytesRead != lpIR -> nNumImages * sizeof(ICONDIRENTRY)) {
+        Tcl_AppendResult(interp, "Error Reading File", (char * ) NULL);
         goto close_error;
     }
     /* Loop through and read in each image */
-    for( i = 0; i < lpIR->nNumImages; i++ )    {
+    for (i = 0; i < lpIR -> nNumImages; i++) {
         /* Allocate memory for the resource */
-        if( (lpIR->IconImages[i].lpBits = (LPBYTE) ckalloc(lpIDE[i].dwBytesInRes)) == NULL )
-        {
-            Tcl_AppendResult(interp,"Error Allocating Memory",(char*)NULL);
+        if ((lpIR -> IconImages[i].lpBits = (LPBYTE) ckalloc(lpIDE[i].dwBytesInRes)) == NULL) {
+            Tcl_AppendResult(interp, "Error Allocating Memory", (char * ) NULL);
             goto close_error;
         }
-        lpIR->IconImages[i].dwNumBytes = lpIDE[i].dwBytesInRes;
+        lpIR -> IconImages[i].dwNumBytes = lpIDE[i].dwBytesInRes;
         /* Seek to beginning of this image */
         if (Tcl_Seek(channel, lpIDE[i].dwImageOffset, SEEK_SET) < 0) {
-            Tcl_AppendResult(interp,"Error Seeking in File",(char*)NULL);
+            Tcl_AppendResult(interp, "Error Seeking in File", (char * ) NULL);
             goto close_error;
         }
         /* Read it in */
-        if ((dwBytesRead = Tcl_Read(channel, lpIR->IconImages[i].lpBits, 
-            lpIDE[i].dwBytesInRes)) < 0)
-        {
-            Tcl_AppendResult(interp,"Error Reading File",(char*)NULL);
+        if ((dwBytesRead = Tcl_Read(channel, lpIR -> IconImages[i].lpBits,
+                lpIDE[i].dwBytesInRes)) < 0) {
+            Tcl_AppendResult(interp, "Error Reading File", (char * ) NULL);
             goto close_error;
         }
-        if( dwBytesRead != lpIDE[i].dwBytesInRes )
-        {
-            Tcl_AppendResult(interp,"Error Reading File",(char*)NULL);
+        if (dwBytesRead != lpIDE[i].dwBytesInRes) {
+            Tcl_AppendResult(interp, "Error Reading File", (char * ) NULL);
             goto close_error;
         }
         /* Set the internal pointers appropriately */
-        if( ! AdjustICONIMAGEPointers( &(lpIR->IconImages[i]) ) )
-        {
-            Tcl_AppendResult(interp,"Error Converting to Internal Format",(char*)NULL);
+        if (!AdjustICONIMAGEPointers( & (lpIR -> IconImages[i]))) {
+            Tcl_AppendResult(interp, "Error Converting to Internal Format", (char * ) NULL);
             goto close_error;
         }
-        lpIR->IconImages[i].hIcon=MakeIconFromResource(&(lpIR->IconImages[i]));
+        lpIR -> IconImages[i].hIcon = MakeIconFromResource( & (lpIR -> IconImages[i]));
     }
     /* Clean up */
-    ckfree( (char*)lpIDE );
+    ckfree((char * ) lpIDE);
     Tcl_Close(interp, channel);
     Tcl_DecrRefCount(oPath);
     return lpIR;
 
- close_error:
-    Tcl_Close(interp, channel);
+    close_error:
+        Tcl_Close(interp, channel);
     Tcl_DecrRefCount(oPath);
-    ckfree((char *)lpIR);
-    ckfree((char *)lpIDE);
+    ckfree((char * ) lpIR);
+    ckfree((char * ) lpIDE);
     return NULL;
 }
 
@@ -376,67 +362,65 @@ ReadIconFromICOFile(Tcl_Interp* interp, LPCSTR szFileName)
  */
 
 static BOOL
-AdjustICONIMAGEPointers( LPICONIMAGE lpImage )
-{
+AdjustICONIMAGEPointers(LPICONIMAGE lpImage) {
     /* Sanity check */
-    if( lpImage==NULL )
+    if (lpImage == NULL)
         return FALSE;
     /* BITMAPINFO is at beginning of bits */
-    lpImage->lpbi = (LPBITMAPINFO)lpImage->lpBits;
+    lpImage -> lpbi = (LPBITMAPINFO) lpImage -> lpBits;
     /* Width - simple enough */
-    lpImage->Width = lpImage->lpbi->bmiHeader.biWidth;
+    lpImage -> Width = lpImage -> lpbi -> bmiHeader.biWidth;
     /* Icons are stored in funky format where height is doubled - account for it */
-    lpImage->Height = (lpImage->lpbi->bmiHeader.biHeight)/2;
+    lpImage -> Height = (lpImage -> lpbi -> bmiHeader.biHeight) / 2;
     /* How many colors? */
-    lpImage->Colors = lpImage->lpbi->bmiHeader.biPlanes * lpImage->lpbi->bmiHeader.biBitCount;
+    lpImage -> Colors = lpImage -> lpbi -> bmiHeader.biPlanes * lpImage -> lpbi -> bmiHeader.biBitCount;
     /* XOR bits follow the header and color table */
-    lpImage->lpXOR = (LPBYTE)FindDIBBits((LPSTR)lpImage->lpbi);
+    lpImage -> lpXOR = (LPBYTE) FindDIBBits((LPSTR) lpImage -> lpbi);
     /* AND bits follow the XOR bits */
-    lpImage->lpAND = lpImage->lpXOR + (lpImage->Height*BytesPerLine((LPBITMAPINFOHEADER)(lpImage->lpbi)));
+    lpImage -> lpAND = lpImage -> lpXOR + (lpImage -> Height * BytesPerLine((LPBITMAPINFOHEADER)(lpImage -> lpbi)));
     return TRUE;
 }
 
 /*
  * Read the header from an ICO file.
  */
- 
-static int 
-ReadICOHeader( Tcl_Channel channel )
-{
-    WORD    Input;
-    DWORD        dwBytesRead;
+
+static int
+ReadICOHeader(Tcl_Channel channel) {
+    WORD Input;
+    DWORD dwBytesRead;
 
     /* Read the 'reserved' WORD */
-    if ((dwBytesRead = Tcl_Read(channel, (char *)&Input, sizeof(WORD))) < 0)
+    if ((dwBytesRead = Tcl_Read(channel, (char * ) & Input, sizeof(WORD))) < 0)
         return -1;
 
     /* Did we get a WORD? */
-    if (dwBytesRead != sizeof( WORD ))
+    if (dwBytesRead != sizeof(WORD))
         return -1;
 
     /* Was it 'reserved' ?   (ie 0) */
-    if( Input != 0 )
+    if (Input != 0)
         return -1;
 
     /* Read the type WORD */
-    if ((dwBytesRead = Tcl_Read(channel, (char *)&Input, sizeof(WORD))) < 0)
+    if ((dwBytesRead = Tcl_Read(channel, (char * ) & Input, sizeof(WORD))) < 0)
         return -1;
 
     /* Did we get a WORD? */
-    if( dwBytesRead != sizeof( WORD ) )
+    if (dwBytesRead != sizeof(WORD))
         return -1;
     /* Was it type 1? */
-    if( Input != 1 )
+    if (Input != 1)
         return -1;
 
     /* Get the count of images */
-    if ((dwBytesRead = Tcl_Read(channel, (char *)&Input, sizeof( WORD ))) < 0)
+    if ((dwBytesRead = Tcl_Read(channel, (char * ) & Input, sizeof(WORD))) < 0)
         return -1;
     /* Did we get a WORD? */
-    if( dwBytesRead != sizeof( WORD ) )
+    if (dwBytesRead != sizeof(WORD))
         return -1;
     /* Return the count */
-    return (int)Input;
+    return (int) Input;
 }
 
 /* 
@@ -446,365 +430,314 @@ ReadICOHeader( Tcl_Channel channel )
  * DrawIcon(hdc,x,y,hIcon) or , more complicated 
  * DrawIconEx32PlusMoreParameters ... 
  */
- 
+
 /* #define ICO_DRAW */
 #ifdef ICO_DRAW
-	#define RectWidth(r)            ((r).right - (r).left + 1)
-	#define RectHeight(r)           ((r).bottom - (r).top + 1)
-
-	/*
-	 * Using DIB functions, draw XOR mask on hDC in Rect.
-	 */ 
-
-	static BOOL 
-	DrawXORMask( HDC hDC, RECT Rect, LPLPICONIMAGE lpIcon )
-	{
-		int x, y;
-
-		/* Sanity checks */
-		if( lpIcon == NULL )
-			return FALSE;
-		if( lpIcon->lpBits == NULL )
-			return FALSE;
-
-		/* Account for height*2 thing */
-		lpIcon->lpbi->bmiHeader.biHeight /= 2;
-
-		/* Locate it */
-		x = Rect.left + ((RectWidth(Rect)-lpIcon->lpbi->bmiHeader.biWidth)/2);
-		y = Rect.top + ((RectHeight(Rect)-lpIcon->lpbi->bmiHeader.biHeight)/2);
-
-		/* Blast it to the screen */
-		SetDIBitsToDevice( hDC, x, y,
-			lpIcon->lpbi->bmiHeader.biWidth,
-			lpIcon->lpbi->bmiHeader.biHeight, 
-			0, 0, 0, lpIcon->lpbi->bmiHeader.biHeight,
-			lpIcon->lpXOR, lpIcon->lpbi, DIB_RGB_COLORS );
-
-		/* UnAccount for height*2 thing */
-		lpIcon->lpbi->bmiHeader.biHeight *= 2;
-
-		return TRUE;
-	}
-
-	/*
-	 * Using DIB functions, draw AND mask on hDC in Rect.
-	 */
- 
-	BOOL 
-	DrawANDMask( HDC hDC, RECT Rect, LPLPICONIMAGE lpIcon )
-	{
-		LPBITMAPINFO    lpbi;
-		int                    x, y;
-
-		/* Sanity checks */
-		if( lpIcon == NULL )
-			return FALSE;
-		if( lpIcon->lpBits == NULL )
-			return FALSE;
-
-		/* Need a bitmap header for the mono mask */
-		lpbi = ckalloc( sizeof(BITMAPINFO) + (2 * sizeof( RGBQUAD )) );
-		lpbi->bmiHeader.biSize = sizeof( BITMAPINFOHEADER );
-		lpbi->bmiHeader.biWidth = lpIcon->lpbi->bmiHeader.biWidth;
-		lpbi->bmiHeader.biHeight = lpIcon->lpbi->bmiHeader.biHeight/2;
-		lpbi->bmiHeader.biPlanes = 1;
-		lpbi->bmiHeader.biBitCount = 1;
-		lpbi->bmiHeader.biCompression = BI_RGB;
-		lpbi->bmiHeader.biSizeImage = 0;
-		lpbi->bmiHeader.biXPelsPerMeter = 0;
-		lpbi->bmiHeader.biYPelsPerMeter = 0;
-		lpbi->bmiHeader.biClrUsed = 0;
-		lpbi->bmiHeader.biClrImportant = 0;
-		lpbi->bmiColors[0].rgbRed = 0;
-		lpbi->bmiColors[0].rgbGreen = 0;
-		lpbi->bmiColors[0].rgbBlue = 0;
-		lpbi->bmiColors[0].rgbReserved = 0;
-		lpbi->bmiColors[1].rgbRed = 255;
-		lpbi->bmiColors[1].rgbGreen = 255;
-		lpbi->bmiColors[1].rgbBlue = 255;
-		lpbi->bmiColors[1].rgbReserved = 0;
-
-		/* Locate it */
-		x = Rect.left + ((RectWidth(Rect)-lpbi->bmiHeader.biWidth)/2);
-		y = Rect.top + ((RectHeight(Rect)-lpbi->bmiHeader.biHeight)/2);
-
-		/* Blast it to the screen */
-		SetDIBitsToDevice( hDC, x, y, lpbi->bmiHeader.biWidth, lpbi->bmiHeader.biHeight, 0, 0, 0, lpbi->bmiHeader.biHeight, lpIcon->lpAND, lpbi, DIB_RGB_COLORS );
-
-		/* clean up */
-		ckfree( (char*)lpbi );
-
-		return TRUE;
-	}
-#endif
+#define RectWidth(r)((r).right - (r).left + 1)
+#define RectHeight(r)((r).bottom - (r).top + 1)
 
 /*
- * Locate the image bits in a CF_DIB format DIB.
-*/
+ * Using DIB functions, draw XOR mask on hDC in Rect.
+ */
+
+static BOOL
+DrawXORMask(HDC hDC, RECT Rect, LPLPICONIMAGE lpIcon) {
+    int x, y;
+
+    /* Sanity checks */
+    if (lpIcon == NULL)
+        return FALSE;
+    if (lpIcon -> lpBits == NULL)
+        return FALSE;
+
+    /* Account for height*2 thing */
+    lpIcon -> lpbi -> bmiHeader.biHeight /= 2;
+
+    /* Locate it */
+    x = Rect.left + ((RectWidth(Rect) - lpIcon -> lpbi -> bmiHeader.biWidth) / 2);
+    y = Rect.top + ((RectHeight(Rect) - lpIcon -> lpbi -> bmiHeader.biHeight) / 2);
+
+    /* Blast it to the screen */
+    SetDIBitsToDevice(hDC, x, y,
+        lpIcon -> lpbi -> bmiHeader.biWidth,
+        lpIcon -> lpbi -> bmiHeader.biHeight,
+        0, 0, 0, lpIcon -> lpbi -> bmiHeader.biHeight,
+        lpIcon -> lpXOR, lpIcon -> lpbi, DIB_RGB_COLORS);
+
+    /* UnAccount for height*2 thing */
+    lpIcon -> lpbi -> bmiHeader.biHeight *= 2;
 
-static LPSTR 
-FindDIBBits( LPSTR lpbi )
-{
-    return ( lpbi + *(LPDWORD)lpbi + PaletteSize( lpbi ) );
+    return TRUE;
 }
 
+/*
+ * Using DIB functions, draw AND mask on hDC in Rect.
+ */
+
+BOOL
+DrawANDMask(HDC hDC, RECT Rect, LPLPICONIMAGE lpIcon) {
+    LPBITMAPINFO lpbi;
+    int x, y;
+
+    /* Sanity checks */
+    if (lpIcon == NULL)
+        return FALSE;
+    if (lpIcon -> lpBits == NULL)
+        return FALSE;
+
+    /* Need a bitmap header for the mono mask */
+    lpbi = ckalloc(sizeof(BITMAPINFO) + (2 * sizeof(RGBQUAD)));
+    lpbi -> bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
+    lpbi -> bmiHeader.biWidth = lpIcon -> lpbi -> bmiHeader.biWidth;
+    lpbi -> bmiHeader.biHeight = lpIcon -> lpbi -> bmiHeader.biHeight / 2;
+    lpbi -> bmiHeader.biPlanes = 1;
+    lpbi -> bmiHeader.biBitCount = 1;
+    lpbi -> bmiHeader.biCompression = BI_RGB;
+    lpbi -> bmiHeader.biSizeImage = 0;
+    lpbi -> bmiHeader.biXPelsPerMeter = 0;
+    lpbi -> bmiHeader.biYPelsPerMeter = 0;
+    lpbi -> bmiHeader.biClrUsed = 0;
+    lpbi -> bmiHeader.biClrImportant = 0;
+    lpbi -> bmiColors[0].rgbRed = 0;
+    lpbi -> bmiColors[0].rgbGreen = 0;
+    lpbi -> bmiColors[0].rgbBlue = 0;
+    lpbi -> bmiColors[0].rgbReserved = 0;
+    lpbi -> bmiColors[1].rgbRed = 255;
+    lpbi -> bmiColors[1].rgbGreen = 255;
+    lpbi -> bmiColors[1].rgbBlue = 255;
+    lpbi -> bmiColors[1].rgbReserved = 0;
+
+    /* Locate it */
+    x = Rect.left + ((RectWidth(Rect) - lpbi -> bmiHeader.biWidth) / 2);
+    y = Rect.top + ((RectHeight(Rect) - lpbi -> bmiHeader.biHeight) / 2);
+
+    /* Blast it to the screen */
+    SetDIBitsToDevice(hDC, x, y, lpbi -> bmiHeader.biWidth, lpbi -> bmiHeader.biHeight, 0, 0, 0, lpbi -> bmiHeader.biHeight, lpIcon -> lpAND, lpbi, DIB_RGB_COLORS);
+
+    /* clean up */
+    ckfree((char * ) lpbi);
+
+    return TRUE;
+}
+#endif
 
+/*
+ * Locate the image bits in a CF_DIB format DIB.
+ */
 
+static LPSTR
+FindDIBBits(LPSTR lpbi) {
+    return (lpbi + * (LPDWORD) lpbi + PaletteSize(lpbi));
+}
 
 static BOOL
-NotifyA (IcoInfo* icoPtr, int oper, HICON hIcon, char* txt,  char* msgtitle, char* msginfo) 
-{
+NotifyA(IcoInfo * icoPtr, int oper, HICON hIcon, char * txt) {
     NOTIFYICONDATAA ni;
     Tcl_DString dst;
-    Tcl_DString infodst;
-    Tcl_DString titledst;
-    CHAR* str;
-    CHAR* info;
-    CHAR* title;
+    CHAR * str;
 
     ni.cbSize = sizeof(NOTIFYICONDATAA);
     ni.hWnd = CreateTaskbarHandlerWindow();
-    ni.uID = icoPtr->id;
-    ni.uFlags = NIF_ICON | NIF_TIP | NIF_MESSAGE | NIF_INFO;
+    ni.uID = icoPtr -> id;
+    ni.uFlags = NIF_ICON | NIF_TIP | NIF_MESSAGE;
     ni.uCallbackMessage = ICON_MESSAGE;
-    ni.hIcon = (HICON)hIcon;
+    ni.hIcon = (HICON) hIcon;
 
     /* Tooltip text for system tray icon.*/
-    str = (CHAR*)Tcl_UtfToExternalDString(NULL, txt, -1, &dst);
+    str = (CHAR * ) Tcl_UtfToExternalDString(NULL, txt, -1, & dst);
     strncpy(ni.szTip, str, 63);
     ni.szTip[63] = 0;
-    Tcl_DStringFree(&dst);
-    /* Balloon notification for system tray icon. */
-     if (msgtitle != NULL) {
-      title = (CHAR*)Tcl_UtfToExternalDString(NULL, msgtitle, -1, &titledst);
-      strncpy(ni.szInfoTitle, msgtitle, Tcl_DStringLength(&titledst) + 1);
-      Tcl_DStringFree(&titledst);
-    }
-    if (msginfo != NULL) {
-      info = (CHAR*)Tcl_UtfToExternalDString(NULL, msginfo, -1, &infodst);
-      strncpy(ni.szInfo, msginfo, Tcl_DStringLength(&infodst) + 1);
-      Tcl_DStringFree(&infodst);
-    }
-    return notify_funcA(oper, &ni);
+    Tcl_DStringFree( & dst);
+
+    return notify_funcA(oper, & ni);
 }
 
 static BOOL
-NotifyW (IcoInfo* icoPtr, int oper, HICON hIcon,  char* txt,  char* msgtitle, char* msginfo) 
-{
+NotifyW(IcoInfo * icoPtr, int oper, HICON hIcon, char * txt) {
     NOTIFYICONDATAW ni;
     Tcl_DString dst;
-    Tcl_DString infodst;
-    Tcl_DString titledst;
-    WCHAR* str;
-    WCHAR* info;
-    WCHAR* title;
+    WCHAR * str;
     Tcl_Encoding Encoding;
 
     ni.cbSize = sizeof(NOTIFYICONDATAW);
     ni.hWnd = CreateTaskbarHandlerWindow();
-    ni.uID = icoPtr->id;
+    ni.uID = icoPtr -> id;
     ni.uFlags = NIF_ICON | NIF_TIP | NIF_MESSAGE;
     ni.uCallbackMessage = ICON_MESSAGE;
-    ni.hIcon=(HICON)hIcon;
+    ni.hIcon = (HICON) hIcon;
 
     Encoding = Tcl_GetEncoding(NULL, "unicode");
-    str = (WCHAR*)Tcl_UtfToExternalDString(Encoding, txt, -1, &dst);
+    str = (WCHAR * ) Tcl_UtfToExternalDString(Encoding, txt, -1, & dst);
     wcsncpy(ni.szTip, str, 63);
     ni.szTip[63] = 0;
-    Tcl_DStringFree(&dst);
-      /* Balloon notification for system tray icon. */
-     if (msgtitle != NULL) {
-      title = (WCHAR*)Tcl_UtfToExternalDString(Encoding, msgtitle, -1, &titledst);
-      wcsncpy(ni.szInfoTitle, msgtitle, Tcl_DStringLength(&titledst) + 1);
-      Tcl_DStringFree(&titledst);
-    }
-    if (msginfo != NULL) {
-      info = (WCHAR*)Tcl_UtfToExternalDString(Encoding, msginfo, -1, &infodst);
-      wcsncpy(ni.szInfo, msginfo, Tcl_DStringLength(&infodst) + 1);
-      Tcl_DStringFree(&infodst);
-    }
+    Tcl_DStringFree( & dst);
     Tcl_FreeEncoding(Encoding);
-    return notify_funcW(oper, &ni);
+    return notify_funcW(oper, & ni);
 }
 
-static int 
-TaskbarOperation (IcoInfo *icoPtr, int oper, HICON hIcon, char *txt,  char* msginfo, char* msgtitle) 
-{
+static int
+TaskbarOperation(IcoInfo * icoPtr, int oper, HICON hIcon, char * txt) {
     int result;
-    
+
     if (notify_funcA == NULL && notify_funcW == NULL && hmod == NULL) {
         hmod = GetModuleHandle("SHELL32.DLL");
         if (hmod == NULL)
             hmod = LoadLibrary("SHELL32.DLL");
         if (hmod == NULL) {
-            Tcl_AppendResult(icoPtr->interp, "Could not Load SHELL32.DLL",(char*)NULL);
+            Tcl_AppendResult(icoPtr -> interp, "Could not Load SHELL32.DLL", (char * ) NULL);
             return TCL_ERROR;
         }
-        notify_funcW = (LPFN_SHELLNOTIFYICONW)GetProcAddress(hmod, "Shell_NotifyIconW");
-        notify_funcA = (LPFN_SHELLNOTIFYICONA)GetProcAddress(hmod, "Shell_NotifyIconA");
+        notify_funcW = (LPFN_SHELLNOTIFYICONW) GetProcAddress(hmod, "Shell_NotifyIconW");
+        notify_funcA = (LPFN_SHELLNOTIFYICONA) GetProcAddress(hmod, "Shell_NotifyIconA");
         if (notify_funcW == NULL && notify_funcA == NULL) {
-            Tcl_AppendResult(icoPtr->interp,
-		"Could not get address of Shell_NotifyIconW or Shell_NotifyIconA",
-                (char*)NULL);
+            Tcl_AppendResult(icoPtr -> interp,
+                "Could not get address of Shell_NotifyIconW or Shell_NotifyIconA",
+                (char * ) NULL);
             return TCL_ERROR;
         }
     } else if (notify_funcA == NULL && notify_funcW == NULL) {
-        Tcl_AppendResult(icoPtr->interp,
-	    "You probably don't have a Windows shell", (char*)NULL);
+        Tcl_AppendResult(icoPtr -> interp,
+            "You probably don't have a Windows shell", (char * ) NULL);
         return TCL_ERROR;
     }
 
     if (notify_funcW != NULL) {
-      result = NotifyW(icoPtr, oper, hIcon, txt, msgtitle, msginfo) 
-        || NotifyA(icoPtr, oper, hIcon, txt, msgtitle, msginfo);
+        result = NotifyW(icoPtr, oper, hIcon, txt) ||
+            NotifyA(icoPtr, oper, hIcon, txt);
     } else {
-      result = NotifyA(icoPtr, oper, hIcon, txt, msgtitle, msginfo);
+        result = NotifyA(icoPtr, oper, hIcon, txt);
     }
 
-    Tcl_SetObjResult(icoPtr->interp, Tcl_NewIntObj(result));
+    Tcl_SetObjResult(icoPtr -> interp, Tcl_NewIntObj(result));
     if (result == 1) {
         if (oper == NIM_ADD || oper == NIM_MODIFY) {
-            icoPtr->taskbar_flags |= TASKBAR_ICON;
+            icoPtr -> taskbar_flags |= TASKBAR_ICON;
         }
         if (oper == NIM_DELETE) {
-            icoPtr->taskbar_flags &= ~TASKBAR_ICON;
+            icoPtr -> taskbar_flags &= ~TASKBAR_ICON;
         }
     }
     return TCL_OK;
 }
 
 static IcoInfo *
-NewIcon (Tcl_Interp *interp, HICON hIcon, 
-    int itype, LPICONRESOURCE lpIR, int iconpos) 
-{
-    static int nextId = 1;
-    int n;
-    char buffer[5 + TCL_INTEGER_SPACE];
-    IcoInfo* icoPtr;
-
-    icoPtr = (IcoInfo *) ckalloc((unsigned) (sizeof(IcoInfo)));
-    memset(icoPtr, 0, sizeof(IcoInfo));
-    icoPtr->id      = nextId;
-    icoPtr->hIcon   = hIcon;
-    icoPtr->itype   = itype;
-    icoPtr->lpIR    = lpIR;
-    icoPtr->iconpos = iconpos;
-    n = _snprintf(buffer, sizeof(buffer)-1, "ico#%d", icoPtr->id); buffer[n] = 0;
-    icoPtr->taskbar_txt = ckalloc((int)strlen(buffer)+1);
-    strcpy(icoPtr->taskbar_txt, buffer);
-    icoPtr->taskbar_info=NULL;
-    icoPtr->taskbar_title=NULL;
-    icoPtr->interp  = interp;
-    icoPtr->taskbar_command= NULL;
-    icoPtr->taskbar_flags = 0;
-    icoPtr->hwndFocus = NULL;
-    if (itype == ICO_LOAD) {
-        icoPtr->lpIR = (LPICONRESOURCE)NULL;
-        icoPtr->iconpos = 0;
+    NewIcon(Tcl_Interp * interp, HICON hIcon,
+        int itype, LPICONRESOURCE lpIR, int iconpos) {
+        static int nextId = 1;
+        int n;
+        char buffer[5 + TCL_INTEGER_SPACE];
+        IcoInfo * icoPtr;
+
+        icoPtr = (IcoInfo * ) ckalloc((unsigned)(sizeof(IcoInfo)));
+        memset(icoPtr, 0, sizeof(IcoInfo));
+        icoPtr -> id = nextId;
+        icoPtr -> hIcon = hIcon;
+        icoPtr -> itype = itype;
+        icoPtr -> lpIR = lpIR;
+        icoPtr -> iconpos = iconpos;
+        n = _snprintf(buffer, sizeof(buffer) - 1, "ico#%d", icoPtr -> id);
+        buffer[n] = 0;
+        icoPtr -> taskbar_txt = ckalloc((int) strlen(buffer) + 1);
+        strcpy(icoPtr -> taskbar_txt, buffer);
+        icoPtr -> interp = interp;
+        icoPtr -> taskbar_command = NULL;
+        icoPtr -> taskbar_flags = 0;
+        icoPtr -> hwndFocus = NULL;
+        if (itype == ICO_LOAD) {
+            icoPtr -> lpIR = (LPICONRESOURCE) NULL;
+            icoPtr -> iconpos = 0;
+        }
+        nextId += 1;
+        icoPtr -> nextPtr = firstIcoPtr;
+        firstIcoPtr = icoPtr;
+        Tcl_SetObjResult(interp, Tcl_NewStringObj(buffer, -1));
+        return icoPtr;
     }
-    nextId += 1;
-    icoPtr->nextPtr = firstIcoPtr;
-    firstIcoPtr = icoPtr;
-    Tcl_SetObjResult(interp, Tcl_NewStringObj(buffer, -1));
-    return icoPtr;
-}
 
-static void 
-FreeIcoPtr(Tcl_Interp *interp, IcoInfo *icoPtr)
-{
-    IcoInfo *prevPtr;
+static void
+FreeIcoPtr(Tcl_Interp * interp, IcoInfo * icoPtr) {
+    IcoInfo * prevPtr;
     if (firstIcoPtr == icoPtr) {
-        firstIcoPtr = icoPtr->nextPtr;
+        firstIcoPtr = icoPtr -> nextPtr;
     } else {
-        for (prevPtr = firstIcoPtr; prevPtr->nextPtr != icoPtr;
-             prevPtr = prevPtr->nextPtr) {
+        for (prevPtr = firstIcoPtr; prevPtr -> nextPtr != icoPtr; prevPtr = prevPtr -> nextPtr) {
             /* Empty loop body. */
         }
-        prevPtr->nextPtr = icoPtr->nextPtr;
+        prevPtr -> nextPtr = icoPtr -> nextPtr;
     }
-    if (icoPtr->taskbar_flags & TASKBAR_ICON) {
-        TaskbarOperation(icoPtr, NIM_DELETE, NULL, "", "", "");
+    if (icoPtr -> taskbar_flags & TASKBAR_ICON) {
+        TaskbarOperation(icoPtr, NIM_DELETE, NULL, "");
         Tcl_ResetResult(interp);
     }
-    if(icoPtr->itype==ICO_FILE){
-        FreeIconResource(icoPtr->lpIR);
-    }
-    if(icoPtr->taskbar_txt!=NULL) {
-        ckfree((char *) icoPtr->taskbar_txt);
+    if (icoPtr -> itype == ICO_FILE) {
+        FreeIconResource(icoPtr -> lpIR);
     }
-       if(icoPtr->taskbar_title!=NULL) {
-        ckfree((char *) icoPtr->taskbar_title);
+    if (icoPtr -> taskbar_txt != NULL) {
+        ckfree((char * ) icoPtr -> taskbar_txt);
     }
-          if(icoPtr->taskbar_info!=NULL) {
-        ckfree((char *) icoPtr->taskbar_info);
-    }
-    if(icoPtr->taskbar_command!=NULL) {
-        ckfree((char *) icoPtr->taskbar_command);
+
+    if (icoPtr -> taskbar_command != NULL) {
+        ckfree((char * ) icoPtr -> taskbar_command);
     }
-    ckfree((char *) icoPtr);
+    ckfree((char * ) icoPtr);
 }
 
-static IcoInfo* GetIcoPtr(Tcl_Interp* interp,char* string){
-    IcoInfo *icoPtr;
+static IcoInfo * GetIcoPtr(Tcl_Interp * interp, char * string) {
+    IcoInfo * icoPtr;
     int id;
-    char *end;
+    char * end;
 
     if (strncmp(string, "ico#", 4) != 0) {
         return NULL;
     }
     string += 4;
-    id = strtoul(string, &end, 10);
-    if ((end == string) || (*end != 0)) {
+    id = strtoul(string, & end, 10);
+    if ((end == string) || ( * end != 0)) {
         return NULL;
     }
-    for (icoPtr = firstIcoPtr; icoPtr != NULL;
-         icoPtr = icoPtr->nextPtr) {
-        if (icoPtr->id == id) {
+    for (icoPtr = firstIcoPtr; icoPtr != NULL; icoPtr = icoPtr -> nextPtr) {
+        if (icoPtr -> id == id) {
             return icoPtr;
         }
     }
     Tcl_AppendResult(interp, "icon \"", string,
-        "\" doesn't exist", (char *) NULL);
+        "\" doesn't exist", (char * ) NULL);
     return NULL;
 }
 
 static int
-GetInt(long theint, char *buffer, size_t len)
-{
+GetInt(long theint, char * buffer, size_t len) {
     snprintf(buffer, len, "0x%lx", theint);
-    buffer[len-1] = 0;
-    return (int)strlen(buffer);
+    buffer[len - 1] = 0;
+    return (int) strlen(buffer);
 }
 
 static int
-GetIntDec(long theint, char *buffer, size_t len)
-{
+GetIntDec(long theint, char * buffer, size_t len) {
     snprintf(buffer, len - 1, "%ld", theint);
-    buffer[len-1] = 0;
-    return (int)strlen(buffer);
+    buffer[len - 1] = 0;
+    return (int) strlen(buffer);
 }
 
-static char* 
-TaskbarExpandPercents(IcoInfo *icoPtr, char *msgstring,
-    WPARAM wParam, LPARAM lParam, char *before, char *after, int *aftersize)
-{
-#define SPACELEFT (*aftersize-(dst-after)-1)
-#define AFTERLEN ((*aftersize>0)?(*aftersize*2):1024)
-#define ALLOCLEN ((len>AFTERLEN)?(len*2):AFTERLEN)
-    char buffer[TCL_INTEGER_SPACE + 5];
-    char* dst;
-    dst = after;
-    while (*before) {
-        char *ptr=before;
-        int len=1;
-        if(*before=='%') {
-            switch(before[1]){
+static char *
+    TaskbarExpandPercents(IcoInfo * icoPtr, char * msgstring,
+        WPARAM wParam, LPARAM lParam, char * before, char * after, int * aftersize) {
+        #define SPACELEFT( * aftersize - (dst - after) - 1)
+        #define AFTERLEN(( * aftersize > 0) ? ( * aftersize * 2) : 1024)
+        #define ALLOCLEN((len > AFTERLEN) ? (len * 2) : AFTERLEN)
+        char buffer[TCL_INTEGER_SPACE + 5];
+        char * dst;
+        dst = after;
+        while ( * before) {
+            char * ptr = before;
+            int len = 1;
+            if ( * before == '%') {
+                switch (before[1]) {
                 case 'M':
                 case 'm': {
                     before++;
-                    len=(int)strlen(msgstring);
-                    ptr=msgstring;
+                    len = (int) strlen(msgstring);
+                    ptr = msgstring;
                     break;
                 }
                 /* case 'W': {
@@ -816,215 +749,239 @@ TaskbarExpandPercents(IcoInfo *icoPtr, char *msgstring,
                 */
                 case 'i': {
                     before++;
-                    snprintf(buffer, sizeof(buffer) - 1, "ico#%d", icoPtr->id);
-                    len=(int)strlen(buffer);
-                    ptr=buffer;
+                    snprintf(buffer, sizeof(buffer) - 1, "ico#%d", icoPtr -> id);
+                    len = (int) strlen(buffer);
+                    ptr = buffer;
                     break;
                 }
                 case 'w': {
                     before++;
-                    len=GetInt((long)wParam,buffer, sizeof(buffer));
-                    ptr=buffer;
+                    len = GetInt((long) wParam, buffer, sizeof(buffer));
+                    ptr = buffer;
                     break;
                 }
                 case 'l': {
                     before++;
-                    len=GetInt((long)lParam,buffer, sizeof(buffer));
-                    ptr=buffer;
+                    len = GetInt((long) lParam, buffer, sizeof(buffer));
+                    ptr = buffer;
                     break;
                 }
                 case 't': {
                     before++;
-                    len=GetInt((long)GetTickCount(), buffer, sizeof(buffer));
-                    ptr=buffer;
+                    len = GetInt((long) GetTickCount(), buffer, sizeof(buffer));
+                    ptr = buffer;
                     break;
                 }
                 case 'x': {
                     POINT pt;
-                    GetCursorPos(&pt);
+                    GetCursorPos( & pt);
                     before++;
-                    len=GetIntDec((long)pt.x, buffer, sizeof(buffer));
-                    ptr=buffer;
+                    len = GetIntDec((long) pt.x, buffer, sizeof(buffer));
+                    ptr = buffer;
                     break;
                 }
                 case 'y': {
                     POINT pt;
-                    GetCursorPos(&pt);
+                    GetCursorPos( & pt);
                     before++;
-                    len=GetIntDec((long)pt.y,buffer, sizeof(buffer));
-                    ptr=buffer;
+                    len = GetIntDec((long) pt.y, buffer, sizeof(buffer));
+                    ptr = buffer;
                     break;
                 }
                 case 'X': {
                     DWORD dw;
-                    dw=GetMessagePos();
+                    dw = GetMessagePos();
                     before++;
-                    len=GetIntDec((long)LOWORD(dw),buffer, sizeof(buffer));
-                    ptr=buffer;
+                    len = GetIntDec((long) LOWORD(dw), buffer, sizeof(buffer));
+                    ptr = buffer;
                     break;
                 }
                 case 'Y': {
                     DWORD dw;
-                    dw=GetMessagePos();
+                    dw = GetMessagePos();
                     before++;
-                    len=GetIntDec((long)HIWORD(dw),buffer, sizeof(buffer));
-                    ptr=buffer;
+                    len = GetIntDec((long) HIWORD(dw), buffer, sizeof(buffer));
+                    ptr = buffer;
                     break;
                 }
                 case 'H': {
                     before++;
-                    len = GetInt((long)icoPtr->hwndFocus, buffer, sizeof(buffer));
+                    len = GetInt((long) icoPtr -> hwndFocus, buffer, sizeof(buffer));
                     ptr = buffer;
                     break;
                 }
                 case '%': {
                     before++;
-                    len=1;
-                    ptr="%";
+                    len = 1;
+                    ptr = "%";
                     break;
                 }
+                }
             }
+            if (SPACELEFT < len) {
+                char * newspace;
+                ptrdiff_t dist = dst - after;
+                int alloclen = ALLOCLEN;
+                newspace = (char * ) ckalloc(alloclen);
+                if (dist > 0)
+                    memcpy((VOID * ) newspace, (VOID * ) after, dist);
+                if (after && * aftersize)
+                    ckfree(after);
+                * aftersize = alloclen;
+                after = newspace;
+                dst = after + dist;
+            }
+            if (len > 0)
+                memcpy(dst, ptr, len);
+            dst += len;
+            if ((dst - after) > ( * aftersize - 1))
+                printf("oops\n");
+            before++;
         }
-        if (SPACELEFT < len) {
-            char *newspace;
-            ptrdiff_t dist = dst - after;
-            int alloclen = ALLOCLEN;
-            newspace = (char *) ckalloc(alloclen);
-            if(dist>0)
-                memcpy((VOID *) newspace, (VOID *) after, dist);
-            if(after && *aftersize)
-                ckfree(after);
-            *aftersize =alloclen;
-            after = newspace;
-            dst=after+dist;
-        }
-        if(len>0)
-            memcpy(dst,ptr,len);
-        dst+=len;
-        if((dst-after)>(*aftersize-1))
-            printf("oops\n");
-        before++;
+        * dst = 0;
+        return after;
     }
-    *dst=0;
-    return after;
-}
 
-static void 
-TaskbarEval(IcoInfo* icoPtr,WPARAM wParam,LPARAM lParam) {
-    char* msgstring = "none";
+static void
+TaskbarEval(IcoInfo * icoPtr, WPARAM wParam, LPARAM lParam) {
+    char * msgstring = "none";
     char evalspace[200];
     int evalsize = 200;
-    char* expanded;
+    char * expanded;
     int fixup = 0;
 
     switch (lParam) {
-        case WM_MOUSEMOVE:
-            msgstring = "WM_MOUSEMOVE";
-            icoPtr->hwndFocus = GetFocus();
-            break;
-        case WM_LBUTTONDOWN  :msgstring="WM_LBUTTONDOWN";  fixup = 1; break;
-        case WM_LBUTTONUP    :msgstring="WM_LBUTTONUP";    fixup = 1; break;
-        case WM_LBUTTONDBLCLK:msgstring="WM_LBUTTONDBLCLK";fixup = 1; break;
-        case WM_RBUTTONDOWN  :msgstring="WM_RBUTTONDOWN";  fixup = 1; break;
-        case WM_RBUTTONUP    :msgstring="WM_RBUTTONUP";    fixup = 1; break;
-        case WM_RBUTTONDBLCLK:msgstring="WM_RBUTTONDBLCLK";fixup = 1; break;
-        case WM_MBUTTONDOWN  :msgstring="WM_MBUTTONDOWN";  fixup = 1; break;
-        case WM_MBUTTONUP    :msgstring="WM_MBUTTONUP";    fixup = 1; break;
-        case WM_MBUTTONDBLCLK:msgstring="WM_MBUTTONDBLCLK";fixup = 1; break;
-        default:              msgstring = "WM_NULL";       fixup = 0;
-    }
-    expanded = TaskbarExpandPercents(icoPtr,msgstring,wParam,lParam,
-        icoPtr->taskbar_command,evalspace, &evalsize);
-    if (icoPtr->interp!=NULL) {
+    case WM_MOUSEMOVE:
+        msgstring = "WM_MOUSEMOVE";
+        icoPtr -> hwndFocus = GetFocus();
+        break;
+    case WM_LBUTTONDOWN:
+        msgstring = "WM_LBUTTONDOWN";
+        fixup = 1;
+        break;
+    case WM_LBUTTONUP:
+        msgstring = "WM_LBUTTONUP";
+        fixup = 1;
+        break;
+    case WM_LBUTTONDBLCLK:
+        msgstring = "WM_LBUTTONDBLCLK";
+        fixup = 1;
+        break;
+    case WM_RBUTTONDOWN:
+        msgstring = "WM_RBUTTONDOWN";
+        fixup = 1;
+        break;
+    case WM_RBUTTONUP:
+        msgstring = "WM_RBUTTONUP";
+        fixup = 1;
+        break;
+    case WM_RBUTTONDBLCLK:
+        msgstring = "WM_RBUTTONDBLCLK";
+        fixup = 1;
+        break;
+    case WM_MBUTTONDOWN:
+        msgstring = "WM_MBUTTONDOWN";
+        fixup = 1;
+        break;
+    case WM_MBUTTONUP:
+        msgstring = "WM_MBUTTONUP";
+        fixup = 1;
+        break;
+    case WM_MBUTTONDBLCLK:
+        msgstring = "WM_MBUTTONDBLCLK";
+        fixup = 1;
+        break;
+    default:
+        msgstring = "WM_NULL";
+        fixup = 0;
+    }
+    expanded = TaskbarExpandPercents(icoPtr, msgstring, wParam, lParam,
+        icoPtr -> taskbar_command, evalspace, & evalsize);
+    if (icoPtr -> interp != NULL) {
         int result;
         HWND hwnd = NULL;
-        
+
         /* See http//:support.microsoft.com/kb/q135788 */
         if (fixup) {
-            if (icoPtr->hwndFocus != NULL && IsWindow(icoPtr->hwndFocus)) {
-                hwnd = icoPtr->hwndFocus;
+            if (icoPtr -> hwndFocus != NULL && IsWindow(icoPtr -> hwndFocus)) {
+                hwnd = icoPtr -> hwndFocus;
             } else {
-                Tk_Window tkwin = Tk_MainWindow(icoPtr->interp);
+                Tk_Window tkwin = Tk_MainWindow(icoPtr -> interp);
                 hwnd = Tk_GetHWND(Tk_WindowId(tkwin));
             }
             SetForegroundWindow(hwnd);
         }
-        
-        result = Tcl_GlobalEval(icoPtr->interp, expanded);
-        
+
+        result = Tcl_GlobalEval(icoPtr -> interp, expanded);
+
         if (hwnd != NULL) {
             /* See http:/ /support.microsoft.com/kb/q135788/ */
             PostMessage(hwnd, WM_NULL, 0, 0);
         }
         if (result != TCL_OK) {
             char buffer[100];
-            sprintf(buffer, "\n  (command bound to taskbar-icon ico#%d)",icoPtr->id);
-            Tcl_AddErrorInfo(icoPtr->interp, buffer);
-            Tcl_BackgroundError(icoPtr->interp);
+            sprintf(buffer, "\n  (command bound to taskbar-icon ico#%d)", icoPtr -> id);
+            Tcl_AddErrorInfo(icoPtr -> interp, buffer);
+            Tcl_BackgroundError(icoPtr -> interp);
         }
     }
     if (expanded != evalspace) {
         ckfree(expanded);
     }
-}
-\
+}\
 /*
  * Windows callback procedure, if ICON_MESSAGE arrives, try to execute
  * the taskbar_command
  */
 
-static LRESULT CALLBACK 
-TaskbarHandlerProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) 
-{
+static LRESULT CALLBACK
+TaskbarHandlerProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) {
     static UINT msgTaskbarCreated = 0;
-    IcoInfo *icoPtr = NULL;
+    IcoInfo * icoPtr = NULL;
 
     switch (message) {
-        case WM_CREATE:
-            msgTaskbarCreated = RegisterWindowMessage(TEXT("TaskbarCreated"));
-            break;
-
-        case ICON_MESSAGE:
-            for (icoPtr = firstIcoPtr; icoPtr != NULL;
-                 icoPtr = icoPtr->nextPtr) {
-                if (wParam == (WPARAM)icoPtr->id) {
-                    if (icoPtr->taskbar_command != NULL) {
-                        TaskbarEval(icoPtr, wParam, lParam);
-                    }
+    case WM_CREATE:
+        msgTaskbarCreated = RegisterWindowMessage(TEXT("TaskbarCreated"));
+        break;
+
+    case ICON_MESSAGE:
+        for (icoPtr = firstIcoPtr; icoPtr != NULL; icoPtr = icoPtr -> nextPtr) {
+            if (wParam == (WPARAM) icoPtr -> id) {
+                if (icoPtr -> taskbar_command != NULL) {
+                    TaskbarEval(icoPtr, wParam, lParam);
                 }
             }
-            break;
-            
-        default:
-            /* 
-             * Check to see if explorer has been restarted and we ned to
-             * re-add our icons.
-             */
-            if (message == msgTaskbarCreated) {
-                for (icoPtr = firstIcoPtr; icoPtr != NULL;
-                     icoPtr = icoPtr->nextPtr) {
-                    if (icoPtr->taskbar_flags & TASKBAR_ICON) {
-			HICON hIcon = icoPtr->hIcon;
-			if (icoPtr->iconpos != 0 && icoPtr->lpIR != NULL) {
-			    hIcon = icoPtr->lpIR->IconImages[icoPtr->iconpos].hIcon;
-			}
-                        TaskbarOperation(icoPtr, NIM_ADD, hIcon, icoPtr->taskbar_txt, "", "");
+        }
+        break;
+
+    default:
+        /* 
+         * Check to see if explorer has been restarted and we ned to
+         * re-add our icons.
+         */
+        if (message == msgTaskbarCreated) {
+            for (icoPtr = firstIcoPtr; icoPtr != NULL; icoPtr = icoPtr -> nextPtr) {
+                if (icoPtr -> taskbar_flags & TASKBAR_ICON) {
+                    HICON hIcon = icoPtr -> hIcon;
+                    if (icoPtr -> iconpos != 0 && icoPtr -> lpIR != NULL) {
+                        hIcon = icoPtr -> lpIR -> IconImages[icoPtr -> iconpos].hIcon;
                     }
+                    TaskbarOperation(icoPtr, NIM_ADD, hIcon, icoPtr -> taskbar_txt);
                 }
             }
-            return DefWindowProc(hwnd, message, wParam, lParam);
+        }
+        return DefWindowProc(hwnd, message, wParam, lParam);
     }
-    return 0L;
+    return 0 L;
 }
 
 /*
  * Registers the handler window class
  */
-static int 
-RegisterHandlerClass(HINSTANCE hInstance)
-{
+static int
+RegisterHandlerClass(HINSTANCE hInstance) {
     WNDCLASS wndclass;
-    memset(&wndclass,0,sizeof(WNDCLASS));
+    memset( & wndclass, 0, sizeof(WNDCLASS));
     wndclass.style = 0;
     wndclass.lpfnWndProc = TaskbarHandlerProc;
     wndclass.cbClsExtra = 0;
@@ -1035,310 +992,345 @@ RegisterHandlerClass(HINSTANCE hInstance)
     wndclass.hbrBackground = (HBRUSH) GetStockObject(WHITE_BRUSH);
     wndclass.lpszMenuName = NULL;
     wndclass.lpszClassName = HANDLER_CLASS;
-    return RegisterClass(&wndclass);
+    return RegisterClass( & wndclass);
 }
 
 /*
  *Creates a hidden window to handle taskbar messages
  */
-static HWND 
-CreateTaskbarHandlerWindow(void) 
-{
+static HWND
+CreateTaskbarHandlerWindow(void) {
     static int registered = 0;
     HINSTANCE hInstance = GETHINSTANCE;
     if (handlerWindow)
         return handlerWindow;
-    if (!registered){
+    if (!registered) {
         if (!RegisterHandlerClass(hInstance))
             return 0;
         registered = 1;
     }
-    return (handlerWindow = CreateWindow(HANDLER_CLASS,"",WS_OVERLAPPED,0,0,
-        CW_USEDEFAULT,CW_USEDEFAULT,NULL, NULL, hInstance, NULL));
+    return (handlerWindow = CreateWindow(HANDLER_CLASS, "", WS_OVERLAPPED, 0, 0,
+        CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, hInstance, NULL));
 }
 
 static void
-DestroyHandlerWindow(void) 
-{
-    if(handlerWindow)
+DestroyHandlerWindow(void) {
+    if (handlerWindow)
         DestroyWindow(handlerWindow);
 }
 
-static char * 
-StandardIcon(CONST84 char* arg){
-    if (!stricmp(arg, "application"))
-        return IDI_APPLICATION;
-    if (!stricmp(arg, "asterisk"))
-        return IDI_ASTERISK;
-    if (!stricmp(arg, "error"))
-        return IDI_ERROR;
-    if (!stricmp(arg, "exclamation"))
-        return IDI_EXCLAMATION;
-    if (!stricmp(arg, "hand"))
-        return IDI_HAND;
-    if (!stricmp(arg, "question"))
-        return IDI_QUESTION;
-    if (!stricmp(arg, "information"))
-        return IDI_INFORMATION;
-    if (!stricmp(arg, "warning"))
-        return IDI_WARNING;
-    if (!stricmp(arg, "winlogo"))
-        return IDI_WINLOGO;
-    return NULL;
-}
+static char *
+    StandardIcon(CONST84 char * arg) {
+        if (!stricmp(arg, "application"))
+            return IDI_APPLICATION;
+        if (!stricmp(arg, "asterisk"))
+            return IDI_ASTERISK;
+        if (!stricmp(arg, "error"))
+            return IDI_ERROR;
+        if (!stricmp(arg, "exclamation"))
+            return IDI_EXCLAMATION;
+        if (!stricmp(arg, "hand"))
+            return IDI_HAND;
+        if (!stricmp(arg, "question"))
+            return IDI_QUESTION;
+        if (!stricmp(arg, "information"))
+            return IDI_INFORMATION;
+        if (!stricmp(arg, "warning"))
+            return IDI_WARNING;
+        if (!stricmp(arg, "winlogo"))
+            return IDI_WINLOGO;
+        return NULL;
+    }
 
 /*
  * Tries to get a valid window handle from a Tk-pathname for a toplevel.
  */
 static int
-NameOrHandle(Tcl_Interp* interp, char* arg,HWND* hwndPtr)
-{
-#define WINFO_FRAME "wm frame "
+NameOrHandle(Tcl_Interp * interp, char * arg, HWND * hwndPtr) {
+    #define WINFO_FRAME "wm frame "
     Tk_Window tkwin;
     size_t limit = 0;
     char * cmd;
 
-    if (Tcl_GetInt(interp,arg,(int*)hwndPtr) == TCL_OK) {
-        return TCL_OK; 
+    if (Tcl_GetInt(interp, arg, (int * ) hwndPtr) == TCL_OK) {
+        return TCL_OK;
     }
     Tcl_ResetResult(interp);
-    tkwin = Tk_NameToWindow(interp, arg,Tk_MainWindow(interp));
+    tkwin = Tk_NameToWindow(interp, arg, Tk_MainWindow(interp));
     if (tkwin == NULL) {
-        Tcl_AppendResult(interp,arg," is no valid windowpath",(char*)NULL);
+        Tcl_AppendResult(interp, arg, " is no valid windowpath", (char * ) NULL);
         return TCL_ERROR;
     }
-    if(!Tk_IsTopLevel(tkwin)) {
-        Tcl_AppendResult(interp, arg, 
-            " is not a toplevel valid windowpath", (char*)NULL);
+    if (!Tk_IsTopLevel(tkwin)) {
+        Tcl_AppendResult(interp, arg,
+            " is not a toplevel valid windowpath", (char * ) NULL);
         return TCL_ERROR;
     }
     limit = strlen(arg) + strlen(WINFO_FRAME);
     cmd = ckalloc((int) limit + 1);
     strcpy(cmd, WINFO_FRAME);
     strcat(cmd, arg);
-    if (Tcl_Eval(interp,cmd) == TCL_ERROR) {
-        return TCL_ERROR; 
+    if (Tcl_Eval(interp, cmd) == TCL_ERROR) {
+        return TCL_ERROR;
     }
-    strncpy(cmd, Tcl_GetStringResult(interp), limit); cmd[limit] = 0;
-    if (sscanf(cmd, "0x%x", (int*)hwndPtr) != 1){
-        Tcl_AppendResult(interp,"couldn't scan ", cmd, (char*)NULL);
+    strncpy(cmd, Tcl_GetStringResult(interp), limit);
+    cmd[limit] = 0;
+    if (sscanf(cmd, "0x%x", (int * ) hwndPtr) != 1) {
+        Tcl_AppendResult(interp, "couldn't scan ", cmd, (char * ) NULL);
         return TCL_ERROR;
     }
-    if (*hwndPtr == NULL){
+    if ( * hwndPtr == NULL) {
         Tcl_AppendResult(interp, "couldn't get windowid from ",
-            cmd, (char*)NULL);
+            cmd, (char * ) NULL);
         return TCL_ERROR;
     }
     return TCL_OK;
 }
 
-static void 
-WinIcoDestroy (ClientData clientData) 
-{
-    IcoInfo* icoPtr;
-    IcoInfo* nextPtr;
-    Tcl_Interp* interp=(Tcl_Interp*)clientData;
+static void
+WinIcoDestroy(ClientData clientData) {
+    IcoInfo * icoPtr;
+    IcoInfo * nextPtr;
+    Tcl_Interp * interp = (Tcl_Interp * ) clientData;
     DestroyHandlerWindow();
-    for (icoPtr = firstIcoPtr; icoPtr != NULL;
-         icoPtr = nextPtr) {
-        nextPtr=icoPtr->nextPtr;
-        FreeIcoPtr(interp,icoPtr);
+    for (icoPtr = firstIcoPtr; icoPtr != NULL; icoPtr = nextPtr) {
+        nextPtr = icoPtr -> nextPtr;
+        FreeIcoPtr(interp, icoPtr);
     }
 }
 
-static int 
-WinIcoCmd(ClientData clientData, Tcl_Interp *interp,
-          int argc, CONST84 char *argv[])
-{
-  size_t length;
-  HICON hIcon;
-  int i;
-  IcoInfo* icoPtr;
-  if (argc < 2) {
-    Tcl_AppendResult(interp, "wrong # args: should be \"",
-                     argv[0], " option ?arg arg ...?\"", (char *) NULL);
-    return TCL_ERROR;
-  }
-    
-  length = strlen(argv[1]);
-  if ((strncmp(argv[1], "createfrom", length) == 0) && (length >= 2)) {
-    LPICONRESOURCE lpIR = NULL;
-    int pos = 0;
-    if(argc<3) {
-      Tcl_AppendResult(interp,"wrong # args,must be:",
-                       argv[0]," createfrom <icofilename> ",(char*)NULL);
-      return TCL_ERROR;
-    }
-    lpIR=ReadIconFromICOFile(interp,argv[2]);
-    if(lpIR==NULL){
-      Tcl_AppendResult(interp,"reading of ",argv[2]," failed!",(char*)NULL);
-      return TCL_ERROR;
-    }
-    hIcon=NULL;
-    for( i = 0; i < lpIR->nNumImages; i++ ) {
-      /*take the first or a 32x32 16 color icon*/
-      if(i==0 ||
-         (lpIR->IconImages[i].Height==32 && lpIR->IconImages[i].Width==32
-          && lpIR->IconImages[i].Colors==4)){
-        hIcon=lpIR->IconImages[i].hIcon;
-        pos=i;
-      }
-    }
-    if(hIcon==NULL){
-      FreeIconResource(lpIR);
-      Tcl_AppendResult(interp,"Could not find an icon in ",argv[2],(char*)NULL);
-      return TCL_ERROR;
-    }
-    NewIcon(interp,hIcon,ICO_FILE,lpIR,pos);
-  } else if ((strncmp(argv[1], "delete", length) == 0)
-             && (length >= 2)) {
-    if (argc != 3) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"",
-                       argv[0], " delete ?id?\"", (char *) NULL);
-      return TCL_ERROR;
-    }
-    icoPtr = GetIcoPtr(interp, (char*)argv[2]);
-    if (icoPtr == NULL) {
-      Tcl_ResetResult(interp);
-      return TCL_OK;
-    }
-    FreeIcoPtr(interp,icoPtr);
-    return TCL_OK;
-  }  else if ((strncmp(argv[1], "text", length) == 0) && (length >= 2)) {
-    if (argc < 3) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"",
-                       argv[0], " text <id> ?newtext?\"", (char *) NULL);
-      return TCL_ERROR;
-    }
-    if(( icoPtr = GetIcoPtr(interp, (char*)argv[2])) == NULL ) return TCL_ERROR;
-    if(argc>3){
-      char* newtxt=(char*)argv[3];
-      if(icoPtr->taskbar_txt!=NULL){
-        ckfree(icoPtr->taskbar_txt);
-      }
-      icoPtr->taskbar_txt=ckalloc((int)strlen(newtxt)+1);
-      strcpy(icoPtr->taskbar_txt,newtxt);
-    }
-    Tcl_AppendResult(interp,icoPtr->taskbar_txt,(char*)NULL);
-    return TCL_OK;
-  }  else if ((strncmp(argv[1], "balloon", length) == 0) && (length >= 2)) {
-    if (argc < 4) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"",
-                       argv[0], " notify <id> ?title? ?info?\"", (char *) NULL);
-      return TCL_ERROR;
+static int
+WinIcoCmd(ClientData clientData, Tcl_Interp * interp,
+    int argc, CONST84 char * argv[]) {
+    size_t length;
+    HICON hIcon;
+    int i;
+    IcoInfo * icoPtr;
+    if (argc < 2) {
+        Tcl_AppendResult(interp, "wrong # args: should be \"",
+            argv[0], " option ?arg arg ...?\"", (char * ) NULL);
+        return TCL_ERROR;
     }
-    if(( icoPtr = GetIcoPtr(interp, (char*)argv[2])) == NULL ) return TCL_ERROR;
-    if(argc>3){
-      char* newtitle=(char*)argv[3];
-      if(icoPtr->taskbar_title!=NULL){
-        ckfree(icoPtr->taskbar_title);
-      }
-      icoPtr->taskbar_title=ckalloc((int)strlen(newtitle)+1);
-      strcpy(icoPtr->taskbar_title,newtitle);
-      char* newinfo=(char*)argv[4];
-      if(icoPtr->taskbar_info!=NULL){
-        ckfree(icoPtr->taskbar_info);
-      }
-      icoPtr->taskbar_info=ckalloc((int)strlen(newinfo)+1);
-      strcpy(icoPtr->taskbar_info,newinfo);			
+
+    length = strlen(argv[1]);
+    if ((strncmp(argv[1], "createfrom", length) == 0) && (length >= 2)) {
+        LPICONRESOURCE lpIR = NULL;
+        int pos = 0;
+        if (argc < 3) {
+            Tcl_AppendResult(interp, "wrong # args,must be:",
+                argv[0], " createfrom <icofilename> ", (char * ) NULL);
+            return TCL_ERROR;
+        }
+        lpIR = ReadIconFromICOFile(interp, argv[2]);
+        if (lpIR == NULL) {
+            Tcl_AppendResult(interp, "reading of ", argv[2], " failed!", (char * ) NULL);
+            return TCL_ERROR;
+        }
+        hIcon = NULL;
+        for (i = 0; i < lpIR -> nNumImages; i++) {
+            /*take the first or a 32x32 16 color icon*/
+            if (i == 0 ||
+                (lpIR -> IconImages[i].Height == 32 && lpIR -> IconImages[i].Width == 32 &&
+                    lpIR -> IconImages[i].Colors == 4)) {
+                hIcon = lpIR -> IconImages[i].hIcon;
+                pos = i;
+            }
+        }
+        if (hIcon == NULL) {
+            FreeIconResource(lpIR);
+            Tcl_AppendResult(interp, "Could not find an icon in ", argv[2], (char * ) NULL);
+            return TCL_ERROR;
+        }
+        NewIcon(interp, hIcon, ICO_FILE, lpIR, pos);
+    } else if ((strncmp(argv[1], "delete", length) == 0) &&
+        (length >= 2)) {
+        if (argc != 3) {
+            Tcl_AppendResult(interp, "wrong # args: should be \"",
+                argv[0], " delete ?id?\"", (char * ) NULL);
+            return TCL_ERROR;
+        }
+        icoPtr = GetIcoPtr(interp, (char * ) argv[2]);
+        if (icoPtr == NULL) {
+            Tcl_ResetResult(interp);
+            return TCL_OK;
+        }
+        FreeIcoPtr(interp, icoPtr);
+        return TCL_OK;
+    } else if ((strncmp(argv[1], "text", length) == 0) && (length >= 2)) {
+        if (argc < 3) {
+            Tcl_AppendResult(interp, "wrong # args: should be \"",
+                argv[0], " text <id> ?newtext?\"", (char * ) NULL);
+            return TCL_ERROR;
+        }
+        if ((icoPtr = GetIcoPtr(interp, (char * ) argv[2])) == NULL) return TCL_ERROR;
+        if (argc > 3) {
+            char * newtxt = (char * ) argv[3];
+            if (icoPtr -> taskbar_txt != NULL) {
+                ckfree(icoPtr -> taskbar_txt);
+            }
+            icoPtr -> taskbar_txt = ckalloc((int) strlen(newtxt) + 1);
+            strcpy(icoPtr -> taskbar_txt, newtxt);
+        }
+        Tcl_AppendResult(interp, icoPtr -> taskbar_txt, (char * ) NULL);
+        return TCL_OK;
+    } else if ((strncmp(argv[1], "taskbar", length) == 0) && (length >= 2)) {
+        char * callback = NULL;
+        int oper;
+        char ** args;
+        int c;
+        int length;
+        int count;
+        int newpos;
+        char * txt;
+        if (argc < 4) {
+            Tcl_AppendResult(interp, "wrong # args: should be \"",
+                argv[0], " taskbar <add/delete/modify> <id> ?-callback <callback>? \"", (char * ) NULL);
+            return TCL_ERROR;
+        }
+        if (strcmp(argv[2], "add") == 0) {
+            oper = NIM_ADD;
+        } else if (strncmp(argv[2], "del", 3) == 0) {
+            oper = NIM_DELETE;
+        } else if (strncmp(argv[2], "mod", 3) == 0) {
+            oper = NIM_MODIFY;
+        } else {
+            Tcl_AppendResult(interp, "bad argument ", argv[2], "should be add, delete or modify", (char * ) NULL);
+            return TCL_ERROR;
+        }
+        if ((icoPtr = GetIcoPtr(interp, (char * ) argv[3])) == NULL)
+            return TCL_ERROR;
+        hIcon = icoPtr -> hIcon;
+        txt = icoPtr -> taskbar_txt;
+        if (argc > 4) {
+            for (count = argc - 4, args = (char ** ) argv + 4; count > 1; count -= 2, args += 2) {
+                if (args[0][0] != '-')
+                    goto wrongargs2;
+                c = args[0][1];
+                length = (int) strlen(args[0]);
+                if ((c == '-') && (length == 2)) {
+                    break;
+                }
+                if ((c == 'c') && (strncmp(args[0], "-callback", length) == 0)) {
+                    callback = args[1];
+                } else if ((c == 't') && (strncmp(args[0], "-text", length) == 0)) {
+                    txt = args[1];
+                } else {
+                    goto wrongargs2;
+                }
+            }
+            if (count == 1)
+                goto wrongargs2;
+        }
+        if (callback != NULL) {
+            if (icoPtr -> taskbar_command != NULL) {
+                ckfree((char * ) icoPtr -> taskbar_command);
+            }
+            icoPtr -> taskbar_command = ckalloc((int) strlen(callback) + 1);
+            strcpy(icoPtr -> taskbar_command, callback);
+        }
+        return TaskbarOperation(icoPtr, oper, hIcon, txt);
+        wrongargs2:
+            Tcl_AppendResult(interp, "unknown option \"", args[0], "\",valid are:",
+                "-callback <tcl-callback>  -text <tooltiptext>", (char * ) NULL);
+        return TCL_ERROR;
+    } else {
+        Tcl_AppendResult(interp, "bad argument \"", argv[1],
+            "\": must be  createfrom, info, hicon, pos, text, taskbar",
+            (char * ) NULL);
+        return TCL_ERROR;
     }
-    Tcl_AppendResult(interp,icoPtr->taskbar_title,(char*)NULL);
-    Tcl_AppendResult(interp,icoPtr->taskbar_info,(char*)NULL);
     return TCL_OK;
-  } else if ((strncmp(argv[1], "taskbar", length) == 0)  && (length >= 2)) {
-    char* callback=NULL;
-    int oper;
-    char ** args;
-    int c;
-    int length;
-    int count;
-    int newpos;
-    char* txt;
-    if (argc < 4) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"",
-                       argv[0], " taskbar <add/delete/modify> <id> ?-callback <callback>? \"", (char *) NULL);
-      return TCL_ERROR;
+}
+
+/*
+ * Balloon notification in system tray.
+ */
+static int
+WinSystrayCmd(ClientData clientData, Tcl_Interp * interp,
+    int argc, CONST84 char * argv[]) {
+    size_t length;
+    HICON hIcon;
+    int i;
+    IcoInfo * icoPtr;
+
+    icoPtr = GetIcoPtr(interp, (char * ) argv[2]);
+    if (icoPtr == NULL) {
+        Tcl_ResetResult(interp);
+        return TCL_OK;
     }
-    if (strcmp(argv[2],"add")==0) {
-      oper = NIM_ADD;
-    } else if(strncmp(argv[2],"del",3)==0 ) {
-      oper = NIM_DELETE;
-    } else if(strncmp(argv[2],"mod",3)==0 ) {
-      oper = NIM_MODIFY;
-    } else {
-      Tcl_AppendResult(interp,"bad argument ",argv[2], "should be add,delete or modify",(char*)NULL);
-      return TCL_ERROR;
+    Tcl_DString infodst;
+    Tcl_DString titledst;
+
+    NOTIFYICONDATAA ni;
+    ni.cbSize = sizeof(NOTIFYICONDATAA);
+    ni.hWnd = CreateTaskbarHandlerWindow();
+    ni.uID = icoPtr -> id;
+    ni.uFlags = NIF_INFO;
+    ni.uCallbackMessage = ICON_MESSAGE;
+    ni.hIcon = (HICON) hIcon;
+
+    if (argc < 2) {
+        Tcl_AppendResult(interp, "wrong # args: should be \"",
+            argv[0], " option ?arg arg ...?\"", (char * ) NULL);
+        return TCL_ERROR;
     }
-    if ((icoPtr = GetIcoPtr(interp, (char *)argv[3])) == NULL )
-      return TCL_ERROR;
-    hIcon = icoPtr->hIcon;
-    txt = icoPtr->taskbar_txt;
-    if (argc > 4) {
-      for (count = argc-4, args = (char**)argv+4; count > 1; count -= 2, args += 2) {
-        if (args[0][0] != '-')
-          goto wrongargs2;
-        c = args[0][1];
-        length = (int)strlen(args[0]);
-        if ((c == '-') && (length == 2)) {
-          break;
+
+    length = strlen(argv[1]);
+    if ((strncmp(argv[1], "notify", length) == 0) &&
+        (length >= 2)) {
+        if (argc != 5) {
+            Tcl_AppendResult(interp, "wrong # args: should be \"",
+                argv[0], " notify ?id? ?title? ?detail?\ ", (char * ) NULL);
+            return TCL_ERROR;
         }
-        if ((c == 'c') && (strncmp(args[0], "-callback", length) == 0)) {
-          callback = args[1];
-        } else if ((c == 't') && (strncmp(args[0], "-text", length) == 0)) {
-          txt = args[1];
-        } else {
-          goto wrongargs2;
+
+        char * msgtitle = (char * ) argv[3];
+        char * msginfo = (char * ) argv[4];
+        char * title;
+        char * info;
+
+        /* Balloon notification for system tray icon. */
+        if (msgtitle != NULL) {
+            title = (CHAR * ) Tcl_UtfToExternalDString(NULL, msgtitle, -1, & titledst);
+            strncpy(ni.szInfoTitle, msgtitle, Tcl_DStringLength( & titledst) + 1);
+            Tcl_DStringFree( & titledst);
         }
-      }
-      if(count==1)
-        goto wrongargs2;
-    }
-    if(callback!=NULL ) {
-      if (icoPtr->taskbar_command!=NULL) {
-        ckfree((char*)icoPtr->taskbar_command);
-      }
-      icoPtr->taskbar_command=ckalloc((int)strlen(callback)+1);
-      strcpy(icoPtr->taskbar_command,callback);
+        if (msginfo != NULL) {
+            info = (CHAR * ) Tcl_UtfToExternalDString(NULL, msginfo, -1, & infodst);
+            strncpy(ni.szInfo, msginfo, Tcl_DStringLength( & infodst) + 1);
+            Tcl_DStringFree( & infodst);
+        }
+
+        Shell_NotifyIcon(NIM_MODIFY, & ni);
+        return TCL_OK;
     }
-    return TaskbarOperation(icoPtr, oper, hIcon, txt, "", "");
-  wrongargs2:
-    Tcl_AppendResult(interp, "unknown option \"", args[0],"\",valid are:",
-                     "-callback <tcl-callback>  -text <tooltiptext>", (char *) NULL);
-    return TCL_ERROR;
-  } else {
-    Tcl_AppendResult(interp, "bad argument \"", argv[1],
-                     "\": must be  createfrom, info, hicon, pos, text, taskbar",
-                     (char *) NULL);
-    return TCL_ERROR;
-  }
-  return TCL_OK;
 }
 
-int 
-WinIcoInit (Tcl_Interp* interp) 
-{
+int
+WinIcoInit(Tcl_Interp * interp) {
     OSVERSIONINFO info;
-#ifdef USE_TCL_STUBS
-    if (Tcl_InitStubs (interp, TCL_VERSION, 0) == NULL) {
+    #ifdef USE_TCL_STUBS
+    if (Tcl_InitStubs(interp, TCL_VERSION, 0) == NULL) {
         return TCL_ERROR;
     }
-#endif
-#ifdef USE_TK_STUBS
-    if (Tk_InitStubs (interp, TK_VERSION, 0) == NULL) {
+    #endif
+    #ifdef USE_TK_STUBS
+    if (Tk_InitStubs(interp, TK_VERSION, 0) == NULL) {
         return TCL_ERROR;
     }
-#endif
+    #endif
 
     info.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-    GetVersionEx(&info);
+    GetVersionEx( & info);
     isWin32s = (info.dwPlatformId == VER_PLATFORM_WIN32s);
-    
-    Tcl_CreateCommand(interp, "_winico", WinIcoCmd, (ClientData)interp,
-        (Tcl_CmdDeleteProc *) WinIcoDestroy);
-		return TCL_OK;
- 
-}
 
+    Tcl_CreateCommand(interp, "_winico", WinIcoCmd, (ClientData) interp,
+        (Tcl_CmdDeleteProc * ) WinIcoDestroy);
+    Tcl_CreateCommand(interp, "_systray", WinSystrayCmd, (ClientData) interp,
+        NULL);
+    return TCL_OK;
+
+}
 
 /*
  * Local variables: