- * If the file is opened for write access by other programs, then it - * is file system specific if writing to the end of the file is atomic. - */ - APPEND, - - /** - * If the file already exists and it is opened for {@link #WRITE} - * access, then its length is truncated to 0. This option is ignored - * if the file is opened only for {@link #READ} access. - */ - TRUNCATE_EXISTING, - - /** - * Create a new file if it does not exist. - * This option is ignored if the {@link #CREATE_NEW} option is also set. - * The check for the existence of the file and the creation of the file - * if it does not exist is atomic with respect to other file system - * operations. - */ - CREATE, - - /** - * Create a new file, failing if the file already exists. - * The check for the existence of the file and the creation of the file - * if it does not exist is atomic with respect to other file system - * operations. - */ - CREATE_NEW, - - /** - * Delete on close. When this option is present then the implementation - * makes a best effort attempt to delete the file when closed - * by the appropriate {@code close} method. If the {@code close} method is - * not invoked then a best effort attempt is made to delete the - * file when the Java virtual machine terminates (either normally, as - * defined by the Java Language Specification, or where possible, - * abnormally). - * This option is primarily intended for use with work files that - * are used solely by a single instance of the Java virtual machine. This - * option is not recommended for use when opening files that are open - * concurrently by other entities. Many of the details as to when and how - * the file is deleted are implementation specific and therefore not - * specified. In particular, an implementation may be unable to guarantee - * that it deletes the expected file when replaced by an attacker while the - * file is open. Consequently, security sensitive applications should take - * care when using this option. - * - *
- * For security reasons, this option may imply the {@link - * LinkOption#NOFOLLOW_LINKS} option. In other words, if the option is - * present - * when opening an existing file that is a symbolic link then it may fail - * (by throwing {@link java.io.IOException}). - */ - DELETE_ON_CLOSE, - - /** - * Sparse file. When used with the {@link #CREATE_NEW} option then this - * option provides a hint that the new file will be sparse. The - * option is ignored when the file system does not support the creation of - * sparse files. - */ - SPARSE, - - /** - * Requires that every update to the file's content or metadata be written - * synchronously to the underlying storage device. - * - * @see Synchronized I/O file - * integrity - */ - SYNC, - - /** - * Requires that every update to the file's content be written - * synchronously to the underlying storage device. - * - * @see Synchronized I/O file - * integrity - */ - DSYNC; -} diff --git a/src/jar-specific/java/it/cavallium/warppi/deps/DSystem.java b/src/jar-specific/java/it/cavallium/warppi/deps/DSystem.java deleted file mode 100644 index ef421991..00000000 --- a/src/jar-specific/java/it/cavallium/warppi/deps/DSystem.java +++ /dev/null @@ -1,7 +0,0 @@ -package it.cavallium.warppi.deps; - -public class DSystem { - public static final void exit(int val) { - System.exit(val); - } -} diff --git a/src/jar-specific/java/it/cavallium/warppi/deps/DURLClassLoader.java b/src/jar-specific/java/it/cavallium/warppi/deps/DURLClassLoader.java deleted file mode 100644 index 1ad355e7..00000000 --- a/src/jar-specific/java/it/cavallium/warppi/deps/DURLClassLoader.java +++ /dev/null @@ -1,23 +0,0 @@ -package it.cavallium.warppi.deps; - -import java.net.URL; -import java.net.URLClassLoader; -import java.net.URLStreamHandlerFactory; - -public class DURLClassLoader extends URLClassLoader { - - public DURLClassLoader(URL[] urls, ClassLoader parent, URLStreamHandlerFactory factory) { - super(urls, parent, factory); - // TODO Auto-generated constructor stub - } - - public DURLClassLoader(URL[] urls, ClassLoader parent) { - super(urls, parent); - // TODO Auto-generated constructor stub - } - - public DURLClassLoader(URL[] urls) { - super(urls); - // TODO Auto-generated constructor stub - } -} diff --git a/src/jar-specific/java/it/cavallium/warppi/deps/nio/DFiles.java b/src/jar-specific/java/it/cavallium/warppi/deps/nio/DFiles.java deleted file mode 100644 index 428cbc59..00000000 --- a/src/jar-specific/java/it/cavallium/warppi/deps/nio/DFiles.java +++ /dev/null @@ -1,26 +0,0 @@ -package it.cavallium.warppi.deps.nio; - -import java.io.IOException; -import java.nio.file.Files; -import java.util.List; - -public class DFiles { - - public static boolean deleteIfExists(DPath path) throws IOException { - return Files.deleteIfExists(path.toPath()); - - } - - public static boolean exists(DPath f) { - return Files.exists(f.toPath()); - } - - public static DPath createTempFile(String prefix, String suffix) throws IOException { - return new DPath(Files.createTempFile(prefix, suffix)); - } - - public static List readAllLines(DPath p) throws IOException { - return Files.readAllLines(p.toPath()); - } - -} diff --git a/src/jar-specific/java/it/cavallium/warppi/deps/nio/DPath.java b/src/jar-specific/java/it/cavallium/warppi/deps/nio/DPath.java deleted file mode 100644 index 0217e705..00000000 --- a/src/jar-specific/java/it/cavallium/warppi/deps/nio/DPath.java +++ /dev/null @@ -1,20 +0,0 @@ -package it.cavallium.warppi.deps.nio; - -import java.nio.file.Path; - -public class DPath { - - private final Path p; - - public DPath(Path p) { - this.p = p; - } - - Path toPath() { - return p; - } - - public DPath toAbsolutePath() { - return new DPath(p.toAbsolutePath()); - } -} diff --git a/src/jar-specific/java/it/cavallium/warppi/deps/nio/DPaths.java b/src/jar-specific/java/it/cavallium/warppi/deps/nio/DPaths.java deleted file mode 100644 index dc9a89ee..00000000 --- a/src/jar-specific/java/it/cavallium/warppi/deps/nio/DPaths.java +++ /dev/null @@ -1,11 +0,0 @@ -package it.cavallium.warppi.deps.nio; - -import java.nio.file.Paths; - -public class DPaths { - - public static DPath get(String first, String... more) { - return new DPath(Paths.get(first, more)); - } - -} diff --git a/src/main/java/it/cavallium/warppi/KeyboardTest.java b/src/main/java/it/cavallium/warppi/KeyboardTest.java deleted file mode 100755 index 76066ec1..00000000 --- a/src/main/java/it/cavallium/warppi/KeyboardTest.java +++ /dev/null @@ -1,16 +0,0 @@ -package it.cavallium.warppi; - -import java.io.IOException; - -import it.cavallium.warppi.boot.WarpPI; -import it.cavallium.warppi.device.PIHardwareDisplay; -import it.cavallium.warppi.device.PIHardwareTouchDevice; -import it.cavallium.warppi.gui.CalculatorHUD; -import it.cavallium.warppi.gui.screens.KeyboardDebugScreen; - -public class KeyboardTest { - - public static void main(String[] args) throws InterruptedException, Error, IOException { - Engine.start(new KeyboardDebugScreen(), new PIHardwareDisplay(), new PIHardwareTouchDevice(false, false, false), new CalculatorHUD(), WarpPI.parseStartupArguments(args)); - } -} diff --git a/src/main/java/it/cavallium/warppi/TestGPU.java b/src/main/java/it/cavallium/warppi/TestGPU.java deleted file mode 100755 index 7d675566..00000000 --- a/src/main/java/it/cavallium/warppi/TestGPU.java +++ /dev/null @@ -1,226 +0,0 @@ -package it.cavallium.warppi; - -import java.io.IOException; - -import it.cavallium.warppi.deps.DEngine; -import it.cavallium.warppi.deps.DSystem; -import it.cavallium.warppi.device.Keyboard; -import it.cavallium.warppi.event.KeyPressedEvent; -import it.cavallium.warppi.event.KeyReleasedEvent; -import it.cavallium.warppi.event.KeyboardEventListener; -import it.cavallium.warppi.gui.expression.InputContext; -import it.cavallium.warppi.gui.expression.blocks.BlockContainer; -import it.cavallium.warppi.gui.expression.containers.NormalInputContainer; -import it.cavallium.warppi.gui.graphicengine.BinaryFont; -import it.cavallium.warppi.gui.graphicengine.GraphicEngine; -import it.cavallium.warppi.gui.graphicengine.Renderer; -import it.cavallium.warppi.gui.graphicengine.RenderingLoop; -import it.cavallium.warppi.gui.graphicengine.Skin; -import it.cavallium.warppi.math.MathContext; -import it.cavallium.warppi.math.MathematicalSymbols; -import it.cavallium.warppi.math.functions.Expression; -import it.cavallium.warppi.math.parser.MathParser; - -public class TestGPU { - - public static final GraphicEngine d = DEngine.newGPUEngine(); - - public static void main(String[] args) throws IOException, Error { - StaticVars.debugOn = true; - Utils.debugThirdScreen = false; - d.create(); - - Keyboard k = new Keyboard(); - k.startKeyboard(); - k.setAdditionalKeyboardListener(new KeyboardEventListener() { - @Override - public boolean onKeyPressed(KeyPressedEvent k) { - try { - switch (k.getKey()) { - case LEFT: - c.moveLeft(); - return true; - case RIGHT: - c.moveRight(); - return true; - case NUM0: - c.typeChar('0'); - return true; - case NUM1: - c.typeChar('1'); - return true; - case NUM2: - c.typeChar('2'); - return true; - case NUM3: - c.typeChar('3'); - return true; - case NUM4: - c.typeChar('4'); - return true; - case NUM5: - c.typeChar('5'); - return true; - case NUM6: - c.typeChar('6'); - return true; - case NUM7: - c.typeChar('7'); - return true; - case NUM8: - c.typeChar('8'); - return true; - case NUM9: - c.typeChar('9'); - return true; - case PLUS: - c.typeChar(MathematicalSymbols.SUM); - return true; - case MINUS: - c.typeChar(MathematicalSymbols.SUBTRACTION); - return true; - case MULTIPLY: - c.typeChar(MathematicalSymbols.MULTIPLICATION); - return true; - case DIVIDE: - c.typeChar(MathematicalSymbols.DIVISION); - return true; - case SQRT: - c.typeChar(MathematicalSymbols.SQUARE_ROOT); - return true; - case PARENTHESIS_OPEN: - case SINE: - c.typeChar(MathematicalSymbols.PARENTHESIS_OPEN); - return true; - case PARENTHESIS_CLOSE: - case debug_DEG: - c.moveRight(); - return true; - case DELETE: - c.del(); - return true; - case RESET: - c.clear(); - return true; - case POWEROFF: - d.destroy(); - DSystem.exit(0); - return true; - case EQUAL: - Expression expr; - try { - expr = MathParser.parseInput(new MathContext(), c); - System.out.println("Parsed input:" + expr.toString()); - } catch (final Error e) { - e.printStackTrace(); - } - default: - break; - } - return false; - } catch (final Exception ex) { - ex.printStackTrace(); - } - return false; - - } - - @Override - public boolean onKeyReleased(KeyReleasedEvent k) { - return false; - - } - }); - - new Scene(d); - } - - private static NormalInputContainer c = null; - - private static class Scene implements RenderingLoop { - - private final BinaryFont exampleFont; - private final Skin exampleSkin; - - private final Renderer r; - private final GraphicEngine d; - private long lastTime = 0L; - - public Scene(GraphicEngine d) throws IOException, Error { - this.d = d; - r = d.getRenderer(); - - exampleFont = d.loadFont("norm"); - - exampleSkin = d.loadSkin("skin.png"); - - BlockContainer.initializeFonts(d.loadFont("norm"), d.loadFont("smal")); - - //New expression framework test - c = new NormalInputContainer(new InputContext(), false, 0, 200); - c.typeChar(MathematicalSymbols.DIVISION); - c.typeChar('5'); - c.typeChar(MathematicalSymbols.MULTIPLICATION); - c.typeChar('2'); - c.moveRight(); - c.typeChar('2'); - c.moveRight(); - c.typeChar(MathematicalSymbols.MULTIPLICATION); - c.typeChar('2'); - c.typeChar('2'); - c.recomputeDimensions(); - - d.start(this); - -// fonts = new RAWFont[1]; -// textures = new int[100]; -// fonts[0] = new RAWFont(); -// fonts[0].create("big"); - new Thread(() -> { - try { - for (int i = 0; i < 12; i++) { - Utils.printSystemResourcesUsage(); - Thread.sleep(5000); - } - } catch (final InterruptedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - if (!StaticVars.debugOn) { - d.destroy(); - DSystem.exit(0); - } - }).start(); - - d.waitForExit(); - } - - @Override - public void refresh() { - exampleSkin.use(d); - r.glClearColor(0xFFD0FDCF); - r.glClear(d.getWidth(), d.getHeight()); - r.glColor3f(1.0f, 1.0f, 1.0f); - r.glFillRect(2, 2, 160, 160, 0, 0, 16, 16); - exampleFont.use(d); - r.glColor3f(1, 0, 0); - r.glDrawStringLeft(10, 170, "Prova! 123456789 222"); - - //MSAA TEST - r.glDrawStringLeft(10f, 190.5f, "Test MSAA"); - exampleSkin.use(d); - r.glColor3f(1.0f, 1.0f, 1.0f); - r.glFillRect(162, 2.5f, 160, 160, 0, 0, 16, 16); - - //New expression framework test - if (lastTime == 0) { - lastTime = System.currentTimeMillis(); - } - final double delta = System.currentTimeMillis() - lastTime; - lastTime = System.currentTimeMillis(); - c.beforeRender((float) (delta / 1000d)); - c.draw(d, r, 10, 220); - } - - } -} diff --git a/src/main/java/it/cavallium/warppi/device/chip/ParallelToSerial.java b/src/main/java/it/cavallium/warppi/device/chip/ParallelToSerial.java deleted file mode 100755 index 2c739877..00000000 --- a/src/main/java/it/cavallium/warppi/device/chip/ParallelToSerial.java +++ /dev/null @@ -1,35 +0,0 @@ -package it.cavallium.warppi.device.chip; - -import it.cavallium.warppi.deps.DGpio; - -public class ParallelToSerial { - - private final int SH_LD; - private final int CLK_INH; - private final int QH; - private final int CLK; - - public ParallelToSerial(int SH_LD_pin, int CLK_INH_pin, int QH_pin, int CLK_pin) { - SH_LD = SH_LD_pin; - CLK_INH = CLK_INH_pin; - QH = QH_pin; - CLK = CLK_pin; - } - - public boolean[] read() { - final boolean[] data = new boolean[8]; - DGpio.digitalWrite(CLK_INH, DGpio.HIGH); - DGpio.digitalWrite(SH_LD, DGpio.LOW); - DGpio.delayMicroseconds(1); - DGpio.digitalWrite(SH_LD, DGpio.HIGH); - DGpio.digitalWrite(CLK_INH, DGpio.LOW); - - for (int i = 7; i >= 0; i--) { - DGpio.digitalWrite(CLK, DGpio.HIGH); - DGpio.digitalWrite(CLK, DGpio.LOW); - data[i] = DGpio.digitalRead(QH) == DGpio.HIGH ? true : false; - } - - return data; - } -} diff --git a/src/main/java/it/cavallium/warppi/device/chip/SerialToParallel.java b/src/main/java/it/cavallium/warppi/device/chip/SerialToParallel.java deleted file mode 100755 index 3e991131..00000000 --- a/src/main/java/it/cavallium/warppi/device/chip/SerialToParallel.java +++ /dev/null @@ -1,31 +0,0 @@ -package it.cavallium.warppi.device.chip; - -import it.cavallium.warppi.deps.DGpio; - -public class SerialToParallel { - private final int RCK; //Storage register clock pin (latch pin) - private final int SCK; //Shift register clock pin - private final int SER; //Serial data input - - public SerialToParallel(int RCK_pin, int SCK_pin, int SER_pin) { - RCK = RCK_pin; - SCK = SCK_pin; - SER = SER_pin; - } - - public void write(boolean[] data) { - if (data.length != 8) { - return; - } else { - DGpio.digitalWrite(RCK, DGpio.LOW); - - for (int i = 7; i >= 0; i--) { - DGpio.digitalWrite(SCK, DGpio.LOW); - DGpio.digitalWrite(SER, data[i]); - DGpio.digitalWrite(SCK, DGpio.HIGH); - } - - DGpio.digitalWrite(RCK, DGpio.HIGH); - } - } -} diff --git a/src/main/java/it/cavallium/warppi/gui/graphicengine/cpu/CPUSkin.java b/src/main/java/it/cavallium/warppi/gui/graphicengine/cpu/CPUSkin.java deleted file mode 100755 index a3b8353d..00000000 --- a/src/main/java/it/cavallium/warppi/gui/graphicengine/cpu/CPUSkin.java +++ /dev/null @@ -1,124 +0,0 @@ -package it.cavallium.warppi.gui.graphicengine.cpu; - -import java.awt.image.BufferedImage; -import java.io.File; -import java.io.IOException; -import java.net.URISyntaxException; - -import javax.imageio.ImageIO; - -import ar.com.hjg.pngj.ImageLineInt; -import ar.com.hjg.pngj.PngReader; -import it.cavallium.warppi.deps.StorageUtils; -import it.cavallium.warppi.gui.graphicengine.GraphicEngine; -import it.cavallium.warppi.gui.graphicengine.Skin; - -public class CPUSkin implements Skin { - - public int[] skinData; - public int[] skinSize; - @SuppressWarnings("unused") - private final boolean isResource; - - public CPUSkin(String file) throws IOException { - isResource = !new File(file).exists(); - load(file); - } - - @SuppressWarnings("unused") - @Override - public void load(String file) throws IOException { - if (!file.startsWith("/")) - file = "/" + file; - try { - if (!file.endsWith(".png")) { - File f = File.createTempFile("picalculator-png", ".png"); - f.deleteOnExit(); - BufferedImage img = ImageIO.read(StorageUtils.getResourceStream(file)); - ImageIO.write(img, "PNG", f); - file = f.toString(); - } - PngReader r = new PngReader(StorageUtils.getResourceStream(file)); - if (r == null) { - skinData = new int[0]; - skinSize = new int[] { 0, 0 }; - System.err.println("ERROR WHILE LOADING SKIN " + file); - } else { - skinData = getMatrixOfImage(r); - skinSize = new int[] { r.imgInfo.cols, r.imgInfo.rows }; - } - } catch (URISyntaxException e) { - IOException ex = new IOException(); - ex.initCause(e); - throw ex; - } - } - - public static int[] getMatrixOfImage(PngReader r) { - final int width = r.imgInfo.cols; - final int height = r.imgInfo.rows; - final int channels = r.imgInfo.channels; - final int[] pixels = new int[width * height]; - int pi = 0; - ImageLineInt lint; - while (r.hasMoreRows()) { - lint = (ImageLineInt) r.readRow(); - int[] scanLine = lint.getScanline(); - - for (int i = 0; i < width; i++) { - int offset = i * channels; - - // Adjust the following code depending on your source image. - // I need the to set the alpha channel to 0xFF000000 since my destination image - // is TRANSLUCENT : BufferedImage bi = CONFIG.createCompatibleImage( width, height, Transparency.TRANSLUCENT ); - // my source was 3 channels RGB without transparency - int nextPixel; - if (channels == 4) { - nextPixel = (scanLine[offset] << 16) | (scanLine[offset + 1] << 8) | (scanLine[offset + 2]) | (scanLine[offset + 3] << 24); - } else if (channels == 3) { - nextPixel = (scanLine[offset] << 16) | (scanLine[offset + 1] << 8) | (scanLine[offset + 2]) | (0xFF << 24); - } else if (channels == 2) { - nextPixel = (scanLine[offset] << 16) | (scanLine[offset + 1] << 8) | 0xFF | (0xFF << 24); - } else { - nextPixel = (scanLine[offset] << 16) | (scanLine[offset] << 8) | scanLine[offset] | (0xFF << 24); - } - - // I'm placing the pixels on a memory mapped file - pixels[pi] = nextPixel; - pi++; - } - - } - - return pixels; - } - - @Override - public void initialize(GraphicEngine d) { - // TODO Auto-generated method stub - - } - - @Override - public void use(GraphicEngine d) { - if (d.getRenderer() instanceof CPURenderer) { - ((CPURenderer) d.getRenderer()).currentSkin = this; - } - } - - @Override - public boolean isInitialized() { - return true; - } - - @Override - public int getSkinWidth() { - return skinSize[0]; - } - - @Override - public int getSkinHeight() { - return skinSize[1]; - } - -} diff --git a/src/teavm-specific/java/it/cavallium/warppi/ConsoleUtils.java b/src/teavm-specific/java/it/cavallium/warppi/ConsoleUtils.java deleted file mode 100644 index e201d1d6..00000000 --- a/src/teavm-specific/java/it/cavallium/warppi/ConsoleUtils.java +++ /dev/null @@ -1,110 +0,0 @@ -package it.cavallium.warppi; - -import java.io.PrintStream; -import java.io.StringWriter; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; - -import it.cavallium.warppi.math.MathematicalSymbols; - -public class ConsoleUtils { - - public static final class AdvancedOutputStream { - - private void print(PrintStream stream, String str) { - stream.print(fixString(str)); - } - - private void println(PrintStream stream, String str) { - stream.println(fixString(str)); - } - - private void println(PrintStream stream) { - stream.println(); - } - - private String fixString(String str) { - - return str.replace("" + MathematicalSymbols.NTH_ROOT, "root").replace("" + MathematicalSymbols.SQUARE_ROOT, "sqrt").replace("" + MathematicalSymbols.POWER, "powerOf").replace("" + MathematicalSymbols.POWER_OF_TWO, "powerOfTwo").replace("" + MathematicalSymbols.SINE, "sine").replace("" + MathematicalSymbols.COSINE, "cosine").replace("" + MathematicalSymbols.TANGENT, "tangent").replace("" + MathematicalSymbols.ARC_SINE, "asin").replace("" + MathematicalSymbols.ARC_COSINE, "acos").replace("" + MathematicalSymbols.ARC_TANGENT, "atan").replace("" + MathematicalSymbols.UNDEFINED, "undefined").replace("" + MathematicalSymbols.PI, "PI").replace("" + MathematicalSymbols.EULER_NUMBER, "EULER_NUMBER").replace("" + MathematicalSymbols.X, "X").replace("" + MathematicalSymbols.Y, "Y"); - } - - public void println(String str) { - println(0, str); - } - - public void println(int level) { - if (StaticVars.outputLevel >= level) { - final String time = getTimeString(); - if (StaticVars.outputLevel == 0) { - println(System.out); - } else { - println(System.out); - } - } - } - - public void println(int level, Object str) { - if (StaticVars.outputLevel >= level) { - final String time = getTimeString(); - if (StaticVars.outputLevel == 0) { - println(System.out, "[" + time + "]" + str); - } else { - println(System.out, "[" + time + "]" + str); - } - } - } - - public void print(int level, String str) { - if (StaticVars.outputLevel >= level) { - if (StaticVars.outputLevel == 0) { - print(System.out, str); - } else { - print(System.out, str); - } - } - } - - public void println(int level, Object prefix, Object str) { - if (StaticVars.outputLevel >= level) { - final String time = getTimeString(); - if (StaticVars.outputLevel == 0) { - println(System.out, "[" + time + "][" + prefix + "]" + str); - } else { - println(System.out, "[" + time + "][" + prefix + "]" + str); - } - } - } - - public void println(int level, Object... parts) { - if (StaticVars.outputLevel >= level) { - final String time = getTimeString(); - String output = ""; - for (int i = 0; i < parts.length; i++) { - if (i + 1 == parts.length) { - output += parts[i]; - } else { - output += "[" + parts[i] + "]"; - } - } - if (StaticVars.outputLevel == 0) { - println(System.out, "[" + time + "]" + output); - } else { - println(System.out, "[" + time + "]" + output); - } - } - } - - private String getTimeString() { - return System.currentTimeMillis()+""; - } - - int before = 0; - boolean due = false; - - } - public static ConsoleUtils.AdvancedOutputStream out = new ConsoleUtils.AdvancedOutputStream(); - public static final int OUTPUTLEVEL_NODEBUG = 0; - public static final int OUTPUTLEVEL_DEBUG_MIN = 1; - public static final int OUTPUTLEVEL_DEBUG_VERBOSE = 4; - -} diff --git a/src/teavm-specific/java/it/cavallium/warppi/ZipUtils.java b/src/teavm-specific/java/it/cavallium/warppi/ZipUtils.java deleted file mode 100644 index 6820c666..00000000 --- a/src/teavm-specific/java/it/cavallium/warppi/ZipUtils.java +++ /dev/null @@ -1,11 +0,0 @@ -package it.cavallium.warppi; - -public class ZipUtils { - public static void zip(String targetPath, String destinationFilePath, String password) { - throw new java.lang.UnsupportedOperationException("Not implemented."); - } - - public static void unzip(String targetZipFilePath, String destinationFolderPath, String password) { - throw new java.lang.UnsupportedOperationException("Not implemented."); - } -} diff --git a/src/teavm-specific/java/it/cavallium/warppi/deps/DAtomicInteger.java b/src/teavm-specific/java/it/cavallium/warppi/deps/DAtomicInteger.java deleted file mode 100644 index ab47d0ec..00000000 --- a/src/teavm-specific/java/it/cavallium/warppi/deps/DAtomicInteger.java +++ /dev/null @@ -1,338 +0,0 @@ -/* - * ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - */ - -/* - * - * - * - * - * - * Written by Doug Lea with assistance from members of JCP JSR-166 - * Expert Group and released to the public domain, as explained at - * http://creativecommons.org/publicdomain/zero/1.0/ - */ - -package it.cavallium.warppi.deps; -import java.util.function.IntUnaryOperator; -import java.util.function.IntBinaryOperator; - -/** - * An {@code int} value that may be updated atomically. See the - * {@link java.util.concurrent.atomic} package specification for - * description of the properties of atomic variables. An - * {@code AtomicInteger} is used in applications such as atomically - * incremented counters, and cannot be used as a replacement for an - * {@link java.lang.Integer}. However, this class does extend - * {@code Number} to allow uniform access by tools and utilities that - * deal with numerically-based classes. - * - * @since 1.5 - * @author Doug Lea -*/ -public class DAtomicInteger extends Number implements java.io.Serializable { - private static final long serialVersionUID = 6214790243416807050L; - - - private volatile int value; - - /** - * Creates a new AtomicInteger with the given initial value. - * - * @param initialValue the initial value - */ - public DAtomicInteger(int initialValue) { - value = initialValue; - } - - /** - * Creates a new AtomicInteger with initial value {@code 0}. - */ - public DAtomicInteger() { - } - - /** - * Gets the current value. - * - * @return the current value - */ - public final int get() { - return value; - } - - /** - * Sets to the given value. - * - * @param newValue the new value - */ - public final void set(int newValue) { - value = newValue; - } - - /** - * Eventually sets to the given value. - * - * @param newValue the new value - * @since 1.6 - */ - public final void lazySet(int newValue) { - value = newValue; - } - - /** - * Atomically sets to the given value and returns the old value. - * - * @param newValue the new value - * @return the previous value - */ - public final int getAndSet(int newValue) { - int oldV = value; - value = newValue; - return oldV; - } - - /** - * Atomically sets the value to the given updated value - * if the current value {@code ==} the expected value. - * - * @param expect the expected value - * @param update the new value - * @return {@code true} if successful. False return indicates that - * the actual value was not equal to the expected value. - */ - public final boolean compareAndSet(int expect, int update) { - boolean equal = (value == expect); - value = update; - return equal; - } - - /** - * Atomically sets the value to the given updated value - * if the current value {@code ==} the expected value. - * - * May fail - * spuriously and does not provide ordering guarantees, so is - * only rarely an appropriate alternative to {@code compareAndSet}. - * - * @param expect the expected value - * @param update the new value - * @return {@code true} if successful - */ - public final boolean weakCompareAndSet(int expect, int update) { - return compareAndSet(expect, update); - } - - /** - * Atomically increments by one the current value. - * - * @return the previous value - */ - public final int getAndIncrement() { - int oldV = value; - value++; - return oldV; - } - - /** - * Atomically decrements by one the current value. - * - * @return the previous value - */ - public final int getAndDecrement() { - int oldV = value; - value--; - return oldV; - } - - /** - * Atomically adds the given value to the current value. - * - * @param delta the value to add - * @return the previous value - */ - public final int getAndAdd(int delta) { - int oldV = value; - value+=delta; - return oldV; - } - - /** - * Atomically increments by one the current value. - * - * @return the updated value - */ - public final int incrementAndGet() { - value++; - return value; - } - - /** - * Atomically decrements by one the current value. - * - * @return the updated value - */ - public final int decrementAndGet() { - value--; - return value; - } - - /** - * Atomically adds the given value to the current value. - * - * @param delta the value to add - * @return the updated value - */ - public final int addAndGet(int delta) { - value+=delta; - return value; - } - - /** - * Atomically updates the current value with the results of - * applying the given function, returning the previous value. The - * function should be side-effect-free, since it may be re-applied - * when attempted updates fail due to contention among threads. - * - * @param updateFunction a side-effect-free function - * @return the previous value - * @since 1.8 - */ - public final int getAndUpdate(IntUnaryOperator updateFunction) { - int prev, next; - do { - prev = get(); - next = updateFunction.applyAsInt(prev); - } while (!compareAndSet(prev, next)); - return prev; - } - - /** - * Atomically updates the current value with the results of - * applying the given function, returning the updated value. The - * function should be side-effect-free, since it may be re-applied - * when attempted updates fail due to contention among threads. - * - * @param updateFunction a side-effect-free function - * @return the updated value - * @since 1.8 - */ - public final int updateAndGet(IntUnaryOperator updateFunction) { - int prev, next; - do { - prev = get(); - next = updateFunction.applyAsInt(prev); - } while (!compareAndSet(prev, next)); - return next; - } - - /** - * Atomically updates the current value with the results of - * applying the given function to the current and given values, - * returning the previous value. The function should be - * side-effect-free, since it may be re-applied when attempted - * updates fail due to contention among threads. The function - * is applied with the current value as its first argument, - * and the given update as the second argument. - * - * @param x the update value - * @param accumulatorFunction a side-effect-free function of two arguments - * @return the previous value - * @since 1.8 - */ - public final int getAndAccumulate(int x, - IntBinaryOperator accumulatorFunction) { - int prev, next; - do { - prev = get(); - next = accumulatorFunction.applyAsInt(prev, x); - } while (!compareAndSet(prev, next)); - return prev; - } - - /** - * Atomically updates the current value with the results of - * applying the given function to the current and given values, - * returning the updated value. The function should be - * side-effect-free, since it may be re-applied when attempted - * updates fail due to contention among threads. The function - * is applied with the current value as its first argument, - * and the given update as the second argument. - * - * @param x the update value - * @param accumulatorFunction a side-effect-free function of two arguments - * @return the updated value - * @since 1.8 - */ - public final int accumulateAndGet(int x, - IntBinaryOperator accumulatorFunction) { - int prev, next; - do { - prev = get(); - next = accumulatorFunction.applyAsInt(prev, x); - } while (!compareAndSet(prev, next)); - return next; - } - - /** - * Returns the String representation of the current value. - * @return the String representation of the current value - */ - public String toString() { - return Integer.toString(get()); - } - - /** - * Returns the value of this {@code AtomicInteger} as an {@code int}. - */ - public int intValue() { - return get(); - } - - /** - * Returns the value of this {@code AtomicInteger} as a {@code long} - * after a widening primitive conversion. - * @jls 5.1.2 Widening Primitive Conversions - */ - public long longValue() { - return (long)get(); - } - - /** - * Returns the value of this {@code AtomicInteger} as a {@code float} - * after a widening primitive conversion. - * @jls 5.1.2 Widening Primitive Conversions - */ - public float floatValue() { - return (float)get(); - } - - /** - * Returns the value of this {@code AtomicInteger} as a {@code double} - * after a widening primitive conversion. - * @jls 5.1.2 Widening Primitive Conversions - */ - public double doubleValue() { - return (double)get(); - } - -} diff --git a/src/teavm-specific/java/it/cavallium/warppi/deps/DEngine.java b/src/teavm-specific/java/it/cavallium/warppi/deps/DEngine.java deleted file mode 100644 index 4d20fd67..00000000 --- a/src/teavm-specific/java/it/cavallium/warppi/deps/DEngine.java +++ /dev/null @@ -1,29 +0,0 @@ -package it.cavallium.warppi.deps; - -import it.cavallium.warppi.ClassUtils; -import it.cavallium.warppi.gui.graphicengine.GraphicEngine; -import it.cavallium.warppi.gui.graphicengine.html.HtmlEngine; - -public class DEngine { - public static GraphicEngine newCPUEngine() { - return null; - } - public static GraphicEngine newGPUEngine() { - return null; - } - public static GraphicEngine newHeadless24bitEngine() { - return null; - } - public static GraphicEngine newHeadless256Engine() { - return null; - } - public static GraphicEngine newHeadless8Engine() { - return null; - } - public static GraphicEngine newFBEngine() { - return null; - } - public static GraphicEngine newHtmlEngine() { - return new HtmlEngine(); - } -} diff --git a/src/teavm-specific/java/it/cavallium/warppi/deps/DGpio.java b/src/teavm-specific/java/it/cavallium/warppi/deps/DGpio.java deleted file mode 100644 index de9750f1..00000000 --- a/src/teavm-specific/java/it/cavallium/warppi/deps/DGpio.java +++ /dev/null @@ -1,45 +0,0 @@ -package it.cavallium.warppi.deps; - -import it.cavallium.warppi.ClassUtils; -import it.cavallium.warppi.ClassUtils.Var; - -public class DGpio { - - public static final int OUTPUT = 0; - public static final int PWM_OUTPUT = 1; - public static final int INPUT = 2; - public static final int HIGH = 3; - public static final int LOW = 4; - public static final Object UnknownBoardType = new Object(); - - public static void wiringPiSetupPhys() { - } - - public static void pinMode(int i, int type) { - } - - public static void digitalWrite(int pin, int val) { - throw new java.lang.UnsupportedOperationException("Not implemented."); - } - - public static void digitalWrite(int pin, boolean val) { - throw new java.lang.UnsupportedOperationException("Not implemented."); - } - - public static void pwmWrite(int pin, int val) { - throw new java.lang.UnsupportedOperationException("Not implemented."); - } - - public static void delayMicroseconds(int t) { - throw new java.lang.UnsupportedOperationException("Not implemented."); - } - - public static int digitalRead(int pin) { - throw new java.lang.UnsupportedOperationException("Not implemented."); - } - - public static Object getBoardType() { - return new Object(); - } - -} diff --git a/src/teavm-specific/java/it/cavallium/warppi/deps/DJDTCompiler.java b/src/teavm-specific/java/it/cavallium/warppi/deps/DJDTCompiler.java deleted file mode 100644 index c7f815ca..00000000 --- a/src/teavm-specific/java/it/cavallium/warppi/deps/DJDTCompiler.java +++ /dev/null @@ -1,13 +0,0 @@ -package it.cavallium.warppi.deps; - -import java.io.PrintWriter; - -import it.cavallium.warppi.ClassUtils; -import it.cavallium.warppi.ClassUtils.Var; - -public class DJDTCompiler { - - public static boolean compile(String[] strings, PrintWriter printWriter, PrintWriter printWriter2) { - throw new java.lang.UnsupportedOperationException("Not implemented."); - } -} diff --git a/src/teavm-specific/java/it/cavallium/warppi/deps/DStandardOpenOption.java b/src/teavm-specific/java/it/cavallium/warppi/deps/DStandardOpenOption.java deleted file mode 100644 index 8635026c..00000000 --- a/src/teavm-specific/java/it/cavallium/warppi/deps/DStandardOpenOption.java +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved. - * ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - */ - -package it.cavallium.warppi.deps; - -/** - * Defines the standard open options. - * - * @since 1.7 - */ - -public enum DStandardOpenOption { - /** - * Open for read access. - */ - READ, - - /** - * Open for write access. - */ - WRITE, - - /** - * If the file is opened for {@link #WRITE} access then bytes will be written - * to the end of the file rather than the beginning. - * - * If the file is opened for write access by other programs, then it - * is file system specific if writing to the end of the file is atomic. - */ - APPEND, - - /** - * If the file already exists and it is opened for {@link #WRITE} - * access, then its length is truncated to 0. This option is ignored - * if the file is opened only for {@link #READ} access. - */ - TRUNCATE_EXISTING, - - /** - * Create a new file if it does not exist. - * This option is ignored if the {@link #CREATE_NEW} option is also set. - * The check for the existence of the file and the creation of the file - * if it does not exist is atomic with respect to other file system - * operations. - */ - CREATE, - - /** - * Create a new file, failing if the file already exists. - * The check for the existence of the file and the creation of the file - * if it does not exist is atomic with respect to other file system - * operations. - */ - CREATE_NEW, - - /** - * Delete on close. When this option is present then the implementation - * makes a best effort attempt to delete the file when closed - * by the appropriate {@code close} method. If the {@code close} method is - * not invoked then a best effort attempt is made to delete the - * file when the Java virtual machine terminates (either normally, as - * defined by the Java Language Specification, or where possible, abnormally). - * This option is primarily intended for use with work files that - * are used solely by a single instance of the Java virtual machine. This - * option is not recommended for use when opening files that are open - * concurrently by other entities. Many of the details as to when and how - * the file is deleted are implementation specific and therefore not - * specified. In particular, an implementation may be unable to guarantee - * that it deletes the expected file when replaced by an attacker while the - * file is open. Consequently, security sensitive applications should take - * care when using this option. - * - * For security reasons, this option may imply the {@link - * LinkOption#NOFOLLOW_LINKS} option. In other words, if the option is present - * when opening an existing file that is a symbolic link then it may fail - * (by throwing {@link java.io.IOException}). - */ - DELETE_ON_CLOSE, - - /** - * Sparse file. When used with the {@link #CREATE_NEW} option then this - * option provides a hint that the new file will be sparse. The - * option is ignored when the file system does not support the creation of - * sparse files. - */ - SPARSE, - - /** - * Requires that every update to the file's content or metadata be written - * synchronously to the underlying storage device. - * - * @see Synchronized I/O file integrity - */ - SYNC, - - /** - * Requires that every update to the file's content be written - * synchronously to the underlying storage device. - * - * @see Synchronized I/O file integrity - */ - DSYNC; -} diff --git a/src/teavm-specific/java/it/cavallium/warppi/deps/DSystem.java b/src/teavm-specific/java/it/cavallium/warppi/deps/DSystem.java deleted file mode 100644 index dbdb0933..00000000 --- a/src/teavm-specific/java/it/cavallium/warppi/deps/DSystem.java +++ /dev/null @@ -1,7 +0,0 @@ -package it.cavallium.warppi.deps; - -public class DSystem { - public static final void exit(int code) { - System.err.println("====================PROGRAM END===================="); - } -} diff --git a/src/teavm-specific/java/it/cavallium/warppi/deps/DURLClassLoader.java b/src/teavm-specific/java/it/cavallium/warppi/deps/DURLClassLoader.java deleted file mode 100644 index b6f444ee..00000000 --- a/src/teavm-specific/java/it/cavallium/warppi/deps/DURLClassLoader.java +++ /dev/null @@ -1,20 +0,0 @@ -package it.cavallium.warppi.deps; - -import java.net.URL; - -public class DURLClassLoader { - - public DURLClassLoader(URL[] urls) { - // TODO Auto-generated constructor stub - } - - public Class loadClass(String javaClassNameAndPath) { - return null; - } - - public void close() { - // TODO Auto-generated method stub - - } - -} diff --git a/src/teavm-specific/java/it/cavallium/warppi/deps/jogamp/DJogamp.java b/src/teavm-specific/java/it/cavallium/warppi/deps/jogamp/DJogamp.java deleted file mode 100644 index a8f05605..00000000 --- a/src/teavm-specific/java/it/cavallium/warppi/deps/jogamp/DJogamp.java +++ /dev/null @@ -1,568 +0,0 @@ -package it.cavallium.warppi.deps.jogamp; - -import it.cavallium.warppi.ClassUtils; -import it.cavallium.warppi.ClassUtils.Var; - -public class DJogamp { - - // - // Unicode: Non printable controls: [0x00 - 0x1F] - // - - /** - * This value, {@value}, is used to indicate that the keyCode is unknown. - */ - public static final short VK_UNDEFINED = (short) 0x0; - - static final short VK_FREE01 = (short) 0x01; - - /** Constant for the HOME function key. ASCII: Start Of Text. */ - public static final short VK_HOME = (short) 0x02; - - /** Constant for the END function key. ASCII: End Of Text. */ - public static final short VK_END = (short) 0x03; - - /** Constant for the END function key. ASCII: End Of Transmission. */ - public static final short VK_FINAL = (short) 0x04; - - /** Constant for the PRINT function key. ASCII: Enquiry. */ - public static final short VK_PRINTSCREEN = (short) 0x05; - - static final short VK_FREE06 = (short) 0x06; - static final short VK_FREE07 = (short) 0x07; - - /** Constant for the BACK SPACE key "\b", matching ASCII. Printable! */ - public static final short VK_BACK_SPACE = (short) 0x08; - - /** Constant for the HORIZ TAB key "\t", matching ASCII. Printable! */ - public static final short VK_TAB = (short) 0x09; - - /** LINE_FEED "\n", matching ASCII, n/a on keyboard. */ - static final short VK_FREE0A = (short) 0x0A; - - /** Constant for the PAGE DOWN function key. ASCII: Vertical Tabulation. */ - public static final short VK_PAGE_DOWN = (short) 0x0B; - - /** Constant for the CLEAR key, i.e. FORM FEED, matching ASCII. */ - public static final short VK_CLEAR = (short) 0x0C; - - /** Constant for the ENTER key, i.e. CARRIAGE RETURN, matching ASCII. Printable! */ - public static final short VK_ENTER = (short) 0x0D; - - static final short VK_FREE0E = (short) 0x0E; - - /** Constant for the CTRL function key. ASCII: shift-in. */ - public static final short VK_SHIFT = (short) 0x0F; - - /** Constant for the PAGE UP function key. ASCII: Data Link Escape. */ - public static final short VK_PAGE_UP = (short) 0x10; - - /** Constant for the CTRL function key. ASCII: device-ctrl-one. */ - public static final short VK_CONTROL = (short) 0x11; - - /** Constant for the left ALT function key. ASCII: device-ctrl-two. */ - public static final short VK_ALT = (short) 0x12; - - /** Constant for the ALT_GRAPH function key, i.e. right ALT key. ASCII: device-ctrl-three. */ - public static final short VK_ALT_GRAPH = (short) 0x13; - - /** Constant for the CAPS LOCK function key. ASCII: device-ctrl-four. */ - public static final short VK_CAPS_LOCK = (short) 0x14; - - static final short VK_FREE15 = (short) 0x15; - - /** Constant for the PAUSE function key. ASCII: sync-idle. */ - public static final short VK_PAUSE = (short) 0x16; - - /** scroll lock key. ASCII: End Of Transmission Block. */ - public static final short VK_SCROLL_LOCK = (short) 0x17; - - /** Constant for the CANCEL function key. ASCII: Cancel. */ - public static final short VK_CANCEL = (short) 0x18; - - static final short VK_FREE19 = (short) 0x19; - - /** Constant for the INSERT function key. ASCII: Substitute. */ - public static final short VK_INSERT = (short) 0x1A; - - /** Constant for the ESCAPE function key. ASCII: Escape. */ - public static final short VK_ESCAPE = (short) 0x1B; - - /** Constant for the Convert function key, Japanese "henkan". ASCII: File Separator. */ - public static final short VK_CONVERT = (short) 0x1C; - - /** Constant for the Don't Convert function key, Japanese "muhenkan". ASCII: Group Separator.*/ - public static final short VK_NONCONVERT = (short) 0x1D; - - /** Constant for the Accept or Commit function key, Japanese "kakutei". ASCII: Record Separator.*/ - public static final short VK_ACCEPT = (short) 0x1E; - - /** Constant for the Mode Change (?). ASCII: Unit Separator.*/ - public static final short VK_MODECHANGE = (short) 0x1F; - - // - // Unicode: Printable [0x20 - 0x7E] - // NOTE: Collision of 'a' - 'x' [0x61 .. 0x78], used for keyCode/keySym Fn function keys - // - - /** Constant for the SPACE function key. ASCII: SPACE. */ - public static final short VK_SPACE = (short) 0x20; - - /** Constant for the "!" key. */ - public static final short VK_EXCLAMATION_MARK = (short) 0x21; - - /** Constant for the """ key. */ - public static final short VK_QUOTEDBL = (short) 0x22; - - /** Constant for the "#" key. */ - public static final short VK_NUMBER_SIGN = (short) 0x23; - - /** Constant for the "$" key. */ - public static final short VK_DOLLAR = (short) 0x24; - - /** Constant for the "%" key. */ - public static final short VK_PERCENT = (short) 0x25; - - /** Constant for the "&" key. */ - public static final short VK_AMPERSAND = (short) 0x26; - - /** Constant for the "'" key. */ - public static final short VK_QUOTE = (short) 0x27; - - /** Constant for the "(" key. */ - public static final short VK_LEFT_PARENTHESIS = (short) 0x28; - - /** Constant for the ")" key. */ - public static final short VK_RIGHT_PARENTHESIS = (short) 0x29; - - /** Constant for the "*" key */ - public static final short VK_ASTERISK = (short) 0x2A; - - /** Constant for the "+" key. */ - public static final short VK_PLUS = (short) 0x2B; - - /** Constant for the comma key, "," */ - public static final short VK_COMMA = (short) 0x2C; - - /** Constant for the minus key, "-" */ - public static final short VK_MINUS = (short) 0x2D; - - /** Constant for the period key, "." */ - public static final short VK_PERIOD = (short) 0x2E; - - /** Constant for the forward slash key, "/" */ - public static final short VK_SLASH = (short) 0x2F; - - /** VK_0 thru VK_9 are the same as UTF16/ASCII '0' thru '9' [0x30 - 0x39] */ - public static final short VK_0 = (short) 0x30; - /** See {@link #VK_0}. */ - public static final short VK_1 = (short) 0x31; - /** See {@link #VK_0}. */ - public static final short VK_2 = (short) 0x32; - /** See {@link #VK_0}. */ - public static final short VK_3 = (short) 0x33; - /** See {@link #VK_0}. */ - public static final short VK_4 = (short) 0x34; - /** See {@link #VK_0}. */ - public static final short VK_5 = (short) 0x35; - /** See {@link #VK_0}. */ - public static final short VK_6 = (short) 0x36; - /** See {@link #VK_0}. */ - public static final short VK_7 = (short) 0x37; - /** See {@link #VK_0}. */ - public static final short VK_8 = (short) 0x38; - /** See {@link #VK_0}. */ - public static final short VK_9 = (short) 0x39; - - /** Constant for the ":" key. */ - public static final short VK_COLON = (short) 0x3A; - - /** Constant for the semicolon key, ";" */ - public static final short VK_SEMICOLON = (short) 0x3B; - - /** Constant for the equals key, "<" */ - public static final short VK_LESS = (short) 0x3C; - - /** Constant for the equals key, "=" */ - public static final short VK_EQUALS = (short) 0x3D; - - /** Constant for the equals key, ">" */ - public static final short VK_GREATER = (short) 0x3E; - - /** Constant for the equals key, "?" */ - public static final short VK_QUESTIONMARK = (short) 0x3F; - - /** Constant for the equals key, "@" */ - public static final short VK_AT = (short) 0x40; - - /** VK_A thru VK_Z are the same as Capital UTF16/ASCII 'A' thru 'Z' (0x41 - 0x5A) */ - public static final short VK_A = (short) 0x41; - /** See {@link #VK_A}. */ - public static final short VK_B = (short) 0x42; - /** See {@link #VK_A}. */ - public static final short VK_C = (short) 0x43; - /** See {@link #VK_A}. */ - public static final short VK_D = (short) 0x44; - /** See {@link #VK_A}. */ - public static final short VK_E = (short) 0x45; - /** See {@link #VK_A}. */ - public static final short VK_F = (short) 0x46; - /** See {@link #VK_A}. */ - public static final short VK_G = (short) 0x47; - /** See {@link #VK_A}. */ - public static final short VK_H = (short) 0x48; - /** See {@link #VK_A}. */ - public static final short VK_I = (short) 0x49; - /** See {@link #VK_A}. */ - public static final short VK_J = (short) 0x4A; - /** See {@link #VK_A}. */ - public static final short VK_K = (short) 0x4B; - /** See {@link #VK_A}. */ - public static final short VK_L = (short) 0x4C; - /** See {@link #VK_A}. */ - public static final short VK_M = (short) 0x4D; - /** See {@link #VK_A}. */ - public static final short VK_N = (short) 0x4E; - /** See {@link #VK_A}. */ - public static final short VK_O = (short) 0x4F; - /** See {@link #VK_A}. */ - public static final short VK_P = (short) 0x50; - /** See {@link #VK_A}. */ - public static final short VK_Q = (short) 0x51; - /** See {@link #VK_A}. */ - public static final short VK_R = (short) 0x52; - /** See {@link #VK_A}. */ - public static final short VK_S = (short) 0x53; - /** See {@link #VK_A}. */ - public static final short VK_T = (short) 0x54; - /** See {@link #VK_A}. */ - public static final short VK_U = (short) 0x55; - /** See {@link #VK_A}. */ - public static final short VK_V = (short) 0x56; - /** See {@link #VK_A}. */ - public static final short VK_W = (short) 0x57; - /** See {@link #VK_A}. */ - public static final short VK_X = (short) 0x58; - /** See {@link #VK_A}. */ - public static final short VK_Y = (short) 0x59; - /** See {@link #VK_A}. */ - public static final short VK_Z = (short) 0x5A; - - /** Constant for the open bracket key, "[" */ - public static final short VK_OPEN_BRACKET = (short) 0x5B; - - /**Constant for the back slash key, "\" */ - public static final short VK_BACK_SLASH = (short) 0x5C; - - /** Constant for the close bracket key, "]" */ - public static final short VK_CLOSE_BRACKET = (short) 0x5D; - - /** Constant for the "^" key. */ - public static final short VK_CIRCUMFLEX = (short) 0x5E; - - /** Constant for the "_" key */ - public static final short VK_UNDERSCORE = (short) 0x5F; - - /** Constant for the "`" key */ - public static final short VK_BACK_QUOTE = (short) 0x60; - - /** Small UTF/ASCII 'a' thru 'z' (0x61 - 0x7a) - Not used for keyCode / keySym. */ - - /** - * Constant for the Fn function keys. - * - * F1..F24, i.e. Fn, are mapped from on 0x60+n -> [0x61 .. 0x78]. - * - * - * Warning: The Fn function keys do collide with unicode characters small 'a' thru 'x'! - * See Unicode Collision for details. - * - */ - public static final short VK_F1 = (short) ( 0x60+ 1 ); - - /** Constant for the F2 function key. See {@link #VK_F1}. */ - public static final short VK_F2 = (short) ( 0x60+ 2 ); - - /** Constant for the F3 function key. See {@link #VK_F1}. */ - public static final short VK_F3 = (short) ( 0x60+ 3 ); - - /** Constant for the F4 function key. See {@link #VK_F1}. */ - public static final short VK_F4 = (short) ( 0x60+ 4 ); - - /** Constant for the F5 function key. See {@link #VK_F1}. */ - public static final short VK_F5 = (short) ( 0x60+ 5 ); - - /** Constant for the F6 function key. See {@link #VK_F1}. */ - public static final short VK_F6 = (short) ( 0x60+ 6 ); - - /** Constant for the F7 function key. See {@link #VK_F1}. */ - public static final short VK_F7 = (short) ( 0x60+ 7 ); - - /** Constant for the F8 function key. See {@link #VK_F1}. */ - public static final short VK_F8 = (short) ( 0x60+ 8 ); - - /** Constant for the F9 function key. See {@link #VK_F1}. */ - public static final short VK_F9 = (short) ( 0x60+ 9 ); - - /** Constant for the F11 function key. See {@link #VK_F1}. */ - public static final short VK_F10 = (short) ( 0x60+10 ); - - /** Constant for the F11 function key. See {@link #VK_F1}. */ - public static final short VK_F11 = (short) ( 0x60+11 ); - - /** Constant for the F12 function key. See {@link #VK_F1}.*/ - public static final short VK_F12 = (short) ( 0x60+12 ); - - /** Constant for the F13 function key. See {@link #VK_F1}. */ - public static final short VK_F13 = (short) ( 0x60+13 ); - - /** Constant for the F14 function key. See {@link #VK_F1}. */ - public static final short VK_F14 = (short) ( 0x60+14 ); - - /** Constant for the F15 function key. See {@link #VK_F1}. */ - public static final short VK_F15 = (short) ( 0x60+15 ); - - /** Constant for the F16 function key. See {@link #VK_F1}. */ - public static final short VK_F16 = (short) ( 0x60+16 ); - - /** Constant for the F17 function key. See {@link #VK_F1}. */ - public static final short VK_F17 = (short) ( 0x60+17 ); - - /** Constant for the F18 function key. See {@link #VK_F1}. */ - public static final short VK_F18 = (short) ( 0x60+18 ); - - /** Constant for the F19 function key. See {@link #VK_F1}. */ - public static final short VK_F19 = (short) ( 0x60+19 ); - - /** Constant for the F20 function key. See {@link #VK_F1}. */ - public static final short VK_F20 = (short) ( 0x60+20 ); - - /** Constant for the F21 function key. See {@link #VK_F1}. */ - public static final short VK_F21 = (short) ( 0x60+21 ); - - /** Constant for the F22 function key. See {@link #VK_F1}. */ - public static final short VK_F22 = (short) ( 0x60+22 ); - - /** Constant for the F23 function key. See {@link #VK_F1}. */ - public static final short VK_F23 = (short) ( 0x60+23 ); - - /** Constant for the F24 function key. See {@link #VK_F1}. */ - public static final short VK_F24 = (short) ( 0x60+24 ); - - - /** Constant for the "{" key */ - public static final short VK_LEFT_BRACE = (short) 0x7B; - /** Constant for the "|" key */ - public static final short VK_PIPE = (short) 0x7C; - /** Constant for the "}" key */ - public static final short VK_RIGHT_BRACE = (short) 0x7D; - - /** Constant for the "~" key, matching ASCII */ - public static final short VK_TILDE = (short) 0x7E; - - // - // Unicode: Non printable controls: [0x7F - 0x9F] - // - // Numpad keys [0x7F - 0x8E] are printable - // - - /** Numeric keypad decimal separator key. Non printable UTF control. */ - public static final short VK_SEPARATOR = (short) 0x7F; - - /** Numeric keypad VK_NUMPAD0 thru VK_NUMPAD9 are mapped to UTF control (0x80 - 0x89). Non printable UTF control. */ - public static final short VK_NUMPAD0 = (short) 0x80; - /** See {@link #VK_NUMPAD0}. */ - public static final short VK_NUMPAD1 = (short) 0x81; - /** See {@link #VK_NUMPAD0}. */ - public static final short VK_NUMPAD2 = (short) 0x82; - /** See {@link #VK_NUMPAD0}. */ - public static final short VK_NUMPAD3 = (short) 0x83; - /** See {@link #VK_NUMPAD0}. */ - public static final short VK_NUMPAD4 = (short) 0x84; - /** See {@link #VK_NUMPAD0}. */ - public static final short VK_NUMPAD5 = (short) 0x85; - /** See {@link #VK_NUMPAD0}. */ - public static final short VK_NUMPAD6 = (short) 0x86; - /** See {@link #VK_NUMPAD0}. */ - public static final short VK_NUMPAD7 = (short) 0x87; - /** See {@link #VK_NUMPAD0}. */ - public static final short VK_NUMPAD8 = (short) 0x88; - /** See {@link #VK_NUMPAD0}. */ - public static final short VK_NUMPAD9 = (short) 0x89; - - /** Numeric keypad decimal separator key. Non printable UTF control. */ - public static final short VK_DECIMAL = (short) 0x8A; - - /** Numeric keypad add key. Non printable UTF control. */ - public static final short VK_ADD = (short) 0x8B; - - /** Numeric keypad subtract key. Non printable UTF control. */ - public static final short VK_SUBTRACT = (short) 0x8C; - - /** Numeric keypad multiply key. Non printable UTF control. */ - public static final short VK_MULTIPLY = (short) 0x8D; - - /** Numeric keypad divide key. Non printable UTF control. */ - public static final short VK_DIVIDE = (short) 0x8E; - - /** Constant for the DEL key, matching ASCII. Non printable UTF control. */ - public static final short VK_DELETE = (short) 0x93; - - /** Numeric keypad num lock key. Non printable UTF control. */ - public static final short VK_NUM_LOCK = (short) 0x94; - - /** Constant for the cursor- or numerical-pad left arrow key. Non printable UTF control. */ - public static final short VK_LEFT = (short) 0x95; - - /** Constant for the cursor- or numerical-pad up arrow key. Non printable UTF control. */ - public static final short VK_UP = (short) 0x96; - - /** Constant for the cursor- or numerical-pad right arrow key. Non printable UTF control. */ - public static final short VK_RIGHT = (short) 0x97; - - /** Constant for the cursor- or numerical pad down arrow key. Non printable UTF control. */ - public static final short VK_DOWN = (short) 0x98; - - /** Constant for the Context Menu key. Non printable UTF control. */ - public static final short VK_CONTEXT_MENU = (short) 0x99; - - /** - * Constant for the MS "Windows" function key. - * It is used for both the left and right version of the key. - */ - public static final short VK_WINDOWS = (short) 0x9A; - - /** Constant for the Meta function key. */ - public static final short VK_META = (short) 0x9B; - - /** Constant for the Help function key. */ - public static final short VK_HELP = (short) 0x9C; - - /** Constant for the Compose function key. */ - public static final short VK_COMPOSE = (short) 0x9D; - - /** Constant for the Begin function key. */ - public static final short VK_BEGIN = (short) 0x9E; - - /** Constant for the Stop function key. */ - public static final short VK_STOP = (short) 0x9F; - - // - // Unicode: Printable [0x00A0 - 0xDFFF] - // - - /** Constant for the inverted exclamation mark key. */ - public static final short VK_INVERTED_EXCLAMATION_MARK = (short) 0xA1; - - /** Constant for the Euro currency sign key. */ - public static final short VK_EURO_SIGN = (short) 0x20AC; - - // - // Unicode: Private 0xE000 - 0xF8FF (Marked Non-Printable) - // - - /* for Sun keyboards */ - public static final short VK_CUT = (short) 0xF879; - public static final short VK_COPY = (short) 0xF87A; - public static final short VK_PASTE = (short) 0xF87B; - public static final short VK_UNDO = (short) 0xF87C; - public static final short VK_AGAIN = (short) 0xF87D; - public static final short VK_FIND = (short) 0xF87E; - public static final short VK_PROPS = (short) 0xF87F; - - /* for input method support on Asian Keyboards */ - - /** - * Constant for the input method on/off key. - */ - /* Japanese PC 106 keyboard: kanji. Japanese Solaris keyboard: nihongo */ - public static final short VK_INPUT_METHOD_ON_OFF = (short) 0xF890; - - /** - * Constant for the Code Input function key. - */ - /* Japanese PC 106 keyboard - VK_ALPHANUMERIC + ALT: kanji bangou */ - public static final short VK_CODE_INPUT = (short) 0xF891; - - /** - * Constant for the Roman Characters function key. - */ - /* Japanese PC 106 keyboard: roumaji */ - public static final short VK_ROMAN_CHARACTERS = (short) 0xF892; - - /** - * Constant for the All Candidates function key. - */ - /* Japanese PC 106 keyboard - VK_CONVERT + ALT: zenkouho */ - public static final short VK_ALL_CANDIDATES = (short) 0xF893; - - /** - * Constant for the Previous Candidate function key. - */ - /* Japanese PC 106 keyboard - VK_CONVERT + SHIFT: maekouho */ - public static final short VK_PREVIOUS_CANDIDATE = (short) 0xF894; - - /** - * Constant for the Alphanumeric function key. - */ - /* Japanese PC 106 keyboard: eisuu */ - public static final short VK_ALPHANUMERIC = (short) 0xF895; - - /** - * Constant for the Katakana function key. - */ - /* Japanese PC 106 keyboard: katakana */ - public static final short VK_KATAKANA = (short) 0xF896; - - /** - * Constant for the Hiragana function key. - */ - /* Japanese PC 106 keyboard: hiragana */ - public static final short VK_HIRAGANA = (short) 0xF897; - - /** - * Constant for the Full-Width Characters function key. - */ - /* Japanese PC 106 keyboard: zenkaku */ - public static final short VK_FULL_WIDTH = (short) 0xF898; - - /** - * Constant for the Half-Width Characters function key. - */ - /* Japanese PC 106 keyboard: hankaku */ - public static final short VK_HALF_WIDTH = (short) 0xF89A; - - /** - * Constant for the Japanese-Katakana function key. - * This key switches to a Japanese input method and selects its Katakana input mode. - */ - /* Japanese Macintosh keyboard - VK_JAPANESE_HIRAGANA + SHIFT */ - public static final short VK_JAPANESE_KATAKANA = (short) 0xF89B; - - /** - * Constant for the Japanese-Hiragana function key. - * This key switches to a Japanese input method and selects its Hiragana input mode. - */ - /* Japanese Macintosh keyboard */ - public static final short VK_JAPANESE_HIRAGANA = (short) 0xF89C; - - /** - * Constant for the Japanese-Roman function key. - * This key switches to a Japanese input method and selects its Roman-Direct input mode. - */ - /* Japanese Macintosh keyboard */ - public static final short VK_JAPANESE_ROMAN = (short) 0xF89D; - - /** - * Constant for the locking Kana function key. - * This key locks the keyboard into a Kana layout. - */ - /* Japanese PC 106 keyboard with special Windows driver - eisuu + Control; Japanese Solaris keyboard: kana */ - public static final short VK_KANA_LOCK = (short) 0xF89F; - - /** - * Constant for Keyboard became invisible, e.g. Android's soft keyboard Back button hit while keyboard is visible. - */ - public static final short VK_KEYBOARD_INVISIBLE = (short) 0xF8FF; - -} diff --git a/src/teavm-specific/java/it/cavallium/warppi/deps/nio/DFiles.java b/src/teavm-specific/java/it/cavallium/warppi/deps/nio/DFiles.java deleted file mode 100644 index 7150c8d8..00000000 --- a/src/teavm-specific/java/it/cavallium/warppi/deps/nio/DFiles.java +++ /dev/null @@ -1,32 +0,0 @@ -package it.cavallium.warppi.deps.nio; - -import java.io.File; -import java.io.IOException; -import java.nio.charset.Charset; -import java.util.List; - -import org.apache.commons.io.FileUtils; - -import it.cavallium.warppi.deps.nio.DPaths.DPathImpl; - -public class DFiles { - - public static List readAllLines(DPath osRelease) throws IOException { - return FileUtils.readLines(osRelease.toFile(), Charset.defaultCharset()); - } - - public static boolean exists(DPath f) { - return f.toFile().exists(); - } - - public static DPath createTempFile(String prefix, String suffix) throws IOException { - return new DPathImpl(File.createTempFile(prefix, suffix)); - } - - public static void deleteIfExists(DPath f) throws IOException { - if (f.toFile().exists()) { - f.toFile().delete(); - } - } - -} diff --git a/src/teavm-specific/java/it/cavallium/warppi/deps/nio/DPath.java b/src/teavm-specific/java/it/cavallium/warppi/deps/nio/DPath.java deleted file mode 100644 index 685e8509..00000000 --- a/src/teavm-specific/java/it/cavallium/warppi/deps/nio/DPath.java +++ /dev/null @@ -1,12 +0,0 @@ -package it.cavallium.warppi.deps.nio; - -import java.io.File; -import java.nio.file.Path; - -public interface DPath { - - DPath toAbsolutePath(); - - File toFile(); - -} diff --git a/src/teavm-specific/java/it/cavallium/warppi/deps/nio/DPaths.java b/src/teavm-specific/java/it/cavallium/warppi/deps/nio/DPaths.java deleted file mode 100644 index 15197f2b..00000000 --- a/src/teavm-specific/java/it/cavallium/warppi/deps/nio/DPaths.java +++ /dev/null @@ -1,32 +0,0 @@ -package it.cavallium.warppi.deps.nio; - -import java.io.File; - -public class DPaths { - public static DPath get(String first, String... more) { - return new DPathImpl("/etc", "os-release"); - } - - protected static class DPathImpl implements DPath { - protected final File realFile; - - private DPathImpl(String main, String... more) { - realFile = new File(String.join(File.separator, main)); - } - - DPathImpl(File f) { - realFile = f; - } - - @Override - public File toFile() { - return realFile; - } - - @Override - public DPath toAbsolutePath() { - return new DPathImpl(realFile.getAbsoluteFile()); - } - - } -} diff --git a/src/teavm-specific/java/it/cavallium/warppi/gui/graphicengine/html/InputEvent.java b/src/teavm-specific/java/it/cavallium/warppi/gui/graphicengine/html/InputEvent.java deleted file mode 100644 index e28d2cb4..00000000 --- a/src/teavm-specific/java/it/cavallium/warppi/gui/graphicengine/html/InputEvent.java +++ /dev/null @@ -1,10 +0,0 @@ -package it.cavallium.warppi.gui.graphicengine.html; - -import org.teavm.jso.JSProperty; -import org.teavm.jso.dom.events.Event; - -public interface InputEvent extends Event { - - @JSProperty - String getValue(); -} diff --git a/teavm/.classpath b/teavm/.classpath new file mode 100644 index 00000000..e1938397 --- /dev/null +++ b/teavm/.classpath @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/teavm/.gitignore b/teavm/.gitignore new file mode 100644 index 00000000..b83d2226 --- /dev/null +++ b/teavm/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/teavm/.project b/teavm/.project new file mode 100644 index 00000000..af36fefb --- /dev/null +++ b/teavm/.project @@ -0,0 +1,23 @@ + + + warppi-teavm + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/teavm/.settings/org.eclipse.core.resources.prefs b/teavm/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000..654c1750 --- /dev/null +++ b/teavm/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding/=UTF-8 diff --git a/teavm/.settings/org.eclipse.jdt.core.prefs b/teavm/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..f494d1de --- /dev/null +++ b/teavm/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,6 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/teavm/.settings/org.eclipse.m2e.core.prefs b/teavm/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 00000000..14b697b7 --- /dev/null +++ b/teavm/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/teavm/pom.xml b/teavm/pom.xml new file mode 100644 index 00000000..9df40a65 --- /dev/null +++ b/teavm/pom.xml @@ -0,0 +1,113 @@ + + 4.0.0 + + + it.cavallium + warppi + ${project.version} + + warppi-teavm + jar + + WarpPI Calculator TeaVM + WarpPI Calculator teavm project + + + it.cavallium + warppi-core + ${project.version} + + + it.cavallium + warppi-rules + ${project.version} + + + org.teavm + teavm-classlib + 0.6.0-dev-559 + + + + + teavm-dev + https://dl.bintray.com/konsoletyper/teavm + + true + + default + + + + + 1_teavm-dev + https://dl.bintray.com/konsoletyper/teavm + + true + + default + + + + + + + org.codehaus.mojo + versions-maven-plugin + 2.5 + + + org.teavm:* + + + + + org.apache.maven.plugins + maven-compiler-plugin + + ${maven.compiler.source} + ${maven.compiler.target} + UTF-8 + + + + org.teavm + teavm-maven-plugin + 0.6.0-dev-559 + + + + compile + + process-classes + + it.cavallium.warppi.teavm.TeaVMBoot + true + true + true + + + + + + org.apache.maven.plugins + maven-source-plugin + + + org.apache.maven.plugins + maven-javadoc-plugin + + + org.apache.maven.plugins + maven-resources-plugin + 3.0.2 + + UTF-8 + + + + + + diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/BufferedStreamFeeder.java b/teavm/src/main/java/ar/com/hjg/pngj/BufferedStreamFeeder.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/BufferedStreamFeeder.java rename to teavm/src/main/java/ar/com/hjg/pngj/BufferedStreamFeeder.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/ChunkReader.java b/teavm/src/main/java/ar/com/hjg/pngj/ChunkReader.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/ChunkReader.java rename to teavm/src/main/java/ar/com/hjg/pngj/ChunkReader.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/ChunkSeqBuffering.java b/teavm/src/main/java/ar/com/hjg/pngj/ChunkSeqBuffering.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/ChunkSeqBuffering.java rename to teavm/src/main/java/ar/com/hjg/pngj/ChunkSeqBuffering.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/ChunkSeqReader.java b/teavm/src/main/java/ar/com/hjg/pngj/ChunkSeqReader.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/ChunkSeqReader.java rename to teavm/src/main/java/ar/com/hjg/pngj/ChunkSeqReader.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/ChunkSeqReaderPng.java b/teavm/src/main/java/ar/com/hjg/pngj/ChunkSeqReaderPng.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/ChunkSeqReaderPng.java rename to teavm/src/main/java/ar/com/hjg/pngj/ChunkSeqReaderPng.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/ChunkSeqSkipping.java b/teavm/src/main/java/ar/com/hjg/pngj/ChunkSeqSkipping.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/ChunkSeqSkipping.java rename to teavm/src/main/java/ar/com/hjg/pngj/ChunkSeqSkipping.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/DeflatedChunkReader.java b/teavm/src/main/java/ar/com/hjg/pngj/DeflatedChunkReader.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/DeflatedChunkReader.java rename to teavm/src/main/java/ar/com/hjg/pngj/DeflatedChunkReader.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/DeflatedChunksSet.java b/teavm/src/main/java/ar/com/hjg/pngj/DeflatedChunksSet.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/DeflatedChunksSet.java rename to teavm/src/main/java/ar/com/hjg/pngj/DeflatedChunksSet.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/Deinterlacer.java b/teavm/src/main/java/ar/com/hjg/pngj/Deinterlacer.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/Deinterlacer.java rename to teavm/src/main/java/ar/com/hjg/pngj/Deinterlacer.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/FilterType.java b/teavm/src/main/java/ar/com/hjg/pngj/FilterType.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/FilterType.java rename to teavm/src/main/java/ar/com/hjg/pngj/FilterType.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/IBytesConsumer.java b/teavm/src/main/java/ar/com/hjg/pngj/IBytesConsumer.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/IBytesConsumer.java rename to teavm/src/main/java/ar/com/hjg/pngj/IBytesConsumer.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/IChunkFactory.java b/teavm/src/main/java/ar/com/hjg/pngj/IChunkFactory.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/IChunkFactory.java rename to teavm/src/main/java/ar/com/hjg/pngj/IChunkFactory.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/IDatChunkWriter.java b/teavm/src/main/java/ar/com/hjg/pngj/IDatChunkWriter.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/IDatChunkWriter.java rename to teavm/src/main/java/ar/com/hjg/pngj/IDatChunkWriter.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/IImageLine.java b/teavm/src/main/java/ar/com/hjg/pngj/IImageLine.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/IImageLine.java rename to teavm/src/main/java/ar/com/hjg/pngj/IImageLine.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/IImageLineArray.java b/teavm/src/main/java/ar/com/hjg/pngj/IImageLineArray.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/IImageLineArray.java rename to teavm/src/main/java/ar/com/hjg/pngj/IImageLineArray.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/IImageLineFactory.java b/teavm/src/main/java/ar/com/hjg/pngj/IImageLineFactory.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/IImageLineFactory.java rename to teavm/src/main/java/ar/com/hjg/pngj/IImageLineFactory.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/IImageLineSet.java b/teavm/src/main/java/ar/com/hjg/pngj/IImageLineSet.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/IImageLineSet.java rename to teavm/src/main/java/ar/com/hjg/pngj/IImageLineSet.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/IImageLineSetFactory.java b/teavm/src/main/java/ar/com/hjg/pngj/IImageLineSetFactory.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/IImageLineSetFactory.java rename to teavm/src/main/java/ar/com/hjg/pngj/IImageLineSetFactory.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/IPngWriterFactory.java b/teavm/src/main/java/ar/com/hjg/pngj/IPngWriterFactory.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/IPngWriterFactory.java rename to teavm/src/main/java/ar/com/hjg/pngj/IPngWriterFactory.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/IdatSet.java b/teavm/src/main/java/ar/com/hjg/pngj/IdatSet.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/IdatSet.java rename to teavm/src/main/java/ar/com/hjg/pngj/IdatSet.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/ImageInfo.java b/teavm/src/main/java/ar/com/hjg/pngj/ImageInfo.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/ImageInfo.java rename to teavm/src/main/java/ar/com/hjg/pngj/ImageInfo.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/ImageLineByte.java b/teavm/src/main/java/ar/com/hjg/pngj/ImageLineByte.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/ImageLineByte.java rename to teavm/src/main/java/ar/com/hjg/pngj/ImageLineByte.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/ImageLineHelper.java b/teavm/src/main/java/ar/com/hjg/pngj/ImageLineHelper.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/ImageLineHelper.java rename to teavm/src/main/java/ar/com/hjg/pngj/ImageLineHelper.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/ImageLineInt.java b/teavm/src/main/java/ar/com/hjg/pngj/ImageLineInt.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/ImageLineInt.java rename to teavm/src/main/java/ar/com/hjg/pngj/ImageLineInt.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/ImageLineSetDefault.java b/teavm/src/main/java/ar/com/hjg/pngj/ImageLineSetDefault.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/ImageLineSetDefault.java rename to teavm/src/main/java/ar/com/hjg/pngj/ImageLineSetDefault.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/PngHelperInternal.java b/teavm/src/main/java/ar/com/hjg/pngj/PngHelperInternal.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/PngHelperInternal.java rename to teavm/src/main/java/ar/com/hjg/pngj/PngHelperInternal.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/PngHelperInternal2.java b/teavm/src/main/java/ar/com/hjg/pngj/PngHelperInternal2.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/PngHelperInternal2.java rename to teavm/src/main/java/ar/com/hjg/pngj/PngHelperInternal2.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/PngReader.java b/teavm/src/main/java/ar/com/hjg/pngj/PngReader.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/PngReader.java rename to teavm/src/main/java/ar/com/hjg/pngj/PngReader.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/PngReaderApng.java b/teavm/src/main/java/ar/com/hjg/pngj/PngReaderApng.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/PngReaderApng.java rename to teavm/src/main/java/ar/com/hjg/pngj/PngReaderApng.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/PngReaderByte.java b/teavm/src/main/java/ar/com/hjg/pngj/PngReaderByte.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/PngReaderByte.java rename to teavm/src/main/java/ar/com/hjg/pngj/PngReaderByte.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/PngReaderFilter.java b/teavm/src/main/java/ar/com/hjg/pngj/PngReaderFilter.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/PngReaderFilter.java rename to teavm/src/main/java/ar/com/hjg/pngj/PngReaderFilter.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/PngReaderInt.java b/teavm/src/main/java/ar/com/hjg/pngj/PngReaderInt.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/PngReaderInt.java rename to teavm/src/main/java/ar/com/hjg/pngj/PngReaderInt.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/PngWriter.java b/teavm/src/main/java/ar/com/hjg/pngj/PngWriter.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/PngWriter.java rename to teavm/src/main/java/ar/com/hjg/pngj/PngWriter.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/PngWriterHc.java b/teavm/src/main/java/ar/com/hjg/pngj/PngWriterHc.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/PngWriterHc.java rename to teavm/src/main/java/ar/com/hjg/pngj/PngWriterHc.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/PngjBadCrcException.java b/teavm/src/main/java/ar/com/hjg/pngj/PngjBadCrcException.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/PngjBadCrcException.java rename to teavm/src/main/java/ar/com/hjg/pngj/PngjBadCrcException.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/PngjException.java b/teavm/src/main/java/ar/com/hjg/pngj/PngjException.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/PngjException.java rename to teavm/src/main/java/ar/com/hjg/pngj/PngjException.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/PngjExceptionInternal.java b/teavm/src/main/java/ar/com/hjg/pngj/PngjExceptionInternal.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/PngjExceptionInternal.java rename to teavm/src/main/java/ar/com/hjg/pngj/PngjExceptionInternal.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/PngjInputException.java b/teavm/src/main/java/ar/com/hjg/pngj/PngjInputException.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/PngjInputException.java rename to teavm/src/main/java/ar/com/hjg/pngj/PngjInputException.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/PngjOutputException.java b/teavm/src/main/java/ar/com/hjg/pngj/PngjOutputException.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/PngjOutputException.java rename to teavm/src/main/java/ar/com/hjg/pngj/PngjOutputException.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/PngjUnsupportedException.java b/teavm/src/main/java/ar/com/hjg/pngj/PngjUnsupportedException.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/PngjUnsupportedException.java rename to teavm/src/main/java/ar/com/hjg/pngj/PngjUnsupportedException.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/RowInfo.java b/teavm/src/main/java/ar/com/hjg/pngj/RowInfo.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/RowInfo.java rename to teavm/src/main/java/ar/com/hjg/pngj/RowInfo.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/chunks/ChunkCopyBehaviour.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/ChunkCopyBehaviour.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/chunks/ChunkCopyBehaviour.java rename to teavm/src/main/java/ar/com/hjg/pngj/chunks/ChunkCopyBehaviour.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/chunks/ChunkFactory.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/ChunkFactory.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/chunks/ChunkFactory.java rename to teavm/src/main/java/ar/com/hjg/pngj/chunks/ChunkFactory.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/chunks/ChunkHelper.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/ChunkHelper.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/chunks/ChunkHelper.java rename to teavm/src/main/java/ar/com/hjg/pngj/chunks/ChunkHelper.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/chunks/ChunkLoadBehaviour.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/ChunkLoadBehaviour.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/chunks/ChunkLoadBehaviour.java rename to teavm/src/main/java/ar/com/hjg/pngj/chunks/ChunkLoadBehaviour.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/chunks/ChunkPredicate.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/ChunkPredicate.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/chunks/ChunkPredicate.java rename to teavm/src/main/java/ar/com/hjg/pngj/chunks/ChunkPredicate.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/chunks/ChunkRaw.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/ChunkRaw.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/chunks/ChunkRaw.java rename to teavm/src/main/java/ar/com/hjg/pngj/chunks/ChunkRaw.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/chunks/ChunksList.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/ChunksList.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/chunks/ChunksList.java rename to teavm/src/main/java/ar/com/hjg/pngj/chunks/ChunksList.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/chunks/ChunksListForWrite.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/ChunksListForWrite.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/chunks/ChunksListForWrite.java rename to teavm/src/main/java/ar/com/hjg/pngj/chunks/ChunksListForWrite.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngBadCharsetException.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngBadCharsetException.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngBadCharsetException.java rename to teavm/src/main/java/ar/com/hjg/pngj/chunks/PngBadCharsetException.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunk.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunk.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunk.java rename to teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunk.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkACTL.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkACTL.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkACTL.java rename to teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkACTL.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkBKGD.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkBKGD.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkBKGD.java rename to teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkBKGD.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkCHRM.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkCHRM.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkCHRM.java rename to teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkCHRM.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkFCTL.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkFCTL.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkFCTL.java rename to teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkFCTL.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkFDAT.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkFDAT.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkFDAT.java rename to teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkFDAT.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkGAMA.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkGAMA.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkGAMA.java rename to teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkGAMA.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkHIST.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkHIST.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkHIST.java rename to teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkHIST.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkICCP.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkICCP.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkICCP.java rename to teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkICCP.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkIDAT.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkIDAT.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkIDAT.java rename to teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkIDAT.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkIEND.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkIEND.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkIEND.java rename to teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkIEND.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkIHDR.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkIHDR.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkIHDR.java rename to teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkIHDR.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkITXT.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkITXT.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkITXT.java rename to teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkITXT.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkMultiple.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkMultiple.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkMultiple.java rename to teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkMultiple.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkOFFS.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkOFFS.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkOFFS.java rename to teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkOFFS.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkPHYS.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkPHYS.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkPHYS.java rename to teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkPHYS.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkPLTE.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkPLTE.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkPLTE.java rename to teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkPLTE.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkSBIT.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkSBIT.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkSBIT.java rename to teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkSBIT.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkSPLT.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkSPLT.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkSPLT.java rename to teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkSPLT.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkSRGB.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkSRGB.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkSRGB.java rename to teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkSRGB.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkSTER.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkSTER.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkSTER.java rename to teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkSTER.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkSingle.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkSingle.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkSingle.java rename to teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkSingle.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkTEXT.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkTEXT.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkTEXT.java rename to teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkTEXT.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkTIME.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkTIME.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkTIME.java rename to teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkTIME.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkTRNS.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkTRNS.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkTRNS.java rename to teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkTRNS.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkTextVar.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkTextVar.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkTextVar.java rename to teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkTextVar.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkUNKNOWN.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkUNKNOWN.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkUNKNOWN.java rename to teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkUNKNOWN.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkZTXT.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkZTXT.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngChunkZTXT.java rename to teavm/src/main/java/ar/com/hjg/pngj/chunks/PngChunkZTXT.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngMetadata.java b/teavm/src/main/java/ar/com/hjg/pngj/chunks/PngMetadata.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/chunks/PngMetadata.java rename to teavm/src/main/java/ar/com/hjg/pngj/chunks/PngMetadata.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/chunks/package.html b/teavm/src/main/java/ar/com/hjg/pngj/chunks/package.html similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/chunks/package.html rename to teavm/src/main/java/ar/com/hjg/pngj/chunks/package.html diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/package.html b/teavm/src/main/java/ar/com/hjg/pngj/package.html similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/package.html rename to teavm/src/main/java/ar/com/hjg/pngj/package.html diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/pixels/CompressorStream.java b/teavm/src/main/java/ar/com/hjg/pngj/pixels/CompressorStream.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/pixels/CompressorStream.java rename to teavm/src/main/java/ar/com/hjg/pngj/pixels/CompressorStream.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/pixels/CompressorStreamDeflater.java b/teavm/src/main/java/ar/com/hjg/pngj/pixels/CompressorStreamDeflater.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/pixels/CompressorStreamDeflater.java rename to teavm/src/main/java/ar/com/hjg/pngj/pixels/CompressorStreamDeflater.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/pixels/CompressorStreamLz4.java b/teavm/src/main/java/ar/com/hjg/pngj/pixels/CompressorStreamLz4.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/pixels/CompressorStreamLz4.java rename to teavm/src/main/java/ar/com/hjg/pngj/pixels/CompressorStreamLz4.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/pixels/DeflaterEstimatorHjg.java b/teavm/src/main/java/ar/com/hjg/pngj/pixels/DeflaterEstimatorHjg.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/pixels/DeflaterEstimatorHjg.java rename to teavm/src/main/java/ar/com/hjg/pngj/pixels/DeflaterEstimatorHjg.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/pixels/DeflaterEstimatorLz4.java b/teavm/src/main/java/ar/com/hjg/pngj/pixels/DeflaterEstimatorLz4.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/pixels/DeflaterEstimatorLz4.java rename to teavm/src/main/java/ar/com/hjg/pngj/pixels/DeflaterEstimatorLz4.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/pixels/FiltersPerformance.java b/teavm/src/main/java/ar/com/hjg/pngj/pixels/FiltersPerformance.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/pixels/FiltersPerformance.java rename to teavm/src/main/java/ar/com/hjg/pngj/pixels/FiltersPerformance.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/pixels/PixelsWriter.java b/teavm/src/main/java/ar/com/hjg/pngj/pixels/PixelsWriter.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/pixels/PixelsWriter.java rename to teavm/src/main/java/ar/com/hjg/pngj/pixels/PixelsWriter.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/pixels/PixelsWriterDefault.java b/teavm/src/main/java/ar/com/hjg/pngj/pixels/PixelsWriterDefault.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/pixels/PixelsWriterDefault.java rename to teavm/src/main/java/ar/com/hjg/pngj/pixels/PixelsWriterDefault.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/pixels/PixelsWriterMultiple.java b/teavm/src/main/java/ar/com/hjg/pngj/pixels/PixelsWriterMultiple.java similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/pixels/PixelsWriterMultiple.java rename to teavm/src/main/java/ar/com/hjg/pngj/pixels/PixelsWriterMultiple.java diff --git a/src/teavm-specific/java/ar/com/hjg/pngj/pixels/package.html b/teavm/src/main/java/ar/com/hjg/pngj/pixels/package.html similarity index 100% rename from src/teavm-specific/java/ar/com/hjg/pngj/pixels/package.html rename to teavm/src/main/java/ar/com/hjg/pngj/pixels/package.html diff --git a/src/teavm-specific/java/it/cavallium/warppi/gui/graphicengine/html/HtmlEngine.java b/teavm/src/main/java/it/cavallium/warppi/gui/graphicengine/html/HtmlEngine.java similarity index 93% rename from src/teavm-specific/java/it/cavallium/warppi/gui/graphicengine/html/HtmlEngine.java rename to teavm/src/main/java/it/cavallium/warppi/gui/graphicengine/html/HtmlEngine.java index a668ae00..adb9c583 100644 --- a/src/teavm-specific/java/it/cavallium/warppi/gui/graphicengine/html/HtmlEngine.java +++ b/teavm/src/main/java/it/cavallium/warppi/gui/graphicengine/html/HtmlEngine.java @@ -1,300 +1,296 @@ -package it.cavallium.warppi.gui.graphicengine.html; - -import java.io.IOException; -import java.util.concurrent.Semaphore; - -import org.teavm.jso.JSBody; -import org.teavm.jso.JSObject; -import org.teavm.jso.browser.Window; -import org.teavm.jso.canvas.CanvasGradient; -import org.teavm.jso.canvas.CanvasRenderingContext2D; -import org.teavm.jso.dom.events.Event; -import org.teavm.jso.dom.events.EventListener; -import org.teavm.jso.dom.events.EventTarget; -import org.teavm.jso.dom.events.KeyboardEvent; -import org.teavm.jso.dom.html.HTMLButtonElement; -import org.teavm.jso.dom.html.HTMLCanvasElement; -import org.teavm.jso.dom.html.HTMLDocument; -import org.teavm.jso.dom.html.HTMLElement; -import org.teavm.jso.dom.html.HTMLInputElement; -import org.teavm.jso.dom.xml.NodeList; -import org.teavm.jso.json.JSON; - -import it.cavallium.warppi.PlatformUtils; -import it.cavallium.warppi.Utils; -import it.cavallium.warppi.deps.DSemaphore; -import it.cavallium.warppi.deps.StorageUtils; -import it.cavallium.warppi.device.Keyboard; -import it.cavallium.warppi.flow.BehaviorSubject; -import it.cavallium.warppi.flow.Observable; -import it.cavallium.warppi.gui.graphicengine.BinaryFont; -import it.cavallium.warppi.gui.graphicengine.GraphicEngine; -import it.cavallium.warppi.gui.graphicengine.Renderer; -import it.cavallium.warppi.gui.graphicengine.RenderingLoop; -import it.cavallium.warppi.gui.graphicengine.Skin; -import it.cavallium.warppi.gui.graphicengine.cpu.CPUFont; -import it.cavallium.warppi.gui.graphicengine.cpu.CPUSkin; - -public class HtmlEngine implements GraphicEngine { - - private boolean initialized; - public DSemaphore exitSemaphore = new DSemaphore(0); - private static final HTMLDocument document = Window.current().getDocument(); - private HTMLCanvasElement canvas; - private CanvasRenderingContext2D g; - private RenderingLoop renderingLoop; - private HtmlRenderer renderer; - private int width = -1, height = -1; - private final int frameTime = (int) (1000d/10d); - private final BehaviorSubject onResize = BehaviorSubject.create(); - - @Override - public int[] getSize() { - return new int[] { getWidth(), getHeight() }; - } - - @Override - public boolean isInitialized() { - return initialized; - } - - @Override - public void setTitle(String title) { - HtmlEngine.setHTMLTitle(title); - } - - @JSBody(params = {"wndTitle"}, script = "document.title = wndTitle") - private static native void setHTMLTitle(String wndTitle); - - @Override - public void setResizable(boolean r) {} - - @Override - public void setDisplayMode(int ww, int wh) { - canvas.setWidth(ww); - width = ww; - canvas.setHeight(wh); - height = wh; - } - - private String previousValue=""; - - @Override - public void create(Runnable onInitialized) { - canvas = (HTMLCanvasElement) document.createElement("canvas"); - g = (CanvasRenderingContext2D ) canvas.getContext("2d"); - HTMLInputElement keyInput = (HTMLInputElement) document.createElement("input"); - keyInput.setType("text"); - keyInput.getStyle().setProperty("opacity", "0.1"); - setDisplayMode(480, 320); - document.getElementById("container").appendChild(canvas); - document.getBody().appendChild(keyInput); - keyInput.setTabIndex(0); - keyInput.addEventListener("keydown", (KeyboardEvent evt) -> { - evt.preventDefault(); - new Thread(() -> { - previousValue = keyInput.getValue(); - Keyboard.debugKeyPressed(evt.getKeyCode()); - System.out.println(evt.getKeyCode()); - System.out.println(""+(int) evt.getKey().charAt(0)); - }).start(); - }); - keyInput.addEventListener("input", (Event evt) -> { - evt.preventDefault(); - final String previousValue = this.previousValue; - final String newValue = keyInput.getValue(); - final int prevLen = previousValue.length(); - final int newLen = newValue.length(); - - new Thread(() -> { - if (newLen == prevLen) { - - } else if (newLen - prevLen == 1) { - Keyboard.debugKeyPressed((int) newValue.toUpperCase().charAt(newLen-1)); - } else if (newLen - prevLen > 1) { - for (int i = 0; i < newLen - prevLen; i++) { - Keyboard.debugKeyPressed((int) newValue.toUpperCase().charAt(prevLen + i)); - } - } else if (newLen - prevLen < 1) { - for (int i = 0; i < prevLen - newLen; i++) { - Keyboard.debugKeyPressed(8); - } - } - }).start(); - }); - canvas.addEventListener("click", (Event evt) -> { - keyInput.focus(); - }); - document.addEventListener("DOMContentLoaded", (Event e) -> { - keyInput.focus(); - }); - NodeList buttons = document.getBody().getElementsByTagName("button"); - for (int i = 0; i < buttons.getLength(); i++) { - if (buttons.item(i).hasAttribute("keycode")) { - buttons.item(i).addEventListener("click", (Event evt) -> { - evt.preventDefault(); - EventTarget target = evt.getCurrentTarget(); - HTMLButtonElement button = target.cast(); - new Thread(() -> { - try { - if (button.hasAttribute("keycode") && button.getAttribute("keycode").contains(",")) { - String code = button.getAttribute("keycode"); - String[] coordinates = code.split(",", 2); - boolean removeshift = Keyboard.shift && Integer.parseInt(coordinates[0]) != 0 && Integer.parseInt(coordinates[1]) != 0; - boolean removealpha = Keyboard.alpha && Integer.parseInt(coordinates[0]) != 0 && Integer.parseInt(coordinates[1]) != 1; - Keyboard.keyPressedRaw(Integer.parseInt(coordinates[0]), Integer.parseInt(coordinates[1])); - if (removeshift) { - Keyboard.keyPressedRaw(0,0); - } - if (removealpha) { - Keyboard.keyPressedRaw(0,1); - } - Thread.sleep(100); - Keyboard.keyReleasedRaw(Integer.parseInt(coordinates[0]), Integer.parseInt(coordinates[1])); - if (removeshift) { - Keyboard.keyReleasedRaw(0,0); - } - if (removealpha) { - Keyboard.keyReleasedRaw(0,1); - } - } else { - if (Keyboard.alpha && !Keyboard.shift) { - if (button.hasAttribute("keycodea")) { - Keyboard.debugKeyPressed(Integer.parseInt(button.getAttribute("keycodea"))); - } else { - Keyboard.debugKeyPressed(Integer.parseInt(button.getAttribute("keycode"))); - } - } else if (!Keyboard.alpha && Keyboard.shift) { - if (button.hasAttribute("keycodes")) { - Keyboard.debugKeyPressed(Integer.parseInt(button.getAttribute("keycodes"))); - } else { - Keyboard.debugKeyPressed(Integer.parseInt(button.getAttribute("keycode"))); - } - } else if (Keyboard.alpha && Keyboard.shift) { - if (button.hasAttribute("keycodesa")) { - Keyboard.debugKeyPressed(Integer.parseInt(button.getAttribute("keycodesa"))); - } else { - if (button.hasAttribute("keycodes")) { - Keyboard.debugKeyPressed(Integer.parseInt(button.getAttribute("keycodes"))); - } else { - Keyboard.debugKeyPressed(Integer.parseInt(button.getAttribute("keycode"))); - } - } - } else { - Keyboard.debugKeyPressed(Integer.parseInt(button.getAttribute("keycode"))); - } - } - } catch (Exception ex) { - ex.printStackTrace(); - } - }).start(); - }); - } - } - renderer = new HtmlRenderer(this, g); - initialized = true; - if (onInitialized != null) { - onInitialized.run(); - } - } - - @Override - public int getWidth() { - if (width == -1) { - width = canvas.getWidth(); - } - return width; - } - - @Override - public int getHeight() { - if (height == -1) { - height = canvas.getHeight(); - } - return height; - } - - @Override - public void destroy() { - document.getBody().removeChild(canvas); - initialized = false; - exitSemaphore.release(); - } - - @Override - public void start(RenderingLoop d) { - renderingLoop = d; - final Thread th = new Thread(() -> { - try { - double extratime = 0; - while (initialized) { - final long start = System.currentTimeMillis(); - repaint(); - final long end = System.currentTimeMillis(); - final double delta = (end - start) / 1000d; - final int deltaInt = (int) Math.floor(delta); - final int extraTimeInt = (int) Math.floor(extratime); - if (extraTimeInt + deltaInt < frameTime) { - Thread.sleep(frameTime - (extraTimeInt + deltaInt)); - extratime = 0; - } else { - extratime += delta - frameTime; - } - } - } catch (final InterruptedException e) { - e.printStackTrace(); - } - }); - PlatformUtils.setThreadName(th, "Canvas rendering thread"); - PlatformUtils.setDaemon(th); - th.start(); - } - - @Override - public void repaint() { - renderingLoop.refresh(); - } - - @Override - public HtmlRenderer getRenderer() { - return renderer; - } - - @Override - public HtmlFont loadFont(String fontName) throws IOException { - return new HtmlFont(fontName); - } - - @Override - public HtmlFont loadFont(String path, String fontName) throws IOException { - return new HtmlFont(fontName); - } - - @Override - public HtmlSkin loadSkin(String file) throws IOException { - return new HtmlSkin(file); - } - - @Override - public void waitForExit() { - try { - exitSemaphore.acquire(); - } catch (final InterruptedException e) {} - } - - @Override - public boolean isSupported() { - return PlatformUtils.isJavascript; - } - - @Override - public boolean doesRefreshPauses() { - return true; - } - - @Override - public Observable onResize() { - return onResize; - } - -} +package it.cavallium.warppi.gui.graphicengine.html; + +import java.io.IOException; + +import org.teavm.jso.JSBody; +import org.teavm.jso.JSObject; +import org.teavm.jso.browser.Window; +import org.teavm.jso.canvas.CanvasGradient; +import org.teavm.jso.canvas.CanvasRenderingContext2D; +import org.teavm.jso.dom.events.Event; +import org.teavm.jso.dom.events.EventListener; +import org.teavm.jso.dom.events.EventTarget; +import org.teavm.jso.dom.events.KeyboardEvent; +import org.teavm.jso.dom.html.HTMLButtonElement; +import org.teavm.jso.dom.html.HTMLCanvasElement; +import org.teavm.jso.dom.html.HTMLDocument; +import org.teavm.jso.dom.html.HTMLElement; +import org.teavm.jso.dom.html.HTMLInputElement; +import org.teavm.jso.dom.xml.NodeList; +import org.teavm.jso.json.JSON; + +import it.cavallium.warppi.Engine; +import it.cavallium.warppi.Utils; +import it.cavallium.warppi.deps.Platform.Semaphore; +import it.cavallium.warppi.device.Keyboard; +import it.cavallium.warppi.flow.BehaviorSubject; +import it.cavallium.warppi.flow.Observable; +import it.cavallium.warppi.gui.graphicengine.BinaryFont; +import it.cavallium.warppi.gui.graphicengine.GraphicEngine; +import it.cavallium.warppi.gui.graphicengine.Renderer; +import it.cavallium.warppi.gui.graphicengine.RenderingLoop; +import it.cavallium.warppi.gui.graphicengine.Skin; + +public class HtmlEngine implements GraphicEngine { + + private boolean initialized; + public Semaphore exitSemaphore = Engine.getPlatform().newSemaphore(0); + private static final HTMLDocument document = Window.current().getDocument(); + private HTMLCanvasElement canvas; + private CanvasRenderingContext2D g; + private RenderingLoop renderingLoop; + private HtmlRenderer renderer; + private int width = -1, height = -1; + private final int frameTime = (int) (1000d/10d); + private final BehaviorSubject onResize = BehaviorSubject.create(); + + @Override + public int[] getSize() { + return new int[] { getWidth(), getHeight() }; + } + + @Override + public boolean isInitialized() { + return initialized; + } + + @Override + public void setTitle(String title) { + HtmlEngine.setHTMLTitle(title); + } + + @JSBody(params = {"wndTitle"}, script = "document.title = wndTitle") + private static native void setHTMLTitle(String wndTitle); + + @Override + public void setResizable(boolean r) {} + + @Override + public void setDisplayMode(int ww, int wh) { + canvas.setWidth(ww); + width = ww; + canvas.setHeight(wh); + height = wh; + } + + private String previousValue=""; + + @Override + public void create(Runnable onInitialized) { + canvas = (HTMLCanvasElement) document.createElement("canvas"); + g = (CanvasRenderingContext2D ) canvas.getContext("2d"); + HTMLInputElement keyInput = (HTMLInputElement) document.createElement("input"); + keyInput.setType("text"); + keyInput.getStyle().setProperty("opacity", "0.1"); + setDisplayMode(480, 320); + document.getElementById("container").appendChild(canvas); + document.getBody().appendChild(keyInput); + keyInput.setTabIndex(0); + keyInput.addEventListener("keydown", (KeyboardEvent evt) -> { + evt.preventDefault(); + new Thread(() -> { + previousValue = keyInput.getValue(); + Keyboard.debugKeyPressed(evt.getKeyCode()); + System.out.println(evt.getKeyCode()); + System.out.println(""+(int) evt.getKey().charAt(0)); + }).start(); + }); + keyInput.addEventListener("input", (Event evt) -> { + evt.preventDefault(); + final String previousValue = this.previousValue; + final String newValue = keyInput.getValue(); + final int prevLen = previousValue.length(); + final int newLen = newValue.length(); + + new Thread(() -> { + if (newLen == prevLen) { + + } else if (newLen - prevLen == 1) { + Keyboard.debugKeyPressed((int) newValue.toUpperCase().charAt(newLen-1)); + } else if (newLen - prevLen > 1) { + for (int i = 0; i < newLen - prevLen; i++) { + Keyboard.debugKeyPressed((int) newValue.toUpperCase().charAt(prevLen + i)); + } + } else if (newLen - prevLen < 1) { + for (int i = 0; i < prevLen - newLen; i++) { + Keyboard.debugKeyPressed(8); + } + } + }).start(); + }); + canvas.addEventListener("click", (Event evt) -> { + keyInput.focus(); + }); + document.addEventListener("DOMContentLoaded", (Event e) -> { + keyInput.focus(); + }); + NodeList buttons = document.getBody().getElementsByTagName("button"); + for (int i = 0; i < buttons.getLength(); i++) { + if (buttons.item(i).hasAttribute("keycode")) { + buttons.item(i).addEventListener("click", (Event evt) -> { + evt.preventDefault(); + EventTarget target = evt.getCurrentTarget(); + HTMLButtonElement button = target.cast(); + new Thread(() -> { + try { + if (button.hasAttribute("keycode") && button.getAttribute("keycode").contains(",")) { + String code = button.getAttribute("keycode"); + String[] coordinates = code.split(",", 2); + boolean removeshift = Keyboard.shift && Integer.parseInt(coordinates[0]) != 0 && Integer.parseInt(coordinates[1]) != 0; + boolean removealpha = Keyboard.alpha && Integer.parseInt(coordinates[0]) != 0 && Integer.parseInt(coordinates[1]) != 1; + Keyboard.keyPressedRaw(Integer.parseInt(coordinates[0]), Integer.parseInt(coordinates[1])); + if (removeshift) { + Keyboard.keyPressedRaw(0,0); + } + if (removealpha) { + Keyboard.keyPressedRaw(0,1); + } + Thread.sleep(100); + Keyboard.keyReleasedRaw(Integer.parseInt(coordinates[0]), Integer.parseInt(coordinates[1])); + if (removeshift) { + Keyboard.keyReleasedRaw(0,0); + } + if (removealpha) { + Keyboard.keyReleasedRaw(0,1); + } + } else { + if (Keyboard.alpha && !Keyboard.shift) { + if (button.hasAttribute("keycodea")) { + Keyboard.debugKeyPressed(Integer.parseInt(button.getAttribute("keycodea"))); + } else { + Keyboard.debugKeyPressed(Integer.parseInt(button.getAttribute("keycode"))); + } + } else if (!Keyboard.alpha && Keyboard.shift) { + if (button.hasAttribute("keycodes")) { + Keyboard.debugKeyPressed(Integer.parseInt(button.getAttribute("keycodes"))); + } else { + Keyboard.debugKeyPressed(Integer.parseInt(button.getAttribute("keycode"))); + } + } else if (Keyboard.alpha && Keyboard.shift) { + if (button.hasAttribute("keycodesa")) { + Keyboard.debugKeyPressed(Integer.parseInt(button.getAttribute("keycodesa"))); + } else { + if (button.hasAttribute("keycodes")) { + Keyboard.debugKeyPressed(Integer.parseInt(button.getAttribute("keycodes"))); + } else { + Keyboard.debugKeyPressed(Integer.parseInt(button.getAttribute("keycode"))); + } + } + } else { + Keyboard.debugKeyPressed(Integer.parseInt(button.getAttribute("keycode"))); + } + } + } catch (Exception ex) { + ex.printStackTrace(); + } + }).start(); + }); + } + } + renderer = new HtmlRenderer(this, g); + initialized = true; + if (onInitialized != null) { + onInitialized.run(); + } + } + + @Override + public int getWidth() { + if (width == -1) { + width = canvas.getWidth(); + } + return width; + } + + @Override + public int getHeight() { + if (height == -1) { + height = canvas.getHeight(); + } + return height; + } + + @Override + public void destroy() { + document.getBody().removeChild(canvas); + initialized = false; + exitSemaphore.release(); + } + + @Override + public void start(RenderingLoop d) { + renderingLoop = d; + final Thread th = new Thread(() -> { + try { + double extratime = 0; + while (initialized) { + final long start = System.currentTimeMillis(); + repaint(); + final long end = System.currentTimeMillis(); + final double delta = (end - start) / 1000d; + final int deltaInt = (int) Math.floor(delta); + final int extraTimeInt = (int) Math.floor(extratime); + if (extraTimeInt + deltaInt < frameTime) { + Thread.sleep(frameTime - (extraTimeInt + deltaInt)); + extratime = 0; + } else { + extratime += delta - frameTime; + } + } + } catch (final InterruptedException e) { + e.printStackTrace(); + } + }); + Engine.getPlatform().setThreadName(th, "Canvas rendering thread"); + Engine.getPlatform().setThreadDaemon(th); + th.start(); + } + + @Override + public void repaint() { + renderingLoop.refresh(); + } + + @Override + public HtmlRenderer getRenderer() { + return renderer; + } + + @Override + public HtmlFont loadFont(String fontName) throws IOException { + return new HtmlFont(fontName); + } + + @Override + public HtmlFont loadFont(String path, String fontName) throws IOException { + return new HtmlFont(fontName); + } + + @Override + public HtmlSkin loadSkin(String file) throws IOException { + return new HtmlSkin(file); + } + + @Override + public void waitForExit() { + try { + exitSemaphore.acquire(); + } catch (final InterruptedException e) {} + } + + @Override + public boolean isSupported() { + return Engine.getPlatform().isJavascript(); + } + + @Override + public boolean doesRefreshPauses() { + return true; + } + + @Override + public Observable onResize() { + return onResize; + } + +} \ No newline at end of file diff --git a/src/teavm-specific/java/it/cavallium/warppi/gui/graphicengine/html/HtmlFont.java b/teavm/src/main/java/it/cavallium/warppi/gui/graphicengine/html/HtmlFont.java similarity index 92% rename from src/teavm-specific/java/it/cavallium/warppi/gui/graphicengine/html/HtmlFont.java rename to teavm/src/main/java/it/cavallium/warppi/gui/graphicengine/html/HtmlFont.java index 57419beb..e7645b69 100644 --- a/src/teavm-specific/java/it/cavallium/warppi/gui/graphicengine/html/HtmlFont.java +++ b/teavm/src/main/java/it/cavallium/warppi/gui/graphicengine/html/HtmlFont.java @@ -1,69 +1,69 @@ -package it.cavallium.warppi.gui.graphicengine.html; - -import java.io.IOException; - -import org.teavm.jso.browser.Window; -import org.teavm.jso.canvas.CanvasRenderingContext2D; -import org.teavm.jso.dom.html.HTMLCanvasElement; -import org.teavm.jso.dom.html.HTMLDocument; -import org.teavm.jso.dom.html.HTMLImageElement; -import org.teavm.jso.typedarrays.Uint8ClampedArray; - -import it.cavallium.warppi.StaticVars; -import it.cavallium.warppi.gui.graphicengine.GraphicEngine; -import it.cavallium.warppi.gui.graphicengine.cpu.CPUFont; - -public class HtmlFont extends CPUFont { - - public HTMLCanvasElement imgEl; - public CanvasRenderingContext2D imgElCtx; - - public HtmlFont(String fontName) throws IOException { - super(fontName); - HTMLDocument doc = Window.current().getDocument(); - imgEl = doc.createElement("canvas").cast(); - imgEl.setClassName("hidden"); - doc.getBody().appendChild(imgEl); - imgElCtx = imgEl.getContext("2d").cast(); - imgEl.setWidth(this.charW); - imgEl.setHeight(this.charH * intervalsTotalSize); - - int screenPos = 0; - - int currentInt; - int currentIntBitPosition; - int bitData; - int j; - imgElCtx.clearRect(0, 0, imgEl.getWidth(), imgEl.getHeight()); - imgElCtx.setFillStyle("#000"); - int minBound = 0, maxBound = intervalsTotalSize-1; - System.out.println("charIndex:"+0); - System.out.println("minBound"+minBound); - System.out.println("maxBound"+maxBound); - for (int charIndex = minBound; charIndex < maxBound; charIndex++) { - for (int dy = 0; dy < charH; dy++) { - for (int dx = 0; dx < charW; dx++) { - j = dx; - final int bit = dx + dy * charW; - currentInt = (int) (Math.floor(bit) / (HtmlFont.intBits)); - currentIntBitPosition = bit - (currentInt * HtmlFont.intBits); - final int charIdx = charIndex * charIntCount + currentInt; - if (charIdx >= 0 && charIdx < chars32.length) { - bitData = (chars32[charIdx] >> currentIntBitPosition) & 1; - if (bitData == 1) { - imgElCtx.fillRect( dx, charIndex*charH+dy, 1, 1 ); - } - } - } - } - } - } - - @Override - public void use(GraphicEngine d) { - if (d.getRenderer() instanceof HtmlRenderer) { - ((HtmlRenderer) d.getRenderer()).f = this; - } - } - -} +package it.cavallium.warppi.gui.graphicengine.html; + +import java.io.IOException; + +import org.teavm.jso.browser.Window; +import org.teavm.jso.canvas.CanvasRenderingContext2D; +import org.teavm.jso.dom.html.HTMLCanvasElement; +import org.teavm.jso.dom.html.HTMLDocument; +import org.teavm.jso.dom.html.HTMLImageElement; +import org.teavm.jso.typedarrays.Uint8ClampedArray; + +import it.cavallium.warppi.StaticVars; +import it.cavallium.warppi.gui.graphicengine.GraphicEngine; +import it.cavallium.warppi.gui.graphicengine.common.RFTFont; + +public class HtmlFont extends RFTFont { + + public HTMLCanvasElement imgEl; + public CanvasRenderingContext2D imgElCtx; + + public HtmlFont(String fontName) throws IOException { + super(fontName); + HTMLDocument doc = Window.current().getDocument(); + imgEl = doc.createElement("canvas").cast(); + imgEl.setClassName("hidden"); + doc.getBody().appendChild(imgEl); + imgElCtx = imgEl.getContext("2d").cast(); + imgEl.setWidth(this.charW); + imgEl.setHeight(this.charH * intervalsTotalSize); + + int screenPos = 0; + + int currentInt; + int currentIntBitPosition; + int bitData; + int j; + imgElCtx.clearRect(0, 0, imgEl.getWidth(), imgEl.getHeight()); + imgElCtx.setFillStyle("#000"); + int minBound = 0, maxBound = intervalsTotalSize-1; + System.out.println("charIndex:"+0); + System.out.println("minBound"+minBound); + System.out.println("maxBound"+maxBound); + for (int charIndex = minBound; charIndex < maxBound; charIndex++) { + for (int dy = 0; dy < charH; dy++) { + for (int dx = 0; dx < charW; dx++) { + j = dx; + final int bit = dx + dy * charW; + currentInt = (int) (Math.floor(bit) / (HtmlFont.intBits)); + currentIntBitPosition = bit - (currentInt * HtmlFont.intBits); + final int charIdx = charIndex * charIntCount + currentInt; + if (charIdx >= 0 && charIdx < chars32.length) { + bitData = (chars32[charIdx] >> currentIntBitPosition) & 1; + if (bitData == 1) { + imgElCtx.fillRect( dx, charIndex*charH+dy, 1, 1 ); + } + } + } + } + } + } + + @Override + public void use(GraphicEngine d) { + if (d.getRenderer() instanceof HtmlRenderer) { + ((HtmlRenderer) d.getRenderer()).f = this; + } + } + +} \ No newline at end of file diff --git a/src/teavm-specific/java/it/cavallium/warppi/gui/graphicengine/html/HtmlRenderer.java b/teavm/src/main/java/it/cavallium/warppi/gui/graphicengine/html/HtmlRenderer.java similarity index 96% rename from src/teavm-specific/java/it/cavallium/warppi/gui/graphicengine/html/HtmlRenderer.java rename to teavm/src/main/java/it/cavallium/warppi/gui/graphicengine/html/HtmlRenderer.java index a1e17d90..5739fc5d 100644 --- a/src/teavm-specific/java/it/cavallium/warppi/gui/graphicengine/html/HtmlRenderer.java +++ b/teavm/src/main/java/it/cavallium/warppi/gui/graphicengine/html/HtmlRenderer.java @@ -1,293 +1,293 @@ -package it.cavallium.warppi.gui.graphicengine.html; - -import org.teavm.jso.canvas.CanvasImageSource; -import org.teavm.jso.canvas.CanvasRenderingContext2D; -import org.teavm.jso.dom.html.HTMLImageElement; -import org.teavm.jso.typedarrays.Uint8ClampedArray; - -import it.cavallium.warppi.StaticVars; -import it.cavallium.warppi.gui.graphicengine.Renderer; - -public class HtmlRenderer implements Renderer { - private static final boolean ENABLE_SUPERSAMPLING = false; - private static final boolean ENABLE_TRANSPARENCY = true; - private String currentColor = "#000000ff"; - private String clearColor = "#000000ff"; - HtmlFont f = null; - HtmlSkin currentSkin = null; - private final CanvasRenderingContext2D g; - private final HtmlEngine e; - public HtmlRenderer(HtmlEngine e, CanvasRenderingContext2D g) { - this.g = g; - this.e = e; - } - - private String toHex(int c) { - final int a = c >> 24 & 0xFF; - final int r = c >> 16 & 0xFF; - final int gg = c >> 8 & 0xFF; - final int b = c & 0xFF; - return String.format("#%02x%02x%02x%02x", r, gg, b, a); - } - - private String toHex8(int c) { - final int r = c >> 16 & 0xFF; - final int gg = c >> 8 & 0xFF; - final int b = c & 0xFF; - return String.format("#%02x%02x%02x", r, gg, b); - } - - private String toHex(int r, int g, int b) { - return String.format("#%02x%02x%02x", r, g, b); - } - - private String toHex(int r, int g, int b, int a) { - return String.format("#%02x%02x%02x%02x", r, g, b, a); - } - - @Override - public int glGetClearColor() { - return hexToInt(clearColor); - } - - private int hexToInt(String hex) { - switch (hex.length()) { - case 6: - return (0xFF << 24) | - (Integer.valueOf(hex.substring(0, 2), 16) << 16) | - (Integer.valueOf(hex.substring(2, 4), 16) << 8) | - Integer.valueOf(hex.substring(4, 6), 16); - case 6+1: - return (0xFF << 24) | - (Integer.valueOf(hex.substring(0+1, 2+1), 16) << 16) | - (Integer.valueOf(hex.substring(2+1, 4+1), 16) << 8) | - Integer.valueOf(hex.substring(4+1, 6+1), 16); - case 8: - return (Integer.valueOf(hex.substring(6, 8), 16) << 24) | - (Integer.valueOf(hex.substring(0, 2), 16) << 16) | - (Integer.valueOf(hex.substring(2, 4), 16) << 8) | - Integer.valueOf(hex.substring(4, 6), 16); - case 8+1: - return (Integer.valueOf(hex.substring(6+1, 8+1), 16) << 24) | - (Integer.valueOf(hex.substring(0+1, 2+1), 16) << 16) | - (Integer.valueOf(hex.substring(2+1, 4+1), 16) << 8) | - Integer.valueOf(hex.substring(4+1, 6+1), 16); - } - return 0xFF000000; - } - - @Override - public void glFillRect(float x, float y, float width, float height, float uvX, float uvY, float uvWidth, - float uvHeight) { - if (currentSkin != null) { - glDrawSkin((int) x, (int) y, (int) (x + width), (int) (y + height), (int) uvX, (int) uvY, (int) (uvWidth + uvX), (int) (uvHeight + uvY), true); - } else { - glFillColor(x, y, width, height); - } - } - - @SuppressWarnings("unused") - private void glDrawSkin(int x0, int y0, int x1, int y1, int s0, int t0, int s1, int t1, boolean transparent) { - final int[] size = e.getSize(); - - x0 += StaticVars.screenPos[0]; - y0 += StaticVars.screenPos[1]; - final double incrementX = Math.abs((double) (x1 - x0) / (double) (s1 - s0)); - final double incrementY = Math.abs((double) (y1 - y0) / (double) (t1 - t0)); - final boolean flippedX = (x1 - x0) / (s1 - s0) < 0; - final boolean flippedY = (y1 - y0) / (t1 - t0) < 0; - int oldColor = 0; - int newColor; - final int onex = s0 <= s1 ? 1 : -1; - final int oney = t0 <= t1 ? 1 : -1; - int width = 0; - int height = 0; - if (onex == -1) { - final int s00 = s0; - s0 = s1; - s1 = s00; - width = s1 - s0; - } - if (oney == -1) { - final int t00 = t0; - t0 = t1; - t1 = t00; - height = t1 - t0; - } - if (x0 >= size[0] || y0 >= size[0]) { - return; - } - if (x0 + width >= size[0]) { - s1 = size[0] - x0 + s0; - } - if (y0 + height >= size[1]) { - t1 = size[1] - y0 + t0; - } - if (x0 < 0) { - if (onex == -1) { - width += x0; - s1 += x0 + 1; - } else { - s0 -= x0; - } - x0 = 0; - } - if (y0 < 0) { - if (oney == -1) { - height += y0; - t1 += y0 + 1; - } else { - t0 -= y0; - } - y0 = 0; - } - g.drawImage(currentSkin.getImgElement(), s0, t0, s1-s0, t1-t0, x0, y0, x1-x0, y1-y0); - } - - @Override - public void glFillColor(float x, float y, float width, float height) { - x += StaticVars.screenPos[0]; - y += StaticVars.screenPos[1]; - g.setFillStyle(currentColor); - g.fillRect( x, y, width, height ); - } - - @Override - public void glDrawStringRight(float x, float y, String text) { - glDrawStringLeft(x - f.getStringWidth(text), y, text); - } - - @Override - public void glDrawStringLeft(float x, float y, String textString) { - x += StaticVars.screenPos[0]; - y += StaticVars.screenPos[1]; - - f.imgElCtx.setGlobalCompositeOperation("source-in"); - f.imgElCtx.setFillStyle(currentColor); - f.imgElCtx.fillRect(0, 0, f.imgEl.getWidth(), f.imgEl.getHeight()); - - final int[] text = f.getCharIndexes(textString); - final int[] screenSize = e.getSize(); - int cpos; - final int l = text.length; - for (int i = 0; i < l; i++) { - cpos = (i * (f.charW)); - final int charIndex = text[i]; - g.drawImage(f.imgEl, 0, charIndex*f.charH, f.charW, f.charH, x+cpos, y, f.charW, f.charH); - } - } - - private int stackColors(int... color) { - double a = 0; - double r = 0; - double g = 0; - double b = 0; - for (final int newColor : color) { - final double alpha = (newColor >> 24 & 0xFF) / 255d; - a = a * (1d - alpha) + (newColor >> 24 & 0xFF) * alpha; - r = r * (1d - alpha) + (newColor >> 16 & 0xFF) * alpha; - g = g * (1d - alpha) + (newColor >> 8 & 0xFF) * alpha; - b = b * (1d - alpha) + (newColor & 0xFF) * alpha; - } - return ((int) a) << 24 | ((int) r) << 16 | ((int) g) << 8 | ((int) b); - } - - @Override - public void glDrawStringCenter(float x, float y, String text) { - glDrawStringLeft(x - (f.getStringWidth(text) / 2), y, text); - } - - @Override - public void glDrawLine(float x0, float y0, float x1, float y1) { - if (x1-x0 > 0 && y1-y0 > 0) { - g.beginPath(); - g.moveTo(x0, y0); - g.lineTo(x1, y1); - g.stroke(); - } else { - g.fillRect(x0, y0, (x1-x0)+1, (y1-y0)+1); - } - } - - @Override - public void glDrawCharRight(int x, int y, char ch) { - glDrawStringRight(x, y, ch + ""); - } - - @Override - public void glDrawCharLeft(int x, int y, char ch) { - glDrawStringLeft(x, y, ch + ""); - } - - @Override - public void glDrawCharCenter(int x, int y, char ch) { - glDrawStringCenter(x, y, ch + ""); - } - - @Override - public void glColor4i(int red, int green, int blue, int alpha) { - g.setFillStyle(currentColor = toHex(red, green, blue, alpha)); - } - - @Override - public void glColor4f(float red, float green, float blue, float alpha) { - glColor4i((int) (red * 255d), (int) (green * 255d), (int) (blue * 255d), (int) (alpha * 255d)); - } - - @Override - public void glColor3i(int r, int gg, int b) { - g.setFillStyle(currentColor = toHex(r, gg, b)); - } - - @Override - public void glColor3f(float red, float green, float blue) { - glColor3i((int) (red * 255d), (int) (green * 255d), (int) (blue * 255d)); - } - - @Override - public void glColor(int c) { - final int a = c >> 24 & 0xFF; - final int r = c >> 16 & 0xFF; - final int gg = c >> 8 & 0xFF; - final int b = c & 0xFF; - g.setFillStyle(currentColor = toHex(r, gg, b, a)); - } - - @Override - public void glClearSkin() { - currentSkin = null; - } - - @Override - public void glClearColor4i(int red, int green, int blue, int alpha) { - clearColor = toHex(red, green, blue, alpha); - } - - @Override - public void glClearColor4f(float red, float green, float blue, float alpha) { - clearColor = toHex((int)(red*255), - (int)(green*255), - (int)(blue*255), - (int)(alpha*255)); - } - - @Override - public void glClearColor(int c) { - final int r = c >> 16 & 0xFF; - final int gg = c >> 8 & 0xFF; - final int b = c & 0xFF; - clearColor = toHex(r, gg, b); - } - - @Override - public void glClear(int screenWidth, int screenHeight) { - g.setFillStyle(clearColor); - g.fillRect(0, 0, screenWidth, screenHeight); - g.setFillStyle(currentColor); - } - - @Override - public HtmlFont getCurrentFont() { - return f; - } -} +package it.cavallium.warppi.gui.graphicengine.html; + +import org.teavm.jso.canvas.CanvasImageSource; +import org.teavm.jso.canvas.CanvasRenderingContext2D; +import org.teavm.jso.dom.html.HTMLImageElement; +import org.teavm.jso.typedarrays.Uint8ClampedArray; + +import it.cavallium.warppi.StaticVars; +import it.cavallium.warppi.gui.graphicengine.Renderer; + +public class HtmlRenderer implements Renderer { + private static final boolean ENABLE_SUPERSAMPLING = false; + private static final boolean ENABLE_TRANSPARENCY = true; + private String currentColor = "#000000ff"; + private String clearColor = "#000000ff"; + HtmlFont f = null; + HtmlSkin currentSkin = null; + private final CanvasRenderingContext2D g; + private final HtmlEngine e; + public HtmlRenderer(HtmlEngine e, CanvasRenderingContext2D g) { + this.g = g; + this.e = e; + } + + private String toHex(int c) { + final int a = c >> 24 & 0xFF; + final int r = c >> 16 & 0xFF; + final int gg = c >> 8 & 0xFF; + final int b = c & 0xFF; + return String.format("#%02x%02x%02x%02x", r, gg, b, a); + } + + private String toHex8(int c) { + final int r = c >> 16 & 0xFF; + final int gg = c >> 8 & 0xFF; + final int b = c & 0xFF; + return String.format("#%02x%02x%02x", r, gg, b); + } + + private String toHex(int r, int g, int b) { + return String.format("#%02x%02x%02x", r, g, b); + } + + private String toHex(int r, int g, int b, int a) { + return String.format("#%02x%02x%02x%02x", r, g, b, a); + } + + @Override + public int glGetClearColor() { + return hexToInt(clearColor); + } + + private int hexToInt(String hex) { + switch (hex.length()) { + case 6: + return (0xFF << 24) | + (Integer.valueOf(hex.substring(0, 2), 16) << 16) | + (Integer.valueOf(hex.substring(2, 4), 16) << 8) | + Integer.valueOf(hex.substring(4, 6), 16); + case 6+1: + return (0xFF << 24) | + (Integer.valueOf(hex.substring(0+1, 2+1), 16) << 16) | + (Integer.valueOf(hex.substring(2+1, 4+1), 16) << 8) | + Integer.valueOf(hex.substring(4+1, 6+1), 16); + case 8: + return (Integer.valueOf(hex.substring(6, 8), 16) << 24) | + (Integer.valueOf(hex.substring(0, 2), 16) << 16) | + (Integer.valueOf(hex.substring(2, 4), 16) << 8) | + Integer.valueOf(hex.substring(4, 6), 16); + case 8+1: + return (Integer.valueOf(hex.substring(6+1, 8+1), 16) << 24) | + (Integer.valueOf(hex.substring(0+1, 2+1), 16) << 16) | + (Integer.valueOf(hex.substring(2+1, 4+1), 16) << 8) | + Integer.valueOf(hex.substring(4+1, 6+1), 16); + } + return 0xFF000000; + } + + @Override + public void glFillRect(float x, float y, float width, float height, float uvX, float uvY, float uvWidth, + float uvHeight) { + if (currentSkin != null) { + glDrawSkin((int) x, (int) y, (int) (x + width), (int) (y + height), (int) uvX, (int) uvY, (int) (uvWidth + uvX), (int) (uvHeight + uvY), true); + } else { + glFillColor(x, y, width, height); + } + } + + @SuppressWarnings("unused") + private void glDrawSkin(int x0, int y0, int x1, int y1, int s0, int t0, int s1, int t1, boolean transparent) { + final int[] size = e.getSize(); + + x0 += StaticVars.screenPos[0]; + y0 += StaticVars.screenPos[1]; + final double incrementX = Math.abs((double) (x1 - x0) / (double) (s1 - s0)); + final double incrementY = Math.abs((double) (y1 - y0) / (double) (t1 - t0)); + final boolean flippedX = (x1 - x0) / (s1 - s0) < 0; + final boolean flippedY = (y1 - y0) / (t1 - t0) < 0; + int oldColor = 0; + int newColor; + final int onex = s0 <= s1 ? 1 : -1; + final int oney = t0 <= t1 ? 1 : -1; + int width = 0; + int height = 0; + if (onex == -1) { + final int s00 = s0; + s0 = s1; + s1 = s00; + width = s1 - s0; + } + if (oney == -1) { + final int t00 = t0; + t0 = t1; + t1 = t00; + height = t1 - t0; + } + if (x0 >= size[0] || y0 >= size[0]) { + return; + } + if (x0 + width >= size[0]) { + s1 = size[0] - x0 + s0; + } + if (y0 + height >= size[1]) { + t1 = size[1] - y0 + t0; + } + if (x0 < 0) { + if (onex == -1) { + width += x0; + s1 += x0 + 1; + } else { + s0 -= x0; + } + x0 = 0; + } + if (y0 < 0) { + if (oney == -1) { + height += y0; + t1 += y0 + 1; + } else { + t0 -= y0; + } + y0 = 0; + } + g.drawImage(currentSkin.getImgElement(), s0, t0, s1-s0, t1-t0, x0, y0, x1-x0, y1-y0); + } + + @Override + public void glFillColor(float x, float y, float width, float height) { + x += StaticVars.screenPos[0]; + y += StaticVars.screenPos[1]; + g.setFillStyle(currentColor); + g.fillRect( x, y, width, height ); + } + + @Override + public void glDrawStringRight(float x, float y, String text) { + glDrawStringLeft(x - f.getStringWidth(text), y, text); + } + + @Override + public void glDrawStringLeft(float x, float y, String textString) { + x += StaticVars.screenPos[0]; + y += StaticVars.screenPos[1]; + + f.imgElCtx.setGlobalCompositeOperation("source-in"); + f.imgElCtx.setFillStyle(currentColor); + f.imgElCtx.fillRect(0, 0, f.imgEl.getWidth(), f.imgEl.getHeight()); + + final int[] text = f.getCharIndexes(textString); + final int[] screenSize = e.getSize(); + int cpos; + final int l = text.length; + for (int i = 0; i < l; i++) { + cpos = (i * (f.charW)); + final int charIndex = text[i]; + g.drawImage(f.imgEl, 0, charIndex*f.charH, f.charW, f.charH, x+cpos, y, f.charW, f.charH); + } + } + + private int stackColors(int... color) { + double a = 0; + double r = 0; + double g = 0; + double b = 0; + for (final int newColor : color) { + final double alpha = (newColor >> 24 & 0xFF) / 255d; + a = a * (1d - alpha) + (newColor >> 24 & 0xFF) * alpha; + r = r * (1d - alpha) + (newColor >> 16 & 0xFF) * alpha; + g = g * (1d - alpha) + (newColor >> 8 & 0xFF) * alpha; + b = b * (1d - alpha) + (newColor & 0xFF) * alpha; + } + return ((int) a) << 24 | ((int) r) << 16 | ((int) g) << 8 | ((int) b); + } + + @Override + public void glDrawStringCenter(float x, float y, String text) { + glDrawStringLeft(x - (f.getStringWidth(text) / 2), y, text); + } + + @Override + public void glDrawLine(float x0, float y0, float x1, float y1) { + if (x1-x0 > 0 && y1-y0 > 0) { + g.beginPath(); + g.moveTo(x0, y0); + g.lineTo(x1, y1); + g.stroke(); + } else { + g.fillRect(x0, y0, (x1-x0)+1, (y1-y0)+1); + } + } + + @Override + public void glDrawCharRight(int x, int y, char ch) { + glDrawStringRight(x, y, ch + ""); + } + + @Override + public void glDrawCharLeft(int x, int y, char ch) { + glDrawStringLeft(x, y, ch + ""); + } + + @Override + public void glDrawCharCenter(int x, int y, char ch) { + glDrawStringCenter(x, y, ch + ""); + } + + @Override + public void glColor4i(int red, int green, int blue, int alpha) { + g.setFillStyle(currentColor = toHex(red, green, blue, alpha)); + } + + @Override + public void glColor4f(float red, float green, float blue, float alpha) { + glColor4i((int) (red * 255d), (int) (green * 255d), (int) (blue * 255d), (int) (alpha * 255d)); + } + + @Override + public void glColor3i(int r, int gg, int b) { + g.setFillStyle(currentColor = toHex(r, gg, b)); + } + + @Override + public void glColor3f(float red, float green, float blue) { + glColor3i((int) (red * 255d), (int) (green * 255d), (int) (blue * 255d)); + } + + @Override + public void glColor(int c) { + final int a = c >> 24 & 0xFF; + final int r = c >> 16 & 0xFF; + final int gg = c >> 8 & 0xFF; + final int b = c & 0xFF; + g.setFillStyle(currentColor = toHex(r, gg, b, a)); + } + + @Override + public void glClearSkin() { + currentSkin = null; + } + + @Override + public void glClearColor4i(int red, int green, int blue, int alpha) { + clearColor = toHex(red, green, blue, alpha); + } + + @Override + public void glClearColor4f(float red, float green, float blue, float alpha) { + clearColor = toHex((int)(red*255), + (int)(green*255), + (int)(blue*255), + (int)(alpha*255)); + } + + @Override + public void glClearColor(int c) { + final int r = c >> 16 & 0xFF; + final int gg = c >> 8 & 0xFF; + final int b = c & 0xFF; + clearColor = toHex(r, gg, b); + } + + @Override + public void glClear(int screenWidth, int screenHeight) { + g.setFillStyle(clearColor); + g.fillRect(0, 0, screenWidth, screenHeight); + g.setFillStyle(currentColor); + } + + @Override + public HtmlFont getCurrentFont() { + return f; + } +} \ No newline at end of file diff --git a/src/teavm-specific/java/it/cavallium/warppi/gui/graphicengine/html/HtmlSkin.java b/teavm/src/main/java/it/cavallium/warppi/gui/graphicengine/html/HtmlSkin.java similarity index 85% rename from src/teavm-specific/java/it/cavallium/warppi/gui/graphicengine/html/HtmlSkin.java rename to teavm/src/main/java/it/cavallium/warppi/gui/graphicengine/html/HtmlSkin.java index 2ab734d2..d9679265 100644 --- a/src/teavm-specific/java/it/cavallium/warppi/gui/graphicengine/html/HtmlSkin.java +++ b/teavm/src/main/java/it/cavallium/warppi/gui/graphicengine/html/HtmlSkin.java @@ -1,86 +1,86 @@ -package it.cavallium.warppi.gui.graphicengine.html; - -import java.io.IOException; -import java.net.URISyntaxException; - -import org.teavm.jso.JSObject; -import org.teavm.jso.browser.Window; -import org.teavm.jso.dom.html.HTMLDocument; -import org.teavm.jso.dom.html.HTMLImageElement; - -import ar.com.hjg.pngj.PngReader; -import it.cavallium.warppi.deps.StorageUtils; -import it.cavallium.warppi.gui.graphicengine.GraphicEngine; -import it.cavallium.warppi.gui.graphicengine.Skin; - -public class HtmlSkin implements Skin { - - private String url; - - private int[] skinSize; - - private boolean initd; - - private HTMLImageElement imgEl; - - public HtmlSkin(String file) throws IOException { - load(file); - } - - public void use(GraphicEngine d) { - if (d instanceof HtmlEngine) { - if (!initd) - initialize(d); - ((HtmlEngine) d).getRenderer().currentSkin = this; - } - } - - @Override - public void load(String file) throws IOException { - if (!file.startsWith("/")) - file = "/"+file; - url = StorageUtils.basepath+file; - try { - PngReader r = new PngReader(StorageUtils.getResourceStream(file)); - skinSize = new int[] { r.imgInfo.cols, r.imgInfo.rows }; - r.close(); - } catch (URISyntaxException e) { - IOException ex = new IOException(); - ex.initCause(e); - throw ex; - } - } - - @Override - public void initialize(GraphicEngine d) { - HTMLDocument doc = Window.current().getDocument(); - imgEl = doc.createElement("img").cast(); - imgEl.setSrc(url); - imgEl.setClassName("hidden"); - doc.getBody().appendChild(imgEl); - initd = true; - } - - @Override - public boolean isInitialized() { - return initd; - } - - @Override - public int getSkinWidth() { - return skinSize[0]; - } - - @Override - public int getSkinHeight() { - return skinSize[1]; - } - - public final String getUrl() { - return url; - } - - public final HTMLImageElement getImgElement() { - return imgEl; - } -} +package it.cavallium.warppi.gui.graphicengine.html; + +import java.io.IOException; +import java.net.URISyntaxException; + +import org.teavm.jso.JSObject; +import org.teavm.jso.browser.Window; +import org.teavm.jso.dom.html.HTMLDocument; +import org.teavm.jso.dom.html.HTMLImageElement; + +import ar.com.hjg.pngj.PngReader; +import it.cavallium.warppi.Engine; +import it.cavallium.warppi.gui.graphicengine.GraphicEngine; +import it.cavallium.warppi.gui.graphicengine.Skin; + +public class HtmlSkin implements Skin { + + private String url; + + private int[] skinSize; + + private boolean initd; + + private HTMLImageElement imgEl; + + public HtmlSkin(String file) throws IOException { + load(file); + } + + public void use(GraphicEngine d) { + if (d instanceof HtmlEngine) { + if (!initd) + initialize(d); + ((HtmlEngine) d).getRenderer().currentSkin = this; + } + } + + @Override + public void load(String file) throws IOException { + if (!file.startsWith("/")) + file = "/"+file; + url = Engine.getPlatform().getStorageUtils().getBasePath()+file; + try { + PngReader r = new PngReader(Engine.getPlatform().getStorageUtils().getResourceStream(file)); + skinSize = new int[] { r.imgInfo.cols, r.imgInfo.rows }; + r.close(); + } catch (URISyntaxException e) { + IOException ex = new IOException(); + ex.initCause(e); + throw ex; + } + } + + @Override + public void initialize(GraphicEngine d) { + HTMLDocument doc = Window.current().getDocument(); + imgEl = doc.createElement("img").cast(); + imgEl.setSrc(url); + imgEl.setClassName("hidden"); + doc.getBody().appendChild(imgEl); + initd = true; + } + + @Override + public boolean isInitialized() { + return initd; + } + + @Override + public int getSkinWidth() { + return skinSize[0]; + } + + @Override + public int getSkinHeight() { + return skinSize[1]; + } + + public final String getUrl() { + return url; + } + + public final HTMLImageElement getImgElement() { + return imgEl; + } +} \ No newline at end of file diff --git a/teavm/src/main/java/it/cavallium/warppi/teavm/TeaVMBoot.java b/teavm/src/main/java/it/cavallium/warppi/teavm/TeaVMBoot.java new file mode 100644 index 00000000..c45cb4a2 --- /dev/null +++ b/teavm/src/main/java/it/cavallium/warppi/teavm/TeaVMBoot.java @@ -0,0 +1,11 @@ +package it.cavallium.warppi.teavm; + +import it.cavallium.warppi.boot.Boot; + +public class TeaVMBoot { + + public static void main(String[] args) throws Exception { + Boot.boot(new TeaVMPlatform(), args); + } + +} diff --git a/teavm/src/main/java/it/cavallium/warppi/teavm/TeaVMConsoleUtils.java b/teavm/src/main/java/it/cavallium/warppi/teavm/TeaVMConsoleUtils.java new file mode 100644 index 00000000..f7ab52ee --- /dev/null +++ b/teavm/src/main/java/it/cavallium/warppi/teavm/TeaVMConsoleUtils.java @@ -0,0 +1,113 @@ +package it.cavallium.warppi.teavm; + +import java.io.PrintStream; + +import it.cavallium.warppi.StaticVars; +import it.cavallium.warppi.math.MathematicalSymbols; + +public class TeaVMConsoleUtils implements it.cavallium.warppi.deps.Platform.ConsoleUtils { + + private AdvancedOutputStream os; + + public TeaVMConsoleUtils() { + os = new AdvancedOutputStream() { + private void print(PrintStream stream, String str) { + stream.print(fixString(str)); + } + + private void println(PrintStream stream, String str) { + stream.println(fixString(str)); + } + + private void println(PrintStream stream) { + stream.println(); + } + + private String fixString(String str) { + + return str.replace("" + MathematicalSymbols.NTH_ROOT, "root").replace("" + MathematicalSymbols.SQUARE_ROOT, "sqrt").replace("" + MathematicalSymbols.POWER, "powerOf").replace("" + MathematicalSymbols.POWER_OF_TWO, "powerOfTwo").replace("" + MathematicalSymbols.SINE, "sine").replace("" + MathematicalSymbols.COSINE, "cosine").replace("" + MathematicalSymbols.TANGENT, "tangent").replace("" + MathematicalSymbols.ARC_SINE, "asin").replace("" + MathematicalSymbols.ARC_COSINE, "acos").replace("" + MathematicalSymbols.ARC_TANGENT, "atan").replace("" + MathematicalSymbols.UNDEFINED, "undefined").replace("" + MathematicalSymbols.PI, "PI").replace("" + MathematicalSymbols.EULER_NUMBER, "EULER_NUMBER").replace("" + MathematicalSymbols.X, "X").replace("" + MathematicalSymbols.Y, "Y"); + } + + public void println(Object str) { + println(0, str); + } + + public void println(int level) { + if (StaticVars.outputLevel >= level) { + if (StaticVars.outputLevel == 0) { + println(System.out); + } else { + println(System.out); + } + } + } + + public void println(int level, Object str) { + if (StaticVars.outputLevel >= level) { + final String time = getTimeString(); + if (StaticVars.outputLevel == 0) { + println(System.out, "[" + time + "] " + str); + } else { + println(System.out, "[" + time + "] " + str); + } + } + } + + public void print(int level, String str) { + if (StaticVars.outputLevel >= level) { + if (StaticVars.outputLevel == 0) { + print(System.out, str); + } else { + print(System.out, str); + } + } + } + + public void println(int level, String prefix, String str) { + if (StaticVars.outputLevel >= level) { + final String time = getTimeString(); + if (StaticVars.outputLevel == 0) { + println(System.out, "[" + time + "][" + prefix + "] " + str); + } else { + println(System.out, "[" + time + "][" + prefix + "] " + str); + } + } + } + + public void println(int level, String... parts) { + if (StaticVars.outputLevel >= level) { + final String time = getTimeString(); + StringBuilder output = new StringBuilder(); + for (int i = 0; i < parts.length; i++) { + if (i + 1 == parts.length) { + output.append(' '); + output.append(parts[i]); + } else { + output.append('['); + output.append(parts[i]); + output.append(']'); + } + } + output.insert(0, '['); + output.insert(1, time); + output.insert(time.length() + 1, ']'); + if (StaticVars.outputLevel == 0) { + println(System.out, output.toString()); + } else { + println(System.out, output.toString()); + } + } + } + + private String getTimeString() { + return System.currentTimeMillis()+""; + } + }; + } + + @Override + public AdvancedOutputStream out() { + return os; + } + +} diff --git a/teavm/src/main/java/it/cavallium/warppi/teavm/TeaVMGpio.java b/teavm/src/main/java/it/cavallium/warppi/teavm/TeaVMGpio.java new file mode 100644 index 00000000..d735e6fc --- /dev/null +++ b/teavm/src/main/java/it/cavallium/warppi/teavm/TeaVMGpio.java @@ -0,0 +1,75 @@ +package it.cavallium.warppi.teavm; + +import it.cavallium.warppi.ClassUtils; + +public class TeaVMGpio implements it.cavallium.warppi.deps.Platform.Gpio { + + @Override + public int valueOutput() { + return 0; + } + + @Override + public int valuePwmOutput() { + return 0; + } + + @Override + public int valueInput() { + return 0; + } + + @Override + public int valueHigh() { + return 0; + } + + @Override + public int valueLow() { + return 0; + } + + @Override + public Object valueUnknownBoardType() { + return new Object(); + } + + @Override + public void wiringPiSetupPhys() { + } + + @Override + public void pinMode(int i, int type) { + } + + @Override + public void digitalWrite(int pin, int val) { + throw new java.lang.UnsupportedOperationException("Not implemented."); + } + + @Override + public void digitalWrite(int pin, boolean val) { + throw new java.lang.UnsupportedOperationException("Not implemented."); + } + + @Override + public void pwmWrite(int pin, int val) { + throw new java.lang.UnsupportedOperationException("Not implemented."); + } + + @Override + public void delayMicroseconds(int t) { + throw new java.lang.UnsupportedOperationException("Not implemented."); + } + + @Override + public int digitalRead(int pin) { + throw new java.lang.UnsupportedOperationException("Not implemented."); + } + + @Override + public Object getBoardType() { + return new Object(); + } + +} diff --git a/src/teavm-specific/java/it/cavallium/warppi/PlatformUtils.java b/teavm/src/main/java/it/cavallium/warppi/teavm/TeaVMPlatform.java similarity index 50% rename from src/teavm-specific/java/it/cavallium/warppi/PlatformUtils.java rename to teavm/src/main/java/it/cavallium/warppi/teavm/TeaVMPlatform.java index 34cc1552..93b39989 100644 --- a/src/teavm-specific/java/it/cavallium/warppi/PlatformUtils.java +++ b/teavm/src/main/java/it/cavallium/warppi/teavm/TeaVMPlatform.java @@ -1,37 +1,144 @@ -package it.cavallium.warppi; +package it.cavallium.warppi.teavm; import java.io.PrintWriter; import java.io.StringWriter; -import java.lang.ref.WeakReference; +import java.net.URL; +import java.util.HashMap; +import java.util.Map; import org.teavm.jso.browser.Window; import org.teavm.jso.dom.html.HTMLDocument; -import it.cavallium.warppi.gui.expression.blocks.Block; +import it.cavallium.warppi.Error; +import it.cavallium.warppi.deps.Platform; +import it.cavallium.warppi.gui.graphicengine.GraphicEngine; +import it.cavallium.warppi.gui.graphicengine.html.HtmlEngine; import it.cavallium.warppi.math.rules.RulesManager; -public final class PlatformUtils { - public static final boolean isJavascript = true; - public static String osName = "JavaScript"; +public class TeaVMPlatform implements Platform { + + private final TeaVMConsoleUtils cu; + private final TeaVMGpio gi; + private final TeaVMStorageUtils su; + private final String on; + private final Map el; + private final TeaVMPngUtils pu; + + public TeaVMPlatform() { + cu = new TeaVMConsoleUtils(); + gi = new TeaVMGpio(); + su = new TeaVMStorageUtils(); + pu = new TeaVMPngUtils(); + on = "JavaScript"; + el = new HashMap<>(); + el.put("HTML5 engine", new HtmlEngine()); + } - public static void setThreadName(Thread t, String string) { + @Override + public ConsoleUtils getConsoleUtils() { + return cu; } - public static void setDaemon(Thread kt) { + @Override + public Gpio getGpio() { + return gi; } - public static void setDaemon(Thread kt, boolean val) { + @Override + public StorageUtils getStorageUtils() { + return su; } - public static void throwNewExceptionInInitializerError(String string) { - throw new NullPointerException(string); + @Override + public PngUtils getPngUtils() { + return pu; } - public static String[] stacktraceToString(Error e) { + @Override + public void setThreadName(Thread t, String name) { + } + + @Override + public void setThreadDaemon(Thread t) { + } + + @Override + public void setThreadDaemon(Thread t, boolean value) { + } + + @Override + public void exit(int value) { + System.err.println("====================PROGRAM END===================="); + } + + @Override + public void gc() { + + } + + @Override + public boolean isJavascript() { + return true; + } + + @Override + public String getOsName() { + return on; + } + + private boolean shift, alpha; + + @Override + public void alphaChanged(boolean alpha) { + this.alpha = alpha; + HTMLDocument doc = Window.current().getDocument(); + doc.getBody().setClassName((shift ? "shift " : "") + (alpha ? "alpha": "")); + } + + @Override + public void shiftChanged(boolean shift) { + this.shift = shift; + HTMLDocument doc = Window.current().getDocument(); + doc.getBody().setClassName((shift ? "shift " : "") + (alpha ? "alpha": "")); + } + + @Override + public Semaphore newSemaphore() { + return new TeaVMSemaphore(0); + } + + @Override + public Semaphore newSemaphore(int i) { + return new TeaVMSemaphore(i); + } + + @Override + public URLClassLoader newURLClassLoader(URL[] urls) { + return new TeaVMURLClassLoader(urls); + } + + @Override + public Map getEnginesList() { + return el; + } + + @Override + public GraphicEngine getEngine(String string) throws NullPointerException { + return el.get(string); + } + + @Override + public void throwNewExceptionInInitializerError(String text) { + throw new NullPointerException(); + } + + @Override + public String[] stacktraceToString(Error e) { return e.getMessage().toUpperCase().replace("\r", "").split("\n"); } - public static void loadPlatformRules() { + @Override + public void loadPlatformRules() { RulesManager.addRule(new rules.functions.DivisionRule()); RulesManager.addRule(new rules.functions.EmptyNumberRule()); RulesManager.addRule(new rules.functions.ExpressionRule()); @@ -83,21 +190,19 @@ public final class PlatformUtils { RulesManager.addRule(new rules.VariableRule3()); } - public static void gc() { + @Override + public void zip(String targetPath, String destinationFilePath, String password) { + throw new java.lang.UnsupportedOperationException("Not implemented."); } - private static boolean shift, alpha; - - public static void shiftChanged(boolean shift) { - PlatformUtils.shift = shift; - HTMLDocument doc = Window.current().getDocument(); - doc.getBody().setClassName((shift ? "shift " : "") + (alpha ? "alpha": "")); + @Override + public void unzip(String targetZipFilePath, String destinationFolderPath, String password) { + throw new java.lang.UnsupportedOperationException("Not implemented."); } - public static void alphaChanged(boolean alpha) { - PlatformUtils.alpha = alpha; - HTMLDocument doc = Window.current().getDocument(); - doc.getBody().setClassName((shift ? "shift " : "") + (alpha ? "alpha": "")); + @Override + public boolean compile(String[] command, PrintWriter printWriter, PrintWriter errors) { + throw new java.lang.UnsupportedOperationException("Not implemented."); } - + } diff --git a/teavm/src/main/java/it/cavallium/warppi/teavm/TeaVMPngReader.java b/teavm/src/main/java/it/cavallium/warppi/teavm/TeaVMPngReader.java new file mode 100644 index 00000000..c9d4d4aa --- /dev/null +++ b/teavm/src/main/java/it/cavallium/warppi/teavm/TeaVMPngReader.java @@ -0,0 +1,61 @@ +package it.cavallium.warppi.teavm; + +import java.io.InputStream; + +import ar.com.hjg.pngj.ImageLineInt; +import it.cavallium.warppi.deps.Platform.PngUtils.PngReader; + +public class TeaVMPngReader implements PngReader { + + private ar.com.hjg.pngj.PngReader r; + + public TeaVMPngReader(InputStream resourceStream) { + r = new ar.com.hjg.pngj.PngReader(resourceStream); + } + + @Override + public int[] getImageMatrix() { + final int width = r.imgInfo.cols; + final int height = r.imgInfo.rows; + final int channels = r.imgInfo.channels; + final int[] pixels = new int[width * height]; + int pi = 0; + ImageLineInt lint; + while (r.hasMoreRows()) { + lint = (ImageLineInt) r.readRow(); + int[] scanLine = lint.getScanline(); + + for (int i = 0; i < width; i++) { + int offset = i * channels; + + // Adjust the following code depending on your source image. + // I need the to set the alpha channel to 0xFF000000 since my destination image + // is TRANSLUCENT : BufferedImage bi = CONFIG.createCompatibleImage( width, height, Transparency.TRANSLUCENT ); + // my source was 3 channels RGB without transparency + int nextPixel; + if (channels == 4) { + nextPixel = (scanLine[offset] << 16) | (scanLine[offset + 1] << 8) | (scanLine[offset + 2]) | (scanLine[offset + 3] << 24); + } else if (channels == 3) { + nextPixel = (scanLine[offset] << 16) | (scanLine[offset + 1] << 8) | (scanLine[offset + 2]) | (0xFF << 24); + } else if (channels == 2) { + nextPixel = (scanLine[offset] << 16) | (scanLine[offset + 1] << 8) | 0xFF | (0xFF << 24); + } else { + nextPixel = (scanLine[offset] << 16) | (scanLine[offset] << 8) | scanLine[offset] | (0xFF << 24); + } + + // I'm placing the pixels on a memory mapped file + pixels[pi] = nextPixel; + pi++; + } + + } + + return pixels; + } + + @Override + public int[] getSize() { + return new int[] {r.imgInfo.cols, r.imgInfo.rows}; + } + +} diff --git a/teavm/src/main/java/it/cavallium/warppi/teavm/TeaVMPngUtils.java b/teavm/src/main/java/it/cavallium/warppi/teavm/TeaVMPngUtils.java new file mode 100644 index 00000000..ddc2cde0 --- /dev/null +++ b/teavm/src/main/java/it/cavallium/warppi/teavm/TeaVMPngUtils.java @@ -0,0 +1,14 @@ +package it.cavallium.warppi.teavm; + +import java.io.InputStream; + +import it.cavallium.warppi.deps.Platform.PngUtils; + +public class TeaVMPngUtils implements PngUtils { + + @Override + public PngReader load(InputStream resourceStream) { + return new TeaVMPngReader(resourceStream); + } + +} diff --git a/src/teavm-specific/java/it/cavallium/warppi/deps/DSemaphore.java b/teavm/src/main/java/it/cavallium/warppi/teavm/TeaVMSemaphore.java similarity index 65% rename from src/teavm-specific/java/it/cavallium/warppi/deps/DSemaphore.java rename to teavm/src/main/java/it/cavallium/warppi/teavm/TeaVMSemaphore.java index 9bc6b473..79fef229 100644 --- a/src/teavm-specific/java/it/cavallium/warppi/deps/DSemaphore.java +++ b/teavm/src/main/java/it/cavallium/warppi/teavm/TeaVMSemaphore.java @@ -1,23 +1,21 @@ -package it.cavallium.warppi.deps; +package it.cavallium.warppi.teavm; -import java.util.ArrayList; import java.util.LinkedList; import java.util.Queue; +import java.util.concurrent.Semaphore; -import org.teavm.classlib.java.util.TArrayList; -import org.teavm.classlib.java.util.TQueue; - -public class DSemaphore { +public class TeaVMSemaphore implements it.cavallium.warppi.deps.Platform.Semaphore { private Queue q; private int freePermits = 0; - public DSemaphore(int i) { + public TeaVMSemaphore(int i) { q = new LinkedList(); freePermits = i; } - + + @Override public void release() { if (q.peek() == null) { q.poll(); @@ -26,6 +24,7 @@ public class DSemaphore { } } + @Override public void acquire() throws InterruptedException { if (freePermits > 0) { freePermits--; @@ -37,5 +36,4 @@ public class DSemaphore { } } } - } diff --git a/src/teavm-specific/java/it/cavallium/warppi/deps/StorageUtils.java b/teavm/src/main/java/it/cavallium/warppi/teavm/TeaVMStorageUtils.java similarity index 67% rename from src/teavm-specific/java/it/cavallium/warppi/deps/StorageUtils.java rename to teavm/src/main/java/it/cavallium/warppi/teavm/TeaVMStorageUtils.java index add9f705..b04b21ce 100644 --- a/src/teavm-specific/java/it/cavallium/warppi/deps/StorageUtils.java +++ b/teavm/src/main/java/it/cavallium/warppi/teavm/TeaVMStorageUtils.java @@ -1,62 +1,35 @@ -package it.cavallium.warppi.deps; +package it.cavallium.warppi.teavm; import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; -import java.net.URI; import java.net.URISyntaxException; import java.net.URL; import java.nio.charset.Charset; -import java.nio.file.FileSystemAlreadyExistsException; -import java.nio.file.FileSystems; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.StandardOpenOption; import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; -import java.util.stream.Stream; -import org.apache.commons.io.Charsets; import org.apache.commons.io.IOUtils; -import org.teavm.classlib.java.nio.charset.TCharset; import org.teavm.jso.browser.Window; -public class StorageUtils { - public static final String basepath; - static { - String fullurl = Window.current().getLocation().getFullURL(); - if (fullurl.charAt(fullurl.length()-1) == '/') { - basepath = fullurl+"resources"; - } else { - basepath = fullurl+"/resources"; - } -} - - private static Map resourcesCache = new HashMap(); - - public static final boolean exists(Path f) { - return f.toFile().exists(); - } - - public static final boolean exists(File f) { +import it.cavallium.warppi.deps.Platform.StorageUtils; + +public class TeaVMStorageUtils implements StorageUtils { + public boolean exists(File f) { return f.exists(); } - public static File get(String... path) { - return new File(join(path, File.separator)); + public File get(String path) { + return new File(path); } - + private static String join(String[] list, String conjunction) { StringBuilder sb = new StringBuilder(); @@ -72,7 +45,13 @@ public class StorageUtils { return sb.toString(); } - public static File getResource(String path) throws IOException, URISyntaxException { + public File get(String... path) { + return new File(join(path, File.separator)); + } + + private static Map resourcesCache = new HashMap(); + + public File getResource(String path) throws IOException, URISyntaxException { try { File targetFile; if (resourcesCache.containsKey(path)) { @@ -82,7 +61,7 @@ public class StorageUtils { resourcesCache.remove(path); } } - final URL res = new URL(basepath+path); + final URL res = new URL(this.getBasePath()+path); InputStream initialStream = res.openStream(); byte[] buffer = new byte[initialStream.available()]; initialStream.read(buffer); @@ -99,7 +78,7 @@ public class StorageUtils { } } - public static InputStream getResourceStream(String path) throws IOException, URISyntaxException { + public InputStream getResourceStream(String path) throws IOException, URISyntaxException { try { File targetFile; if (resourcesCache.containsKey(path)) { @@ -109,7 +88,7 @@ public class StorageUtils { resourcesCache.remove(path); } } - final URL res = new URL(basepath+path); + final URL res = new URL(this.getBasePath()+path); InputStream initialStream = res.openStream(); byte[] buffer = new byte[initialStream.available()]; initialStream.read(buffer); @@ -126,7 +105,7 @@ public class StorageUtils { } } - public static List readAllLines(File file) throws IOException { + public List readAllLines(File file) throws IOException { Reader reader_ = new InputStreamReader(new FileInputStream(file), Charset.defaultCharset()); BufferedReader reader = reader_ instanceof BufferedReader ? (BufferedReader) reader_ : new BufferedReader(reader_); List list = new ArrayList(); @@ -139,11 +118,11 @@ public class StorageUtils { return list; } - public static String read(InputStream input) throws IOException { - return IOUtils.toString(input); + public String read(InputStream input) throws IOException { + return IOUtils.toString(input, "UTF-8"); } - public static List walk(File dir) throws IOException { + public List walk(File dir) throws IOException { List out = new ArrayList<>(); File[] filesList = dir.listFiles(); if (filesList == null) { @@ -164,26 +143,26 @@ public class StorageUtils { return out; } - public static File relativize(File rulesPath, File f) { + public File relativize(File rulesPath, File f) { return f; } - public static File resolve(File file, String string) { + public File resolve(File file, String string) { return new File(file.getAbsolutePath() + File.separatorChar + string); } - public static File getParent(File f) { + public File getParent(File f) { return f.getParentFile(); } - public static void createDirectories(File dir) { + public void createDirectories(File dir) throws IOException { dir.mkdirs(); } - public static void write(File f, byte[] bytes, DStandardOpenOption... options) throws IOException { + public void write(File f, byte[] bytes, int... options) throws IOException { boolean create = false; - for (DStandardOpenOption opt : options) { - if (opt == DStandardOpenOption.CREATE) { + for (int opt : options) { + if (opt == StorageUtils.OpenOptionCreate) { create = true; } } @@ -200,8 +179,8 @@ public class StorageUtils { stream.write(bytes); stream.close(); } - - public static List readAllLines(InputStream input) throws IOException { + + public List readAllLines(InputStream input) throws IOException { try (BufferedReader buffer = new BufferedReader(new InputStreamReader(input))) { String thisLine = null; ArrayList output = new ArrayList<>(); @@ -211,4 +190,14 @@ public class StorageUtils { return output; } } + + @Override + public String getBasePath() { + String fullurl = Window.current().getLocation().getFullURL(); + if (fullurl.charAt(fullurl.length()-1) == '/') { + return fullurl+"resources"; + } else { + return fullurl+"/resources"; + } + } } diff --git a/teavm/src/main/java/it/cavallium/warppi/teavm/TeaVMURLClassLoader.java b/teavm/src/main/java/it/cavallium/warppi/teavm/TeaVMURLClassLoader.java new file mode 100644 index 00000000..547d0367 --- /dev/null +++ b/teavm/src/main/java/it/cavallium/warppi/teavm/TeaVMURLClassLoader.java @@ -0,0 +1,24 @@ +package it.cavallium.warppi.teavm; + +import java.io.IOException; +import java.net.URL; + +import it.cavallium.warppi.deps.Platform.URLClassLoader; + +public class TeaVMURLClassLoader implements URLClassLoader { + + public TeaVMURLClassLoader(URL[] urls) { + + } + + @Override + public Class loadClass(String name) throws ClassNotFoundException { + return null; + } + + @Override + public void close() throws IOException { + + } + +}
May fail - * spuriously and does not provide ordering guarantees, so is - * only rarely an appropriate alternative to {@code compareAndSet}. - * - * @param expect the expected value - * @param update the new value - * @return {@code true} if successful - */ - public final boolean weakCompareAndSet(int expect, int update) { - return compareAndSet(expect, update); - } - - /** - * Atomically increments by one the current value. - * - * @return the previous value - */ - public final int getAndIncrement() { - int oldV = value; - value++; - return oldV; - } - - /** - * Atomically decrements by one the current value. - * - * @return the previous value - */ - public final int getAndDecrement() { - int oldV = value; - value--; - return oldV; - } - - /** - * Atomically adds the given value to the current value. - * - * @param delta the value to add - * @return the previous value - */ - public final int getAndAdd(int delta) { - int oldV = value; - value+=delta; - return oldV; - } - - /** - * Atomically increments by one the current value. - * - * @return the updated value - */ - public final int incrementAndGet() { - value++; - return value; - } - - /** - * Atomically decrements by one the current value. - * - * @return the updated value - */ - public final int decrementAndGet() { - value--; - return value; - } - - /** - * Atomically adds the given value to the current value. - * - * @param delta the value to add - * @return the updated value - */ - public final int addAndGet(int delta) { - value+=delta; - return value; - } - - /** - * Atomically updates the current value with the results of - * applying the given function, returning the previous value. The - * function should be side-effect-free, since it may be re-applied - * when attempted updates fail due to contention among threads. - * - * @param updateFunction a side-effect-free function - * @return the previous value - * @since 1.8 - */ - public final int getAndUpdate(IntUnaryOperator updateFunction) { - int prev, next; - do { - prev = get(); - next = updateFunction.applyAsInt(prev); - } while (!compareAndSet(prev, next)); - return prev; - } - - /** - * Atomically updates the current value with the results of - * applying the given function, returning the updated value. The - * function should be side-effect-free, since it may be re-applied - * when attempted updates fail due to contention among threads. - * - * @param updateFunction a side-effect-free function - * @return the updated value - * @since 1.8 - */ - public final int updateAndGet(IntUnaryOperator updateFunction) { - int prev, next; - do { - prev = get(); - next = updateFunction.applyAsInt(prev); - } while (!compareAndSet(prev, next)); - return next; - } - - /** - * Atomically updates the current value with the results of - * applying the given function to the current and given values, - * returning the previous value. The function should be - * side-effect-free, since it may be re-applied when attempted - * updates fail due to contention among threads. The function - * is applied with the current value as its first argument, - * and the given update as the second argument. - * - * @param x the update value - * @param accumulatorFunction a side-effect-free function of two arguments - * @return the previous value - * @since 1.8 - */ - public final int getAndAccumulate(int x, - IntBinaryOperator accumulatorFunction) { - int prev, next; - do { - prev = get(); - next = accumulatorFunction.applyAsInt(prev, x); - } while (!compareAndSet(prev, next)); - return prev; - } - - /** - * Atomically updates the current value with the results of - * applying the given function to the current and given values, - * returning the updated value. The function should be - * side-effect-free, since it may be re-applied when attempted - * updates fail due to contention among threads. The function - * is applied with the current value as its first argument, - * and the given update as the second argument. - * - * @param x the update value - * @param accumulatorFunction a side-effect-free function of two arguments - * @return the updated value - * @since 1.8 - */ - public final int accumulateAndGet(int x, - IntBinaryOperator accumulatorFunction) { - int prev, next; - do { - prev = get(); - next = accumulatorFunction.applyAsInt(prev, x); - } while (!compareAndSet(prev, next)); - return next; - } - - /** - * Returns the String representation of the current value. - * @return the String representation of the current value - */ - public String toString() { - return Integer.toString(get()); - } - - /** - * Returns the value of this {@code AtomicInteger} as an {@code int}. - */ - public int intValue() { - return get(); - } - - /** - * Returns the value of this {@code AtomicInteger} as a {@code long} - * after a widening primitive conversion. - * @jls 5.1.2 Widening Primitive Conversions - */ - public long longValue() { - return (long)get(); - } - - /** - * Returns the value of this {@code AtomicInteger} as a {@code float} - * after a widening primitive conversion. - * @jls 5.1.2 Widening Primitive Conversions - */ - public float floatValue() { - return (float)get(); - } - - /** - * Returns the value of this {@code AtomicInteger} as a {@code double} - * after a widening primitive conversion. - * @jls 5.1.2 Widening Primitive Conversions - */ - public double doubleValue() { - return (double)get(); - } - -} diff --git a/src/teavm-specific/java/it/cavallium/warppi/deps/DEngine.java b/src/teavm-specific/java/it/cavallium/warppi/deps/DEngine.java deleted file mode 100644 index 4d20fd67..00000000 --- a/src/teavm-specific/java/it/cavallium/warppi/deps/DEngine.java +++ /dev/null @@ -1,29 +0,0 @@ -package it.cavallium.warppi.deps; - -import it.cavallium.warppi.ClassUtils; -import it.cavallium.warppi.gui.graphicengine.GraphicEngine; -import it.cavallium.warppi.gui.graphicengine.html.HtmlEngine; - -public class DEngine { - public static GraphicEngine newCPUEngine() { - return null; - } - public static GraphicEngine newGPUEngine() { - return null; - } - public static GraphicEngine newHeadless24bitEngine() { - return null; - } - public static GraphicEngine newHeadless256Engine() { - return null; - } - public static GraphicEngine newHeadless8Engine() { - return null; - } - public static GraphicEngine newFBEngine() { - return null; - } - public static GraphicEngine newHtmlEngine() { - return new HtmlEngine(); - } -} diff --git a/src/teavm-specific/java/it/cavallium/warppi/deps/DGpio.java b/src/teavm-specific/java/it/cavallium/warppi/deps/DGpio.java deleted file mode 100644 index de9750f1..00000000 --- a/src/teavm-specific/java/it/cavallium/warppi/deps/DGpio.java +++ /dev/null @@ -1,45 +0,0 @@ -package it.cavallium.warppi.deps; - -import it.cavallium.warppi.ClassUtils; -import it.cavallium.warppi.ClassUtils.Var; - -public class DGpio { - - public static final int OUTPUT = 0; - public static final int PWM_OUTPUT = 1; - public static final int INPUT = 2; - public static final int HIGH = 3; - public static final int LOW = 4; - public static final Object UnknownBoardType = new Object(); - - public static void wiringPiSetupPhys() { - } - - public static void pinMode(int i, int type) { - } - - public static void digitalWrite(int pin, int val) { - throw new java.lang.UnsupportedOperationException("Not implemented."); - } - - public static void digitalWrite(int pin, boolean val) { - throw new java.lang.UnsupportedOperationException("Not implemented."); - } - - public static void pwmWrite(int pin, int val) { - throw new java.lang.UnsupportedOperationException("Not implemented."); - } - - public static void delayMicroseconds(int t) { - throw new java.lang.UnsupportedOperationException("Not implemented."); - } - - public static int digitalRead(int pin) { - throw new java.lang.UnsupportedOperationException("Not implemented."); - } - - public static Object getBoardType() { - return new Object(); - } - -} diff --git a/src/teavm-specific/java/it/cavallium/warppi/deps/DJDTCompiler.java b/src/teavm-specific/java/it/cavallium/warppi/deps/DJDTCompiler.java deleted file mode 100644 index c7f815ca..00000000 --- a/src/teavm-specific/java/it/cavallium/warppi/deps/DJDTCompiler.java +++ /dev/null @@ -1,13 +0,0 @@ -package it.cavallium.warppi.deps; - -import java.io.PrintWriter; - -import it.cavallium.warppi.ClassUtils; -import it.cavallium.warppi.ClassUtils.Var; - -public class DJDTCompiler { - - public static boolean compile(String[] strings, PrintWriter printWriter, PrintWriter printWriter2) { - throw new java.lang.UnsupportedOperationException("Not implemented."); - } -} diff --git a/src/teavm-specific/java/it/cavallium/warppi/deps/DStandardOpenOption.java b/src/teavm-specific/java/it/cavallium/warppi/deps/DStandardOpenOption.java deleted file mode 100644 index 8635026c..00000000 --- a/src/teavm-specific/java/it/cavallium/warppi/deps/DStandardOpenOption.java +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved. - * ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - */ - -package it.cavallium.warppi.deps; - -/** - * Defines the standard open options. - * - * @since 1.7 - */ - -public enum DStandardOpenOption { - /** - * Open for read access. - */ - READ, - - /** - * Open for write access. - */ - WRITE, - - /** - * If the file is opened for {@link #WRITE} access then bytes will be written - * to the end of the file rather than the beginning. - * - *
If the file is opened for write access by other programs, then it - * is file system specific if writing to the end of the file is atomic. - */ - APPEND, - - /** - * If the file already exists and it is opened for {@link #WRITE} - * access, then its length is truncated to 0. This option is ignored - * if the file is opened only for {@link #READ} access. - */ - TRUNCATE_EXISTING, - - /** - * Create a new file if it does not exist. - * This option is ignored if the {@link #CREATE_NEW} option is also set. - * The check for the existence of the file and the creation of the file - * if it does not exist is atomic with respect to other file system - * operations. - */ - CREATE, - - /** - * Create a new file, failing if the file already exists. - * The check for the existence of the file and the creation of the file - * if it does not exist is atomic with respect to other file system - * operations. - */ - CREATE_NEW, - - /** - * Delete on close. When this option is present then the implementation - * makes a best effort attempt to delete the file when closed - * by the appropriate {@code close} method. If the {@code close} method is - * not invoked then a best effort attempt is made to delete the - * file when the Java virtual machine terminates (either normally, as - * defined by the Java Language Specification, or where possible, abnormally). - * This option is primarily intended for use with work files that - * are used solely by a single instance of the Java virtual machine. This - * option is not recommended for use when opening files that are open - * concurrently by other entities. Many of the details as to when and how - * the file is deleted are implementation specific and therefore not - * specified. In particular, an implementation may be unable to guarantee - * that it deletes the expected file when replaced by an attacker while the - * file is open. Consequently, security sensitive applications should take - * care when using this option. - * - *
For security reasons, this option may imply the {@link - * LinkOption#NOFOLLOW_LINKS} option. In other words, if the option is present - * when opening an existing file that is a symbolic link then it may fail - * (by throwing {@link java.io.IOException}). - */ - DELETE_ON_CLOSE, - - /** - * Sparse file. When used with the {@link #CREATE_NEW} option then this - * option provides a hint that the new file will be sparse. The - * option is ignored when the file system does not support the creation of - * sparse files. - */ - SPARSE, - - /** - * Requires that every update to the file's content or metadata be written - * synchronously to the underlying storage device. - * - * @see Synchronized I/O file integrity - */ - SYNC, - - /** - * Requires that every update to the file's content be written - * synchronously to the underlying storage device. - * - * @see Synchronized I/O file integrity - */ - DSYNC; -} diff --git a/src/teavm-specific/java/it/cavallium/warppi/deps/DSystem.java b/src/teavm-specific/java/it/cavallium/warppi/deps/DSystem.java deleted file mode 100644 index dbdb0933..00000000 --- a/src/teavm-specific/java/it/cavallium/warppi/deps/DSystem.java +++ /dev/null @@ -1,7 +0,0 @@ -package it.cavallium.warppi.deps; - -public class DSystem { - public static final void exit(int code) { - System.err.println("====================PROGRAM END===================="); - } -} diff --git a/src/teavm-specific/java/it/cavallium/warppi/deps/DURLClassLoader.java b/src/teavm-specific/java/it/cavallium/warppi/deps/DURLClassLoader.java deleted file mode 100644 index b6f444ee..00000000 --- a/src/teavm-specific/java/it/cavallium/warppi/deps/DURLClassLoader.java +++ /dev/null @@ -1,20 +0,0 @@ -package it.cavallium.warppi.deps; - -import java.net.URL; - -public class DURLClassLoader { - - public DURLClassLoader(URL[] urls) { - // TODO Auto-generated constructor stub - } - - public Class loadClass(String javaClassNameAndPath) { - return null; - } - - public void close() { - // TODO Auto-generated method stub - - } - -} diff --git a/src/teavm-specific/java/it/cavallium/warppi/deps/jogamp/DJogamp.java b/src/teavm-specific/java/it/cavallium/warppi/deps/jogamp/DJogamp.java deleted file mode 100644 index a8f05605..00000000 --- a/src/teavm-specific/java/it/cavallium/warppi/deps/jogamp/DJogamp.java +++ /dev/null @@ -1,568 +0,0 @@ -package it.cavallium.warppi.deps.jogamp; - -import it.cavallium.warppi.ClassUtils; -import it.cavallium.warppi.ClassUtils.Var; - -public class DJogamp { - - // - // Unicode: Non printable controls: [0x00 - 0x1F] - // - - /** - * This value, {@value}, is used to indicate that the keyCode is unknown. - */ - public static final short VK_UNDEFINED = (short) 0x0; - - static final short VK_FREE01 = (short) 0x01; - - /** Constant for the HOME function key. ASCII: Start Of Text. */ - public static final short VK_HOME = (short) 0x02; - - /** Constant for the END function key. ASCII: End Of Text. */ - public static final short VK_END = (short) 0x03; - - /** Constant for the END function key. ASCII: End Of Transmission. */ - public static final short VK_FINAL = (short) 0x04; - - /** Constant for the PRINT function key. ASCII: Enquiry. */ - public static final short VK_PRINTSCREEN = (short) 0x05; - - static final short VK_FREE06 = (short) 0x06; - static final short VK_FREE07 = (short) 0x07; - - /** Constant for the BACK SPACE key "\b", matching ASCII. Printable! */ - public static final short VK_BACK_SPACE = (short) 0x08; - - /** Constant for the HORIZ TAB key "\t", matching ASCII. Printable! */ - public static final short VK_TAB = (short) 0x09; - - /** LINE_FEED "\n", matching ASCII, n/a on keyboard. */ - static final short VK_FREE0A = (short) 0x0A; - - /** Constant for the PAGE DOWN function key. ASCII: Vertical Tabulation. */ - public static final short VK_PAGE_DOWN = (short) 0x0B; - - /** Constant for the CLEAR key, i.e. FORM FEED, matching ASCII. */ - public static final short VK_CLEAR = (short) 0x0C; - - /** Constant for the ENTER key, i.e. CARRIAGE RETURN, matching ASCII. Printable! */ - public static final short VK_ENTER = (short) 0x0D; - - static final short VK_FREE0E = (short) 0x0E; - - /** Constant for the CTRL function key. ASCII: shift-in. */ - public static final short VK_SHIFT = (short) 0x0F; - - /** Constant for the PAGE UP function key. ASCII: Data Link Escape. */ - public static final short VK_PAGE_UP = (short) 0x10; - - /** Constant for the CTRL function key. ASCII: device-ctrl-one. */ - public static final short VK_CONTROL = (short) 0x11; - - /** Constant for the left ALT function key. ASCII: device-ctrl-two. */ - public static final short VK_ALT = (short) 0x12; - - /** Constant for the ALT_GRAPH function key, i.e. right ALT key. ASCII: device-ctrl-three. */ - public static final short VK_ALT_GRAPH = (short) 0x13; - - /** Constant for the CAPS LOCK function key. ASCII: device-ctrl-four. */ - public static final short VK_CAPS_LOCK = (short) 0x14; - - static final short VK_FREE15 = (short) 0x15; - - /** Constant for the PAUSE function key. ASCII: sync-idle. */ - public static final short VK_PAUSE = (short) 0x16; - - /** scroll lock key. ASCII: End Of Transmission Block. */ - public static final short VK_SCROLL_LOCK = (short) 0x17; - - /** Constant for the CANCEL function key. ASCII: Cancel. */ - public static final short VK_CANCEL = (short) 0x18; - - static final short VK_FREE19 = (short) 0x19; - - /** Constant for the INSERT function key. ASCII: Substitute. */ - public static final short VK_INSERT = (short) 0x1A; - - /** Constant for the ESCAPE function key. ASCII: Escape. */ - public static final short VK_ESCAPE = (short) 0x1B; - - /** Constant for the Convert function key, Japanese "henkan". ASCII: File Separator. */ - public static final short VK_CONVERT = (short) 0x1C; - - /** Constant for the Don't Convert function key, Japanese "muhenkan". ASCII: Group Separator.*/ - public static final short VK_NONCONVERT = (short) 0x1D; - - /** Constant for the Accept or Commit function key, Japanese "kakutei". ASCII: Record Separator.*/ - public static final short VK_ACCEPT = (short) 0x1E; - - /** Constant for the Mode Change (?). ASCII: Unit Separator.*/ - public static final short VK_MODECHANGE = (short) 0x1F; - - // - // Unicode: Printable [0x20 - 0x7E] - // NOTE: Collision of 'a' - 'x' [0x61 .. 0x78], used for keyCode/keySym Fn function keys - // - - /** Constant for the SPACE function key. ASCII: SPACE. */ - public static final short VK_SPACE = (short) 0x20; - - /** Constant for the "!" key. */ - public static final short VK_EXCLAMATION_MARK = (short) 0x21; - - /** Constant for the """ key. */ - public static final short VK_QUOTEDBL = (short) 0x22; - - /** Constant for the "#" key. */ - public static final short VK_NUMBER_SIGN = (short) 0x23; - - /** Constant for the "$" key. */ - public static final short VK_DOLLAR = (short) 0x24; - - /** Constant for the "%" key. */ - public static final short VK_PERCENT = (short) 0x25; - - /** Constant for the "&" key. */ - public static final short VK_AMPERSAND = (short) 0x26; - - /** Constant for the "'" key. */ - public static final short VK_QUOTE = (short) 0x27; - - /** Constant for the "(" key. */ - public static final short VK_LEFT_PARENTHESIS = (short) 0x28; - - /** Constant for the ")" key. */ - public static final short VK_RIGHT_PARENTHESIS = (short) 0x29; - - /** Constant for the "*" key */ - public static final short VK_ASTERISK = (short) 0x2A; - - /** Constant for the "+" key. */ - public static final short VK_PLUS = (short) 0x2B; - - /** Constant for the comma key, "," */ - public static final short VK_COMMA = (short) 0x2C; - - /** Constant for the minus key, "-" */ - public static final short VK_MINUS = (short) 0x2D; - - /** Constant for the period key, "." */ - public static final short VK_PERIOD = (short) 0x2E; - - /** Constant for the forward slash key, "/" */ - public static final short VK_SLASH = (short) 0x2F; - - /** VK_0 thru VK_9 are the same as UTF16/ASCII '0' thru '9' [0x30 - 0x39] */ - public static final short VK_0 = (short) 0x30; - /** See {@link #VK_0}. */ - public static final short VK_1 = (short) 0x31; - /** See {@link #VK_0}. */ - public static final short VK_2 = (short) 0x32; - /** See {@link #VK_0}. */ - public static final short VK_3 = (short) 0x33; - /** See {@link #VK_0}. */ - public static final short VK_4 = (short) 0x34; - /** See {@link #VK_0}. */ - public static final short VK_5 = (short) 0x35; - /** See {@link #VK_0}. */ - public static final short VK_6 = (short) 0x36; - /** See {@link #VK_0}. */ - public static final short VK_7 = (short) 0x37; - /** See {@link #VK_0}. */ - public static final short VK_8 = (short) 0x38; - /** See {@link #VK_0}. */ - public static final short VK_9 = (short) 0x39; - - /** Constant for the ":" key. */ - public static final short VK_COLON = (short) 0x3A; - - /** Constant for the semicolon key, ";" */ - public static final short VK_SEMICOLON = (short) 0x3B; - - /** Constant for the equals key, "<" */ - public static final short VK_LESS = (short) 0x3C; - - /** Constant for the equals key, "=" */ - public static final short VK_EQUALS = (short) 0x3D; - - /** Constant for the equals key, ">" */ - public static final short VK_GREATER = (short) 0x3E; - - /** Constant for the equals key, "?" */ - public static final short VK_QUESTIONMARK = (short) 0x3F; - - /** Constant for the equals key, "@" */ - public static final short VK_AT = (short) 0x40; - - /** VK_A thru VK_Z are the same as Capital UTF16/ASCII 'A' thru 'Z' (0x41 - 0x5A) */ - public static final short VK_A = (short) 0x41; - /** See {@link #VK_A}. */ - public static final short VK_B = (short) 0x42; - /** See {@link #VK_A}. */ - public static final short VK_C = (short) 0x43; - /** See {@link #VK_A}. */ - public static final short VK_D = (short) 0x44; - /** See {@link #VK_A}. */ - public static final short VK_E = (short) 0x45; - /** See {@link #VK_A}. */ - public static final short VK_F = (short) 0x46; - /** See {@link #VK_A}. */ - public static final short VK_G = (short) 0x47; - /** See {@link #VK_A}. */ - public static final short VK_H = (short) 0x48; - /** See {@link #VK_A}. */ - public static final short VK_I = (short) 0x49; - /** See {@link #VK_A}. */ - public static final short VK_J = (short) 0x4A; - /** See {@link #VK_A}. */ - public static final short VK_K = (short) 0x4B; - /** See {@link #VK_A}. */ - public static final short VK_L = (short) 0x4C; - /** See {@link #VK_A}. */ - public static final short VK_M = (short) 0x4D; - /** See {@link #VK_A}. */ - public static final short VK_N = (short) 0x4E; - /** See {@link #VK_A}. */ - public static final short VK_O = (short) 0x4F; - /** See {@link #VK_A}. */ - public static final short VK_P = (short) 0x50; - /** See {@link #VK_A}. */ - public static final short VK_Q = (short) 0x51; - /** See {@link #VK_A}. */ - public static final short VK_R = (short) 0x52; - /** See {@link #VK_A}. */ - public static final short VK_S = (short) 0x53; - /** See {@link #VK_A}. */ - public static final short VK_T = (short) 0x54; - /** See {@link #VK_A}. */ - public static final short VK_U = (short) 0x55; - /** See {@link #VK_A}. */ - public static final short VK_V = (short) 0x56; - /** See {@link #VK_A}. */ - public static final short VK_W = (short) 0x57; - /** See {@link #VK_A}. */ - public static final short VK_X = (short) 0x58; - /** See {@link #VK_A}. */ - public static final short VK_Y = (short) 0x59; - /** See {@link #VK_A}. */ - public static final short VK_Z = (short) 0x5A; - - /** Constant for the open bracket key, "[" */ - public static final short VK_OPEN_BRACKET = (short) 0x5B; - - /**Constant for the back slash key, "\" */ - public static final short VK_BACK_SLASH = (short) 0x5C; - - /** Constant for the close bracket key, "]" */ - public static final short VK_CLOSE_BRACKET = (short) 0x5D; - - /** Constant for the "^" key. */ - public static final short VK_CIRCUMFLEX = (short) 0x5E; - - /** Constant for the "_" key */ - public static final short VK_UNDERSCORE = (short) 0x5F; - - /** Constant for the "`" key */ - public static final short VK_BACK_QUOTE = (short) 0x60; - - /** Small UTF/ASCII 'a' thru 'z' (0x61 - 0x7a) - Not used for keyCode / keySym. */ - - /** - * Constant for the Fn function keys. - *
- * F1..F24, i.e. Fn, are mapped from on 0x60+n -> [0x61 .. 0x78]. - *
0x60+n
[0x61 .. 0x78]
- * Warning: The Fn function keys do collide with unicode characters small 'a' thru 'x'! - * See Unicode Collision for details. - *