Skip to content

Commit

Permalink
Release 4.0.8 version
Browse files Browse the repository at this point in the history
  • Loading branch information
@adonais
adonais committed Dec 1, 2023
1 parent 33c9b56 commit e368c67
Show file tree
Hide file tree
Showing 103 changed files with 7,945 additions and 4,866 deletions.
10 changes: 8 additions & 2 deletions conf/conf.d/eu_accel.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ function eu_accel.loadaccel()
" {bit.bor(FVIRTKEY,FCONTROL), string.byte(\"W\"), IDM_FILE_CLOSE},\n",
" {bit.bor(FVIRTKEY,FCONTROL,FSHIFT), VK_F4, IDM_FILE_CLOSEALL},\n",
" {0, 0, IDM_FILE_CLOSEALL_EXCLUDE},\n",
" {0, 0, IDM_FILE_UNMODIFIED},\n",
" {bit.bor(FVIRTKEY,FCONTROL,FSHIFT), string.byte(\"T\"), IDM_FILE_RESTORE_RECENT},\n",
" {bit.bor(FVIRTKEY,FSHIFT), VK_F5, IDM_FILE_RELOAD_CURRENT},\n",
" {0, 0, IDM_FILE_REMOTE_FILESERVERS},\n",
Expand Down Expand Up @@ -122,6 +123,10 @@ function eu_accel.loadaccel()
" {bit.bor(FVIRTKEY), VK_F2, IDM_SEARCH_GOTO_NEXT_BOOKMARK},\n",
" {bit.bor(FVIRTKEY,FCONTROL,FSHIFT), VK_F2, IDM_SEARCH_GOTO_PREV_BOOKMARK_INALL},\n",
" {bit.bor(FVIRTKEY,FSHIFT), VK_F2, IDM_SEARCH_GOTO_NEXT_BOOKMARK_INALL},\n",
" {bit.bor(FVIRTKEY,FCONTROL,FSHIFT), string.byte(\"1\"), IDM_EDIT_BOOKMARK_LINES_COPY},\n",
" {bit.bor(FVIRTKEY,FCONTROL,FSHIFT), string.byte(\"2\"), IDM_EDIT_BOOKMARK_LINES_CUT},\n",
" {bit.bor(FVIRTKEY,FCONTROL,FSHIFT), string.byte(\"3\"), IDM_EDIT_BOOKMARK_LINES_REMOVE},\n",
" {bit.bor(FVIRTKEY,FCONTROL,FSHIFT), string.byte(\"4\"), IDM_EDIT_BOOKMARK_LINES_RESERVE},\n",
" {bit.bor(FVIRTKEY,FCONTROL), VK_BACK, IDM_SEARCH_NAVIGATE_PREV_THIS},\n",
" {bit.bor(FVIRTKEY,FCONTROL,FSHIFT), VK_BACK, IDM_SEARCH_NAVIGATE_PREV_INALL},\n",
" {bit.bor(FVIRTKEY,FCONTROL,FSHIFT), string.byte(\"A\"), IDM_SEARCH_SELECT_MATCHING_ALL},\n",
Expand All @@ -146,6 +151,7 @@ function eu_accel.loadaccel()
" {0, 0, IDM_TABCLOSE_NONE},\n",
" {bit.bor(FVIRTKEY,FCONTROL), VK_TAB, IDM_VIEW_SWITCH_TAB},\n",
" {0, 0, IDM_VIEW_SCROLLCURSOR},\n",
" {0, 0, IDM_VIEW_TABBAR_SPLIT},\n",
" {bit.bor(FVIRTKEY,FCONTROL), VK_OEM_MINUS, IDM_VIEW_ZOOMOUT},\n",
" {bit.bor(FVIRTKEY,FCONTROL), VK_SUBTRACT, IDM_VIEW_ZOOMOUT},\n",
" {bit.bor(FVIRTKEY,FCONTROL), VK_OEM_PLUS, IDM_VIEW_ZOOMIN},\n",
Expand Down Expand Up @@ -209,8 +215,8 @@ function eu_accel.loadaccel()
end
local m_len = tonumber(#my_code)
if (m_len ~= nil) then
--print("m_len = " .. m_len)
if (m_len < 178) then
-- print("m_len = " .. m_len)
if (m_len < 184) then
eu_core.euapi.eu_reset_accs_mask()
end
local m_accel = eu_core.ffi.new("ACCEL[?]", m_len, {})
Expand Down
10 changes: 8 additions & 2 deletions conf/conf.d/eu_conf.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@ function eu_conf.fill_customize(s)
['param'] = "%CURRENT_SELSTR% %NUM_SELSTR%", ['micon'] = 44305, ['posid'] = 0, ['hbmp'] = 0}
process_customized[2] = {['hide'] = false, ['name'] = "44501", ['path'] = "",
['param'] = "", ['micon'] = 0, ['posid'] = 0, ['hbmp'] = 0}
local ver = eu_core.euapi.eu_win10_or_later()
if (ver ~= 0xFFFFFFFF) then
if (eu_core.euapi.eu_under_wine()) then
process_customized[2].path = "calc"
elseif (eu_core.euapi.eu_which("win32calc.exe")) then
process_customized[2].path = "%windir%/system32/win32calc.exe"
else
process_customized[2].path = "%windir%/system32/calc.exe"
Expand Down Expand Up @@ -108,6 +109,7 @@ function eu_conf.loadconf()
"block_fold_visiable = true\n" ..
"tabs_tip_show_enable = true\n" ..
"code_hint_show_enable = true\n" ..
"tab_split_show = false\n" ..
"tab_close_way = 0\n" ..
"tab_close_draw = 43004\n" ..
"tab_new_way = 0\n" ..
Expand Down Expand Up @@ -191,6 +193,9 @@ function eu_conf.loadconf()
if (titlebar == nil) then
titlebar = {["icon"] = true, ["name"] = true, ["path"] = true}
end
if (tab_split_show == nil) then
tab_split_show = false;
end
local m_config = eu_core.ffi.new("struct eu_config", {
newfile_eols,
newfile_encoding,
Expand Down Expand Up @@ -227,6 +232,7 @@ function eu_conf.loadconf()
block_fold_visiable,
tabs_tip_show_enable,
code_hint_show_enable,
tab_split_show,
tab_close_way,
tab_close_draw,
tab_new_way,
Expand Down
5 changes: 5 additions & 0 deletions conf/conf.d/eu_core.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ struct eu_config
bool block_fold;
bool m_tab_tip;
bool m_code_hint;
bool m_tab_split;

int m_close_way;
int m_close_draw;
Expand Down Expand Up @@ -470,6 +471,10 @@ void eu_reset_accs_mask(void);
void eu_reset_snip_mask(void);
void eu_reset_theme_mask(void);

/* 是否运行在Linux/Wine */
bool eu_under_wine(void);
/* 文件是否在环境变量路径中 */
bool eu_which(const char *path);
/* 获取系统版本 */
const uint32_t eu_win10_or_later(void);

Expand Down
15 changes: 12 additions & 3 deletions conf/conf.d/eu_evaluation.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,16 @@ local pstr = arg[1]
local nlen = tonumber(arg[2])
if (pstr ~= nil and nlen ~= nil and 1 < nlen) then
local ret = eu_core.euapi.eu_te_interp(eu_core.ffi.cast('const char *', pstr), nil)
if (isnan(ret)) then ret = "NaN" else ret = tostring(ret) end
if (ret == "inf") then ret = "INFINITY" end
eu_core.euapi.eu_lua_calltip(eu_core.ffi.new('char [?]', #ret + 1, ret))
if (ret ~= nil) then
if (isnan(ret)) then ret = "NaN" else ret = tostring(ret) end
if (ret == "inf") then
ret = "INFINITY"
elseif (ret == "-inf") then
ret = "-INFINITY"
else
local x, y = math.modf(ret)
if (math.abs(x) == 0 and math.abs(y) < 1.0E-12) then ret = "0" else ret = tostring(ret) end
end
eu_core.euapi.eu_lua_calltip(ret)
end
end
6 changes: 6 additions & 0 deletions conf/conf.d/eu_sci.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3298,6 +3298,7 @@ IDM_FILE_SAVEALL = 30419
IDM_FILE_CLOSE = 30004
IDM_FILE_CLOSEALL = 30100
IDM_FILE_CLOSEALL_EXCLUDE = 30101
IDM_FILE_UNMODIFIED = 30028
IDM_FILE_RESTORE_RECENT = 30114
IDM_FILE_PAGESETUP = 42040
IDM_FILE_PRINT = 30005
Expand Down Expand Up @@ -3365,6 +3366,7 @@ IDM_EDIT_SWAP_CLIPBOARD = 30455
IDM_EDIT_CLEAR_CLIPBOARD = 30456
IDM_EDIT_COPY_INCREMENTAL = 30457
IDM_EDIT_COPY_RTF = 30458
IDM_VIEW_TABBAR_SPLIT = 30459
IDM_EDIT_SLASH_BACKSLASH = 44100
IDM_EDIT_BACKSLASH_SLASH = 44101
-- Serach
Expand Down Expand Up @@ -3403,6 +3405,10 @@ IDM_SEARCH_GOTO_PREV_BOOKMARK = 30017
IDM_SEARCH_GOTO_NEXT_BOOKMARK = 30018
IDM_SEARCH_GOTO_PREV_BOOKMARK_INALL = 30301
IDM_SEARCH_GOTO_NEXT_BOOKMARK_INALL = 30302
IDM_EDIT_BOOKMARK_LINES_COPY = 30211
IDM_EDIT_BOOKMARK_LINES_CUT = 30212
IDM_EDIT_BOOKMARK_LINES_REMOVE = 30213
IDM_EDIT_BOOKMARK_LINES_RESERVE = 30214
IDM_SEARCH_NAVIGATE_PREV_THIS = 30303
IDM_SEARCH_NAVIGATE_PREV_INALL = 30304
IDM_SEARCH_SELECT_MATCHING_ALL = 44700
Expand Down
13 changes: 9 additions & 4 deletions conf/conf.d/eu_theme.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@ function eu_theme.get_default(name)
"xmlsection_bold = 1\n" ..
"activetab_font = \"DEFAULT_GUI_FONT\"\n" ..
"activetab_fontsize = 11\n" ..
"activetab_color = 0\n" ..
"activetab_bgcolor = 0x00545454\n" ..
"activetab_color = 0x00545454\n" ..
"activetab_bgcolor = 0x00C4C4C4\n" ..
"activetab_bold = 0\n" ..
"caret_font = \"Consolas\"\n" ..
"caret_fontsize = 11\n" ..
Expand Down Expand Up @@ -301,7 +301,7 @@ function eu_theme.get_default(name)
"activetab_font = \"DEFAULT_GUI_FONT\"\n" ..
"activetab_fontsize = 11\n" ..
"activetab_color = 0\n" ..
"activetab_bgcolor = 0x00d77800\n" ..
"activetab_bgcolor = 0x00C4C4C4\n" ..
"activetab_bold = 0\n" ..
"caret_font = \"Consolas\"\n" ..
"caret_fontsize = 11\n" ..
Expand Down Expand Up @@ -470,7 +470,7 @@ function eu_theme.get_default(name)
"activetab_font = \"DEFAULT_GUI_FONT\"\n" ..
"activetab_fontsize = 11\n" ..
"activetab_color = 0\n" ..
"activetab_bgcolor = 0x00d77800\n" ..
"activetab_bgcolor = 0x00C4C4C4\n" ..
"activetab_bold = 0\n" ..
"caret_font = \"Consolas\"\n" ..
"caret_fontsize = 11\n" ..
Expand Down Expand Up @@ -553,6 +553,11 @@ function eu_theme.load_default(name)
dofile(file)
tname = name
end
-- 兼容旧代码
if (name == "black" and activetab_bgcolor == 0x00545454 and activetab_color == 0) then
activetab_color = 0x00545454
activetab_bgcolor = 0x00C4C4C4
end
local m_file = eu_core.ffi.new('char[260]')
eu_core.ffi.C._fullpath(m_file, file, 260)
local m_theme = eu_core.ffi.new("struct eu_theme", {m_file, tname,
Expand Down
33 changes: 23 additions & 10 deletions locales/src/en-us.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ BEGIN
MENUITEM "&Close", IDM_FILE_CLOSE
MENUITEM "Close All", IDM_FILE_CLOSEALL
MENUITEM "Close Other Documents", IDM_FILE_CLOSEALL_EXCLUDE
MENUITEM "Close All Unchanged", IDM_FILE_UNMODIFIED
MENUITEM MF_SEPARATOR
MENUITEM "Restore Recent Closed File", IDM_FILE_RESTORE_RECENT
MENUITEM "Reload The Current File", IDM_FILE_RELOAD_CURRENT
Expand Down Expand Up @@ -202,7 +203,7 @@ BEGIN
MENUITEM "Moves To The Next Block", IDM_SEARCH_MOVEBOTTOM_FIRSTLINE
END
MENUITEM MF_SEPARATOR
POPUP "&Go To ..."
POPUP "&Go To ...", IDM_EDIT_GOLINE_GROUP
BEGIN
MENUITEM "Jump To First Line", IDM_SEARCH_GOTOHOME
MENUITEM "Jump To Last Line", IDM_SEARCH_GOTOEND
Expand All @@ -225,6 +226,11 @@ BEGIN
MENUITEM "Jump Next Bookmark (Current File)", IDM_SEARCH_GOTO_NEXT_BOOKMARK
MENUITEM "Jump Previous Bookmark (All Open Files)", IDM_SEARCH_GOTO_PREV_BOOKMARK_INALL
MENUITEM "Jump Next Bookmark (All Open Files)", IDM_SEARCH_GOTO_NEXT_BOOKMARK_INALL
MENUITEM MF_SEPARATOR
MENUITEM "Copy Bookmarked Lines", IDM_EDIT_BOOKMARK_LINES_COPY
MENUITEM "Cut Bookmarked Lines", IDM_EDIT_BOOKMARK_LINES_CUT
MENUITEM "Remove Bookmarked Lines", IDM_EDIT_BOOKMARK_LINES_REMOVE
MENUITEM "Remove Non-Bookmarked Lines", IDM_EDIT_BOOKMARK_LINES_RESERVE
END
POPUP "Navigation", IDM_EDIT_PLACEHOLDE14
BEGIN
Expand All @@ -238,11 +244,12 @@ BEGIN
MENUITEM "&Document Map", IDM_VIEW_DOCUMENT_MAP
MENUITEM "&Symbolic Window", IDM_VIEW_SYMTREE
MENUITEM MF_SEPARATOR
POPUP "P&anels"
POPUP "Panels"
BEGIN
MENUITEM "Full Screen Mode", IDM_VIEW_FULLSCREEN
MENUITEM "Show M&enubar", IDM_VIEW_MENUBAR
MENUITEM "Show Stat&usbar", IDM_VIEW_STATUSBAR
MENUITEM "Show Menubar", IDM_VIEW_MENUBAR
MENUITEM "Show Toolbar", IDM_VIEW_TOOLBAR
MENUITEM "Show Statusbar", IDM_VIEW_STATUSBAR
END
POPUP "Customize Titlebar", IDM_VIEW_TITLEBAR_GROUP
BEGIN
Expand Down Expand Up @@ -270,15 +277,15 @@ BEGIN
MENUITEM MF_SEPARATOR
MENUITEM "&Hex Edit View", IDM_VIEW_HEXEDIT_MODE
MENUITEM MF_SEPARATOR
POPUP "H&ighlight"
POPUP "Highlight", IDM_VIEW_HIGHLIGHT_GROUP
BEGIN
MENUITEM "Highlight The Matching &Brace", IDM_VIEW_HIGHLIGHT_BRACE
MENUITEM "Highlight The Matching &String", IDM_VIEW_HIGHLIGHT_STR
MENUITEM "Highlight Current Bloc&k", IDM_VIEW_HIGHLIGHT_FOLD
END
MENUITEM "Auto Indent", IDM_EDIT_AUTO_INDENTATION
MENUITEM MF_SEPARATOR
POPUP "&Display", IDM_VIEW_DISPLAY_PLACEHOLDE
POPUP "Display", IDM_VIEW_DISPLAY_PLACEHOLDE
BEGIN
MENUITEM "Line Numbers", IDM_VIEW_LINENUMBER_VISIABLE
MENUITEM "Show Bookmark", IDM_VIEW_BOOKMARK_VISIABLE
Expand Down Expand Up @@ -320,8 +327,12 @@ BEGIN
MENUITEM "&Always Draw", IDM_TABCLOSE_ALWAYS
MENUITEM "&Never Draw", IDM_TABCLOSE_NONE
END
MENUITEM "Switch The Next Tab", IDM_VIEW_SWITCH_TAB
MENUITEM "Switch Tabs To Scroll To The Cursor Position", IDM_VIEW_SCROLLCURSOR
POPUP "Other Options For Tabbar"
BEGIN
MENUITEM "Switch The Next Tab", IDM_VIEW_SWITCH_TAB
MENUITEM "Scroll To Anchor When Switching Tabs", IDM_VIEW_SCROLLCURSOR
MENUITEM "Split Line On Multiline Tabs", IDM_VIEW_TABBAR_SPLIT
END
MENUITEM MF_SEPARATOR
POPUP "Zoom", IDM_EDIT_PLACEHOLDE_ZOOM
BEGIN
Expand Down Expand Up @@ -469,6 +480,7 @@ BEGIN
BEGIN
MENUITEM "&Close Tab", IDM_FILE_CLOSE
MENUITEM "Close &Other Tabs", IDM_FILE_CLOSEALL_EXCLUDE
MENUITEM "Close All &Unchanged", IDM_FILE_UNMODIFIED
MENUITEM "Close All Tabs", IDM_FILE_CLOSEALL
MENUITEM "Close The Left Tabs", IDM_TAB_CLOSE_LEFT
MENUITEM "Close The Right Tabs", IDM_TAB_CLOSE_RIGHT
Expand Down Expand Up @@ -870,8 +882,9 @@ BEGIN
MENUITEM "mac-cyrillic", IDM_OTHER_2
MENUITEM "mac-centraleurope", IDM_OTHER_3
MENUITEM "Native Codepage", IDM_OTHER_ANSI
MENUITEM "Binary code", IDM_OTHER_BIN,,0x00000003
MENUITEM "Unknown code", IDM_UNKNOWN,,0x00000003
MENUITEM "Binary Code", IDM_OTHER_BIN,,0x00000003
MENUITEM "Plugins Code", IDM_OTHER_PLUGIN,,0x00000003
MENUITEM "Unknown Code", IDM_UNKNOWN,,0x00000003
END
}
END
Expand Down
Loading

0 comments on commit e368c67

Please sign in to comment.