summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2020-12-07 22:36:38 +0800
committerruki <[email protected]>2020-12-07 22:36:38 +0800
commit24b48fde3bb5c1edef6897e9ffa213ec1ae2e556 (patch)
treeafe78ad08217354194484e0214c55677ac3d45c5
parent83c683cb9f564d73b84750ee1691d58b6b778eed (diff)
add utf8dialog
-rw-r--r--tests/ui/utf8dialog.lua140
-rw-r--r--xmake/core/base/string.lua130
-rw-r--r--xmake/core/ui/label.lua2
3 files changed, 268 insertions, 4 deletions
diff --git a/tests/ui/utf8dialog.lua b/tests/ui/utf8dialog.lua
new file mode 100644
index 000000000..e7de3a075
--- /dev/null
+++ b/tests/ui/utf8dialog.lua
@@ -0,0 +1,140 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership. The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License. You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-2020, TBOOX Open Source Group.
+--
+-- @author ruki, laelnasan
+-- @file inputdialog.lua
+--
+
+-- imports
+import("core.ui.log")
+import("core.ui.rect")
+import("core.ui.view")
+import("core.ui.label")
+import("core.ui.event")
+import("core.ui.button")
+import("core.ui.boxdialog")
+import("core.ui.textdialog")
+import("core.ui.inputdialog")
+import("core.ui.application")
+
+-- the demo application
+local demo = application()
+
+-- init demo
+function demo:init()
+
+ -- init name
+ application.init(self, "demo")
+
+ -- init background
+ self:background_set("blue")
+
+ -- init main dialog
+ self:insert(self:dialog_main())
+
+ -- init input dialog
+ self:insert(self:dialog_input(), {centerx = true, centery = true})
+
+ -- init tips dialog
+ self:insert(self:dialog_tips(), {centerx = true, centery = true})
+end
+
+-- main dialog
+function demo:dialog_main()
+ local dialog_main = self._DIALOG_MAIN
+ if not dialog_main then
+ dialog_main = boxdialog:new("dialog.main", rect {1, 1, self:width() - 1, self:height() - 1}, "main dialog")
+ dialog_main:text():text_set([[LTUI是一个基于lua的跨平台字符终端UI界面库。
+此框架源于xmake中图形化菜单配置的需求,类似linux kernel的menuconf去配置编译参数,因此基于curses和lua实现了一整套跨平台的字符终端ui库。 而样式风格基本上完全参照的kconfig-frontends,当然用户也可以自己定制不同的ui风格。]])
+ dialog_main:button_add("tips", "< ☝ Tips >", function (v) self:view("dialog.tips"):show(true, {focused = true}) end)
+ dialog_main:button_add("input", "< ☺ Input >", function (v) self:view("dialog.input"):show(true, {focused = true}) end)
+ dialog_main:button_add("help", "< ☕Help >", function (v) self:insert(self:dialog_help()) end)
+ dialog_main:button_add("quit", "< ☠ Quit >", "cm_quit")
+ self._DIALOG_MAIN = dialog_main
+ end
+ return dialog_main
+end
+
+-- help dialog
+function demo:dialog_help()
+ local dialog_help = self._DIALOG_HELP
+ if not dialog_help then
+ dialog_help = textdialog:new("dialog.help", rect {1, 1, self:width() - 1, self:height() - 1}, "README")
+ dialog_help:option_set("scrollable", true)
+ local helptext = nil
+ local file = io.open("./LICENSE.md", 'r')
+ if file then
+ helptext = file:read("*a")
+ file:close()
+ end
+ if helptext then
+ dialog_help:text():text_set(helptext)
+ end
+ dialog_help:button_add("exit", "< Exit >", function (v) self:remove(dialog_help) end)
+ self._DIALOG_HELP = dialog_help
+ end
+ return dialog_help
+end
+
+-- input dialog
+function demo:dialog_input()
+ local dialog_input = self._DIALOG_INPUT
+ if not dialog_input then
+ dialog_input = inputdialog:new("dialog.input", rect {0, 0, 50, 8}):background_set(self:dialog_main():frame():background())
+ dialog_input:frame():background_set("cyan")
+ dialog_input:text():text_set("please input text:"):textattr_set("red")
+ dialog_input:button_add("no", "< No >", function (v) dialog_input:show(false) end)
+ dialog_input:button_add("yes", "< Yes >", function (v)
+ self:dialog_main():text():text_set(dialog_input:textedit():text())
+ dialog_input:show(false)
+ end)
+ dialog_input:show(false)
+ self._DIALOG_INPUT = dialog_input
+ end
+ return dialog_input
+end
+
+-- tips dialog
+function demo:dialog_tips()
+ local dialog_tips = self._DIALOG_TIPS
+ if not dialog_tips then
+ dialog_tips = textdialog:new("dialog.tips", rect {0, 0, 50, 8}):background_set(self:dialog_main():frame():background())
+ dialog_tips:frame():background_set("cyan")
+ dialog_tips:text():text_set("hello ltui! (https://tboox.org)\nA cross-platform terminal ui library based on Lua"):textattr_set("red")
+ dialog_tips:button_add("yes", "< Yes >", function (v) dialog_tips:show(false) end)
+ dialog_tips:button_add("no", "< No >", function (v) dialog_tips:show(false) end)
+ self._DIALOG_TIPS = dialog_tips
+ end
+ return dialog_tips
+end
+
+-- on resize
+function demo:on_resize()
+ self:dialog_main():bounds_set(rect {1, 1, self:width() - 1, self:height() - 1})
+ self:dialog_help():bounds_set(rect {1, 1, self:width() - 1, self:height() - 1})
+ self:center(self:dialog_input(), {centerx = true, centery = true})
+ self:center(self:dialog_tips(), {centerx = true, centery = true})
+ application.on_resize(self)
+end
+
+-- main entry
+function main(...)
+ demo:run(...)
+end
diff --git a/xmake/core/base/string.lua b/xmake/core/base/string.lua
index 3a4eab821..8bfbe3c4f 100644
--- a/xmake/core/base/string.lua
+++ b/xmake/core/base/string.lua
@@ -24,11 +24,12 @@ local string = string or {}
-- load modules
local deprecated = require("base/deprecated")
local serialize = require("base/serialize")
+local bit = require("bit")
-- save original interfaces
-string._dump = string._dump or string.dump
-string._trim = string._trim or string.trim
-string._split = string._split or string.split
+string._dump = string._dump or string.dump
+string._trim = string._trim or string.trim
+string._split = string._split or string.split
string._lastof = string._lastof or string.lastof
-- find the last substring with the given pattern
@@ -257,5 +258,128 @@ function string:deserialize()
return serialize.load(self)
end
+-- unicode character width in the given index
+function string:wcwidth(idx)
+
+ -- based on Markus Kuhn's implementation of wcswidth()
+ -- https://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c
+ local non_spacing =
+ {
+ {0x0300, 0x036F}, {0x0483, 0x0486}, {0x0488, 0x0489},
+ {0x0591, 0x05BD}, {0x05BF, 0x05BF}, {0x05C1, 0x05C2},
+ {0x05C4, 0x05C5}, {0x05C7, 0x05C7}, {0x0600, 0x0603},
+ {0x0610, 0x0615}, {0x064B, 0x065E}, {0x0670, 0x0670},
+ {0x06D6, 0x06E4}, {0x06E7, 0x06E8}, {0x06EA, 0x06ED},
+ {0x070F, 0x070F}, {0x0711, 0x0711}, {0x0730, 0x074A},
+ {0x07A6, 0x07B0}, {0x07EB, 0x07F3}, {0x0901, 0x0902},
+ {0x093C, 0x093C}, {0x0941, 0x0948}, {0x094D, 0x094D},
+ {0x0951, 0x0954}, {0x0962, 0x0963}, {0x0981, 0x0981},
+ {0x09BC, 0x09BC}, {0x09C1, 0x09C4}, {0x09CD, 0x09CD},
+ {0x09E2, 0x09E3}, {0x0A01, 0x0A02}, {0x0A3C, 0x0A3C},
+ {0x0A41, 0x0A42}, {0x0A47, 0x0A48}, {0x0A4B, 0x0A4D},
+ {0x0A70, 0x0A71}, {0x0A81, 0x0A82}, {0x0ABC, 0x0ABC},
+ {0x0AC1, 0x0AC5}, {0x0AC7, 0x0AC8}, {0x0ACD, 0x0ACD},
+ {0x0AE2, 0x0AE3}, {0x0B01, 0x0B01}, {0x0B3C, 0x0B3C},
+ {0x0B3F, 0x0B3F}, {0x0B41, 0x0B43}, {0x0B4D, 0x0B4D},
+ {0x0B56, 0x0B56}, {0x0B82, 0x0B82}, {0x0BC0, 0x0BC0},
+ {0x0BCD, 0x0BCD}, {0x0C3E, 0x0C40}, {0x0C46, 0x0C48},
+ {0x0C4A, 0x0C4D}, {0x0C55, 0x0C56}, {0x0CBC, 0x0CBC},
+ {0x0CBF, 0x0CBF}, {0x0CC6, 0x0CC6}, {0x0CCC, 0x0CCD},
+ {0x0CE2, 0x0CE3}, {0x0D41, 0x0D43}, {0x0D4D, 0x0D4D},
+ {0x0DCA, 0x0DCA}, {0x0DD2, 0x0DD4}, {0x0DD6, 0x0DD6},
+ {0x0E31, 0x0E31}, {0x0E34, 0x0E3A}, {0x0E47, 0x0E4E},
+ {0x0EB1, 0x0EB1}, {0x0EB4, 0x0EB9}, {0x0EBB, 0x0EBC},
+ {0x0EC8, 0x0ECD}, {0x0F18, 0x0F19}, {0x0F35, 0x0F35},
+ {0x0F37, 0x0F37}, {0x0F39, 0x0F39}, {0x0F71, 0x0F7E},
+ {0x0F80, 0x0F84}, {0x0F86, 0x0F87}, {0x0F90, 0x0F97},
+ {0x0F99, 0x0FBC}, {0x0FC6, 0x0FC6}, {0x102D, 0x1030},
+ {0x1032, 0x1032}, {0x1036, 0x1037}, {0x1039, 0x1039},
+ {0x1058, 0x1059}, {0x1160, 0x11FF}, {0x135F, 0x135F},
+ {0x1712, 0x1714}, {0x1732, 0x1734}, {0x1752, 0x1753},
+ {0x1772, 0x1773}, {0x17B4, 0x17B5}, {0x17B7, 0x17BD},
+ {0x17C6, 0x17C6}, {0x17C9, 0x17D3}, {0x17DD, 0x17DD},
+ {0x180B, 0x180D}, {0x18A9, 0x18A9}, {0x1920, 0x1922},
+ {0x1927, 0x1928}, {0x1932, 0x1932}, {0x1939, 0x193B},
+ {0x1A17, 0x1A18}, {0x1B00, 0x1B03}, {0x1B34, 0x1B34},
+ {0x1B36, 0x1B3A}, {0x1B3C, 0x1B3C}, {0x1B42, 0x1B42},
+ {0x1B6B, 0x1B73}, {0x1DC0, 0x1DCA}, {0x1DFE, 0x1DFF},
+ {0x200B, 0x200F}, {0x202A, 0x202E}, {0x2060, 0x2063},
+ {0x206A, 0x206F}, {0x20D0, 0x20EF}, {0x302A, 0x302F},
+ {0x3099, 0x309A}, {0xA806, 0xA806}, {0xA80B, 0xA80B},
+ {0xA825, 0xA826}, {0xFB1E, 0xFB1E}, {0xFE00, 0xFE0F},
+ {0xFE20, 0xFE23}, {0xFEFF, 0xFEFF}, {0xFFF9, 0xFFFB},
+ {0x10A01, 0x10A03}, {0x10A05, 0x10A06}, {0x10A0C, 0x10A0F},
+ {0x10A38, 0x10A3A}, {0x10A3F, 0x10A3F}, {0x1D167, 0x1D169},
+ {0x1D173, 0x1D182}, {0x1D185, 0x1D18B}, {0x1D1AA, 0x1D1AD},
+ {0x1D242, 0x1D244}, {0xE0001, 0xE0001}, {0xE0020, 0xE007F},
+ {0xE0100, 0xE01EF},
+ }
+
+ idx = idx or 1
+
+ -- turn codepoint into unicode
+ local c = self:byte(idx)
+ local seq = c < 0x80 and 1 or c < 0xE0 and 2 or c < 0xF0 and 3 or
+ c < 0xF8 and 4 or error("invalid UTF-8 sequence")
+ local val = seq == 1 and c or bit.band(c, (2^(8 - seq) - 1))
+
+ for aux = 2, seq do
+ c = self:byte(idx + aux - 1)
+ val = val * 2 ^ 6 + bit.band(c, 0x3F)
+ end
+
+ -- test for 8-bit control characters
+ if val == 0 then return 0 end
+
+ if val < 32 or (val >= 0x7f and val < 0xa0) then
+ return -1
+ end
+
+ -- binary search in table of non-spacing characters
+ local min, max = 1, #non_spacing
+ if val >= non_spacing[1][1] and val <= non_spacing[max][2] then
+ while max >= min do
+ local mid = math.floor((min + max) / 2)
+ if val > non_spacing[mid][2] then
+ min = mid + 1
+ elseif val < non_spacing[mid][1] then
+ max = mid - 1
+ else
+ return 0
+ end
+ end
+ end
+
+ if val >= 0x1100 and (val <= 0x115f or -- Hangul Jamo init. consonants
+ val == 0x2329 or val == 0x232a or
+ (val >= 0x2e80 and val <= 0xa4cf and
+ val ~= 0x303f) or -- CJK ... Yi
+ (val >= 0xac00 and val <= 0xd7a3) or -- Hangul Syllables
+ (val >= 0xf900 and val <= 0xfaff) or -- CJK Compatibility Ideographs
+ (val >= 0xfe10 and val <= 0xfe19) or -- Vertical forms
+ (val >= 0xfe30 and val <= 0xfe6f) or -- CJK Compatibility Forms
+ (val >= 0xff00 and val <= 0xff60) or -- Fullwidth Forms
+ (val >= 0xffe0 and val <= 0xffe6) or
+ (val >= 0x20000 and val <= 0x2fffd) or
+ (val >= 0x30000 and val <= 0x3fffd)) then
+ return 2
+ end
+
+ return 1
+end
+
+-- unicode string width in given start index
+function string:wcswidth(idx)
+ local width = 0
+ idx = idx or 1
+ while idx <= #self do
+ if bit.band(self:byte(idx), 0xc0) ~= 0x80 then
+ width = width + self:wcwidth(idx)
+ end
+ idx = idx + 1
+ end
+ return width
+end
+
-- return module: string
return string
diff --git a/xmake/core/ui/label.lua b/xmake/core/ui/label.lua
index 64cdf646e..63edb4481 100644
--- a/xmake/core/ui/label.lua
+++ b/xmake/core/ui/label.lua
@@ -131,7 +131,7 @@ function label:splitext(text, width)
local size = 0
for i = 1, #line do
if bit.band(line:byte(i), 0xc0) ~= 0x80 then
- size = size + 1
+ size = size + line:wcwidth(i)
if size > width then
table.insert(result, line:sub(1, i - 1))
line = line:sub(i)