[Virtuawin-cvs] Defines.h, 1.60, 1.61 DiskRoutines.c, 1.66, 1.67 DiskRoutines.h, 1.25, 1.26 VirtuaWin.c, 1.190, 1.191 VirtuaWin.h, 1.62, 1.63

[Steven P. <bj...@us...>]

Update of /cvsroot/virtuawin
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv25386

Modified Files:
	Defines.h DiskRoutines.c DiskRoutines.h VirtuaWin.c 
	VirtuaWin.h 
Log Message:
2980468 Renamed some types in preparation for module menu interface.

Index: Defines.h
===================================================================
RCS file: /cvsroot/virtuawin/Defines.h,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- Defines.h	1 Apr 2010 08:23:43 -0000	1.60
+++ Defines.h	1 Apr 2010 09:30:11 -0000	1.61
@@ -154,14 +154,14 @@
     HWND      handle;
     TCHAR     description[vwMODULENAME_MAX+1];
     vwUByte   disabled;
-} moduleType;
+} vwModule ;
 
 /* Holds disabled modules */
 typedef struct {
     TCHAR     moduleName[vwMODULENAME_MAX+1];
-} disModules;
+} vwDisModule ;
 
-/* vwMenuItem - Structure used by the window list menu */
+/* vwListItem - Structure used by the window list menu */
 typedef struct {
     TCHAR    *name;
     HICON     icon; 
@@ -169,7 +169,7 @@
     vwUShort  id;
     vwUByte   desk;
     vwUByte   sticky;
-} vwMenuItem ;
+} vwListItem ;
 
 /* vwHotkey - Structure to store a hotkey binding */
 #define vwHOTKEY_ALT       MOD_ALT

Index: DiskRoutines.h
===================================================================
RCS file: /cvsroot/virtuawin/DiskRoutines.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- DiskRoutines.h	10 Sep 2009 17:12:17 -0000	1.25
+++ DiskRoutines.h	1 Apr 2010 09:30:11 -0000	1.26
@@ -39,8 +39,8 @@
 #endif
 
 void GetFilename(eFileNames filetype, int location, TCHAR *outStr);
-int  loadDisabledModules(disModules *theDisList);
-void saveDisabledList(int theNOfModules, moduleType* theModList);
+int  loadDisabledModules(vwDisModule *theDisList);
+void saveDisabledList(int theNOfModules, vwModule *theModList);
 void loadWindowConfig(void);
 void saveWindowConfig(void);
 void loadVirtuawinConfig(void);

Index: VirtuaWin.c
===================================================================
RCS file: /cvsroot/virtuawin/VirtuaWin.c,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -d -r1.190 -r1.191
--- VirtuaWin.c	1 Apr 2010 08:56:29 -0000	1.190
+++ VirtuaWin.c	1 Apr 2010 09:30:11 -0000	1.191
@@ -108,15 +108,15 @@
 
 int desktopWorkArea[2][4] ;
 
-vwHotkey   hotkeyList[vwHOTKEY_MAX];         // list for holding hotkeys
+vwHotkey      hotkeyList[vwHOTKEY_MAX];      // list for holding hotkeys
 vwWindowBase *windowHash[vwWINHASH_SIZE];    // hash table for all windows
 vwWindowBase *windowBaseList;                // list of all windows
 vwWindow     *windowList;                    // list of managed windows
 vwWindow     *windowFreeList;                // list of free, ready for reuse
 vwWindowBase *windowBaseFreeList;            // list of free, ready for reuse
 vwWindowRule *windowRuleList;                // list for holding window rules
-moduleType moduleList[MAXMODULES];           // list that holds modules
-disModules disabledModules[MAXMODULES*2];    // list with disabled modules
+vwModule      moduleList[MAXMODULES];        // list that holds modules
+vwDisModule   disabledModules[MAXMODULES*2]; // list with disabled modules
 
 UINT RM_Shellhook;
 UINT RM_TaskbarCreated;         // Message used to broadcast taskbar restart 
@@ -2979,10 +2979,10 @@
 #define vwWINLIST_MAX    vwPMENU_ID_MASK
 
 static int
