WebSVN – filter_foundry – Diff – /trunk/main.c

         /* Workaround for GIMP/PSPI, to avoid that formulas vanish when you re-open the main window.
            The reason is a bug in PSPI: The host should preserve the value of pb->parameters, which PSPI does not do.
            Also, all global variables are unloaded, so the plugin cannot preserve any data.
            Workaround in FF 1.7: If the host GIMP is detected, the new flag persistent_savestate will be set.
-           This mode saves the filter data into a temporary file "tmp.afs" and loads it
+           This mode saves the filter data into a temporary file "FilterFoundryGIMP.afs" and loads it
            when the window is opened again. */
-#if MAC_ENV
-        if (pb->hostSig == 'GIMP') persistent_savestate = true;
+        // GIMP/PSPI uses the hostSig "GIMP" (string!) which is the Windows OSType 'PMIG'.
-#else
+        // There are no further steps to do for Mac OS, because PSPI will not be available for Mac OS
         if (pb->hostSig == 'PMIG') persistent_savestate = true;
-#endif
         if(selector != filterSelectorAbout && !*data){
                 BufferID tempId;
                 if( (*result = PS_BUFFER_ALLOC(sizeof(globals_t), &tempId)) )
                         return;
                 /* wantdialog = false means that we never got a Parameters call, so we're not supposed to ask user */
                 if( wantdialog && (!gdata->standalone || gdata->parm.popDialog) ){
                         if( maindialog(pb) ){
                                 if (persistent_savestate) {
+                                        // GIMP Workaround: Save settings in "FilterFoundryGIMP.afs", becase pb->parameters is not preserved by GIMP/PSPI
+                                        char outfilename[255];
+                                        char* tempdir;
                                         StandardFileReply sfr;
                                         sfr.sfGood = true;
                                         sfr.sfReplacing = true;
                                         sfr.sfType = PS_FILTER_FILETYPE;
+                                        tempdir = getenv("TMP");
+                                        #ifdef WIN_ENV
+                                        if (strlen(tempdir) > 0) strcat(tempdir, "\\");
+                                        #else
+                                        if (strlen(tempdir) > 0) strcat(tempdir, "/");
+                                        #endif
+                                        sprintf(outfilename, "%sFilterFoundryGIMP.afs", tempdir);
-                                        myc2pstrcpy(sfr.sfFile.name, "tmp.afs");
+                                        myc2pstrcpy(sfr.sfFile.name, outfilename);
-                                        sfr.nFileExtension = 3; // length of "tmp"
+                                        sfr.nFileExtension = strlen(outfilename)-strlen(".afs");
                                         sfr.sfScript = 0; // FIXME: is that ok?
                                         savefile(&sfr);
+                                }
                                 /* update stored parameters from new user settings */
 int checkandinitparams(Handle params){
         char *reasonstr,*reason;
         int i,f,showdialog;
         if (persistent_savestate) {
+                // GIMP Workaround: Load settings in "FilterFoundryGIMP.afs", becase pb->parameters is not preserved by GIMP/PSPI
+                char outfilename[255];
+                char* tempdir;
                 StandardFileReply sfr;
                 sfr.sfGood = true;
                 sfr.sfReplacing = true;
                 sfr.sfType = PS_FILTER_FILETYPE;
+                tempdir = getenv("TMP");
+                #ifdef WIN_ENV
+                if (strlen(tempdir) > 0) strcat(tempdir, "\\");
+                #else
+                if (strlen(tempdir) > 0) strcat(tempdir, "/");
+                #endif
+                sprintf(outfilename, "%sFilterFoundryGIMP.afs", tempdir);
-                myc2pstrcpy(sfr.sfFile.name, "tmp.afs");
+                myc2pstrcpy(sfr.sfFile.name, outfilename);
-                sfr.nFileExtension = 3; // length of "tmp"
+                sfr.nFileExtension = strlen(outfilename) - strlen(".afs");
                 sfr.sfScript = 0; // FIXME: is that ok?
                 if (loadfile(&sfr, &reason)) return true;
+        }
         if( (f = !(params && readparams(params,false,&reasonstr))) ){
         saveparams(params);
         return f || showdialog;
+}
-int64_t MaxSpace(){
+int64_t maxspace(){
         if (gpb->maxSpace64 != 0) {
                 // If this is non-zero, the host either support 64-bit OR the host ignored the rule "set reserved fields to 0".
                 uint64_t maxSpace64 = gpb->maxSpace64;
                 return maxSpace64;
         } else {
                 uint64_t maxSpace64 = maxSpace32;
                 return maxSpace64;
+        }
+}
+int maxspace_available() {
+        // GIMP sets MaxSpace to hardcoded 100 MB
+        // GIMP/PSPI uses the hostSig "GIMP" (string!) which is the Windows OSType 'PMIG'.
+        // There are no further steps to do for Mac OS, because PSPI will not be available for Mac OS
+        if (gpb->hostSig == 'PMIG') return false;
+        return true;
+}
 void DoPrepare(FilterRecordPtr pb){
         int i;
         for(i = 4; i--;){
                 if(expr[i]||tree[i]) DBG("expr[] or tree[] non-NULL in Prepare!");
                 maxSpace = space;
         pb->maxSpace = maxSpace;
         */
         // New variant:
+        if (maxspace_available()) {
-        pb->maxSpace = (MaxSpace()/10.)*9; // don't ask for more than 90% of available memory
+                pb->maxSpace = (maxspace()/10.)*9; // don't ask for more than 90% of available memory
+        }
+}
 void RequestNext(FilterRecordPtr pb,long toprow){
         /* Request next block of the image */

Subversion Repositories filter_foundry

filter_foundry/trunk/main.c – Rev 181 → 182