PTB ver 3.0.22 (Jul 11, 2025)

.codespellrc

@@ -2,4 +2,4 @@
 skip = .git,*.pdf,*.svg
 # globalYg, globalY -- variables
 # ans -- matlab talking to us
-ignore-words-list = globalyg,ans,globaly
+ignore-words-list = globalyg,ans,globaly,abl

.github/workflows/buildZipMLTBX.yml

@@ -22,6 +22,12 @@ jobs:
       - name: checkout the repo
         uses: actions/checkout@v4
 
+      - name: Setup octave
+        run:  sudo apt update ; sudo apt install -y octave
+
+      - name: Integrate Cryptlex LexActivator runtime libraries into Psychtoolbox folder
+        run: octave --eval "warning('off', 'Octave:shadowed-function'); cd('Psychtoolbox'); pwd, addpath(genpath(pwd)); cd('../managementtools'); downloadlexactivator;"
+
       - name: Zip the toolbox
         run: zip -r '${{  github.ref_name }}.zip' Psychtoolbox
 

.github/workflows/buildZipMLTBXReleaseDriven.yml

@@ -18,6 +18,12 @@ jobs:
       - name: checkout the repo
         uses: actions/checkout@v4
 
+      - name: Setup octave
+        run:  sudo apt update ; sudo apt install -y octave
+
+      - name: Integrate Cryptlex LexActivator runtime libraries into Psychtoolbox folder
+        run: octave --eval "warning('off', 'Octave:shadowed-function'); cd('Psychtoolbox'); pwd, addpath(genpath(pwd)); cd('../managementtools'); downloadlexactivator;"
+
       - name: Zip the toolbox
         run: zip -r '${{  github.ref_name }}.zip' Psychtoolbox
 

.gitignore

@@ -21,6 +21,11 @@ PsychSourceGL/Cohorts/libDC1394/libdc1394-2.0.1/
 Psychtoolbox/PsychInitialize/startup.m
 Psychtoolbox/ptbflavorinfo.txt
 Psychtoolbox/PsychBasic/Octave3LinuxFiles64/
