Working around some opengl problems

Author: kazimuth

README.md

@@ -1,7 +1,7 @@
 Processing Python Mode
 ----------------------
 
-[Processing](http://www.processing.org/) is awesome! [Jython](http://www.jython.org/) is awesome! Together, they are TOTALLY AWESOME!
+[Processing](http://www.processing.org/) is awesome! [Jython](http://www.jython.org/) is awesome! Together, they are very awesome!
 
 This project uses Processing 2.0's mode infrastructure to create a seamless blend of Processing and python.
 

src/info/sansgills/mode/python/Communicator.java

@@ -54,7 +54,6 @@ public void destroy(){
 	 */
 	public void sendClose(){
 		toSketch.println("__STOP__"); //hard-coded, what the hell
-		System.out.println("__STOP__");
 		toSketch.flush();
 	}
 
@@ -69,7 +68,6 @@ public void sendSketch(String[] args){
 
 
 		toSketch.println(out.toString());
-		System.out.println(out.toString());
 		toSketch.flush();
 	}
 
@@ -91,18 +89,24 @@ public void run() {
 				String currentLine;
 
 				// continually read messages
-				while ((currentLine = messageReader.readLine()) != null && running) {
+				while ((currentLine = messageReader.readLine()) != null) {
+					if(!running){
+						System.out.println("Messenger thread no longer running");
+						return;
+					}
 					if (currentLine.indexOf("__STOPPED__") != -1) {
 						// sketch telling us it stopped
 						runner.parallelStopped();
+						System.out.println("Stopped recieved.");
 						return;
 					}else if(currentLine.indexOf("__STARTED__") != -1){
 						runner.parallelStarted();
+						System.out.println("Started recieved.");
 					} else{
 						System.err.println(currentLine);
 					}
 				}
-			} catch (Exception e) {}
+			} catch (Exception e) {e.printStackTrace();}
 		}
 	}
 }

src/info/sansgills/mode/python/PythonBuild.java

