![allcontributors[bot]](https://avatars.githubusercontent.com/in/23186?v=4?s=120)
+Processing is a flexible software sketchbook and a programming language designed for learning how to code.
-### Beta 8
-
-* [Renamed](https://github.com/processing/processing4/commit/409163986ff2ff4d2dbf69c79c7eced45950d1d0) the Add Mode, Add Library, and Add Tool menu items to Manage Modes, Manage Libraries, and Manage Tools. This will require translation updates for the new text:
- * `toolbar.add_mode = Add Mode...` has been replaced with `toolbar.manage_modes = Manage Modes…`
- * `menu.library.add_library = Add Library...` → `menu.library.manage_libraries = Manage Libraries…`
- * `menu.tools.add_tool = Add Tool...` → `menu.tools.manage_tools = Manage Tools…`
-
-
-### Beta 6
-
-* Major rewrite of `handleOpen()`, now possible to use something besides the folder name for the main sketch file (see `revisions.md` for details).
-
-* Now using Java 17.0.2+8 from [Adoptium](https://adoptium.net/).
-
-
-### Beta 3
-
-* Now using JDK 17.0.1 and JavaFX 17.0.1.
-
-* Major changes to `theme.txt` and theme handling in general. Now rendering toolbar icons from SVG images. More documentation later.
-
-* Made `DrawListener` public in `PSurfaceJOGL`.
-
-
-### Beta 2
-
-* Added a workaround so that `color` can be part of package names, which gets some older code (i.e. toxiclibs) running again.
-
-
-### Beta 1
-
-* Now using JDK 11.0.12+7.
-
-
-### Alpha 6
-
-* `Editor.applyPreferences()` was `protected`, now it's `public`.
-
-* Removed `Editor.repaintErrorBar()` and `Editor.showConsole()`. Does not appear to be in use anywhere, easy to add back if we hear otherwise.
+This repository contains the source code for the [Processing](https://processing.org/) project for people who want to help improve the code.
-* Renamed `TextAreaPainter.getCompositionTextpainter()` to `getCompositionTextPainter()`. This was an internal function and inconsistent with the rest of the function naming.
+We welcome new contributors! Join us on the [Discord Server](https://discord.processing.org), and see the [Contributor Guide](CONTRIBUTING.md) for guidelines and tips on getting started.
+## Acknowledgement
+Processing was initiated in 2001 by Ben Fry and Casey Reas, who led the development and maintenance of the project until 2023. We are grateful for their vision and dedication to the project. Processing is also indebted to over two decades of contributions from the broader Processing community.
-### Alpha 5
+## Using Processing
-* ~~Known bug: code completion is currently broken. Any updates will be posted [here](https://github.com/processing/processing4/issues/177).~~ Fixed in alpha 6.
+If you're interested in *using* Processing, head over to the [download page](https://processing.org/download), or read more about the project on the [Processing website](https://processing.org/). There are also several [tutorials](https://processing.org/tutorials) that provide a helpful introduction. They are complemented by hundreds of examples that are included with the software itself.
-* Moved from the 11.0.2 LTS version of JavaFX to the in-progress version 16. This fixes a [garbled text](https://bugs.openjdk.java.net/browse/JDK-8234916) issue that was breaking Tools that used JavaFX.
+## Getting Help
+For assistance with your own sketches, projects, or code, please post your question on the Processing forum: https://discourse.processing.org/. Our community is full of experienced developers and knowledgeable users who are eager to help. Before you post, please take a moment to read the [guidelines on asking questions](https://discourse.processing.org/t/guidelines-asking-questions/2147) to make sure you get the best possible help. We’re incredibly grateful for the support and knowledge shared by everyone on the forum over the years.
-* The minimum system version for macOS (for the PDE and exported applications) is now set to 10.14.6 (the last update of Mojave). 10.13 (High Sierra) is no longer supported by Apple as of September or December 2020 (depending on what you read), and for our sanity, we're dropping it as well.
+## Contributing to Processing
+Processing is a labor of love, built over decades by people who believe in this community and genuinely enjoy contributing to it. If you want to fix a bug that’s been bothering you or give back to the project in other ways, you’re in the right place! We invite you to think of this repository as a community garden. We’re here to cultivate something beautiful together, and that takes kindness, dedication, and patience. For detailed guidelines on how to contribute, please see our [CONTRIBUTING.md](CONTRIBUTING.md).
-* JavaFX has been moved out of core and into a separate library. After Java 8, it's no longer part of the JDK, so it requires additional files that were formerly included by default. The Processing version of that library comes in at 180 MB, which seems excessive to include with every project, regardless of whether it's used. (And that's not including the full Webkit implementation, which adds \~80 MB per platform.)
+We understand that contributing to open source can be intimidating, but mistakes are part of learning—and we are all learners here. We do not assume knowledge or imply that somebody should already know any particular thing in order to contribute. Whether you’re a newcomer or an expert, your knowledge and contributions are valuable. Never hesitate to ask questions, open an issue, a pull request, or write a comment. We also encourage you to step in if you can: reply to issues, review pull requests, or help out in whatever way feels right for you.
+While we assume good intentions, and will give everyone a chance to learn, we have zero tolerance for repeated harassment, harmful behavior, or toxicity of any kind. Please read our [Code of Conduct](https://github.com/processing/processing4?tab=coc-ov-file) and join us in creating a safe and supportive environment through your words and actions.
-### Alpha 4
+## AI Usage Policy
+This project does *not* accept fully AI-generated contributions. AI tools may be used assistively only. As a contributor, you should be able to understand and take responsibility for changes you make to the codebase.
-* `EditorState(ListOnly monospaced (fixed-width) fonts may be used,
though the list may be imperfect. -preferences.editor_font_size = Editor font size: -preferences.console_font_size = Console font size: -preferences.interface_scale = Interface scale: +preferences.sketch_naming.tip=Choose how new sketches are named and numbered. +preferences.language=Language +preferences.editor_and_console_font=Editor and Console font +preferences.editor_and_console_font.tip=Installed Monospaced fonts will be displayed as options. +preferences.editor_font_size=Editor font size +preferences.console_font_size=Console font size +preferences.editor.theme=Theme +preferences.editor.theme.tip=Choose a color theme for windows except for the editor. +preferences.editor.theme.system=System +preferences.editor.theme.light=Light +preferences.editor.theme.dark=Dark +preferences.interface_theme=Interface theme +preferences.interface_scale=Interface scale +preferences.interface_scale.tip=Adjust the size of interface elements. preferences.interface_scale.auto = Automatic preferences.background_color = Background color when Presenting: -preferences.background_color.tip = Select the background color used when using Present.
Present is used to present a sketch in full-screen,
accessible from the Sketch menu. +preferences.background_color.tip=Select the background color used when using Present. Present is used to present a sketch in full-screen, accessible from the Sketch menu. preferences.use_smooth_text = Use smooth text in editor window preferences.enable_complex_text = Enable complex text input -preferences.enable_complex_text.tip = Using languages such as Chinese, Japanese, and Arabic
in the Editor window require additional features to be enabled. +preferences.enable_complex_text.tip=Using languages such as Chinese, Japanese, and Arabic in the Editor window require additional features to be enabled. preferences.continuously_check = Continuously check for errors preferences.show_warnings = Show warnings preferences.code_completion = Code completion with preferences.trigger_with = Trigger with preferences.cmd_space = space preferences.suggest_imports = Suggest import statements +preferences.increase_memory=Increase maximum available memory preferences.increase_max_memory = Increase maximum available memory to # preferences.delete_previous_folder_on_export = Delete previous folder on export preferences.check_for_updates_on_startup = Allow update checking (see FAQ for information shared) +preferences.update_check=Check for updates on startup +preferences.update_check.tip=No personal information is sent during this process. See the [FAQ](https://github.com/processing/processing4/wiki/FAQ#checking-for-updates) preferences.run_sketches_on_display = Run sketches on display -preferences.run_sketches_on_display.tip = Sets the display where sketches are initially placed.
As usual, if the sketch window is moved, it will re-open
at the same location, however when running in present
(full screen) mode, this display will always be used. +preferences.run_sketches_on_display.tip=Sets the display where sketches are initially placed. As usual, if the sketch window is moved, it will re-open at the same location, however when running in present (full screen) mode, this display will always be used. preferences.automatically_associate_pde_files = Automatically associate .pde files with Processing preferences.launch_programs_in = Launch programs in preferences.launch_programs_in.mode = mode preferences.file = More preferences can be edited directly in the file: preferences.file.hint = (Edit only when Processing is not running.) +preferences.other=Show experimental settings +preferences.other.tip=These settings are contained in the preferences.txt file and are not officially supported. They may be removed or changed without notice in future versions of Processing. +# Preferences (Experimental Pane) +# Keys from the comments of defaults.txt (Nov 2025) +preferences.contribution.backup.on_remove=Backup contributions when "Remove" button is pressed +preferences.contribution.backup.on_remove.tip=When enabled, a backup copy of the contribution will be created in your sketchbook "tools", "modes", "libraries", or "examples" folder when you remove it via the Contribution Manager. +preferences.contribution.backup.on_install=Backup contributions when installing a newer version +preferences.contribution.backup.on_install.tip=When enabled, a backup copy of the contribution will be created in your sketchbook "tools", "modes", "libraries", or "examples" folder when you install a newer version via the Contribution Manager. +preferences.recent.count=Number of recent sketches to show +preferences.chooser.files.native=Use native file chooser dialogs +preferences.theme.gradient.method=Gradient method for themes +preferences.theme.gradient.method.tip=Set to 'lab' to interpolate theme gradients using L*a*b* color space +preferences.platform.auto_file_type_associations=Automatically set file type associations (Windows only) +preferences.platform.auto_file_type_associations.tip=When enabled, Processing will attempt to set itself as the default application for .pde files on Windows systems. +preferences.editor.window.width.default=Default editor window width +preferences.editor.window.height.default=Default editor window height +preferences.editor.window.width.min=Minimum editor window width +preferences.editor.window.height.min=Minimum editor window height +preferences.editor.smooth=Enable antialiasing in the code editor +preferences.editor.caret.blink=Blink the caret +preferences.editor.caret.block=Use block caret # Sketchbook Location (Frame) sketchbook_location = Select new sketchbook folder @@ -599,6 +666,7 @@ contrib.import.errors.link = Error: The library %s has a strange looking downloa warn.delete = Delete warn.delete.sketch_folder = Are you sure you want to delete this sketch?\nThis will remove the entire “%s” folder. +warn.delete.sketch_last = To keep your files safe, deleting the whole sketch folder is not supported in Processing. \nPlease open the sketch folder in your file explorer to delete it. warn.delete.sketch_file = Are you sure you want to delete “%s”? warn.cannot_change_mode.title = Cannot change mode warn.cannot_change_mode.body = Cannot change mode,\nbecause “%s” mode is not compatible with current mode. @@ -611,6 +679,15 @@ update_check = Update update_check.updates_available.core = A new version of Processing is available,\nwould you like to visit the Processing download page? update_check.updates_available.contributions = There are updates available for some of the installed contributions,\nwould you like to open the the Contribution Manager now? +# --------------------------------------- +# Beta +beta.window.title = Welcome to Beta +beta.title = Thanks for testing this Processing Beta! +beta.message = This preview release lets us gather feedback and fix issues before the final version. **Some features may not work as expected.** If you encounter problems, [please post on the forum](https://discourse.processing.org) or [open a GitHub issue](https://github.com/processing/processing4/issues). +beta.button = Ok +# Welcome +welcome.survey.title=Take the Community Survey +welcome.survey.description=Processing is free, open-source, and shaped by its community. Your answers help us focus on what matters most. # --------------------------------------- # Color Chooser @@ -618,6 +695,23 @@ update_check.updates_available.contributions = There are updates available for s color_chooser = Color Selector color_chooser.select = Select + +# --------------------------------------- +# Welcome Screen +welcome.processing.logo = Processing Logo +welcome.processing.title = Welcome to Processing +welcome.actions.sketch.new = New Sketch +welcome.actions.examples = Open Examples +welcome.actions.sketchbook = My Sketches +welcome.actions.show_startup = Show this window at startup +welcome.resources.title = Resources +welcome.resources.get_started = Get Started +welcome.resources.tutorials = Tutorials +welcome.resources.documentation = Reference +welcome.community.title = Join our community +welcome.community.forum = Forum +welcome.sketch.open = Open + # --------------------------------------- # Movie Maker diff --git a/build/shared/lib/languages/PDE_ar.properties b/app/src/main/resources/languages/PDE_ar.properties similarity index 98% rename from build/shared/lib/languages/PDE_ar.properties rename to app/src/main/resources/languages/PDE_ar.properties index 8f15db5c39..2365f40fea 100644 --- a/build/shared/lib/languages/PDE_ar.properties +++ b/app/src/main/resources/languages/PDE_ar.properties @@ -105,7 +105,7 @@ menu.tools.color_selector = أداة اختيار الألوان... menu.tools.create_font = أداة صناعة الخطوط menu.tools.archive_sketch = أرشفة المخطوط menu.tools.fix_the_serial_lbrary = إصلاح مكتبة الاتصالات التسلسلية -menu.tools.install_processing_java = تثبيت"processing-java" +menu.tools.install_processing_java = تثبيت"processing" menu.tools.add_tool = أضف أداة # | File | Edit | Sketch | Debug | Tools | Help | @@ -550,6 +550,10 @@ update_check = تحديث update_check.updates_available.core = يوجد نسخة جديدة من بروسسنج جاهزة للتحميل. \nهل تود زيارة الموقع الرسمي لتحميلها؟ update_check.updates_available.contributions = يوجد تحديثات متوفرة لبعض المشاركات المثبتة. \nهل تريد الذهاب إلى مدير المشاركات الآن؟ +# --------------------------------------- +# Welcome +welcome.survey.title=شارك في استطلاع المجتمع (بالإنجليزية) +welcome.survey.description=Processing مجاني ومفتوح المصدر ومشكّل من قبل مجتمعه. إجاباتك تساعدنا على التركيز على ما يهم أكثر. # --------------------------------------- # Color Chooser diff --git a/build/shared/lib/languages/PDE_ca.properties b/app/src/main/resources/languages/PDE_ca.properties similarity index 99% rename from build/shared/lib/languages/PDE_ca.properties rename to app/src/main/resources/languages/PDE_ca.properties index 230393f6cc..77187986ba 100644 --- a/build/shared/lib/languages/PDE_ca.properties +++ b/app/src/main/resources/languages/PDE_ca.properties @@ -126,7 +126,7 @@ menu.tools.color_selector = Selector de color... menu.tools.create_font = Creació de fonts tipogràfiques... menu.tools.archive_sketch = Arxiva l'sketch menu.tools.fix_the_serial_lbrary = Arregla la «Serial Library» -menu.tools.install_processing_java = Instal·la «processing-java» +menu.tools.install_processing_java = Instal·la «processing» # menu.tools.add_tool = Afegeix una eina... menu.tools.manage_tools = Gestiona les eines... @@ -138,6 +138,7 @@ menu.help.about = Quant al Processing menu.help.environment = Entorn de desenvolupament menu.help.reference = Referència menu.help.find_in_reference = Cerca en la referència +menu.help.reference.download = Descarrega la referència menu.help.libraries_reference = Referències de les biblioteques menu.help.tools_reference = Referències de les eines menu.help.empty = (buit) @@ -561,7 +562,7 @@ contrib.progress.installing = S'està instal·lant contrib.progress.starting = Començant instal·lació contrib.progress.downloading = Descarregant contrib.download_error = S'ha produït un error durant la descàrrega de la contribució. -contrib.unsupported_operating_system = Sembla que el vostre sistema operatiu no és compatible. Consulteu la biblioteca de «%s» per a més informació. +contrib.missing_link = No s'ha trobat l'enllaç de descàrrega per a %s, contacteu amb l'autor. contrib.category.3d = 3D contrib.category.animation = Animació contrib.category.data = Dades diff --git a/build/shared/lib/languages/PDE_de.properties b/app/src/main/resources/languages/PDE_de.properties similarity index 96% rename from build/shared/lib/languages/PDE_de.properties rename to app/src/main/resources/languages/PDE_de.properties index 2ffa28ea7f..53dadf64bb 100644 --- a/build/shared/lib/languages/PDE_de.properties +++ b/app/src/main/resources/languages/PDE_de.properties @@ -100,7 +100,7 @@ menu.tools.color_selector = Farbauswahl ... menu.tools.create_font = Schrift erstellen ... menu.tools.archive_sketch = Sketch archivieren ... menu.tools.fix_the_serial_lbrary = "Serial Library" beheben ... -menu.tools.install_processing_java = "processing-java" installieren ... +menu.tools.install_processing_java="processing" installieren ... #menu.tools.add_tool = Tool hinzufügen ... menu.tools.manage_tools = Tools verwalten... @@ -121,6 +121,8 @@ menu.help.troubleshooting = Fehlerbehandlung menu.help.faq = Häufig gestellte Fragen (FAQ) menu.help.foundation = "The Processing Foundation" menu.help.visit = Processing.org besuchen +menu.help.report = Einen Fehler melden +menu.help.ask = Im Forum fragen # --------------------------------------- @@ -407,6 +409,7 @@ editor.status.error.syntax = Syntaxfehler - %s warn.delete = Löschen warn.delete.sketch = Den Sketch endgültig löschen? +warn.delete.sketch_last = Um deine Dateien sicher zu halten, wird das Löschen des gesamten Sketch-Ordners in Processing nicht unterstützt. \nBitte öffne den Sketch-Ordner in deinem Datei-Explorer, um ihn zu löschen. warn.delete.file = Die Datei "%s" entgültig löschen? @@ -417,6 +420,10 @@ update_check = Update update_check.updates_available.core = Eine neue Version von Processing ist verfügbar,\nsoll der Download-Bereich aufgerufen werden? update_check.updates_available.contributions = Es sind neue Updates von installierten Paketen verfügbar,\nsoll der Contribution Manager geöffnet werden? +# --------------------------------------- +# Welcome +welcome.survey.title=Nimm an der Community-Umfrage teil (auf Englisch) +welcome.survey.description=Processing ist kostenlos, open source und von seiner Community geprägt. Deine Antworten helfen uns, die wichtigsten Schwerpunkte zu setzen. # --------------------------------------- # Color Chooser diff --git a/build/shared/lib/languages/PDE_el.properties b/app/src/main/resources/languages/PDE_el.properties similarity index 98% rename from build/shared/lib/languages/PDE_el.properties rename to app/src/main/resources/languages/PDE_el.properties index 53a8d36da9..e7e29cb509 100644 --- a/build/shared/lib/languages/PDE_el.properties +++ b/app/src/main/resources/languages/PDE_el.properties @@ -100,7 +100,7 @@ menu.tools.color_selector = Επιλογή Χρώματος... menu.tools.create_font = Δημιουργία Γραμματοσειράς... menu.tools.archive_sketch = Αρχειοθέτηση Σχεδίου menu.tools.fix_the_serial_lbrary = Διόρθωση Σειριακής Βιβλιοθήκης -menu.tools.install_processing_java = Εγκατάσταση της "processing-java" +menu.tools.install_processing_java = Εγκατάσταση της "processing" menu.tools.add_tool = Προσθήκη Εργαλείου... # | File | Edit | Sketch | Debug | Tools | Help | @@ -478,6 +478,7 @@ contrib.import.errors.link = Error: The library %s has a strange looking downloa warn.delete = Διαγραφή warn.delete.sketch = Είσαι σίγουρος ότι θέλεις να διαγραφεί το Σχέδιο; +warn.delete.sketch_last = Για να διατηρήσετε τα αρχεία σας ασφαλή, η διαγραφή ολόκληρου του φακέλου Σχεδίου δεν υποστηρίζεται στο Processing.\nΠαρακαλούμε ανοίξτε το φάκελο Σχεδίου στον εξερευνητή αρχείων για να το διαγράψετε. warn.delete.file = Είσαι σίγουρος ότι θέλεις να διαγράψεις το "%s"; diff --git a/build/shared/lib/languages/PDE_en.properties b/app/src/main/resources/languages/PDE_en.properties similarity index 100% rename from build/shared/lib/languages/PDE_en.properties rename to app/src/main/resources/languages/PDE_en.properties diff --git a/build/shared/lib/languages/PDE_es.properties b/app/src/main/resources/languages/PDE_es.properties similarity index 98% rename from build/shared/lib/languages/PDE_es.properties rename to app/src/main/resources/languages/PDE_es.properties index 2ef620b0f0..1df196955b 100644 --- a/build/shared/lib/languages/PDE_es.properties +++ b/app/src/main/resources/languages/PDE_es.properties @@ -126,7 +126,7 @@ menu.tools.color_selector = Selector de colores... menu.tools.create_font = Crear fuente... menu.tools.archive_sketch = Archivar sketch menu.tools.fix_the_serial_lbrary = Corregir «Serial library» -menu.tools.install_processing_java = Instalar «processing-java» +menu.tools.install_processing_java = Instalar «processing» # menu.tools.add_tool = Añadir herramienta... menu.tools.manage_tools = Gestionar herramientas... @@ -138,6 +138,7 @@ menu.help.about = Acerca de Processing menu.help.environment = Entorno de desarrollo menu.help.reference = Referencia menu.help.find_in_reference = Buscar en la referencia +menu.help.reference.download = Descargar la referencia menu.help.libraries_reference = Referencias de bibliotecas menu.help.tools_reference = Referencias de herramientas menu.help.empty = (vacío) @@ -561,7 +562,7 @@ contrib.progress.installing = Instalando contrib.progress.starting = Comenzando contrib.progress.downloading = Descargando contrib.download_error = Ha ocurrido un error durante la descarga de la contribución. -contrib.unsupported_operating_system = Parece que este sistema operativo no es compatible. Consulta la biblioteca de «%s» para más información. +contrib.missing_link = No se ha encontrado el enlace de descarga de %s, contacta con el autor. contrib.category.3d = 3D contrib.category.animation = Animación contrib.category.data = Datos @@ -598,6 +599,7 @@ contrib.import.errors.link = Error: el enlace de descarga de la biblioteca «%s warn.delete = Eliminar warn.delete.sketch_folder = ¿Seguro que quieres eliminar el sketch?\nEsto suprimirá la carpeta «%s» y todo su contenido. +warn.delete.sketch_last = Para mantener tus archivos seguros, no se admite eliminar toda la carpeta del sketch en Processing.\nAbre la carpeta del sketch en tu explorador de archivos para eliminarla. warn.delete.sketch_file = ¿Seguro que quieres eliminar el archivo «%s»? warn.cannot_change_mode.title = Error cambio de modo warn.cannot_change_mode.body = No se puede cambiar al modo «%s»\nporque no es compatible con el modo actual. diff --git a/build/shared/lib/languages/PDE_fr.properties b/app/src/main/resources/languages/PDE_fr.properties similarity index 97% rename from build/shared/lib/languages/PDE_fr.properties rename to app/src/main/resources/languages/PDE_fr.properties index 7f18f9b386..17a222a671 100644 --- a/build/shared/lib/languages/PDE_fr.properties +++ b/app/src/main/resources/languages/PDE_fr.properties @@ -40,6 +40,7 @@ menu.edit.paste = Coller menu.edit.select_all = Sélectionner tout menu.edit.auto_format = Mise en forme automatique menu.edit.comment_uncomment = Commenter/Décommenter +menu.edit.comment_uncomment.keystroke = meta pressed COLON menu.edit.increase_indent = → Augmenter l'indentation menu.edit.decrease_indent = ← Diminuer l'indentation menu.edit.find = Rechercher... @@ -82,7 +83,7 @@ menu.tools.color_selector = Sélecteur de couleurs... menu.tools.create_font = Générer la police... menu.tools.archive_sketch = Archiver le sketch... menu.tools.fix_the_serial_lbrary = Réparer la "Serial Library"... -menu.tools.install_processing_java = Installer "processing-java"... +menu.tools.install_processing_java = Installer "processing"... menu.tools.add_tool = Ajouter un outil... # | File | Edit | Sketch | Debug | Tools | Help | @@ -486,7 +487,9 @@ contrib.import.errors.link = Erreur : Le lien de téléchargement de la biblioth # Warnings warn.delete = Supprimer -warn.delete.sketch = Êtes-vous sûr(e) de vouloir supprimer ce sketch? +warn.delete.sketch = Êtes-vous sûr(e) de vouloir supprimer ce sketch? \nLe dossier “%s” sera entièrement effacé. +# warn.delete.sketch_last = To keep your files safe, deleting the whole sketch folder isn?t supported in Processing. \nPlease open the sketch folder in your file explorer to delete it. +warn.delete.sketch_last = Pour protéger vos fichiers, la suppression du dossier de sketch entier n'est pas prise en charge dans Processing. \nVeuillez ouvrir le dossier de sketch dans votre explorateur de fichiers pour le supprimer. warn.delete.file = Êtes-vous sûr(e) de vouloir supprimer «%s»? warn.cannot_change_mode.title = Impossible de changer le mode warn.cannot_change_mode.body = Impossible de changer de mode, \ncar le mode "%s" n'est pas compatible avec le mode actuel. @@ -499,6 +502,9 @@ update_check = Mise à jour update_check.updates_available.core = Une nouvelle version de Processing est disponible, \nVoulez-vous visiter la page de téléchargement de Processing? update_check.updates_available.contributions = Il y a des mises à jour disponibles pour certaines des contributions installées, \nVoulez-vous ouvrir le gestionnaire de contributions? +# Welcome +welcome.survey.title=Participez au sondage de la communauté (en anglais) +welcome.survey.description=Processing est gratuit, open source et façonné par sa communauté. Vos réponses nous aident à nous concentrer sur ce qui compte le plus. # --------------------------------------- # Color Chooser diff --git a/build/shared/lib/languages/PDE_it.properties b/app/src/main/resources/languages/PDE_it.properties similarity index 98% rename from build/shared/lib/languages/PDE_it.properties rename to app/src/main/resources/languages/PDE_it.properties index 9689c4760a..c7931526ac 100644 --- a/build/shared/lib/languages/PDE_it.properties +++ b/app/src/main/resources/languages/PDE_it.properties @@ -100,7 +100,7 @@ menu.tools.color_selector = Selezionatore dei colori... menu.tools.create_font = Crea Font... menu.tools.archive_sketch = Archivia Sketch menu.tools.fix_the_serial_lbrary = Ripara la "Serial Library" -menu.tools.install_processing_java = Installa "processing-java" +menu.tools.install_processing_java = Installa "processing" menu.tools.add_tool = Aggiungi Strumento... # | File | Edit | Sketch | Debug | Tools | Help | @@ -533,6 +533,7 @@ contrib.import.errors.link = Errore: la libreria %s ha uno strano link di downlo warn.delete = Elimina warn.delete.sketch = Sei sicuro di voler eliminare questo sketch? +warn.delete.sketch_last = Per mantenere i tuoi file al sicuro, l'eliminazione dell'intera cartella dello sketch non è supportata in Processing. \nPer favore apri la cartella dello sketch nel tuo esplora file per eliminarla. warn.delete.file = Sei sicuro di voler eliminare "%s"? warn.cannot_change_mode.title = Impossibile cambiare modalità warn.cannot_change_mode.body = Impossibile cambiare modalità,\npoichè la modalità "%s" non è compatibile con quella corrente. @@ -545,6 +546,11 @@ update_check = Aggiorna update_check.updates_available.core = Una nuova versione di Processing è disponibile,\nvuoi visitare la pagina di download del sito di Processing? update_check.updates_available.contributions = Ci sono aggiornamenti disponibili per alcuni dei contributi installati,\nvorresti aprire il gestore dei contributi ora? +# --------------------------------------- +# Welcome +welcome.survey.title=Partecipa al sondaggio della community (in inglese) +welcome.survey.description=Processing è gratuito, open-source e plasmato dalla sua community. Le tue risposte ci aiutano a capire ciò che conta di più. + # --------------------------------------- # Color Chooser diff --git a/build/shared/lib/languages/PDE_ja.properties b/app/src/main/resources/languages/PDE_ja.properties similarity index 97% rename from build/shared/lib/languages/PDE_ja.properties rename to app/src/main/resources/languages/PDE_ja.properties index fdce4bb81b..e506f9c7e2 100644 --- a/build/shared/lib/languages/PDE_ja.properties +++ b/app/src/main/resources/languages/PDE_ja.properties @@ -105,7 +105,7 @@ menu.tools.color_selector = 色選択... menu.tools.create_font = フォント作成... menu.tools.archive_sketch = スケッチをアーカイブ menu.tools.fix_the_serial_lbrary = シリアルライブラリを修正 -menu.tools.install_processing_java = "processing-java" をインストール +menu.tools.install_processing_java = "processing" をインストール menu.tools.add_tool = ツールを追加... # | File | Edit | Sketch | Debug | Tools | Help | @@ -537,6 +537,7 @@ contrib.import.errors.link = Error: The library %s has a strange looking downloa warn.delete = 削除 warn.delete.sketch = このスケッチを削除してもよろしいですか? +warn.delete.sketch_last = ファイルの安全を保つため、Processing ではプロジェクトフォルダーの削除はサポートされていません。\nファイルエクスプローラーでプロジェクトフォルダーを開き、削除してください。 warn.delete.file = "%s"を削除してもよろしいですか? warn.cannot_change_mode.title = モード変更失敗 warn.cannot_change_mode.body = 互換性がないため、"%s"モードに切り替えられません。 @@ -549,6 +550,11 @@ update_check = 更新 update_check.updates_available.core = 新しいバージョンのProcessingが利用可能です。\nProcessingのダウンロードページにアクセスしますか? update_check.updates_available.contributions = There are updates available for some of the installed contributions,\nwould you like to open the the Contribution Manager now? +# --------------------------------------- +# Welcome +welcome.survey.title=コミュニティ調査にご協力ください（英語） +welcome.survey.description=Processing は無料でオープンソースであり、コミュニティによって形作られています。あなたの回答は、私たちが何に注力すべきかを知る助けになります。 + # --------------------------------------- # Color Chooser diff --git a/build/shared/lib/languages/PDE_ko.properties b/app/src/main/resources/languages/PDE_ko.properties similarity index 98% rename from build/shared/lib/languages/PDE_ko.properties rename to app/src/main/resources/languages/PDE_ko.properties index 0f13cb121c..f3491ccc96 100644 --- a/build/shared/lib/languages/PDE_ko.properties +++ b/app/src/main/resources/languages/PDE_ko.properties @@ -77,7 +77,7 @@ menu.tools.create_font = 글꼴 생성... menu.tools.color_selector = 색상 선택 menu.tools.archive_sketch = .zip으로 압축하기 menu.tools.fix_the_serial_lbrary = 시리얼 라이브러리 오류 수정 -menu.tools.install_processing_java = "processing-java" 설치 +menu.tools.install_processing_java = "processing" 설치 menu.tools.add_tool = 추가도구 생성... # | File | Edit | Sketch | Debug | Tools | Help | @@ -308,6 +308,7 @@ editor.status.error.syntax = 구문 오류 - %s warn.delete = 삭제 warn.delete.sketch = 정말 해당 스케치를 삭제하시겠습니까? +warn.delete.sketch_last = 파일의 안전을 위해 Processing에서는 프로젝트 폴더 삭제를 지원하지 않습니다. \n파일 탐색기에서 프로젝트 폴더를 열어 삭제해 주세요. warn.delete.file = 정말 "%s"를 삭제하시겠습니까? diff --git a/build/shared/lib/languages/PDE_nl.properties b/app/src/main/resources/languages/PDE_nl.properties similarity index 88% rename from build/shared/lib/languages/PDE_nl.properties rename to app/src/main/resources/languages/PDE_nl.properties index 1b6b9d5f01..b8278d1c24 100644 --- a/build/shared/lib/languages/PDE_nl.properties +++ b/app/src/main/resources/languages/PDE_nl.properties @@ -72,7 +72,7 @@ menu.tools.color_selector = Kleur Selecteren... menu.tools.create_font = Lettertype Maken... menu.tools.archive_sketch = Schets Archiveren menu.tools.fix_the_serial_lbrary = Seriële Bibliotheek Herstellen -menu.tools.install_processing_java = Installeren "processing-java" +menu.tools.install_processing_java = Installeren "processing" menu.tools.add_tool = Tool Toevoegen... # | File | Edit | Sketch | Debug | Tools | Help | @@ -305,6 +305,7 @@ contrib.unsupported_operating_system = Uw besturingssyteem wordt schijnbaar niet warn.delete = Verwijderen warn.delete.sketch = Weet u zeker dat u deze schets wil verwijderen? +warn.delete.sketch_last = Om je bestanden veilig te houden, wordt het verwijderen van de gehele schets niet ondersteund in Processing. \nOpen de schets map in je bestandsverkenner om deze te verwijderen. warn.delete.file = Weet u zeker dat u "%s" wil verwijderen? @@ -314,6 +315,33 @@ update_check = Update update_check.updates_available.core = Een nieuwe versie van Processing is beschikbaar,\nwilt u de Processing download pagina bezoeken? update_check.updates_available.contributions = Er zijn updates beschikbaar voor sommige van de door u geïnstalleerde bijdragen,\nwilt u nu de Bijdragen Manager openen? +# --------------------------------------- +# Welcome +welcome.survey.title=Doe mee aan de community-enquête (in het Engels) +welcome.survey.description=Processing is gratis, open-source en gevormd door de community. Jouw antwoorden helpen ons te focussen op wat het belangrijkst is. + +# --------------------------------------- +# Beta +beta.window.title = Welkom bij Beta +beta.title = Dankuwel voor het testen van deze Processing Beta! +beta.message = Deze preview release laat ons feedback verzamelen en problemen oplossen. **Sommige functies werken mogelijk niet zoals verwacht.** Als u problemen ondervindt, [post dan op het forum](https://discourse.processing.org) of [open een GitHub issue](https://github.com/processing/processing4/issues). +beta.button = Ok + + +# --------------------------------------- +# Welcome Screen +welcome.processing.logo = Processing Logo +welcome.processing.title = Welkom bij Processing! +welcome.actions.sketch.new = Nieuwe Schets +welcome.actions.examples = Open Voorbeelden +welcome.actions.show_startup = Laat dit scherm zien bij opstarten +welcome.resources.title = Resources +welcome.resources.video = Video Cursus +welcome.resources.get_started = Om te beginnen +welcome.resources.tutorials = Tutorials +welcome.resources.documentation = Handleiding +welcome.community.title = Neem deel aan de Community +welcome.community.forum = Forum # --------------------------------------- # Color Chooser diff --git a/build/shared/lib/languages/PDE_pt.properties b/app/src/main/resources/languages/PDE_pt.properties similarity index 92% rename from build/shared/lib/languages/PDE_pt.properties rename to app/src/main/resources/languages/PDE_pt.properties index 6c957c0331..2c9e3bc527 100644 --- a/build/shared/lib/languages/PDE_pt.properties +++ b/app/src/main/resources/languages/PDE_pt.properties @@ -71,7 +71,7 @@ menu.tools.color_selector = Selector de Cor... menu.tools.create_font = Criar Fonte... menu.tools.archive_sketch = Arquivar Sketch menu.tools.fix_the_serial_lbrary = Corrijir a Biblioteca Serial -menu.tools.install_processing_java = Instalar "processing-java" +menu.tools.install_processing_java = Instalar "processing" menu.tools.add_tool = Adicionar Ferramenta... # | File | Edit | Sketch | Debug | Tools | Help | @@ -253,3 +253,13 @@ contrib.progress.starting = A iniciar contrib.progress.downloading = A descarregar contrib.download_error = Ocorreu um erro ao descarregar a contribuição. contrib.unsupported_operating_system = O seu sistema operativo não parece ser suportado. Deve visitar a biblioteca %s para mais informação. + +# --------------------------------------- +# Warnings + +warn.delete = Apagar +warn.delete.sketch_folder = Tem a certeza de que deseja apagar este sketch?\nIsto irá remover a pasta inteira “%s”. +warn.delete.sketch_last = Para manter os seus ficheiros seguros, apagar a pasta inteira do sketch não é suportado no Processing.\nPor favor, abra a pasta do sketch no seu explorador de ficheiros para a apagar. +warn.delete.sketch_file = Tem a certeza de que deseja apagar “%s”? +warn.cannot_change_mode.title = Não é possível mudar de modo +warn.cannot_change_mode.body = Não é possível mudar de modo,\nporque o modo “%s” não é compatível com o modo atual. \ No newline at end of file diff --git a/build/shared/lib/languages/PDE_ru.properties b/app/src/main/resources/languages/PDE_ru.properties similarity index 99% rename from build/shared/lib/languages/PDE_ru.properties rename to app/src/main/resources/languages/PDE_ru.properties index f35ce1cccc..b5df6de76f 100644 --- a/build/shared/lib/languages/PDE_ru.properties +++ b/app/src/main/resources/languages/PDE_ru.properties @@ -100,7 +100,7 @@ menu.tools.color_selector = Выбрать цвет... menu.tools.create_font = Создать шрифты... menu.tools.archive_sketch = Архивировать набросок menu.tools.fix_the_serial_lbrary = Исправить библиотеку Serial -menu.tools.install_processing_java = Установить "processing-java" +menu.tools.install_processing_java = Установить "processing" menu.tools.add_tool = Добавить инструмент... # | File | Edit | Sketch | Debug | Tools | Help | @@ -547,6 +547,7 @@ contrib.import.errors.link = Ошибка: у библиотеки %s стран warn.delete = Удалить warn.delete.sketch = Вы уверены, что хотите удалить эскиз? +warn.delete.sketch_last = Чтобы сохранить ваши файлы в безопасности, удаление всей папки с наброском не поддерживается в Processing.\nПожалуйста, откройте папку с наброском в проводнике, чтобы удалить её. warn.delete.file = Вы уверены, что хотите удалить "%s"? warn.cannot_change_mode.title = Нельзя сменить режим warn.cannot_change_mode.body = Не получается изменить режим,\nтак как "%s" не совместим с текущим режимом. diff --git a/build/shared/lib/languages/PDE_tr.properties b/app/src/main/resources/languages/PDE_tr.properties similarity index 91% rename from build/shared/lib/languages/PDE_tr.properties rename to app/src/main/resources/languages/PDE_tr.properties index 1da470b4b7..8d0782939b 100644 --- a/build/shared/lib/languages/PDE_tr.properties +++ b/app/src/main/resources/languages/PDE_tr.properties @@ -72,7 +72,7 @@ menu.tools.color_selector = Renk Seçici menu.tools.create_font = Yazı Tipi Oluştur... menu.tools.archive_sketch = Sketch'i Arşivle menu.tools.fix_the_serial_lbrary = "Serial Kütüphanesi"ni Onar... -menu.tools.install_processing_java = "Processing-Java"yı Yükle... +menu.tools.install_processing_java = "Processing"yı Yükle... menu.tools.add_tool = Araç Ekle... # | File | Edit | Sketch | Debug | Tools | Help | @@ -232,3 +232,13 @@ editor.status.error.syntax = Hata - %s contrib.category = Kategori: contrib.filter_your_search = Aramayı Filtrele... + +# --------------------------------------- +# Warnings + +warn.delete = Sil +warn.delete.sketch_folder = Bu sketch'i silmek istediğinizden emin misiniz?\nBu işlem “%s” klasörünün tamamını silecektir. +warn.delete.sketch_last = Dosyalarınızı güvende tutmak için, tüm sketch klasörünü silmek Processing'de desteklenmemektedir.\nLütfen bu klasörü silmek için dosya gezgininizi kullanın. +warn.delete.sketch_file = “%s” dosyasını silmek istediğinizden emin misiniz? +warn.cannot_change_mode.title = Mod değiştirilemiyor +warn.cannot_change_mode.body = Mod değiştirilemiyor,\nçünkü “%s” modu mevcut modla uyumlu değil. \ No newline at end of file diff --git a/build/shared/lib/languages/PDE_uk.properties b/app/src/main/resources/languages/PDE_uk.properties similarity index 99% rename from build/shared/lib/languages/PDE_uk.properties rename to app/src/main/resources/languages/PDE_uk.properties index 8584ecda99..78c8b07050 100644 --- a/build/shared/lib/languages/PDE_uk.properties +++ b/app/src/main/resources/languages/PDE_uk.properties @@ -126,7 +126,7 @@ menu.tools.color_selector = Вибрати колір... menu.tools.create_font = Створити шрифт... menu.tools.archive_sketch = Архівувати ескіз menu.tools.fix_the_serial_lbrary = Виправити Serial Library -menu.tools.install_processing_java = Встановити "processing-java" +menu.tools.install_processing_java = Встановити "processing" # menu.tools.add_tool = Додати інструмент... menu.tools.manage_tools = Керувати інструментами... @@ -594,6 +594,7 @@ contrib.import.errors.link = Помилка: У бібліотеки %s неді warn.delete = Видалення warn.delete.sketch = Ви впевнені, що хочете видалити цей ескіз? +warn.delete.sketch_last = Щоб зберегти ваші файли в безпеці, видалення всієї папки ескізу не підтримується в Processing.\nБудь ласка, відкрийте папку ескізу у вашому файловому менеджері, щоб видалити її. warn.delete.file = Ви впевнені, що хочете видалити "%s"? warn.cannot_change_mode.title = Зміна режиму неможлива warn.cannot_change_mode.body = Зміна режиму неможлива,\nоскільки режим "%s" несумісний з поточним режимом. @@ -649,4 +650,5 @@ movie_maker.progress.creating_output_file = Створюю вихідний фа movie_maker.progress.initializing = Ініціалізація... movie_maker.progress.processing = Обробляю %s. -movie_maker.progress.handling_frame = Конвертую кадр %s з %s... \ No newline at end of file +movie_maker.progress.handling_frame = Конвертую кадр %s з %s... + diff --git a/build/shared/lib/languages/PDE_zh-CN.properties b/app/src/main/resources/languages/PDE_zh-CN.properties similarity index 91% rename from build/shared/lib/languages/PDE_zh-CN.properties rename to app/src/main/resources/languages/PDE_zh-CN.properties index 5d2f8e1ee1..d475571a58 100644 --- a/build/shared/lib/languages/PDE_zh-CN.properties +++ b/app/src/main/resources/languages/PDE_zh-CN.properties @@ -92,7 +92,7 @@ menu.tools.color_selector = 颜色选择器... menu.tools.create_font = 创建字体... menu.tools.archive_sketch = 速写本压缩输出 menu.tools.fix_the_serial_lbrary = 修复串口库文件 -menu.tools.install_processing_java = 安装 "processing-java" +menu.tools.install_processing_java = 安装 "processing" menu.tools.add_tool = 添加工具... # | File | Edit | Sketch | Debug | Tools | Help | @@ -307,5 +307,15 @@ contrib.unsupported_operating_system = 你当前的操作系统似乎不被支 # Warnings warn.delete = 删除 -warn.delete.sketch = 你确定要删除该速写本? -warn.delete.file = 你确定删除 "%s"? +warn.delete.sketch = 你确定要删除该速写本吗？ +warn.delete.sketch_folder = 你确定要删除该速写本吗？\n这将删除整个 “%s” 文件夹。 +warn.delete.sketch_last = 为了确保您的文件安全，Processing 不支持删除整个速写本文件夹。\n请在文件管理器中打开速写本文件夹进行删除。 +warn.delete.file = 你确定要删除 "%s" 吗？ +warn.delete.sketch_file = 你确定要删除 “%s” 吗？ +warn.cannot_change_mode.title = 无法切换模式 +warn.cannot_change_mode.body = 无法切换模式，\n因为 “%s” 模式与当前模式不兼容。 + +# --------------------------------------- +# Welcome +welcome.survey.title=参与社区调查（英文） +welcome.survey.description=Processing 是免费的、开源的，并由社区共同塑造。你的回答将帮助我们关注最重要的事项。 \ No newline at end of file diff --git a/build/shared/lib/languages/PDE_zh-TW.properties b/app/src/main/resources/languages/PDE_zh-TW.properties similarity index 98% rename from build/shared/lib/languages/PDE_zh-TW.properties rename to app/src/main/resources/languages/PDE_zh-TW.properties index b68c8489ae..33a7e48e99 100644 --- a/build/shared/lib/languages/PDE_zh-TW.properties +++ b/app/src/main/resources/languages/PDE_zh-TW.properties @@ -126,7 +126,7 @@ menu.tools.color_selector = 顏色選擇器(Color Selector)... menu.tools.create_font = 建字型檔(Create Font)... menu.tools.archive_sketch = 壓縮程式專案(Archive Sketch) menu.tools.fix_the_serial_library = 修復Serial函式庫(Fix the Serial Library) -menu.tools.install_processing_java = 安裝 "processing-java" +menu.tools.install_processing_java = 安裝 "processing" menu.tools.add_tool = 新增工具(Add Tool)... # | File | Edit | Sketch | Debug | Tools | Help | @@ -577,9 +577,10 @@ contrib.import.errors.link = 錯誤Error: 這個library %s 的下載網址有問 warn.delete = 刪除Delete... warn.delete.sketch = 確定要刪除程式嗎? warn.delete.file = 確定要刪除檔案 "%s" 嗎? -warn.cannot_change_mode.title = Cannot change mode -warn.cannot_change_mode.body = Cannot change mode,\nbecause "%s" mode is not compatible with current mode. - +warn.delete.sketch_file = 您確定要刪除「%s」嗎？ +warn.delete.sketch_last = 為了保護您的檔案安全，Processing 不支援刪除整個程式素描本資料夾。\n請在檔案總管中開啟該資料夾進行刪除。 +warn.cannot_change_mode.title = 無法切換模式 +warn.cannot_change_mode.body = 無法切換模式，\n因為「%s」模式與當前模式不相容。 # --------------------------------------- # Update Check diff --git a/app/src/main/resources/languages/locales.txt b/app/src/main/resources/languages/locales.txt new file mode 100644 index 0000000000..e8f991712b --- /dev/null +++ b/app/src/main/resources/languages/locales.txt @@ -0,0 +1,17 @@ +ar +ca +de +el +en +es +fr +it +ja +ko +nl +pt +ru +tr +uk +zh-CN +zh-TW \ No newline at end of file diff --git a/app/src/main/resources/logo.svg b/app/src/main/resources/logo.svg new file mode 100644 index 0000000000..aa04fcb296 --- /dev/null +++ b/app/src/main/resources/logo.svg @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/app/src/main/resources/processing/app/laf/FlatLaf.properties b/app/src/main/resources/processing/app/laf/FlatLaf.properties new file mode 100644 index 0000000000..70e0829120 --- /dev/null +++ b/app/src/main/resources/processing/app/laf/FlatLaf.properties @@ -0,0 +1,23 @@ +# The default is 8, which creates tiny nubby scroll bars +ScrollBar.width = 16 + +TitlePane.inactiveForeground = #000000 + + +# Better matched for macOS dark mode (but using everywhere) +# https://github.com/JFormDesigner/FlatLaf/issues/497 + +[dark]@background = #1e1e1e +[dark]@foreground = #e0e0e0 +[dark]@accentColor = #107aff +[dark]@accentFocusColor = #176896 + +[dark]Component.arrowType = chevron + +[dark]CheckBox.icon.style = filled +[dark]CheckBox.icon[filled].selectedBorderColor = @accentColor +[dark]CheckBox.icon[filled].selectedBackground = @accentColor +[dark]CheckBox.icon[filled].checkmarkColor = @foreground + +[dark]RadioButton.icon.style = filled +[dark]RadioButton.icon[filled].centerDiameter = 6 diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java index c7df19baf7..49a8625e51 100644 --- a/app/src/processing/app/Base.java +++ b/app/src/processing/app/Base.java @@ -23,27 +23,29 @@ package processing.app; -import java.awt.*; -import java.awt.event.ActionListener; -import java.io.*; -import java.lang.reflect.InvocationTargetException; -import java.util.*; -import java.util.List; -import java.util.Map.Entry; - -import javax.swing.*; -import javax.swing.tree.DefaultMutableTreeNode; - import com.formdev.flatlaf.FlatDarkLaf; import com.formdev.flatlaf.FlatLaf; import com.formdev.flatlaf.FlatLightLaf; +import org.jetbrains.annotations.NotNull; import processing.app.contrib.*; import processing.app.tools.Tool; import processing.app.ui.*; import processing.app.ui.Toolkit; -import processing.core.*; +import processing.core.PApplet; import processing.data.StringList; +import javax.swing.*; +import javax.swing.tree.DefaultMutableTreeNode; +import java.awt.*; +import java.awt.event.ActionListener; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.lang.reflect.InvocationTargetException; +import java.util.*; +import java.util.List; +import java.util.Map.Entry; /** * The base class for the main processing application. @@ -52,11 +54,15 @@ * files and images, etc.) that comes from that. */ public class Base { - // Added accessors for 0218 because the UpdateCheck class was not properly - // updating the values, due to javac inlining the static final values. - static private final int REVISION = 1292; - /** This might be replaced by main() if there's a lib/version.txt file. */ - static private String VERSION_NAME = "1292"; //$NON-NLS-1$ + /** + * Revision number, used for update checks and contribution compatibility. + */ + static private final int REVISION = Integer.parseInt(System.getProperty("processing.revision", "1295")); + /** + * This might be replaced by main() if there's a lib/version.txt file. + * + */ + static private String VERSION_NAME = System.getProperty("processing.version", "1295"); static final public String SKETCH_BUNDLE_EXT = ".pdez"; static final public String CONTRIB_BUNDLE_EXT = ".pdex"; @@ -66,9 +72,12 @@ public class Base { * if an empty file named 'debug' is found in the settings folder. * See implementation in createAndShowGUI(). */ - static public boolean DEBUG; + static public boolean DEBUG = Boolean.parseBoolean(System.getenv().getOrDefault("DEBUG", "false")); + - /** True if running via Commander. */ + /** + * is Processing being run from the command line (true) or from the GUI (false)? + */ static private boolean commandLine; /** @@ -121,108 +130,62 @@ public class Base { // https://github.com/processing/processing/pull/2366 private JFileChooser openChooser; - static protected File sketchbookFolder; - - static public void main(final String[] args) { + Messages.log("Starting Processing version" + VERSION_NAME + " revision "+ REVISION); EventQueue.invokeLater(() -> { - try { - createAndShowGUI(args); + run(args); + }); + } - } catch (Throwable t) { - // Windows Defender has been insisting on destroying each new - // release by removing core.jar and other files. Yay! - // https://github.com/processing/processing/issues/5537 - if (Platform.isWindows()) { - String mess = t.getMessage(); - String missing = null; - if (mess.contains("Could not initialize class com.sun.jna.Native")) { - //noinspection SpellCheckingInspection - missing = "jnidispatch.dll"; - } else if (t instanceof NoClassDefFoundError && - mess.contains("processing/core/PApplet")) { - // Had to change how this was called - // https://github.com/processing/processing4/issues/154 - missing = "core.jar"; - } - if (missing != null) { - Messages.showError("Necessary files are missing", - "A file required by Processing (" + missing + ") is missing.\n\n" + - "Make sure that you're not trying to run Processing from inside\n" + - "the .zip file you downloaded, and check that Windows Defender\n" + - "has not removed files from the Processing folder.\n\n" + - "(Defender sometimes flags parts of Processing as malware.\n" + - "It is not, but Microsoft has ignored our pleas for help.)", t); - } + /** + * The main run() method, wrapped in a try/catch to + * provide a graceful error message if something goes wrong. + */ + private static void run(String[] args) { + try { + createAndShowGUI(args); + } catch (Throwable t) { + // Windows Defender has been insisting on destroying each new + // release by removing core.jar and other files. Yay! + // https://github.com/processing/processing/issues/5537 + if (Platform.isWindows()) { + String mess = t.getMessage(); + String missing = null; + if (mess.contains("Could not initialize class com.sun.jna.Native")) { + //noinspection SpellCheckingInspection + missing = "jnidispatch.dll"; + } else if (t instanceof NoClassDefFoundError && + mess.contains("processing/core/PApplet")) { + // Had to change how this was called + // https://github.com/processing/processing4/issues/154 + missing = "core.jar"; + } + if (missing != null) { + Messages.showError("Necessary files are missing", + "A file required by Processing (" + missing + ") is missing.\n\n" + + "Make sure that you're not trying to run Processing from inside\n" + + "the .zip file you downloaded, and check that Windows Defender\n" + + "has not removed files from the Processing folder.\n\n" + + "(Defender sometimes flags parts of Processing as malware.\n" + + "It is not, but Microsoft has ignored our pleas for help.)", t); } - Messages.showTrace("Unknown Problem", - "A serious error happened during startup. Please report:\n" + - "http://github.com/processing/processing/issues/new", t, true); } - }); + Messages.showTrace("Unknown Problem", + "A serious error happened during startup. Please report:\n" + + "http://github.com/processing/processing4/issues/new", t, true); + } } static private void createAndShowGUI(String[] args) { - // these times are fairly negligible relative to Base.
clears to the next line + // second
is a shorter height blank space before the trace + Toolkit.formatMessage("$message
$sw"), + title, + if (fatal) JOptionPane.ERROR_MESSAGE else JOptionPane.WARNING_MESSAGE + ) + + if (fatal) { + System.exit(1) + } + } + } + + @JvmStatic + fun showYesNoQuestion( + editor: Frame?, title: String?, + primary: String?, secondary: String? + ): Int { + if (!Platform.isMacOS()) { + return JOptionPane.showConfirmDialog( + editor, + Toolkit.formatMessage(primary, secondary), //"" + + //"" + primary + "" + + //"
" + secondary, + title, + JOptionPane.YES_NO_OPTION, + JOptionPane.QUESTION_MESSAGE + ) + } else { + val result = showCustomQuestion( + editor, title, primary, secondary, + 0, "Yes", "No" + ) + return if (result == 0) { + JOptionPane.YES_OPTION + } else if (result == 1) { + JOptionPane.NO_OPTION + } else { + JOptionPane.CLOSED_OPTION + } + } + } + + + /** + * @param highlight A valid array index for options[] that specifies the + * default (i.e. safe) choice. + * @return The (zero-based) index of the selected value, -1 otherwise. + */ + @JvmStatic + fun showCustomQuestion( + editor: Frame?, title: String?, + primary: String?, secondary: String?, + highlight: Int, vararg options: String + ): Int { + val result: Any + if (!Platform.isMacOS()) { + return JOptionPane.showOptionDialog( + editor, + Toolkit.formatMessage(primary, secondary), title, + JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, + options, options[highlight] + ) + } else { + val pane = + JOptionPane( + Toolkit.formatMessage(primary, secondary), + JOptionPane.QUESTION_MESSAGE + ) + + pane.options = options + + // highlight the safest option ala apple hig + pane.initialValue = options[highlight] + + val dialog = pane.createDialog(editor, null) + dialog.isVisible = true + + result = pane.value + } + for (i in options.indices) { + if (result != null && result == options[i]) return i + } + return -1 + } + + + // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . + @JvmStatic + @Deprecated("Use log() instead") + fun log(from: Any, message: String) { + if (Base.DEBUG) { + val callingClass = Throwable() + .stackTrace[2] + .className + .formatClassName() + println("$callingClass: $message") + } + } + + @JvmStatic + fun log(message: String?) { + if (Base.DEBUG) { + val callingClass = Throwable() + .stackTrace[2] + .className + .formatClassName() + println("$callingClass$message") + } + } + + @JvmStatic + fun logf(message: String?, vararg args: Any?) { + if (Base.DEBUG) { + val callingClass = Throwable() + .stackTrace[2] + .className + .formatClassName() + System.out.printf("$callingClass$message", *args) + } + } + + @JvmStatic + @JvmOverloads + fun err(message: String?, e: Throwable? = null) { + if (Base.DEBUG) { + if (message != null) { + val callingClass = Throwable() + .stackTrace[4] + .className + .formatClassName() + System.err.println("$callingClass$message") + } + e?.printStackTrace() + } + } + } +} + +@OptIn(ExperimentalComposeUiApi::class) +fun showDialog(title: String, content: @Composable (modifier: Modifier, dismiss: () -> Unit) -> Unit) { + ComposeDialog().apply { + isModal = true + setTitle(title) + size = Dimension(400, 400) + rootPane.putClientProperty("apple.awt.fullWindowContent", true) + rootPane.putClientProperty("apple.awt.transparentTitleBar", true) + rootPane.putClientProperty("apple.awt.windowTitleVisible", false); + + + setContent { + PDETheme { + val density = LocalDensity.current + content(Modifier.onSizeChanged { + size = Dimension((it.width / density.density).toInt(), (it.height / density.density).toInt()) + setLocationRelativeTo(null) + }, ::dispose) + } + } + setLocationRelativeTo(null) + isVisible = true + } +} + +fun main() { + val types = mapOf( + "message" to { Messages.showMessage("Test Title", "This is a test message.") }, + "warning" to { Messages.showWarning("Test Warning", "This is a test warning.", Exception("dfdsfjk")) }, + "trace" to { Messages.showTrace("Test Trace", "This is a test trace.", Exception("Test Exception"), false) }, + "tiered_warning" to { + Messages.showWarningTiered( + "Test Tiered Warning", + "Primary message", + "Secondary message", + null + ) + }, + "yes_no" to { + Messages.showYesNoQuestion( + null, + "Test Yes/No", + "Do you want to continue?", + "Choose yes or no." + ) + }, + "custom_question" to { + Messages.showCustomQuestion( + null, + "Test Custom Question", + "Choose an option:", + "Select one of the options below.", + 1, + "Option 1", + "Option 2", + "Option 3" + ) + }, + "error" to { Messages.showError("Test Error", "This is a test error.", null) }, + ) + Platform.init() + UIManager.setLookAndFeel(FlatLightLaf()) + application { + val state = rememberWindowState( + size = DpSize(500.dp, 300.dp) + ) + Window(state = state, onCloseRequest = ::exitApplication, title = "Test Messages") { + PDETheme { + Column { + for ((type, action) in types) { + Button(onClick = { action() }, modifier = Modifier.padding(8.dp)) { + Text("Show $type dialog") + } + } + } + } + } + + } + +} + +// Helper functions to give the base classes a color +fun String.formatClassName() = this + .replace("processing.", "") + .replace(".", "/") + .padEnd(40) + .colorizePathParts() + +fun String.colorizePathParts() = split("/").joinToString("/") { part -> + "\u001B[${31 + (part.hashCode() and 0x7).rem(6)}m$part\u001B[0m" +} \ No newline at end of file diff --git a/app/src/processing/app/Mode.java b/app/src/processing/app/Mode.java index 29e9ad6d3a..28e5267e82 100644 --- a/app/src/processing/app/Mode.java +++ b/app/src/processing/app/Mode.java @@ -40,6 +40,7 @@ import processing.app.ui.Recent; import processing.app.ui.Toolkit; import processing.core.PApplet; +import processing.utils.SketchException; public abstract class Mode { diff --git a/app/src/processing/app/Platform.java b/app/src/processing/app/Platform.java index d6f472abe5..3372e3f9bc 100644 --- a/app/src/processing/app/Platform.java +++ b/app/src/processing/app/Platform.java @@ -23,6 +23,12 @@ package processing.app; +import com.sun.jna.platform.FileUtils; +import processing.app.platform.DefaultPlatform; +import processing.core.PApplet; +import processing.core.PConstants; +import processing.data.StringDict; + import java.io.File; import java.io.IOException; import java.lang.management.ManagementFactory; @@ -33,15 +39,8 @@ import java.util.List; import java.util.Map; -import com.sun.jna.platform.FileUtils; - -import processing.app.platform.DefaultPlatform; -import processing.core.PApplet; -import processing.core.PConstants; -import processing.data.StringDict; - -public class Platform { +public class Platform extends processing.utils.Platform { static DefaultPlatform inst; /* @@ -86,8 +85,11 @@ static public boolean isAvailable() { return inst != null; } + static { + init(); + } - static public void init() { + static public void init() { try { // Start with DefaultPlatform, but try to upgrade to a known platform final String packageName = DefaultPlatform.class.getPackageName(); @@ -108,6 +110,9 @@ static public void init() { "An unknown error occurred while trying to load\n" + "platform-specific code for your machine.", e); } + + // Fix the issue where `java.home` points to the JRE instead of the JDK. processing/processing4#1163 + System.setProperty("java.home", getJavaHome().getAbsolutePath()); } @@ -131,12 +136,7 @@ static public float getSystemZoom() { } - static public File getSettingsFolder() throws Exception { - return inst.getSettingsFolder(); - } - - - static public File getDefaultSketchbookFolder() throws Exception { + static public File getDefaultSketchbookFolder() throws Exception { return inst.getDefaultSketchbookFolder(); } @@ -298,29 +298,8 @@ static public int getIndex(String platformName) { // the MACOSX constant would instead read as the LINUX constant. - /** - * returns true if Processing is running on a Mac OS X machine. - */ - static public boolean isMacOS() { - return System.getProperty("os.name").contains("Mac"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - - /** - * returns true if running on windows. - */ - static public boolean isWindows() { - return System.getProperty("os.name").contains("Windows"); //$NON-NLS-1$ //$NON-NLS-2$ - } - /** - * true if running on linux. - */ - static public boolean isLinux() { - return System.getProperty("os.name").contains("Linux"); //$NON-NLS-1$ //$NON-NLS-2$ - } - // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . @@ -331,9 +310,18 @@ static public boolean isLinux() { * Get reference to a file adjacent to the executable on Windows and Linux, * or inside Contents/Resources/Java on Mac OS X. This will return the local * JRE location, *whether or not it is the active JRE*. + * @deprecated start using the build in JAR Resources system instead. */ + @Deprecated static public File getContentFile(String name) { if (processingRoot == null) { + var resourcesDir = System.getProperty("compose.application.resources.dir"); + if(resourcesDir != null) { + var directory = new File(resourcesDir); + if(directory.exists()){ + return new File(directory, name); + } + } // Get the path to the .jar file that contains Base.class URL pathURL = Base.class.getProtectionDomain().getCodeSource().getLocation(); @@ -382,8 +370,23 @@ static public File getContentFile(String name) { return new File(processingRoot, name); } - static public File getJavaHome() { + // Get the build in JDK location from the Jetpack Compose resources + var resourcesDir = System.getProperty("compose.application.resources.dir"); + if(resourcesDir != null) { + var jdkFolder = new File(resourcesDir,"jdk"); + if(jdkFolder.exists()){ + return jdkFolder; + } + } + + // If the JDK is set in the environment, use that. + var home = System.getProperty("java.home"); + if(home != null){ + return new File(home); + } + + // Otherwise try to use the Ant embedded JDK. if (Platform.isMacOS()) { //return "Contents/PlugIns/jdk1.7.0_40.jdk/Contents/Home/jre/bin/java"; File[] plugins = getContentFile("../PlugIns").listFiles((dir, name) -> dir.isDirectory() && @@ -394,7 +397,6 @@ static public File getJavaHome() { return getContentFile("java"); } - /** Get the path to the embedded Java executable. */ static public String getJavaPath() { String javaPath = "bin/java" + (Platform.isWindows() ? ".exe" : ""); @@ -558,18 +560,25 @@ static public boolean deleteFile(File file) throws IOException { // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . + /** + * These methods were refactored to use the Preferences system instead of + * actual environment variables, since modifying environment variables at runtime + * proved problematic. This approach provides similar functionality + * while being compatible with various platforms and execution environments. + * + * This abstraction maintains a consistent API for environment-like variable storage + * while implementing it differently under the hood to work around runtime limitations. + */ static public void setenv(String variable, String value) { - inst.setenv(variable, value); + Preferences.set(variable, value); } - static public String getenv(String variable) { - return inst.getenv(variable); + return Preferences.get(variable); } - static public int unsetenv(String variable) { - return inst.unsetenv(variable); + throw new RuntimeException("unsetenv() not yet implemented"); } } diff --git a/app/src/processing/app/Preferences.java b/app/src/processing/app/Preferences.java index 640c77eade..b88e1416da 100644 --- a/app/src/processing/app/Preferences.java +++ b/app/src/processing/app/Preferences.java @@ -21,14 +21,14 @@ package processing.app; -import java.awt.Color; -import java.awt.Font; -import java.awt.SystemColor; -import java.io.*; -import java.util.*; - import processing.app.ui.Toolkit; -import processing.core.*; +import processing.core.PApplet; +import processing.core.PConstants; + +import java.awt.*; +import java.io.*; +import java.util.HashMap; +import java.util.Map; /** @@ -65,9 +65,11 @@ static public void init() { // start by loading the defaults, in case something // important was deleted from the user prefs try { - // Name changed for 2.1b2 to avoid problems with users modifying or - // replacing the file after doing a search for "preferences.txt". - load(Base.getLibStream(DEFAULTS_FILE)); + var defaultsStream = Preferences + .class + .getClassLoader() + .getResourceAsStream(DEFAULTS_FILE); + load(defaultsStream); } catch (Exception e) { Messages.showError(null, "Could not read default settings.\n" + "You'll need to reinstall Processing.", e); @@ -85,8 +87,13 @@ static public void init() { setBoolean("editor.input_method_support", true); } + // next load user preferences file preferencesFile = Base.getSettingsFile(PREFS_FILE); + var preferencesFileOverride = System.getProperty("processing.app.preferences.file"); + if (preferencesFileOverride != null && !preferencesFileOverride.isEmpty()) { + preferencesFile = new File(preferencesFileOverride); + } boolean firstRun = !preferencesFile.exists(); if (!firstRun) { try { @@ -136,6 +143,14 @@ static public void skipInit() { initialized = true; } + /** + * Check whether Preferences.init() has been called. If not, we are probably not running the full application. + * @return true if Preferences has been initialized + */ + static public boolean isInitialized() { + return initialized; + } + static void handleProxy(String protocol, String hostProp, String portProp) { String proxyHost = get("proxy." + protocol + ".host"); @@ -169,9 +184,11 @@ static public void load(InputStream input) throws IOException { String[] lines = PApplet.loadStrings(input); // Reads as UTF-8 for (String line : lines) { - if ((line.length() == 0) || + if ((line.isEmpty()) || (line.charAt(0) == '#')) continue; + line = line.replace("\\", "/"); // normalize slashes in paths + // this won't properly handle = signs being in the text int equals = line.indexOf('='); if (equals != -1) { @@ -273,9 +290,7 @@ static public void save() { static public String get(String attribute /*, String defaultValue */) { if (!initialized) { - throw new RuntimeException( - "Tried reading preferences prior to initialization." - ); + init(); } return table.get(attribute); } @@ -321,7 +336,15 @@ static public void setBoolean(String attribute, boolean value) { static public int getInteger(String attribute /*, int defaultValue*/) { - return Integer.parseInt(get(attribute)); + try { + return Integer.parseInt(get(attribute)); + } catch (NumberFormatException err) { + try { + return Integer.parseInt(getDefault(attribute)); + } catch (NumberFormatException err2) { + throw new IllegalArgumentException("Cannot parse: " + attribute); + } + } } diff --git a/app/src/processing/app/Preferences.kt b/app/src/processing/app/Preferences.kt new file mode 100644 index 0000000000..4e139b08e1 --- /dev/null +++ b/app/src/processing/app/Preferences.kt @@ -0,0 +1,222 @@ +package processing.app + +import androidx.compose.runtime.* +import kotlinx.coroutines.* +import kotlinx.coroutines.flow.debounce +import kotlinx.coroutines.flow.dropWhile +import processing.utils.Settings +import java.io.File +import java.io.InputStream +import java.nio.file.FileSystems +import java.nio.file.Path +import java.nio.file.StandardWatchEventKinds +import java.nio.file.WatchEvent +import java.util.* + +/* + The ReactiveProperties class extends the standard Java Properties class + to provide reactive capabilities using Jetpack Compose's mutableStateMapOf. + This allows UI components to automatically update when preference values change. +*/ +class ReactiveProperties : Properties() { + val snapshotStateMap = mutableStateMapOf
404 Not Found
The requested resource was not found.
"; + exchange.getResponseHeaders().set("Content-Type", "text/html"); + exchange.sendResponseHeaders(404, response.length()); + try (OutputStream os = exchange.getResponseBody()) { + os.write(response.getBytes()); + } + + Messages.log("404 Not Found: " + path); + } + } + } + + /** + * A main() method for testing. + */ + static public void main(String[] args) { + try { + new ReferenceServer(new File(args[0]), 8053); + System.out.println("Server running at http://localhost:8053/"); + } catch (IOException e) { + e.printStackTrace(); + } + } +} \ No newline at end of file diff --git a/app/src/processing/app/Schema.kt b/app/src/processing/app/Schema.kt new file mode 100644 index 0000000000..a02bf1da76 --- /dev/null +++ b/app/src/processing/app/Schema.kt @@ -0,0 +1,171 @@ +package processing.app + +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.Job +import kotlinx.coroutines.launch +import processing.app.ui.Editor +import java.io.File +import java.io.FileOutputStream +import java.net.URI +import java.net.URL +import java.net.URLDecoder +import java.nio.charset.StandardCharsets +import java.util.* + + +class Schema { + companion object{ + private var base: Base? = null + val jobs = mutableListOf- * This function must be static to be used with super() - * in each of the constructors above. - */ - /* - static public final String massage(String msg) { - if (msg.indexOf("java.lang.") == 0) { - //int dot = msg.lastIndexOf('.'); - msg = msg.substring("java.lang.".length()); + public SketchException(String message, int file, int line) { + super(message, file, line); } - return msg; - //return (dot == -1) ? msg : msg.substring(dot+1); - } - */ + public SketchException(String message, int file, int line, int column) { + super(message, file, line, column); + } - public void printStackTrace() { - if (showStackTrace) { - super.printStackTrace(); + public SketchException(String message, int file, int line, int column, boolean showStackTrace) { + super(message, file, line, column, showStackTrace); } - } } diff --git a/app/src/processing/app/UpdateCheck.java b/app/src/processing/app/UpdateCheck.java index 1bcfe70c3e..20c91dd38c 100644 --- a/app/src/processing/app/UpdateCheck.java +++ b/app/src/processing/app/UpdateCheck.java @@ -31,9 +31,11 @@ import javax.swing.JOptionPane; +import processing.app.ui.WelcomeToBeta; import processing.core.PApplet; + /** * Threaded class to check for updates in the background. *
@@ -56,11 +58,14 @@ public class UpdateCheck { private final Base base; - static private final String DOWNLOAD_URL = "https://processing.org/download/"; - static private final String LATEST_URL = "https://processing.org/download/latest.txt"; + static private final String DOWNLOAD_URL = System.getProperty("processing.download.page","https://processing.org/download/"); + static private final String LATEST_URL = System.getProperty("processing.download.latest","https://processing.org/download/latest.txt"); static private final long ONE_DAY = 24 * 60 * 60 * 1000; + public static void doCheck(Base base) { + new UpdateCheck(base); + } public UpdateCheck(Base base) { this.base = base; @@ -111,12 +116,13 @@ public void updateCheck() throws IOException { System.getProperty("os.arch")); int latest = readInt(LATEST_URL + "?" + info); + int revision = Base.getRevision(); String lastString = Preferences.get("update.last"); long now = System.currentTimeMillis(); if (lastString != null) { long when = Long.parseLong(lastString); - if (now - when < ONE_DAY) { + if (now - when < ONE_DAY && !Base.DEBUG) { // don't annoy the shit outta people return; } @@ -124,17 +130,21 @@ public void updateCheck() throws IOException { Preferences.set("update.last", String.valueOf(now)); if (base.activeEditor != null) { -// boolean offerToUpdateContributions = true; - if (latest > Base.getRevision()) { + if (latest > revision) { System.out.println("You are running Processing revision 0" + - Base.getRevision() + ", the latest build is 0" + + revision + ", the latest build is 0" + latest + "."); // Assume the person is busy downloading the latest version // offerToUpdateContributions = !promptToVisitDownloadPage(); promptToVisitDownloadPage(); } + int lastBetaWelcomeSeen = Preferences.getInteger("update.beta_welcome"); + if(latest < revision && revision != lastBetaWelcomeSeen ) { + WelcomeToBeta.showWelcomeToBeta(); + } + /* if (offerToUpdateContributions) { // Wait for xml file to be downloaded and updates to come in. diff --git a/app/src/processing/app/Util.java b/app/src/processing/app/Util.java index 4c94af5fe5..f87a6fdcef 100644 --- a/app/src/processing/app/Util.java +++ b/app/src/processing/app/Util.java @@ -60,16 +60,17 @@ static public int countLines(String what) { */ static public byte[] loadBytesRaw(File file) throws IOException { int size = (int) file.length(); - FileInputStream input = new FileInputStream(file); - byte[] buffer = new byte[size]; - int offset = 0; - int bytesRead; - while ((bytesRead = input.read(buffer, offset, size-offset)) != -1) { - offset += bytesRead; - if (bytesRead == 0) break; - } - input.close(); // weren't properly being closed - return buffer; + byte[] buffer; + try (FileInputStream input = new FileInputStream(file)) { + buffer = new byte[size]; + int offset = 0; + int bytesRead; + while ((bytesRead = input.read(buffer, offset, size - offset)) != -1) { + offset += bytesRead; + if (bytesRead == 0) break; + } + } + return buffer; } @@ -143,7 +144,7 @@ static public StringDict readSettings(String filename, String[] lines, boolean a line = line.substring(0, line.indexOf('#')).trim(); } - if (line.length() != 0 && line.charAt(0) != '#') { + if (!line.isEmpty() && line.charAt(0) != '#') { int equals = line.indexOf('='); if (equals == -1) { if (filename != null) { @@ -161,26 +162,20 @@ static public StringDict readSettings(String filename, String[] lines, boolean a } - static public void copyFile(File sourceFile, - File targetFile) throws IOException { - BufferedInputStream from = - new BufferedInputStream(new FileInputStream(sourceFile)); - BufferedOutputStream to = - new BufferedOutputStream(new FileOutputStream(targetFile)); + static public void copyFile(File sourceFile, File targetFile) throws IOException { + try ( + BufferedInputStream from = new BufferedInputStream(new FileInputStream(sourceFile)); + BufferedOutputStream to = new BufferedOutputStream(new FileOutputStream(targetFile))) { byte[] buffer = new byte[16 * 1024]; int bytesRead; while ((bytesRead = from.read(buffer)) != -1) { to.write(buffer, 0, bytesRead); } - from.close(); - - to.flush(); - to.close(); - //noinspection ResultOfMethodCallIgnored targetFile.setLastModified(sourceFile.lastModified()); //noinspection ResultOfMethodCallIgnored targetFile.setExecutable(sourceFile.canExecute()); + } } @@ -218,13 +213,15 @@ static public void saveFile(String text, File file) throws IOException { file.getAbsolutePath()); } // Could use saveStrings(), but we wouldn't be able to checkError() - PrintWriter writer = PApplet.createWriter(temp); - for (String line : lines) { - writer.println(line); - } - boolean error = writer.checkError(); // calls flush() - writer.close(); // attempt to close regardless - if (error) { + boolean error; + try (PrintWriter writer = PApplet.createWriter(temp)) { + for (String line : lines) { + writer.println(line); + } + // calls flush() + error = writer.checkError(); + } + if (error) { throw new IOException("Error while trying to save " + file); } @@ -589,7 +586,7 @@ static public StringList packageListFromClassPath(String path) { for (String piece : pieces) { //System.out.println("checking piece '" + pieces[i] + "'"); - if (piece.length() != 0) { + if (!piece.isEmpty()) { if (piece.toLowerCase().endsWith(".jar") || piece.toLowerCase().endsWith(".zip")) { //System.out.println("checking " + pieces[i]); @@ -623,8 +620,7 @@ static public StringList packageListFromClassPath(String path) { static private void packageListFromZip(String filename, StringList list) { - try { - ZipFile file = new ZipFile(filename); + try (ZipFile file = new ZipFile(filename);) { Enumeration entries = file.entries(); while (entries.hasMoreElements()) { ZipEntry entry = (ZipEntry) entries.nextElement(); @@ -643,7 +639,6 @@ static private void packageListFromZip(String filename, StringList list) { } } } - file.close(); } catch (IOException e) { System.err.println("Ignoring " + filename + " (" + e.getMessage() + ")"); //e.printStackTrace(); @@ -688,9 +683,7 @@ static private void packageListFromFolder(File dir, String sofar, * Ignores (does not extract) any __MACOSX files from macOS archives. */ static public void unzip(File zipFile, File dest) throws IOException { - FileInputStream fis = new FileInputStream(zipFile); - CheckedInputStream checksum = new CheckedInputStream(fis, new Adler32()); - ZipInputStream zis = new ZipInputStream(new BufferedInputStream(checksum)); + try (ZipInputStream zis = new ZipInputStream( new BufferedInputStream( new CheckedInputStream( new FileInputStream(zipFile), new Adler32())))) { ZipEntry entry; while ((entry = zis.getNextEntry()) != null) { final String name = entry.getName(); @@ -710,25 +703,26 @@ static public void unzip(File zipFile, File dest) throws IOException { } } } + } static protected void unzipEntry(ZipInputStream zin, File f) throws IOException { - FileOutputStream out = new FileOutputStream(f); - byte[] b = new byte[512]; - int len; - while ((len = zin.read(b)) != -1) { - out.write(b, 0, len); - } - out.flush(); - out.close(); + try (FileOutputStream out = new FileOutputStream(f)) { + byte[] b = new byte[512]; + int len; + while ((len = zin.read(b)) != -1) { + out.write(b, 0, len); + } + out.flush(); + } } static public byte[] gzipEncode(byte[] what) throws IOException { ByteArrayOutputStream baos = new ByteArrayOutputStream(); - GZIPOutputStream output = new GZIPOutputStream(baos); - PApplet.saveStream(output, new ByteArrayInputStream(what)); - output.close(); + try (GZIPOutputStream output = new GZIPOutputStream(baos);) { + PApplet.saveStream(output, new ByteArrayInputStream(what)); + } return baos.toByteArray(); } diff --git a/app/src/processing/app/WebServer.java b/app/src/processing/app/WebServer.java deleted file mode 100644 index bd13f59b40..0000000000 --- a/app/src/processing/app/WebServer.java +++ /dev/null @@ -1,335 +0,0 @@ -package processing.app; - -import java.io.*; -import java.net.*; -import java.util.*; -import java.util.concurrent.ConcurrentHashMap; -import java.util.zip.*; - - -/** - * This code is placed here in anticipation of running the reference from an - * internal web server that reads the docs from a zip file, instead of using - * thousands of .html files on the disk, which is really inefficient. - * - * This is a very simple, multi-threaded HTTP server, originally based on - * this article on java.sun.com. - */ -public class WebServer { - static final int HTTP_OK = 200; - static final int HTTP_NOT_FOUND = 404; - static final int HTTP_BAD_METHOD = 405; - - /** where worker threads stand idle */ - private final Vector404 Not Found
"); - ps.print("The requested resource was not found."); - ps.write(EOL); - ps.write(EOL); - } - - void sendFile(InputStream is, PrintStream ps) throws IOException { - try (is) { - int n; - while ((n = is.read(buffer)) > 0) { - ps.write(buffer, 0, n); - } - } - } - } - - - /** mapping of file extensions to content-types */ - static final Map- * cd app - * ant - * open http://localhost:8053/reference/index.html - * java -cp pde.jar processing.app.WebServer ../java/reference.zip - *- */ - static public void main(String[] args) { - try { - new WebServer(new File(args[0]), 8053); - } catch (IOException e) { - e.printStackTrace(); - } - } -} - - - diff --git a/app/src/processing/app/api/Contributions.kt b/app/src/processing/app/api/Contributions.kt new file mode 100644 index 0000000000..7b35a30593 --- /dev/null +++ b/app/src/processing/app/api/Contributions.kt @@ -0,0 +1,156 @@ +package processing.app.api + +import com.github.ajalt.clikt.command.SuspendingCliktCommand +import com.github.ajalt.clikt.core.Context +import com.github.ajalt.clikt.core.subcommands +import kotlinx.serialization.encodeToString +import kotlinx.serialization.json.Json +import processing.app.Platform +import processing.app.api.Sketch.Companion.getSketches +import java.io.File + +class Contributions: SuspendingCliktCommand(){ + override fun help(context: Context) = "Manage Processing contributions" + override suspend fun run() { + System.setProperty("java.awt.headless", "true") + } + init { + subcommands(Examples()) + } + + class Examples: SuspendingCliktCommand("examples") { + override fun help(context: Context) = "Manage Processing examples" + override suspend fun run() { + } + init { + subcommands(ExamplesList()) + } + } + + class ExamplesList: SuspendingCliktCommand("list") { + val serializer = Json { + prettyPrint = true + } + + override fun help(context: Context) = "List all examples" + override suspend fun run() { + Platform.init() + + val json = serializer.encodeToString(listAllExamples()) + println(json) + } + + companion object { + /** + * Get all example sketch folders + * @return List of example sketch folders + */ + fun listAllExamples(): List
+ This utility will install the processing command line interface,
+ which is capable of building and running
+ sketches from the command line.
+
+ Click “Yes” to install it for all users
+ (an administrator password is required).
+
+ or “No” to place the program in your home directory.
+
+ If you rename or move Processing.app,
+ you'll need to reinstall the tool.
+
" + secondary + "
", - "Commander", + JOptionPane.showConfirmDialog(editor, messageHtml, + "Processing CLI", JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); @@ -86,30 +90,41 @@ public void run() { PrintWriter writer = PApplet.createWriter(file); writer.print("#!/bin/sh\n\n"); - writer.print("# Prevents processing-java from stealing focus, see:\n" + - "# https://github.com/processing/processing/issues/3996.\n" + - "OPTION_FOR_HEADLESS_RUN=\"\"\n" + - "for ARG in \"$@\"\n" + - "do\n" + - " if [ \"$ARG\" = \"--build\" ]; then\n" + - " OPTION_FOR_HEADLESS_RUN=\"-Djava.awt.headless=true\"\n" + - " fi\n" + - "done\n\n"); - - String javaRoot = Platform.getContentFile(".").getCanonicalPath(); - - StringList jarList = new StringList(); - addJarList(jarList, new File(javaRoot)); - addJarList(jarList, new File(javaRoot, "core/library")); - addJarList(jarList, new File(javaRoot, "modes/java/mode")); - String classPath = jarList.join(":").replaceAll(javaRoot + "\\/?", ""); - - writer.println("cd \"" + javaRoot + "\" && " + - Platform.getJavaPath().replaceAll(" ", "\\\\ ") + - " -Djna.nosys=true" + - " $OPTION_FOR_HEADLESS_RUN" + - " -cp \"" + classPath + "\"" + - " processing.mode.java.Commander \"$@\""); + var resourcesDir = System.getProperty("compose.application.resources.dir"); + if(resourcesDir != null) { + // Gradle based distributable + var appBinary = (resourcesDir + .split("\\.app")[0] + ".app/Contents/MacOS/Processing") + .replaceAll(" ", "\\\\ "); + writer.print(appBinary + " $@"); + + } else { + // Ant based distributable + writer.print("# Prevents processing-java from stealing focus, see:\n" + + "# https://github.com/processing/processing/issues/3996.\n" + + "OPTION_FOR_HEADLESS_RUN=\"\"\n" + + "for ARG in \"$@\"\n" + + "do\n" + + " if [ \"$ARG\" = \"--build\" ]; then\n" + + " OPTION_FOR_HEADLESS_RUN=\"-Djava.awt.headless=true\"\n" + + " fi\n" + + "done\n\n"); + + String javaRoot = Platform.getContentFile(".").getCanonicalPath(); + + StringList jarList = new StringList(); + addJarList(jarList, new File(javaRoot)); + addJarList(jarList, new File(javaRoot, "core/library")); + addJarList(jarList, new File(javaRoot, "modes/java/mode")); + String classPath = jarList.join(":").replaceAll(javaRoot + "\\/?", ""); + + writer.println("cd \"" + javaRoot + "\" && " + + Platform.getJavaPath().replaceAll(" ", "\\\\ ") + + " -Djna.nosys=true" + + " $OPTION_FOR_HEADLESS_RUN" + + " -cp \"" + classPath + "\"" + + " processing.mode.java.Commander \"$@\""); + } writer.flush(); writer.close(); file.setExecutable(true); @@ -119,7 +134,7 @@ public void run() { // Moving to /usr/local/bin instead of /usr/bin for compatibility // with OS X 10.11 and its "System Integrity Protection" // https://github.com/processing/processing/issues/3497 - String targetPath = "/usr/local/bin/processing-java"; + String targetPath = "/usr/local/bin/processing"; // Remove the old version in case it exists // https://github.com/processing/processing/issues/3786 String oldPath = "/usr/bin/processing-java"; @@ -128,14 +143,14 @@ public void run() { " && /bin/mv " + sourcePath + " " + targetPath; String appleScript = "do shell script \"" + shellScript + "\" with administrator privileges"; - PApplet.exec(new String[] { "osascript", "-e", appleScript }); + PApplet.exec("osascript", "-e", appleScript); } else if (result == JOptionPane.NO_OPTION) { - File targetFile = new File(System.getProperty("user.home"), "processing-java"); + File targetFile = new File(System.getProperty("user.home"), "processing"); String targetPath = targetFile.getAbsolutePath(); if (targetFile.exists()) { Messages.showWarning("File Already Exists", - "The processing-java program already exists at:\n" + + "The processing program already exists at:\n" + targetPath + "\n" + "Please remove it and try again."); } else { @@ -157,8 +172,10 @@ public boolean accept(File dir, String name) { return name.toLowerCase().endsWith(".jar") && !name.startsWith("."); } }); - for (File jar : jars) { - list.append(jar.getAbsolutePath()); + if (jars != null) { + for (File jar : jars) { + list.append(jar.getAbsolutePath()); + } } } } diff --git a/app/src/processing/app/ui/Editor.java b/app/src/processing/app/ui/Editor.java index b9761aa79e..52650ad659 100644 --- a/app/src/processing/app/ui/Editor.java +++ b/app/src/processing/app/ui/Editor.java @@ -23,53 +23,42 @@ package processing.app.ui; -import java.awt.BorderLayout; -import java.awt.Component; -import java.awt.Dimension; -import java.awt.EventQueue; -import java.awt.Font; -import java.awt.Frame; -import java.awt.Point; -import java.awt.datatransfer.*; -import java.awt.event.*; -import java.awt.print.*; -import java.io.*; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.Stack; -import java.util.Timer; -import java.util.TimerTask; -import java.util.stream.Collectors; - -import javax.swing.*; -import javax.swing.border.EmptyBorder; -import javax.swing.event.*; -import javax.swing.plaf.basic.*; -import javax.swing.text.*; -import javax.swing.text.html.*; -import javax.swing.undo.*; - -import processing.app.Base; +import com.formdev.flatlaf.util.SystemInfo; +import processing.app.*; import processing.app.Formatter; -import processing.app.Language; -import processing.app.Messages; -import processing.app.Mode; -import processing.app.Platform; -import processing.app.Preferences; -import processing.app.Problem; -import processing.app.RunnerListener; -import processing.app.Sketch; -import processing.app.SketchCode; -import processing.app.SketchException; import processing.app.contrib.ContributionManager; import processing.app.laf.PdeMenuItemUI; import processing.app.syntax.*; -import processing.core.*; +import processing.core.PApplet; +import processing.utils.SketchException; + +import javax.swing.*; +import javax.swing.border.EmptyBorder; +import javax.swing.event.*; +import javax.swing.plaf.basic.BasicSplitPaneDivider; +import javax.swing.plaf.basic.BasicSplitPaneUI; +import javax.swing.text.BadLocationException; +import javax.swing.text.Element; +import javax.swing.text.View; +import javax.swing.text.ViewFactory; +import javax.swing.text.html.HTMLEditorKit; +import javax.swing.undo.CannotRedoException; +import javax.swing.undo.CannotUndoException; +import javax.swing.undo.CompoundEdit; +import javax.swing.undo.UndoManager; +import java.awt.*; +import java.awt.datatransfer.DataFlavor; +import java.awt.datatransfer.Transferable; +import java.awt.event.*; +import java.awt.print.PageFormat; +import java.awt.print.PrinterException; +import java.awt.print.PrinterJob; +import java.io.File; +import java.io.IOException; +import java.util.*; +import java.util.List; +import java.util.Timer; +import java.util.stream.Collectors; /** @@ -104,6 +93,7 @@ public abstract class Editor extends JFrame implements RunnerListener { private JMenu fileMenu; private JMenu sketchMenu; + protected JPanel spacer = new JPanel(); protected EditorHeader header; protected EditorToolbar toolbar; protected JEditTextArea textarea; @@ -150,6 +140,7 @@ public abstract class Editor extends JFrame implements RunnerListener { private FindReplace find; JMenu toolsMenu; JMenu modePopup; + JMenu developMenu; protected ListIf {@code moveUp} is true, the selected lines are moved up. If false, they move down.
+ *This method ensures proper selection updates and handles edge cases like moving + * the first or last line.
+ *This operation is undo/redoable, allowing the user to revert the action using + * {@code Ctrl/Cmd + Z} (Undo). Redo functionality is available through the + * keybinding {@code Ctrl/Cmd + Z} on Windows/Linux and {@code Shift + Cmd + Z} on macOS.
+ * + * @param moveUp {@code true} to move the selection up, {@code false} to move it down. + */ + public void handleMoveLines(boolean moveUp) { + startCompoundEdit(); + boolean isSelected = false; + + if (textarea.isSelectionActive()) + isSelected = true; + + int caretPos = textarea.getCaretPosition(); + int currentLine = textarea.getCaretLine(); + int lineStart = textarea.getLineStartOffset(currentLine); + int column = caretPos - lineStart; + + int startLine = textarea.getSelectionStartLine(); + int stopLine = textarea.getSelectionStopLine(); + + // Adjust selection if the last line isn't fully selected + if (startLine != stopLine && + textarea.getSelectionStop() == textarea.getLineStartOffset(stopLine)) { + stopLine--; + } + + int replacedLine = moveUp ? startLine - 1 : stopLine + 1; + if (replacedLine < 0 || replacedLine >= textarea.getLineCount()) { + stopCompoundEdit(); + return; + } + + final String source = textarea.getText(); // Get full text from textarea + + int replaceStart = textarea.getLineStartOffset(replacedLine); + int replaceEnd = textarea.getLineStopOffset(replacedLine); + if (replaceEnd > source.length()) { + replaceEnd = source.length(); + } + + int selectionStart = textarea.getLineStartOffset(startLine); + int selectionEnd = textarea.getLineStopOffset(stopLine); + if (selectionEnd > source.length()) { + selectionEnd = source.length(); + } + + String replacedText = source.substring(replaceStart, replaceEnd); + String selectedText = source.substring(selectionStart, selectionEnd); + + if (replacedLine == textarea.getLineCount() - 1) { + replacedText += "\n"; + selectedText = selectedText.substring(0, Math.max(0, selectedText.length() - 1)); + } else if (stopLine == textarea.getLineCount() - 1) { + selectedText += "\n"; + replacedText = replacedText.substring(0, Math.max(0, replacedText.length() - 1)); + } + + int newSelectionStart, newSelectionEnd; + if (moveUp) { + textarea.select(selectionStart, selectionEnd); + textarea.setSelectedText(replacedText); // Use setSelectedText() + + textarea.select(replaceStart, replaceEnd); + textarea.setSelectedText(selectedText); + + newSelectionStart = textarea.getLineStartOffset(startLine - 1); + newSelectionEnd = textarea.getLineStopOffset(stopLine - 1); + } else { + textarea.select(replaceStart, replaceEnd); + textarea.setSelectedText(selectedText); + + textarea.select(selectionStart, selectionEnd); + textarea.setSelectedText(replacedText); + + newSelectionStart = textarea.getLineStartOffset(startLine + 1); + newSelectionEnd = stopLine + 1 < textarea.getLineCount() + ? Math.min(textarea.getLineStopOffset(stopLine + 1), source.length()) + : textarea.getLineStopOffset(stopLine); // Prevent out-of-bounds + } + stopCompoundEdit(); + + if (isSelected) + SwingUtilities.invokeLater(() -> { + textarea.select(newSelectionStart, newSelectionEnd-1); + }); + else if (replacedLine >= 0 && replacedLine < textarea.getLineCount()) { + int replacedLineStart = textarea.getLineStartOffset(replacedLine); + int replacedLineEnd = textarea.getLineStopOffset(replacedLine); + + // Ensure caret stays within bounds of the new line + int newCaretPos = Math.min(replacedLineStart + column, replacedLineEnd - 1); + + SwingUtilities.invokeLater(() -> textarea.setCaretPosition(newCaretPos)); + } +} + static public boolean checkParen(char[] array, int index, int stop) { while (index < stop) { @@ -2103,7 +2317,7 @@ protected void handleOpenInternal(String path) throws EditorException { * something like "sketch_070752a - Processing 0126" */ public void updateTitle() { - setTitle(sketch.getName() + " | Processing " + Base.getVersionName()); + setTitle(sketch.getName()); if (!sketch.isUntitled()) { // Set current file for macOS so that cmd-click in title bar works. @@ -2285,8 +2499,10 @@ public void prepareRun() { internalCloseRunner(); statusEmpty(); - // do this to advance/clear the terminal window / dos prompt / etc - for (int i = 0; i < 10; i++) System.out.println(); + // Do this to advance/clear the terminal window / dos prompt / etc. + // This may be useful especially when 'console.auto_clear' is false. + int headPadding = Preferences.getInteger("console.head_padding"); + for (int i = 0; i < headPadding; i++) console.message("\n", false); // clear the console on each run, unless the user doesn't want to if (Preferences.getBoolean("console.auto_clear")) { @@ -2490,7 +2706,7 @@ public int getStatusMode() { * Clear the status area. */ public void statusEmpty() { - statusNotice(EMPTY); + status.empty(); } @@ -2556,9 +2772,20 @@ public void updateErrorTable(List
+ * This function must be static to be used with super()
+ * in each of the constructors above.
+ */
+ /*
+ static public final String massage(String msg) {
+ if (msg.indexOf("java.lang.") == 0) {
+ //int dot = msg.lastIndexOf('.');
+ msg = msg.substring("java.lang.".length());
+ }
+ return msg;
+ //return (dot == -1) ? msg : msg.substring(dot+1);
+ }
+ */
+
+
+ public void printStackTrace() {
+ if (showStackTrace) {
+ super.printStackTrace();
+ }
+ }
+}
diff --git a/app/utils/src/test/java/SettingsTest.java b/app/utils/src/test/java/SettingsTest.java
new file mode 100644
index 0000000000..c03fb6732d
--- /dev/null
+++ b/app/utils/src/test/java/SettingsTest.java
@@ -0,0 +1,40 @@
+import org.junit.jupiter.api.Test;
+import processing.utils.Settings;
+
+import java.io.IOException;
+import java.nio.file.Files;
+
+public class SettingsTest {
+
+ /**
+ * Requesting the settings folder should create it if it doesn't exist
+ */
+ @Test
+ public void testSettingsFolder() {
+ try {
+ var folder = Settings.getFolder();
+ assert (folder.exists());
+ } catch (Settings.SettingsFolderException e) {
+ assert (false);
+ }
+ }
+
+ /**
+ * Overriding the settings folder via system property should work
+ */
+ @Test
+ public void testOverrideFolder() throws IOException {
+ var settings = Files.createTempDirectory("settings_test");
+ System.setProperty("processing.settings.folder", settings.toString());
+
+ try {
+ var folder = Settings.getFolder();
+ assert (folder.toPath().toString().equals(settings.toString()));
+ } catch (Settings.SettingsFolderException e) {
+ assert (false);
+ } finally {
+ System.clearProperty("processing.settings.folder");
+ Files.deleteIfExists(settings);
+ }
+ }
+}
diff --git a/app/windows/LICENSE.rtf b/app/windows/LICENSE.rtf
new file mode 100644
index 0000000000..5f882b67e9
--- /dev/null
+++ b/app/windows/LICENSE.rtf
@@ -0,0 +1,1055 @@
+{\rtf1\ansi\deff0{\fonttbl{\f0 \fswiss Helvetica;}{\f1 \fmodern Courier;}}
+{\colortbl;\red255\green0\blue0;\red0\green0\blue255;}
+\widowctrl\hyphauto
+
+{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel0 \b \fs36 Introduction\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 We use GPL v2 for the parts of the project that we\u8217've developed ourselves. For the \u8216'core\u8217' library, it\u8217's LGPL, for everything else, it\u8217's GPL.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 Over the course of many years of development, files being moved around, and other code being added and removed, the license information has become quite a mess. Please help us clean this up so that others are properly credited and licenses are consistently/correctly noted: https://github.com/processing/processing/issues/224\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel1 \b \fs32 GNU GPL License\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 License for processing outside of core:\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \f1 \line
+ GNU GENERAL PUBLIC LICENSE\line
+ Version 2, June 1991\line
+\line
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.\line
+59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\line
+Everyone is permitted to copy and distribute verbatim copies\line
+of this license document, but changing it is not allowed.\line
+\line
+ Preamble\line
+\line
+ The licenses for most software are designed to take away your\line
+freedom to share and change it. By contrast, the GNU General Public\line
+License is intended to guarantee your freedom to share and change free\line
+software--to make sure the software is free for all its users. This\line
+General Public License applies to most of the Free Software\line
+Foundation's software and to any other program whose authors commit to\line
+using it. (Some other Free Software Foundation software is covered by\line
+the GNU Library General Public License instead.) You can apply it to\line
+your programs, too.\line
+\line
+ When we speak of free software, we are referring to freedom, not\line
+price. Our General Public Licenses are designed to make sure that you\line
+have the freedom to distribute copies of free software (and charge for\line
+this service if you wish), that you receive source code or can get it\line
+if you want it, that you can change the software or use pieces of it\line
+in new free programs; and that you know you can do these things.\line
+\line
+ To protect your rights, we need to make restrictions that forbid\line
+anyone to deny you these rights or to ask you to surrender the rights.\line
+These restrictions translate to certain responsibilities for you if you\line
+distribute copies of the software, or if you modify it.\line
+\line
+ For example, if you distribute copies of such a program, whether\line
+gratis or for a fee, you must give the recipients all the rights that\line
+you have. You must make sure that they, too, receive or can get the\line
+source code. And you must show them these terms so they know their\line
+rights.\line
+\line
+ We protect your rights with two steps: (1) copyright the software, and\line
+(2) offer you this license which gives you legal permission to copy,\line
+distribute and/or modify the software.\line
+\line
+ Also, for each author's protection and ours, we want to make certain\line
+that everyone understands that there is no warranty for this free\line
+software. If the software is modified by someone else and passed on, we\line
+want its recipients to know that what they have is not the original, so\line
+that any problems introduced by others will not reflect on the original\line
+authors' reputations.\line
+\line
+ Finally, any free program is threatened constantly by software\line
+patents. We wish to avoid the danger that redistributors of a free\line
+program will individually obtain patent licenses, in effect making the\line
+program proprietary. To prevent this, we have made it clear that any\line
+patent must be licensed for everyone's free use or not licensed at all.\line
+\line
+ The precise terms and conditions for copying, distribution and\line
+modification follow.\line
+\line
+ GNU GENERAL PUBLIC LICENSE\line
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\line
+\line
+ 0. This License applies to any program or other work which contains\line
+a notice placed by the copyright holder saying it may be distributed\line
+under the terms of this General Public License. The "Program", below,\line
+refers to any such program or work, and a "work based on the Program"\line
+means either the Program or any derivative work under copyright law:\line
+that is to say, a work containing the Program or a portion of it,\line
+either verbatim or with modifications and/or translated into another\line
+language. (Hereinafter, translation is included without limitation in\line
+the term "modification".) Each licensee is addressed as "you".\line
+\line
+Activities other than copying, distribution and modification are not\line
+covered by this License; they are outside its scope. The act of\line
+running the Program is not restricted, and the output from the Program\line
+is covered only if its contents constitute a work based on the\line
+Program (independent of having been made by running the Program).\line
+Whether that is true depends on what the Program does.\line
+\line
+ 1. You may copy and distribute verbatim copies of the Program's\line
+source code as you receive it, in any medium, provided that you\line
+conspicuously and appropriately publish on each copy an appropriate\line
+copyright notice and disclaimer of warranty; keep intact all the\line
+notices that refer to this License and to the absence of any warranty;\line
+and give any other recipients of the Program a copy of this License\line
+along with the Program.\line
+\line
+You may charge a fee for the physical act of transferring a copy, and\line
+you may at your option offer warranty protection in exchange for a fee.\line
+\line
+ 2. You may modify your copy or copies of the Program or any portion\line
+of it, thus forming a work based on the Program, and copy and\line
+distribute such modifications or work under the terms of Section 1\line
+above, provided that you also meet all of these conditions:\line
+\line
+ a) You must cause the modified files to carry prominent notices\line
+ stating that you changed the files and the date of any change.\line
+\line
+ b) You must cause any work that you distribute or publish, that in\line
+ whole or in part contains or is derived from the Program or any\line
+ part thereof, to be licensed as a whole at no charge to all third\line
+ parties under the terms of this License.\line
+\line
+ c) If the modified program normally reads commands interactively\line
+ when run, you must cause it, when started running for such\line
+ interactive use in the most ordinary way, to print or display an\line
+ announcement including an appropriate copyright notice and a\line
+ notice that there is no warranty (or else, saying that you provide\line
+ a warranty) and that users may redistribute the program under\line
+ these conditions, and telling the user how to view a copy of this\line
+ License. (Exception: if the Program itself is interactive but\line
+ does not normally print such an announcement, your work based on\line
+ the Program is not required to print an announcement.)\line
+\line
+These requirements apply to the modified work as a whole. If\line
+identifiable sections of that work are not derived from the Program,\line
+and can be reasonably considered independent and separate works in\line
+themselves, then this License, and its terms, do not apply to those\line
+sections when you distribute them as separate works. But when you\line
+distribute the same sections as part of a whole which is a work based\line
+on the Program, the distribution of the whole must be on the terms of\line
+this License, whose permissions for other licensees extend to the\line
+entire whole, and thus to each and every part regardless of who wrote it.\line
+\line
+Thus, it is not the intent of this section to claim rights or contest\line
+your rights to work written entirely by you; rather, the intent is to\line
+exercise the right to control the distribution of derivative or\line
+collective works based on the Program.\line
+\line
+In addition, mere aggregation of another work not based on the Program\line
+with the Program (or with a work based on the Program) on a volume of\line
+a storage or distribution medium does not bring the other work under\line
+the scope of this License.\line
+\line
+ 3. You may copy and distribute the Program (or a work based on it,\line
+under Section 2) in object code or executable form under the terms of\line
+Sections 1 and 2 above provided that you also do one of the following:\line
+\line
+ a) Accompany it with the complete corresponding machine-readable\line
+ source code, which must be distributed under the terms of Sections\line
+ 1 and 2 above on a medium customarily used for software interchange; or,\line
+\line
+ b) Accompany it with a written offer, valid for at least three\line
+ years, to give any third party, for a charge no more than your\line
+ cost of physically performing source distribution, a complete\line
+ machine-readable copy of the corresponding source code, to be\line
+ distributed under the terms of Sections 1 and 2 above on a medium\line
+ customarily used for software interchange; or,\line
+\line
+ c) Accompany it with the information you received as to the offer\line
+ to distribute corresponding source code. (This alternative is\line
+ allowed only for noncommercial distribution and only if you\line
+ received the program in object code or executable form with such\line
+ an offer, in accord with Subsection b above.)\line
+\line
+The source code for a work means the preferred form of the work for\line
+making modifications to it. For an executable work, complete source\line
+code means all the source code for all modules it contains, plus any\line
+associated interface definition files, plus the scripts used to\line
+control compilation and installation of the executable. However, as a\line
+special exception, the source code distributed need not include\line
+anything that is normally distributed (in either source or binary\line
+form) with the major components (compiler, kernel, and so on) of the\line
+operating system on which the executable runs, unless that component\line
+itself accompanies the executable.\line
+\line
+If distribution of executable or object code is made by offering\line
+access to copy from a designated place, then offering equivalent\line
+access to copy the source code from the same place counts as\line
+distribution of the source code, even though third parties are not\line
+compelled to copy the source along with the object code.\line
+\line
+ 4. You may not copy, modify, sublicense, or distribute the Program\line
+except as expressly provided under this License. Any attempt\line
+otherwise to copy, modify, sublicense or distribute the Program is\line
+void, and will automatically terminate your rights under this License.\line
+However, parties who have received copies, or rights, from you under\line
+this License will not have their licenses terminated so long as such\line
+parties remain in full compliance.\line
+\line
+ 5. You are not required to accept this License, since you have not\line
+signed it. However, nothing else grants you permission to modify or\line
+distribute the Program or its derivative works. These actions are\line
+prohibited by law if you do not accept this License. Therefore, by\line
+modifying or distributing the Program (or any work based on the\line
+Program), you indicate your acceptance of this License to do so, and\line
+all its terms and conditions for copying, distributing or modifying\line
+the Program or works based on it.\line
+\line
+ 6. Each time you redistribute the Program (or any work based on the\line
+Program), the recipient automatically receives a license from the\line
+original licensor to copy, distribute or modify the Program subject to\line
+these terms and conditions. You may not impose any further\line
+restrictions on the recipients' exercise of the rights granted herein.\line
+You are not responsible for enforcing compliance by third parties to\line
+this License.\line
+\line
+ 7. If, as a consequence of a court judgment or allegation of patent\line
+infringement or for any other reason (not limited to patent issues),\line
+conditions are imposed on you (whether by court order, agreement or\line
+otherwise) that contradict the conditions of this License, they do not\line
+excuse you from the conditions of this License. If you cannot\line
+distribute so as to satisfy simultaneously your obligations under this\line
+License and any other pertinent obligations, then as a consequence you\line
+may not distribute the Program at all. For example, if a patent\line
+license would not permit royalty-free redistribution of the Program by\line
+all those who receive copies directly or indirectly through you, then\line
+the only way you could satisfy both it and this License would be to\line
+refrain entirely from distribution of the Program.\line
+\line
+If any portion of this section is held invalid or unenforceable under\line
+any particular circumstance, the balance of the section is intended to\line
+apply and the section as a whole is intended to apply in other\line
+circumstances.\line
+\line
+It is not the purpose of this section to induce you to infringe any\line
+patents or other property right claims or to contest validity of any\line
+such claims; this section has the sole purpose of protecting the\line
+integrity of the free software distribution system, which is\line
+implemented by public license practices. Many people have made\line
+generous contributions to the wide range of software distributed\line
+through that system in reliance on consistent application of that\line
+system; it is up to the author/donor to decide if he or she is willing\line
+to distribute software through any other system and a licensee cannot\line
+impose that choice.\line
+\line
+This section is intended to make thoroughly clear what is believed to\line
+be a consequence of the rest of this License.\line
+\line
+ 8. If the distribution and/or use of the Program is restricted in\line
+certain countries either by patents or by copyrighted interfaces, the\line
+original copyright holder who places the Program under this License\line
+may add an explicit geographical distribution limitation excluding\line
+those countries, so that distribution is permitted only in or among\line
+countries not thus excluded. In such case, this License incorporates\line
+the limitation as if written in the body of this License.\line
+\line
+ 9. The Free Software Foundation may publish revised and/or new versions\line
+of the General Public License from time to time. Such new versions will\line
+be similar in spirit to the present version, but may differ in detail to\line
+address new problems or concerns.\line
+\line
+Each version is given a distinguishing version number. If the Program\line
+specifies a version number of this License which applies to it and "any\line
+later version", you have the option of following the terms and conditions\line
+either of that version or of any later version published by the Free\line
+Software Foundation. If the Program does not specify a version number of\line
+this License, you may choose any version ever published by the Free Software\line
+Foundation.\line
+\line
+ 10. If you wish to incorporate parts of the Program into other free\line
+programs whose distribution conditions are different, write to the author\line
+to ask for permission. For software which is copyrighted by the Free\line
+Software Foundation, write to the Free Software Foundation; we sometimes\line
+make exceptions for this. Our decision will be guided by the two goals\line
+of preserving the free status of all derivatives of our free software and\line
+of promoting the sharing and reuse of software generally.\line
+\line
+ NO WARRANTY\line
+\line
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY\line
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN\line
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES\line
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED\line
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\line
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS\line
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE\line
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,\line
+REPAIR OR CORRECTION.\line
+\line
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\line
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR\line
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,\line
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING\line
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED\line
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY\line
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER\line
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE\line
+POSSIBILITY OF SUCH DAMAGES.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel1 \b \fs32 GNU LGPL License\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 License for core:\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \f1 GNU LESSER GENERAL PUBLIC LICENSE\line
+ Version 2.1, February 1999\line
+\line
+Copyright (C) 1991, 1999 Free Software Foundation, Inc.\line
+59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\line
+Everyone is permitted to copy and distribute verbatim copies\line
+of this license document, but changing it is not allowed.\line
+\line
+[ This is the first released version of the Lesser GPL. \line
+It also counts as the successor of the GNU Library Public\line
+License, version 2, hence the version number 2.1. ]\line
+\line
+ Preamble\line
+\line
+The licenses for most software are designed to take away your\line
+freedom to share and change it. By contrast, the GNU General Public\line
+Licenses are intended to guarantee your freedom to share and change\line
+free software--to make sure the software is free for all its users.\line
+\line
+This license, the Lesser General Public License, applies to some\line
+specially designated software packages--typically libraries--of the\line
+Free Software Foundation and other authors who decide to use it. You\line
+can use it too, but we suggest you first think carefully about whether\line
+this license or the ordinary General Public License is the better\line
+strategy to use in any particular case, based on the explanations below.\line
+\line
+When we speak of free software, we are referring to freedom of use,\line
+not price. Our General Public Licenses are designed to make sure that\line
+you have the freedom to distribute copies of free software (and charge\line
+for this service if you wish); that you receive source code or can get\line
+it if you want it; that you can change the software and use pieces of\line
+it in new free programs; and that you are informed that you can do\line
+these things.\line
+\line
+To protect your rights, we need to make restrictions that forbid\line
+distributors to deny you these rights or to ask you to surrender these\line
+rights. These restrictions translate to certain responsibilities for\line
+you if you distribute copies of the library or if you modify it.\line
+\line
+For example, if you distribute copies of the library, whether gratis\line
+or for a fee, you must give the recipients all the rights that we gave\line
+you. You must make sure that they, too, receive or can get the source\line
+code. If you link other code with the library, you must provide\line
+complete object files to the recipients, so that they can relink them\line
+with the library after making changes to the library and recompiling\line
+it. And you must show them these terms so they know their rights.\line
+\line
+We protect your rights with a two-step method: (1) we copyright the\line
+library, and (2) we offer you this license, which gives you legal\line
+permission to copy, distribute and/or modify the library.\line
+\line
+To protect each distributor, we want to make it very clear that\line
+there is no warranty for the free library. Also, if the library is\line
+modified by someone else and passed on, the recipients should know\line
+that what they have is not the original version, so that the original\line
+author's reputation will not be affected by problems that might be\line
+introduced by others.\line
+\line
+Finally, software patents pose a constant threat to the existence of\line
+any free program. We wish to make sure that a company cannot\line
+effectively restrict the users of a free program by obtaining a\line
+restrictive license from a patent holder. Therefore, we insist that\line
+any patent license obtained for a version of the library must be\line
+consistent with the full freedom of use specified in this license.\line
+\line
+Most GNU software, including some libraries, is covered by the\line
+ordinary GNU General Public License. This license, the GNU Lesser\line
+General Public License, applies to certain designated libraries, and\line
+is quite different from the ordinary General Public License. We use\line
+this license for certain libraries in order to permit linking those\line
+libraries into non-free programs.\line
+\line
+When a program is linked with a library, whether statically or using\line
+a shared library, the combination of the two is legally speaking a\line
+combined work, a derivative of the original library. The ordinary\line
+General Public License therefore permits such linking only if the\line
+entire combination fits its criteria of freedom. The Lesser General\line
+Public License permits more lax criteria for linking other code with\line
+the library.\line
+\line
+We call this license the "Lesser" General Public License because it\line
+does Less to protect the user's freedom than the ordinary General\line
+Public License. It also provides other free software developers Less\line
+of an advantage over competing non-free programs. These disadvantages\line
+are the reason we use the ordinary General Public License for many\line
+libraries. However, the Lesser license provides advantages in certain\line
+special circumstances.\line
+\line
+For example, on rare occasions, there may be a special need to\line
+encourage the widest possible use of a certain library, so that it becomes\line
+a de-facto standard. To achieve this, non-free programs must be\line
+allowed to use the library. A more frequent case is that a free\line
+library does the same job as widely used non-free libraries. In this\line
+case, there is little to gain by limiting the free library to free\line
+software only, so we use the Lesser General Public License.\line
+\line
+In other cases, permission to use a particular library in non-free\line
+programs enables a greater number of people to use a large body of\line
+free software. For example, permission to use the GNU C Library in\line
+non-free programs enables many more people to use the whole GNU\line
+operating system, as well as its variant, the GNU/Linux operating\line
+system.\line
+\line
+Although the Lesser General Public License is Less protective of the\line
+users' freedom, it does ensure that the user of a program that is\line
+linked with the Library has the freedom and the wherewithal to run\line
+that program using a modified version of the Library.\line
+\line
+The precise terms and conditions for copying, distribution and\line
+modification follow. Pay close attention to the difference between a\line
+"work based on the library" and a "work that uses the library". The\line
+former contains code derived from the library, whereas the latter must\line
+be combined with the library in order to run.\line
+\line
+ GNU LESSER GENERAL PUBLIC LICENSE\line
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\line
+\line
+0. This License Agreement applies to any software library or other\line
+program which contains a notice placed by the copyright holder or\line
+other authorized party saying it may be distributed under the terms of\line
+this Lesser General Public License (also called "this License").\line
+Each licensee is addressed as "you".\line
+\line
+A "library" means a collection of software functions and/or data\line
+prepared so as to be conveniently linked with application programs\line
+(which use some of those functions and data) to form executables.\line
+\line
+The "Library", below, refers to any such software library or work\line
+which has been distributed under these terms. A "work based on the\line
+Library" means either the Library or any derivative work under\line
+copyright law: that is to say, a work containing the Library or a\line
+portion of it, either verbatim or with modifications and/or translated\line
+straightforwardly into another language. (Hereinafter, translation is\line
+included without limitation in the term "modification".)\line
+\line
+"Source code" for a work means the preferred form of the work for\line
+making modifications to it. For a library, complete source code means\line
+all the source code for all modules it contains, plus any associated\line
+interface definition files, plus the scripts used to control compilation\line
+and installation of the library.\line
+\line
+Activities other than copying, distribution and modification are not\line
+covered by this License; they are outside its scope. The act of\line
+running a program using the Library is not restricted, and output from\line
+such a program is covered only if its contents constitute a work based\line
+on the Library (independent of the use of the Library in a tool for\line
+writing it). Whether that is true depends on what the Library does\line
+and what the program that uses the Library does.\line
+\line
+1. You may copy and distribute verbatim copies of the Library's\line
+complete source code as you receive it, in any medium, provided that\line
+you conspicuously and appropriately publish on each copy an\line
+appropriate copyright notice and disclaimer of warranty; keep intact\line
+all the notices that refer to this License and to the absence of any\line
+warranty; and distribute a copy of this License along with the\line
+Library.\line
+\line
+You may charge a fee for the physical act of transferring a copy,\line
+and you may at your option offer warranty protection in exchange for a\line
+fee.\line
+\line
+2. You may modify your copy or copies of the Library or any portion\line
+of it, thus forming a work based on the Library, and copy and\line
+distribute such modifications or work under the terms of Section 1\line
+above, provided that you also meet all of these conditions:\line
+\line
+a) The modified work must itself be a software library.\line
+\line
+b) You must cause the files modified to carry prominent notices\line
+stating that you changed the files and the date of any change.\line
+\line
+c) You must cause the whole of the work to be licensed at no\line
+charge to all third parties under the terms of this License.\line
+\line
+d) If a facility in the modified Library refers to a function or a\line
+table of data to be supplied by an application program that uses\line
+the facility, other than as an argument passed when the facility\line
+is invoked, then you must make a good faith effort to ensure that,\line
+in the event an application does not supply such function or\line
+table, the facility still operates, and performs whatever part of\line
+its purpose remains meaningful.\line
+\line
+(For example, a function in a library to compute square roots has\line
+a purpose that is entirely well-defined independent of the\line
+application. Therefore, Subsection 2d requires that any\line
+application-supplied function or table used by this function must\line
+be optional: if the application does not supply it, the square\line
+root function must still compute square roots.)\line
+\line
+These requirements apply to the modified work as a whole. If\line
+identifiable sections of that work are not derived from the Library,\line
+and can be reasonably considered independent and separate works in\line
+themselves, then this License, and its terms, do not apply to those\line
+sections when you distribute them as separate works. But when you\line
+distribute the same sections as part of a whole which is a work based\line
+on the Library, the distribution of the whole must be on the terms of\line
+this License, whose permissions for other licensees extend to the\line
+entire whole, and thus to each and every part regardless of who wrote\line
+it.\line
+\line
+Thus, it is not the intent of this section to claim rights or contest\line
+your rights to work written entirely by you; rather, the intent is to\line
+exercise the right to control the distribution of derivative or\line
+collective works based on the Library.\line
+\line
+In addition, mere aggregation of another work not based on the Library\line
+with the Library (or with a work based on the Library) on a volume of\line
+a storage or distribution medium does not bring the other work under\line
+the scope of this License.\line
+\line
+3. You may opt to apply the terms of the ordinary GNU General Public\line
+License instead of this License to a given copy of the Library. To do\line
+this, you must alter all the notices that refer to this License, so\line
+that they refer to the ordinary GNU General Public License, version 2,\line
+instead of to this License. (If a newer version than version 2 of the\line
+ordinary GNU General Public License has appeared, then you can specify\line
+that version instead if you wish.) Do not make any other change in\line
+these notices.\line
+\line
+Once this change is made in a given copy, it is irreversible for\line
+that copy, so the ordinary GNU General Public License applies to all\line
+subsequent copies and derivative works made from that copy.\line
+\line
+This option is useful when you wish to copy part of the code of\line
+the Library into a program that is not a library.\line
+\line
+4. You may copy and distribute the Library (or a portion or\line
+derivative of it, under Section 2) in object code or executable form\line
+under the terms of Sections 1 and 2 above provided that you accompany\line
+it with the complete corresponding machine-readable source code, which\line
+must be distributed under the terms of Sections 1 and 2 above on a\line
+medium customarily used for software interchange.\line
+\line
+If distribution of object code is made by offering access to copy\line
+from a designated place, then offering equivalent access to copy the\line
+source code from the same place satisfies the requirement to\line
+distribute the source code, even though third parties are not\line
+compelled to copy the source along with the object code.\line
+\line
+5. A program that contains no derivative of any portion of the\line
+Library, but is designed to work with the Library by being compiled or\line
+linked with it, is called a "work that uses the Library". Such a\line
+work, in isolation, is not a derivative work of the Library, and\line
+therefore falls outside the scope of this License.\line
+\line
+However, linking a "work that uses the Library" with the Library\line
+creates an executable that is a derivative of the Library (because it\line
+contains portions of the Library), rather than a "work that uses the\line
+library". The executable is therefore covered by this License.\line
+Section 6 states terms for distribution of such executables.\line
+\line
+When a "work that uses the Library" uses material from a header file\line
+that is part of the Library, the object code for the work may be a\line
+derivative work of the Library even though the source code is not.\line
+Whether this is true is especially significant if the work can be\line
+linked without the Library, or if the work is itself a library. The\line
+threshold for this to be true is not precisely defined by law.\line
+\line
+If such an object file uses only numerical parameters, data\line
+structure layouts and accessors, and small macros and small inline\line
+functions (ten lines or less in length), then the use of the object\line
+file is unrestricted, regardless of whether it is legally a derivative\line
+work. (Executables containing this object code plus portions of the\line
+Library will still fall under Section 6.)\line
+\line
+Otherwise, if the work is a derivative of the Library, you may\line
+distribute the object code for the work under the terms of Section 6.\line
+Any executables containing that work also fall under Section 6,\line
+whether or not they are linked directly with the Library itself.\line
+\line
+6. As an exception to the Sections above, you may also combine or\line
+link a "work that uses the Library" with the Library to produce a\line
+work containing portions of the Library, and distribute that work\line
+under terms of your choice, provided that the terms permit\line
+modification of the work for the customer's own use and reverse\line
+engineering for debugging such modifications.\line
+\line
+You must give prominent notice with each copy of the work that the\line
+Library is used in it and that the Library and its use are covered by\line
+this License. You must supply a copy of this License. If the work\line
+during execution displays copyright notices, you must include the\line
+copyright notice for the Library among them, as well as a reference\line
+directing the user to the copy of this License. Also, you must do one\line
+of these things:\line
+\line
+a) Accompany the work with the complete corresponding\line
+machine-readable source code for the Library including whatever\line
+changes were used in the work (which must be distributed under\line
+Sections 1 and 2 above); and, if the work is an executable linked\line
+with the Library, with the complete machine-readable "work that\line
+uses the Library", as object code and/or source code, so that the\line
+user can modify the Library and then relink to produce a modified\line
+executable containing the modified Library. (It is understood\line
+that the user who changes the contents of definitions files in the\line
+Library will not necessarily be able to recompile the application\line
+to use the modified definitions.)\line
+\line
+b) Use a suitable shared library mechanism for linking with the\line
+Library. A suitable mechanism is one that (1) uses at run time a\line
+copy of the library already present on the user's computer system,\line
+rather than copying library functions into the executable, and (2)\line
+will operate properly with a modified version of the library, if\line
+the user installs one, as long as the modified version is\line
+interface-compatible with the version that the work was made with.\line
+\line
+c) Accompany the work with a written offer, valid for at\line
+least three years, to give the same user the materials\line
+specified in Subsection 6a, above, for a charge no more\line
+than the cost of performing this distribution.\line
+\line
+d) If distribution of the work is made by offering access to copy\line
+from a designated place, offer equivalent access to copy the above\line
+specified materials from the same place.\line
+\line
+e) Verify that the user has already received a copy of these\line
+materials or that you have already sent this user a copy.\line
+\line
+For an executable, the required form of the "work that uses the\line
+Library" must include any data and utility programs needed for\line
+reproducing the executable from it. However, as a special exception,\line
+the materials to be distributed need not include anything that is\line
+normally distributed (in either source or binary form) with the major\line
+components (compiler, kernel, and so on) of the operating system on\line
+which the executable runs, unless that component itself accompanies\line
+the executable.\line
+\line
+It may happen that this requirement contradicts the license\line
+restrictions of other proprietary libraries that do not normally\line
+accompany the operating system. Such a contradiction means you cannot\line
+use both them and the Library together in an executable that you\line
+distribute.\line
+\line
+7. You may place library facilities that are a work based on the\line
+Library side-by-side in a single library together with other library\line
+facilities not covered by this License, and distribute such a combined\line
+library, provided that the separate distribution of the work based on\line
+the Library and of the other library facilities is otherwise\line
+permitted, and provided that you do these two things:\line
+\line
+a) Accompany the combined library with a copy of the same work\line
+based on the Library, uncombined with any other library\line
+facilities. This must be distributed under the terms of the\line
+Sections above.\line
+\line
+b) Give prominent notice with the combined library of the fact\line
+that part of it is a work based on the Library, and explaining\line
+where to find the accompanying uncombined form of the same work.\line
+\line
+8. You may not copy, modify, sublicense, link with, or distribute\line
+the Library except as expressly provided under this License. Any\line
+attempt otherwise to copy, modify, sublicense, link with, or\line
+distribute the Library is void, and will automatically terminate your\line
+rights under this License. However, parties who have received copies,\line
+or rights, from you under this License will not have their licenses\line
+terminated so long as such parties remain in full compliance.\line
+\line
+9. You are not required to accept this License, since you have not\line
+signed it. However, nothing else grants you permission to modify or\line
+distribute the Library or its derivative works. These actions are\line
+prohibited by law if you do not accept this License. Therefore, by\line
+modifying or distributing the Library (or any work based on the\line
+Library), you indicate your acceptance of this License to do so, and\line
+all its terms and conditions for copying, distributing or modifying\line
+the Library or works based on it.\line
+\line
+10. Each time you redistribute the Library (or any work based on the\line
+Library), the recipient automatically receives a license from the\line
+original licensor to copy, distribute, link with or modify the Library\line
+subject to these terms and conditions. You may not impose any further\line
+restrictions on the recipients' exercise of the rights granted herein.\line
+You are not responsible for enforcing compliance by third parties with\line
+this License.\line
+\line
+11. If, as a consequence of a court judgment or allegation of patent\line
+infringement or for any other reason (not limited to patent issues),\line
+conditions are imposed on you (whether by court order, agreement or\line
+otherwise) that contradict the conditions of this License, they do not\line
+excuse you from the conditions of this License. If you cannot\line
+distribute so as to satisfy simultaneously your obligations under this\line
+License and any other pertinent obligations, then as a consequence you\line
+may not distribute the Library at all. For example, if a patent\line
+license would not permit royalty-free redistribution of the Library by\line
+all those who receive copies directly or indirectly through you, then\line
+the only way you could satisfy both it and this License would be to\line
+refrain entirely from distribution of the Library.\line
+\line
+If any portion of this section is held invalid or unenforceable under any\line
+particular circumstance, the balance of the section is intended to apply,\line
+and the section as a whole is intended to apply in other circumstances.\line
+\line
+It is not the purpose of this section to induce you to infringe any\line
+patents or other property right claims or to contest validity of any\line
+such claims; this section has the sole purpose of protecting the\line
+integrity of the free software distribution system which is\line
+implemented by public license practices. Many people have made\line
+generous contributions to the wide range of software distributed\line
+through that system in reliance on consistent application of that\line
+system; it is up to the author/donor to decide if he or she is willing\line
+to distribute software through any other system and a licensee cannot\line
+impose that choice.\line
+\line
+This section is intended to make thoroughly clear what is believed to\line
+be a consequence of the rest of this License.\line
+\line
+12. If the distribution and/or use of the Library is restricted in\line
+certain countries either by patents or by copyrighted interfaces, the\line
+original copyright holder who places the Library under this License may add\line
+an explicit geographical distribution limitation excluding those countries,\line
+so that distribution is permitted only in or among countries not thus\line
+excluded. In such case, this License incorporates the limitation as if\line
+written in the body of this License.\line
+\line
+13. The Free Software Foundation may publish revised and/or new\line
+versions of the Lesser General Public License from time to time.\line
+Such new versions will be similar in spirit to the present version,\line
+but may differ in detail to address new problems or concerns.\line
+\line
+Each version is given a distinguishing version number. If the Library\line
+specifies a version number of this License which applies to it and\line
+"any later version", you have the option of following the terms and\line
+conditions either of that version or of any later version published by\line
+the Free Software Foundation. If the Library does not specify a\line
+license version number, you may choose any version ever published by\line
+the Free Software Foundation.\line
+\line
+14. If you wish to incorporate parts of the Library into other free\line
+programs whose distribution conditions are incompatible with these,\line
+write to the author to ask for permission. For software which is\line
+copyrighted by the Free Software Foundation, write to the Free\line
+Software Foundation; we sometimes make exceptions for this. Our\line
+decision will be guided by the two goals of preserving the free status\line
+of all derivatives of our free software and of promoting the sharing\line
+and reuse of software generally.\line
+\line
+ NO WARRANTY\line
+\line
+15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO\line
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.\line
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR\line
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY\line
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE\line
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\line
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE\line
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME\line
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.\line
+\line
+16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN\line
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY\line
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU\line
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR\line
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE\line
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING\line
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A\line
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF\line
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH\line
+DAMAGES.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel1 \b \fs32 Third Party Open Source Software Used\par}
+{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab {\field{\*\fldinst{HYPERLINK "https://ant.apache.org"}}{\fldrslt{\ul
+Ant
+}}}
+ by {\field{\*\fldinst{HYPERLINK "https://www.apache.org"}}{\fldrslt{\ul
+The Apache Software Foundation
+}}}
+ under the {\field{\*\fldinst{HYPERLINK "https://www.apache.org/licenses/LICENSE-2.0"}}{\fldrslt{\ul
+Apache v2 License
+}}}
+.\par}
+{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab {\field{\*\fldinst{HYPERLINK "http://ant-contrib.sourceforge.net"}}{\fldrslt{\ul
+Ant-contrib
+}}}
+ by the Ant-Contrib Project under the {\field{\*\fldinst{HYPERLINK "https://sourceforge.net/p/ant-contrib/code/HEAD/tree/ant-contrib/trunk/docs/LICENSE.txt"}}{\fldrslt{\ul
+Apache 1.1 License
+}}}
+.\par}
+{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab {\field{\*\fldinst{HYPERLINK "https://www.antlr2.org"}}{\fldrslt{\ul
+Antlr 2
+}}}
+ under {\field{\*\fldinst{HYPERLINK "https://www.antlr2.org/license.html"}}{\fldrslt{\ul
+Public Domain
+}}}
+.\par}
+{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab Processing has a modified copy of appbundler under. It is is a fork of {\field{\*\fldinst{HYPERLINK "https://web.archive.org/web/20161220062720/https://java.net/projects/appbundler"}}{\fldrslt{\ul
+Oracle\u8217's now-defunct appbundler project
+}}}
+ with contributions from {\field{\*\fldinst{HYPERLINK "https://bitbucket.org/infinitekind/appbundler"}}{\fldrslt{\ul
+InfiniteKind
+}}}
+, both under the {\field{\*\fldinst{HYPERLINK "https://openjdk.java.net/legal/gplv2+ce.html"}}{\fldrslt{\ul
+GPL v2 license with classpath exception
+}}}
+.\par}
+{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab {\field{\*\fldinst{HYPERLINK "http://site.icu-project.org"}}{\fldrslt{\ul
+ICU4J
+}}}
+ from IBM under the {\field{\*\fldinst{HYPERLINK "http://source.icu-project.org/repos/icu/icu/tags/release-57-1/LICENSE"}}{\fldrslt{\ul
+ICU License
+}}}
+.\par}
+{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab {\field{\*\fldinst{HYPERLINK "https://www.eclipse.org/jdt/"}}{\fldrslt{\ul
+Java Development Tools
+}}}
+ by the {\field{\*\fldinst{HYPERLINK "https://www.eclipse.org"}}{\fldrslt{\ul
+Eclipse Foundation
+}}}
+ under the {\field{\*\fldinst{HYPERLINK "https://www.eclipse.org/legal/epl-2.0/"}}{\fldrslt{\ul
+Eclipse Public License v2
+}}}
+.\par}
+{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab {\field{\*\fldinst{HYPERLINK "https://github.com/java-native-access/jna"}}{\fldrslt{\ul
+Java Native Access
+}}}
+ dual licensed under the {\field{\*\fldinst{HYPERLINK "https://github.com/java-native-access/jna/blob/master/LICENSE"}}{\fldrslt{\ul
+Apache v2 License and LGPL
+}}}
+.\par}
+{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab {\field{\*\fldinst{HYPERLINK "http://jogamp.org/jogl/www/"}}{\fldrslt{\ul
+JOGL
+}}}
+ by {\field{\*\fldinst{HYPERLINK "http://jogamp.org"}}{\fldrslt{\ul
+Jogamp
+}}}
+ under the {\field{\*\fldinst{HYPERLINK "https://creativecommons.org/licenses/by/3.0/us/"}}{\fldrslt{\ul
+CC BY 3.0 US license
+}}}
+.\par}
+{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab {\field{\*\fldinst{HYPERLINK "https://openjfx.io"}}{\fldrslt{\ul
+OpenJFX 11
+}}}
+ by Oracle under the {\field{\*\fldinst{HYPERLINK "https://openjdk.java.net/legal/gplv2+ce.html"}}{\fldrslt{\ul
+GPL v2 with classpath exception
+}}}
+.\par}
+{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab {\field{\*\fldinst{HYPERLINK "https://openjdk.java.net/projects/jdk/11/"}}{\fldrslt{\ul
+OpenJDK 11
+}}}
+ by Oracle under the {\field{\*\fldinst{HYPERLINK "https://openjdk.java.net/legal/gplv2+ce.html"}}{\fldrslt{\ul
+GPL v2 with classpath exception
+}}}
+\par}
+{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab {\f1 org.netbeans.swing.outline} from {\field{\*\fldinst{HYPERLINK "http://netbeans.apache.org"}}{\fldrslt{\ul
+Netbeans
+}}}
+ dual licensed under the {\field{\*\fldinst{HYPERLINK "http://wiki.netbeans.org/FaqWhyCDDLAndGPL"}}{\fldrslt{\ul
+GNU GPL v2 and CDDL licenses
+}}}
+\par}
+{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab Some text used from {\field{\*\fldinst{HYPERLINK "https://en.wikipedia.org/wiki/Wikipedia:Copyrights"}}{\fldrslt{\ul
+Wikipedia
+}}}
+ under the {\field{\*\fldinst{HYPERLINK "https://en.wikipedia.org/wiki/Wikipedia:Text_of_Creative_Commons_Attribution-ShareAlike_3.0_Unported_License"}}{\fldrslt{\ul
+CC BY-SA
+}}}
+ license.\sa180\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \outlinelevel1 \b \fs32 Other License Bodies\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 Text of other relevant licenses\u8230 ?\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 {\b IBM Public License Version 1.0}\line the original document can be found at: http://oss.software.ibm.com/developerworks/opensource/license10.html\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \f1 IBM Public License Version 1.0\line
+\line
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS IBM\line
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF\line
+THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.\line
+\line
+\line
+1. DEFINITIONS\line
+\line
+"Contribution" means:\line
+\line
+a) in the case of International Business Machines Corporation ("IBM"),\line
+the Original Program, and\line
+\line
+b) in the case of each Contributor,\line
+\line
+i) changes to the Program, and\line
+\line
+ii) additions to the Program;\line
+where such changes and/or additions to the Program originate from and\line
+are distributed by that particular Contributor. A Contribution\line
+'originates' from a Contributor if it was added to the Program by such\line
+Contributor itself or anyone acting on such Contributor's\line
+behalf. Contributions do not include additions to the Program which:\line
+(i) are separate modules of software distributed in conjunction with\line
+the Program under their own license agreement, and (ii) are not\line
+derivative works of the Program.\line
+\line
+"Contributor" means IBM and any other entity that distributes the\line
+Program.\line
+\line
+"Licensed Patents " mean patent claims licensable by a Contributor\line
+which are necessarily infringed by the use or sale of its Contribution\line
+alone or when combined with the Program.\line
+\line
+\line
+"Original Program" means the original version of the software\line
+accompanying this Agreement as released by IBM, including source code,\line
+object code and documentation, if any.\line
+\line
+"Program" means the Original Program and Contributions.\line
+\line
+"Recipient" means anyone who receives the Program under this\line
+Agreement, including all Contributors.\line
+\line
+\line
+2. GRANT OF RIGHTS\line
+\line
+a) Subject to the terms of this Agreement, each Contributor hereby\line
+grants Recipient a non-exclusive, worldwide, royalty-free copyright\line
+license to reproduce, prepare derivative works of, publicly display,\line
+publicly perform, distribute and sublicense the Contribution of such\line
+Contributor, if any, and such derivative works, in source code and\line
+object code form.\line
+\line
+b) Subject to the terms of this Agreement, each Contributor hereby\line
+grants Recipient a non-exclusive, worldwide, royalty-free patent\line
+license under Licensed Patents to make, use, sell, offer to sell,\line
+import and otherwise transfer the Contribution of such Contributor, if\line
+any, in source code and object code form. This patent license shall\line
+apply to the combination of the Contribution and the Program if, at\line
+the time the Contribution is added by the Contributor, such addition\line
+of the Contribution causes such combination to be covered by the\line
+Licensed Patents. The patent license shall not apply to any other\line
+combinations which include the Contribution. No hardware per se is\line
+licensed hereunder.\line
+\line
+c) Recipient understands that although each Contributor grants the\line
+licenses to its Contributions set forth herein, no assurances are\line
+provided by any Contributor that the Program does not infringe the\line
+patent or other intellectual property rights of any other entity. Each\line
+Contributor disclaims any liability to Recipient for claims brought by\line
+any other entity based on infringement of intellectual property rights\line
+or otherwise. As a condition to exercising the rights and licenses\line
+granted hereunder, each Recipient hereby assumes sole responsibility\line
+to secure any other intellectual property rights needed, if any. For\line
+example, if a third party patent license is required to allow\line
+Recipient to distribute the Program, it is Recipient's responsibility\line
+to acquire that license before distributing the Program.\line
+\line
+d) Each Contributor represents that to its knowledge it has sufficient\line
+copyright rights in its Contribution, if any, to grant the copyright\line
+license set forth in this Agreement.\line
+\line
+\line
+3. REQUIREMENTS\line
+\line
+A Contributor may choose to distribute the Program in object code form\line
+under its own license agreement, provided that:\line
+\line
+a) it complies with the terms and conditions of this Agreement; and\line
+\line
+b) its license agreement:\line
+\line
+i) effectively disclaims on behalf of all Contributors all warranties\line
+and conditions, express and implied, including warranties or\line
+conditions of title and non-infringement, and implied warranties or\line
+conditions of merchantability and fitness for a particular purpose;\line
+\line
+ii) effectively excludes on behalf of all Contributors all liability\line
+for damages, including direct, indirect, special, incidental and\line
+consequential damages, such as lost profits;\line
+\line
+iii) states that any provisions which differ from this Agreement are\line
+offered by that Contributor alone and not by any other party; and\line
+\line
+iv) states that source code for the Program is available from such\line
+Contributor, and informs licensees how to obtain it in a reasonable\line
+manner on or through a medium customarily used for software exchange.\line
+\line
+When the Program is made available in source code form:\line
+a) it must be made available under this Agreement; and\line
+b) a copy of this Agreement must be included with each copy of the\line
+Program.\line
+\line
+Each Contributor must include the following in a conspicuous location\line
+in the Program:\line
+\line
+Copyright 2003, International Business Machines Corporation and\line
+others. All Rights Reserved.\line
+\line
+In addition, each Contributor must identify itself as the originator\line
+of its Contribution, if any, in a manner that reasonably allows\line
+subsequent Recipients to identify the originator of the Contribution.\line
+\line
+\line
+4. COMMERCIAL DISTRIBUTION\line
+\line
+Commercial distributors of software may accept certain\line
+responsibilities with respect to end users, business partners and the\line
+like. While this license is intended to facilitate the commercial use\line
+of the Program, the Contributor who includes the Program in a\line
+commercial product offering should do so in a manner which does not\line
+create potential liability for other Contributors. Therefore, if a\line
+Contributor includes the Program in a commercial product offering,\line
+such Contributor ("Commercial Contributor") hereby agrees to defend\line
+and indemnify every other Contributor ("Indemnified Contributor")\line
+against any losses, damages and costs (collectively "Losses") arising\line
+from claims, lawsuits and other legal actions brought by a third party\line
+against the Indemnified Contributor to the extent caused by the acts\line
+or omissions of such Commercial Contributor in connection with its\line
+distribution of the Program in a commercial product offering. The\line
+obligations in this section do not apply to any claims or Losses\line
+relating to any actual or alleged intellectual property\line
+infringement. In order to qualify, an Indemnified Contributor must: a)\line
+promptly notify the Commercial Contributor in writing of such claim,\line
+and b) allow the Commercial Contributor to control, and cooperate with\line
+the Commercial Contributor in, the defense and any related settlement\line
+negotiations. The Indemnified Contributor may participate in any such\line
+claim at its own expense.\line
+\line
+For example, a Contributor might include the Program in a commercial\line
+product offering, Product X. That Contributor is then a Commercial\line
+Contributor. If that Commercial Contributor then makes performance\line
+claims, or offers warranties related to Product X, those performance\line
+claims and warranties are such Commercial Contributor's responsibility\line
+alone. Under this section, the Commercial Contributor would have to\line
+defend claims against the other Contributors related to those\line
+performance claims and warranties, and if a court requires any other\line
+Contributor to pay any damages as a result, the Commercial Contributor\line
+must pay those damages.\line
+\line
+\line
+5. NO WARRANTY\line
+\line
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS\line
+PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\line
+KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY\line
+WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY\line
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely\line
+responsible for determining the appropriateness of using and\line
+distributing the Program and assumes all risks associated with its\line
+exercise of rights under this Agreement, including but not limited to\line
+the risks and costs of program errors, compliance with applicable\line
+laws, damage to or loss of data, programs or equipment, and\line
+unavailability or interruption of operations.\line
+\line
+\line
+6. DISCLAIMER OF LIABILITY\line
+\line
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR\line
+ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,\line
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING\line
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF\line
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING\line
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR\line
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED\line
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.\line
+\line
+\line
+7. GENERAL\line
+\line
+If any provision of this Agreement is invalid or unenforceable under\line
+applicable law, it shall not affect the validity or enforceability of\line
+the remainder of the terms of this Agreement, and without further\line
+action by the parties hereto, such provision shall be reformed to the\line
+minimum extent necessary to make such provision valid and\line
+enforceable.\line
+\line
+If Recipient institutes patent litigation against a Contributor with\line
+respect to a patent applicable to software (including a cross-claim or\line
+counterclaim in a lawsuit), then any patent licenses granted by that\line
+Contributor to such Recipient under this Agreement shall terminate as\line
+of the date such litigation is filed. In addition, If Recipient\line
+institutes patent litigation against any entity (including a\line
+cross-claim or counterclaim in a lawsuit) alleging that the Program\line
+itself (excluding combinations of the Program with other software or\line
+hardware\par}
+}
diff --git a/app/windows/Processing.wixproj b/app/windows/Processing.wixproj
new file mode 100644
index 0000000000..3dcd4695fa
--- /dev/null
+++ b/app/windows/Processing.wixproj
@@ -0,0 +1,9 @@
+
* The settings() method runs before the sketch has been * set up, so other Processing functions cannot be used at that @@ -1082,6 +1083,9 @@ public int displayDensity(int display) { */ public void pixelDensity(int density) { //println(density + " " + this.pixelDensity); + + + this.pixelDensityWarning = false; if (density != this.pixelDensity) { if (insideSettings("pixelDensity", density)) { if (density != 1 && density != 2) { @@ -2050,6 +2054,10 @@ public void handleDraw() { if (frameCount == 0) { setup(); + if(pixelDensityWarning){ + System.err.println("Warning: Processing now sets pixelDensity(2) by default on high-density screens. This may change how your sketch looks. To revert to the old behavior, set pixelDensity(1) in setup()."); + } + } else { // frameCount > 0, meaning an actual draw() // update the current frameRate @@ -2635,8 +2643,11 @@ protected void handleKeyEvent(KeyEvent event) { keyPressed = true; keyPressed(keyEvent); } - case KeyEvent.RELEASE -> { - pressedKeys.remove(((long) keyCode << Character.SIZE) | key); + case KeyEvent.RELEASE -> { + pressedKeys.removeIf(hash -> { + int pressedKeyCode = (int)(hash >> Character.SIZE); + return pressedKeyCode == keyCode; + }); keyPressed = !pressedKeys.isEmpty(); keyReleased(keyEvent); } @@ -2842,6 +2853,7 @@ public void focusGained() { } public void focusLost() { // TODO: if user overrides this without calling super it's not gonna work pressedKeys.clear(); + keyPressed = false; } @@ -3679,8 +3691,7 @@ public void cursor() { /** * - * Hides the cursor from view. Will not work when running the program in a - * web browser or when running in full screen (Present) mode. + * Hides the mouse cursor from view. * *
Advanced
* Hide the cursor by creating a transparent image @@ -9664,7 +9675,7 @@ public void frameResized(int w, int h) { // WINDOW METHODS - Map* Using point() with strokeWeight(1) or smaller may draw nothing to the screen, * depending on the graphics settings of the computer. Workarounds include - * setting the pixel using set() or drawing the point using either + * setting the pixel using set() or drawing the point using either * circle() or square(). * * @webref shape:2d primitives @@ -3559,8 +3559,8 @@ public float curvePoint(float a, float b, float c, float d, float t) { /** * Calculates the tangent of a point on a curve. There's a good definition - * of tangent on Wikipedia. + * of tangent on Wikipedia. * *
Advanced
* Code thanks to Dave Bollinger (Bug #715) @@ -4768,7 +4768,7 @@ public void text(char[] chars, int start, int stop, float x, float y) { } // int start = 0; - int index = 0; + int index = start; while (index < stop) { //length) { if (chars[index] == '\n') { textLineAlignImpl(chars, start, index, x, y); @@ -6252,7 +6252,7 @@ public float modelZ(float x, float y, float z) { ** The style information controlled by the following functions are included * in the style: - * fill(), stroke(), tint(), strokeWeight(), strokeCap(),strokeJoin(), + * fill(), stroke(), tint(), strokeWeight(), strokeCap(),strokeJoin(), * imageMode(), rectMode(), ellipseMode(), shapeMode(), colorMode(), * textAlign(), textFont(), textMode(), textSize(), textLeading(), * emissive(), specular(), shininess(), ambient() @@ -6439,7 +6439,7 @@ public PStyle getStyle(PStyle s) { // ignore *
* Using point() with strokeWeight(1) or smaller may draw nothing to the screen, * depending on the graphics settings of the computer. Workarounds include - * setting the pixel using set() or drawing the point using either + * setting the pixel using set() or drawing the point using either * circle() or square(). * * @webref shape:attributes diff --git a/core/src/processing/core/PImage.java b/core/src/processing/core/PImage.java index d2ac4e3b99..2f350775c7 100644 --- a/core/src/processing/core/PImage.java +++ b/core/src/processing/core/PImage.java @@ -497,11 +497,37 @@ public Object clone() throws CloneNotSupportedException { // ignore * @usage web_application * @param w the resized image width * @param h the resized image height + * @param interpolationMode the type of interpolation that should be used when resizing the image * @see PImage#get(int, int, int, int) */ - public void resize(int w, int h) { // ignore + public void resize(int w, int h,int interpolationMode) { // ignore //throw new RuntimeException("resize() not implemented for this PImage type"); - ShimAWT.resizeImage(this, w, h); + ShimAWT.resizeImage(this, w, h, interpolationMode); + } + + /** + * + * Resize the image to a new width and height. To make the image scale + * proportionally, use 0 as the value for the wide or high + * parameter. For instance, to make the width of an image 150 pixels, and + * change the height using the same proportion, use resize(150, 0).
+ *
+ * Even though a PGraphics is technically a PImage, it is not possible to + * rescale the image data found in a PGraphics. (It's simply not possible + * to do this consistently across renderers: technically infeasible with + * P3D, or what would it even do with PDF?) If you want to resize PGraphics + * content, first get a copy of its image data using the get() + * method, and call resize() on the PImage that is returned. + * + * @webref pimage:method + * @webBrief Resize the image to a new width and height + * @usage web_application + * @param w the resized image width + * @param h the resized image height + * @see PImage#get(int, int, int, int) + */ + public void resize(int w, int h) { // ignore + resize(w, h, PConstants.BILINEAR); } @@ -840,6 +866,14 @@ public void mask(int[] maskArray) { // ignore */ public void mask(PImage img) { img.loadPixels(); + if (this.pixelWidth != img.pixelWidth || this.pixelHeight != img.pixelHeight) { + if (this.pixelDensity != img.pixelDensity) { + throw new IllegalArgumentException("mask() requires the mask image to have the same pixel size after adjusting for pixelDensity."); + } + else if (this.width != img.width || this.height != img.height) { + throw new IllegalArgumentException("mask() requires the mask image to have the same width and height."); + } + } mask(img.pixels); } @@ -1057,6 +1091,9 @@ else if (format == ARGB) * [toxi 050728] */ protected void buildBlurKernel(float r) { + float maxRadius = Math.min(width, height) / 2.0f; + float maxR = maxRadius / 3.5f; + r = Math.min(r, maxR); int radius = (int) (r * 3.5f); if (radius < 1) radius = 1; if (radius > 248) radius = 248; @@ -1083,6 +1120,9 @@ protected void buildBlurKernel(float r) { } } + private int safeDivide(int numerator, int denominator) { + return denominator == 0 ? numerator : numerator / denominator; + } protected void blurAlpha(float r) { int sum, cb; @@ -1115,7 +1155,7 @@ protected void blurAlpha(float r) { read++; } ri = yi + x; - b2[ri] = cb / sum; + b2[ri] = safeDivide(cb, sum); } yi += pixelWidth; } @@ -1146,7 +1186,7 @@ protected void blurAlpha(float r) { ri++; read += pixelWidth; } - pixels[x+yi] = (cb/sum); + pixels[x+yi] = safeDivide(cb, sum); } yi += pixelWidth; ymi += pixelWidth; @@ -1191,9 +1231,9 @@ protected void blurRGB(float r) { read++; } ri = yi + x; - r2[ri] = cr / sum; - g2[ri] = cg / sum; - b2[ri] = cb / sum; + r2[ri] = safeDivide(cr, sum); + g2[ri] = safeDivide(cg, sum); + b2[ri] = safeDivide(cb, sum); } yi += pixelWidth; } @@ -1228,7 +1268,7 @@ protected void blurRGB(float r) { ri++; read += pixelWidth; } - pixels[x+yi] = 0xff000000 | (cr/sum)<<16 | (cg/sum)<<8 | (cb/sum); + pixels[x+yi] = 0xff000000 | (safeDivide(cr, sum))<<16 | (safeDivide(cg, sum))<<8 | (safeDivide(cb, sum)); } yi += pixelWidth; ymi += pixelWidth; @@ -1276,10 +1316,10 @@ protected void blurARGB(float r) { read++; } ri = yi + x; - a2[ri] = ca / sum; - r2[ri] = cr / sum; - g2[ri] = cg / sum; - b2[ri] = cb / sum; + a2[ri] = safeDivide(ca, sum); + r2[ri] = safeDivide(cr, sum); + g2[ri] = safeDivide(cg, sum); + b2[ri] = safeDivide(cb, sum); } yi += pixelWidth; } @@ -1315,7 +1355,7 @@ protected void blurARGB(float r) { ri++; read += pixelWidth; } - pixels[x+yi] = (ca/sum)<<24 | (cr/sum)<<16 | (cg/sum)<<8 | (cb/sum); + pixels[x+yi] = (safeDivide(ca, sum))<<24 | (safeDivide(cr, sum))<<16 | (safeDivide(cg, sum))<<8 | (safeDivide(cb, sum)); } yi += pixelWidth; ymi += pixelWidth; diff --git a/core/src/processing/core/PMatrix.java b/core/src/processing/core/PMatrix.java index edb1d260eb..df15dc4a40 100644 --- a/core/src/processing/core/PMatrix.java +++ b/core/src/processing/core/PMatrix.java @@ -205,4 +205,8 @@ public void preApply(float n00, float n01, float n02, float n03, * @return the determinant of the matrix */ public float determinant(); + /** + * Print the matrix data to the console. + */ + public void print(); } diff --git a/core/src/processing/core/PMatrix2D.java b/core/src/processing/core/PMatrix2D.java index c30a3504e3..bc6538f918 100644 --- a/core/src/processing/core/PMatrix2D.java +++ b/core/src/processing/core/PMatrix2D.java @@ -466,26 +466,15 @@ public float determinant() { ////////////////////////////////////////////////////////////// + @Override public void print() { - int big = (int) abs(max(PApplet.max(abs(m00), abs(m01), abs(m02)), - PApplet.max(abs(m10), abs(m11), abs(m12)))); - - int digits = 1; - if (Float.isNaN(big) || Float.isInfinite(big)) { // avoid infinite loop - digits = 5; - } else { - while ((big /= 10) != 0) digits++; // cheap log() - } - - System.out.println(PApplet.nfs(m00, digits, 4) + " " + - PApplet.nfs(m01, digits, 4) + " " + - PApplet.nfs(m02, digits, 4)); - - System.out.println(PApplet.nfs(m10, digits, 4) + " " + - PApplet.nfs(m11, digits, 4) + " " + - PApplet.nfs(m12, digits, 4)); + System.out.print(toString()); + } - System.out.println(); + @Override + public String toString() { + return PApplet.nfs(m00, 1, 4) + " " + PApplet.nfs(m01, 1, 4) + " " + PApplet.nfs(m02, 1, 4) + "\n" + + PApplet.nfs(m10, 1, 4) + " " + PApplet.nfs(m11, 1, 4) + " " + PApplet.nfs(m12, 1, 4) + "\n"; } diff --git a/core/src/processing/core/PMatrix3D.java b/core/src/processing/core/PMatrix3D.java index 831d9ad635..082d7fa8ca 100644 --- a/core/src/processing/core/PMatrix3D.java +++ b/core/src/processing/core/PMatrix3D.java @@ -809,52 +809,18 @@ protected boolean invApply(float n00, float n01, float n02, float n03, ////////////////////////////////////////////////////////////// + @Override public void print() { - /* - System.out.println(m00 + " " + m01 + " " + m02 + " " + m03 + "\n" + - m10 + " " + m11 + " " + m12 + " " + m13 + "\n" + - m20 + " " + m21 + " " + m22 + " " + m23 + "\n" + - m30 + " " + m31 + " " + m32 + " " + m33 + "\n"); - */ - int big = (int) Math.abs(max(max(max(max(abs(m00), abs(m01)), - max(abs(m02), abs(m03))), - max(max(abs(m10), abs(m11)), - max(abs(m12), abs(m13)))), - max(max(max(abs(m20), abs(m21)), - max(abs(m22), abs(m23))), - max(max(abs(m30), abs(m31)), - max(abs(m32), abs(m33)))))); - - int digits = 1; - if (Float.isNaN(big) || Float.isInfinite(big)) { // avoid infinite loop - digits = 5; - } else { - while ((big /= 10) != 0) digits++; // cheap log() - } - - System.out.println(PApplet.nfs(m00, digits, 4) + " " + - PApplet.nfs(m01, digits, 4) + " " + - PApplet.nfs(m02, digits, 4) + " " + - PApplet.nfs(m03, digits, 4)); - - System.out.println(PApplet.nfs(m10, digits, 4) + " " + - PApplet.nfs(m11, digits, 4) + " " + - PApplet.nfs(m12, digits, 4) + " " + - PApplet.nfs(m13, digits, 4)); - - System.out.println(PApplet.nfs(m20, digits, 4) + " " + - PApplet.nfs(m21, digits, 4) + " " + - PApplet.nfs(m22, digits, 4) + " " + - PApplet.nfs(m23, digits, 4)); - - System.out.println(PApplet.nfs(m30, digits, 4) + " " + - PApplet.nfs(m31, digits, 4) + " " + - PApplet.nfs(m32, digits, 4) + " " + - PApplet.nfs(m33, digits, 4)); - - System.out.println(); + System.out.print(toString()); } + @Override + public String toString() { + return PApplet.nfs(m00, 1, 4) + " " + PApplet.nfs(m01, 1, 4) + " " + PApplet.nfs(m02, 1, 4) + " " + PApplet.nfs(m03, 1, 4) + "\n" + + PApplet.nfs(m10, 1, 4) + " " + PApplet.nfs(m11, 1, 4) + " " + PApplet.nfs(m12, 1, 4) + " " + PApplet.nfs(m13, 1, 4) + "\n" + + PApplet.nfs(m20, 1, 4) + " " + PApplet.nfs(m21, 1, 4) + " " + PApplet.nfs(m22, 1, 4) + " " + PApplet.nfs(m23, 1, 4) + "\n" + + PApplet.nfs(m30, 1, 4) + " " + PApplet.nfs(m31, 1, 4) + " " + PApplet.nfs(m32, 1, 4) + " " + PApplet.nfs(m33, 1, 4) + "\n"; + } ////////////////////////////////////////////////////////////// diff --git a/core/src/processing/core/PShape.java b/core/src/processing/core/PShape.java index 3d71183685..09c5e07362 100644 --- a/core/src/processing/core/PShape.java +++ b/core/src/processing/core/PShape.java @@ -1772,12 +1772,34 @@ protected void drawPrimitive(PGraphics g) { protected void drawGeometry(PGraphics g) { // get cache object using g. g.beginShape(kind); + + boolean insideContour = false; + int codeIndex = 0; + if (style) { for (int i = 0; i < vertexCount; i++) { + if (vertexCodes[codeIndex++] == BREAK) { + if (insideContour) { + g.endContour(); + } + g.beginContour(); + codeIndex++; + insideContour = true; + } + g.vertex(vertices[i]); } } else { for (int i = 0; i < vertexCount; i++) { + if (vertexCodes[codeIndex++] == BREAK) { + if (insideContour) { + g.endContour(); + } + g.beginContour(); + codeIndex++; + insideContour = true; + } + float[] vert = vertices[i]; if (vert.length < 3 || vert[Z] == 0) { g.vertex(vert[X], vert[Y]); @@ -1786,6 +1808,10 @@ protected void drawGeometry(PGraphics g) { } } } + + if (insideContour) { + g.endContour(); + } g.endShape(close ? CLOSE : OPEN); } @@ -2309,18 +2335,28 @@ protected void setPath(int vcount, float[][] verts, int ccount, int[] codes) { } /** - * The getVertexCount() method returns the number of vertices that - * make up a PShape. In the above example, the value 4 is returned by the + * The getVertexCount() method returns the number of vertices (with an option to count children by passing true as boolean parameter to method call) that + * make up a PShape. By default, it does not count child vertices for GROUP shapes. To include child vertices, pass true as a boolean parameter. In the above example, the value 4 is returned by the * getVertexCount() method because 4 vertices are defined in * setup(). * * @webref pshape:method - * @webBrief Returns the total number of vertices as an int + * @webBrief Returns the total number of vertices as an int with an option to count children Vertex for GROUP Shapes * @see PShape#getVertex(int) * @see PShape#setVertex(int, float, float) */ + public int getVertexCount(boolean includeChildren) { + if(!includeChildren && family == GROUP){ + PGraphics.showWarning(NO_VERTICES_ERROR); + } + else if (family == PRIMITIVE) { + PGraphics.showWarning(NO_VERTICES_ERROR); + } + return vertexCount; + } + public int getVertexCount() { - if (family == GROUP || family == PRIMITIVE) { + if(family == GROUP || family == PRIMITIVE){ PGraphics.showWarning(NO_VERTICES_ERROR); } return vertexCount; diff --git a/core/src/processing/core/PShapeSVG.java b/core/src/processing/core/PShapeSVG.java index e85389f02e..7e00b9a05b 100644 --- a/core/src/processing/core/PShapeSVG.java +++ b/core/src/processing/core/PShapeSVG.java @@ -440,15 +440,102 @@ protected void parseEllipse(boolean circle) { } + /** + * Parse