key/char event changes for inline editing (japanese/hirgana etc)

[wxWidgets.git] / src / stc / gen_iface.py

diff --git a/src/stc/gen_iface.py b/src/stc/gen_iface.py
index 070d4cbe90e78dbbe30e99f022082745b93b33b2..4e0afbb12919223ce91886da00d085fc8315d8bc 100644 (file)
--- a/src/stc/gen_iface.py
+++ b/src/stc/gen_iface.py
@@ -21,6 +21,7 @@ H_TEMPLATE    = os.path.abspath('./stc.h.in')
 CPP_TEMPLATE  = os.path.abspath('./stc.cpp.in')
 H_DEST        = os.path.abspath('../../include/wx/stc/stc.h')
 CPP_DEST      = os.path.abspath('./stc.cpp')
 CPP_TEMPLATE  = os.path.abspath('./stc.cpp.in')
 H_DEST        = os.path.abspath('../../include/wx/stc/stc.h')
 CPP_DEST      = os.path.abspath('./stc.cpp')

+DOCSTR_DEST   = os.path.abspath('../../../wxPython/contrib/stc/_stc_gendocs.i')

 
 
 # Value prefixes to convert
 
 
 # Value prefixes to convert


@@ -35,7 +36,7 @@ valPrefixes = [('SCI_', ''),
                ('SCWS_', 'WS_'),
 ]
 
                ('SCWS_', 'WS_'),
 ]
 

