Changeset 1486 for trunk/dll/command.c

Timestamp:

Dec 17, 2009, 1:36:04 AM (16 years ago)

Author:

Gregg Young

Message:

Initial changes to commands handling. Allows you to reorder commands menu without breaking toolbars and changing hotkeys. Fixes the environment so it is used and so it is deleted if the command is deleted. Allows for user defined bitmaps in toolbars which are named based on the text or the the ID of the command.The new commands.dat will not be usable with earlier versions of FM/2

File:

• trunk/dll/command.c (modified) (20 diffs)

trunk/dll/command.c

@@ -65 +65 @@
 {
   PSZ pszCmdLine;
-  INT flags;
   CHAR title[100];
+  ULONG flags;
+  ULONG ID;
+  ULONG HotKeyID;
 }
 COMMAND;
@@ -75 +77 @@
 static PSZ pszSrcFile = __FILE__;
 static LINKCMDS *cmdtail;
+static INT CommandDatVersion = 0;
 
 #pragma data_seg(GLOBAL2)
 LINKCMDS *cmdhead;
 BOOL cmdloaded;
+BOOL UsedCommandIDs[300];
+BOOL UsedHotKeyIDs[20];
 
 MRESULT EXPENTRY CommandTextProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
@@ -344 +349 @@
   LINKCMDS *info;
   PSZ pszCmdLine;
+  CHAR *p;
   CHAR title[100];
   CHAR flags[34];
+  CHAR ID[34];
+  CHAR HotKeyID[34];
 
   if (cmdhead)
@@ -355 +363 @@
     fp = _fsopen(pszCmdLine, "r", SH_DENYWR);
     if (fp) {
+      xfgets(title, sizeof(title), fp, pszSrcFile, __LINE__);
+      lstrip(title);
+      if (!strnicmp(title, "Version", 7) && !CommandDatVersion) {
+        p = title + 7;
+        while (*p == ' ')
+          p++;
+        bstripcr(p);
+        CommandDatVersion = atol(p);
+      }
       while (!feof(fp)) {
         if (!xfgets_bstripcr(title, sizeof(title), fp, pszSrcFile, __LINE__))
@@ -365 +382 @@
         if (!xfgets_bstripcr(flags, sizeof(flags), fp, pszSrcFile, __LINE__))
           break;                                /* error! */
+        if (CommandDatVersion) {
+          if (!xfgets_bstripcr(ID, sizeof(ID), fp, pszSrcFile, __LINE__))
+            break;                              /* error! */
+          ID[34] = 0;
+          if (!xfgets_bstripcr(HotKeyID, sizeof(HotKeyID), fp, pszSrcFile, __LINE__))
+            break;                              /* error! */
+          ID[34] = 0;
+        }
         pszCmdLine[strlen(pszCmdLine)] = 0;                     // fixme to know why chopped this way?
         //bstripcr(pszCmdLine);
@@ -380 +405 @@
           info->title = xstrdup(title, pszSrcFile, __LINE__);
           info->flags = atol(flags);
+          if (CommandDatVersion) {
+            info->ID = atol(ID);
+            info->HotKeyID = atol(HotKeyID);
+          }
           if (!info->pszCmdLine || !info->title) {
             xfree(info->pszCmdLine, pszSrcFile, __LINE__);
@@ -412 +441 @@
   FILE *fp;
   CHAR s[CCHMAXPATH + 14];
+  INT x = 0;
 
   if (!cmdloaded || !cmdhead)
@@ -421 +451 @@
   fp = xfopen(s, "w", pszSrcFile, __LINE__);
   if (fp) {
+    //Adds line for version tracking
+    fprintf(fp,"Version 2\n");
     fputs(GetPString(IDS_COMMANDFILETEXT), fp);
     info = cmdhead;
     while (info) {
-      fprintf(fp,
-              ";\n%0.99s\n%0.*s\n%lu\n",
-              info->title, MaxComLineStrg, info->pszCmdLine, info->flags);
+      //This updates the old commands.dat file to the new format
+      //assigning the IDs based on file order
+      if (!info->ID) {
+        info->ID = IDM_COMMANDSTART + x;
+        UsedCommandIDs[x] = TRUE;
+        if (x < 20) {
+          info->HotKeyID = IDM_COMMANDNUM0 + x;
+          UsedHotKeyIDs[x] = TRUE;
+        }
+      }
+        fprintf(fp, ";\n%0.99s\n%0.*s\n%lu\n%lu\n%lu\n",
+                info->title, MaxComLineStrg, info->pszCmdLine,
+                info->flags, info->ID, info->HotKeyID);
+      //else
+      //  fprintf(fp,
+      //          ";\n%0.99s\n%0.*s\n%lu\n",
+      //          info->title, MaxComLineStrg, info->pszCmdLine, info->flags);
+      x++;
       info = info->next;
-    }
+    } // while
+    PrfWriteProfileData(fmprof, FM3Str, "UsedCommandIDs", &UsedCommandIDs,
+                        sizeof(BOOL) * 300);
+    PrfWriteProfileData(fmprof, FM3Str, "UsedHotKeyIDs", &UsedHotKeyIDs,
+                        sizeof(BOOL) * 20);
     fclose(fp);
-  }
+  } // if (fp)
 }
 
 //== add_command() Add command to list ==
 
