From e6bf6b3de834ad8fefd3cdbe2c5a4815b75eea9c Mon Sep 17 00:00:00 2001 From: benfry Date: Mon, 12 Nov 2012 16:19:58 +0000 Subject: [PATCH] start moving event handling for Andres --- core/src/processing/core/PApplet.java | 33 ++++++++++++++++++--------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java index ddfb2e022..5251b7361 100644 --- a/core/src/processing/core/PApplet.java +++ b/core/src/processing/core/PApplet.java @@ -2353,6 +2353,26 @@ public class PApplet extends Applet ////////////////////////////////////////////////////////////// + public void postEvent(processing.event.Event pe) { + if (pe instanceof MouseEvent) { + if (looping) { + enqueueMouseEvent((MouseEvent) pe); + } else { + handleMouseEvent((MouseEvent) pe); + } + } else if (pe instanceof KeyEvent) { + if (looping) { + enqueueKeyEvent((KeyEvent) pe); + } else { + handleKeyEvent((KeyEvent) pe); + } + } + } + + + ////////////////////////////////////////////////////////////// + + MouseEvent mouseEventQueue[] = new MouseEvent[10]; int mouseEventCount; @@ -2516,12 +2536,7 @@ public class PApplet extends Applet nativeEvent.getX(), nativeEvent.getY(), peButton, nativeEvent.getClickCount()); - - if (looping) { - enqueueMouseEvent(pe); - } else { - handleMouseEvent(pe); - } + postEvent(pe); } @@ -2813,11 +2828,7 @@ public class PApplet extends Applet KeyEvent ke = new KeyEvent(event, event.getWhen(), peAction, peModifiers, event.getKeyChar(), event.getKeyCode()); - if (looping) { - enqueueKeyEvent(ke); - } else { - handleKeyEvent(ke); - } + postEvent(ke); }