psychopy 2024.2.5__py3-none-any.whl → 2025.1.0__py3-none-any.whl

psychopy/visual/textbox2/textbox2.py

@@ -18,6 +18,7 @@ some more added:
 from ast import literal_eval
 
 import numpy as np
+import sys
 from arabic_reshaper import ArabicReshaper
 from pyglet import gl
 from bidi import algorithm as bidi
@@ -25,18 +26,23 @@ import re
 
 from ..aperture import Aperture
 from ..basevisual import (
-    BaseVisualStim, ColorMixin, ContainerMixin, WindowMixin, DraggingMixin
+    BaseVisualStim, ColorMixin, ContainerMixin, WindowMixin, DraggingMixin, PointerMixin
 )
 from psychopy.tools.attributetools import attributeSetter, setAttribute
 from psychopy.tools import mathtools as mt
 from psychopy.colors import Color
 from psychopy.tools.fontmanager import FontManager, GLFont
+from psychopy.tools import gltools as gt
 from .. import shaders
 from ..rect import Rect
 from ... import core, alerts, layout
 
 from psychopy.tools.linebreak import get_breakable_points, break_units
 
+import pyglet
+USE_LEGACY_GL = pyglet.version < '2.0'
+import pyglet.gl as gl
+
 allFonts = FontManager()
 
 # compile global shader programs later (when we're certain a GL context exists)
@@ -66,9 +72,9 @@ debug = False
 # If text is ". " we don't want to start next line with single space?
 
 
