Permalink
Browse files

Initial sync with Processing 6406. Compiles and runs (on Mac OS X) bu…

…t probably very buggy.
  • Loading branch information...
damellis committed Apr 21, 2010
1 parent d36fbfe commit 34579ae440a7bf68ea5ef962b8793b7607589b70
Showing with 22,886 additions and 2,191 deletions.
  1. +201 −51 app/src/processing/app/Base.java
  2. +247 −183 app/src/processing/app/Editor.java
  3. +5 −15 app/src/processing/app/EditorConsole.java
  4. +11 −0 app/src/processing/app/EditorListener.java
  5. +89 −131 app/src/processing/app/EditorToolbar.java
  6. +33 −0 app/src/processing/app/Platform.java
  7. +5 −0 app/src/processing/app/Preferences.java
  8. +150 −79 app/src/processing/app/Sketch.java
  9. +95 −0 app/src/processing/app/StreamRedirectThread.java
  10. +6 −2 app/src/processing/app/WebServer.java
  11. +3 −2 app/src/processing/app/debug/{EventThread.java → EventThread.java.disabled}
  12. +6 −1 app/src/processing/app/debug/MessageSiphon.java
  13. +104 −498 app/src/processing/app/debug/{Runner.java → Runner.java.disabled}
  14. +9 −1 app/src/processing/app/debug/RunnerException.java
  15. +2 −0 app/src/processing/app/debug/RunnerListener.java
  16. +12 −3 app/src/processing/app/linux/Platform.java
  17. +35 −23 app/src/processing/app/macosx/Platform.java
  18. +2 −1 app/src/processing/app/macosx/ThinkDifferent.java
  19. +51 −57 app/src/processing/app/preproc/PdePreprocessor.java
  20. +35 −1 app/src/processing/app/syntax/InputHandler.java
  21. +14 −1 app/src/processing/app/syntax/JEditTextArea.java
  22. +22 −7 app/src/processing/app/syntax/PdeTextAreaDefaults.java
  23. +26 −2 app/src/processing/app/syntax/TextAreaPainter.java
  24. +187 −0 app/src/processing/app/syntax/im/CompositionTextManager.java
  25. +124 −0 app/src/processing/app/syntax/im/CompositionTextPainter.java
  26. +105 −0 app/src/processing/app/syntax/im/InputMethodSupport.java
  27. +20 −7 app/src/processing/app/tools/ColorSelector.java
  28. +525 −57 app/src/processing/app/tools/CreateFont.java
  29. +38 −1 app/src/processing/app/windows/Platform.java
  30. +1 −0 build/macosx/make.sh
  31. +27 −5 build/shared/lib/preferences.txt
  32. +17 −17 core/.project
  33. +271 −261 core/.settings/org.eclipse.jdt.core.prefs
  34. +2 −2 core/.settings/org.eclipse.jdt.ui.prefs
  35. +26 −0 core/build.xml
  36. +55 −0 core/done.txt
  37. +7 −0 core/methods/.classpath
  38. +17 −0 core/methods/.project
  39. +28 −0 core/methods/build.xml
  40. +9,483 −0 core/methods/demo/PApplet.java
  41. +5,075 −0 core/methods/demo/PGraphics.java
  42. +2,862 −0 core/methods/demo/PImage.java
  43. BIN core/methods/methods.jar
  44. +272 −0 core/methods/src/PAppletMethods.java
  45. +599 −90 core/src/processing/core/PApplet.java
  46. +44 −1 core/src/processing/core/PConstants.java
  47. +522 −356 core/src/processing/core/PFont.java
  48. +815 −159 core/src/processing/core/PGraphics.java
  49. +32 −13 core/src/processing/core/PGraphics3D.java
  50. +10 −0 core/src/processing/core/PGraphicsJava2D.java
  51. +213 −65 core/src/processing/core/PImage.java
  52. +1 −1 core/src/processing/core/PPolygon.java
  53. +129 −16 core/src/processing/core/PShape.java
  54. +5 −1 core/src/processing/core/PShapeSVG.java
  55. +2 −2 core/src/processing/core/PVector.java
  56. +93 −33 core/src/processing/xml/XMLElement.java
  57. +116 −46 core/todo.txt

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -28,6 +28,7 @@
import java.io.*;
import javax.swing.*;
import javax.swing.text.*;
+
import java.util.*;
@@ -47,8 +48,6 @@
MutableAttributeSet stdStyle;
MutableAttributeSet errStyle;
- boolean cerror;
-
int maxLineCount;
static File errFile;
@@ -221,18 +220,9 @@ public void handleQuit() {
public void write(byte b[], int offset, int length, boolean err) {
- if (err != cerror) {
- // advance the line because switching between err/out streams
- // potentially, could check whether we're already on a new line
- message("", cerror, true);
- }
-
// we could do some cross platform CR/LF mangling here before outputting
-
// add text to output document
message(new String(b, offset, length), err, false);
- // set last error state
- cerror = err;
}
@@ -291,10 +281,10 @@ public void clear() {
// . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
- class EditorConsoleStream extends OutputStream {
+ private static class EditorConsoleStream extends OutputStream {
//static EditorConsole current;
- boolean err; // whether stderr or stdout
- byte single[] = new byte[1];
+ final boolean err; // whether stderr or stdout
+ final byte single[] = new byte[1];
public EditorConsoleStream(boolean err) {
this.err = err;
@@ -389,7 +379,7 @@ public void write(int b) {
* swing event thread, so they need to be synchronized
*/
class BufferedStyledDocument extends DefaultStyledDocument {
- ArrayList elements = new ArrayList();
+ ArrayList<ElementSpec> elements = new ArrayList<ElementSpec>();
int maxLineLength, maxLineCount;
int currentLineLength = 0;
boolean needLineBreak = false;
@@ -103,6 +103,10 @@ public boolean keyPressed(KeyEvent event) {
char c = event.getKeyChar();
int code = event.getKeyCode();
+// if (code == KeyEvent.VK_SHIFT) {
+// editor.toolbar.setShiftPressed(true);
+// }
+
//System.out.println((int)c + " " + code + " " + event);
//System.out.println();
@@ -457,6 +461,13 @@ public boolean keyPressed(KeyEvent event) {
}
+// public boolean keyReleased(KeyEvent event) {
+// if (code == KeyEvent.VK_SHIFT) {
+// editor.toolbar.setShiftPressed(false);
+// }
+// }
+
+
public boolean keyTyped(KeyEvent event) {
char c = event.getKeyChar();
Oops, something went wrong.

0 comments on commit 34579ae

Please sign in to comment.