Added text input support and tweaked the new Font system. Welcome to …

…version 1.2

.gitignore

@@ -7,4 +7,6 @@
 *.so
 eel.c
 figure.c
-*.txt
+shader.c
+*.txt
+*.png

eel.pxd

@@ -118,4 +118,6 @@ Functions
 """
 cpdef keyPressed(key)
 cpdef keyRelease(key)
+cdef char _getChar()
+cpdef getText()
 cpdef mousePressed(int button)

eel.pyx

@@ -16,6 +16,9 @@ from glew cimport glewInit, glBindFramebuffer, glFramebufferTexture, glDrawBuffe
 from glfw3 cimport *
 from gl cimport *
 from SOIL cimport *
+
+# Python STDLIB
+from ctypes import c_ubyte
 # ------------------------------------------------------------------------------
 """
 Data Structuresa
@@ -42,6 +45,8 @@ cdef float ycoord[4]
 xcoord[0] = xcoord[1] = ycoord[0] = ycoord[3] = 1
 xcoord[2] = xcoord[3] = ycoord[1] = ycoord[2] = 0
 
+# ------------------------------------------------------------------------------
+__version__ = 1.2
 # ------------------------------------------------------------------------------
 """
 Eel's Paintable Superclass
@@ -297,6 +302,7 @@ cdef class Eel(Paintable):
 
         glfwMakeContextCurrent(self.window)
         glfwSetKeyCallback(self.window, keyCallback)
+        glfwSetCharCallback(self.window, charCallback)
         glfwSetMouseButtonCallback(self.window, mouseCallback)
         glfwSwapInterval(1)
 
@@ -550,6 +556,27 @@ cpdef keyRelease(key):
         _keyRelease(key)
 
 
+cdef char _getChar():
+    """
+    def _getChar()
+    Returns the last typed character
+    """
+
+    return _popChar() if _charCount() else 0
+
+
+cpdef getText():
+
+    l = []
+
+    cdef unsigned int j = c_ubyte(_getChar()).value
+    while j:
+        l.insert(0, chr(j))
+        j = _getChar()
+
+    return "".join(l[::-1])
+
+
 cpdef mousePressed(int button):
     """
     def mousePressed(button)

eelCallbacks.c

@@ -33,6 +33,27 @@ void _keyRelease(int key) {
 
     key_pressed &= (~(1ULL << key));
 
+}
+// -----------------------------------------------------------------------------
+// TEXT INPUT
+
+void charCallback(GLFWwindow *window, unsigned int codepoint) {
+
+    _input[_index] = codepoint;
+    _index = (_index + 1) % 256;
+
+}
+
+unsigned int _popChar() {
+
+    return _index ? _input[--_index] : 0;
+
+}
+
+int _charCount() {
+
+    return _index;
+
 }
 // -----------------------------------------------------------------------------
 // MOUSE INPUT

eelCallbacks.h

@@ -7,12 +7,21 @@
 // KEYBOARD INPUT
 // One for each ASCII-key
 static unsigned long long int key_pressed = 0;
-static struct _key keybuffer[255];
-static char keycount = 0;
+// static struct _key keybuffer[255];
+// static char keycount = 0;
 
 void keyCallback(GLFWwindow *window, int key, int scan, int action, int mods);
 int _keyPressed(int key);
 void _keyRelease(int key);
+// -----------------------------------------------------------------------------
+// TEXT INPUT
+static unsigned int _input[256];
+static int _index = 0;
+
+void charCallback(GLFWwindow *window, unsigned int codepoint);
+unsigned int _popChar();
+int _charCount();
+
 // -----------------------------------------------------------------------------
 // MOUSE INPUT
 static short int mouse_button = 0;

eelCallbacks.pxd

@@ -11,6 +11,10 @@ cdef extern from "eelCallbacks.h":
     int _keyPressed(int key)
     void _keyRelease(int key)
 
+    void charCallback(GLFWwindow *window, unsigned int codepoint)
+    unsigned int _popChar()
+    int _charCount()
+
     void mouseCallback(GLFWwindow *window, int button, int action, int mods)
     int _mousePressed(int button)
     void _mouseRelease(int button)

figure.pyx

@@ -218,7 +218,8 @@ Base Text (Cython Implementation)
 
 cdef class _BaseText(_BaseFigure):
 
-    cdef char *str
+    # cdef char *str
+    cdef int _strlen
     cdef Character *font
 
     def __cinit__(self, int x, int y, text, _BaseFont font=None):
@@ -234,13 +235,15 @@ cdef class _BaseText(_BaseFigure):
             self.font = font.font
             # self.poly.color = font.color
 
-        if type(text) is not bytes: text = bytes(text, "utf-8")
-        self.str = <char *> malloc(sizeof(char) * strlen(text))
-        strcpy(self.str, text)
+        # if type(text) is not bytes: text = bytes(text, "utf-8")
+        # self.str = <char *> malloc(sizeof(char) * strlen(text))
+        # strcpy(self.str, text)
 
+        self.str = text if type(text) is bytes else bytes(text, "utf-8")
+        self._strlen = len(self.str)
 
-    def __dealloc__(self):
-        free(self.str)
+    # def __dealloc__(self):
+        # free(self.str)
 
 
     cpdef drawTo(self, Paintable eel):
@@ -255,9 +258,8 @@ cdef class _BaseText(_BaseFigure):
         fx = self.x / width
         fy = self.y / height
 
-        # for i in range(0, self.chlen):
-        while (self.str[i]):
-            ch = self.font + self.str[i]
+        for i in range(0, self._strlen):
+            ch = self.font + <char>self.str[i]
 
             xpos = fx + ch.bear.x / width
             ypos = fy + (ch.size.y - ch.bear.y) / height
@@ -283,11 +285,12 @@ cdef class _BaseText(_BaseFigure):
 
 
     cpdef setText(self, text):
-        # self.str = text
-        if type(text) is not bytes: text = bytes(text, "utf-8")
-        free(self.str)
-        self.str = <char *> malloc(sizeof(char) * strlen(text))
-        strcpy(self.str, text)
+        self.str = text
+        self._strlen = len(text)
+        # if type(text) is not bytes: text = bytes(text, "utf-8")
+        # free(self.str)
+        # self.str = <char *> malloc(sizeof(char) * strlen(text))
+        # strcpy(self.str, text)
 
 
     cpdef getWidth(self):
@@ -300,7 +303,7 @@ cdef class _BaseText(_BaseFigure):
 
         # for i in range(0, ln):
         while (self.str[i]):
-            ch = self.font + self.str[i]
+            ch = self.font + <char>self.str[i]
             x += (ch.advance >> 6)
 
             i += 1
@@ -318,7 +321,7 @@ cdef class _BaseText(_BaseFigure):
 
         # for i in range(0, ln):
         while (self.str[i]):
-            ch = self.font + self.str[i]
+            ch = self.font + <char>self.str[i]
             y = max(y, ch.size.y)
 
             i += 1