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

Changed Areas on WIndows so that they all use the same window class, rather than having one per Area.

This commit is contained in:
Pietro Gagliardi 2014-05-30 23:02:15 -04:00
parent 855a09656a
commit 2e0914e575
3 changed files with 117 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
area_windows.go
View File

@ -6,7 +6,6 @@ import (
"fmt" "fmt"
"syscall" "syscall"
"unsafe" "unsafe"
"sync"
"image" "image"
) )
@ -16,12 +15,7 @@ const (
) )
const ( const (
areaWndClassFormat = "gouiarea%X" areaWndClass = "gouiarea"
)
var (
areaWndClassNum uintptr
areaWndClassNumLock sync.Mutex
) )
func getScrollPos(hwnd _HWND) (xpos int32, ypos int32) { func getScrollPos(hwnd _HWND) (xpos int32, ypos int32) {
@ -604,8 +598,7 @@ var (
_setFocus = user32.NewProc("SetFocus") _setFocus = user32.NewProc("SetFocus")
) )
func areaWndProc(unused *sysData) func(hwnd _HWND, uMsg uint32, wParam _WPARAM, lParam _LPARAM) _LRESULT { func areaWndProc(hwnd _HWND, uMsg uint32, wParam _WPARAM, lParam _LPARAM) _LRESULT {
return func(hwnd _HWND, uMsg uint32, wParam _WPARAM, lParam _LPARAM) _LRESULT {
s := getSysData(hwnd) s := getSysData(hwnd)
if s == nil { // not yet saved if s == nil { // not yet saved
return storeSysData(hwnd, uMsg, wParam, lParam) return storeSysData(hwnd, uMsg, wParam, lParam)
@ -711,36 +704,22 @@ func areaWndProc(unused *sysData) func(hwnd _HWND, uMsg uint32, wParam _WPARAM,
} }
panic(fmt.Sprintf("areaWndProc message %d did not return: internal bug in ui library", uMsg)) panic(fmt.Sprintf("areaWndProc message %d did not return: internal bug in ui library", uMsg))
} }
}
func registerAreaWndClass(s *sysData) (newClassName string, err error) {
areaWndClassNumLock.Lock()
newClassName = fmt.Sprintf(areaWndClassFormat, areaWndClassNum)
areaWndClassNum++
areaWndClassNumLock.Unlock()
func registerAreaWndClass() (err error) {
wc := &_WNDCLASS{ wc := &_WNDCLASS{
style: _CS_HREDRAW | _CS_VREDRAW, // no CS_DBLCLKS because do that manually style: _CS_HREDRAW | _CS_VREDRAW, // no CS_DBLCLKS because do that manually
lpszClassName: uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(newClassName))), lpszClassName: uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(areaWndClass))),
lpfnWndProc: syscall.NewCallback(areaWndProc(s)), lpfnWndProc: syscall.NewCallback(areaWndProc),
hInstance: hInstance, hInstance: hInstance,
hIcon: icon, hIcon: icon,
hCursor: cursor, hCursor: cursor,
hbrBackground: _HBRUSH(_NULL), // no brush; we handle WM_ERASEBKGND hbrBackground: _HBRUSH(_NULL), // no brush; we handle WM_ERASEBKGND
} }
r1, _, err := _registerClass.Call(uintptr(unsafe.Pointer(wc)))
ret := make(chan uiret) if r1 == 0 { // failure
defer close(ret) return err
uitask <- &uimsg{
call: _registerClass,
p: []uintptr{uintptr(unsafe.Pointer(wc))},
ret: ret,
} }
r := <-ret return nil
if r.ret == 0 { // failure
return "", r.err
}
return newClassName, nil
} }
type _BITMAPINFO struct { type _BITMAPINFO struct {

4
init_windows.go
View File

@ -69,6 +69,10 @@ func doWindowsInit() (err error) {
if err != nil { if err != nil {
return fmt.Errorf("error registering standard window class (for Window): %v", err) return fmt.Errorf("error registering standard window class (for Window): %v", err)
} }
err = registerAreaWndClass()
if err != nil {
return fmt.Errorf("error registering Area window class: %v", err)
}
err = getStandardWindowFonts() err = getStandardWindowFonts()
if err != nil { if err != nil {
return fmt.Errorf("error getting standard window fonts: %v", err) return fmt.Errorf("error getting standard window fonts: %v", err)

2
sysdata_windows.go
View File

@ -113,7 +113,7 @@ var classTypes = [nctypes]*classData{
doNotLoadFont: true, doNotLoadFont: true,
}, },
c_area: &classData{ c_area: &classData{
register: registerAreaWndClass, name: areaWndClass,
style: areastyle, style: areastyle,
xstyle: areaxstyle, xstyle: areaxstyle,
storeSysData: true, storeSysData: true,