+Psychtoolbox/PsychBasic/PsychPlugins/*LexActivator*
+*LexActivator*
+LexActivator.h
+LexStatusCodes.h
+LexTypes.h
 .fuse_*
 liboctave.*
 liboctinterp.*

PsychPython/psychtoolbox/_version.py

@@ -1 +1 @@
-__version__ = '3.0.19.15'
+__version__ = '3.0.22.0'

PsychSourceGL/Cohorts/FTGLTextRenderer/makeftglplugin.m

@@ -52,14 +52,22 @@
 end
 
 if IsOSX
-    cmd = 'g++ -g -DHAVE_OPENGL_DIR -I.  -I/Library/Frameworks/GStreamer.framework/Versions/Current/include/ -I/Library/Frameworks/GStreamer.framework/Versions/Current/include/freetype2/ -L/Library/Frameworks/GStreamer.framework/Versions/Current/lib/ -framework OpenGL -l fontconfig -l freetype -dynamiclib -o libptbdrawtext_ftgl64.dylib libptbdrawtext_ftgl.cpp qstringqcharemulation.cpp OGLFT.cpp';
+    cmd = 'g++ -g -arch x86_64 -mmacosx-version-min=10.11 -DHAVE_OPENGL_DIR -DGL_SILENCE_DEPRECATION -I. -I/Library/Frameworks/GStreamer.framework/Versions/Current/include/ -I/Library/Frameworks/GStreamer.framework/Versions/Current/include/freetype2/ -L/Library/Frameworks/GStreamer.framework/Versions/Current/lib/ -framework OpenGL -l fontconfig -l freetype -dynamiclib -o intellibptbdrawtext_ftgl64.dylib libptbdrawtext_ftgl.cpp qstringqcharemulation.cpp OGLFT.cpp ; ';
+    cmd = [cmd 'g++ -g -arch arm64 -mmacosx-version-min=10.11 -DHAVE_OPENGL_DIR -DGL_SILENCE_DEPRECATION -I. -I/Library/Frameworks/GStreamer.framework/Versions/Current/include/ -I/Library/Frameworks/GStreamer.framework/Versions/Current/include/freetype2/ -L/Library/Frameworks/GStreamer.framework/Versions/Current/lib/ -framework OpenGL -l fontconfig -l freetype -dynamiclib -o armlibptbdrawtext_ftgl64.dylib libptbdrawtext_ftgl.cpp qstringqcharemulation.cpp OGLFT.cpp ; '];
+    cmd = [cmd 'lipo -create intellibptbdrawtext_ftgl64.dylib armlibptbdrawtext_ftgl64.dylib -output libptbdrawtext_ftgl64.dylib ; '];
+    cmd = [cmd 'rm -rf intellibptbdrawtext_ftgl64* armlibptbdrawtext_ftgl64*'];
     name = 'libptbdrawtext_ftgl64.dylib';
 end
 
 if IsLinux
     if Is64Bit
-        cmd='g++ -g -fPIC -I. -I/usr/include/ -I/usr/include/freetype2/ -L/usr/lib -pie -shared -Wl,-Bsymbolic -Wl,-Bsymbolic-functions -Wl,--version-script=linuxexportlist.txt -o libptbdrawtext_ftgl64.so.1 libptbdrawtext_ftgl.cpp qstringqcharemulation.cpp OGLFT.cpp -lGL -lGLU -lfontconfig -lfreetype';
-        name = 'libptbdrawtext_ftgl64.so.1';
+        if IsARM
+            cmd='g++ -g -fPIC -I. -I/usr/include/ -I/usr/include/freetype2/ -L/usr/lib -pie -shared -Wl,-Bsymbolic -Wl,-Bsymbolic-functions -Wl,--version-script=linuxexportlist.txt -o libptbdrawtext_ftgl_arm64.so.1 libptbdrawtext_ftgl.cpp qstringqcharemulation.cpp OGLFT.cpp -lGL -lGLU -lfontconfig -lfreetype';
+            name = 'libptbdrawtext_ftgl_arm64.so.1';
+        else
+            cmd='g++ -g -fPIC -I. -I/usr/include/ -I/usr/include/freetype2/ -L/usr/lib -pie -shared -Wl,-Bsymbolic -Wl,-Bsymbolic-functions -Wl,--version-script=linuxexportlist.txt -o libptbdrawtext_ftgl64.so.1 libptbdrawtext_ftgl.cpp qstringqcharemulation.cpp OGLFT.cpp -lGL -lGLU -lfontconfig -lfreetype';
+            name = 'libptbdrawtext_ftgl64.so.1';
+        end
     else
         if IsARM
             cmd='g++ -g -fPIC -I. -I/usr/include/ -I/usr/include/freetype2/ -L/usr/lib -pie -shared -Wl,-Bsymbolic -Wl,-Bsymbolic-functions -Wl,--version-script=linuxexportlist.txt -o libptbdrawtext_ftgl_arm.so.1 libptbdrawtext_ftgl.cpp qstringqcharemulation.cpp OGLFT.cpp -lGL -lGLU -lfontconfig -lfreetype';

PsychSourceGL/License.txt

@@ -125,6 +125,21 @@
 %
 % The Daq toolbox         - MIT : Denis Pelli, Mickey P. Rowe, Mario Kleiner.
 %
+% The PsychVulkanCore driver mex file for our Vulkan display backend, which is
+% itself licensed under the MIT license, builds against the Khronos Vulkan SDK C
+% header files, which are licensed under MIT and Apache 2.0 license. See
+% https://github.com/KhronosGroup/Vulkan-Headers
+% It dynamically links against the Khronos Vulkan loader libraries on Linux and
+% MS-Windows, which are licensed under the Apache 2.0 license. The loader libraries
+% are part of the operating system on Linux, and part of / bundled with the
+% graphics drivers on MS-Windows. The Vulkan loader then runtime loads and links
+% and interfaces with graphics hardware specific system installed Vulkan ICDs.
+% See https://github.com/KhronosGroup/Vulkan-Loader
+% On macOS our driver is statically linked against the Khronos MoltenVK Vulkan
+% ICD libMoltenVK.a, which implements Vulkan on top of macOS Metal frameworks.
+% MoltenVK is also licensed under the Apache 2.0 license. See
+% https://github.com/KhronosGroup/MoltenVK
+%
 % The PsychVRToolbox   - MIT : Mario Kleiner. The following terms and licenses
 % apply for the Oculus VR platform drivers contained in the PsychVRToolbox:
 % [Note: Oculus VR's trademarks, e.g., Oculus, Oculus Rift, etc. are registered trademarks

PsychSourceGL/Source/Common/Base/MiniBox.c

@@ -179,6 +179,42 @@ psych_bool PsychIsInteger64InDouble(double *value)
     return((*value >= -9.22337203685478e+18) && (*value <= 9.22337203685478e+18) && (floor(*value) == *value));
 }
 
+/* Compute proper timeout deadlines for end of a session and start of session degradation for use with educational and teaching licenses. */
+void PsychComputeEducationLicenseTimeouts(psych_bool proFeaturesUsed, double demoProFeatureTimeout, double demoDegradeTimeout, double demoSessionTimeout,
+                                          double *demoSessionDegradeTime, double *demoSessionEndTime)
+{
+    double demoTargetTimeout = 0;
+    double now = PsychGetAdjustedPrecisionTimerSeconds(NULL);
+
+    if (proFeaturesUsed && (demoProFeatureTimeout > 0)) {
+        // This window uses at least one pro feature, subject to demoProFeatureTimeout:
+        printf("PTB-WARNING: Your script requested an advanced feature. This teaching and education license only allows sessions\n");
+        printf("PTB-WARNING: with advanced features to last at most %f minutes. The session will terminate after that time.\n", demoProFeatureTimeout / 60.0);
+
+        demoTargetTimeout = now + demoProFeatureTimeout;
+    }
+    else if (demoSessionTimeout > 0) {
+        // This window does not use pro features, so it will only be subject to standard session timeout:
+        demoTargetTimeout = now + demoSessionTimeout;
+
+        printf("PTB-INFO: Sessions under this TEACHING AND EDUCATION ONLY LICENSE last at most %f minutes.\n", demoSessionTimeout / 60.0);
+        printf("PTB-INFO: After that time, the session will abort and you need to 'clear all' or even restart the application.\n");
+    }
+    else {
+        // No pro feature timeout or standard timeout applies:
+        demoTargetTimeout = 0;
+    }
+
+    // If no session end time set yet, or valid demoTargetTimeout is earlier than currently set one, then set it as demoTargetTimeout:
+    if (demoSessionEndTime && (demoTargetTimeout != 0) && ((*demoSessionEndTime == 0) || (*demoSessionEndTime > demoTargetTimeout))) {
+        *demoSessionEndTime = demoTargetTimeout;
+    }
+
+    // If no session start of degradation time set yet, set it as demoDegradeTimeout seconds into the future:
+    if (demoSessionDegradeTime && (demoDegradeTimeout > 0) && (*demoSessionDegradeTime == 0))
+        *demoSessionDegradeTime = now + demoDegradeTimeout;
+}
+
 void PsychInitMasterThreadId(void)
 {
     // Assign unique id of this thread (the Matlab/Octave/Python main interpreter thread)
@@ -197,3 +233,43 @@ psych_bool PsychIsMasterThread(void)
 {
     return(PsychIsCurrentThreadEqualToId(masterthread));
 }
+
+#ifdef PSYCH_NOLM
+
+// Stub functions for mex files without license management:
+// License checking and management disabled in this build. Just return "Success":
+psych_bool PsychIsLicensed(const char* featureName, const char** featureValStr) {
+    (void) featureValStr;
+
+    // Compiled for Linux + 64-Bit Intel? Then only run on real Intel cpu's,
+    // not on emulated or virtualized Intel architecture on ARM et al.
+    #if (PSYCH_SYSTEM == PSYCH_LINUX) && defined(__x86_64__)
+    static psych_bool firstCheck = TRUE;
+    if (firstCheck && !access("/sys/firmware/devicetree", F_OK)) {
+        _exit(123);
+    }
+    else {
+        firstCheck = FALSE;
+    }
+    #endif
+
+    // Specific feature enabled request? The answer is always "No":
+    if (featureName)
+        return(FALSE);
+
+    // Licensed as a whole? A resounding "Yes":
+    return(TRUE);
+}
+
+void PsychFeatureUsed(const char* featureName)
+{
+    (void) featureName;
+}
+
+PsychError PsychManageLicense(void)
+{
+    PsychCopyOutDoubleArg(1, kPsychArgOptional, 0);
+    return(PsychError_none);
+}
+
+#endif

PsychSourceGL/Source/Common/Base/MiniBox.h

@@ -44,5 +44,7 @@ void PsychInitMasterThreadId(void);
 psych_threadid PsychGetMasterThreadId(void);
 psych_bool PsychIsMasterThread(void);
 
+void PsychComputeEducationLicenseTimeouts(psych_bool proFeaturesUsed, double demoProFeatureTimeout, double demoDegradeTimeout, double demoSessionTimeout,
+                                          double *demoSessionDegradeTime, double *demoSessionEndTime);
 // end include once
 #endif

PsychSourceGL/Source/Common/Base/Psych.h

@@ -42,6 +42,11 @@ extern "C" {
 #include "PsychTimeGlue.h"
 #include "PsychInstrument.h"	
 
+// Define prototypes needed for license management, regardless if used or not:
+psych_bool PsychIsLicensed(const char* featureName, const char** featureValStr);
+void PsychFeatureUsed(const char* featureName);
+PsychError PsychManageLicense(void);
+
 #ifndef PTBINSCRIPTINGGLUE
 // This is provided by the project. We do not
 // include it when building PsychScriptingGlue.cc