diff --git a/contribution.txt b/CppMode.txt similarity index 60% rename from contribution.txt rename to CppMode.txt index 5753d74..c1c2b8a 100644 --- a/contribution.txt +++ b/CppMode.txt @@ -1,12 +1,10 @@ name=C++ Mode category=Other -authors=[Jose Llamas](https://github.com/pepc84) +authors=[Jose Gonzalez Llamas](https://github.com/pepc84) url=https://github.com/processing-cpp/processing.cpp -sentence=Write Processing sketches in C++, compiled to a native binary. +sentence=Write and run Processing sketches in C++. paragraph=C++ Mode lets you write sketches using the familiar Processing API — size(), ellipse(), mouseX, draw() — but compiled to a native binary via g++. Runs on Linux, macOS, and Windows (via MSYS2). Requires g++ and OpenGL (GLFW + GLEW). version=1 prettyVersion=0.1.0 -minRevision=1275 +minRevision=1280 maxRevision=0 -type=Mode -download=https://github.com/processing-cpp/processing.cpp/releases/download/v0.1.0/cppMode.zip diff --git a/fonts/ProcessingSansPro-LICENSE.txt b/fonts/ProcessingSansPro-LICENSE.txt new file mode 100644 index 0000000..caaf349 --- /dev/null +++ b/fonts/ProcessingSansPro-LICENSE.txt @@ -0,0 +1,98 @@ +"Processing Sans" fonts are just "Source Sans", but renamed to +prevent conflicts on Windows with other versions of Source Sans. +https://github.com/processing/processing/issues/4747 + + +Copyright 2010, 2012, 2014 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries. + +This Font Software is licensed under the SIL Open Font License, Version 1.1. + +This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/fonts/ProcessingSansPro-Regular.ttf b/fonts/ProcessingSansPro-Regular.ttf new file mode 100644 index 0000000..c7862f3 Binary files /dev/null and b/fonts/ProcessingSansPro-Regular.ttf differ diff --git a/mode/CppMode.jar b/mode/CppMode.jar index dc0cbc9..a30b0b0 100644 Binary files a/mode/CppMode.jar and b/mode/CppMode.jar differ diff --git a/src/Processing.cpp b/src/Processing.cpp index c118f20..f8a2a90 100644 --- a/src/Processing.cpp +++ b/src/Processing.cpp @@ -2896,12 +2896,51 @@ void run(){ // Auto-load default.ttf from project root as the default font // (matches Processing Java's "a generic sans-serif font will be used") // Try to load default.ttf from several common locations - if (!tryLoadTTF("default.ttf", g_textSize) && - !tryLoadTTF("src/default.ttf", g_textSize) && - !tryLoadTTF("fonts/default.ttf",g_textSize) && - !tryLoadTTF("/home/pep/Projects/processing4/core/src/font/ProcessingSansPro-Regular.ttf", g_textSize)) { - std::cerr << "[font] default.ttf not found -- using bitmap fallback\n"; - } + { + std::string _homeDir; +#ifdef _WIN32 + if (const char* h = std::getenv("USERPROFILE")) _homeDir = h; +#else + if (const char* h = std::getenv("HOME")) _homeDir = h; +#endif + std::string _modePath; + if (const char* mp = std::getenv("PROCESSING_MODE_PATH")) + _modePath = std::string(mp) + "/"; + + // Font name used by Processing4 + const std::string _font = "ProcessingSansPro-Regular.ttf"; + + // Check Documents/Processing on Windows (user sketchbook) + std::string _docsPath; +#ifdef _WIN32 + if (const char* ud = std::getenv("USERPROFILE")) + _docsPath = std::string(ud) + "/Documents/Processing/"; +#endif + + if (!tryLoadTTF(_modePath + "fonts/" + _font, g_textSize) && + !tryLoadTTF(_modePath + _font, g_textSize) && + !tryLoadTTF(_docsPath + "modes/CppMode/fonts/" + _font, g_textSize) && + // Windows: Processing4 install locations + !tryLoadTTF("C:/Program Files/Processing/core/library/" + _font, g_textSize) && + !tryLoadTTF("C:/Program Files (x86)/Processing/core/library/" + _font, g_textSize) && + !tryLoadTTF("C:/Program Files/processing-4.3/core/library/" + _font, g_textSize) && + !tryLoadTTF(_homeDir + "/AppData/Local/Programs/Processing/core/library/" + _font, g_textSize) && + // Windows: dev build + !tryLoadTTF(_homeDir + "/Projects/processing4/core/src/font/" + _font, g_textSize) && + // Linux: installed Processing4 + !tryLoadTTF("/usr/lib/processing4/core/library/" + _font, g_textSize) && + !tryLoadTTF("/usr/share/processing4/core/library/" + _font, g_textSize) && + !tryLoadTTF("/opt/processing4/core/library/" + _font, g_textSize) && + !tryLoadTTF("/opt/processing/core/library/" + _font, g_textSize) && + !tryLoadTTF(_homeDir + "/.local/share/processing4/core/library/" + _font, g_textSize) && + !tryLoadTTF(_homeDir + "/processing-4.3/core/library/" + _font, g_textSize) && + !tryLoadTTF(_homeDir + "/Projects/processing4/core/src/font/" + _font, g_textSize) && + // macOS + !tryLoadTTF("/Applications/Processing.app/Contents/Java/core/library/" + _font, g_textSize) && + !tryLoadTTF(_homeDir + "/Applications/Processing.app/Contents/Java/core/library/" + _font, g_textSize)) { + std::cerr << "[font] ProcessingSansPro-Regular.ttf not found -- using bitmap fallback\n"; + } + } glfwFocusWindow(gWindow); // ensure input focus on Windows