-class TextBox2(BaseVisualStim, DraggingMixin, ContainerMixin, ColorMixin):
+class TextBox2(BaseVisualStim, PointerMixin, DraggingMixin, ContainerMixin, ColorMixin):
     def __init__(self, win, text,
-                 font="Open Sans",
+                 font="Noto Sans",
                  pos=(0, 0),
                  units=None,
                  letterHeight=None,
@@ -99,13 +105,16 @@ class TextBox2(BaseVisualStim, DraggingMixin, ContainerMixin, ColorMixin):
                  autoLog=None,
                  autoDraw=False,
                  depth=0,
-                 onTextCallback=None):
+                 onTextCallback=None,
+                 clickable=True):
         """
 
         Parameters
         ----------
-        win
-        text
+        win : Window
+            The window this stimulus is associated with.
+        text : str
+            The text to display in the TextBox.
         font
         pos
         units
@@ -149,6 +158,7 @@ class TextBox2(BaseVisualStim, DraggingMixin, ContainerMixin, ColorMixin):
         self.colorSpace = colorSpace
         ColorMixin.foreColor.fset(self, color)  # Have to call the superclass directly on init as text has not been set
         self.onTextCallback = onTextCallback
+        self.clickable = clickable
         self.draggable = draggable
 
         # Box around the whole textbox - drawn
@@ -199,7 +209,7 @@ class TextBox2(BaseVisualStim, DraggingMixin, ContainerMixin, ColorMixin):
         self.glFont = None  # will be set by the self.font attribute setter
         self.font = font
         self.letterSpacing = letterSpacing
-        # If font not found, default to Open Sans Regular and raise alert
+        # If font not found, default to Noto Sans Regular and raise alert
         if not self.glFont:
             alerts.alert(4325, self, {
                 'font': font,
@@ -208,7 +218,7 @@ class TextBox2(BaseVisualStim, DraggingMixin, ContainerMixin, ColorMixin):
                 'name': self.name})
             self.bold = False
             self.italic = False
-            self.font = "Open Sans"
+            self.font = "Noto Sans"
 
         # once font is set up we can set the shader (depends on rgb/a of font)
         if self.glFont.atlas.format == 'rgb':
@@ -1210,17 +1220,57 @@ class TextBox2(BaseVisualStim, DraggingMixin, ContainerMixin, ColorMixin):
         if lastOri != value:
             self._layout()
 
+    def _drawLegacyGL(self):
+        """Legacy draw routine for older GL versions.
+        """
+        gl.glPushMatrix()
+        self.win.setScale('pix')
+
+        gl.glActiveTexture(gl.GL_TEXTURE0)
+        gl.glBindTexture(gl.GL_TEXTURE_2D, self.glFont.textureID)
+        gl.glEnable(gl.GL_TEXTURE_2D)
+        gl.glDisable(gl.GL_DEPTH_TEST)
+
+        gl.glEnableClientState(gl.GL_VERTEX_ARRAY)
+        gl.glEnableClientState(gl.GL_COLOR_ARRAY)
+        gl.glEnableClientState(gl.GL_TEXTURE_COORD_ARRAY)
+        gl.glEnableClientState(gl.GL_VERTEX_ARRAY)
+
+        gl.glVertexPointer(2, gl.GL_DOUBLE, 0, self.verticesPix.ctypes)
+        gl.glColorPointer(4, gl.GL_DOUBLE, 0, self._colors.ctypes)
+        gl.glTexCoordPointer(2, gl.GL_DOUBLE, 0, self._texcoords.ctypes)
+
+        self.shader.bind()
+        self.shader.setInt('texture', 0)
+        self.shader.setFloat('pixel', [1.0 / 512, 1.0 / 512])
+        nVerts = (len(self._text) + len(self._renderChars)) * 4
+
+        gl.glDrawArrays(gl.GL_QUADS, 0, nVerts)
+        self.shader.unbind()
+
+        # removed the colors and font texture
+        gl.glDisableClientState(gl.GL_COLOR_ARRAY)
+        gl.glDisableClientState(gl.GL_TEXTURE_COORD_ARRAY)
+        gl.glDisableVertexAttribArray(1)
+        gl.glDisableClientState(gl.GL_VERTEX_ARRAY)
+
+        gl.glActiveTexture(gl.GL_TEXTURE0)
+        gl.glBindTexture(gl.GL_TEXTURE_2D, 0)
+        gl.glDisable(gl.GL_TEXTURE_2D)
+
+        if self.hasFocus:  # draw caret line
+            self.caret.draw()
+
+        gl.glPopMatrix()
+
     def draw(self):
         """Draw the text to the back buffer"""
         # Border width
         self.box.setLineWidth(self.palette['lineWidth']) # Use 1 as base if border width is none
-        #self.borderWidth = self.box.lineWidth
         # Border colour
         self.box.setLineColor(self.palette['lineColor'], colorSpace='rgb')
-        #self.borderColor = self.box.lineColor
         # Background
         self.box.setFillColor(self.palette['fillColor'], colorSpace='rgb')
-        #self.fillColor = self.box.fillColor
 
         # Inherit win
         self.box.win = self.win
@@ -1266,45 +1316,48 @@ class TextBox2(BaseVisualStim, DraggingMixin, ContainerMixin, ColorMixin):
             # Activate aperture
             self.container.enable()
 
-        gl.glPushMatrix()
-        self.win.setScale('pix')
-
-        gl.glActiveTexture(gl.GL_TEXTURE0)
-        gl.glBindTexture(gl.GL_TEXTURE_2D, self.glFont.textureID)
-        gl.glEnable(gl.GL_TEXTURE_2D)
-        gl.glDisable(gl.GL_DEPTH_TEST)
-
-        gl.glEnableClientState(gl.GL_VERTEX_ARRAY)
-        gl.glEnableClientState(gl.GL_COLOR_ARRAY)
-        gl.glEnableClientState(gl.GL_TEXTURE_COORD_ARRAY)
-        gl.glEnableClientState(gl.GL_VERTEX_ARRAY)
-
-        gl.glVertexPointer(2, gl.GL_DOUBLE, 0, self.verticesPix.ctypes)
-        gl.glColorPointer(4, gl.GL_DOUBLE, 0, self._colors.ctypes)
-        gl.glTexCoordPointer(2, gl.GL_DOUBLE, 0, self._texcoords.ctypes)
-
-        self.shader.bind()
-        self.shader.setInt('texture', 0)
-        self.shader.setFloat('pixel', [1.0 / 512, 1.0 / 512])
-        nVerts = (len(self._text) + len(self._renderChars)) * 4
-
-        gl.glDrawArrays(gl.GL_QUADS, 0, nVerts)
-        self.shader.unbind()
-
-        # removed the colors and font texture
-        gl.glDisableClientState(gl.GL_COLOR_ARRAY)
-        gl.glDisableClientState(gl.GL_TEXTURE_COORD_ARRAY)
-        gl.glDisableVertexAttribArray(1)
-        gl.glDisableClientState(gl.GL_VERTEX_ARRAY)
-
-        gl.glActiveTexture(gl.GL_TEXTURE0)
-        gl.glBindTexture(gl.GL_TEXTURE_2D, 0)
-        gl.glDisable(gl.GL_TEXTURE_2D)
+        if self.win.USE_LEGACY_GL:
+            self._drawLegacyGL()
+        else:
+            self._selectWindow(self.win)
+
+            self.win.setScale('pix')
+            self.win.setOrthographicView()
+
+            gl.glActiveTexture(gl.GL_TEXTURE0)
+            gl.glBindTexture(gl.GL_TEXTURE_2D, self.glFont.textureID)
+            gl.glEnable(gl.GL_TEXTURE_2D)
+            gl.glDisable(gl.GL_DEPTH_TEST)
+
+            prog = self.shader.handle
+            gt.useProgram(prog)
+            gt.setUniformSampler2D(prog, b'uTexture', 0)
+            gt.setUniformValue(prog, b'uColor', self._foreColor.render('rgba1'))
+            gt.setUniformMatrix(
+                prog, 
+                b'uModelViewMatrix', 
+                self.win._viewMatrix,
+                transpose=True)
+            gt.setUniformMatrix(
+                prog, 
+                b'uProjectionMatrix', 
+                self.win._projectionMatrix,
+                transpose=True)
+
+            gt.drawClientArrays({
+                'gl_Vertex': self.verticesPix,
+                'gl_Color': self._colors,
+                'gl_MultiTexCoord0': self._texcoords}, 
+                'GL_QUADS')
+        
+            gt.useProgram(None)
 
-        if self.hasFocus:  # draw caret line
-            self.caret.draw()
+            gl.glActiveTexture(gl.GL_TEXTURE0)
+            gl.glBindTexture(gl.GL_TEXTURE_2D, 0)
+            gl.glDisable(gl.GL_TEXTURE_2D)
 
-        gl.glPopMatrix()
+            if self.hasFocus:  # draw caret line
+                self.caret.draw()
 
         # Draw placeholder if blank
         if self.editable and len(self.text) == 0:
@@ -1498,6 +1551,59 @@ class TextBox2(BaseVisualStim, DraggingMixin, ContainerMixin, ColorMixin):
         else:
             print("Received unhandled cursor motion type: ", key)
 
+    def getCharAtPos(self, pos):
+        """Get the character index at a given position.
+        
+        This can be used to determine what character is under the specified 
+        position in the stimulus.
+
+        Parameters
+        ----------
+        pos : list, tuple
+            Position in stimulus units.
+
+        Returns
+        -------
+        int or None
+            Index of character at the given position. Returns None if no 
+            character is at the given position or if the position is outside
+            the stimulus bounds.
+            
+        """
+        px, py = pos[0] * 2.0, pos[1] * 2.0   # why x2?
+
+        # read verticies in blocks of 4
+        for i in range(0, len(self.vertices), 4):
+            # get the four corners of the character
+            charVertices = self.vertices[i:i + 4]
+            
+            x0, y0 = charVertices[0]  # top-left
+            x1, y1 = charVertices[2]  # bottom-right
+
+            # check if the mouse is within the bounds of the character
+            if x0 <= px <= x1 and y0 >= py >= y1:
+                toReturn = i // 4
+                return toReturn
+
+        return None
+
+    def _onMouse(self):
+        """Called by the window when the mouse is inside the stimulus.
+        """
+
+        if not self.editable:
+            return
+
+        # get button state
+        buttons = self.mouse.getPressed()
+        leftMbDn, middleMbDn, rightMbDn = buttons
+        if leftMbDn:
+            # get the character index at the given position
+            charIdxAtPointer = self.getCharAtPos(self.mouse.getPos())
+
+            if charIdxAtPointer:
+                self.caret.index = charIdxAtPointer
+
     @property
     def hasFocus(self):
         if self.win and self.win.currentEditable == self:
@@ -1598,6 +1704,19 @@ class Caret(ColorMixin):
         self.colorSpace = colorSpace
         self.color = color
 
+    def _drawLegacyGL(self):
+        """Legacy drawing code for older GL versions.
+        """
+        # If no override and conditions are met, or override is True, draw
+        gl.glLineWidth(self.width)
+        gl.glColor4f(
+            *self._foreColor.rgba1
+        )
+        gl.glBegin(gl.GL_LINES)
+        gl.glVertex2f(self.vertices[0, 0], self.vertices[0, 1])
+        gl.glVertex2f(self.vertices[1, 0], self.vertices[1, 1])
+        gl.glEnd()
+
     def draw(self, override=None):
         """
         Draw the caret