@@ -41,6 +41,8 @@ public class PythonBuild {
 
 	String classPath, pythonLibs, javaLibs;
 
+	boolean usesOpenGL;
+	
 	//build tracking
 	private int buildnumber;
 	private static int buildstotal = 0;
@@ -88,13 +90,14 @@ public void build() throws Exception{
 	}
 
 
+	private static Pattern whitespace = Pattern.compile("\\s*");
 	/*
 	 * Turn .pde into valid python
 	 * 
 	 * Now with antlr!
 	 */
 	private String preprocess(StringBuilder program){
-		if(Pattern.matches("\\s*", program)){
+		if(whitespace.matcher(program).matches()){
 			return "def setup():\n\tpass\n\n"; //empty sketch; TODO fix hack
 		}
 		try{
@@ -110,6 +113,8 @@ private String preprocess(StringBuilder program){
 
 			String[] libraries = converter.getLibraries();
 
+			usesOpenGL = converter.usesOpenGL;
+			
 			Set<String> knownPythonLibraries = PythonMode.getPythonLibraries();
 
 			pythonLibs = "";

src/info/sansgills/mode/python/PythonEditor.java

@@ -109,6 +109,7 @@ public void actionPerformed(ActionEvent e) {
 	        handleStop();
 	      }
 	    });
+	    
 	    return buildSketchMenu(new JMenuItem[] { runItem, presentItem, stopItem });
 	}
 

src/info/sansgills/mode/python/PythonRunner.java

@@ -26,15 +26,17 @@ public class PythonRunner {
 	// Threads to redirect output / error streams from process to us
 	Communicator communicator;
 
-	boolean active;
+	boolean dying, needsReboot;
 
 	public PythonRunner(PythonEditor editor) {
 		this.editor = editor;
-		active = false;
+		dying = false;
+		
 
 		//make sure our partner process is dead
 		Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {
 			public void run() {
+				dying = true; //don't try to start again
 				if (communicator != null) {
 					communicator.destroy();
 				}
@@ -49,6 +51,8 @@ public void run() {
 	 * Run the code.
 	 */
 	public void launch(PythonBuild build, boolean present) {
+		needsReboot = build.usesOpenGL;
+		System.out.println("we need to reboot: "+needsReboot);
 		ensureParallel();
 		String[] a = buildSketchArgs(build, present);
 		System.out.println(a);
@@ -61,36 +65,63 @@ public void launch(PythonBuild build, boolean present) {
 	public void internalClose() {
 		//Closed from editor button
 		ensureParallel();
-		System.out.println("Closing...");
 		communicator.sendClose();
 	}
 
+	
+	
+	/*
+	 * Sketch process died; get ready to reboot it
+	 */
+	private void prepareReboot(){
+		System.out.println("rebooting");
+		if(!dying){
+			sketchProcess = null;
+			communicator.destroy();
+			communicator = null;
+		}
+	}
+	
+	/*
+	 * Force sketch process to restart
+	 */
+	public void forceReboot(){
+		System.out.println("Forcing reboot.");
+		if(sketchProcess != null) sketchProcess.destroy();
+	}
+	
+	
 	/*
 	 * Make sure we've got a process to run the code.
 	 */
 	private void ensureParallel(){
 		if(sketchProcess == null){
 			sketchProcess = PApplet.exec(buildJavaArgs());
 			communicator = new Communicator(sketchProcess, this);
+			new Thread(new Runnable(){
+				public void run(){
+					try{
+						int result = sketchProcess.waitFor();
+						System.out.println("parallel process killed");
+						prepareReboot();
+					}catch(InterruptedException e){
+						System.err.println("someone interrupted the deathwatch thread");
+					}
+				}
+			}).start();
 		}
 	}
 
-	
+	/*
+	 * Handle talking to companion process
+	 */
 	public void parallelStopped() {
-		//Closed from sketch window
-		if(active){
-			active = false;
-			System.out.println("Closed");
-		}else{
-			System.err.println("something is wrong");
+		if(needsReboot){
+			forceReboot();
 		}
 	}
 	public void parallelStarted(){
-		if(!active){
-			active = true;
-		}else{
-			System.err.println("something is very wrong");
-		}
+		
 	}
 
 	/*

src/info/sansgills/mode/python/preproc/PyPdeConverter.java

@@ -33,6 +33,7 @@ public class PyPdeConverter extends PyPdeBaseListener {
 
 	boolean hasIssues = false;
 	boolean staticMode = true;
+	public boolean usesOpenGL = false;
 
 	String result;
 
@@ -65,15 +66,16 @@ public String[] getLibraries(){
 	//fiddle with certain PApplet variables
 	//TODO yell at the user when they try to assign to things
 	@Override
-	public void enterPrimaryAtom(PyPdeParser.PrimaryAtomContext ctx){
-		PyPdeParser.IdentifierContext id = ctx.atom().identifier();
+	public void enterAtom(PyPdeParser.AtomContext ctx){
+		PyPdeParser.IdentifierContext id = ctx.identifier();
 		if(id != null){
+			String text = id.getText();
 			//hopefully this will work without java string nonsense
-			if(instanceVars.contains(id.getText())){
+			if(instanceVars.contains(text)){
 				//one of our instance variables;
 				//replace mouseX with __applet__.mouseX, etc.
 				rewriter.insertBefore(id.IDENTIFIER().getSymbol(), "__applet__."); //woo dirty hacks!
-			}else if(wonkyVars.contains(id.getText())){
+			}else if(wonkyVars.contains(text)){
 				//one of the obnoxious variables with name conflicts
 				//replace mousePressed with getmousePressed()
 				//can't do __applet__.mousePressed Jython thinks that refers to the function
@@ -83,6 +85,21 @@ public void enterPrimaryAtom(PyPdeParser.PrimaryAtomContext ctx){
 		}
 	}
 
+	private static Pattern getArgs = Pattern.compile("OPENGL|P3D|P2D");
+	@Override
+	public void enterCall(PyPdeParser.CallContext ctx) {
+		if (ctx.primary() instanceof PyPdeParser.PrimaryAtomContext) {
+			System.out.println("found a funcall");
+			if (ctx.primary().getText().equals("size")) {
+				System.out.println("found size");
+				if(getArgs.matcher(ctx.getText()).find()){
+					usesOpenGL = true;
+				}
+			}
+		}
+
+	}
+	
 
 	@Override
 	public void enterComplexSuite(PyPdeParser.ComplexSuiteContext ctx){

src/info/sansgills/mode/python/wrapper/ProcessingJythonWrapper.java

@@ -117,6 +117,16 @@ public static void prepare() {
 		ready = true;
 	}
 
+	public static void sendStarted(){
+		System.err.println("__STARTED__");
+		System.out.println("started sent");
+	}
+	public static void sendStopped(){
+		System.err.println("__STOPPED__");
+		System.out.println("stopped sent");
+	}
+	
+	
 	public static void startSketch(String[] args){
 		if(applet != null){
 			applet.exit();
@@ -139,7 +149,6 @@ public static void startSketch(String[] args){
 		//we're good to go, hopefully
 
 		runSketch(args);
-		
 	}
 
 
@@ -200,6 +209,7 @@ public static void terminateSketch(){
 	public static void sketchDisposed(){
 		scrubContext();
 		applet = null; //all done
+		sendStopped(); //signal the mothership
 	}
 
 
@@ -283,7 +293,6 @@ public static void runSketch(final String args[]) {
 					scriptPath = value;
 				} else if (param.equals("--pylibs")) {
 					if (value != null) {
-						System.out.println(sys.path);
 						for (String lib : value.split(separator)) {
 							if (!pythonLibraries.contains(lib)) {
 								pythonLibraries.add(lib);
@@ -294,7 +303,6 @@ public static void runSketch(final String args[]) {
 				} else if (param.equals("--javalibs")) {
 					if (value != null) {
 						for (String lib : value.split(separator)) {
-							System.out.println(sys.path);
 							if (!javaLibraries.contains(lib)) {
 								javaLibraries.add(lib);
 								sys.path.append(new PyString(lib));
@@ -522,6 +530,7 @@ public void mousePressed(java.awt.event.MouseEvent e) {
 				frame.setVisible(true);
 			}
 		}
+		sendStarted(); //signal the mothership
 	}
 
 	/*

src/info/sansgills/mode/python/wrapper/PythonPApplet.java

@@ -169,11 +169,14 @@ public float getframeRate(){
 	@Override
 	public void dispose(){
 		if (!disposed) {
+			System.out.println("disposing sketch");
 			disposed = true;
 			super.dispose();
 			frame.dispose();
 
 			ProcessingJythonWrapper.sketchDisposed();
+			
+			System.out.println("done disposing");
 		}
 	}