X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/713a0408bb325665b88871ff731c902a44d2e04a..88932ec82d048d006cdc81bd309f5e59aee799ac:/src/stc/gen_iface.py?ds=sidebyside diff --git a/src/stc/gen_iface.py b/src/stc/gen_iface.py index 54efef00db..9db059ea9f 100755 --- a/src/stc/gen_iface.py +++ b/src/stc/gen_iface.py @@ -8,7 +8,7 @@ # Created: 5-Sept-2000 # RCS-ID: $Id$ # Copyright: (c) 2000 by Total Control Software -# Licence: wxWindows license +# Licence: wxWindows licence #---------------------------------------------------------------------------- @@ -18,10 +18,15 @@ from fileinput import FileInput IFACE = os.path.abspath('./scintilla/include/Scintilla.iface') H_TEMPLATE = os.path.abspath('./stc.h.in') +IH_TEMPLATE = os.path.abspath('./stc.interface.h.in') CPP_TEMPLATE = os.path.abspath('./stc.cpp.in') H_DEST = os.path.abspath('../../include/wx/stc/stc.h') +IH_DEST = os.path.abspath('../../interface/wx/stc/stc.h') CPP_DEST = os.path.abspath('./stc.cpp') -DOCSTR_DEST = '/dev/null' #os.path.abspath('../../../wxPython/contrib/stc/_stc_gendocs.i') +if len(sys.argv) > 1 and sys.argv[1] == '--wxpython': + DOCSTR_DEST = os.path.abspath('../../../wxPython/src/_stc_gendocs.i') +else: + DOCSTR_DEST = '/dev/null' # Value prefixes to convert @@ -29,6 +34,7 @@ valPrefixes = [('SCI_', ''), ('SC_', ''), ('SCN_', None), # just toss these out... ('SCEN_', None), + ('SC_EFF', None), ('SCE_', ''), ('SCLEX_', 'LEX_'), ('SCK_', 'KEY_'), @@ -48,6 +54,8 @@ cmdValues = [ 2011, (2426, 2442), (2450, 2455), 2518, + (2619, 2621), + (2628, 2629) ] @@ -84,8 +92,8 @@ methodOverrideMap = { 'void %s(const wxString& text);', '''void %s(const wxString& text) { - wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text); - SendMsg(%s, strlen(buf), (sptr_t)(const char*)buf);''', + const wxWX2MBbuf buf = wx2stc(text); + SendMsg(%s, wx2stclen(text, buf), (sptr_t)(const char*)buf);''', 0), 'AddStyledText' : (0, @@ -99,8 +107,8 @@ methodOverrideMap = { 'void %s(const wxString& text);', '''void %s(const wxString& text) { - wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text); - SendMsg(%s, strlen(buf), (sptr_t)(const char*)buf);''', + const wxWX2MBbuf buf = wx2stc(text); + SendMsg(%s, wx2stclen(text, buf), (sptr_t)(const char*)buf);''', 0), 'GetViewWS' : ( 'GetViewWhiteSpace', 0, 0, 0), @@ -176,6 +184,9 @@ methodOverrideMap = { 'MarkerSetFore' : ('MarkerSetForeground', 0, 0, 0), 'MarkerSetBack' : ('MarkerSetBackground', 0, 0, 0), + 'MarkerSetBackSelected' : ('MarkerSetBackgroundSelected', 0,0,0), + + 'MarkerSymbolDefined' : ('GetMarkerSymbolDefined', 0, 0, 0), 'MarkerDefine' : (0, @@ -188,9 +199,9 @@ methodOverrideMap = { const wxColour& background) { SendMsg(%s, markerNumber, markerSymbol); - if (foreground.Ok()) + if (foreground.IsOk()) MarkerSetForeground(markerNumber, foreground); - if (background.Ok()) + if (background.IsOk()) MarkerSetBackground(markerNumber, background);''', ('Set the symbol used for a particular marker number,', @@ -225,7 +236,77 @@ methodOverrideMap = { 'GetMarginMaskN' : ('GetMarginMask', 0, 0, 0), 'SetMarginSensitiveN' : ('SetMarginSensitive', 0, 0, 0), 'GetMarginSensitiveN' : ('GetMarginSensitive', 0, 0, 0), + 'SetMarginCursorN' : ('SetMarginCursor', 0, 0, 0), + 'GetMarginCursorN' : ('GetMarginCursor', 0, 0, 0), + + 'MarginGetText' : + (0, + 'wxString %s(int line) const;', + + '''wxString %s(int line) const { + long msg = %s; + long len = SendMsg(msg, line, 0); + + wxMemoryBuffer mbuf(len+1); + char* buf = (char*)mbuf.GetWriteBuf(len+1); + SendMsg(msg, line, (sptr_t)buf); + mbuf.UngetWriteBuf(len); + mbuf.AppendByte(0); + return stc2wx(buf);''', + 0), + + 'MarginGetStyles' : + (0, + 'wxString %s(int line) const;', + + '''wxString %s(int line) const { + long msg = %s; + long len = SendMsg(msg, line, 0); + wxMemoryBuffer mbuf(len+1); + char* buf = (char*)mbuf.GetWriteBuf(len+1); + SendMsg(msg, line, (sptr_t)buf); + mbuf.UngetWriteBuf(len); + mbuf.AppendByte(0); + return stc2wx(buf);''', + 0), + + 'SetAdditionalSelFore' : ('SetAdditionalSelForeground', 0, 0, 0), + 'SetAdditionalSelBack' : ('SetAdditionalSelBackground', 0, 0, 0), + 'SetAdditionalCaretFore' : ('SetAdditionalCaretForeground', 0, 0, 0), + 'GetAdditionalCaretFore' : ('GetAdditionalCaretForeground', 0, 0, 0), + + 'AnnotationGetText' : + (0, + 'wxString %s(int line) const;', + + '''wxString %s(int line) const { + long msg = %s; + long len = SendMsg(msg, line, 0); + + wxMemoryBuffer mbuf(len+1); + char* buf = (char*)mbuf.GetWriteBuf(len+1); + SendMsg(msg, line, (sptr_t)buf); + mbuf.UngetWriteBuf(len); + mbuf.AppendByte(0); + return stc2wx(buf);''', + 0), + + 'AnnotationGetStyles' : + (0, + 'wxString %s(int line) const;', + + '''wxString %s(int line) const { + long msg = %s; + long len = SendMsg(msg, line, 0); + + wxMemoryBuffer mbuf(len+1); + char* buf = (char*)mbuf.GetWriteBuf(len+1); + SendMsg(msg, line, (sptr_t)buf); + mbuf.UngetWriteBuf(len); + mbuf.AppendByte(0); + return stc2wx(buf);''', + 0), 'StyleGetFore' : ('StyleGetForeground', 0, 0, 0), 'StyleGetBack' : ('StyleGetBackground', 0, 0, 0), @@ -279,6 +360,10 @@ methodOverrideMap = { 0), + 'IndicSetAlpha' : ('IndicatorSetAlpha', 0, 0, 0), + 'IndicGetAlpha' : ('IndicatorGetAlpha', 0, 0, 0), + 'IndicSetOutlineAlpha' : ('IndicatorSetOutlineAlpha', 0, 0, 0), + 'IndicGetOutlineAlpha' : ('IndicatorGetOutlineAlpha', 0, 0, 0), 'IndicSetStyle' : ('IndicatorSetStyle', 0, 0, 0), 'IndicGetStyle' : ('IndicatorGetStyle', 0, 0, 0), 'IndicSetFore' : ('IndicatorSetForeground', 0, 0, 0), @@ -312,11 +397,14 @@ methodOverrideMap = { 'AutoCGetTypeSeparator' : ('AutoCompGetTypeSeparator', 0, 0, 0), 'AutoCSetTypeSeparator' : ('AutoCompSetTypeSeparator', 0, 0, 0), 'AutoCGetCurrent' : ('AutoCompGetCurrent', 0, 0, 0), + 'AutoCGetCurrentText' : (None, 0, 0, 0), 'AutoCSetMaxWidth' : ('AutoCompSetMaxWidth', 0, 0, 0), 'AutoCGetMaxWidth' : ('AutoCompGetMaxWidth', 0, 0, 0), 'AutoCSetMaxHeight' : ('AutoCompSetMaxHeight', 0, 0, 0), 'AutoCGetMaxHeight' : ('AutoCompGetMaxHeight', 0, 0, 0), 'AutoCGetMaxHeight' : ('AutoCompGetMaxHeight', 0, 0, 0), + 'AutoCSetCaseInsensitiveBehaviour' : ('AutoCompSetCaseInsensitiveBehaviour', 0, 0, 0), + 'AutoCGetCaseInsensitiveBehaviour' : ('AutoCompGetCaseInsensitiveBehaviour', 0, 0, 0), 'RegisterImage' : (0, @@ -362,7 +450,7 @@ methodOverrideMap = { TextToFind ft; ft.chrg.cpMin = minPos; ft.chrg.cpMax = maxPos; - wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text); + const wxWX2MBbuf buf = wx2stc(text); ft.lpstrText = (char*)(const char*)buf; return SendMsg(%s, flags, (sptr_t)&ft);''', @@ -432,11 +520,7 @@ methodOverrideMap = { 'wxString %s();', '''wxString %s() { - long start; - long end; - - GetSelection(&start, &end); - int len = end - start; + const int len = SendMsg(SCI_GETSELTEXT, 0, (sptr_t)0); if (!len) return wxEmptyString; wxMemoryBuffer mbuf(len+2); @@ -519,8 +603,8 @@ methodOverrideMap = { ''' int %s(const wxString& text) { - wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text); - return SendMsg(%s, strlen(buf), (sptr_t)(const char*)buf);''', + const wxWX2MBbuf buf = wx2stc(text); + return SendMsg(%s, wx2stclen(text, buf), (sptr_t)(const char*)buf);''', 0), 'ReplaceTargetRE' : @@ -529,8 +613,8 @@ methodOverrideMap = { ''' int %s(const wxString& text) { - wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text); - return SendMsg(%s, strlen(buf), (sptr_t)(const char*)buf);''', + const wxWX2MBbuf buf = wx2stc(text); + return SendMsg(%s, wx2stclen(text, buf), (sptr_t)(const char*)buf);''', 0), 'SearchInTarget' : @@ -539,8 +623,8 @@ methodOverrideMap = { ''' int %s(const wxString& text) { - wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text); - return SendMsg(%s, strlen(buf), (sptr_t)(const char*)buf);''', + const wxWX2MBbuf buf = wx2stc(text); + return SendMsg(%s, wx2stclen(text, buf), (sptr_t)(const char*)buf);''', 0), # not sure what to do about these yet @@ -650,7 +734,187 @@ methodOverrideMap = { 'SetPositionCache' : ('SetPositionCacheSize', 0, 0, 0), 'GetPositionCache' : ('GetPositionCacheSize', 0, 0, 0), + 'GetLexerLanguage' : (None, 0, 0, 0), + 'SetFontQuality' : (None, 0, 0, 0), + 'GetFontQuality' : (None, 0, 0, 0), + 'SetSelection' : (None, 0, 0, 0), + + 'GetCharacterPointer' : (0, + 'const char* %s() const;', + 'const char* %s() const {\n' + ' return (const char*)SendMsg(%s, 0, 0);', + 0), + + 'GetRangePointer' : (0, + 'const char* %s(int position, int rangeLength) const;', + 'const char* %s(int position, int rangeLength) const {\n' + ' return (const char*)SendMsg(%s, position, rangeLength);', + 0), + + + 'GetWordChars' : + (0, + 'wxString %s() const;', + + '''wxString %s() const { + int msg = %s; + int len = SendMsg(msg, 0, (sptr_t)NULL); + if (!len) return wxEmptyString; + + wxMemoryBuffer mbuf(len+1); + char* buf = (char*)mbuf.GetWriteBuf(len+1); + SendMsg(msg, 0, (sptr_t)buf); + mbuf.UngetWriteBuf(len); + mbuf.AppendByte(0); + return stc2wx(buf);''', + + ('Get the set of characters making up words for when moving or selecting by word.',)), + + 'GetTag' : + (0, + 'wxString %s(int tagNumber) const;', + + '''wxString %s(int tagNumber) const { + int msg = %s; + int len = SendMsg(msg, tagNumber, (sptr_t)NULL); + if (!len) return wxEmptyString; + + wxMemoryBuffer mbuf(len+1); + char* buf = (char*)mbuf.GetWriteBuf(len+1); + SendMsg(msg, tagNumber, (sptr_t)buf); + mbuf.UngetWriteBuf(len); + mbuf.AppendByte(0); + return stc2wx(buf);''', + 0), + + 'GetWhitespaceChars' : + (0, + 'wxString %s() const;', + + '''wxString %s() const { + int msg = %s; + int len = SendMsg(msg, 0, (sptr_t)NULL); + if (!len) return wxEmptyString; + + wxMemoryBuffer mbuf(len+1); + char* buf = (char*)mbuf.GetWriteBuf(len+1); + SendMsg(msg, 0, (sptr_t)buf); + mbuf.UngetWriteBuf(len); + mbuf.AppendByte(0); + return stc2wx(buf);''', + 0), + + + 'GetPunctuationChars' : + (0, + 'wxString %s() const;', + + '''wxString %s() const { + int msg = %s; + int len = SendMsg(msg, 0, (sptr_t)NULL); + if (!len) return wxEmptyString; + + wxMemoryBuffer mbuf(len+1); + char* buf = (char*)mbuf.GetWriteBuf(len+1); + SendMsg(msg, 0, (sptr_t)buf); + mbuf.UngetWriteBuf(len); + mbuf.AppendByte(0); + return stc2wx(buf);''', + 0), + + 'PropertyNames' : + (0, + 'wxString %s() const;', + + '''wxString %s() const { + int msg = %s; + int len = SendMsg(msg, 0, (sptr_t)NULL); + if (!len) return wxEmptyString; + + wxMemoryBuffer mbuf(len+1); + char* buf = (char*)mbuf.GetWriteBuf(len+1); + SendMsg(msg, 0, (sptr_t)buf); + mbuf.UngetWriteBuf(len); + mbuf.AppendByte(0); + return stc2wx(buf);''', + 0), + + + + 'DescribeProperty' : + (0, + 'wxString %s(const wxString& name) const;', + + '''wxString %s(const wxString& name) const { + int msg = %s; + int len = SendMsg(msg, (sptr_t)(const char*)wx2stc(name), (sptr_t)NULL); + if (!len) return wxEmptyString; + + wxMemoryBuffer mbuf(len+1); + char* buf = (char*)mbuf.GetWriteBuf(len+1); + SendMsg(msg, (sptr_t)(const char*)wx2stc(name), (sptr_t)buf); + mbuf.UngetWriteBuf(len); + mbuf.AppendByte(0); + return stc2wx(buf);''', + 0), + + + + 'DescribeKeyWordSets' : + (0, + 'wxString %s() const;', + + '''wxString %s() const { + int msg = %s; + int len = SendMsg(msg, 0, (sptr_t)NULL); + if (!len) return wxEmptyString; + + wxMemoryBuffer mbuf(len+1); + char* buf = (char*)mbuf.GetWriteBuf(len+1); + SendMsg(msg, 0, (sptr_t)buf); + mbuf.UngetWriteBuf(len); + mbuf.AppendByte(0); + return stc2wx(buf);''', + 0), + + + 'MarkerDefineRGBAImage' : + (0, + 'void %s(int markerNumber, const unsigned char* pixels);', + '''void %s(int markerNumber, const unsigned char* pixels) { + SendMsg(%s, markerNumber, (sptr_t)pixels);''', + 0), + + + 'RegisterRGBAImage' : + (0, + 'void %s(int type, const unsigned char* pixels);', + '''void %s(int type, const unsigned char* pixels) { + SendMsg(%s, type, (sptr_t)pixels);''', + 0), + + + # I think these are only available on the native OSX backend, so + # don't add them to the wx API... + 'FindIndicatorShow' : (None, 0,0,0), + 'FindIndicatorFlash' : (None, 0,0,0), + 'FindIndicatorHide' : (None, 0,0,0), + + 'CreateLoader' : + (0, + 'void* %s(int bytes) const;', + """void* %s(int bytes) const { + return (void*)(sptr_t)SendMsg(%s, bytes); """, + 0), + + 'PrivateLexerCall' : + (0, + 'void* %s(int operation, void* pointer);', + """void* %s(int operation, void* pointer) { + return (void*)(sptr_t)SendMsg(%s, operation, (sptr_t)pointer); """, + 0), + '' : ('', 0, 0, 0), } @@ -670,7 +934,7 @@ constNonGetterMethods = ( #---------------------------------------------------------------------------- -def processIface(iface, h_tmplt, cpp_tmplt, h_dest, cpp_dest, docstr_dest): +def processIface(iface, h_tmplt, cpp_tmplt, ih_tmplt, h_dest, cpp_dest, docstr_dest, ih_dest): curDocStrings = [] values = [] methods = [] @@ -697,7 +961,7 @@ def processIface(iface, h_tmplt, cpp_tmplt, h_dest, cpp_dest, docstr_dest): curDocStrings = [] elif op == 'cat ': - if string.strip(line[4:]) == 'Deprecated': + if line[4:].strip() == 'Deprecated': break # skip the rest of the file elif op == 'evt ': @@ -710,34 +974,37 @@ def processIface(iface, h_tmplt, cpp_tmplt, h_dest, cpp_dest, docstr_dest): pass else: - print '***** Unknown line type: ', line + print('***** Unknown line type: %s' % line) # process templates data = {} data['VALUES'] = processVals(values) data['CMDS'] = processVals(cmds) - defs, imps, docstrings = processMethods(methods) + defs, imps, docstrings, idefs = processMethods(methods) data['METHOD_DEFS'] = defs + data['METHOD_IDEFS'] = idefs data['METHOD_IMPS'] = imps # get template text h_text = open(h_tmplt).read() + ih_text = open(ih_tmplt).read() cpp_text = open(cpp_tmplt).read() # do the substitutions h_text = h_text % data cpp_text = cpp_text % data + ih_text = ih_text % data # write out destination files open(h_dest, 'w').write(h_text) open(cpp_dest, 'w').write(cpp_text) open(docstr_dest, 'w').write(docstrings) - + open(ih_dest, 'w').write(ih_text) def joinWithNewLines(values): - return string.join(values, '\n') + return '\n'.join(values) #---------------------------------------------------------------------------- @@ -747,7 +1014,7 @@ def processVals(values): if docs: text.append('') for x in docs: - text.append('// ' + x) + text.append('/// ' + x) text.append('#define %s %s' % (name, value)) return joinWithNewLines(text) @@ -755,6 +1022,7 @@ def processVals(values): def processMethods(methods): defs = [] + idefs = [] imps = [] dstr = [] @@ -784,6 +1052,18 @@ def processMethods(methods): theDef = theDef + ';' defs.append(theDef) + # Build the method definition for the interface .h file + if docs: + idefs.append('') + idefs.append(' /**') + for x in docs: + idefs.append(' ' + x) + idefs.append(' */') + if name == 'GetCurLine': + idefs.append(' wxString GetCurLine(int* linePos=NULL);') + else: + idefs.append(theDef) + # Build the method implementation string if docs: imps.append('') @@ -810,14 +1090,14 @@ def processMethods(methods): imps.append(theImp) - return joinWithNewLines(defs), joinWithNewLines(imps), joinWithNewLines(dstr) + return joinWithNewLines(defs), joinWithNewLines(imps), joinWithNewLines(dstr), joinWithNewLines(idefs) #---------------------------------------------------------------------------- def checkMethodOverride(name, number, docs): theDef = theImp = None - if methodOverrideMap.has_key(name): + if name in methodOverrideMap: item = methodOverrideMap[name] try: @@ -830,7 +1110,7 @@ def checkMethodOverride(name, number, docs): if item[3] != 0: docs = item[3] except: - print "*************", name + print("************* " + name) raise return name, theDef, theImp, docs @@ -870,7 +1150,7 @@ def makeParamString(param1, param2): #---------------------------------------------------------------------------- def parseVal(line, values, docs): - name, val = string.split(line, '=') + name, val = line.split('=') # remove prefixes such as SCI, etc. for old, new in valPrefixes: @@ -889,20 +1169,20 @@ funregex = re.compile(r'\s*([a-zA-Z0-9_]+)' # return type '\s+([a-zA-Z0-9_]+)=' # name= '([0-9]+)' # number '\(([ a-zA-Z0-9_]*),' # (param, - '([ a-zA-Z0-9_]*)\)') # param) + '([ a-zA-Z0-9_]*),*\)') # param) def parseFun(line, methods, docs, values, is_const): def parseParam(param): - param = string.strip(param) + param = param.strip() if param == '': param = None else: - param = tuple(string.split(param)) + param = tuple(param.split()) return param mo = funregex.match(line) if mo is None: - print "***** Line doesn't match! : " + line + print("***** Line doesn't match! : %s" % line) retType, name, number, param1, param2 = mo.groups() @@ -910,10 +1190,10 @@ def parseFun(line, methods, docs, values, is_const): param2 = parseParam(param2) # Special case. For the key command functions we want a value defined too - num = string.atoi(number) + num = int(number) 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) + parseVal('CMD_%s=%s' % (name.upper(), number), values, docs) # if we are not also doing a function for CMD values, then # just return, otherwise fall through to the append blow. @@ -931,11 +1211,11 @@ def main(args): # TODO: parse command line args to replace default input/output files??? if not os.path.exists(IFACE): - print 'Please run this script from src/stc subdirectory.' + print('Please run this script from src/stc subdirectory.') sys.exit(1) # Now just do it - processIface(IFACE, H_TEMPLATE, CPP_TEMPLATE, H_DEST, CPP_DEST, DOCSTR_DEST) + processIface(IFACE, H_TEMPLATE, CPP_TEMPLATE, IH_TEMPLATE, H_DEST, CPP_DEST, DOCSTR_DEST, IH_DEST)