-# Message function values that should have a CMD_ constant as well
+# Message function values that should have a CMD_ constant generated

 cmdValues = [ (2300, 2349),
               2011,
               2013,
 cmdValues = [ (2300, 2349),
               2011,
               2013,


@@ -45,10 +46,14 @@ cmdValues = [ (2300, 2349),
               2404,
               (2413, 2416),
               (2426, 2442),
               2404,
               (2413, 2416),
               (2426, 2442),

-              (2450, 2454),
+              (2450, 2455),

             ]
 
 
             ]
 
 

+# Should a funciton be also generated for the CMDs?
+FUNC_FOR_CMD = True
+
+

 # Map some generic typenames to wx types, using return value syntax
 retTypeMap = {
     'position': 'int',
 # Map some generic typenames to wx types, using return value syntax
 retTypeMap = {
     'position': 'int',


@@ -89,6 +94,14 @@ methodOverrideMap = {
                           SendMsg(%s, data.GetDataLen(), (long)data.GetData());''',
                        0),
 
                           SendMsg(%s, data.GetDataLen(), (long)data.GetData());''',
                        0),
 

+    'AppendText' : (0,
+                 'void %s(const wxString& text);',
+
+                 '''void %s(const wxString& text) {
+                    wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
+                    SendMsg(%s, strlen(buf), (long)(const char*)buf);''',
+                 0),
+

     'GetViewWS' : ( 'GetViewWhiteSpace', 0, 0, 0),
     'SetViewWS' : ( 'SetViewWhiteSpace', 0, 0, 0),
 
     'GetViewWS' : ( 'GetViewWhiteSpace', 0, 0, 0),
     'SetViewWS' : ( 'SetViewWhiteSpace', 0, 0, 0),
 


@@ -190,6 +203,8 @@ methodOverrideMap = {
         // convert bmp to a xpm in a string
         wxMemoryOutputStream strm;
         wxImage img = bmp.ConvertToImage();
         // convert bmp to a xpm in a string
         wxMemoryOutputStream strm;
         wxImage img = bmp.ConvertToImage();

+        if (img.HasAlpha())
+            img.ConvertAlphaToMask();

         img.SaveFile(strm, wxBITMAP_TYPE_XPM);
         size_t len = strm.GetSize();
         char* buff = new char[len+1];
         img.SaveFile(strm, wxBITMAP_TYPE_XPM);
         size_t len = strm.GetSize();
         char* buff = new char[len+1];


@@ -216,7 +231,8 @@ methodOverrideMap = {
     'SetSelBack' : ('SetSelBackground', 0, 0, 0),
     'SetCaretFore' : ('SetCaretForeground', 0, 0, 0),
     'StyleSetFont' : ('StyleSetFaceName', 0, 0, 0),
     'SetSelBack' : ('SetSelBackground', 0, 0, 0),
     'SetCaretFore' : ('SetCaretForeground', 0, 0, 0),
     'StyleSetFont' : ('StyleSetFaceName', 0, 0, 0),

-
+    'StyleSetCharacterSet' : (None, 0, 0, 0),
+    

     'AssignCmdKey' :
     ('CmdKeyAssign',
      'void %s(int key, int modifiers, int cmd);',
     'AssignCmdKey' :
     ('CmdKeyAssign',
      'void %s(int key, int modifiers, int cmd);',


@@ -285,6 +301,8 @@ methodOverrideMap = {
         // convert bmp to a xpm in a string
         wxMemoryOutputStream strm;
         wxImage img = bmp.ConvertToImage();
         // convert bmp to a xpm in a string
         wxMemoryOutputStream strm;
         wxImage img = bmp.ConvertToImage();

+        if (img.HasAlpha())
+            img.ConvertAlphaToMask();

         img.SaveFile(strm, wxBITMAP_TYPE_XPM);
         size_t len = strm.GetSize();
         char* buff = new char[len+1];
         img.SaveFile(strm, wxBITMAP_TYPE_XPM);
         size_t len = strm.GetSize();
         char* buff = new char[len+1];


@@ -497,6 +515,11 @@ methodOverrideMap = {
          return SendMsg(%s, strlen(buf), (long)(const char*)buf);''',
      0),
 
          return SendMsg(%s, strlen(buf), (long)(const char*)buf);''',
      0),
 

+    # not sure what to do about these yet
+    'TargetAsUTF8' :       ( None, 0, 0, 0),
+    'SetLengthForEncode' : ( None, 0, 0, 0),
+    'EncodedFromUTF8' :    ( None, 0, 0, 0),
+    

 
     'GetDocPointer' :
     (0,
 
     'GetDocPointer' :
     (0,


@@ -550,7 +573,7 @@ methodOverrideMap = {
 
     'GrabFocus' : (None, 0, 0, 0),
 
 
     'GrabFocus' : (None, 0, 0, 0),
 

-    # Rename some that woudl otherwise hid the wxWindow methods
+    # Rename some that would otherwise hide the wxWindow methods

     'SetFocus'  : ('SetSTCFocus', 0, 0, 0),
     'GetFocus'  : ('GetSTCFocus', 0, 0, 0),
     'SetCursor' : ('SetSTCCursor', 0, 0, 0),
     'SetFocus'  : ('SetSTCFocus', 0, 0, 0),
     'GetFocus'  : ('GetSTCFocus', 0, 0, 0),
     'SetCursor' : ('SetSTCCursor', 0, 0, 0),


@@ -559,89 +582,13 @@ methodOverrideMap = {
     'LoadLexerLibrary' : (None, 0,0,0),
 
 
     'LoadLexerLibrary' : (None, 0,0,0),
 
 

-
-    # Remove all methods that are key commands since they can be
-    # executed with CmdKeyExecute
-    'LineDown' : (None, 0, 0, 0),
-    'LineDownExtend' : (None, 0, 0, 0),
-    'LineUp' : (None, 0, 0, 0),
-    'LineUpExtend' : (None, 0, 0, 0),
-    'CharLeft' : (None, 0, 0, 0),
-    'CharLeftExtend' : (None, 0, 0, 0),
-    'CharRight' : (None, 0, 0, 0),
-    'CharRightExtend' : (None, 0, 0, 0),
-    'WordLeft' : (None, 0, 0, 0),
-    'WordLeftExtend' : (None, 0, 0, 0),
-    'WordRight' : (None, 0, 0, 0),
-    'WordRightExtend' : (None, 0, 0, 0),
-    'Home' : (None, 0, 0, 0),
-    'HomeExtend' : (None, 0, 0, 0),
-    'LineEnd' : (None, 0, 0, 0),
-    'LineEndExtend' : (None, 0, 0, 0),
-    'DocumentStart' : (None, 0, 0, 0),
-    'DocumentStartExtend' : (None, 0, 0, 0),
-    'DocumentEnd' : (None, 0, 0, 0),
-    'DocumentEndExtend' : (None, 0, 0, 0),
-    'PageUp' : (None, 0, 0, 0),
-    'PageUpExtend' : (None, 0, 0, 0),
-    'PageDown' : (None, 0, 0, 0),
-    'PageDownExtend' : (None, 0, 0, 0),
-    'EditToggleOvertype' : (None, 0, 0, 0),
-    'Cancel' : (None, 0, 0, 0),
-    'DeleteBack' : (None, 0, 0, 0),
-    'Tab' : (None, 0, 0, 0),
-    'BackTab' : (None, 0, 0, 0),
-    'NewLine' : (None, 0, 0, 0),
-    'FormFeed' : (None, 0, 0, 0),
-    'VCHome' : (None, 0, 0, 0),
-    'VCHomeExtend' : (None, 0, 0, 0),
-    'ZoomIn' : (None, 0, 0, 0),
-    'ZoomOut' : (None, 0, 0, 0),
-    'DelWordLeft' : (None, 0, 0, 0),
-    'DelWordRight' : (None, 0, 0, 0),
-    'LineCut' : (None, 0, 0, 0),
-    'LineDelete' : (None, 0, 0, 0),
-    'LineTranspose' : (None, 0, 0, 0),
-    'LowerCase' : (None, 0, 0, 0),
-    'UpperCase' : (None, 0, 0, 0),
-    'LineScrollDown' : (None, 0, 0, 0),
-    'LineScrollUp' : (None, 0, 0, 0),
-    'DeleteBackNotLine' : (None, 0, 0, 0),
-    'HomeWrap' : (None, 0, 0, 0),
-    'HomeWrapExtend' : (None, 0, 0, 0),
-    'LineEndWrap' : (None, 0, 0, 0),
-    'LineEndWrapExtend' : (None, 0, 0, 0),
-    'VCHomeWrap' : (None, 0, 0, 0),
-    'VCHomeWrapExtend' : (None, 0, 0, 0),
-    'ParaDown' : (None, 0, 0, 0),
-    'ParaDownExtend' : (None, 0, 0, 0),
-    'ParaUp' : (None, 0, 0, 0),
-    'ParaUpExtend' : (None, 0, 0, 0),
-    'LineDownRectExtend' : (None, 0, 0, 0),
-    'LineUpRectExtend' : (None, 0, 0, 0),
-    'CharLeftRectExtend' : (None, 0, 0, 0),
-    'CharRightRectExtend' : (None, 0, 0, 0),
-    'HomeRectExtend' : (None, 0, 0, 0),
-    'VCHomeRectExtend' : (None, 0, 0, 0),
-    'LineEndRectExtend' : (None, 0, 0, 0),
-    'PageUpRectExtend' : (None, 0, 0, 0),
-    'PageDownRectExtend' : (None, 0, 0, 0),
-    'StutteredPageUp' : (None, 0, 0, 0),
-    'StutteredPageUpExtend' : (None, 0, 0, 0),
-    'StutteredPageDown' : (None, 0, 0, 0),
-    'StutteredPageDownExtend' : (None, 0, 0, 0),
-    'WordLeftEnd' : (None, 0, 0, 0),
-    'WordLeftEndExtend' : (None, 0, 0, 0),
-    'WordRightEnd' : (None, 0, 0, 0),
-    'WordRightEndExtend' : (None, 0, 0, 0),
-

     '' : ('', 0, 0, 0),
 
     }
 
 #----------------------------------------------------------------------------
 
     '' : ('', 0, 0, 0),
 
     }
 
 #----------------------------------------------------------------------------
 

-def processIface(iface, h_tmplt, cpp_tmplt, h_dest, cpp_dest):
+def processIface(iface, h_tmplt, cpp_tmplt, h_dest, cpp_dest, docstr_dest):

     curDocStrings = []
     values = []
     methods = []
     curDocStrings = []
     values = []
     methods = []


@@ -688,7 +635,7 @@ def processIface(iface, h_tmplt, cpp_tmplt, h_dest, cpp_dest):
     data = {}
     data['VALUES'] = processVals(values)
     data['CMDS']   = processVals(cmds)
     data = {}
     data['VALUES'] = processVals(values)
     data['CMDS']   = processVals(cmds)

-    defs, imps = processMethods(methods)
+    defs, imps, docstrings = processMethods(methods)

     data['METHOD_DEFS'] = defs
     data['METHOD_IMPS'] = imps
 
     data['METHOD_DEFS'] = defs
     data['METHOD_IMPS'] = imps
 


@@ -703,6 +650,7 @@ def processIface(iface, h_tmplt, cpp_tmplt, h_dest, cpp_dest):
     # write out destination files
     open(h_dest, 'w').write(h_text)
     open(cpp_dest, 'w').write(cpp_text)
     # write out destination files
     open(h_dest, 'w').write(h_text)
     open(cpp_dest, 'w').write(cpp_text)

+    open(docstr_dest, 'w').write(docstrings)

 
 
 
 
 
 


@@ -723,6 +671,7 @@ def processVals(values):
 def processMethods(methods):
     defs = []
     imps = []
 def processMethods(methods):
     defs = []
     imps = []

+    dstr = []

 
     for retType, name, number, param1, param2, docs in methods:
         retType = retTypeMap.get(retType, retType)
 
     for retType, name, number, param1, param2, docs in methods:
         retType = retTypeMap.get(retType, retType)


@@ -733,6 +682,11 @@ def processMethods(methods):
         if name is None:
             continue
 
         if name is None:
             continue
 

+        # Build docstrings
+        st = 'DocStr(wxStyledTextCtrl::%s,\n' \
+             '"%s", "");\n' % (name, '\n'.join(docs))
+        dstr.append(st)
+        

         # Build the method definition for the .h file
         if docs:
             defs.append('')
         # Build the method definition for the .h file
         if docs:
             defs.append('')


@@ -766,7 +720,7 @@ def processMethods(methods):
         imps.append(theImp)
 
 
         imps.append(theImp)
 
 

-    return string.join(defs, '\n'), string.join(imps, '\n')
+    return '\n'.join(defs), '\n'.join(imps), '\n'.join(dstr)

 
 
 #----------------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------------


@@ -870,9 +824,12 @@ def parseFun(line, methods, docs, values):
     for v in cmdValues:
         if (type(v) == type(()) and v[0] <= num <= v[1]) or v == num:
             parseVal('CMD_%s=%s' % (string.upper(name), number), values, docs)
     for v in cmdValues:
         if (type(v) == type(()) and v[0] <= num <= v[1]) or v == num:
             parseVal('CMD_%s=%s' % (string.upper(name), number), values, docs)

-
-    #if retType == 'void' and not param1 and not param2:
-
+            
+            # if we are not also doing a function for CMD values, then
+            # just return, otherwise fall through to the append blow.
+            if not FUNC_FOR_CMD:
+                return
+                

     methods.append( (retType, name, number, param1, param2, tuple(docs)) )
 
 
     methods.append( (retType, name, number, param1, param2, tuple(docs)) )
 
 


@@ -883,7 +840,7 @@ def main(args):
     # TODO: parse command line args to replace default input/output files???
 
     # Now just do it
     # TODO: parse command line args to replace default input/output files???
 
     # Now just do it

-    processIface(IFACE, H_TEMPLATE, CPP_TEMPLATE, H_DEST, CPP_DEST)
+    processIface(IFACE, H_TEMPLATE, CPP_TEMPLATE, H_DEST, CPP_DEST, DOCSTR_DEST)