Updates and fixes necessary for glml

This selfish update adds the necessary bindings and constants for glml
to stop using cgo. Also some fixes.

Author: Popog

constants.go

@@ -511,6 +511,13 @@ const (
 	WM_CLIPBOARDUPDATE        = 0x031D
 )
 
+// WM_ACTIVATE
+const (
+	WA_INACTIVE    = 0
+	WA_ACTIVE      = 1
+	WA_CLICKACTIVE = 2
+)
+
 const LF_FACESIZE = 32
 
 // Font weight constants
@@ -1256,6 +1263,14 @@ const (
 	DISPID_COLLECT     = -8
 )
 
+const (
+	MONITOR_DEFAULTTONULL    = 0x00000000
+	MONITOR_DEFAULTTOPRIMARY = 0x00000001
+	MONITOR_DEFAULTTONEAREST = 0x00000002
+
+	MONITORINFOF_PRIMARY = 0x00000001
+)
+
 const (
 	CCHDEVICENAME = 32
 	CCHFORMNAME   = 32
@@ -1694,6 +1709,16 @@ const (
 	ILC_HIGHQUALITYSCALE = 0x00020000
 )
 
+// Keystroke Message Flags
+const (
+	KF_EXTENDED = 0x0100
+	KF_DLGMODE  = 0x0800
+	KF_MENUMODE = 0x1000
+	KF_ALTDOWN  = 0x2000
+	KF_REPEAT   = 0x4000
+	KF_UP       = 0x8000
+)
+
 // Virtual-Key Codes
 const (
 	VK_LBUTTON             = 0x01
@@ -2473,3 +2498,117 @@ const (
 	GT_TOUCH_PRESSANDHOLDABORT = 9
 	GT_TOUCH_PRESSANDTAP       = 10
 )
+
+// Icons
+const (
+	ICON_SMALL  = 0
+	ICON_BIG    = 1
+	ICON_SMALL2 = 2
+)
+
+const (
+	SIZE_RESTORED  = 0
+	SIZE_MINIMIZED = 1
+	SIZE_MAXIMIZED = 2
+	SIZE_MAXSHOW   = 3
+	SIZE_MAXHIDE   = 4
+)
+
+// XButton values
+const (
+	XBUTTON1 = 1
+	XBUTTON2 = 2
+)
+
+// Devmode
+const (
+	DM_SPECVERSION = 0x0401
+
+	DM_ORIENTATION        = 0x00000001
+	DM_PAPERSIZE          = 0x00000002
+	DM_PAPERLENGTH        = 0x00000004
+	DM_PAPERWIDTH         = 0x00000008
+	DM_SCALE              = 0x00000010
+	DM_POSITION           = 0x00000020
+	DM_NUP                = 0x00000040
+	DM_DISPLAYORIENTATION = 0x00000080
+	DM_COPIES             = 0x00000100
+	DM_DEFAULTSOURCE      = 0x00000200
+	DM_PRINTQUALITY       = 0x00000400
+	DM_COLOR              = 0x00000800
+	DM_DUPLEX             = 0x00001000
+	DM_YRESOLUTION        = 0x00002000
+	DM_TTOPTION           = 0x00004000
+	DM_COLLATE            = 0x00008000
+	DM_FORMNAME           = 0x00010000
+	DM_LOGPIXELS          = 0x00020000
+	DM_BITSPERPEL         = 0x00040000
+	DM_PELSWIDTH          = 0x00080000
+	DM_PELSHEIGHT         = 0x00100000
+	DM_DISPLAYFLAGS       = 0x00200000
+	DM_DISPLAYFREQUENCY   = 0x00400000
+	DM_ICMMETHOD          = 0x00800000
+	DM_ICMINTENT          = 0x01000000
+	DM_MEDIATYPE          = 0x02000000
+	DM_DITHERTYPE         = 0x04000000
+	DM_PANNINGWIDTH       = 0x08000000
+	DM_PANNINGHEIGHT      = 0x10000000
+	DM_DISPLAYFIXEDOUTPUT = 0x20000000
+)
+
+// ChangeDisplaySettings
+const (
+	CDS_UPDATEREGISTRY  = 0x00000001
+	CDS_TEST            = 0x00000002
+	CDS_FULLSCREEN      = 0x00000004
+	CDS_GLOBAL          = 0x00000008
+	CDS_SET_PRIMARY     = 0x00000010
+	CDS_VIDEOPARAMETERS = 0x00000020
+	CDS_RESET           = 0x40000000
+	CDS_NORESET         = 0x10000000
+
+	DISP_CHANGE_SUCCESSFUL  = 0
+	DISP_CHANGE_RESTART     = 1
+	DISP_CHANGE_FAILED      = -1
+	DISP_CHANGE_BADMODE     = -2
+	DISP_CHANGE_NOTUPDATED  = -3
+	DISP_CHANGE_BADFLAGS    = -4
+	DISP_CHANGE_BADPARAM    = -5
+	DISP_CHANGE_BADDUALVIEW = -6
+)
+
+const (
+	ENUM_CURRENT_SETTINGS  = 0xFFFFFFFF
+	ENUM_REGISTRY_SETTINGS = 0xFFFFFFFE
+)
+
+// PIXELFORMATDESCRIPTOR
+const (
+	PFD_TYPE_RGBA       = 0
+	PFD_TYPE_COLORINDEX = 1
+
+	PFD_MAIN_PLANE     = 0
+	PFD_OVERLAY_PLANE  = 1
+	PFD_UNDERLAY_PLANE = -1
+
+	PFD_DOUBLEBUFFER         = 0x00000001
+	PFD_STEREO               = 0x00000002
+	PFD_DRAW_TO_WINDOW       = 0x00000004
+	PFD_DRAW_TO_BITMAP       = 0x00000008
+	PFD_SUPPORT_GDI          = 0x00000010
+	PFD_SUPPORT_OPENGL       = 0x00000020
+	PFD_GENERIC_FORMAT       = 0x00000040
+	PFD_NEED_PALETTE         = 0x00000080
+	PFD_NEED_SYSTEM_PALETTE  = 0x00000100
+	PFD_SWAP_EXCHANGE        = 0x00000200
+	PFD_SWAP_COPY            = 0x00000400
+	PFD_SWAP_LAYER_BUFFERS   = 0x00000800
+	PFD_GENERIC_ACCELERATED  = 0x00001000
+	PFD_SUPPORT_DIRECTDRAW   = 0x00002000
+	PFD_DIRECT3D_ACCELERATED = 0x00004000
+	PFD_SUPPORT_COMPOSITION  = 0x00008000
+
+	PFD_DEPTH_DONTCARE        = 0x20000000
+	PFD_DOUBLEBUFFER_DONTCARE = 0x40000000
+	PFD_STEREO_DONTCARE       = 0x80000000
+)

gdi32.go

@@ -12,47 +12,53 @@ import (
 var (
 	modgdi32 = syscall.NewLazyDLL("gdi32.dll")
 
-	procGetDeviceCaps        = modgdi32.NewProc("GetDeviceCaps")
-	procDeleteObject         = modgdi32.NewProc("DeleteObject")
-	procCreateFontIndirect   = modgdi32.NewProc("CreateFontIndirectW")
-	procAbortDoc             = modgdi32.NewProc("AbortDoc")
-	procBitBlt               = modgdi32.NewProc("BitBlt")
-	procCloseEnhMetaFile     = modgdi32.NewProc("CloseEnhMetaFile")
-	procCopyEnhMetaFile      = modgdi32.NewProc("CopyEnhMetaFileW")
-	procCreateBrushIndirect  = modgdi32.NewProc("CreateBrushIndirect")
-	procCreateCompatibleDC   = modgdi32.NewProc("CreateCompatibleDC")
-	procCreateDC             = modgdi32.NewProc("CreateDCW")
-	procCreateDIBSection     = modgdi32.NewProc("CreateDIBSection")
-	procCreateEnhMetaFile    = modgdi32.NewProc("CreateEnhMetaFileW")
-	procCreateIC             = modgdi32.NewProc("CreateICW")
-	procDeleteDC             = modgdi32.NewProc("DeleteDC")
-	procDeleteEnhMetaFile    = modgdi32.NewProc("DeleteEnhMetaFile")
-	procEllipse              = modgdi32.NewProc("Ellipse")
-	procEndDoc               = modgdi32.NewProc("EndDoc")
-	procEndPage              = modgdi32.NewProc("EndPage")
-	procExtCreatePen         = modgdi32.NewProc("ExtCreatePen")
-	procGetEnhMetaFile       = modgdi32.NewProc("GetEnhMetaFileW")
-	procGetEnhMetaFileHeader = modgdi32.NewProc("GetEnhMetaFileHeader")
-	procGetObject            = modgdi32.NewProc("GetObjectW")
-	procGetStockObject       = modgdi32.NewProc("GetStockObject")
-	procGetTextExtentExPoint = modgdi32.NewProc("GetTextExtentExPointW")
-	procGetTextExtentPoint32 = modgdi32.NewProc("GetTextExtentPoint32W")
-	procGetTextMetrics       = modgdi32.NewProc("GetTextMetricsW")
-	procLineTo               = modgdi32.NewProc("LineTo")
-	procMoveToEx             = modgdi32.NewProc("MoveToEx")
-	procPlayEnhMetaFile      = modgdi32.NewProc("PlayEnhMetaFile")
-	procRectangle            = modgdi32.NewProc("Rectangle")
-	procResetDC              = modgdi32.NewProc("ResetDCW")
-	procSelectObject         = modgdi32.NewProc("SelectObject")
-	procSetBkMode            = modgdi32.NewProc("SetBkMode")
-	procSetBrushOrgEx        = modgdi32.NewProc("SetBrushOrgEx")
-	procSetStretchBltMode    = modgdi32.NewProc("SetStretchBltMode")
-	procSetTextColor         = modgdi32.NewProc("SetTextColor")
-	procSetBkColor           = modgdi32.NewProc("SetBkColor")
-	procStartDoc             = modgdi32.NewProc("StartDocW")
-	procStartPage            = modgdi32.NewProc("StartPage")
-	procStretchBlt           = modgdi32.NewProc("StretchBlt")
-	procSetDIBitsToDevice    = modgdi32.NewProc("SetDIBitsToDevice")
+	procGetDeviceCaps             = modgdi32.NewProc("GetDeviceCaps")
+	procDeleteObject              = modgdi32.NewProc("DeleteObject")
+	procCreateFontIndirect        = modgdi32.NewProc("CreateFontIndirectW")
+	procAbortDoc                  = modgdi32.NewProc("AbortDoc")
+	procBitBlt                    = modgdi32.NewProc("BitBlt")
+	procCloseEnhMetaFile          = modgdi32.NewProc("CloseEnhMetaFile")
+	procCopyEnhMetaFile           = modgdi32.NewProc("CopyEnhMetaFileW")
+	procCreateBrushIndirect       = modgdi32.NewProc("CreateBrushIndirect")
+	procCreateCompatibleDC        = modgdi32.NewProc("CreateCompatibleDC")
+	procCreateDC                  = modgdi32.NewProc("CreateDCW")
+	procCreateDIBSection          = modgdi32.NewProc("CreateDIBSection")
+	procCreateEnhMetaFile         = modgdi32.NewProc("CreateEnhMetaFileW")
+	procCreateIC                  = modgdi32.NewProc("CreateICW")
+	procDeleteDC                  = modgdi32.NewProc("DeleteDC")
+	procDeleteEnhMetaFile         = modgdi32.NewProc("DeleteEnhMetaFile")
+	procEllipse                   = modgdi32.NewProc("Ellipse")
+	procEndDoc                    = modgdi32.NewProc("EndDoc")
+	procEndPage                   = modgdi32.NewProc("EndPage")
+	procExtCreatePen              = modgdi32.NewProc("ExtCreatePen")
+	procGetEnhMetaFile            = modgdi32.NewProc("GetEnhMetaFileW")
+	procGetEnhMetaFileHeader      = modgdi32.NewProc("GetEnhMetaFileHeader")
+	procGetObject                 = modgdi32.NewProc("GetObjectW")
+	procGetStockObject            = modgdi32.NewProc("GetStockObject")
+	procGetTextExtentExPoint      = modgdi32.NewProc("GetTextExtentExPointW")
+	procGetTextExtentPoint32      = modgdi32.NewProc("GetTextExtentPoint32W")
+	procGetTextMetrics            = modgdi32.NewProc("GetTextMetricsW")
+	procLineTo                    = modgdi32.NewProc("LineTo")
+	procMoveToEx                  = modgdi32.NewProc("MoveToEx")
+	procPlayEnhMetaFile           = modgdi32.NewProc("PlayEnhMetaFile")
+	procRectangle                 = modgdi32.NewProc("Rectangle")
+	procResetDC                   = modgdi32.NewProc("ResetDCW")
+	procSelectObject              = modgdi32.NewProc("SelectObject")
+	procSetBkMode                 = modgdi32.NewProc("SetBkMode")
+	procSetBrushOrgEx             = modgdi32.NewProc("SetBrushOrgEx")
+	procSetStretchBltMode         = modgdi32.NewProc("SetStretchBltMode")
+	procSetTextColor              = modgdi32.NewProc("SetTextColor")
+	procSetBkColor                = modgdi32.NewProc("SetBkColor")
+	procStartDoc                  = modgdi32.NewProc("StartDocW")
+	procStartPage                 = modgdi32.NewProc("StartPage")
+	procStretchBlt                = modgdi32.NewProc("StretchBlt")
+	procSetDIBitsToDevice         = modgdi32.NewProc("SetDIBitsToDevice")
+	procChoosePixelFormat         = modgdi32.NewProc("ChoosePixelFormat")
+	procDescribePixelFormat       = modgdi32.NewProc("DescribePixelFormat")
+	procGetEnhMetaFilePixelFormat = modgdi32.NewProc("GetEnhMetaFilePixelFormat")
+	procGetPixelFormat            = modgdi32.NewProc("GetPixelFormat")
+	procSetPixelFormat            = modgdi32.NewProc("SetPixelFormat")
+	procSwapBuffers               = modgdi32.NewProc("SwapBuffers")
 )
 
 func GetDeviceCaps(hdc HDC, index int) int {
@@ -453,3 +459,51 @@ func SetDIBitsToDevice(hdc HDC, xDest, yDest, dwWidth, dwHeight, xSrc, ySrc int,
 
 	return int(ret)
 }
+
+func ChoosePixelFormat(hdc HDC, pfd *PIXELFORMATDESCRIPTOR) int {
+	ret, _, _ := procChoosePixelFormat.Call(
+		uintptr(hdc),
+		uintptr(unsafe.Pointer(pfd)),
+	)
+	return int(ret)
+}
+
+func DescribePixelFormat(hdc HDC, iPixelFormat int, nBytes uint, pfd *PIXELFORMATDESCRIPTOR) int {
+	ret, _, _ := procDescribePixelFormat.Call(
+		uintptr(hdc),
+		uintptr(iPixelFormat),
+		uintptr(nBytes),
+		uintptr(unsafe.Pointer(pfd)),
+	)
+	return int(ret)
+}
+
+func GetEnhMetaFilePixelFormat(hemf HENHMETAFILE, cbBuffer uint32, pfd *PIXELFORMATDESCRIPTOR) uint {
+	ret, _, _ := procGetEnhMetaFilePixelFormat.Call(
+		uintptr(hemf),
+		uintptr(cbBuffer),
+		uintptr(unsafe.Pointer(pfd)),
+	)
+	return uint(ret)
+}
+
+func GetPixelFormat(hdc HDC) int {
+	ret, _, _ := procGetPixelFormat.Call(
+		uintptr(hdc),
+	)
+	return int(ret)
+}
+
+func SetPixelFormat(hdc HDC, iPixelFormat int, pfd *PIXELFORMATDESCRIPTOR) bool {
+	ret, _, _ := procSetPixelFormat.Call(
+		uintptr(hdc),
+		uintptr(iPixelFormat),
+		uintptr(unsafe.Pointer(pfd)),
+	)
+	return ret == TRUE
+}
+
+func SwapBuffers(hdc HDC) bool {
+	ret, _, _ := procSwapBuffers.Call(uintptr(hdc))
+	return ret == TRUE
+}

opengl32.go

@@ -0,0 +1,72 @@
+// Copyright 2010-2012 The W32 Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package w32
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var (
+	modopengl32 = syscall.NewLazyDLL("opengl32.dll")
+
+	procwglCreateContext      = modopengl32.NewProc("wglCreateContext")
+	procwglCreateLayerContext = modopengl32.NewProc("wglCreateLayerContext")
+	procwglDeleteContext      = modopengl32.NewProc("wglDeleteContext")
+	procwglGetProcAddress     = modopengl32.NewProc("wglGetProcAddress")
+	procwglMakeCurrent        = modopengl32.NewProc("wglMakeCurrent")
+	procwglShareLists         = modopengl32.NewProc("wglShareLists")
+)
+
+func WglCreateContext(hdc HDC) HGLRC {
+	ret, _, _ := procwglCreateContext.Call(
+		uintptr(hdc),
+	)
+
+	return HGLRC(ret)
+}
+
+func WglCreateLayerContext(hdc HDC, iLayerPlane int) HGLRC {
+	ret, _, _ := procwglCreateLayerContext.Call(
+		uintptr(hdc),
+		uintptr(iLayerPlane),
+	)
+
+	return HGLRC(ret)
+}
+
+func WglDeleteContext(hglrc HGLRC) bool {
+	ret, _, _ := procwglDeleteContext.Call(
+		uintptr(hglrc),
+	)
+
+	return ret == TRUE
+}
+
+func WglGetProcAddress(szProc string) uintptr {
+	ret, _, _ := procwglGetProcAddress.Call(
+		uintptr(unsafe.Pointer(syscall.StringBytePtr(szProc))),
+	)
+
+	return ret
+}
+
+func WglMakeCurrent(hdc HDC, hglrc HGLRC) bool {
+	ret, _, _ := procwglMakeCurrent.Call(
+		uintptr(hdc),
+		uintptr(hglrc),
+	)
+
+	return ret == TRUE
+}
+
+func WglShareLists(hglrc1, hglrc2 HGLRC) bool {
+	ret, _, _ := procwglShareLists.Call(
+		uintptr(hglrc1),
+		uintptr(hglrc2),
+	)
+
+	return ret == TRUE
+}