-LINKCMDS *add_command(COMMAND * addme)
+LINKCMDS *add_command(COMMAND *addme)
 {
   LINKCMDS *info;
+  ULONG size;
+  INT x;
 
   if (!addme || !*addme->pszCmdLine || !*addme->title)
@@ -452 +505 @@
   info->pszCmdLine = xstrdup(addme->pszCmdLine, pszSrcFile, __LINE__);
   info->title = xstrdup(addme->title, pszSrcFile, __LINE__);
+  info->HotKeyID = addme->HotKeyID;
+  if (!info->ID) {
+    PrfQueryProfileData(fmprof, FM3Str, "UsedCommandIDs", &UsedCommandIDs,
+                        &size); //profile updated by save_commands
+    for (x = 0; x < 300; x++) {
+      if (!UsedCommandIDs[x]) {
+        info->ID = IDM_COMMANDSTART + x;
+        break;
+      }
+    }
+  }
   if (addme->flags)
     info->flags = addme->flags;
-  if (!info->pszCmdLine || !info->title) {
+  if (!info->pszCmdLine || !info->title || !info->ID) {
     xfree(info->pszCmdLine, pszSrcFile, __LINE__);
     xfree(info->title, pszSrcFile, __LINE__);
@@ -479 +543 @@
     while (info) {
       if (!stricmp(info->title, killme)) {
+        UsedCommandIDs[info->ID - IDM_COMMANDSTART] = FALSE;
+        if (info->HotKeyID)
+          UsedHotKeyIDs[info->HotKeyID - IDM_COMMANDNUM0] = FALSE;
         if (info == cmdhead) {
           cmdhead = info->next;
@@ -818 +885 @@
           bstripcr(env);
           if (*env) {
-            PrfWriteProfileString(fmprof, FM3Str, temp.pszCmdLine, env);
+            PrfWriteProfileString(fmprof, FM3Str, temp.title, env);
           }
           x = (SHORT) WinSendDlgItemMsg(hwnd,
@@ -846 +913 @@
 
         WinQueryDlgItemText(hwnd, CMD_TITLE, 100, temp);
-        bstrip(temp);
+        bstrip(temp);
+        PrfWriteProfileString(fmprof, FM3Str, temp, NULL);
         if (!kill_command(temp))
           Runtime_Error(pszSrcFile, __LINE__, "kill_command");
@@ -908 +976 @@
         WinQueryDlgItemText(hwnd, CMD_TITLE, sizeof(temp.title), temp.title);
         bstrip(temp.title);
+        PrfWriteProfileString(fmprof, FM3Str, temp.title, NULL);
         if (kill_command(temp.title)){
           x = (SHORT) WinSendDlgItemMsg(hwnd,
@@ -953 +1022 @@
           bstripcr(env);
           if (*env) {
-            PrfWriteProfileString(fmprof, FM3Str, temp.pszCmdLine, env);
+            PrfWriteProfileString(fmprof, FM3Str, temp.title, env);
           } //put item back in original place
           x = (SHORT) WinSendDlgItemMsg(hwnd,
@@ -1019 +1088 @@
   LINKCMDS *info;
 
+  DbgMsg(pszSrcFile, __LINE__,"ID %i", cx);
   list = BuildList(hwnd);
   x = 0;
   info = cmdhead;
   while (info) {
-    x++;
-    if (x == cx)
-      break;
+    //x++;
+    if (cx < 4300) {
+      if (info->ID == cx)
+        break;
+    }
+    else {
+      if (info->HotKeyID == cx)
+        break;
+    }
     info = info->next;
   }
@@ -1031 +1107 @@
 
     INT flags;
+    CHAR env[1002];
 
     x--;
@@ -1041 +1118 @@
       flags |= SEPARATE;
     flags &= ~(KEEP | DIEAFTER);
+    PrfQueryProfileString(fmprof, FM3Str, info->title, NullStr, env, sizeof(env));
     if (!strchr(info->pszCmdLine, '%')) {
       CHAR *fakelist[2];
@@ -1048 +1126 @@
       ExecOnList(hwnd,
                  info->pszCmdLine,
-                 flags, NULL, fakelist, GetPString(IDS_EXECCMDTITLETEXT),
+                 flags, env, fakelist, GetPString(IDS_EXECCMDTITLETEXT),
                  pszSrcFile, __LINE__);
     }
@@ -1062 +1140 @@
         ExecOnList(hwnd,
                    info->pszCmdLine,
-                   flags, NULL, fakelist, GetPString(IDS_EXECCMDTITLETEXT),
+                   flags, env, fakelist, GetPString(IDS_EXECCMDTITLETEXT),
                    pszSrcFile, __LINE__);
       }
@@ -1069 +1147 @@
       ExecOnList(hwnd,
                  info->pszCmdLine,
-                 flags, NULL, list, GetPString(IDS_EXECCMDTITLETEXT),
+                 flags, env, list, GetPString(IDS_EXECCMDTITLETEXT),
                  pszSrcFile, __LINE__);
     else