interesting
/
andlabs-ui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Implemented the new Area event handling on Windows.

This commit is contained in:
Pietro Gagliardi 2014-06-02 11:32:19 -04:00
parent a9ecc296ef
commit 351177bc23
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
area_windows.go
View File

@ -496,7 +496,7 @@ func areaMouseEvent(s *sysData, button uint, up bool, wparam _WPARAM, lparam _LP
} }
} }
func areaKeyEvent(s *sysData, up bool, wparam _WPARAM, lparam _LPARAM) bool { func areaKeyEvent(s *sysData, up bool, wparam _WPARAM, lparam _LPARAM) {
var ke KeyEvent var ke KeyEvent
scancode := byte((lparam >> 16) & 0xFF) scancode := byte((lparam >> 16) & 0xFF)
@ -516,15 +516,14 @@ func areaKeyEvent(s *sysData, up bool, wparam _WPARAM, lparam _LPARAM) bool {
ke.Key = xke.Key ke.Key = xke.Key
ke.ExtKey = xke.ExtKey ke.ExtKey = xke.ExtKey
} else if ke.Modifiers == 0 { } else if ke.Modifiers == 0 {
// no key, extkey, or modifiers; do nothing but mark not handled // no key, extkey, or modifiers; do nothing
return false return
} }
ke.Up = up ke.Up = up
handled, repaint := s.handler.Key(ke) repaint := s.handler.Key(ke)
if repaint { if repaint {
repaintArea(s) repaintArea(s)
} }
return handled
} }
var extkeys = map[_WPARAM]ExtKey{ var extkeys = map[_WPARAM]ExtKey{
@ -669,18 +668,12 @@ func areaWndProc(hwnd _HWND, uMsg uint32, wParam _WPARAM, lParam _LPARAM) _LRESU
case _WM_KEYUP: case _WM_KEYUP:
areaKeyEvent(s, true, wParam, lParam) areaKeyEvent(s, true, wParam, lParam)
return 0 return 0
// Alt+[anything] and F10 send these instead // Alt+[anything] and F10 send these instead and require us to return to DefWindowProc() so global keystrokes such as Alt+Tab can be processed
case _WM_SYSKEYDOWN: case _WM_SYSKEYDOWN:
handled := areaKeyEvent(s, false, wParam, lParam) areaKeyEvent(s, false, wParam, lParam)
if handled {
return 0
}
return defWindowProc(hwnd, uMsg, wParam, lParam) return defWindowProc(hwnd, uMsg, wParam, lParam)
case _WM_SYSKEYUP: case _WM_SYSKEYUP:
handled := areaKeyEvent(s, true, wParam, lParam) areaKeyEvent(s, true, wParam, lParam)
if handled {
return 0
}
return defWindowProc(hwnd, uMsg, wParam, lParam) return defWindowProc(hwnd, uMsg, wParam, lParam)
case msgSetAreaSize: case msgSetAreaSize:
s.areawidth = int(wParam) // see setAreaSize() in sysdata_windows.go s.areawidth = int(wParam) // see setAreaSize() in sysdata_windows.go