Add _stc, fix wxMemoryBuffer bindings

Author: amauryfa

etg/unfinished/_stc.py renamed to etg/_stc.py

@@ -34,7 +34,8 @@
 # sources and/or additional dependencies when building this extension module.
 ETGFILES = ['etg/%s.py' % NAME] + tools.getEtgFiles(INCLUDES)
 DEPENDS = tools.getNonEtgFiles(INCLUDES)
-OTHERDEPS = [  ]
+OTHERDEPS = [ 'etg/cffi/_stc.py',
+            ]
 
 
 #---------------------------------------------------------------------------
@@ -49,7 +50,8 @@ def run():
     # Tweak the parsed meta objects in the module object as needed for
     # customizing the generated code and docstrings.
 
-    module.addHeaderCode('#include <wxpy_api.h>')
+    # XXX(amauryfa): only for SIP?
+    # module.addHeaderCode('#include <wxpy_api.h>')
     module.addImport('_core')
     module.addPyCode('import wx', order=10)
     module.addInclude(INCLUDES)
@@ -90,34 +92,9 @@ def run():
     ht2.find('row').out = True
     ht2.find('col').out = True
 
-    
-    # Replace the *Pointer methods with ones that return a memoryview object instead.
-    c.find('GetCharacterPointer').ignore()
-    c.addCppMethod('PyObject*', 'GetCharacterPointer', '()',
-        doc="""\
-            Compact the document buffer and return a read-only memoryview 
-            object of the characters in the document.""",
-        body="""
-            const char* ptr = self->GetCharacterPointer();
-            Py_ssize_t len = self->GetLength();
-            PyObject* rv;
-            wxPyBLOCK_THREADS( rv = wxPyMakeBuffer((void*)ptr, len, true) );
-            return rv;
-            """)
-    
-    c.find('GetRangePointer').ignore()
-    c.addCppMethod('PyObject*', 'GetRangePointer', '(int position, int rangeLength)',
-        doc="""\
-            Return a read-only pointer to a range of characters in the 
-            document. May move the gap so that the range is contiguous, 
-            but will only move up to rangeLength bytes.""",
-        body="""
-            const char* ptr = self->GetRangePointer(position, rangeLength);
-            Py_ssize_t len = rangeLength;
-            PyObject* rv;
-            wxPyBLOCK_THREADS( rv = wxPyMakeBuffer((void*)ptr, len, true) );
-            return rv;
-            """)
+
+    # TODO(amauryfa): GetCharacterPointer
+    # TODO(amauryfa): GetRangePointer
 
     # TODO:  Add the UTF8 PyMethods from classic (see _stc_utf8_methods.py)
 

etg/cffi/_stc.py

@@ -0,0 +1,6 @@
+def run(module):
+
+    module.addPyCode('''\
+    from ._stc import *
+    from . import _stc
+    ''', order=0)

etg/cffi/wxpybuffer.py

@@ -16,7 +16,7 @@ def run():
     typedef struct wxPyBuffer
     {
         size_t m_len;
-        char *m_ptr;
+        char *m_ptr;  // owned, allocated with malloc()
     } wxPyBuffer;
     """)
     module.addHeaderCode(tools.textfile_open('src/cffi/wxpybuffer.h').read())
@@ -53,12 +53,10 @@ def run():
             return False
         """))
 
-    # TODO: Uncomment these when re-adding _stc or stream
-    '''
     module.addItem(etgtools.MappedTypeDef_cffi(
         name='wxMemoryBuffer', cType='wxPyBuffer *',
 
-        py2c="""
+        py2c="""\
         memview = memoryview(py_obj)
         chardata = ffi.new('char[]', memview.itemsize)
         for i in range(memview.itemsize):
@@ -70,12 +68,18 @@ def run():
         return (cdata, (cdata, chardata))
         """,
 
-        c2cpp="return new wxCharBuffer(cdata);",
+        c2cpp="""\
+        wxMemoryBuffer* buffer = new wxMemoryBuffer(cdata->m_len);
+        memcpy(buffer->GetData(), cdata->m_ptr, buffer->GetDataLen());
+        return buffer;
+        """,
 
         cpp2c="""\
-        char *cdata = (char*)malloc(cpp_obj->length() + 1);
-        memcpy(cdata, (char*)cpp_obj->GetData(), cpp_obj->GetDataLen());
-        return cdata;
+        wxPyBuffer* buffer = (wxPyBuffer*)malloc(sizeof(wxPyBuffer));
+        buffer->m_len = cpp_obj->GetDataLen();
+        buffer->m_ptr = (char*)malloc(buffer->m_len);
+        memcpy(buffer->m_ptr, cpp_obj->GetData(), cpp_obj->GetDataLen());
+        return buffer;
         """,
         c2py="""
         ret = bytearr
@@ -107,7 +111,6 @@ def run():
         return ret
         """,
         instanceCheck="return isinstance(py_obj, str)"))
-    '''
 
     #-----------------------------------------------------------------
     tools.doCommonTweaks(module)

etg/sip/_stc.py

@@ -0,0 +1,33 @@
+import etgtools
+
+def run(module):
+    c = module.find('wxStyledTextCtrl')
+
+    # Replace the *Pointer methods with ones that return a memoryview object instead.
+    c.find('GetCharacterPointer').ignore()
+    c.addCppMethod('PyObject*', 'GetCharacterPointer', '()',
+        doc="""\
+            Compact the document buffer and return a read-only memoryview 
+            object of the characters in the document.""",
+        body="""
+            const char* ptr = self->GetCharacterPointer();
+            Py_ssize_t len = self->GetLength();
+            PyObject* rv;
+            wxPyBLOCK_THREADS( rv = wxPyMakeBuffer((void*)ptr, len, true) );
+            return rv;
+            """)
+    
+    c.find('GetRangePointer').ignore()
+    c.addCppMethod('PyObject*', 'GetRangePointer', '(int position, int rangeLength)',
+        doc="""\
+            Return a read-only pointer to a range of characters in the 
+            document. May move the gap so that the range is contiguous, 
+            but will only move up to rangeLength bytes.""",
+        body="""
+            const char* ptr = self->GetRangePointer(position, rangeLength);
+            Py_ssize_t len = rangeLength;
+            PyObject* rv;
+            wxPyBLOCK_THREADS( rv = wxPyMakeBuffer((void*)ptr, len, true) );
+            return rv;
+            """)
+