From 8ed751f3cdd5b4250203dbeae3de4007a4b2a3b6 Mon Sep 17 00:00:00 2001 From: benfry Date: Sun, 21 Sep 2003 21:28:53 +0000 Subject: [PATCH] duplicate -> replicate in PdeTokenMarker, and changes to the launcher --- build/windows/launcher/launcher.cpp | 48 +++++++++++++++++++++++++++-- todo.txt | 21 +++++++------ 2 files changed, 57 insertions(+), 12 deletions(-) diff --git a/build/windows/launcher/launcher.cpp b/build/windows/launcher/launcher.cpp index d7b19b2da..80d6b496c 100644 --- a/build/windows/launcher/launcher.cpp +++ b/build/windows/launcher/launcher.cpp @@ -8,7 +8,8 @@ // 2) if the user has a long path, and it gets copied five times over for the // classpath, the program runs the risk of crashing. Bad bad. -#define JAVA_ARGS "-Xms64m -Xmx64m " +//#define JAVA_ARGS "-Xms64m -Xmx64m " +#define JAVA_ARGS "-Xms128m -Xmx128m " #define JAVA_MAIN_CLASS "PdeBase" #include @@ -65,6 +66,13 @@ WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmd, int nShow) //const char *envClasspath = getenv("CLASSPATH"); char *env_classpath = (char *)malloc(256 * sizeof(char)); + + // ignoring CLASSPATH for now, because it's not needed + // and causes more trouble than it's worth [0060] + env_classpath[0] = 0; + + /* + // keep this code around since may be re-enabled later if (getenv("CLASSPATH") != NULL) { strcpy(env_classpath, getenv("CLASSPATH")); if (env_classpath[0] == '\"') { @@ -85,9 +93,43 @@ WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmd, int nShow) } else { env_classpath[0] = 0; } - + */ char *env_qtjava = (char *)malloc(256 * sizeof(char)); + env_qtjava[0] = 0; + + if (getenv("WINDIR") == NULL) { + // uh-oh.. serious problem.. gonna have to report this + // but hopefully WINDIR is set on win98 too + + } else { + strcpy(env_qtjava, getenv("WINDIR")); + strcat(env_qtjava, "\\SYSTEM32\\QTJava.zip"); + + FILE *fp = fopen(env_qtjava, "rb"); + if (fp != NULL) { + // found it, all set to go + fclose(fp); + + } else { + strcpy(env_qtjava, getenv("WINDIR")); + strcat(env_qtjava, "\\SYSTEM\\QTJava.zip"); + + fp = fopen(env_qtjava, "rb"); + if (fp != NULL) { + fclose(fp); + + } else { + // serious problem, but will be caught by the pde + env_qtjava[0] = 0; + } + } + } + /* + // there's a bug in the QTJAVA installer, that sets this + // to a bad value if no java has been installed. grr. + // as a result, it's better just to ignore it. + // keep this code around since may be re-enabled later if (getenv("QTJAVA") != NULL) { strcpy(env_qtjava, getenv("QTJAVA")); if (env_qtjava[0] == '\"') { @@ -107,7 +149,7 @@ WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmd, int nShow) } else { env_qtjava[0] = 0; } - + */ // put quotes around contents of cp, // because %s might have spaces in it. diff --git a/todo.txt b/todo.txt index 1971b5fed..38cdba1b4 100644 --- a/todo.txt +++ b/todo.txt @@ -119,14 +119,7 @@ X http://proce55ing.net/discourse/yabb/YaBB.cgi?board=BugFixes;action=display; X windows fresh checkout from cvs still has problems X major changes to build scripts for far easier building under windows X added error messages for noCursor in jdk11 - - -carlos line code for single pixel lines -ca X single pixel lines have z and alpha -bf X http://proce55ing.net/discourse/yabb/YaBB.cgi?board=BugFixes;action=display;num=1064165816;start=0 -bf X http://proce55ing.net/discourse/yabb/YaBB.cgi?board=BugFixes;action=display;num=1064165995;start=0 -bf X http://proce55ing.net/discourse/yabb/YaBB.cgi?board=BugFixes;action=display;num=1064166034;start=0 -bf X http://proce55ing.net/discourse/yabb/YaBB.cgi?board=BugFixes;action=display;num=1064167337;start=0 +X boost memory size of processing.exe to 128 megs, instead of 64 fixes because of dmose parser @@ -183,6 +176,14 @@ ca o document the change and make several of them ca o font smoothing (unless hint SMOOTH_IMAGES enabled) is broken +carlos line code for single pixel lines +ca X single pixel lines have z and alpha +bf X http://proce55ing.net/discourse/yabb/YaBB.cgi?board=BugFixes;action=display;num=1064165816;start=0 +bf X http://proce55ing.net/discourse/yabb/YaBB.cgi?board=BugFixes;action=display;num=1064165995;start=0 +bf X http://proce55ing.net/discourse/yabb/YaBB.cgi?board=BugFixes;action=display;num=1064166034;start=0 +bf X http://proce55ing.net/discourse/yabb/YaBB.cgi?board=BugFixes;action=display;num=1064167337;start=0 + + api changes in progress -> COLORING FOR ALL THESE X textureImage() -> texture() X textureMode() IMAGE_SPACE or NORMAL_SPACE @@ -200,7 +201,7 @@ X BFont.drawChar, BFont.drawString -> BFont.text() X removed fill(), stroke(), background() with no args X (used to return current) X getPixel/setPixel -> get/set -X addition of copy(), duplicate(), alpha(), and blendMode() +X addition of copy(), replicate(), alpha(), and blendMode() X all the imaging modes that go with those guys X tint() colors images, not fill() X shearX and shearY removed @@ -244,6 +245,8 @@ o only recompile if asked or if changes _ modify build instructions for the many changes _ i.e. buzz.pl requires jdk13+ set for JDK13 flag, used by p5 _ usually need to remove the 'work' dir +_ modify macosx to use jikes from p5 +_ in general, things are way simpler on the pc _ better 1.3/1.4 support.. properly detect vm _ use when deciding which classes to import _ if size() not found in export/compile, ask the user