@@ -1619,16 +1738,29 @@ class Caret(ColorMixin):
         elif not override:
             # If override is False, never draw
             return
+        
+        if USE_LEGACY_GL:
+            self._drawLegacyGL()
+            return
 
         # If no override and conditions are met, or override is True, draw
-        gl.glLineWidth(self.width)
-        gl.glColor4f(
-            *self._foreColor.rgba1
-        )
-        gl.glBegin(gl.GL_LINES)
-        gl.glVertex2f(self.vertices[0, 0], self.vertices[0, 1])
-        gl.glVertex2f(self.vertices[1, 0], self.vertices[1, 1])
-        gl.glEnd()
+        prog = self.win._progSignedFrag
+        gt.useProgram(prog)
+        gt.setLineWidth(self.width)
+        gt.setUniformValue(prog, 'uColor', self._foreColor.rgba1)
+        gt.setUniformMatrix(
+            prog, 
+            b'uProjectionMatrix', 
+            self.win.projectionMatrix,
+            transpose=True)
+        gt.setUniformMatrix(
+            prog, 
+            b'uModelViewMatrix', 
+            self.win.viewMatrix,
+            transpose=True)
+        gt.drawClientArrays({
+            'gl_Vertex': self.vertices}, 'lines')
+        gt.useProgram(None)
 
     @property
     def visible(self):

psychopy/visual/vlcmoviestim.py

@@ -6,7 +6,7 @@ local installation of VLC media player (https://www.videolan.org/).
 """
 
 # Part of the PsychoPy library
-# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2024 Open Science Tools Ltd.
+# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2025 Open Science Tools Ltd.
 # Distributed under the terms of the GNU General Public License (GPL).
 #
 # VlcMovieStim originally contributed by Dan Fitch, April 2019. The `MovieStim2`