TheCloud/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-10 16:00:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

term.ui,os.notify: fix .ctrl being stuck in examples/term.ui/event_viewer.v (regression happened in e9a3817a from 2023-02-20)

Browse Source
This commit is contained in:
Delyan Angelov 2023-10-09 14:03:38 +03:00
parent 169a6b5ce0
commit 121fa0e92d
No known key found for this signature in database
GPG Key ID: 66886C0F12D595ED
6 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vlib/os/notify/backend_darwin.c.v
View File

@ -159,7 +159,7 @@ fn (mut kn KqueueNotifier) close() ! {
// event_mask_to_flag is a helper function that converts a bitmask // event_mask_to_flag is a helper function that converts a bitmask
// returned by kevent() wait to FdEventType // returned by kevent() wait to FdEventType
fn event_mask_to_flag(filter i16, flags u16) FdEventType { fn event_mask_to_flag(filter i16, flags u16) FdEventType {
mut res := FdEventType.read mut res := unsafe { FdEventType(0) }
if filter & notify.kqueue_read != 0 { if filter & notify.kqueue_read != 0 {
res.set(.read) res.set(.read)

2
vlib/os/notify/backend_linux.c.v
View File

@ -140,7 +140,7 @@ fn (mut en EpollNotifier) close() ! {
// event_mask_to_flag is a helper function that converts a bitmask // event_mask_to_flag is a helper function that converts a bitmask
// returned by epoll_wait to FdEventType // returned by epoll_wait to FdEventType
fn event_mask_to_flag(mask u32) FdEventType { fn event_mask_to_flag(mask u32) FdEventType {
mut flags := FdEventType.read mut flags := unsafe { FdEventType(0) }
if mask & notify.epoll_read != 0 { if mask & notify.epoll_read != 0 {
flags.set(.read) flags.set(.read)

4
vlib/term/ui/input_windows.c.v
View File

@ -174,7 +174,7 @@ fn (mut ctx Context) parse_events() {
else { unsafe { KeyCode(ascii) } } else { unsafe { KeyCode(ascii) } }
} }
mut modifiers := Modifiers.ctrl mut modifiers := unsafe { Modifiers(0) }
if e.dwControlKeyState & (0x1 | 0x2) != 0 { if e.dwControlKeyState & (0x1 | 0x2) != 0 {
modifiers.set(.alt) modifiers.set(.alt)
} }
@ -204,7 +204,7 @@ fn (mut ctx Context) parse_events() {
} }
x := e.dwMousePosition.X + 1 x := e.dwMousePosition.X + 1
y := int(e.dwMousePosition.Y) - sb_info.srWindow.Top + 1 y := int(e.dwMousePosition.Y) - sb_info.srWindow.Top + 1
mut modifiers := Modifiers.ctrl mut modifiers := unsafe { Modifiers(0) }
if e.dwControlKeyState & (0x1 | 0x2) != 0 { if e.dwControlKeyState & (0x1 | 0x2) != 0 {
modifiers.set(.alt) modifiers.set(.alt)
} }

4
vlib/term/ui/termios_nix.c.v
View File

@ -427,7 +427,7 @@ fn escape_sequence(buf_ string) (&Event, int) {
lo := typ & 0b00011 lo := typ & 0b00011
hi := typ & 0b11100 hi := typ & 0b11100
mut modifiers := Modifiers.ctrl mut modifiers := unsafe { Modifiers(0) }
if hi & 4 != 0 { if hi & 4 != 0 {
modifiers.set(.shift) modifiers.set(.shift)
} }
@ -497,7 +497,7 @@ fn escape_sequence(buf_ string) (&Event, int) {
// ---------------------------- // ----------------------------
mut code := KeyCode.null mut code := KeyCode.null
mut modifiers := Modifiers.ctrl mut modifiers := unsafe { Modifiers(0) }
match buf { match buf {
'[A', 'OA' { code = .up } '[A', 'OA' { code = .up }
'[B', 'OB' { code = .down } '[B', 'OB' { code = .down }

5
vlib/v/checker/tests/enum_cast.out
View File

@ -18,10 +18,11 @@ vlib/v/checker/tests/enum_cast.vv:21:19: warning: 10 does not represent a value
21 | println(unsafe { Permissions(0b1010) }) 21 | println(unsafe { Permissions(0b1010) })
| ~~~~~~~~~~~~~~~~~~~ | ~~~~~~~~~~~~~~~~~~~
22 | println(unsafe { Permissions(-1) }) 22 | println(unsafe { Permissions(-1) })
23 | } 23 | println(unsafe { Permissions(0) })
vlib/v/checker/tests/enum_cast.vv:22:19: warning: -1 does not represent a value of enum Permissions vlib/v/checker/tests/enum_cast.vv:22:19: warning: -1 does not represent a value of enum Permissions
20 | println(unsafe { Permissions(0b101) }) 20 | println(unsafe { Permissions(0b101) })
21 | println(unsafe { Permissions(0b1010) }) 21 | println(unsafe { Permissions(0b1010) })
22 | println(unsafe { Permissions(-1) }) 22 | println(unsafe { Permissions(-1) })
| ~~~~~~~~~~~~~~~ | ~~~~~~~~~~~~~~~
23 | } 23 | println(unsafe { Permissions(0) })
24 | }

1
vlib/v/checker/tests/enum_cast.vv
View File

@ -20,4 +20,5 @@ fn main() {
println(unsafe { Permissions(0b101) }) println(unsafe { Permissions(0b101) })
println(unsafe { Permissions(0b1010) }) println(unsafe { Permissions(0b1010) })
println(unsafe { Permissions(-1) }) println(unsafe { Permissions(-1) })
println(unsafe { Permissions(0) })
} }