From ffe31f9567826b0f7c97cb5fdd613cdfed39b477 Mon Sep 17 00:00:00 2001 From: CFrank Date: Sun, 15 Jul 2018 14:53:15 +0200 Subject: [PATCH 1/4] several documentation updates fixes #91 --- docs/source/enums.rst | 716 +++++++++++++++++++++++--------------- docs/source/notepad.rst | 80 ++--- docs/source/scintilla.rst | 23 +- 3 files changed, 497 insertions(+), 322 deletions(-) diff --git a/docs/source/enums.rst b/docs/source/enums.rst index ed5f4904..f007253c 100644 --- a/docs/source/enums.rst +++ b/docs/source/enums.rst @@ -295,26 +295,48 @@ MENUCOMMAND .. attribute:: MENUCOMMAND.EDIT_AUTOCOMPLETE_CURRENTFILE +.. attribute:: MENUCOMMAND.EDIT_AUTOCOMPLETE_PATH + +.. attribute:: MENUCOMMAND.EDIT_BEGINENDSELECT + +.. attribute:: MENUCOMMAND.EDIT_BLANKLINEABOVECURRENT + +.. attribute:: MENUCOMMAND.EDIT_BLANKLINEBELOWCURRENT + .. attribute:: MENUCOMMAND.EDIT_BLOCK_COMMENT .. attribute:: MENUCOMMAND.EDIT_BLOCK_COMMENT_SET .. attribute:: MENUCOMMAND.EDIT_BLOCK_UNCOMMENT +.. attribute:: MENUCOMMAND.EDIT_CHANGESEARCHENGINE + +.. attribute:: MENUCOMMAND.EDIT_CHAR_PANEL + .. attribute:: MENUCOMMAND.EDIT_CLEARREADONLY +.. attribute:: MENUCOMMAND.EDIT_CLIPBOARDHISTORY_PANEL + .. attribute:: MENUCOMMAND.EDIT_COLUMNMODE +.. attribute:: MENUCOMMAND.EDIT_COLUMNMODETIP + .. attribute:: MENUCOMMAND.EDIT_COPY +.. attribute:: MENUCOMMAND.EDIT_COPY_BINARY + .. attribute:: MENUCOMMAND.EDIT_CURRENTDIRTOCLIP .. attribute:: MENUCOMMAND.EDIT_CUT +.. attribute:: MENUCOMMAND.EDIT_CUT_BINARY + .. attribute:: MENUCOMMAND.EDIT_DELETE .. attribute:: MENUCOMMAND.EDIT_DUP_LINE +.. attribute:: MENUCOMMAND.EDIT_EOL2WS + .. attribute:: MENUCOMMAND.EDIT_FILENAMETOCLIP .. attribute:: MENUCOMMAND.EDIT_FULLPATHTOCLIP @@ -323,6 +345,8 @@ MENUCOMMAND .. attribute:: MENUCOMMAND.EDIT_INS_TAB +.. attribute:: MENUCOMMAND.EDIT_INVERTCASE + .. attribute:: MENUCOMMAND.EDIT_JOIN_LINES .. attribute:: MENUCOMMAND.EDIT_LINE_DOWN @@ -333,36 +357,106 @@ MENUCOMMAND .. attribute:: MENUCOMMAND.EDIT_LTR +.. attribute:: MENUCOMMAND.EDIT_OPENASFILE + +.. attribute:: MENUCOMMAND.EDIT_OPENINFOLDER + .. attribute:: MENUCOMMAND.EDIT_PASTE +.. attribute:: MENUCOMMAND.EDIT_PASTE_AS_HTML + +.. attribute:: MENUCOMMAND.EDIT_PASTE_AS_RTF + +.. attribute:: MENUCOMMAND.EDIT_PASTE_BINARY + +.. attribute:: MENUCOMMAND.EDIT_PROPERCASE_BLEND + +.. attribute:: MENUCOMMAND.EDIT_PROPERCASE_FORCE + +.. attribute:: MENUCOMMAND.EDIT_RANDOMCASE + .. attribute:: MENUCOMMAND.EDIT_REDO +.. attribute:: MENUCOMMAND.EDIT_REMOVEEMPTYLINES + +.. attribute:: MENUCOMMAND.EDIT_REMOVEEMPTYLINESWITHBLANK + .. attribute:: MENUCOMMAND.EDIT_RMV_TAB .. attribute:: MENUCOMMAND.EDIT_RTL +.. attribute:: MENUCOMMAND.EDIT_SEARCHONINTERNET + .. attribute:: MENUCOMMAND.EDIT_SELECTALL +.. attribute:: MENUCOMMAND.EDIT_SENTENCECASE_BLEND + +.. attribute:: MENUCOMMAND.EDIT_SENTENCECASE_FORCE + .. attribute:: MENUCOMMAND.EDIT_SETREADONLY +.. attribute:: MENUCOMMAND.EDIT_SORTLINES_DECIMALCOMMA_ASCENDING + +.. attribute:: MENUCOMMAND.EDIT_SORTLINES_DECIMALCOMMA_DESCENDING + +.. attribute:: MENUCOMMAND.EDIT_SORTLINES_DECIMALDOT_ASCENDING + +.. attribute:: MENUCOMMAND.EDIT_SORTLINES_DECIMALDOT_DESCENDING + +.. attribute:: MENUCOMMAND.EDIT_SORTLINES_INTEGER_ASCENDING + +.. attribute:: MENUCOMMAND.EDIT_SORTLINES_INTEGER_DESCENDING + +.. attribute:: MENUCOMMAND.EDIT_SORTLINES_LEXICOGRAPHIC_ASCENDING + +.. attribute:: MENUCOMMAND.EDIT_SORTLINES_LEXICOGRAPHIC_DESCENDING + .. attribute:: MENUCOMMAND.EDIT_SPLIT_LINES .. attribute:: MENUCOMMAND.EDIT_STREAM_COMMENT +.. attribute:: MENUCOMMAND.EDIT_STREAM_UNCOMMENT + +.. attribute:: MENUCOMMAND.EDIT_SW2TAB_ALL + +.. attribute:: MENUCOMMAND.EDIT_SW2TAB_LEADING + +.. attribute:: MENUCOMMAND.EDIT_TAB2SW + .. attribute:: MENUCOMMAND.EDIT_TRANSPOSE_LINE +.. attribute:: MENUCOMMAND.EDIT_TRIMALL + +.. attribute:: MENUCOMMAND.EDIT_TRIMLINEHEAD + .. attribute:: MENUCOMMAND.EDIT_TRIMTRAILING +.. attribute:: MENUCOMMAND.EDIT_TRIM_BOTH + .. attribute:: MENUCOMMAND.EDIT_UNDO .. attribute:: MENUCOMMAND.EDIT_UPPERCASE +.. attribute:: MENUCOMMAND.EXPORT_FUNC_LIST_AND_QUIT + +.. attribute:: MENUCOMMAND.FILEMENU_EXISTCMDPOSITION + +.. attribute:: MENUCOMMAND.FILEMENU_LASTONE + +.. attribute:: MENUCOMMAND.FILESWITCHER_FILESCLOSE + +.. attribute:: MENUCOMMAND.FILESWITCHER_FILESCLOSEOTHERS + .. attribute:: MENUCOMMAND.FILE_CLOSE .. attribute:: MENUCOMMAND.FILE_CLOSEALL .. attribute:: MENUCOMMAND.FILE_CLOSEALL_BUT_CURRENT +.. attribute:: MENUCOMMAND.FILE_CLOSEALL_TOLEFT + +.. attribute:: MENUCOMMAND.FILE_CLOSEALL_TORIGHT + .. attribute:: MENUCOMMAND.FILE_DELETE .. attribute:: MENUCOMMAND.FILE_EXIT @@ -373,6 +467,14 @@ MENUCOMMAND .. attribute:: MENUCOMMAND.FILE_OPEN +.. attribute:: MENUCOMMAND.FILE_OPENFOLDERASWORSPACE + +.. attribute:: MENUCOMMAND.FILE_OPEN_CMD + +.. attribute:: MENUCOMMAND.FILE_OPEN_DEFAULT_VIEWER + +.. attribute:: MENUCOMMAND.FILE_OPEN_FOLDER + .. attribute:: MENUCOMMAND.FILE_PRINT .. attribute:: MENUCOMMAND.FILE_PRINTNOW @@ -381,6 +483,8 @@ MENUCOMMAND .. attribute:: MENUCOMMAND.FILE_RENAME +.. attribute:: MENUCOMMAND.FILE_RESTORELASTCLOSEDFILE + .. attribute:: MENUCOMMAND.FILE_SAVE .. attribute:: MENUCOMMAND.FILE_SAVEALL @@ -451,18 +555,12 @@ MENUCOMMAND .. attribute:: MENUCOMMAND.FORMAT_ISO_8859_1 -.. attribute:: MENUCOMMAND.FORMAT_ISO_8859_10 - -.. attribute:: MENUCOMMAND.FORMAT_ISO_8859_11 - .. attribute:: MENUCOMMAND.FORMAT_ISO_8859_13 .. attribute:: MENUCOMMAND.FORMAT_ISO_8859_14 .. attribute:: MENUCOMMAND.FORMAT_ISO_8859_15 -.. attribute:: MENUCOMMAND.FORMAT_ISO_8859_16 - .. attribute:: MENUCOMMAND.FORMAT_ISO_8859_2 .. attribute:: MENUCOMMAND.FORMAT_ISO_8859_3 @@ -535,14 +633,22 @@ MENUCOMMAND .. attribute:: MENUCOMMAND.LANG_ASM +.. attribute:: MENUCOMMAND.LANG_ASN1 + .. attribute:: MENUCOMMAND.LANG_ASP .. attribute:: MENUCOMMAND.LANG_AU3 +.. attribute:: MENUCOMMAND.LANG_AVS + +.. attribute:: MENUCOMMAND.LANG_BAANC + .. attribute:: MENUCOMMAND.LANG_BASH .. attribute:: MENUCOMMAND.LANG_BATCH +.. attribute:: MENUCOMMAND.LANG_BLITZBASIC + .. attribute:: MENUCOMMAND.LANG_C .. attribute:: MENUCOMMAND.LANG_CAML @@ -551,30 +657,46 @@ MENUCOMMAND .. attribute:: MENUCOMMAND.LANG_COBOL +.. attribute:: MENUCOMMAND.LANG_COFFEESCRIPT + .. attribute:: MENUCOMMAND.LANG_CPP .. attribute:: MENUCOMMAND.LANG_CS +.. attribute:: MENUCOMMAND.LANG_CSOUND + .. attribute:: MENUCOMMAND.LANG_CSS .. attribute:: MENUCOMMAND.LANG_D .. attribute:: MENUCOMMAND.LANG_DIFF +.. attribute:: MENUCOMMAND.LANG_ERLANG + +.. attribute:: MENUCOMMAND.LANG_ESCRIPT + .. attribute:: MENUCOMMAND.LANG_EXTERNAL .. attribute:: MENUCOMMAND.LANG_EXTERNAL_LIMIT .. attribute:: MENUCOMMAND.LANG_FLASH +.. attribute:: MENUCOMMAND.LANG_FORTH + .. attribute:: MENUCOMMAND.LANG_FORTRAN +.. attribute:: MENUCOMMAND.LANG_FORTRAN_77 + +.. attribute:: MENUCOMMAND.LANG_FREEBASIC + .. attribute:: MENUCOMMAND.LANG_GUI4CLI .. attribute:: MENUCOMMAND.LANG_HASKELL .. attribute:: MENUCOMMAND.LANG_HTML +.. attribute:: MENUCOMMAND.LANG_IHEX + .. attribute:: MENUCOMMAND.LANG_INI .. attribute:: MENUCOMMAND.LANG_INNO @@ -583,10 +705,14 @@ MENUCOMMAND .. attribute:: MENUCOMMAND.LANG_JS +.. attribute:: MENUCOMMAND.LANG_JSON + .. attribute:: MENUCOMMAND.LANG_JSP .. attribute:: MENUCOMMAND.LANG_KIX +.. attribute:: MENUCOMMAND.LANG_LATEX + .. attribute:: MENUCOMMAND.LANG_LISP .. attribute:: MENUCOMMAND.LANG_LUA @@ -595,10 +721,18 @@ MENUCOMMAND .. attribute:: MENUCOMMAND.LANG_MATLAB +.. attribute:: MENUCOMMAND.LANG_MMIXAL + +.. attribute:: MENUCOMMAND.LANG_NIMROD + +.. attribute:: MENUCOMMAND.LANG_NNCRONTAB + .. attribute:: MENUCOMMAND.LANG_NSIS .. attribute:: MENUCOMMAND.LANG_OBJC +.. attribute:: MENUCOMMAND.LANG_OSCRIPT + .. attribute:: MENUCOMMAND.LANG_PASCAL .. attribute:: MENUCOMMAND.LANG_PERL @@ -611,28 +745,48 @@ MENUCOMMAND .. attribute:: MENUCOMMAND.LANG_PS +.. attribute:: MENUCOMMAND.LANG_PUREBASIC + .. attribute:: MENUCOMMAND.LANG_PYTHON .. attribute:: MENUCOMMAND.LANG_R .. attribute:: MENUCOMMAND.LANG_RC +.. attribute:: MENUCOMMAND.LANG_REBOL + +.. attribute:: MENUCOMMAND.LANG_REGISTRY + .. attribute:: MENUCOMMAND.LANG_RUBY +.. attribute:: MENUCOMMAND.LANG_RUST + .. attribute:: MENUCOMMAND.LANG_SCHEME .. attribute:: MENUCOMMAND.LANG_SMALLTALK +.. attribute:: MENUCOMMAND.LANG_SPICE + .. attribute:: MENUCOMMAND.LANG_SQL +.. attribute:: MENUCOMMAND.LANG_SREC + +.. attribute:: MENUCOMMAND.LANG_SWIFT + .. attribute:: MENUCOMMAND.LANG_TCL +.. attribute:: MENUCOMMAND.LANG_TEHEX + .. attribute:: MENUCOMMAND.LANG_TEX .. attribute:: MENUCOMMAND.LANG_TEXT +.. attribute:: MENUCOMMAND.LANG_TXT2TAGS + .. attribute:: MENUCOMMAND.LANG_USER +.. attribute:: MENUCOMMAND.LANG_USER_DLG + .. attribute:: MENUCOMMAND.LANG_USER_LIMIT .. attribute:: MENUCOMMAND.LANG_VB @@ -641,6 +795,8 @@ MENUCOMMAND .. attribute:: MENUCOMMAND.LANG_VHDL +.. attribute:: MENUCOMMAND.LANG_VISUALPROLOG + .. attribute:: MENUCOMMAND.LANG_XML .. attribute:: MENUCOMMAND.LANG_YAML @@ -673,8 +829,12 @@ MENUCOMMAND .. attribute:: MENUCOMMAND.SEARCH_DELETEMARKEDLINES +.. attribute:: MENUCOMMAND.SEARCH_DELETEUNMARKEDLINES + .. attribute:: MENUCOMMAND.SEARCH_FIND +.. attribute:: MENUCOMMAND.SEARCH_FINDCHARINRANGE + .. attribute:: MENUCOMMAND.SEARCH_FINDINCREMENT .. attribute:: MENUCOMMAND.SEARCH_FINDINFILES @@ -715,6 +875,10 @@ MENUCOMMAND .. attribute:: MENUCOMMAND.SEARCH_GOTOPREVFOUND +.. attribute:: MENUCOMMAND.SEARCH_INVERSEMARKS + +.. attribute:: MENUCOMMAND.SEARCH_MARK + .. attribute:: MENUCOMMAND.SEARCH_MARKALLEXT1 .. attribute:: MENUCOMMAND.SEARCH_MARKALLEXT2 @@ -733,6 +897,8 @@ MENUCOMMAND .. attribute:: MENUCOMMAND.SEARCH_REPLACE +.. attribute:: MENUCOMMAND.SEARCH_SELECTMATCHINGBRACES + .. attribute:: MENUCOMMAND.SEARCH_SETANDFINDNEXT .. attribute:: MENUCOMMAND.SEARCH_SETANDFINDPREV @@ -753,11 +919,7 @@ MENUCOMMAND .. attribute:: MENUCOMMAND.SEARCH_VOLATILE_FINDPREV -.. attribute:: MENUCOMMAND.SETTING_AUTOCNBCHAR - -.. attribute:: MENUCOMMAND.SETTING_EDGE_SIZE - -.. attribute:: MENUCOMMAND.SETTING_HISTORY_SIZE +.. attribute:: MENUCOMMAND.SETTING_EDITCONTEXTMENU .. attribute:: MENUCOMMAND.SETTING_IMPORTPLUGIN @@ -769,9 +931,9 @@ MENUCOMMAND .. attribute:: MENUCOMMAND.SETTING_SHORTCUT_MAPPER -.. attribute:: MENUCOMMAND.SETTING_TAB_REPLCESPACE +.. attribute:: MENUCOMMAND.SETTING_SHORTCUT_MAPPER_MACRO -.. attribute:: MENUCOMMAND.SETTING_TAB_SIZE +.. attribute:: MENUCOMMAND.SETTING_SHORTCUT_MAPPER_RUN .. attribute:: MENUCOMMAND.SETTING_TRAYICON @@ -785,6 +947,12 @@ MENUCOMMAND .. attribute:: MENUCOMMAND.SYSTRAYPOPUP_OPENFILE +.. attribute:: MENUCOMMAND.TOOL_MD5_GENERATE + +.. attribute:: MENUCOMMAND.TOOL_MD5_GENERATEFROMFILE + +.. attribute:: MENUCOMMAND.TOOL_MD5_GENERATEINTOCLIPBOARD + .. attribute:: MENUCOMMAND.UPDATE_NPP .. attribute:: MENUCOMMAND.VIEW_ALL_CHARACTERS @@ -797,6 +965,8 @@ MENUCOMMAND .. attribute:: MENUCOMMAND.VIEW_DOCCHANGEMARGIN +.. attribute:: MENUCOMMAND.VIEW_DOC_MAP + .. attribute:: MENUCOMMAND.VIEW_DRAWTABBAR_CLOSEBOTTUN .. attribute:: MENUCOMMAND.VIEW_DRAWTABBAR_DBCLK2CLOSE @@ -817,6 +987,10 @@ MENUCOMMAND .. attribute:: MENUCOMMAND.VIEW_EOL +.. attribute:: MENUCOMMAND.VIEW_FILEBROWSER + +.. attribute:: MENUCOMMAND.VIEW_FILESWITCHER_PANEL + .. attribute:: MENUCOMMAND.VIEW_FOLD .. attribute:: MENUCOMMAND.VIEW_FOLDERMAGIN @@ -849,6 +1023,8 @@ MENUCOMMAND .. attribute:: MENUCOMMAND.VIEW_FULLSCREENTOGGLE +.. attribute:: MENUCOMMAND.VIEW_FUNC_LIST + .. attribute:: MENUCOMMAND.VIEW_GOTO_ANOTHER_VIEW .. attribute:: MENUCOMMAND.VIEW_GOTO_NEW_INSTANCE @@ -863,12 +1039,28 @@ MENUCOMMAND .. attribute:: MENUCOMMAND.VIEW_LOCKTABBAR +.. attribute:: MENUCOMMAND.VIEW_LWALIGN + +.. attribute:: MENUCOMMAND.VIEW_LWDEF + +.. attribute:: MENUCOMMAND.VIEW_LWINDENT + +.. attribute:: MENUCOMMAND.VIEW_MONITORING + .. attribute:: MENUCOMMAND.VIEW_POSTIT +.. attribute:: MENUCOMMAND.VIEW_PROJECT_PANEL_1 + +.. attribute:: MENUCOMMAND.VIEW_PROJECT_PANEL_2 + +.. attribute:: MENUCOMMAND.VIEW_PROJECT_PANEL_3 + .. attribute:: MENUCOMMAND.VIEW_REDUCETABBAR .. attribute:: MENUCOMMAND.VIEW_REFRESHTABAR +.. attribute:: MENUCOMMAND.VIEW_SUMMARY + .. attribute:: MENUCOMMAND.VIEW_SWITCHTO_OTHER_VIEW .. attribute:: MENUCOMMAND.VIEW_SYMBOLMARGIN @@ -877,6 +1069,32 @@ MENUCOMMAND .. attribute:: MENUCOMMAND.VIEW_SYNSCROLLV +.. attribute:: MENUCOMMAND.VIEW_TAB1 + +.. attribute:: MENUCOMMAND.VIEW_TAB2 + +.. attribute:: MENUCOMMAND.VIEW_TAB3 + +.. attribute:: MENUCOMMAND.VIEW_TAB4 + +.. attribute:: MENUCOMMAND.VIEW_TAB5 + +.. attribute:: MENUCOMMAND.VIEW_TAB6 + +.. attribute:: MENUCOMMAND.VIEW_TAB7 + +.. attribute:: MENUCOMMAND.VIEW_TAB8 + +.. attribute:: MENUCOMMAND.VIEW_TAB9 + +.. attribute:: MENUCOMMAND.VIEW_TAB_MOVEBACKWARD + +.. attribute:: MENUCOMMAND.VIEW_TAB_MOVEFORWARD + +.. attribute:: MENUCOMMAND.VIEW_TAB_NEXT + +.. attribute:: MENUCOMMAND.VIEW_TAB_PREV + .. attribute:: MENUCOMMAND.VIEW_TAB_SPACE .. attribute:: MENUCOMMAND.VIEW_TOGGLE_FOLDALL @@ -909,8 +1127,6 @@ MENUCOMMAND .. attribute:: MENUCOMMAND.VIEW_UNFOLD_CURRENT -.. attribute:: MENUCOMMAND.VIEW_USER_DLG - .. attribute:: MENUCOMMAND.VIEW_WRAP .. attribute:: MENUCOMMAND.VIEW_WRAP_SYMBOL @@ -924,6 +1140,218 @@ MENUCOMMAND .. attribute:: MENUCOMMAND.WIKIFAQ +LANGTYPE +-------- + +.. _LANGTYPE: +.. class:: LANGTYPE + +.. attribute:: LANGTYPE.ADA + +.. attribute:: LANGTYPE.ASM + +.. attribute:: LANGTYPE.ASN1 + +.. attribute:: LANGTYPE.ASP + +.. attribute:: LANGTYPE.AU3 + +.. attribute:: LANGTYPE.AVS + +.. attribute:: LANGTYPE.BAANC + +.. attribute:: LANGTYPE.BASH + +.. attribute:: LANGTYPE.BATCH + +.. attribute:: LANGTYPE.BLITZBASIC + +.. attribute:: LANGTYPE.C + +.. attribute:: LANGTYPE.CAML + +.. attribute:: LANGTYPE.CMAKE + +.. attribute:: LANGTYPE.COBOL + +.. attribute:: LANGTYPE.COFFEESCRIPT + +.. attribute:: LANGTYPE.CPP + +.. attribute:: LANGTYPE.CS + +.. attribute:: LANGTYPE.CSOUND + +.. attribute:: LANGTYPE.CSS + +.. attribute:: LANGTYPE.D + +.. attribute:: LANGTYPE.DIFF + +.. attribute:: LANGTYPE.ERLANG + +.. attribute:: LANGTYPE.ESCRIPT + +.. attribute:: LANGTYPE.FLASH + +.. attribute:: LANGTYPE.FORTH + +.. attribute:: LANGTYPE.FORTRAN + +.. attribute:: LANGTYPE.FORTRAN_77 + +.. attribute:: LANGTYPE.FREEBASIC + +.. attribute:: LANGTYPE.GUI4CLI + +.. attribute:: LANGTYPE.HASKELL + +.. attribute:: LANGTYPE.HTML + +.. attribute:: LANGTYPE.IHEX + +.. attribute:: LANGTYPE.INI + +.. attribute:: LANGTYPE.INNO + +.. attribute:: LANGTYPE.JAVA + +.. attribute:: LANGTYPE.JAVASCRIPT + +.. attribute:: LANGTYPE.JS + +.. attribute:: LANGTYPE.JSON + +.. attribute:: LANGTYPE.JSP + +.. attribute:: LANGTYPE.KIX + +.. attribute:: LANGTYPE.LATEX + +.. attribute:: LANGTYPE.LISP + +.. attribute:: LANGTYPE.LUA + +.. attribute:: LANGTYPE.MAKEFILE + +.. attribute:: LANGTYPE.MATLAB + +.. attribute:: LANGTYPE.MMIXAL + +.. attribute:: LANGTYPE.NIMROD + +.. attribute:: LANGTYPE.NNCRONTAB + +.. attribute:: LANGTYPE.NSIS + +.. attribute:: LANGTYPE.OBJC + +.. attribute:: LANGTYPE.OSCRIPT + +.. attribute:: LANGTYPE.PASCAL + +.. attribute:: LANGTYPE.PERL + +.. attribute:: LANGTYPE.PHP + +.. attribute:: LANGTYPE.POWERSHELL + +.. attribute:: LANGTYPE.PROPS + +.. attribute:: LANGTYPE.PS + +.. attribute:: LANGTYPE.PUREBASIC + +.. attribute:: LANGTYPE.PYTHON + +.. attribute:: LANGTYPE.R + +.. attribute:: LANGTYPE.RC + +.. attribute:: LANGTYPE.REBOL + +.. attribute:: LANGTYPE.REGISTRY + +.. attribute:: LANGTYPE.RUBY + +.. attribute:: LANGTYPE.RUST + +.. attribute:: LANGTYPE.SCHEME + +.. attribute:: LANGTYPE.SEARCHRESULT + +.. attribute:: LANGTYPE.SMALLTALK + +.. attribute:: LANGTYPE.SPICE + +.. attribute:: LANGTYPE.SQL + +.. attribute:: LANGTYPE.SREC + +.. attribute:: LANGTYPE.SWIFT + +.. attribute:: LANGTYPE.TCL + +.. attribute:: LANGTYPE.TEHEX + +.. attribute:: LANGTYPE.TEX + +.. attribute:: LANGTYPE.TXT + +.. attribute:: LANGTYPE.TXT2TAGS + +.. attribute:: LANGTYPE.USER + +.. attribute:: LANGTYPE.VB + +.. attribute:: LANGTYPE.VERILOG + +.. attribute:: LANGTYPE.VHDL + +.. attribute:: LANGTYPE.VISUALPROLOG + +.. attribute:: LANGTYPE.XML + +.. attribute:: LANGTYPE.YAML + + +WINVER +------ + +.. _WINVER: +.. class:: WINVER + +.. attribute:: WINVER.UNKNOWN + +.. attribute:: WINVER.WIN32S + +.. attribute:: WINVER.95 + +.. attribute:: WINVER.98 + +.. attribute:: WINVER.ME + +.. attribute:: WINVER.NT + +.. attribute:: WINVER.W2K + +.. attribute:: WINVER.XP + +.. attribute:: WINVER.S2003 + +.. attribute:: WINVER.XPX64 + +.. attribute:: WINVER.VISTA + +.. attribute:: WINVER.WIN7 + +.. attribute:: WINVER.WIN8 + +.. attribute:: WINVER.WIN81 + +.. attribute:: WINVER.WIN10 + + .. The rest of this file is autogenerated from Scintilla. To edit change CreateWrapper.py /* ++Autogenerated ----- */ @@ -941,7 +1369,6 @@ ANNOTATIONVISIBLE .. attribute:: ANNOTATIONVISIBLE.INDENTED - AUTOMATICFOLD ------------- @@ -954,7 +1381,6 @@ AUTOMATICFOLD .. attribute:: AUTOMATICFOLD.CHANGE - CARETPOLICY ----------- @@ -969,7 +1395,6 @@ CARETPOLICY .. attribute:: CARETPOLICY.EVEN - CARETSTICKY ----------- @@ -982,7 +1407,6 @@ CARETSTICKY .. attribute:: CARETSTICKY.WHITESPACE - CARETSTYLE ---------- @@ -995,7 +1419,6 @@ CARETSTYLE .. attribute:: CARETSTYLE.BLOCK - CASEINSENSITIVEBEHAVIOUR ------------------------ @@ -1006,7 +1429,6 @@ CASEINSENSITIVEBEHAVIOUR .. attribute:: CASEINSENSITIVEBEHAVIOUR.IGNORECASE - CASEVISIBLE ----------- @@ -1019,7 +1441,6 @@ CASEVISIBLE .. attribute:: CASEVISIBLE.LOWER - CHARACTERSET ------------ @@ -1068,7 +1489,6 @@ CHARACTERSET .. attribute:: CHARACTERSET.8859_15 - CURSORSHAPE ----------- @@ -1083,7 +1503,6 @@ CURSORSHAPE .. attribute:: CURSORSHAPE.REVERSEARROW - EDGEVISUALSTYLE --------------- @@ -1096,7 +1515,6 @@ EDGEVISUALSTYLE .. attribute:: EDGEVISUALSTYLE.BACKGROUND - ENDOFLINE --------- @@ -1109,7 +1527,6 @@ ENDOFLINE .. attribute:: ENDOFLINE.LF - FINDOPTION ---------- @@ -1128,7 +1545,6 @@ FINDOPTION .. attribute:: FINDOPTION.CXX11REGEX - FOLDACTION ---------- @@ -1141,7 +1557,6 @@ FOLDACTION .. attribute:: FOLDACTION._TOGGLE - FOLDFLAG -------- @@ -1160,7 +1575,6 @@ FOLDFLAG .. attribute:: FOLDFLAG.LINESTATE - FOLDLEVEL --------- @@ -1175,7 +1589,6 @@ FOLDLEVEL .. attribute:: FOLDLEVEL.NUMBERMASK - FONTQUALITY ----------- @@ -1192,7 +1605,6 @@ FONTQUALITY .. attribute:: FONTQUALITY.QUALITY_LCD_OPTIMIZED - FONTWEIGHT ---------- @@ -1205,7 +1617,6 @@ FONTWEIGHT .. attribute:: FONTWEIGHT.BOLD - IMEINTERACTION -------------- @@ -1216,7 +1627,6 @@ IMEINTERACTION .. attribute:: IMEINTERACTION.INLINE - INDENTVIEW ---------- @@ -1231,7 +1641,6 @@ INDENTVIEW .. attribute:: INDENTVIEW.LOOKBOTH - INDICFLAG --------- @@ -1240,7 +1649,6 @@ INDICFLAG .. attribute:: INDICFLAG.VALUEFORE - INDICATORSTYLE -------------- @@ -1291,7 +1699,6 @@ INDICATORSTYLE .. attribute:: INDICATORSTYLE.CONTAINER - KEYMOD ------ @@ -1310,7 +1717,6 @@ KEYMOD .. attribute:: KEYMOD.META - KEYS ---- @@ -1357,182 +1763,6 @@ KEYS .. attribute:: KEYS.MENU - -LANGTYPE --------- - -.. _LANGTYPE: -.. class:: LANGTYPE - -.. attribute:: LANGTYPE.ADA - -.. attribute:: LANGTYPE.ASM - -.. attribute:: LANGTYPE.ASN1 - -.. attribute:: LANGTYPE.ASP - -.. attribute:: LANGTYPE.AU3 - -.. attribute:: LANGTYPE.AVS - -.. attribute:: LANGTYPE.BAANC - -.. attribute:: LANGTYPE.BASH - -.. attribute:: LANGTYPE.BATCH - -.. attribute:: LANGTYPE.BLITZBASIC - -.. attribute:: LANGTYPE.C - -.. attribute:: LANGTYPE.CAML - -.. attribute:: LANGTYPE.CMAKE - -.. attribute:: LANGTYPE.COBOL - -.. attribute:: LANGTYPE.COFFEESCRIPT - -.. attribute:: LANGTYPE.CPP - -.. attribute:: LANGTYPE.CS - -.. attribute:: LANGTYPE.CSOUND - -.. attribute:: LANGTYPE.CSS - -.. attribute:: LANGTYPE.D - -.. attribute:: LANGTYPE.DIFF - -.. attribute:: LANGTYPE.ERLANG - -.. attribute:: LANGTYPE.ESCRIPT - -.. attribute:: LANGTYPE.FLASH - -.. attribute:: LANGTYPE.FORTH - -.. attribute:: LANGTYPE.FORTRAN - -.. attribute:: LANGTYPE.FORTRAN_77 - -.. attribute:: LANGTYPE.FREEBASIC - -.. attribute:: LANGTYPE.GUI4CLI - -.. attribute:: LANGTYPE.HASKELL - -.. attribute:: LANGTYPE.HTML - -.. attribute:: LANGTYPE.IHEX - -.. attribute:: LANGTYPE.INI - -.. attribute:: LANGTYPE.INNO - -.. attribute:: LANGTYPE.JAVA - -.. attribute:: LANGTYPE.JAVASCRIPT - -.. attribute:: LANGTYPE.JS - -.. attribute:: LANGTYPE.JSON - -.. attribute:: LANGTYPE.JSP - -.. attribute:: LANGTYPE.KIX - -.. attribute:: LANGTYPE.LATEX - -.. attribute:: LANGTYPE.LISP - -.. attribute:: LANGTYPE.LUA - -.. attribute:: LANGTYPE.MAKEFILE - -.. attribute:: LANGTYPE.MATLAB - -.. attribute:: LANGTYPE.MMIXAL - -.. attribute:: LANGTYPE.NIMROD - -.. attribute:: LANGTYPE.NNCRONTAB - -.. attribute:: LANGTYPE.NSIS - -.. attribute:: LANGTYPE.OBJC - -.. attribute:: LANGTYPE.OSCRIPT - -.. attribute:: LANGTYPE.PASCAL - -.. attribute:: LANGTYPE.PERL - -.. attribute:: LANGTYPE.PHP - -.. attribute:: LANGTYPE.POWERSHELL - -.. attribute:: LANGTYPE.PROPS - -.. attribute:: LANGTYPE.PS - -.. attribute:: LANGTYPE.PUREBASIC - -.. attribute:: LANGTYPE.PYTHON - -.. attribute:: LANGTYPE.R - -.. attribute:: LANGTYPE.RC - -.. attribute:: LANGTYPE.REBOL - -.. attribute:: LANGTYPE.REGISTRY - -.. attribute:: LANGTYPE.RUBY - -.. attribute:: LANGTYPE.RUST - -.. attribute:: LANGTYPE.SCHEME - -.. attribute:: LANGTYPE.SEARCHRESULT - -.. attribute:: LANGTYPE.SMALLTALK - -.. attribute:: LANGTYPE.SPICE - -.. attribute:: LANGTYPE.SQL - -.. attribute:: LANGTYPE.SREC - -.. attribute:: LANGTYPE.SWIFT - -.. attribute:: LANGTYPE.TCL - -.. attribute:: LANGTYPE.TEHEX - -.. attribute:: LANGTYPE.TEX - -.. attribute:: LANGTYPE.TXT - -.. attribute:: LANGTYPE.TXT2TAGS - -.. attribute:: LANGTYPE.USER - -.. attribute:: LANGTYPE.VB - -.. attribute:: LANGTYPE.VERILOG - -.. attribute:: LANGTYPE.VHDL - -.. attribute:: LANGTYPE.VISUALPROLOG - -.. attribute:: LANGTYPE.XML - -.. attribute:: LANGTYPE.YAML - - LEXER ----- @@ -1777,7 +2007,6 @@ LEXER .. attribute:: LEXER.AUTOMATIC - LINECACHE --------- @@ -1792,7 +2021,6 @@ LINECACHE .. attribute:: LINECACHE.DOCUMENT - LINEENDTYPE ----------- @@ -1803,7 +2031,6 @@ LINEENDTYPE .. attribute:: LINEENDTYPE.UNICODE - MARGINOPTION ------------ @@ -1814,7 +2041,6 @@ MARGINOPTION .. attribute:: MARGINOPTION.SUBLINESELECT - MARGINTYPE ---------- @@ -1833,7 +2059,6 @@ MARGINTYPE .. attribute:: MARGINTYPE.RTEXT - MARKEROUTLINE ------------- @@ -1854,7 +2079,6 @@ MARKEROUTLINE .. attribute:: MARKEROUTLINE.FOLDEROPEN - MARKERSYMBOL ------------ @@ -1927,7 +2151,6 @@ MARKERSYMBOL .. attribute:: MARKERSYMBOL.CHARACTER - MODIFICATIONFLAGS ----------------- @@ -1980,7 +2203,6 @@ MODIFICATIONFLAGS .. attribute:: MODIFICATIONFLAGS.MODEVENTMASKALL - MULTIAUTOCOMPLETE ----------------- @@ -1991,7 +2213,6 @@ MULTIAUTOCOMPLETE .. attribute:: MULTIAUTOCOMPLETE.EACH - MULTIPASTE ---------- @@ -2002,7 +2223,6 @@ MULTIPASTE .. attribute:: MULTIPASTE.EACH - ORDERING -------- @@ -2015,7 +2235,6 @@ ORDERING .. attribute:: ORDERING.CUSTOM - PHASESDRAW ---------- @@ -2028,7 +2247,6 @@ PHASESDRAW .. attribute:: PHASESDRAW.MULTIPLE - PRINTOPTION ----------- @@ -2045,7 +2263,6 @@ PRINTOPTION .. attribute:: PRINTOPTION.COLOURONWHITEDEFAULTBG - SELECTIONMODE ------------- @@ -2060,7 +2277,6 @@ SELECTIONMODE .. attribute:: SELECTIONMODE.THIN - STATUS ------ @@ -2077,7 +2293,6 @@ STATUS .. attribute:: STATUS.WARN_REGEX - STYLESCOMMON ------------ @@ -2102,7 +2317,6 @@ STYLESCOMMON .. attribute:: STYLESCOMMON.MAX - TYPEPROPERTY ------------ @@ -2115,7 +2329,6 @@ TYPEPROPERTY .. attribute:: TYPEPROPERTY.STRING - UPDATE ------ @@ -2130,7 +2343,6 @@ UPDATE .. attribute:: UPDATE.H_SCROLL - VIRTUALSPACE ------------ @@ -2143,7 +2355,6 @@ VIRTUALSPACE .. attribute:: VIRTUALSPACE.USERACCESSIBLE - WHITESPACE ---------- @@ -2156,44 +2367,6 @@ WHITESPACE .. attribute:: WHITESPACE.VISIBLEAFTERINDENT - -WINVER ----------- - -.. _WINVER: -.. class:: WINVER - -.. attribute:: WINVER.95 - -.. attribute:: WINVER.98 - -.. attribute:: WINVER.ME - -.. attribute:: WINVER.NT - -.. attribute:: WINVER.S2003 - -.. attribute:: WINVER.UNKNOWN - -.. attribute:: WINVER.VISTA - -.. attribute:: WINVER.W2K - -.. attribute:: WINVER.WIN10 - -.. attribute:: WINVER.WIN32S - -.. attribute:: WINVER.WIN7 - -.. attribute:: WINVER.WIN8 - -.. attribute:: WINVER.WIN81 - -.. attribute:: WINVER.XP - -.. attribute:: WINVER.XPX64 - - WRAP ---- @@ -2208,7 +2381,6 @@ WRAP .. attribute:: WRAP.WHITESPACE - WRAPINDENTMODE -------------- @@ -2221,7 +2393,6 @@ WRAPINDENTMODE .. attribute:: WRAPINDENTMODE.INDENT - WRAPVISUALFLAG -------------- @@ -2236,7 +2407,6 @@ WRAPVISUALFLAG .. attribute:: WRAPVISUALFLAG.MARGIN - WRAPVISUALLOCATION ------------------ diff --git a/docs/source/notepad.rst b/docs/source/notepad.rst index 98a51dce..d4bc48fd 100644 --- a/docs/source/notepad.rst +++ b/docs/source/notepad.rst @@ -19,7 +19,6 @@ Notepad++ Object Activates the document with the given filename - .. method:: notepad.activateIndex(view, index) Activates the document with the given view and index. @@ -30,21 +29,20 @@ Notepad++ Object Allocates a range of Command ID for use in WM_COMMAND. Mainly used internally by plugins. - Returns: - The start number of the requested range + Returns the start number of the requested range + .. method:: notepad.allocateMarker(numberRequested) -> bool Allocates a range of marker number for Scintilla. Use this to stop marker number collisions with other plugins / scripts. - Returns: - The start number of the requested range + Returns the start number of the requested range .. method:: notepad.allocateSupported() -> bool - Returns True if the Command ID allocation API is supported in this version of Notepad++ + Returns ``True`` if the Command ID allocation API is supported in this version of Notepad++ .. method:: notepad.callback(function, notifications) @@ -69,8 +67,7 @@ Notepad++ Object For Scintilla notifications, see ``editor.callback()`` -> bool - Returns: - ``True`` if the registration was successful + Returns ``True`` if the registration was successful .. method:: notepad.clearCallbacks() @@ -114,13 +111,16 @@ Notepad++ Object .. method:: notepad.createScintilla() -> editor - Create a new Scintilla handle. Returns an Editor object + Create a new Scintilla handle. + + Returns an :ref:`Editor` .. method:: notepad.decodeSci(view) -> int View is either 0 or 1 - Returns the old unicodeMode + + Returns the old unicode mode .. method:: notepad.destroyScintilla(editor) @@ -135,13 +135,14 @@ Notepad++ Object .. method:: notepad.docSwitcherDisableColumn(boolean) - True if it should be hidden, False if it should be shown + ``True`` if it should be hidden, ``False`` if it should be shown .. method:: notepad.encodeSci(view) -> int View is either 0 or 1 - Returns the new unicodeMode + + Returns the new unicode mode .. method:: notepad.flashWindow(count, milliseconds) @@ -151,7 +152,7 @@ Notepad++ Object .. method:: notepad.getAppdataPluginsAllowed() -> bool - Returns True if loading plugins from %APPDATA%\Notepad++\plugins is allowed, False otherwise + Returns ``True`` if loading plugins from %APPDATA%\\Notepad++\\plugins is allowed, ``False`` otherwise .. method:: notepad.getBufferFilename(bufferID) @@ -183,8 +184,7 @@ Notepad++ Object Get the current language type - Returns: - :class:`LANGTYPE` + Returns :class:`LANGTYPE` .. method:: notepad.getCurrentNativeLangEncoding() -> int @@ -206,9 +206,10 @@ Notepad++ Object Returns the default foreground color as tuple -.. method:: notepad.getEnableThemeTextureFunc() - TODO +.. method:: notepad.getEnableThemeTextureFunc() -> bool + + Returns ``True`` if a dialog window supports background texturing, ``False`` otherwise. .. method:: notepad.getEncoding([bufferID]) -> BUFFERENCODING @@ -216,16 +217,14 @@ Notepad++ Object Gets the encoding of the given *bufferID*. If no bufferID is given, then the encoding of the currently active buffer is returned. - Returns: - :class:`BUFFERENCODING` + Returns :class:`BUFFERENCODING` .. method:: notepad.getFiles() -> list Gets a list of the open filenames. - Returns: - A list of tuples containing ``(filename, bufferID, index, view)`` + Returns A list of tuples containing ``(filename, bufferID, index, view)`` .. method:: notepad.getFormatType([bufferID]) -> FORMATTYPE @@ -233,8 +232,7 @@ Notepad++ Object Gets the format type (i.e. Windows, Unix or Mac) of the given *bufferID*. If no bufferID is given, then the format of the currently active buffer is returned. - Returns: - :class:`FORMATTYPE` + Returns :class:`FORMATTYPE` .. method:: notepad.getLanguageDesc(langType) -> LANGTYPE @@ -252,8 +250,7 @@ Notepad++ Object Gets the language type of the given *bufferID*. If no bufferID is given, then the language of the currently active buffer is returned. - Returns: - :class:`LANGTYPE` + Returns :class:`LANGTYPE` .. method:: notepad.getNppDir() -> str @@ -305,12 +302,12 @@ Notepad++ Object .. method:: notepad.hideMenu(boolean) - True if it should be hidden, False if it should be shown + ``True`` if it should be hidden, ``False`` if it should be shown .. method:: notepad.hideStatusBar(boolean) - True if it should be hidden, False if it should be shown + ``True`` if it should be hidden, ``False`` if it should be shown .. method:: notepad.hideTabBar() @@ -320,37 +317,37 @@ Notepad++ Object .. method:: notepad.hideToolBar(boolean) - True if it should be hidden, False if it should be shown + ``True`` if it should be hidden, ``False`` if it should be shown .. method:: notepad.isDocSwitcherShown() -> bool - Returns True if document switcher is shown else False + Returns ``True`` if document switcher is shown else ``False`` .. method:: notepad.isMenuHidden() -> bool - Returns True if menu is hidden else False + Returns ``True`` if menu is hidden else ``False`` .. method:: notepad.isSingleView() - True if only one view is used, False otherwise + ``True`` if only one view is used, ``False`` otherwise .. method:: notepad.isStatusBarHidden() -> bool - Returns True if statusbar is hidden else False + Returns ``True`` if statusbar is hidden else ``False`` .. method:: notepad.isTabBarHidden() -> bool - Returns True if tabbar is hidden else False + Returns ``True`` if tabbar is hidden else ``False`` .. method:: notepad.isToolBarHidden() -> bool - Returns True if toolbar is hidden else False + Returns ``True`` if toolbar is hidden else ``False`` .. method:: notepad.launchFindInFilesDlg(dir2Search, filter) @@ -380,8 +377,7 @@ Notepad++ Object Flags can be 0 for a standard 'OK' message box, or a combination of :class:`MESSAGEBOXFLAGS`. ``title`` is "Python Script for Notepad++" by default, and flags is 0 by default. - Returns: - A RESULTxxxx member of :class:`MESSAGEBOXFLAGS` as to which button was pressed. + Returns a RESULTxxxx member of :class:`MESSAGEBOXFLAGS` as to which button was pressed. .. method:: notepad.new() @@ -398,8 +394,7 @@ Notepad++ Object Prompts the user for some text. Optionally provide the default text to initialise the entry field. - Returns: - The string entered. + Returns the string entered. ``None`` if cancel was pressed (note that is different to an empty string, which means that no input was given) @@ -433,8 +428,7 @@ Notepad++ Object been updated (for example, you're calling the name of macro that has been removed and added again), set refreshCache to ``True``. This is ``False`` by default. - Returns: - ``True`` if the menu command was found, otherwise ``False`` + Returns ``True`` if the menu command was found, otherwise ``False`` e.g.:: @@ -510,7 +504,7 @@ Notepad++ Object .. method:: notepad.setEditorBorderEdge(boolean) - True if editor should use border edge, False otherwise + ``True`` if editor should use border edge, ``False`` otherwise .. method:: notepad.setEncoding(encoding) @@ -536,7 +530,7 @@ Notepad++ Object .. method:: notepad.setSmoothFont(boolean) - True if smooth font should be set, False otherwise + ``True`` if smooth font should be set, ``False`` otherwise .. method:: notepad.setStatusBar(statusBarSection, text) @@ -546,7 +540,7 @@ Notepad++ Object .. method:: notepad.showDocSwitcher(boolean) - True if it should be hidden, False if it should be shown + ``True`` if it should be hidden, ``False`` if it should be shown .. method:: notepad.showTabBar() diff --git a/docs/source/scintilla.rst b/docs/source/scintilla.rst index 981f1cb8..154b48a9 100644 --- a/docs/source/scintilla.rst +++ b/docs/source/scintilla.rst @@ -1,3 +1,5 @@ +.. _Editor: + Editor Object ============= @@ -2559,12 +2561,6 @@ Scintilla Methods See Scintilla documentation for `SCI_SETDOCPOINTER `_ -.. method:: editor.getRangePointer(start, length) -> int - - Retrieve a pointer to the requested range object. - - See Scintilla documentation for `SCI_GETRANGEPOINTER `_ - .. method:: editor.setModEventMask(mask) Set which document modification events are sent to the container. @@ -3331,6 +3327,21 @@ Scintilla Methods See Scintilla documentation for `SCI_COPYALLOWLINE `_ +.. method:: editor.getCharacterPointer() -> str + + Compact the document buffer and return a read-only pointer to the + characters in the document. + + See Scintilla documentation for `SCI_GETCHARACTERPOINTER `_ + +.. method:: editor.getRangePointer(position, rangeLength) -> str + + 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. + + See Scintilla documentation for `SCI_GETRANGEPOINTER `_ + .. method:: editor.getGapPosition() -> int Return a position which, to avoid performance costs, should not be within From e6bbc803b83ee45dc9fd544dbc2df11937f47525 Mon Sep 17 00:00:00 2001 From: CFrank Date: Sun, 15 Jul 2018 15:38:04 +0200 Subject: [PATCH 2/4] update CreateWrapper.py with missing methods few code changes --- PythonScript/src/CreateWrapper.py | 81 +++++++++++++++++++++++++------ 1 file changed, 66 insertions(+), 15 deletions(-) diff --git a/PythonScript/src/CreateWrapper.py b/PythonScript/src/CreateWrapper.py index 986976bf..a6224879 100644 --- a/PythonScript/src/CreateWrapper.py +++ b/PythonScript/src/CreateWrapper.py @@ -78,10 +78,7 @@ } -exclusions = [ 'FormatRange', 'GetCharacterPointer', 'GetRangePointer' ] - -def Contains(s,sub): - return s.find(sub) != -1 +exclusions = [ 'FormatRange',] def symbolName(v): @@ -317,6 +314,56 @@ def annotationSetTextBody(v, out): '''.format(v["Param2Name"], v["Param2Name"], symbolName(v), v["Param1Name"])) +def getSetDocPointerBody(v, out): + traceCall(v, out) + checkDisallowedInCallback(v, out) + out.write( +''' callScintilla({0}, 0, {1}); +'''.format(symbolName(v), v["Param2Name"])) + + +def getAddRefDocumentBody(v, out): + traceCall(v, out) + checkDisallowedInCallback(v, out) + out.write( +''' callScintilla({0}, 0, {1}); +'''.format(symbolName(v), v["Param2Name"])) + + +def getReleaseDocumentBody(v, out): + traceCall(v, out) + checkDisallowedInCallback(v, out) + out.write( +''' callScintilla({0}, 0, {1}); +'''.format(symbolName(v), v["Param2Name"])) + + +def getPrivateLexerCallBody(v, out): + traceCall(v, out) + checkDisallowedInCallback(v, out) + out.write( +''' return callScintilla({0}, {1}, {2}); +'''.format(symbolName(v), v["Param1Name"], v["Param2Name"])) + + +def getGetRangePointerBody(v, out): + out.write( +''' GILRelease release; + const char *charPtr = reinterpret_cast(callScintilla({0}, {2}, {3})); + release.reacquire(); + return {1}(charPtr, charPtr + {3}); +'''.format(symbolName(v), v["ReturnType"], v["Param1Name"], v["Param2Name"])) + + +def getGetCharacterPointerBody(v, out): + out.write( +''' GILRelease release; + const char *charPtr = reinterpret_cast(callScintilla({0})); + release.reacquire(); + return {1}(charPtr); +'''.format(symbolName(v), v["ReturnType"])) + + def standardBody(v, out): # We always release the GIL. For standard getters, this shouldn't really be necessary. # However, it doesn't appear to affect performance to dramatically (yet!), so we'll leave it in until @@ -409,7 +456,13 @@ def getPythonParamNamesQuoted(param1Type, param1Name, param2Type, param2Name): specialCases = { 'GetStyledText' : ('boost::python::tuple', 'int', 'start', 'int', 'end', getStyledTextBody), 'GetLine': ('boost::python::str', 'int', 'line', '', '', getLineBody), - 'AnnotationSetText' : ('void', 'int', 'line', 'boost::python::object', 'text', annotationSetTextBody) + 'AnnotationSetText' : ('void', 'int', 'line', 'boost::python::object', 'text', annotationSetTextBody), + 'SetDocPointer' :('void', '','','intptr_t', 'pointer', getSetDocPointerBody), + 'AddRefDocument' :('void', '','', 'intptr_t', 'doc', getAddRefDocumentBody), + 'ReleaseDocument' :('void', '','', 'intptr_t', 'doc', getReleaseDocumentBody), + 'PrivateLexerCall' :('intptr_t', 'intptr_t','operation','intptr_t', 'pointer', getPrivateLexerCallBody), + 'GetCharacterPointer' :('boost::python::str', '','','', '', getGetCharacterPointerBody), + 'GetRangePointer' :('boost::python::str', 'int','position','int', 'rangeLength', getGetRangePointerBody) } @@ -496,16 +549,14 @@ class PythonCompatibleStrBuffer sig = mapSignature((v["Param1Type"], v["Param1Name"], v["Param2Type"], v["Param2Name"])) if sig is not None: - # print '{:<45} {} ==>> {}'.format(v["Name"], v["ReturnType"], sig[0]) - v["ReturnType"] = 'intptr_t' if sig[0] == 'int' else sig[0] + v["ReturnType"] = 'intptr_t' if sig[0] in ['int', 'int pointer'] else sig[0] v["Param1Type"] = sig[1] v["Param2Type"] = sig[2] + body = sig[3] else: - # print '{:<45} {} -->> {}'.format(v["Name"], v["ReturnType"], mapType(v["ReturnType"])) #if !checkStandardTypeIsKnown(v["ReturnType", v["Param1Type"], v["Param1Name"], v["Param2Type"], v["Param2Name"]): # print("Warning: unrecognised parameter combination for {0}({1} {2}, {3} {4})".format(v["Name"], v["Param1Type"], v["Param1Name"], v["Param2Type"], v["Param2Name"])) - v["ReturnType"] = 'intptr_t' if v["ReturnType"] in ['int', 'position'] else mapType(v["ReturnType"]) v["Param1Type"] = mapType(v["Param1Type"]) v["Param2Type"] = mapType(v["Param2Type"]) @@ -568,7 +619,7 @@ def writeHFile(f,out): out.write("\t/** " + "\n\t * ".join(v["Comment"]) + "\n */\n") - out.write("\t"); + out.write("\t") out.write(getSignature(v).replace(' ScintillaWrapper::', ' ')) out.write(";\n\n") @@ -659,7 +710,7 @@ def writeEnumsWrapperFile(f, out): out.write('\n\t\t.value("{0}", PYSCR_{1})'.format(val[0][takeEnumValueFromPosition:].upper(), val[0])) out.write(';\n\n') - out.write('\tboost::python::enum_("SCINTILLANOTIFICATION")'.format(name, name.upper())) + out.write('\tboost::python::enum_("SCINTILLANOTIFICATION")') #.format(name, name.upper())) for name in f.order: v = f.features[name] @@ -668,7 +719,7 @@ def writeEnumsWrapperFile(f, out): out.write('\n\t\t.value("{0}", PYSCR_SCN_{1})'.format(name.upper(), name.upper())) out.write(';\n\n') - out.write('\tboost::python::enum_("SCINTILLAMESSAGE")'.format(name, name.upper())) + out.write('\tboost::python::enum_("SCINTILLAMESSAGE")') #.format(name, name.upper())) for name in f.order: v = f.features[name] if v["Category"] != "Deprecated": @@ -688,7 +739,7 @@ def writeScintillaDoc(f, out): continue if v["Name"] in specialCases: - (v["ReturnType"], v["Param1Type"], v["Param1Name"], v["Param2Type"], v["Param2Name"], body) = specialCases[v["Name"]] + (v["ReturnType"], v["Param1Type"], v["Param1Name"], v["Param2Type"], v["Param2Name"], _) = specialCases[v["Name"]] else: sig = mapSignature((v["Param1Type"], v["Param1Name"], v["Param2Type"], v["Param2Name"])) @@ -765,10 +816,10 @@ def CopyWithInsertion(input, output, genfn, definition): for line in input.readlines(): if copying: output.write(line) - if Contains(line, "/* ++Autogenerated"): + if "/* ++Autogenerated" in line: copying = 0 genfn(definition, output) - if Contains(line, "/* --Autogenerated"): + if "/* --Autogenerated" in line: copying = 1 output.write(line) From e7c3a9b88e90eae8bf77ac5a4e9c0e07d6dc4a8b Mon Sep 17 00:00:00 2001 From: CFrank Date: Mon, 16 Jul 2018 01:34:19 +0200 Subject: [PATCH 3/4] new files created as result of createwrapper.py changes fix for #95 - using indicator instead of style to color output fix for #93 - using different variables for default and continue prompt --- PythonScript/src/ConsoleDialog.cpp | 58 +- PythonScript/src/ConsoleDialog.h | 9 +- PythonScript/src/Enums.h | 734 +++++++++--------- PythonScript/src/EnumsWrapper.cpp | 620 +++++++-------- PythonScript/src/PythonConsole.cpp | 2 +- PythonScript/src/ScintillaPython.cpp | 4 +- PythonScript/src/ScintillaWrapper.cpp | 16 - PythonScript/src/ScintillaWrapper.h | 17 +- .../src/ScintillaWrapperGenerated.cpp | 23 + 9 files changed, 740 insertions(+), 743 deletions(-) diff --git a/PythonScript/src/ConsoleDialog.cpp b/PythonScript/src/ConsoleDialog.cpp index 232b9be9..ae429dac 100644 --- a/PythonScript/src/ConsoleDialog.cpp +++ b/PythonScript/src/ConsoleDialog.cpp @@ -22,7 +22,9 @@ ConsoleDialog::ConsoleDialog() : m_scintilla(NULL), m_hInput(NULL), m_console(NULL), - m_prompt(">>> "), + m_currentPrompt(">>> "), + m_standardPrompt(">>> "), + m_continuePrompt("... "), m_originalInputWndProc(NULL), m_hTabIcon(NULL), m_currentHistory(0), @@ -84,7 +86,7 @@ void ConsoleDialog::initDialog(HINSTANCE hInst, NppData& nppData, ConsoleInterfa { m_colorOutput = false; } - m_prompt = ConfigFile::getInstance()->getSetting(_T("ADDEXTRALINETOOUTPUT")) == _T("1") ? m_prompt.insert(0, "\n") : m_prompt; + m_standardPrompt = ConfigFile::getInstance()->getSetting(_T("ADDEXTRALINETOOUTPUT")) == _T("1") ? m_standardPrompt.insert(0, "\n") : m_standardPrompt; //Window::init(hInst, nppData._nppHandle); createOutputWindow(nppData._nppHandle); @@ -433,7 +435,7 @@ void ConsoleDialog::runStatement() std::shared_ptr charBuffer = WcharMbcsConverter::tchar2char(buffer); delete [] buffer; - writeCmdText(m_prompt.size(), m_prompt.c_str()); + writeCmdText(m_currentPrompt.size(), m_currentPrompt.c_str()); writeCmdText(strlen(charBuffer.get()), charBuffer.get()); writeCmdText(1, "\n"); SetWindowText(hText, _T("")); @@ -452,16 +454,16 @@ void ConsoleDialog::stopStatement() } -void ConsoleDialog::setPrompt(const char *prompt) +void ConsoleDialog::setPrompt(std::string prompt) { - m_prompt = prompt; - ::SetWindowTextA(::GetDlgItem(_hSelf, IDC_PROMPT), (m_prompt.rfind('\n', 0) == 0) ? m_prompt.substr(1, m_prompt.size() - 1).c_str() : m_prompt.c_str()); + m_currentPrompt = prompt; + ::SetWindowTextA(::GetDlgItem(_hSelf, IDC_PROMPT), (prompt.rfind('\n', 0) == 0) ? prompt.substr(1, prompt.size() - 1).c_str() : prompt.c_str()); } -const char * ConsoleDialog::getPrompt() -{ - return m_prompt.c_str(); -} +std::string ConsoleDialog::getStandardPrompt(){ return m_standardPrompt;} + +std::string ConsoleDialog::getContinuePrompt(){ return m_continuePrompt;} + void ConsoleDialog::createOutputWindow(HWND hParentWindow) { @@ -510,12 +512,10 @@ void ConsoleDialog::createOutputWindow(HWND hParentWindow) callScintilla(SCI_STYLESETSIZE, 4 /* = style number */, 8 /* = size in points */); callScintilla(SCI_STYLESETFORE, 4, RGB(199, 175, 7)); // mucky yellow - // 5 stderr warning without hotspot callScintilla(SCI_STYLESETSIZE, 5 /* = style number */, 8 /* = size in points */); callScintilla(SCI_STYLESETFORE, 5, RGB(255, 128, 64)); // orange - // 6 is hotspot, stdout, warning callScintilla(SCI_STYLESETSIZE, 6 /* = style number */, 8 /* = size in points */); callScintilla(SCI_STYLESETFORE, 6, RGB(199, 175, 7)); // mucky yellow @@ -528,14 +528,13 @@ void ConsoleDialog::createOutputWindow(HWND hParentWindow) callScintilla(SCI_STYLESETUNDERLINE, 7 /* = style number */, 1 /* = underline */); callScintilla(SCI_STYLESETHOTSPOT, 7, 1); - // 8 is colored stdout - callScintilla(SCI_STYLESETSIZE, 8 /* = style number */, 8 /* = size in points */); - callScintilla(SCI_STYLESETFORE, 8, m_colorOutput ? m_user_color : 0); // green - + // 8 is colored stdout inidcator + intptr_t defaultColor = callScintilla(SCI_STYLEGETFORE, 0, 0); + callScintilla(SCI_INDICSETSTYLE, 8 /* = indicator number */, INDIC_TEXTFORE); + callScintilla(SCI_INDICSETFORE, 8, m_colorOutput ? m_user_color : defaultColor); // green + callScintilla(SCI_USEPOPUP, 0); callScintilla(SCI_SETLEXER, SCLEX_CONTAINER); - - } LRESULT ConsoleDialog::scintillaWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) @@ -609,22 +608,7 @@ void ConsoleDialog::writeText(size_t length, const char *text) void ConsoleDialog::writeColoredText(size_t length, const char *text) { size_t docLength = (size_t)callScintilla(SCI_GETLENGTH); - size_t realLength = length; callScintilla(SCI_SETREADONLY, 0); - for (idx_t i = 0; i < length; ++i) - { - if (text[i] == '\r') - { - if (i) - { - callScintilla(SCI_APPENDTEXT, i, reinterpret_cast(text)); - } - text += i + 1; - length -= i + 1; - realLength--; - i = 0; - } - } if (length > 0) { @@ -632,12 +616,10 @@ void ConsoleDialog::writeColoredText(size_t length, const char *text) } callScintilla(SCI_SETREADONLY, 1); - callScintilla(SCI_STARTSTYLING, docLength, 0x01); - callScintilla(SCI_SETSTYLING, realLength, m_colorOutput ? 8 : 0); - - callScintilla(SCI_COLOURISE, docLength, -1); - callScintilla(SCI_GOTOPOS, docLength + realLength); + callScintilla(SCI_SETINDICATORCURRENT, 8); + callScintilla(SCI_INDICATORFILLRANGE, docLength, length); + callScintilla(SCI_GOTOPOS, docLength+length); } void ConsoleDialog::writeError(size_t length, const char *text) diff --git a/PythonScript/src/ConsoleDialog.h b/PythonScript/src/ConsoleDialog.h index cf5a787b..bc526a3c 100644 --- a/PythonScript/src/ConsoleDialog.h +++ b/PythonScript/src/ConsoleDialog.h @@ -32,8 +32,9 @@ class ConsoleDialog : public DockingDlgInterface void writeColoredText(size_t length, const char *text); void writeError(size_t length, const char *text); void clearText(); - void setPrompt(const char *prompt); - const char * getPrompt(); + void setPrompt(std::string prompt); + std::string getStandardPrompt(); + std::string getContinuePrompt(); HWND getScintillaHwnd() { return m_scintilla; } void giveInputFocus() { SetFocus(m_hInput); } @@ -83,7 +84,9 @@ class ConsoleDialog : public DockingDlgInterface static WNDPROC s_originalScintillaWndProc; HWND m_hInput; // Input TextBox ConsoleInterface *m_console; - std::string m_prompt; + std::string m_standardPrompt; + std::string m_continuePrompt; + std::string m_currentPrompt; WNDPROC m_originalInputWndProc; HICON m_hTabIcon; diff --git a/PythonScript/src/Enums.h b/PythonScript/src/Enums.h index 6fe80d57..7f72410b 100644 --- a/PythonScript/src/Enums.h +++ b/PythonScript/src/Enums.h @@ -209,175 +209,24 @@ enum VkKeys //lint +e849 /* ++Autogenerated ---------------------------------------------- */ -enum CaseInsensitiveBehaviour -{ - PYSCR_SC_CASEINSENSITIVEBEHAVIOUR_RESPECTCASE = SC_CASEINSENSITIVEBEHAVIOUR_RESPECTCASE, - PYSCR_SC_CASEINSENSITIVEBEHAVIOUR_IGNORECASE = SC_CASEINSENSITIVEBEHAVIOUR_IGNORECASE -}; - -enum LineCache -{ - PYSCR_SC_CACHE_NONE = SC_CACHE_NONE, - PYSCR_SC_CACHE_CARET = SC_CACHE_CARET, - PYSCR_SC_CACHE_PAGE = SC_CACHE_PAGE, - PYSCR_SC_CACHE_DOCUMENT = SC_CACHE_DOCUMENT -}; - -enum Ordering -{ - PYSCR_SC_ORDER_PRESORTED = SC_ORDER_PRESORTED, - PYSCR_SC_ORDER_PERFORMSORT = SC_ORDER_PERFORMSORT, - PYSCR_SC_ORDER_CUSTOM = SC_ORDER_CUSTOM -}; - -enum AutomaticFold -{ - PYSCR_SC_AUTOMATICFOLD_SHOW = SC_AUTOMATICFOLD_SHOW, - PYSCR_SC_AUTOMATICFOLD_CLICK = SC_AUTOMATICFOLD_CLICK, - PYSCR_SC_AUTOMATICFOLD_CHANGE = SC_AUTOMATICFOLD_CHANGE -}; - -enum Update -{ - PYSCR_SC_UPDATE_CONTENT = SC_UPDATE_CONTENT, - PYSCR_SC_UPDATE_SELECTION = SC_UPDATE_SELECTION, - PYSCR_SC_UPDATE_V_SCROLL = SC_UPDATE_V_SCROLL, - PYSCR_SC_UPDATE_H_SCROLL = SC_UPDATE_H_SCROLL -}; - -enum CaretPolicy -{ - PYSCR_CARET_SLOP = CARET_SLOP, - PYSCR_CARET_STRICT = CARET_STRICT, - PYSCR_CARET_JUMPS = CARET_JUMPS, - PYSCR_CARET_EVEN = CARET_EVEN -}; - -enum CaseVisible -{ - PYSCR_SC_CASE_MIXED = SC_CASE_MIXED, - PYSCR_SC_CASE_UPPER = SC_CASE_UPPER, - PYSCR_SC_CASE_LOWER = SC_CASE_LOWER -}; - -enum FoldFlag -{ - PYSCR_SC_FOLDFLAG_LINEBEFORE_EXPANDED = SC_FOLDFLAG_LINEBEFORE_EXPANDED, - PYSCR_SC_FOLDFLAG_LINEBEFORE_CONTRACTED = SC_FOLDFLAG_LINEBEFORE_CONTRACTED, - PYSCR_SC_FOLDFLAG_LINEAFTER_EXPANDED = SC_FOLDFLAG_LINEAFTER_EXPANDED, - PYSCR_SC_FOLDFLAG_LINEAFTER_CONTRACTED = SC_FOLDFLAG_LINEAFTER_CONTRACTED, - PYSCR_SC_FOLDFLAG_LEVELNUMBERS = SC_FOLDFLAG_LEVELNUMBERS, - PYSCR_SC_FOLDFLAG_LINESTATE = SC_FOLDFLAG_LINESTATE -}; - -enum CaretStyle -{ - PYSCR_CARETSTYLE_INVISIBLE = CARETSTYLE_INVISIBLE, - PYSCR_CARETSTYLE_LINE = CARETSTYLE_LINE, - PYSCR_CARETSTYLE_BLOCK = CARETSTYLE_BLOCK -}; - -enum MultiAutoComplete -{ - PYSCR_SC_MULTIAUTOC_ONCE = SC_MULTIAUTOC_ONCE, - PYSCR_SC_MULTIAUTOC_EACH = SC_MULTIAUTOC_EACH -}; - -enum Status -{ - PYSCR_SC_STATUS_OK = SC_STATUS_OK, - PYSCR_SC_STATUS_FAILURE = SC_STATUS_FAILURE, - PYSCR_SC_STATUS_BADALLOC = SC_STATUS_BADALLOC, - PYSCR_SC_STATUS_WARN_START = SC_STATUS_WARN_START, - PYSCR_SC_STATUS_WARN_REGEX = SC_STATUS_WARN_REGEX -}; - -enum WrapVisualLocation -{ - PYSCR_SC_WRAPVISUALFLAGLOC_DEFAULT = SC_WRAPVISUALFLAGLOC_DEFAULT, - PYSCR_SC_WRAPVISUALFLAGLOC_END_BY_TEXT = SC_WRAPVISUALFLAGLOC_END_BY_TEXT, - PYSCR_SC_WRAPVISUALFLAGLOC_START_BY_TEXT = SC_WRAPVISUALFLAGLOC_START_BY_TEXT -}; - -enum Keys -{ - PYSCR_SCK_DOWN = SCK_DOWN, - PYSCR_SCK_UP = SCK_UP, - PYSCR_SCK_LEFT = SCK_LEFT, - PYSCR_SCK_RIGHT = SCK_RIGHT, - PYSCR_SCK_HOME = SCK_HOME, - PYSCR_SCK_END = SCK_END, - PYSCR_SCK_PRIOR = SCK_PRIOR, - PYSCR_SCK_NEXT = SCK_NEXT, - PYSCR_SCK_DELETE = SCK_DELETE, - PYSCR_SCK_INSERT = SCK_INSERT, - PYSCR_SCK_ESCAPE = SCK_ESCAPE, - PYSCR_SCK_BACK = SCK_BACK, - PYSCR_SCK_TAB = SCK_TAB, - PYSCR_SCK_RETURN = SCK_RETURN, - PYSCR_SCK_ADD = SCK_ADD, - PYSCR_SCK_SUBTRACT = SCK_SUBTRACT, - PYSCR_SCK_DIVIDE = SCK_DIVIDE, - PYSCR_SCK_WIN = SCK_WIN, - PYSCR_SCK_RWIN = SCK_RWIN, - PYSCR_SCK_MENU = SCK_MENU -}; - -enum KeyMod -{ - PYSCR_SCMOD_NORM = SCMOD_NORM, - PYSCR_SCMOD_SHIFT = SCMOD_SHIFT, - PYSCR_SCMOD_CTRL = SCMOD_CTRL, - PYSCR_SCMOD_ALT = SCMOD_ALT, - PYSCR_SCMOD_SUPER = SCMOD_SUPER, - PYSCR_SCMOD_META = SCMOD_META -}; - -enum AnnotationVisible -{ - PYSCR_ANNOTATION_HIDDEN = ANNOTATION_HIDDEN, - PYSCR_ANNOTATION_STANDARD = ANNOTATION_STANDARD, - PYSCR_ANNOTATION_BOXED = ANNOTATION_BOXED, - PYSCR_ANNOTATION_INDENTED = ANNOTATION_INDENTED -}; - -enum CharacterSet +enum WhiteSpace { - PYSCR_SC_CHARSET_ANSI = SC_CHARSET_ANSI, - PYSCR_SC_CHARSET_DEFAULT = SC_CHARSET_DEFAULT, - PYSCR_SC_CHARSET_BALTIC = SC_CHARSET_BALTIC, - PYSCR_SC_CHARSET_CHINESEBIG5 = SC_CHARSET_CHINESEBIG5, - PYSCR_SC_CHARSET_EASTEUROPE = SC_CHARSET_EASTEUROPE, - PYSCR_SC_CHARSET_GB2312 = SC_CHARSET_GB2312, - PYSCR_SC_CHARSET_GREEK = SC_CHARSET_GREEK, - PYSCR_SC_CHARSET_HANGUL = SC_CHARSET_HANGUL, - PYSCR_SC_CHARSET_MAC = SC_CHARSET_MAC, - PYSCR_SC_CHARSET_OEM = SC_CHARSET_OEM, - PYSCR_SC_CHARSET_RUSSIAN = SC_CHARSET_RUSSIAN, - PYSCR_SC_CHARSET_CYRILLIC = SC_CHARSET_CYRILLIC, - PYSCR_SC_CHARSET_SHIFTJIS = SC_CHARSET_SHIFTJIS, - PYSCR_SC_CHARSET_SYMBOL = SC_CHARSET_SYMBOL, - PYSCR_SC_CHARSET_TURKISH = SC_CHARSET_TURKISH, - PYSCR_SC_CHARSET_JOHAB = SC_CHARSET_JOHAB, - PYSCR_SC_CHARSET_HEBREW = SC_CHARSET_HEBREW, - PYSCR_SC_CHARSET_ARABIC = SC_CHARSET_ARABIC, - PYSCR_SC_CHARSET_VIETNAMESE = SC_CHARSET_VIETNAMESE, - PYSCR_SC_CHARSET_THAI = SC_CHARSET_THAI, - PYSCR_SC_CHARSET_8859_15 = SC_CHARSET_8859_15 + PYSCR_SCWS_INVISIBLE = SCWS_INVISIBLE, + PYSCR_SCWS_VISIBLEALWAYS = SCWS_VISIBLEALWAYS, + PYSCR_SCWS_VISIBLEAFTERINDENT = SCWS_VISIBLEAFTERINDENT }; -enum PrintOption +enum EndOfLine { - PYSCR_SC_PRINT_NORMAL = SC_PRINT_NORMAL, - PYSCR_SC_PRINT_INVERTLIGHT = SC_PRINT_INVERTLIGHT, - PYSCR_SC_PRINT_BLACKONWHITE = SC_PRINT_BLACKONWHITE, - PYSCR_SC_PRINT_COLOURONWHITE = SC_PRINT_COLOURONWHITE, - PYSCR_SC_PRINT_COLOURONWHITEDEFAULTBG = SC_PRINT_COLOURONWHITEDEFAULTBG + PYSCR_SC_EOL_CRLF = SC_EOL_CRLF, + PYSCR_SC_EOL_CR = SC_EOL_CR, + PYSCR_SC_EOL_LF = SC_EOL_LF }; -enum IndicFlag +enum IMEInteraction { - PYSCR_SC_INDICFLAG_VALUEFORE = SC_INDICFLAG_VALUEFORE + PYSCR_SC_IME_WINDOWED = SC_IME_WINDOWED, + PYSCR_SC_IME_INLINE = SC_IME_INLINE }; enum MarkerSymbol @@ -428,6 +277,68 @@ enum MarkerOutline PYSCR_SC_MARKNUM_FOLDEROPEN = SC_MARKNUM_FOLDEROPEN }; +enum MarginType +{ + PYSCR_SC_MARGIN_SYMBOL = SC_MARGIN_SYMBOL, + PYSCR_SC_MARGIN_NUMBER = SC_MARGIN_NUMBER, + PYSCR_SC_MARGIN_BACK = SC_MARGIN_BACK, + PYSCR_SC_MARGIN_FORE = SC_MARGIN_FORE, + PYSCR_SC_MARGIN_TEXT = SC_MARGIN_TEXT, + PYSCR_SC_MARGIN_RTEXT = SC_MARGIN_RTEXT +}; + +enum StylesCommon +{ + PYSCR_STYLE_DEFAULT = STYLE_DEFAULT, + PYSCR_STYLE_LINENUMBER = STYLE_LINENUMBER, + PYSCR_STYLE_BRACELIGHT = STYLE_BRACELIGHT, + PYSCR_STYLE_BRACEBAD = STYLE_BRACEBAD, + PYSCR_STYLE_CONTROLCHAR = STYLE_CONTROLCHAR, + PYSCR_STYLE_INDENTGUIDE = STYLE_INDENTGUIDE, + PYSCR_STYLE_CALLTIP = STYLE_CALLTIP, + PYSCR_STYLE_LASTPREDEFINED = STYLE_LASTPREDEFINED, + PYSCR_STYLE_MAX = STYLE_MAX +}; + +enum CharacterSet +{ + PYSCR_SC_CHARSET_ANSI = SC_CHARSET_ANSI, + PYSCR_SC_CHARSET_DEFAULT = SC_CHARSET_DEFAULT, + PYSCR_SC_CHARSET_BALTIC = SC_CHARSET_BALTIC, + PYSCR_SC_CHARSET_CHINESEBIG5 = SC_CHARSET_CHINESEBIG5, + PYSCR_SC_CHARSET_EASTEUROPE = SC_CHARSET_EASTEUROPE, + PYSCR_SC_CHARSET_GB2312 = SC_CHARSET_GB2312, + PYSCR_SC_CHARSET_GREEK = SC_CHARSET_GREEK, + PYSCR_SC_CHARSET_HANGUL = SC_CHARSET_HANGUL, + PYSCR_SC_CHARSET_MAC = SC_CHARSET_MAC, + PYSCR_SC_CHARSET_OEM = SC_CHARSET_OEM, + PYSCR_SC_CHARSET_RUSSIAN = SC_CHARSET_RUSSIAN, + PYSCR_SC_CHARSET_CYRILLIC = SC_CHARSET_CYRILLIC, + PYSCR_SC_CHARSET_SHIFTJIS = SC_CHARSET_SHIFTJIS, + PYSCR_SC_CHARSET_SYMBOL = SC_CHARSET_SYMBOL, + PYSCR_SC_CHARSET_TURKISH = SC_CHARSET_TURKISH, + PYSCR_SC_CHARSET_JOHAB = SC_CHARSET_JOHAB, + PYSCR_SC_CHARSET_HEBREW = SC_CHARSET_HEBREW, + PYSCR_SC_CHARSET_ARABIC = SC_CHARSET_ARABIC, + PYSCR_SC_CHARSET_VIETNAMESE = SC_CHARSET_VIETNAMESE, + PYSCR_SC_CHARSET_THAI = SC_CHARSET_THAI, + PYSCR_SC_CHARSET_8859_15 = SC_CHARSET_8859_15 +}; + +enum CaseVisible +{ + PYSCR_SC_CASE_MIXED = SC_CASE_MIXED, + PYSCR_SC_CASE_UPPER = SC_CASE_UPPER, + PYSCR_SC_CASE_LOWER = SC_CASE_LOWER +}; + +enum FontWeight +{ + PYSCR_SC_WEIGHT_NORMAL = SC_WEIGHT_NORMAL, + PYSCR_SC_WEIGHT_SEMIBOLD = SC_WEIGHT_SEMIBOLD, + PYSCR_SC_WEIGHT_BOLD = SC_WEIGHT_BOLD +}; + enum IndicatorStyle { PYSCR_INDIC_PLAIN = INDIC_PLAIN, @@ -454,19 +365,304 @@ enum IndicatorStyle PYSCR_INDIC_CONTAINER = INDIC_CONTAINER }; -enum WrapVisualFlag +enum IndicFlag +{ + PYSCR_SC_INDICFLAG_VALUEFORE = SC_INDICFLAG_VALUEFORE +}; + +enum IndentView +{ + PYSCR_SC_IV_NONE = SC_IV_NONE, + PYSCR_SC_IV_REAL = SC_IV_REAL, + PYSCR_SC_IV_LOOKFORWARD = SC_IV_LOOKFORWARD, + PYSCR_SC_IV_LOOKBOTH = SC_IV_LOOKBOTH +}; + +enum PrintOption +{ + PYSCR_SC_PRINT_NORMAL = SC_PRINT_NORMAL, + PYSCR_SC_PRINT_INVERTLIGHT = SC_PRINT_INVERTLIGHT, + PYSCR_SC_PRINT_BLACKONWHITE = SC_PRINT_BLACKONWHITE, + PYSCR_SC_PRINT_COLOURONWHITE = SC_PRINT_COLOURONWHITE, + PYSCR_SC_PRINT_COLOURONWHITEDEFAULTBG = SC_PRINT_COLOURONWHITEDEFAULTBG +}; + +enum FindOption +{ + PYSCR_SCFIND_WHOLEWORD = SCFIND_WHOLEWORD, + PYSCR_SCFIND_MATCHCASE = SCFIND_MATCHCASE, + PYSCR_SCFIND_WORDSTART = SCFIND_WORDSTART, + PYSCR_SCFIND_REGEXP = SCFIND_REGEXP, + PYSCR_SCFIND_POSIX = SCFIND_POSIX, + PYSCR_SCFIND_CXX11REGEX = SCFIND_CXX11REGEX +}; + +enum FoldLevel +{ + PYSCR_SC_FOLDLEVELBASE = SC_FOLDLEVELBASE, + PYSCR_SC_FOLDLEVELWHITEFLAG = SC_FOLDLEVELWHITEFLAG, + PYSCR_SC_FOLDLEVELHEADERFLAG = SC_FOLDLEVELHEADERFLAG, + PYSCR_SC_FOLDLEVELNUMBERMASK = SC_FOLDLEVELNUMBERMASK +}; + +enum FoldAction +{ + PYSCR_SC_FOLDACTION_CONTRACT = SC_FOLDACTION_CONTRACT, + PYSCR_SC_FOLDACTION_EXPAND = SC_FOLDACTION_EXPAND, + PYSCR_SC_FOLDACTION_TOGGLE = SC_FOLDACTION_TOGGLE +}; + +enum AutomaticFold +{ + PYSCR_SC_AUTOMATICFOLD_SHOW = SC_AUTOMATICFOLD_SHOW, + PYSCR_SC_AUTOMATICFOLD_CLICK = SC_AUTOMATICFOLD_CLICK, + PYSCR_SC_AUTOMATICFOLD_CHANGE = SC_AUTOMATICFOLD_CHANGE +}; + +enum FoldFlag +{ + PYSCR_SC_FOLDFLAG_LINEBEFORE_EXPANDED = SC_FOLDFLAG_LINEBEFORE_EXPANDED, + PYSCR_SC_FOLDFLAG_LINEBEFORE_CONTRACTED = SC_FOLDFLAG_LINEBEFORE_CONTRACTED, + PYSCR_SC_FOLDFLAG_LINEAFTER_EXPANDED = SC_FOLDFLAG_LINEAFTER_EXPANDED, + PYSCR_SC_FOLDFLAG_LINEAFTER_CONTRACTED = SC_FOLDFLAG_LINEAFTER_CONTRACTED, + PYSCR_SC_FOLDFLAG_LEVELNUMBERS = SC_FOLDFLAG_LEVELNUMBERS, + PYSCR_SC_FOLDFLAG_LINESTATE = SC_FOLDFLAG_LINESTATE +}; + +enum Wrap +{ + PYSCR_SC_WRAP_NONE = SC_WRAP_NONE, + PYSCR_SC_WRAP_WORD = SC_WRAP_WORD, + PYSCR_SC_WRAP_CHAR = SC_WRAP_CHAR, + PYSCR_SC_WRAP_WHITESPACE = SC_WRAP_WHITESPACE +}; + +enum WrapVisualFlag +{ + PYSCR_SC_WRAPVISUALFLAG_NONE = SC_WRAPVISUALFLAG_NONE, + PYSCR_SC_WRAPVISUALFLAG_END = SC_WRAPVISUALFLAG_END, + PYSCR_SC_WRAPVISUALFLAG_START = SC_WRAPVISUALFLAG_START, + PYSCR_SC_WRAPVISUALFLAG_MARGIN = SC_WRAPVISUALFLAG_MARGIN +}; + +enum WrapVisualLocation +{ + PYSCR_SC_WRAPVISUALFLAGLOC_DEFAULT = SC_WRAPVISUALFLAGLOC_DEFAULT, + PYSCR_SC_WRAPVISUALFLAGLOC_END_BY_TEXT = SC_WRAPVISUALFLAGLOC_END_BY_TEXT, + PYSCR_SC_WRAPVISUALFLAGLOC_START_BY_TEXT = SC_WRAPVISUALFLAGLOC_START_BY_TEXT +}; + +enum WrapIndentMode +{ + PYSCR_SC_WRAPINDENT_FIXED = SC_WRAPINDENT_FIXED, + PYSCR_SC_WRAPINDENT_SAME = SC_WRAPINDENT_SAME, + PYSCR_SC_WRAPINDENT_INDENT = SC_WRAPINDENT_INDENT +}; + +enum LineCache +{ + PYSCR_SC_CACHE_NONE = SC_CACHE_NONE, + PYSCR_SC_CACHE_CARET = SC_CACHE_CARET, + PYSCR_SC_CACHE_PAGE = SC_CACHE_PAGE, + PYSCR_SC_CACHE_DOCUMENT = SC_CACHE_DOCUMENT +}; + +enum PhasesDraw +{ + PYSCR_SC_PHASES_ONE = SC_PHASES_ONE, + PYSCR_SC_PHASES_TWO = SC_PHASES_TWO, + PYSCR_SC_PHASES_MULTIPLE = SC_PHASES_MULTIPLE +}; + +enum FontQuality +{ + PYSCR_SC_EFF_QUALITY_MASK = SC_EFF_QUALITY_MASK, + PYSCR_SC_EFF_QUALITY_DEFAULT = SC_EFF_QUALITY_DEFAULT, + PYSCR_SC_EFF_QUALITY_NON_ANTIALIASED = SC_EFF_QUALITY_NON_ANTIALIASED, + PYSCR_SC_EFF_QUALITY_ANTIALIASED = SC_EFF_QUALITY_ANTIALIASED, + PYSCR_SC_EFF_QUALITY_LCD_OPTIMIZED = SC_EFF_QUALITY_LCD_OPTIMIZED +}; + +enum MultiPaste +{ + PYSCR_SC_MULTIPASTE_ONCE = SC_MULTIPASTE_ONCE, + PYSCR_SC_MULTIPASTE_EACH = SC_MULTIPASTE_EACH +}; + +enum EdgeVisualStyle +{ + PYSCR_EDGE_NONE = EDGE_NONE, + PYSCR_EDGE_LINE = EDGE_LINE, + PYSCR_EDGE_BACKGROUND = EDGE_BACKGROUND +}; + +enum Status +{ + PYSCR_SC_STATUS_OK = SC_STATUS_OK, + PYSCR_SC_STATUS_FAILURE = SC_STATUS_FAILURE, + PYSCR_SC_STATUS_BADALLOC = SC_STATUS_BADALLOC, + PYSCR_SC_STATUS_WARN_START = SC_STATUS_WARN_START, + PYSCR_SC_STATUS_WARN_REGEX = SC_STATUS_WARN_REGEX +}; + +enum CursorShape +{ + PYSCR_SC_CURSORNORMAL = SC_CURSORNORMAL, + PYSCR_SC_CURSORARROW = SC_CURSORARROW, + PYSCR_SC_CURSORWAIT = SC_CURSORWAIT, + PYSCR_SC_CURSORREVERSEARROW = SC_CURSORREVERSEARROW +}; + +enum CaretPolicy +{ + PYSCR_CARET_SLOP = CARET_SLOP, + PYSCR_CARET_STRICT = CARET_STRICT, + PYSCR_CARET_JUMPS = CARET_JUMPS, + PYSCR_CARET_EVEN = CARET_EVEN +}; + +enum SelectionMode +{ + PYSCR_SC_SEL_STREAM = SC_SEL_STREAM, + PYSCR_SC_SEL_RECTANGLE = SC_SEL_RECTANGLE, + PYSCR_SC_SEL_LINES = SC_SEL_LINES, + PYSCR_SC_SEL_THIN = SC_SEL_THIN +}; + +enum CaseInsensitiveBehaviour +{ + PYSCR_SC_CASEINSENSITIVEBEHAVIOUR_RESPECTCASE = SC_CASEINSENSITIVEBEHAVIOUR_RESPECTCASE, + PYSCR_SC_CASEINSENSITIVEBEHAVIOUR_IGNORECASE = SC_CASEINSENSITIVEBEHAVIOUR_IGNORECASE +}; + +enum MultiAutoComplete +{ + PYSCR_SC_MULTIAUTOC_ONCE = SC_MULTIAUTOC_ONCE, + PYSCR_SC_MULTIAUTOC_EACH = SC_MULTIAUTOC_EACH +}; + +enum Ordering +{ + PYSCR_SC_ORDER_PRESORTED = SC_ORDER_PRESORTED, + PYSCR_SC_ORDER_PERFORMSORT = SC_ORDER_PERFORMSORT, + PYSCR_SC_ORDER_CUSTOM = SC_ORDER_CUSTOM +}; + +enum CaretSticky +{ + PYSCR_SC_CARETSTICKY_OFF = SC_CARETSTICKY_OFF, + PYSCR_SC_CARETSTICKY_ON = SC_CARETSTICKY_ON, + PYSCR_SC_CARETSTICKY_WHITESPACE = SC_CARETSTICKY_WHITESPACE +}; + +enum CaretStyle +{ + PYSCR_CARETSTYLE_INVISIBLE = CARETSTYLE_INVISIBLE, + PYSCR_CARETSTYLE_LINE = CARETSTYLE_LINE, + PYSCR_CARETSTYLE_BLOCK = CARETSTYLE_BLOCK +}; + +enum MarginOption +{ + PYSCR_SC_MARGINOPTION_NONE = SC_MARGINOPTION_NONE, + PYSCR_SC_MARGINOPTION_SUBLINESELECT = SC_MARGINOPTION_SUBLINESELECT +}; + +enum AnnotationVisible +{ + PYSCR_ANNOTATION_HIDDEN = ANNOTATION_HIDDEN, + PYSCR_ANNOTATION_STANDARD = ANNOTATION_STANDARD, + PYSCR_ANNOTATION_BOXED = ANNOTATION_BOXED, + PYSCR_ANNOTATION_INDENTED = ANNOTATION_INDENTED +}; + +enum VirtualSpace +{ + PYSCR_SCVS_NONE = SCVS_NONE, + PYSCR_SCVS_RECTANGULARSELECTION = SCVS_RECTANGULARSELECTION, + PYSCR_SCVS_USERACCESSIBLE = SCVS_USERACCESSIBLE +}; + +enum LineEndType +{ + PYSCR_SC_LINE_END_TYPE_DEFAULT = SC_LINE_END_TYPE_DEFAULT, + PYSCR_SC_LINE_END_TYPE_UNICODE = SC_LINE_END_TYPE_UNICODE +}; + +enum TypeProperty +{ + PYSCR_SC_TYPE_BOOLEAN = SC_TYPE_BOOLEAN, + PYSCR_SC_TYPE_INTEGER = SC_TYPE_INTEGER, + PYSCR_SC_TYPE_STRING = SC_TYPE_STRING +}; + +enum ModificationFlags +{ + PYSCR_SC_MOD_INSERTTEXT = SC_MOD_INSERTTEXT, + PYSCR_SC_MOD_DELETETEXT = SC_MOD_DELETETEXT, + PYSCR_SC_MOD_CHANGESTYLE = SC_MOD_CHANGESTYLE, + PYSCR_SC_MOD_CHANGEFOLD = SC_MOD_CHANGEFOLD, + PYSCR_SC_PERFORMED_USER = SC_PERFORMED_USER, + PYSCR_SC_PERFORMED_UNDO = SC_PERFORMED_UNDO, + PYSCR_SC_PERFORMED_REDO = SC_PERFORMED_REDO, + PYSCR_SC_MULTISTEPUNDOREDO = SC_MULTISTEPUNDOREDO, + PYSCR_SC_LASTSTEPINUNDOREDO = SC_LASTSTEPINUNDOREDO, + PYSCR_SC_MOD_CHANGEMARKER = SC_MOD_CHANGEMARKER, + PYSCR_SC_MOD_BEFOREINSERT = SC_MOD_BEFOREINSERT, + PYSCR_SC_MOD_BEFOREDELETE = SC_MOD_BEFOREDELETE, + PYSCR_SC_MULTILINEUNDOREDO = SC_MULTILINEUNDOREDO, + PYSCR_SC_STARTACTION = SC_STARTACTION, + PYSCR_SC_MOD_CHANGEINDICATOR = SC_MOD_CHANGEINDICATOR, + PYSCR_SC_MOD_CHANGELINESTATE = SC_MOD_CHANGELINESTATE, + PYSCR_SC_MOD_CHANGEMARGIN = SC_MOD_CHANGEMARGIN, + PYSCR_SC_MOD_CHANGEANNOTATION = SC_MOD_CHANGEANNOTATION, + PYSCR_SC_MOD_CONTAINER = SC_MOD_CONTAINER, + PYSCR_SC_MOD_LEXERSTATE = SC_MOD_LEXERSTATE, + PYSCR_SC_MOD_INSERTCHECK = SC_MOD_INSERTCHECK, + PYSCR_SC_MOD_CHANGETABSTOPS = SC_MOD_CHANGETABSTOPS, + PYSCR_SC_MODEVENTMASKALL = SC_MODEVENTMASKALL +}; + +enum Update { - PYSCR_SC_WRAPVISUALFLAG_NONE = SC_WRAPVISUALFLAG_NONE, - PYSCR_SC_WRAPVISUALFLAG_END = SC_WRAPVISUALFLAG_END, - PYSCR_SC_WRAPVISUALFLAG_START = SC_WRAPVISUALFLAG_START, - PYSCR_SC_WRAPVISUALFLAG_MARGIN = SC_WRAPVISUALFLAG_MARGIN + PYSCR_SC_UPDATE_CONTENT = SC_UPDATE_CONTENT, + PYSCR_SC_UPDATE_SELECTION = SC_UPDATE_SELECTION, + PYSCR_SC_UPDATE_V_SCROLL = SC_UPDATE_V_SCROLL, + PYSCR_SC_UPDATE_H_SCROLL = SC_UPDATE_H_SCROLL }; -enum TypeProperty +enum Keys { - PYSCR_SC_TYPE_BOOLEAN = SC_TYPE_BOOLEAN, - PYSCR_SC_TYPE_INTEGER = SC_TYPE_INTEGER, - PYSCR_SC_TYPE_STRING = SC_TYPE_STRING + PYSCR_SCK_DOWN = SCK_DOWN, + PYSCR_SCK_UP = SCK_UP, + PYSCR_SCK_LEFT = SCK_LEFT, + PYSCR_SCK_RIGHT = SCK_RIGHT, + PYSCR_SCK_HOME = SCK_HOME, + PYSCR_SCK_END = SCK_END, + PYSCR_SCK_PRIOR = SCK_PRIOR, + PYSCR_SCK_NEXT = SCK_NEXT, + PYSCR_SCK_DELETE = SCK_DELETE, + PYSCR_SCK_INSERT = SCK_INSERT, + PYSCR_SCK_ESCAPE = SCK_ESCAPE, + PYSCR_SCK_BACK = SCK_BACK, + PYSCR_SCK_TAB = SCK_TAB, + PYSCR_SCK_RETURN = SCK_RETURN, + PYSCR_SCK_ADD = SCK_ADD, + PYSCR_SCK_SUBTRACT = SCK_SUBTRACT, + PYSCR_SCK_DIVIDE = SCK_DIVIDE, + PYSCR_SCK_WIN = SCK_WIN, + PYSCR_SCK_RWIN = SCK_RWIN, + PYSCR_SCK_MENU = SCK_MENU +}; + +enum KeyMod +{ + PYSCR_SCMOD_NORM = SCMOD_NORM, + PYSCR_SCMOD_SHIFT = SCMOD_SHIFT, + PYSCR_SCMOD_CTRL = SCMOD_CTRL, + PYSCR_SCMOD_ALT = SCMOD_ALT, + PYSCR_SCMOD_SUPER = SCMOD_SUPER, + PYSCR_SCMOD_META = SCMOD_META }; enum Lexer @@ -592,202 +788,6 @@ enum Lexer PYSCR_SCLEX_AUTOMATIC = SCLEX_AUTOMATIC }; -enum MarginOption -{ - PYSCR_SC_MARGINOPTION_NONE = SC_MARGINOPTION_NONE, - PYSCR_SC_MARGINOPTION_SUBLINESELECT = SC_MARGINOPTION_SUBLINESELECT -}; - -enum CursorShape -{ - PYSCR_SC_CURSORNORMAL = SC_CURSORNORMAL, - PYSCR_SC_CURSORARROW = SC_CURSORARROW, - PYSCR_SC_CURSORWAIT = SC_CURSORWAIT, - PYSCR_SC_CURSORREVERSEARROW = SC_CURSORREVERSEARROW -}; - -enum MarginType -{ - PYSCR_SC_MARGIN_SYMBOL = SC_MARGIN_SYMBOL, - PYSCR_SC_MARGIN_NUMBER = SC_MARGIN_NUMBER, - PYSCR_SC_MARGIN_BACK = SC_MARGIN_BACK, - PYSCR_SC_MARGIN_FORE = SC_MARGIN_FORE, - PYSCR_SC_MARGIN_TEXT = SC_MARGIN_TEXT, - PYSCR_SC_MARGIN_RTEXT = SC_MARGIN_RTEXT -}; - -enum FindOption -{ - PYSCR_SCFIND_WHOLEWORD = SCFIND_WHOLEWORD, - PYSCR_SCFIND_MATCHCASE = SCFIND_MATCHCASE, - PYSCR_SCFIND_WORDSTART = SCFIND_WORDSTART, - PYSCR_SCFIND_REGEXP = SCFIND_REGEXP, - PYSCR_SCFIND_POSIX = SCFIND_POSIX, - PYSCR_SCFIND_CXX11REGEX = SCFIND_CXX11REGEX -}; - -enum ModificationFlags -{ - PYSCR_SC_MOD_INSERTTEXT = SC_MOD_INSERTTEXT, - PYSCR_SC_MOD_DELETETEXT = SC_MOD_DELETETEXT, - PYSCR_SC_MOD_CHANGESTYLE = SC_MOD_CHANGESTYLE, - PYSCR_SC_MOD_CHANGEFOLD = SC_MOD_CHANGEFOLD, - PYSCR_SC_PERFORMED_USER = SC_PERFORMED_USER, - PYSCR_SC_PERFORMED_UNDO = SC_PERFORMED_UNDO, - PYSCR_SC_PERFORMED_REDO = SC_PERFORMED_REDO, - PYSCR_SC_MULTISTEPUNDOREDO = SC_MULTISTEPUNDOREDO, - PYSCR_SC_LASTSTEPINUNDOREDO = SC_LASTSTEPINUNDOREDO, - PYSCR_SC_MOD_CHANGEMARKER = SC_MOD_CHANGEMARKER, - PYSCR_SC_MOD_BEFOREINSERT = SC_MOD_BEFOREINSERT, - PYSCR_SC_MOD_BEFOREDELETE = SC_MOD_BEFOREDELETE, - PYSCR_SC_MULTILINEUNDOREDO = SC_MULTILINEUNDOREDO, - PYSCR_SC_STARTACTION = SC_STARTACTION, - PYSCR_SC_MOD_CHANGEINDICATOR = SC_MOD_CHANGEINDICATOR, - PYSCR_SC_MOD_CHANGELINESTATE = SC_MOD_CHANGELINESTATE, - PYSCR_SC_MOD_CHANGEMARGIN = SC_MOD_CHANGEMARGIN, - PYSCR_SC_MOD_CHANGEANNOTATION = SC_MOD_CHANGEANNOTATION, - PYSCR_SC_MOD_CONTAINER = SC_MOD_CONTAINER, - PYSCR_SC_MOD_LEXERSTATE = SC_MOD_LEXERSTATE, - PYSCR_SC_MOD_INSERTCHECK = SC_MOD_INSERTCHECK, - PYSCR_SC_MOD_CHANGETABSTOPS = SC_MOD_CHANGETABSTOPS, - PYSCR_SC_MODEVENTMASKALL = SC_MODEVENTMASKALL -}; - -enum LineEndType -{ - PYSCR_SC_LINE_END_TYPE_DEFAULT = SC_LINE_END_TYPE_DEFAULT, - PYSCR_SC_LINE_END_TYPE_UNICODE = SC_LINE_END_TYPE_UNICODE -}; - -enum VirtualSpace -{ - PYSCR_SCVS_NONE = SCVS_NONE, - PYSCR_SCVS_RECTANGULARSELECTION = SCVS_RECTANGULARSELECTION, - PYSCR_SCVS_USERACCESSIBLE = SCVS_USERACCESSIBLE -}; - -enum PhasesDraw -{ - PYSCR_SC_PHASES_ONE = SC_PHASES_ONE, - PYSCR_SC_PHASES_TWO = SC_PHASES_TWO, - PYSCR_SC_PHASES_MULTIPLE = SC_PHASES_MULTIPLE -}; - -enum EdgeVisualStyle -{ - PYSCR_EDGE_NONE = EDGE_NONE, - PYSCR_EDGE_LINE = EDGE_LINE, - PYSCR_EDGE_BACKGROUND = EDGE_BACKGROUND -}; - -enum WhiteSpace -{ - PYSCR_SCWS_INVISIBLE = SCWS_INVISIBLE, - PYSCR_SCWS_VISIBLEALWAYS = SCWS_VISIBLEALWAYS, - PYSCR_SCWS_VISIBLEAFTERINDENT = SCWS_VISIBLEAFTERINDENT -}; - -enum IMEInteraction -{ - PYSCR_SC_IME_WINDOWED = SC_IME_WINDOWED, - PYSCR_SC_IME_INLINE = SC_IME_INLINE -}; - -enum FoldLevel -{ - PYSCR_SC_FOLDLEVELBASE = SC_FOLDLEVELBASE, - PYSCR_SC_FOLDLEVELWHITEFLAG = SC_FOLDLEVELWHITEFLAG, - PYSCR_SC_FOLDLEVELHEADERFLAG = SC_FOLDLEVELHEADERFLAG, - PYSCR_SC_FOLDLEVELNUMBERMASK = SC_FOLDLEVELNUMBERMASK -}; - -enum WrapIndentMode -{ - PYSCR_SC_WRAPINDENT_FIXED = SC_WRAPINDENT_FIXED, - PYSCR_SC_WRAPINDENT_SAME = SC_WRAPINDENT_SAME, - PYSCR_SC_WRAPINDENT_INDENT = SC_WRAPINDENT_INDENT -}; - -enum FontWeight -{ - PYSCR_SC_WEIGHT_NORMAL = SC_WEIGHT_NORMAL, - PYSCR_SC_WEIGHT_SEMIBOLD = SC_WEIGHT_SEMIBOLD, - PYSCR_SC_WEIGHT_BOLD = SC_WEIGHT_BOLD -}; - -enum MultiPaste -{ - PYSCR_SC_MULTIPASTE_ONCE = SC_MULTIPASTE_ONCE, - PYSCR_SC_MULTIPASTE_EACH = SC_MULTIPASTE_EACH -}; - -enum StylesCommon -{ - PYSCR_STYLE_DEFAULT = STYLE_DEFAULT, - PYSCR_STYLE_LINENUMBER = STYLE_LINENUMBER, - PYSCR_STYLE_BRACELIGHT = STYLE_BRACELIGHT, - PYSCR_STYLE_BRACEBAD = STYLE_BRACEBAD, - PYSCR_STYLE_CONTROLCHAR = STYLE_CONTROLCHAR, - PYSCR_STYLE_INDENTGUIDE = STYLE_INDENTGUIDE, - PYSCR_STYLE_CALLTIP = STYLE_CALLTIP, - PYSCR_STYLE_LASTPREDEFINED = STYLE_LASTPREDEFINED, - PYSCR_STYLE_MAX = STYLE_MAX -}; - -enum IndentView -{ - PYSCR_SC_IV_NONE = SC_IV_NONE, - PYSCR_SC_IV_REAL = SC_IV_REAL, - PYSCR_SC_IV_LOOKFORWARD = SC_IV_LOOKFORWARD, - PYSCR_SC_IV_LOOKBOTH = SC_IV_LOOKBOTH -}; - -enum Wrap -{ - PYSCR_SC_WRAP_NONE = SC_WRAP_NONE, - PYSCR_SC_WRAP_WORD = SC_WRAP_WORD, - PYSCR_SC_WRAP_CHAR = SC_WRAP_CHAR, - PYSCR_SC_WRAP_WHITESPACE = SC_WRAP_WHITESPACE -}; - -enum SelectionMode -{ - PYSCR_SC_SEL_STREAM = SC_SEL_STREAM, - PYSCR_SC_SEL_RECTANGLE = SC_SEL_RECTANGLE, - PYSCR_SC_SEL_LINES = SC_SEL_LINES, - PYSCR_SC_SEL_THIN = SC_SEL_THIN -}; - -enum CaretSticky -{ - PYSCR_SC_CARETSTICKY_OFF = SC_CARETSTICKY_OFF, - PYSCR_SC_CARETSTICKY_ON = SC_CARETSTICKY_ON, - PYSCR_SC_CARETSTICKY_WHITESPACE = SC_CARETSTICKY_WHITESPACE -}; - -enum FoldAction -{ - PYSCR_SC_FOLDACTION_CONTRACT = SC_FOLDACTION_CONTRACT, - PYSCR_SC_FOLDACTION_EXPAND = SC_FOLDACTION_EXPAND, - PYSCR_SC_FOLDACTION_TOGGLE = SC_FOLDACTION_TOGGLE -}; - -enum FontQuality -{ - PYSCR_SC_EFF_QUALITY_MASK = SC_EFF_QUALITY_MASK, - PYSCR_SC_EFF_QUALITY_DEFAULT = SC_EFF_QUALITY_DEFAULT, - PYSCR_SC_EFF_QUALITY_NON_ANTIALIASED = SC_EFF_QUALITY_NON_ANTIALIASED, - PYSCR_SC_EFF_QUALITY_ANTIALIASED = SC_EFF_QUALITY_ANTIALIASED, - PYSCR_SC_EFF_QUALITY_LCD_OPTIMIZED = SC_EFF_QUALITY_LCD_OPTIMIZED -}; - -enum EndOfLine -{ - PYSCR_SC_EOL_CRLF = SC_EOL_CRLF, - PYSCR_SC_EOL_CR = SC_EOL_CR, - PYSCR_SC_EOL_LF = SC_EOL_LF -}; - /* The following is the enum of events/notifications. * Note that the PYSCN_XXX constants are NOT automatically generated (in ScintillaNotifications.h). diff --git a/PythonScript/src/EnumsWrapper.cpp b/PythonScript/src/EnumsWrapper.cpp index dbc1893a..ae79f2fd 100644 --- a/PythonScript/src/EnumsWrapper.cpp +++ b/PythonScript/src/EnumsWrapper.cpp @@ -205,140 +205,19 @@ void export_enums() */ /* ++Autogenerated -------------------------------------------- */ - boost::python::enum_("CASEINSENSITIVEBEHAVIOUR") - .value("RESPECTCASE", PYSCR_SC_CASEINSENSITIVEBEHAVIOUR_RESPECTCASE) - .value("IGNORECASE", PYSCR_SC_CASEINSENSITIVEBEHAVIOUR_IGNORECASE); - - boost::python::enum_("LINECACHE") - .value("NONE", PYSCR_SC_CACHE_NONE) - .value("CARET", PYSCR_SC_CACHE_CARET) - .value("PAGE", PYSCR_SC_CACHE_PAGE) - .value("DOCUMENT", PYSCR_SC_CACHE_DOCUMENT); - - boost::python::enum_("ORDERING") - .value("PRESORTED", PYSCR_SC_ORDER_PRESORTED) - .value("PERFORMSORT", PYSCR_SC_ORDER_PERFORMSORT) - .value("CUSTOM", PYSCR_SC_ORDER_CUSTOM); - - boost::python::enum_("AUTOMATICFOLD") - .value("SHOW", PYSCR_SC_AUTOMATICFOLD_SHOW) - .value("CLICK", PYSCR_SC_AUTOMATICFOLD_CLICK) - .value("CHANGE", PYSCR_SC_AUTOMATICFOLD_CHANGE); - - boost::python::enum_("UPDATE") - .value("CONTENT", PYSCR_SC_UPDATE_CONTENT) - .value("SELECTION", PYSCR_SC_UPDATE_SELECTION) - .value("V_SCROLL", PYSCR_SC_UPDATE_V_SCROLL) - .value("H_SCROLL", PYSCR_SC_UPDATE_H_SCROLL); - - boost::python::enum_("CARETPOLICY") - .value("SLOP", PYSCR_CARET_SLOP) - .value("STRICT", PYSCR_CARET_STRICT) - .value("JUMPS", PYSCR_CARET_JUMPS) - .value("EVEN", PYSCR_CARET_EVEN); - - boost::python::enum_("CASEVISIBLE") - .value("MIXED", PYSCR_SC_CASE_MIXED) - .value("UPPER", PYSCR_SC_CASE_UPPER) - .value("LOWER", PYSCR_SC_CASE_LOWER); - - boost::python::enum_("FOLDFLAG") - .value("LINEBEFORE_EXPANDED", PYSCR_SC_FOLDFLAG_LINEBEFORE_EXPANDED) - .value("LINEBEFORE_CONTRACTED", PYSCR_SC_FOLDFLAG_LINEBEFORE_CONTRACTED) - .value("LINEAFTER_EXPANDED", PYSCR_SC_FOLDFLAG_LINEAFTER_EXPANDED) - .value("LINEAFTER_CONTRACTED", PYSCR_SC_FOLDFLAG_LINEAFTER_CONTRACTED) - .value("LEVELNUMBERS", PYSCR_SC_FOLDFLAG_LEVELNUMBERS) - .value("LINESTATE", PYSCR_SC_FOLDFLAG_LINESTATE); - - boost::python::enum_("CARETSTYLE") - .value("INVISIBLE", PYSCR_CARETSTYLE_INVISIBLE) - .value("LINE", PYSCR_CARETSTYLE_LINE) - .value("BLOCK", PYSCR_CARETSTYLE_BLOCK); - - boost::python::enum_("MULTIAUTOCOMPLETE") - .value("ONCE", PYSCR_SC_MULTIAUTOC_ONCE) - .value("EACH", PYSCR_SC_MULTIAUTOC_EACH); - - boost::python::enum_("STATUS") - .value("OK", PYSCR_SC_STATUS_OK) - .value("FAILURE", PYSCR_SC_STATUS_FAILURE) - .value("BADALLOC", PYSCR_SC_STATUS_BADALLOC) - .value("WARN_START", PYSCR_SC_STATUS_WARN_START) - .value("WARN_REGEX", PYSCR_SC_STATUS_WARN_REGEX); - - boost::python::enum_("WRAPVISUALLOCATION") - .value("DEFAULT", PYSCR_SC_WRAPVISUALFLAGLOC_DEFAULT) - .value("END_BY_TEXT", PYSCR_SC_WRAPVISUALFLAGLOC_END_BY_TEXT) - .value("START_BY_TEXT", PYSCR_SC_WRAPVISUALFLAGLOC_START_BY_TEXT); - - boost::python::enum_("KEYS") - .value("DOWN", PYSCR_SCK_DOWN) - .value("UP", PYSCR_SCK_UP) - .value("LEFT", PYSCR_SCK_LEFT) - .value("RIGHT", PYSCR_SCK_RIGHT) - .value("HOME", PYSCR_SCK_HOME) - .value("END", PYSCR_SCK_END) - .value("PRIOR", PYSCR_SCK_PRIOR) - .value("NEXT", PYSCR_SCK_NEXT) - .value("DELETE", PYSCR_SCK_DELETE) - .value("INSERT", PYSCR_SCK_INSERT) - .value("ESCAPE", PYSCR_SCK_ESCAPE) - .value("BACK", PYSCR_SCK_BACK) - .value("TAB", PYSCR_SCK_TAB) - .value("RETURN", PYSCR_SCK_RETURN) - .value("ADD", PYSCR_SCK_ADD) - .value("SUBTRACT", PYSCR_SCK_SUBTRACT) - .value("DIVIDE", PYSCR_SCK_DIVIDE) - .value("WIN", PYSCR_SCK_WIN) - .value("RWIN", PYSCR_SCK_RWIN) - .value("MENU", PYSCR_SCK_MENU); - - boost::python::enum_("KEYMOD") - .value("NORM", PYSCR_SCMOD_NORM) - .value("SHIFT", PYSCR_SCMOD_SHIFT) - .value("CTRL", PYSCR_SCMOD_CTRL) - .value("ALT", PYSCR_SCMOD_ALT) - .value("SUPER", PYSCR_SCMOD_SUPER) - .value("META", PYSCR_SCMOD_META); - - boost::python::enum_("ANNOTATIONVISIBLE") - .value("HIDDEN", PYSCR_ANNOTATION_HIDDEN) - .value("STANDARD", PYSCR_ANNOTATION_STANDARD) - .value("BOXED", PYSCR_ANNOTATION_BOXED) - .value("INDENTED", PYSCR_ANNOTATION_INDENTED); - - boost::python::enum_("CHARACTERSET") - .value("ANSI", PYSCR_SC_CHARSET_ANSI) - .value("DEFAULT", PYSCR_SC_CHARSET_DEFAULT) - .value("BALTIC", PYSCR_SC_CHARSET_BALTIC) - .value("CHINESEBIG5", PYSCR_SC_CHARSET_CHINESEBIG5) - .value("EASTEUROPE", PYSCR_SC_CHARSET_EASTEUROPE) - .value("GB2312", PYSCR_SC_CHARSET_GB2312) - .value("GREEK", PYSCR_SC_CHARSET_GREEK) - .value("HANGUL", PYSCR_SC_CHARSET_HANGUL) - .value("MAC", PYSCR_SC_CHARSET_MAC) - .value("OEM", PYSCR_SC_CHARSET_OEM) - .value("RUSSIAN", PYSCR_SC_CHARSET_RUSSIAN) - .value("CYRILLIC", PYSCR_SC_CHARSET_CYRILLIC) - .value("SHIFTJIS", PYSCR_SC_CHARSET_SHIFTJIS) - .value("SYMBOL", PYSCR_SC_CHARSET_SYMBOL) - .value("TURKISH", PYSCR_SC_CHARSET_TURKISH) - .value("JOHAB", PYSCR_SC_CHARSET_JOHAB) - .value("HEBREW", PYSCR_SC_CHARSET_HEBREW) - .value("ARABIC", PYSCR_SC_CHARSET_ARABIC) - .value("VIETNAMESE", PYSCR_SC_CHARSET_VIETNAMESE) - .value("THAI", PYSCR_SC_CHARSET_THAI) - .value("8859_15", PYSCR_SC_CHARSET_8859_15); + boost::python::enum_("WHITESPACE") + .value("INVISIBLE", PYSCR_SCWS_INVISIBLE) + .value("VISIBLEALWAYS", PYSCR_SCWS_VISIBLEALWAYS) + .value("VISIBLEAFTERINDENT", PYSCR_SCWS_VISIBLEAFTERINDENT); - boost::python::enum_("PRINTOPTION") - .value("NORMAL", PYSCR_SC_PRINT_NORMAL) - .value("INVERTLIGHT", PYSCR_SC_PRINT_INVERTLIGHT) - .value("BLACKONWHITE", PYSCR_SC_PRINT_BLACKONWHITE) - .value("COLOURONWHITE", PYSCR_SC_PRINT_COLOURONWHITE) - .value("COLOURONWHITEDEFAULTBG", PYSCR_SC_PRINT_COLOURONWHITEDEFAULTBG); + boost::python::enum_("ENDOFLINE") + .value("CRLF", PYSCR_SC_EOL_CRLF) + .value("CR", PYSCR_SC_EOL_CR) + .value("LF", PYSCR_SC_EOL_LF); - boost::python::enum_("INDICFLAG") - .value("VALUEFORE", PYSCR_SC_INDICFLAG_VALUEFORE); + boost::python::enum_("IMEINTERACTION") + .value("WINDOWED", PYSCR_SC_IME_WINDOWED) + .value("INLINE", PYSCR_SC_IME_INLINE); boost::python::enum_("MARKERSYMBOL") .value("CIRCLE", PYSCR_SC_MARK_CIRCLE) @@ -384,41 +263,312 @@ void export_enums() .value("FOLDER", PYSCR_SC_MARKNUM_FOLDER) .value("FOLDEROPEN", PYSCR_SC_MARKNUM_FOLDEROPEN); - boost::python::enum_("INDICATORSTYLE") - .value("PLAIN", PYSCR_INDIC_PLAIN) - .value("SQUIGGLE", PYSCR_INDIC_SQUIGGLE) - .value("TT", PYSCR_INDIC_TT) - .value("DIAGONAL", PYSCR_INDIC_DIAGONAL) - .value("STRIKE", PYSCR_INDIC_STRIKE) - .value("HIDDEN", PYSCR_INDIC_HIDDEN) - .value("BOX", PYSCR_INDIC_BOX) - .value("ROUNDBOX", PYSCR_INDIC_ROUNDBOX) - .value("STRAIGHTBOX", PYSCR_INDIC_STRAIGHTBOX) - .value("DASH", PYSCR_INDIC_DASH) - .value("DOTS", PYSCR_INDIC_DOTS) - .value("SQUIGGLELOW", PYSCR_INDIC_SQUIGGLELOW) - .value("DOTBOX", PYSCR_INDIC_DOTBOX) - .value("SQUIGGLEPIXMAP", PYSCR_INDIC_SQUIGGLEPIXMAP) - .value("COMPOSITIONTHICK", PYSCR_INDIC_COMPOSITIONTHICK) - .value("COMPOSITIONTHIN", PYSCR_INDIC_COMPOSITIONTHIN) - .value("FULLBOX", PYSCR_INDIC_FULLBOX) - .value("TEXTFORE", PYSCR_INDIC_TEXTFORE) - .value("IME", PYSCR_INDIC_IME) - .value("IME_MAX", PYSCR_INDIC_IME_MAX) - .value("MAX", PYSCR_INDIC_MAX) - .value("CONTAINER", PYSCR_INDIC_CONTAINER); + boost::python::enum_("MARGINTYPE") + .value("SYMBOL", PYSCR_SC_MARGIN_SYMBOL) + .value("NUMBER", PYSCR_SC_MARGIN_NUMBER) + .value("BACK", PYSCR_SC_MARGIN_BACK) + .value("FORE", PYSCR_SC_MARGIN_FORE) + .value("TEXT", PYSCR_SC_MARGIN_TEXT) + .value("RTEXT", PYSCR_SC_MARGIN_RTEXT); + + boost::python::enum_("STYLESCOMMON") + .value("DEFAULT", PYSCR_STYLE_DEFAULT) + .value("LINENUMBER", PYSCR_STYLE_LINENUMBER) + .value("BRACELIGHT", PYSCR_STYLE_BRACELIGHT) + .value("BRACEBAD", PYSCR_STYLE_BRACEBAD) + .value("CONTROLCHAR", PYSCR_STYLE_CONTROLCHAR) + .value("INDENTGUIDE", PYSCR_STYLE_INDENTGUIDE) + .value("CALLTIP", PYSCR_STYLE_CALLTIP) + .value("LASTPREDEFINED", PYSCR_STYLE_LASTPREDEFINED) + .value("MAX", PYSCR_STYLE_MAX); + + boost::python::enum_("CHARACTERSET") + .value("ANSI", PYSCR_SC_CHARSET_ANSI) + .value("DEFAULT", PYSCR_SC_CHARSET_DEFAULT) + .value("BALTIC", PYSCR_SC_CHARSET_BALTIC) + .value("CHINESEBIG5", PYSCR_SC_CHARSET_CHINESEBIG5) + .value("EASTEUROPE", PYSCR_SC_CHARSET_EASTEUROPE) + .value("GB2312", PYSCR_SC_CHARSET_GB2312) + .value("GREEK", PYSCR_SC_CHARSET_GREEK) + .value("HANGUL", PYSCR_SC_CHARSET_HANGUL) + .value("MAC", PYSCR_SC_CHARSET_MAC) + .value("OEM", PYSCR_SC_CHARSET_OEM) + .value("RUSSIAN", PYSCR_SC_CHARSET_RUSSIAN) + .value("CYRILLIC", PYSCR_SC_CHARSET_CYRILLIC) + .value("SHIFTJIS", PYSCR_SC_CHARSET_SHIFTJIS) + .value("SYMBOL", PYSCR_SC_CHARSET_SYMBOL) + .value("TURKISH", PYSCR_SC_CHARSET_TURKISH) + .value("JOHAB", PYSCR_SC_CHARSET_JOHAB) + .value("HEBREW", PYSCR_SC_CHARSET_HEBREW) + .value("ARABIC", PYSCR_SC_CHARSET_ARABIC) + .value("VIETNAMESE", PYSCR_SC_CHARSET_VIETNAMESE) + .value("THAI", PYSCR_SC_CHARSET_THAI) + .value("8859_15", PYSCR_SC_CHARSET_8859_15); + + boost::python::enum_("CASEVISIBLE") + .value("MIXED", PYSCR_SC_CASE_MIXED) + .value("UPPER", PYSCR_SC_CASE_UPPER) + .value("LOWER", PYSCR_SC_CASE_LOWER); + + boost::python::enum_("FONTWEIGHT") + .value("NORMAL", PYSCR_SC_WEIGHT_NORMAL) + .value("SEMIBOLD", PYSCR_SC_WEIGHT_SEMIBOLD) + .value("BOLD", PYSCR_SC_WEIGHT_BOLD); + + boost::python::enum_("INDICATORSTYLE") + .value("PLAIN", PYSCR_INDIC_PLAIN) + .value("SQUIGGLE", PYSCR_INDIC_SQUIGGLE) + .value("TT", PYSCR_INDIC_TT) + .value("DIAGONAL", PYSCR_INDIC_DIAGONAL) + .value("STRIKE", PYSCR_INDIC_STRIKE) + .value("HIDDEN", PYSCR_INDIC_HIDDEN) + .value("BOX", PYSCR_INDIC_BOX) + .value("ROUNDBOX", PYSCR_INDIC_ROUNDBOX) + .value("STRAIGHTBOX", PYSCR_INDIC_STRAIGHTBOX) + .value("DASH", PYSCR_INDIC_DASH) + .value("DOTS", PYSCR_INDIC_DOTS) + .value("SQUIGGLELOW", PYSCR_INDIC_SQUIGGLELOW) + .value("DOTBOX", PYSCR_INDIC_DOTBOX) + .value("SQUIGGLEPIXMAP", PYSCR_INDIC_SQUIGGLEPIXMAP) + .value("COMPOSITIONTHICK", PYSCR_INDIC_COMPOSITIONTHICK) + .value("COMPOSITIONTHIN", PYSCR_INDIC_COMPOSITIONTHIN) + .value("FULLBOX", PYSCR_INDIC_FULLBOX) + .value("TEXTFORE", PYSCR_INDIC_TEXTFORE) + .value("IME", PYSCR_INDIC_IME) + .value("IME_MAX", PYSCR_INDIC_IME_MAX) + .value("MAX", PYSCR_INDIC_MAX) + .value("CONTAINER", PYSCR_INDIC_CONTAINER); + + boost::python::enum_("INDICFLAG") + .value("VALUEFORE", PYSCR_SC_INDICFLAG_VALUEFORE); + + boost::python::enum_("INDENTVIEW") + .value("NONE", PYSCR_SC_IV_NONE) + .value("REAL", PYSCR_SC_IV_REAL) + .value("LOOKFORWARD", PYSCR_SC_IV_LOOKFORWARD) + .value("LOOKBOTH", PYSCR_SC_IV_LOOKBOTH); + + boost::python::enum_("PRINTOPTION") + .value("NORMAL", PYSCR_SC_PRINT_NORMAL) + .value("INVERTLIGHT", PYSCR_SC_PRINT_INVERTLIGHT) + .value("BLACKONWHITE", PYSCR_SC_PRINT_BLACKONWHITE) + .value("COLOURONWHITE", PYSCR_SC_PRINT_COLOURONWHITE) + .value("COLOURONWHITEDEFAULTBG", PYSCR_SC_PRINT_COLOURONWHITEDEFAULTBG); + + boost::python::enum_("FINDOPTION") + .value("WHOLEWORD", PYSCR_SCFIND_WHOLEWORD) + .value("MATCHCASE", PYSCR_SCFIND_MATCHCASE) + .value("WORDSTART", PYSCR_SCFIND_WORDSTART) + .value("REGEXP", PYSCR_SCFIND_REGEXP) + .value("POSIX", PYSCR_SCFIND_POSIX) + .value("CXX11REGEX", PYSCR_SCFIND_CXX11REGEX); + + boost::python::enum_("FOLDLEVEL") + .value("BASE", PYSCR_SC_FOLDLEVELBASE) + .value("WHITEFLAG", PYSCR_SC_FOLDLEVELWHITEFLAG) + .value("HEADERFLAG", PYSCR_SC_FOLDLEVELHEADERFLAG) + .value("NUMBERMASK", PYSCR_SC_FOLDLEVELNUMBERMASK); + + boost::python::enum_("FOLDACTION") + .value("_CONTRACT", PYSCR_SC_FOLDACTION_CONTRACT) + .value("_EXPAND", PYSCR_SC_FOLDACTION_EXPAND) + .value("_TOGGLE", PYSCR_SC_FOLDACTION_TOGGLE); + + boost::python::enum_("AUTOMATICFOLD") + .value("SHOW", PYSCR_SC_AUTOMATICFOLD_SHOW) + .value("CLICK", PYSCR_SC_AUTOMATICFOLD_CLICK) + .value("CHANGE", PYSCR_SC_AUTOMATICFOLD_CHANGE); + + boost::python::enum_("FOLDFLAG") + .value("LINEBEFORE_EXPANDED", PYSCR_SC_FOLDFLAG_LINEBEFORE_EXPANDED) + .value("LINEBEFORE_CONTRACTED", PYSCR_SC_FOLDFLAG_LINEBEFORE_CONTRACTED) + .value("LINEAFTER_EXPANDED", PYSCR_SC_FOLDFLAG_LINEAFTER_EXPANDED) + .value("LINEAFTER_CONTRACTED", PYSCR_SC_FOLDFLAG_LINEAFTER_CONTRACTED) + .value("LEVELNUMBERS", PYSCR_SC_FOLDFLAG_LEVELNUMBERS) + .value("LINESTATE", PYSCR_SC_FOLDFLAG_LINESTATE); + + boost::python::enum_("WRAP") + .value("NONE", PYSCR_SC_WRAP_NONE) + .value("WORD", PYSCR_SC_WRAP_WORD) + .value("CHAR", PYSCR_SC_WRAP_CHAR) + .value("WHITESPACE", PYSCR_SC_WRAP_WHITESPACE); + + boost::python::enum_("WRAPVISUALFLAG") + .value("NONE", PYSCR_SC_WRAPVISUALFLAG_NONE) + .value("END", PYSCR_SC_WRAPVISUALFLAG_END) + .value("START", PYSCR_SC_WRAPVISUALFLAG_START) + .value("MARGIN", PYSCR_SC_WRAPVISUALFLAG_MARGIN); + + boost::python::enum_("WRAPVISUALLOCATION") + .value("DEFAULT", PYSCR_SC_WRAPVISUALFLAGLOC_DEFAULT) + .value("END_BY_TEXT", PYSCR_SC_WRAPVISUALFLAGLOC_END_BY_TEXT) + .value("START_BY_TEXT", PYSCR_SC_WRAPVISUALFLAGLOC_START_BY_TEXT); + + boost::python::enum_("WRAPINDENTMODE") + .value("FIXED", PYSCR_SC_WRAPINDENT_FIXED) + .value("SAME", PYSCR_SC_WRAPINDENT_SAME) + .value("INDENT", PYSCR_SC_WRAPINDENT_INDENT); + + boost::python::enum_("LINECACHE") + .value("NONE", PYSCR_SC_CACHE_NONE) + .value("CARET", PYSCR_SC_CACHE_CARET) + .value("PAGE", PYSCR_SC_CACHE_PAGE) + .value("DOCUMENT", PYSCR_SC_CACHE_DOCUMENT); + + boost::python::enum_("PHASESDRAW") + .value("ONE", PYSCR_SC_PHASES_ONE) + .value("TWO", PYSCR_SC_PHASES_TWO) + .value("MULTIPLE", PYSCR_SC_PHASES_MULTIPLE); + + boost::python::enum_("FONTQUALITY") + .value("QUALITY_MASK", PYSCR_SC_EFF_QUALITY_MASK) + .value("QUALITY_DEFAULT", PYSCR_SC_EFF_QUALITY_DEFAULT) + .value("QUALITY_NON_ANTIALIASED", PYSCR_SC_EFF_QUALITY_NON_ANTIALIASED) + .value("QUALITY_ANTIALIASED", PYSCR_SC_EFF_QUALITY_ANTIALIASED) + .value("QUALITY_LCD_OPTIMIZED", PYSCR_SC_EFF_QUALITY_LCD_OPTIMIZED); + + boost::python::enum_("MULTIPASTE") + .value("ONCE", PYSCR_SC_MULTIPASTE_ONCE) + .value("EACH", PYSCR_SC_MULTIPASTE_EACH); + + boost::python::enum_("EDGEVISUALSTYLE") + .value("NONE", PYSCR_EDGE_NONE) + .value("LINE", PYSCR_EDGE_LINE) + .value("BACKGROUND", PYSCR_EDGE_BACKGROUND); + + boost::python::enum_("STATUS") + .value("OK", PYSCR_SC_STATUS_OK) + .value("FAILURE", PYSCR_SC_STATUS_FAILURE) + .value("BADALLOC", PYSCR_SC_STATUS_BADALLOC) + .value("WARN_START", PYSCR_SC_STATUS_WARN_START) + .value("WARN_REGEX", PYSCR_SC_STATUS_WARN_REGEX); + + boost::python::enum_("CURSORSHAPE") + .value("NORMAL", PYSCR_SC_CURSORNORMAL) + .value("ARROW", PYSCR_SC_CURSORARROW) + .value("WAIT", PYSCR_SC_CURSORWAIT) + .value("REVERSEARROW", PYSCR_SC_CURSORREVERSEARROW); + + boost::python::enum_("CARETPOLICY") + .value("SLOP", PYSCR_CARET_SLOP) + .value("STRICT", PYSCR_CARET_STRICT) + .value("JUMPS", PYSCR_CARET_JUMPS) + .value("EVEN", PYSCR_CARET_EVEN); + + boost::python::enum_("SELECTIONMODE") + .value("STREAM", PYSCR_SC_SEL_STREAM) + .value("RECTANGLE", PYSCR_SC_SEL_RECTANGLE) + .value("LINES", PYSCR_SC_SEL_LINES) + .value("THIN", PYSCR_SC_SEL_THIN); + + boost::python::enum_("CASEINSENSITIVEBEHAVIOUR") + .value("RESPECTCASE", PYSCR_SC_CASEINSENSITIVEBEHAVIOUR_RESPECTCASE) + .value("IGNORECASE", PYSCR_SC_CASEINSENSITIVEBEHAVIOUR_IGNORECASE); + + boost::python::enum_("MULTIAUTOCOMPLETE") + .value("ONCE", PYSCR_SC_MULTIAUTOC_ONCE) + .value("EACH", PYSCR_SC_MULTIAUTOC_EACH); + + boost::python::enum_("ORDERING") + .value("PRESORTED", PYSCR_SC_ORDER_PRESORTED) + .value("PERFORMSORT", PYSCR_SC_ORDER_PERFORMSORT) + .value("CUSTOM", PYSCR_SC_ORDER_CUSTOM); + + boost::python::enum_("CARETSTICKY") + .value("OFF", PYSCR_SC_CARETSTICKY_OFF) + .value("ON", PYSCR_SC_CARETSTICKY_ON) + .value("WHITESPACE", PYSCR_SC_CARETSTICKY_WHITESPACE); + + boost::python::enum_("CARETSTYLE") + .value("INVISIBLE", PYSCR_CARETSTYLE_INVISIBLE) + .value("LINE", PYSCR_CARETSTYLE_LINE) + .value("BLOCK", PYSCR_CARETSTYLE_BLOCK); + + boost::python::enum_("MARGINOPTION") + .value("NONE", PYSCR_SC_MARGINOPTION_NONE) + .value("SUBLINESELECT", PYSCR_SC_MARGINOPTION_SUBLINESELECT); - boost::python::enum_("WRAPVISUALFLAG") - .value("NONE", PYSCR_SC_WRAPVISUALFLAG_NONE) - .value("END", PYSCR_SC_WRAPVISUALFLAG_END) - .value("START", PYSCR_SC_WRAPVISUALFLAG_START) - .value("MARGIN", PYSCR_SC_WRAPVISUALFLAG_MARGIN); + boost::python::enum_("ANNOTATIONVISIBLE") + .value("HIDDEN", PYSCR_ANNOTATION_HIDDEN) + .value("STANDARD", PYSCR_ANNOTATION_STANDARD) + .value("BOXED", PYSCR_ANNOTATION_BOXED) + .value("INDENTED", PYSCR_ANNOTATION_INDENTED); + + boost::python::enum_("VIRTUALSPACE") + .value("NONE", PYSCR_SCVS_NONE) + .value("RECTANGULARSELECTION", PYSCR_SCVS_RECTANGULARSELECTION) + .value("USERACCESSIBLE", PYSCR_SCVS_USERACCESSIBLE); + + boost::python::enum_("LINEENDTYPE") + .value("DEFAULT", PYSCR_SC_LINE_END_TYPE_DEFAULT) + .value("UNICODE", PYSCR_SC_LINE_END_TYPE_UNICODE); boost::python::enum_("TYPEPROPERTY") .value("BOOLEAN", PYSCR_SC_TYPE_BOOLEAN) .value("INTEGER", PYSCR_SC_TYPE_INTEGER) .value("STRING", PYSCR_SC_TYPE_STRING); + boost::python::enum_("MODIFICATIONFLAGS") + .value("INSERTTEXT", PYSCR_SC_MOD_INSERTTEXT) + .value("DELETETEXT", PYSCR_SC_MOD_DELETETEXT) + .value("CHANGESTYLE", PYSCR_SC_MOD_CHANGESTYLE) + .value("CHANGEFOLD", PYSCR_SC_MOD_CHANGEFOLD) + .value("USER", PYSCR_SC_PERFORMED_USER) + .value("UNDO", PYSCR_SC_PERFORMED_UNDO) + .value("REDO", PYSCR_SC_PERFORMED_REDO) + .value("MULTISTEPUNDOREDO", PYSCR_SC_MULTISTEPUNDOREDO) + .value("LASTSTEPINUNDOREDO", PYSCR_SC_LASTSTEPINUNDOREDO) + .value("CHANGEMARKER", PYSCR_SC_MOD_CHANGEMARKER) + .value("BEFOREINSERT", PYSCR_SC_MOD_BEFOREINSERT) + .value("BEFOREDELETE", PYSCR_SC_MOD_BEFOREDELETE) + .value("MULTILINEUNDOREDO", PYSCR_SC_MULTILINEUNDOREDO) + .value("STARTACTION", PYSCR_SC_STARTACTION) + .value("CHANGEINDICATOR", PYSCR_SC_MOD_CHANGEINDICATOR) + .value("CHANGELINESTATE", PYSCR_SC_MOD_CHANGELINESTATE) + .value("CHANGEMARGIN", PYSCR_SC_MOD_CHANGEMARGIN) + .value("CHANGEANNOTATION", PYSCR_SC_MOD_CHANGEANNOTATION) + .value("CONTAINER", PYSCR_SC_MOD_CONTAINER) + .value("LEXERSTATE", PYSCR_SC_MOD_LEXERSTATE) + .value("INSERTCHECK", PYSCR_SC_MOD_INSERTCHECK) + .value("CHANGETABSTOPS", PYSCR_SC_MOD_CHANGETABSTOPS) + .value("MODEVENTMASKALL", PYSCR_SC_MODEVENTMASKALL); + + boost::python::enum_("UPDATE") + .value("CONTENT", PYSCR_SC_UPDATE_CONTENT) + .value("SELECTION", PYSCR_SC_UPDATE_SELECTION) + .value("V_SCROLL", PYSCR_SC_UPDATE_V_SCROLL) + .value("H_SCROLL", PYSCR_SC_UPDATE_H_SCROLL); + + boost::python::enum_("KEYS") + .value("DOWN", PYSCR_SCK_DOWN) + .value("UP", PYSCR_SCK_UP) + .value("LEFT", PYSCR_SCK_LEFT) + .value("RIGHT", PYSCR_SCK_RIGHT) + .value("HOME", PYSCR_SCK_HOME) + .value("END", PYSCR_SCK_END) + .value("PRIOR", PYSCR_SCK_PRIOR) + .value("NEXT", PYSCR_SCK_NEXT) + .value("DELETE", PYSCR_SCK_DELETE) + .value("INSERT", PYSCR_SCK_INSERT) + .value("ESCAPE", PYSCR_SCK_ESCAPE) + .value("BACK", PYSCR_SCK_BACK) + .value("TAB", PYSCR_SCK_TAB) + .value("RETURN", PYSCR_SCK_RETURN) + .value("ADD", PYSCR_SCK_ADD) + .value("SUBTRACT", PYSCR_SCK_SUBTRACT) + .value("DIVIDE", PYSCR_SCK_DIVIDE) + .value("WIN", PYSCR_SCK_WIN) + .value("RWIN", PYSCR_SCK_RWIN) + .value("MENU", PYSCR_SCK_MENU); + + boost::python::enum_("KEYMOD") + .value("NORM", PYSCR_SCMOD_NORM) + .value("SHIFT", PYSCR_SCMOD_SHIFT) + .value("CTRL", PYSCR_SCMOD_CTRL) + .value("ALT", PYSCR_SCMOD_ALT) + .value("SUPER", PYSCR_SCMOD_SUPER) + .value("META", PYSCR_SCMOD_META); + boost::python::enum_("LEXER") .value("CONTAINER", PYSCR_SCLEX_CONTAINER) .value("NULL", PYSCR_SCLEX_NULL) @@ -540,156 +690,6 @@ void export_enums() .value("TEHEX", PYSCR_SCLEX_TEHEX) .value("AUTOMATIC", PYSCR_SCLEX_AUTOMATIC); - boost::python::enum_("MARGINOPTION") - .value("NONE", PYSCR_SC_MARGINOPTION_NONE) - .value("SUBLINESELECT", PYSCR_SC_MARGINOPTION_SUBLINESELECT); - - boost::python::enum_("CURSORSHAPE") - .value("NORMAL", PYSCR_SC_CURSORNORMAL) - .value("ARROW", PYSCR_SC_CURSORARROW) - .value("WAIT", PYSCR_SC_CURSORWAIT) - .value("REVERSEARROW", PYSCR_SC_CURSORREVERSEARROW); - - boost::python::enum_("MARGINTYPE") - .value("SYMBOL", PYSCR_SC_MARGIN_SYMBOL) - .value("NUMBER", PYSCR_SC_MARGIN_NUMBER) - .value("BACK", PYSCR_SC_MARGIN_BACK) - .value("FORE", PYSCR_SC_MARGIN_FORE) - .value("TEXT", PYSCR_SC_MARGIN_TEXT) - .value("RTEXT", PYSCR_SC_MARGIN_RTEXT); - - boost::python::enum_("FINDOPTION") - .value("WHOLEWORD", PYSCR_SCFIND_WHOLEWORD) - .value("MATCHCASE", PYSCR_SCFIND_MATCHCASE) - .value("WORDSTART", PYSCR_SCFIND_WORDSTART) - .value("REGEXP", PYSCR_SCFIND_REGEXP) - .value("POSIX", PYSCR_SCFIND_POSIX) - .value("CXX11REGEX", PYSCR_SCFIND_CXX11REGEX); - - boost::python::enum_("MODIFICATIONFLAGS") - .value("INSERTTEXT", PYSCR_SC_MOD_INSERTTEXT) - .value("DELETETEXT", PYSCR_SC_MOD_DELETETEXT) - .value("CHANGESTYLE", PYSCR_SC_MOD_CHANGESTYLE) - .value("CHANGEFOLD", PYSCR_SC_MOD_CHANGEFOLD) - .value("USER", PYSCR_SC_PERFORMED_USER) - .value("UNDO", PYSCR_SC_PERFORMED_UNDO) - .value("REDO", PYSCR_SC_PERFORMED_REDO) - .value("MULTISTEPUNDOREDO", PYSCR_SC_MULTISTEPUNDOREDO) - .value("LASTSTEPINUNDOREDO", PYSCR_SC_LASTSTEPINUNDOREDO) - .value("CHANGEMARKER", PYSCR_SC_MOD_CHANGEMARKER) - .value("BEFOREINSERT", PYSCR_SC_MOD_BEFOREINSERT) - .value("BEFOREDELETE", PYSCR_SC_MOD_BEFOREDELETE) - .value("MULTILINEUNDOREDO", PYSCR_SC_MULTILINEUNDOREDO) - .value("STARTACTION", PYSCR_SC_STARTACTION) - .value("CHANGEINDICATOR", PYSCR_SC_MOD_CHANGEINDICATOR) - .value("CHANGELINESTATE", PYSCR_SC_MOD_CHANGELINESTATE) - .value("CHANGEMARGIN", PYSCR_SC_MOD_CHANGEMARGIN) - .value("CHANGEANNOTATION", PYSCR_SC_MOD_CHANGEANNOTATION) - .value("CONTAINER", PYSCR_SC_MOD_CONTAINER) - .value("LEXERSTATE", PYSCR_SC_MOD_LEXERSTATE) - .value("INSERTCHECK", PYSCR_SC_MOD_INSERTCHECK) - .value("CHANGETABSTOPS", PYSCR_SC_MOD_CHANGETABSTOPS) - .value("MODEVENTMASKALL", PYSCR_SC_MODEVENTMASKALL); - - boost::python::enum_("LINEENDTYPE") - .value("DEFAULT", PYSCR_SC_LINE_END_TYPE_DEFAULT) - .value("UNICODE", PYSCR_SC_LINE_END_TYPE_UNICODE); - - boost::python::enum_("VIRTUALSPACE") - .value("NONE", PYSCR_SCVS_NONE) - .value("RECTANGULARSELECTION", PYSCR_SCVS_RECTANGULARSELECTION) - .value("USERACCESSIBLE", PYSCR_SCVS_USERACCESSIBLE); - - boost::python::enum_("PHASESDRAW") - .value("ONE", PYSCR_SC_PHASES_ONE) - .value("TWO", PYSCR_SC_PHASES_TWO) - .value("MULTIPLE", PYSCR_SC_PHASES_MULTIPLE); - - boost::python::enum_("EDGEVISUALSTYLE") - .value("NONE", PYSCR_EDGE_NONE) - .value("LINE", PYSCR_EDGE_LINE) - .value("BACKGROUND", PYSCR_EDGE_BACKGROUND); - - boost::python::enum_("WHITESPACE") - .value("INVISIBLE", PYSCR_SCWS_INVISIBLE) - .value("VISIBLEALWAYS", PYSCR_SCWS_VISIBLEALWAYS) - .value("VISIBLEAFTERINDENT", PYSCR_SCWS_VISIBLEAFTERINDENT); - - boost::python::enum_("IMEINTERACTION") - .value("WINDOWED", PYSCR_SC_IME_WINDOWED) - .value("INLINE", PYSCR_SC_IME_INLINE); - - boost::python::enum_("FOLDLEVEL") - .value("BASE", PYSCR_SC_FOLDLEVELBASE) - .value("WHITEFLAG", PYSCR_SC_FOLDLEVELWHITEFLAG) - .value("HEADERFLAG", PYSCR_SC_FOLDLEVELHEADERFLAG) - .value("NUMBERMASK", PYSCR_SC_FOLDLEVELNUMBERMASK); - - boost::python::enum_("WRAPINDENTMODE") - .value("FIXED", PYSCR_SC_WRAPINDENT_FIXED) - .value("SAME", PYSCR_SC_WRAPINDENT_SAME) - .value("INDENT", PYSCR_SC_WRAPINDENT_INDENT); - - boost::python::enum_("FONTWEIGHT") - .value("NORMAL", PYSCR_SC_WEIGHT_NORMAL) - .value("SEMIBOLD", PYSCR_SC_WEIGHT_SEMIBOLD) - .value("BOLD", PYSCR_SC_WEIGHT_BOLD); - - boost::python::enum_("MULTIPASTE") - .value("ONCE", PYSCR_SC_MULTIPASTE_ONCE) - .value("EACH", PYSCR_SC_MULTIPASTE_EACH); - - boost::python::enum_("STYLESCOMMON") - .value("DEFAULT", PYSCR_STYLE_DEFAULT) - .value("LINENUMBER", PYSCR_STYLE_LINENUMBER) - .value("BRACELIGHT", PYSCR_STYLE_BRACELIGHT) - .value("BRACEBAD", PYSCR_STYLE_BRACEBAD) - .value("CONTROLCHAR", PYSCR_STYLE_CONTROLCHAR) - .value("INDENTGUIDE", PYSCR_STYLE_INDENTGUIDE) - .value("CALLTIP", PYSCR_STYLE_CALLTIP) - .value("LASTPREDEFINED", PYSCR_STYLE_LASTPREDEFINED) - .value("MAX", PYSCR_STYLE_MAX); - - boost::python::enum_("INDENTVIEW") - .value("NONE", PYSCR_SC_IV_NONE) - .value("REAL", PYSCR_SC_IV_REAL) - .value("LOOKFORWARD", PYSCR_SC_IV_LOOKFORWARD) - .value("LOOKBOTH", PYSCR_SC_IV_LOOKBOTH); - - boost::python::enum_("WRAP") - .value("NONE", PYSCR_SC_WRAP_NONE) - .value("WORD", PYSCR_SC_WRAP_WORD) - .value("CHAR", PYSCR_SC_WRAP_CHAR) - .value("WHITESPACE", PYSCR_SC_WRAP_WHITESPACE); - - boost::python::enum_("SELECTIONMODE") - .value("STREAM", PYSCR_SC_SEL_STREAM) - .value("RECTANGLE", PYSCR_SC_SEL_RECTANGLE) - .value("LINES", PYSCR_SC_SEL_LINES) - .value("THIN", PYSCR_SC_SEL_THIN); - - boost::python::enum_("CARETSTICKY") - .value("OFF", PYSCR_SC_CARETSTICKY_OFF) - .value("ON", PYSCR_SC_CARETSTICKY_ON) - .value("WHITESPACE", PYSCR_SC_CARETSTICKY_WHITESPACE); - - boost::python::enum_("FOLDACTION") - .value("_CONTRACT", PYSCR_SC_FOLDACTION_CONTRACT) - .value("_EXPAND", PYSCR_SC_FOLDACTION_EXPAND) - .value("_TOGGLE", PYSCR_SC_FOLDACTION_TOGGLE); - - boost::python::enum_("FONTQUALITY") - .value("QUALITY_MASK", PYSCR_SC_EFF_QUALITY_MASK) - .value("QUALITY_DEFAULT", PYSCR_SC_EFF_QUALITY_DEFAULT) - .value("QUALITY_NON_ANTIALIASED", PYSCR_SC_EFF_QUALITY_NON_ANTIALIASED) - .value("QUALITY_ANTIALIASED", PYSCR_SC_EFF_QUALITY_ANTIALIASED) - .value("QUALITY_LCD_OPTIMIZED", PYSCR_SC_EFF_QUALITY_LCD_OPTIMIZED); - - boost::python::enum_("ENDOFLINE") - .value("CRLF", PYSCR_SC_EOL_CRLF) - .value("CR", PYSCR_SC_EOL_CR) - .value("LF", PYSCR_SC_EOL_LF); - boost::python::enum_("SCINTILLANOTIFICATION") .value("STYLENEEDED", PYSCR_SCN_STYLENEEDED) .value("CHARADDED", PYSCR_SCN_CHARADDED) diff --git a/PythonScript/src/PythonConsole.cpp b/PythonScript/src/PythonConsole.cpp index d2e8c4ef..d9460cf7 100644 --- a/PythonScript/src/PythonConsole.cpp +++ b/PythonScript/src/PythonConsole.cpp @@ -319,7 +319,7 @@ void PythonConsole::consume(std::shared_ptr statement) assert(mp_consoleDlg); if (mp_consoleDlg) { - mp_consoleDlg->setPrompt(continuePrompt ? "... " : ">>> "); + mp_consoleDlg->setPrompt(continuePrompt ? mp_consoleDlg->getContinuePrompt() : mp_consoleDlg->getStandardPrompt()); mp_consoleDlg->giveInputFocus(); } } diff --git a/PythonScript/src/ScintillaPython.cpp b/PythonScript/src/ScintillaPython.cpp index af28ceec..4dbbad2d 100644 --- a/PythonScript/src/ScintillaPython.cpp +++ b/PythonScript/src/ScintillaPython.cpp @@ -95,8 +95,6 @@ BOOST_PYTHON_MODULE(Npp) .def("getWord", &ScintillaWrapper::getWordNoFlags, "getWord([position[, useOnlyWordChars]])\nGets the word at position. If position is not given or None, the current caret position is used.\nuseOnlyWordChars is a bool that is passed to Scintilla - see Scintilla rules on what is match. If not given or None, it is assumed to be true.") .def("getWord", &ScintillaWrapper::getCurrentWord, "getWord([position[, useOnlyWordChars]])\nGets the word at position. If position is not given or None, the current caret position is used.\nuseOnlyWordChars is a bool that is passed to Scintilla - see Scintilla rules on what is match. If not given or None, it is assumed to be true.") .def("getCurrentWord", &ScintillaWrapper::getCurrentWord, "getCurrentWord()\nAlias for getWord(), that gets the current word at the cursor.") - .def("getCharacterPointer", &ScintillaWrapper::GetCharacterPointer, "getCharacterPointer()\nGets the text content of the document in a faster way than getText(). However, this method is not thread safe, so if you've potentially got other things (like users!) editing the document while this runs, it's safer to use getText()") - .def("getRangePointer", &ScintillaWrapper::GetRangePointer, boost::python::args("start", "length"), "Gets the text content of the given range of the document.") .def("search", &ScintillaWrapper::searchPlain, boost::python::args("search", "handlerFunction"), "Searches the document for given search text, and calls the handlerFunction with each match. The handler function receives a single match parameter, which is similar to a re.MatchObject object") .def("search", &ScintillaWrapper::searchPlainFlags, boost::python::args("search", "handlerFunction", "flags"), "Searches the document for given search text, and calls the handlerFunction with each match. The handler function receives a single match parameter, which is similar to a re.MatchObject object. Flags are the flags from the re module, specifically only re.IGNORECASE has an effect here.") .def("search", &ScintillaWrapper::searchPlainFlagsStart, boost::python::args("search", "handlerFunction", "flags", "startPosition"), "Searches the document from the given startPosition for given search text, and calls the handlerFunction with each match. The handler function receives a single match parameter, which is similar to a re.MatchObject object. Flags are the flags from the re module, specifically only re.IGNORECASE has an effect here.") @@ -637,6 +635,8 @@ BOOST_PYTHON_MODULE(Npp) .def("setPositionCache", &ScintillaWrapper::SetPositionCache, boost::python::args("size"), "Set number of entries in position cache") .def("getPositionCache", &ScintillaWrapper::GetPositionCache, "How many entries are allocated to the position cache?") .def("copyAllowLine", &ScintillaWrapper::CopyAllowLine, "Copy the selection, if selection empty copy the line with the caret") + .def("getCharacterPointer", &ScintillaWrapper::GetCharacterPointer, "Compact the document buffer and return a read-only pointer to the\ncharacters in the document.") + .def("getRangePointer", &ScintillaWrapper::GetRangePointer, boost::python::args("position", "rangeLength"), "Return a read-only pointer to a range of characters in the document.\nMay move the gap so that the range is contiguous, but will only move up\nto rangeLength bytes.") .def("getGapPosition", &ScintillaWrapper::GetGapPosition, "Return a position which, to avoid performance costs, should not be within\nthe range of a call to GetRangePointer.") .def("indicSetAlpha", &ScintillaWrapper::IndicSetAlpha, boost::python::args("indicator", "alpha"), "Set the alpha fill colour of the given indicator.") .def("indicGetAlpha", &ScintillaWrapper::IndicGetAlpha, boost::python::args("indicator"), "Get the alpha fill colour of the given indicator.") diff --git a/PythonScript/src/ScintillaWrapper.cpp b/PythonScript/src/ScintillaWrapper.cpp index 5f0a887c..eb7c9906 100644 --- a/PythonScript/src/ScintillaWrapper.cpp +++ b/PythonScript/src/ScintillaWrapper.cpp @@ -458,22 +458,6 @@ void ScintillaWrapper::clearAllCallbacks() } } -boost::python::str ScintillaWrapper::GetCharacterPointer() -{ - GILRelease release; - const char *charPtr = reinterpret_cast(callScintilla(SCI_GETCHARACTERPOINTER)); - release.reacquire(); - return boost::python::str(charPtr); -} - -boost::python::str ScintillaWrapper::GetRangePointer(int position, int rangeLength) -{ - GILRelease release; - const char *charPtr = reinterpret_cast(callScintilla(SCI_GETRANGEPOINTER, position, rangeLength)); - release.reacquire(); - return boost::python::str(charPtr, charPtr + rangeLength); -} - void ScintillaWrapper::forEachLine(PyObject* function) { if (PyCallable_Check(function)) diff --git a/PythonScript/src/ScintillaWrapper.h b/PythonScript/src/ScintillaWrapper.h index d37293ed..ba05289e 100644 --- a/PythonScript/src/ScintillaWrapper.h +++ b/PythonScript/src/ScintillaWrapper.h @@ -161,12 +161,6 @@ class ScintillaWrapper : public PyProducerConsumer boost::python::str getCurrentWord() { return getWord(boost::python::object(), boost::python::object(true)); }; - // This "normal" Scintilla function has been implemented manually, as it returns a pointer, which we can convert to a string - boost::python::str GetCharacterPointer(); - - // This "normal" Scintilla function has been implemented manually, as it returns a pointer, which we can convert to a string - boost::python::str GetRangePointer(int position, int length); - /** This helper function gets a std::string from the given object. * If the object is a unicode string, it converts the string to UTF-8. * If it's an object, it calls the __str__ method to convert the object to a string @@ -2400,6 +2394,17 @@ class ScintillaWrapper : public PyProducerConsumer */ void CopyAllowLine(); + /** Compact the document buffer and return a read-only pointer to the + * characters in the document. + */ + boost::python::str GetCharacterPointer(); + + /** 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. + */ + boost::python::str GetRangePointer(int position, int rangeLength); + /** Return a position which, to avoid performance costs, should not be within * the range of a call to GetRangePointer. */ diff --git a/PythonScript/src/ScintillaWrapperGenerated.cpp b/PythonScript/src/ScintillaWrapperGenerated.cpp index f28e7db0..ed051c92 100644 --- a/PythonScript/src/ScintillaWrapperGenerated.cpp +++ b/PythonScript/src/ScintillaWrapperGenerated.cpp @@ -4505,6 +4505,29 @@ void ScintillaWrapper::CopyAllowLine() callScintilla(SCI_COPYALLOWLINE); } +/** Compact the document buffer and return a read-only pointer to the + * characters in the document. + */ +boost::python::str ScintillaWrapper::GetCharacterPointer() +{ + GILRelease release; + const char *charPtr = reinterpret_cast(callScintilla(SCI_GETCHARACTERPOINTER)); + release.reacquire(); + return boost::python::str(charPtr); +} + +/** 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. + */ +boost::python::str ScintillaWrapper::GetRangePointer(int position, int rangeLength) +{ + GILRelease release; + const char *charPtr = reinterpret_cast(callScintilla(SCI_GETRANGEPOINTER, position, rangeLength)); + release.reacquire(); + return boost::python::str(charPtr, charPtr + rangeLength); +} + /** Return a position which, to avoid performance costs, should not be within * the range of a call to GetRangePointer. */ From 1247c72802126284efabdec3ebe0eb08de203786 Mon Sep 17 00:00:00 2001 From: CFrank Date: Mon, 16 Jul 2018 16:42:03 +0200 Subject: [PATCH 4/4] fixes inital prompt to be set correctly --- PythonScript/src/ConsoleDialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PythonScript/src/ConsoleDialog.cpp b/PythonScript/src/ConsoleDialog.cpp index ae429dac..d8c3a4c2 100644 --- a/PythonScript/src/ConsoleDialog.cpp +++ b/PythonScript/src/ConsoleDialog.cpp @@ -87,7 +87,7 @@ void ConsoleDialog::initDialog(HINSTANCE hInst, NppData& nppData, ConsoleInterfa m_colorOutput = false; } m_standardPrompt = ConfigFile::getInstance()->getSetting(_T("ADDEXTRALINETOOUTPUT")) == _T("1") ? m_standardPrompt.insert(0, "\n") : m_standardPrompt; - + m_currentPrompt = m_standardPrompt; //Window::init(hInst, nppData._nppHandle); createOutputWindow(nppData._nppHandle);