Changeset 928 for trunk/dll

Timestamp:

Jan 18, 2008, 4:08:02 AM (18 years ago)

Author:

Gregg Young

Message:

Dir containers now save basic presparams on a per container basis. Ticket 3

Location:

trunk/dll

Files:

• fm3dll.h (modified) (1 diff)
• mainwnd.c (modified) (4 diffs)
• pathutil.c (modified) (1 diff)
• presparm.c (modified) (1 diff)

trunk/dll/fm3dll.h

@@ -601 +601 @@
 VOID PresParamChanged(HWND hwnd, CHAR * keyroot, MPARAM mp1, MPARAM mp2);
 VOID RestorePresParams(HWND hwnd, CHAR * keyroot);
+VOID SavePresParams(HWND hwnd, CHAR * keyroot);
 
 /* dirs.c */

trunk/dll/mainwnd.c

@@ -2501 +2501 @@
       if (hps) {
         GpiCreateLogColorTable(hps, 0, LCOLF_RGB, 0, 0, NULL);
-        WinQueryPresParam(hwnd,              /* Window handle         */
-                          PP_BACKGROUNDCOLOR,  /* Background presparam  */
-                          0,
-                          NULL,
-                          sizeof(lColor),      /* Length of data buffer */
-                          &lColor,             /* Data buffer returned  */
-                          0);
+        WinQueryPresParam(hwnd, PP_BACKGROUNDCOLOR, 0, NULL,
+                          sizeof(lColor), &lColor, 0);
         WinQueryWindowRect(hwnd, &rcl);
         WinFillRect(hps, &rcl, lColor);
@@ -2518 +2513 @@
   case WM_PRESPARAMCHANGED:
     PresParamChanged(hwnd, "ToolBar", mp1, mp2);
-    WinInvalidateRect(hwnd, NULL, TRUE);
     break;
 
@@ -2883 +2877 @@
               PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & dcd->detailscrtime,
                                   sizeof(BOOL));
+              sprintf(szKey, "%sDirCnr.%lu", szPrefix, numsaves);
+              SavePresParams(hwndDir, szKey);
             }
             sprintf(szKey, "%sDirCnrDir.%lu", szPrefix, numsaves++);
@@ -3186 +3182 @@
                                       JBSDBG PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
                                   }
+          sprintf(szKey, "%sDirCnr.%lu", szPrefix, x);
+          RestorePresParams(hwndClient, szKey);
+          SavePresParams(hwndClient, "DirCnr");
           hwndDir = (HWND) WinSendMsg(hwndClient,
                                       UM_SETDIR,

trunk/dll/pathutil.c

@@ -124 +124 @@
 
   bstrip(pszCmdLine_);
+  memset(pszWorkBuf, 0, MAXCOMLINESTRG);
   strcpy(szCmdLine, pszCmdLine_);
   if (szCmdLine[0] != '\0') {

trunk/dll/presparm.c

@@ -461 +461 @@
 }
 
+  /** SavePresParams
+   * Save the presentation parameters used by RestorePresParams
+   */
+VOID SavePresParams(HWND hwnd, CHAR *keyroot)
+{
+
+
+  ULONG AttrFound, AttrValue[64], cbRetLen, x = 0,
+    AttrName[] = { PP_FONTNAMESIZE, PP_FOREGROUNDCOLOR,
+    PP_BACKGROUNDCOLOR, PP_HILITEBACKGROUNDCOLOR,
+    PP_HILITEFOREGROUNDCOLOR, PP_BORDERCOLOR, 0 };
+
+  while (AttrName[x]) {
+    cbRetLen = WinQueryPresParam(hwnd,
+                                 AttrName[x],
+                                 0,
+                                 &AttrFound,
+                                 sizeof(AttrValue),
+                                 &AttrValue, 0);
+    if (cbRetLen){
+      CHAR s[133];
+
+    *s = 0;
+    switch (AttrFound) {
+    case PP_BACKGROUNDCOLOR:
+      sprintf(s, "%s.Backgroundcolor", keyroot);
+      break;
+    case PP_FOREGROUNDCOLOR:
+      sprintf(s, "%s.Foregroundcolor", keyroot);
+      break;
+    case PP_HILITEBACKGROUNDCOLOR:
+      sprintf(s, "%s.Hilitebackgroundcolor", keyroot);
+      break;
+    case PP_HILITEFOREGROUNDCOLOR:
+      sprintf(s, "%s.Hiliteforegroundcolor", keyroot);
+      break;
+    case PP_BORDERCOLOR:
+      sprintf(s, "%s.Bordercolor", keyroot);
+      break;
+    case PP_FONTNAMESIZE:
+      sprintf(s, "%s.Fontnamesize", keyroot);
+      break;
+    default:
+      break;
+    }
+    if (*s)
+      PrfWriteProfileData(fmprof, appname, s, (PVOID) AttrValue, cbRetLen);
+    }
+    x++;
+  } //while
+}
+
 #pragma alloc_text(PRESPARAM,CopyPresParams,SetPresParams,IfNoParam)
-#pragma alloc_text(PRESPARAM,PresParamChanged,RestorePresParams)
+#pragma alloc_text(PRESPARAM,PresParamChanged,RestorePresParams,SavePresParams)
 #pragma alloc_text(PRESPARAM,StoreWndPresParams)