vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

term.ui: fix shift notices, remove warning for main example

pull/13265/head
Delyan Angelov 2022-01-24 20:11:29 +02:00
parent 509a8fcaf1
commit 32f2f0dfa1
No known key found for this signature in database
GPG Key ID: 66886C0F12D595ED
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
vlib/term/ui/README.md
View File

@ -13,7 +13,6 @@ mut:
} }
fn event(e &tui.Event, x voidptr) { fn event(e &tui.Event, x voidptr) {
mut app := &App(x)
println(e) println(e)
if e.typ == .key_down && e.code == .escape { if e.typ == .key_down && e.code == .escape {
exit(0) exit(0)
@ -33,14 +32,16 @@ fn frame(x voidptr) {
app.tui.flush() app.tui.flush()
} }
mut app := &App{} fn main() {
app.tui = tui.init( mut app := &App{}
user_data: app app.tui = tui.init(
event_fn: event user_data: app
frame_fn: frame event_fn: event
hide_cursor: true frame_fn: frame
) hide_cursor: true
app.tui.run() ? )
app.tui.run() ?
}
``` ```
See the `/examples/term.ui/` folder for more usage examples. See the `/examples/term.ui/` folder for more usage examples.

12
vlib/term/ui/color.v
View File

@ -9,8 +9,8 @@ const value_range = [0x00, 0x5f, 0x87, 0xaf, 0xd7, 0xff]!
pub const color_table = init_color_table() pub const color_table = init_color_table()
[direct_array_access] [direct_array_access]
fn init_color_table() []int { fn init_color_table() []u32 {
mut color_table_ := []int{len: 256} mut color_table_ := []u32{len: 256}
// ansi colors // ansi colors
color_table_[0] = 0x000000 color_table_[0] = 0x000000
color_table_[1] = 0x800000 color_table_[1] = 0x800000
@ -33,12 +33,14 @@ fn init_color_table() []int {
r := ui.value_range[(i / 36) % 6] r := ui.value_range[(i / 36) % 6]
g := ui.value_range[(i / 6) % 6] g := ui.value_range[(i / 6) % 6]
b := ui.value_range[i % 6] b := ui.value_range[i % 6]
color_table_[i + 16] = ((r << 16) & 0xffffff) + ((g << 8) & 0xffff) + (b & 0xff) color_table_[i + 16] = ((u32(r) << 16) & 0xffffff) + ((u32(g) << 8) & 0xffff) +
(u32(b) & 0xff)
} }
// grayscale // grayscale
for i in 0 .. 24 { for i in 0 .. 24 {
r := 8 + (i * 10) r := 8 + (i * 10)
color_table_[i + 232] = ((r << 16) & 0xffffff) + ((r << 8) & 0xffff) + (r & 0xff) color_table_[i + 232] = ((u32(r) << 16) & 0xffffff) + ((u32(r) << 8) & 0xffff) +
(u32(r) & 0xff)
} }
return color_table_ return color_table_
} }
@ -66,7 +68,7 @@ fn approximate_rgb(r int, g int, b int) int {
} }
fn lookup_rgb(r int, g int, b int) int { fn lookup_rgb(r int, g int, b int) int {
color := (r << 16) + (g << 8) + b color := (u32(r) << 16) + (u32(g) << 8) + u32(b)
// lookup extended colors only, coz non-extended can be changed by users. // lookup extended colors only, coz non-extended can be changed by users.
for i in 16 .. 256 { for i in 16 .. 256 {
if ui.color_table[i] == color { if ui.color_table[i] == color {