-winListCreateItemList(int flags, vwMenuItem **items,int *numitems)
+winListCreateItemList(int flags, vwListItem **items,int *numitems)
 {
     vwWindow *win, *ww ;
-    vwMenuItem *item;
+    vwListItem *item;
     TCHAR *buff, title[vwWINDOWNAME_MAX+18] ;
     int i, len, x, y, listContent=(winListContent & ~(vwWINLIST_ASSIGN|vwWINLIST_TITLELN)) ;
     
@@ -3040,7 +3040,7 @@
             }
             GetWindowText(win->handle, buff, len);
             
-            if(((item = malloc(sizeof(vwMenuItem))) == NULL) ||
+            if(((item = malloc(sizeof(vwListItem))) == NULL) ||
                ((item->name = _tcsdup(title)) == NULL))
             {
                 while(--i >= 0)
@@ -3180,7 +3180,7 @@
 }
 
 static HMENU
-winListCreateMenu(int flags, int itemCount, vwMenuItem **items)
+winListCreateMenu(int flags, int itemCount, vwListItem **items)
 {
     MENUITEMINFO minfo ;
     HMENU hMenu ;
@@ -4131,11 +4131,11 @@
 {
     HDC testdc;
     HFONT menufont,oldfont;
-    vwMenuItem* item;
+    vwListItem* item;
     SIZE size;
     TCHAR *measuretext;
 
-    item = (vwMenuItem*) mitem->itemData;
+    item = (vwListItem*) mitem->itemData;
 
     measuretext = (item != NULL) ? item->name : _T("D") ;
 
@@ -4164,7 +4164,7 @@
 static void
 renderMenuItem(DRAWITEMSTRUCT* ditem)
 {
-    vwMenuItem* item;
+    vwListItem* item;
     HFONT menufont,oldfont;
     HICON icon;
     UINT oldalign;
@@ -4173,7 +4173,7 @@
     SIZE size;
     int backgroundcolor,textcolor, ll;
 
-    item = (vwMenuItem *) ditem->itemData;
+    item = (vwListItem *) ditem->itemData;
 
     if((item != NULL) && (ditem->itemState & ODS_SELECTED))
     {
@@ -4228,7 +4228,7 @@
 popupWinListMenu(HWND aHWnd, int wlFlags)
 {
     static int singleColumn=0;
-    vwMenuItem *items[vwWINLIST_MAX] ;
+    vwListItem *items[vwWINLIST_MAX] ;
     int itemCount;
     HMENU hpopup ;
     POINT pt ;
@@ -4342,7 +4342,7 @@
     else if(fgWin != NULL)
         setForegroundWin(fgWin,0) ;
     
-    // delete vwMenuItem list
+    // delete vwListItem list
     for (ii=0 ; ii<itemCount ; ii++)
     {
         free(items[ii]->name);

Index: VirtuaWin.h
===================================================================
RCS file: /cvsroot/virtuawin/VirtuaWin.h,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- VirtuaWin.h	13 Mar 2010 02:05:02 -0000	1.62
+++ VirtuaWin.h	1 Apr 2010 09:30:11 -0000	1.63
@@ -44,8 +44,8 @@
 extern vwHotkey hotkeyList[vwHOTKEY_MAX];         // list for holding hotkeys
 
 extern int curDisabledMod;                        // how many disabled modules we have
-extern moduleType moduleList[MAXMODULES];         // list that holds modules
-extern disModules disabledModules[MAXMODULES*2];  // list with disabled modules
+extern vwModule moduleList[MAXMODULES];           // list that holds modules
+extern vwDisModule disabledModules[MAXMODULES*2]; // list with disabled modules
 
 /* logging defines & macros */
 extern vwUByte vwLogFlag ;

Index: DiskRoutines.c
===================================================================
RCS file: /cvsroot/virtuawin/DiskRoutines.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- DiskRoutines.c	28 Mar 2010 23:22:57 -0000	1.66
+++ DiskRoutines.c	1 Apr 2010 09:30:11 -0000	1.67
@@ -208,7 +208,7 @@
  * Loads module names that should be disabled
  */
 int
-loadDisabledModules(disModules *theDisList)
+loadDisabledModules(vwDisModule *theDisList)
 {
     TCHAR buff[MAX_PATH];
     int len, nOfDisMod = 0;
@@ -240,7 +240,7 @@
  * Write out the disabled modules
  */
 void
-saveDisabledList(int theNOfModules, moduleType* theModList)
+saveDisabledList(int theNOfModules, vwModule *theModList)
 {
     TCHAR DisabledFileList[MAX_PATH];
     FILE* fp;