ffi-wingui-core 0.3.0 → 0.4.0

data/examples/Minimal.rbw

@@ -1,8 +1,8 @@
 require 'ffi-wingui-core'
 
-include WinGUI
+exit if defined?(Ocra)
 
-EnableVisualStyles()
+include WinGUI
 
 APPNAME = L(File.basename(__FILE__, '.rbw'))
 
@@ -42,7 +42,9 @@ def main
 		wc[:hInstance] = GetModuleHandle(nil)
 		wc[:hIcon] = LoadIcon(nil, IDI_APPLICATION)
 		wc[:hCursor] = LoadCursor(nil, IDC_ARROW)
-		wc[:hbrBackground] = FFI::Pointer.new(COLOR_WINDOW + 1)
+		wc[:hbrBackground] = FFI::Pointer.new(
+			((WINVER == WINXP) ? COLOR_MENUBAR : COLOR_MENU) + 1
+		)
 
 		PWSTR(APPNAME) { |className|
 			wc[:lpszClassName] = className
@@ -54,7 +56,7 @@ def main
 	}
 
 	hwnd = CreateWindowEx(
-		0, APPNAME, APPNAME, WS_OVERLAPPEDWINDOW,
+		0, APPNAME, APPNAME, WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN,
 		CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
 		nil, nil, GetModuleHandle(nil), nil
 	)

data/examples/Scribble.rbw

@@ -1,29 +1,15 @@
 require 'ffi-wingui-core'
 
-include WinGUI
+exit if defined?(Ocra)
 
-EnableVisualStyles()
+include WinGUI
 
 APPNAME = L(File.basename(__FILE__, '.rbw'))
 
 WndExtra = Struct.new(
 	:scribbles,
 	:hpen
-)
-
-class WndExtra
-	REFS = {}
-
-	def initialize(*args)
-		super
-
-		REFS[object_id] = self
-
-		ObjectSpace.define_finalizer(self, -> id {
-			REFS.delete(id)
-		})
-	end
-end
+).send(:include, Util::Id2RefTracking)
 
 def onCreate(hwnd,
 	cs
@@ -212,7 +198,7 @@ def main
 	}
 
 	hwnd = CreateWindowEx(
-		0, APPNAME, APPNAME, WS_OVERLAPPEDWINDOW,
+		WS_EX_CLIENTEDGE, APPNAME, APPNAME, WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN,
 		CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
 		nil, nil, GetModuleHandle(nil), FFI::Pointer.new(xtra.object_id)
 	)

data/examples/WndExtra.rbw

@@ -1,8 +1,8 @@
 require 'ffi-wingui-core'
 
-include WinGUI
+exit if defined?(Ocra)
 
-EnableVisualStyles()
+include WinGUI
 
 APPNAME = L(File.basename(__FILE__, '.rbw'))
 
@@ -78,7 +78,9 @@ def main
 		wc[:hInstance] = GetModuleHandle(nil)
 		wc[:hIcon] = LoadIcon(nil, IDI_APPLICATION)
 		wc[:hCursor] = LoadCursor(nil, IDC_ARROW)
-		wc[:hbrBackground] = FFI::Pointer.new(COLOR_WINDOW + 1)
+		wc[:hbrBackground] = FFI::Pointer.new(
+			((WINVER == WINXP) ? COLOR_MENUBAR : COLOR_MENU) + 1
+		)
 
 		PWSTR(APPNAME) { |className|
 			wc[:lpszClassName] = className
@@ -90,7 +92,7 @@ def main
 	}
 
 	hwnd = CreateWindowEx(
-		0, APPNAME, APPNAME, WS_OVERLAPPEDWINDOW,
+		0, APPNAME, APPNAME, WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN,
 		CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
 		nil, nil, GetModuleHandle(nil), FFI::Pointer.new(xtra.object_id)
 	)

data/lib/ffi-wingui-core.rb

@@ -29,6 +29,14 @@ module WinGUI
 			end
 		end
 
+		unless FFI::Struct.respond_to?(:by_ref)
+			class << FFI::Struct
+				def by_ref(*args)
+					FFI::Type::Builtin::POINTER
+				end
+			end
+		end
+
 		module ScopedStruct
 			def new(*args)
 				raise ArgumentError, 'Cannot accept both arguments and a block' if
@@ -51,7 +59,9 @@ module WinGUI
 		end
 	end
 
+	#{ INVALID_xxx
 	INVALID_HANDLE_VALUE = FFI::Pointer.new(-1)
+	#}
 
 	def MAKEWORD(lobyte, hibyte)
 		(lobyte & 0xff) | ((hibyte & 0xff) << 8)
@@ -65,6 +75,8 @@ module WinGUI
 		(word >> 8) & 0xff
 	end
 
+	module_function :MAKEWORD, :LOBYTE, :HIBYTE
+
 	def MAKELONG(loword, hiword)
 		(loword & 0xffff) | ((hiword & 0xffff) << 16)
 	end
@@ -77,9 +89,7 @@ module WinGUI
 		(long >> 16) & 0xffff
 	end
 
-	module_function \
-		:MAKEWORD, :LOBYTE, :HIBYTE,
-		:MAKELONG, :LOWORD, :HIWORD
+	module_function :MAKELONG, :LOWORD, :HIWORD
 
 	def L(str)
 		(str << "\0").encode!('utf-16le')
@@ -184,7 +194,7 @@ module WinGUI
 	end
 
 	attach_function :GetVersionEx, :GetVersionExW, [
-		:pointer # OSVERSIONINFOEX.by_ref
+		OSVERSIONINFOEX.by_ref
 	], :int
 
 	OSVERSION = OSVERSIONINFOEX.new.tap { |ovi|
@@ -249,14 +259,6 @@ module WinGUI
 
 	WINVER = HIWORD(NTDDI_VERSION)
 
-	if WINVER == WIN2K
-		class << FFI::Struct
-			def by_ref(*args)
-				FFI::Type::Builtin::POINTER
-			end
-		end
-	end
-
 	attach_function :GetModuleHandle, :GetModuleHandleW, [
 		:buffer_in
 	], :pointer
@@ -375,6 +377,9 @@ module WinGUI
 
 	module_function :EnableVisualStyles
 
+	EnableVisualStyles() unless
+		Object.const_defined?(:WINGUI_VISUAL_STYLES) && !WINGUI_VISUAL_STYLES
+
 	attach_function :MulDiv, [
 		:int,
 		:int,
@@ -535,7 +540,7 @@ module WinGUI
 		], :int
 
 		Detonate(0, :SetProcessDPIAware) unless
-			Object.const_defined?(:DPI_AWARE) && !DPI_AWARE
+			Object.const_defined?(:WINGUI_DPI_AWARE) && !WINGUI_DPI_AWARE
 	end
 
 	attach_function :GetDC, [
@@ -682,6 +687,7 @@ module WinGUI
 				:ulong
 			], :int
 		rescue FFI::NotFoundError # MessageBoxTimeout is undocumented
+
 		end
 	end
 
@@ -713,6 +719,30 @@ module WinGUI
 		:long
 	], :long
 
+	#{ IMAGE_xxx
+	IMAGE_BITMAP = 0
+	IMAGE_ICON = 1
+	IMAGE_CURSOR = 2
+	#}
+
+	#{ LR_xxx
+	LR_SHARED = 0x00008000
+	LR_LOADFROMFILE = 0x00000010
+	LR_CREATEDIBSECTION = 0x00002000
+	LR_LOADTRANSPARENT = 0x00000020
+	LR_LOADMAP3DCOLORS = 0x00001000
+	LR_DEFAULTSIZE = 0x00000040
+	#}
+
+	attach_function :LoadImage, :LoadImageW, [
+		:pointer,
+		:buffer_in,
+		:uint,
+		:int,
+		:int,
+		:uint
+	], :pointer
+
 	#{ IDI_xxx
 	IDI_WINLOGO = FFI::Pointer.new(32517)
 	IDI_APPLICATION = FFI::Pointer.new(32512)
@@ -732,11 +762,16 @@ module WinGUI
 	], :pointer
 
 	#{ IDC_xxx
-	IDC_ARROW = FFI::Pointer.new(32512)
 	IDC_WAIT = FFI::Pointer.new(32514)
 	IDC_APPSTARTING = FFI::Pointer.new(32650)
+
+	IDC_ARROW = FFI::Pointer.new(32512)
 	IDC_HAND = FFI::Pointer.new(32649)
+	IDC_IBEAM = FFI::Pointer.new(32513)
 	IDC_CROSS = FFI::Pointer.new(32515)
+	IDC_HELP = FFI::Pointer.new(32651)
+	IDC_NO = FFI::Pointer.new(32648)
+
 	IDC_SIZEALL = FFI::Pointer.new(32646)
 	IDC_SIZENS = FFI::Pointer.new(32645)
 	IDC_SIZEWE = FFI::Pointer.new(32644)
@@ -749,11 +784,23 @@ module WinGUI
 		:buffer_in
 	], :pointer
 
-	#{ COLOR/CTLCOLOR_xxx
+	attach_function :SetCursorPos, [
+		:int,
+		:int
+	], :int
+
+	attach_function :GetCursorPos, [
+		POINT.by_ref(:out)
+	], :int
+
+	#{ COLOR_xxx
 	COLOR_DESKTOP = 1
 	COLOR_APPWORKSPACE = 12
 	COLOR_WINDOW = 5
-	CTLCOLOR_DLG = 4
+	if WINVER >= WINXP
+		COLOR_MENUBAR = 30
+	end
+	COLOR_MENU = 4
 	#}
 
 	class WNDCLASSEX < FFI::Struct
@@ -789,6 +836,32 @@ module WinGUI
 		WNDCLASSEX.by_ref(:out)
 	], :int
 
+	#{ WS_EX_xxx
+	WS_EX_WINDOWEDGE = 0x00000100
+	WS_EX_CLIENTEDGE = 0x00000200
+	WS_EX_STATICEDGE = 0x00020000
+	WS_EX_DLGMODALFRAME = 0x00000001
+	WS_EX_CONTEXTHELP = 0x00000400
+	WS_EX_ACCEPTFILES = 0x00000010
+
+	WS_EX_TOPMOST = 0x00000008
+	WS_EX_LAYERED = 0x00080000
+	if WINVER >= WINXP
+		WS_EX_COMPOSITED = 0x02000000
+	end
+	WS_EX_TRANSPARENT = 0x00000020
+
+	WS_EX_NOPARENTNOTIFY = 0x00000004
+
+	WS_EX_APPWINDOW = 0x00040000
+	WS_EX_OVERLAPPEDWINDOW = \
+		WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE
+	WS_EX_TOOLWINDOW = 0x00000080
+	WS_EX_PALETTEWINDOW = WS_EX_TOOLWINDOW |
+		WS_EX_WINDOWEDGE | WS_EX_TOPMOST
+	WS_EX_CONTROLPARENT = 0x00010000
+	#}
+
 	#{ WS_xxx
 	WS_BORDER = 0x00800000
 	WS_DLGFRAME = 0x00400000
@@ -799,24 +872,24 @@ module WinGUI
 	WS_MAXIMIZEBOX = 0x00010000
 	WS_HSCROLL = 0x00100000
 	WS_VSCROLL = 0x00200000
+
 	WS_DISABLED = 0x08000000
 	WS_VISIBLE = 0x10000000
 	WS_MINIMIZE = 0x20000000
 	WS_MAXIMIZE = 0x01000000
 	WS_CLIPCHILDREN = 0x02000000
-	WS_CLIPSIBLINGS = 0x04000000
+
 	WS_GROUP = 0x00020000
 	WS_TABSTOP = 0x00010000
+	WS_CLIPSIBLINGS = 0x04000000
 
 	WS_OVERLAPPED = 0x00000000
 	WS_OVERLAPPEDWINDOW = WS_OVERLAPPED |
 		WS_CAPTION | WS_SYSMENU |
 		WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX
-
 	WS_POPUP = 0x80000000
 	WS_POPUPWINDOW = WS_POPUP |
 		WS_BORDER | WS_SYSMENU
-
 	WS_CHILD = 0x40000000
 	WS_CHILDWINDOW = WS_CHILD
 	#}
@@ -881,13 +954,13 @@ module WinGUI
 	], :int
 
 	#{ GWL_xxx
+	GWL_WNDPROC = -4
 	GWL_EXSTYLE = -20
 	GWL_STYLE = -16
 	GWL_HWNDPARENT = -8
 	GWL_ID = -12
 	GWL_HINSTANCE = -6
 	GWL_USERDATA = -21
-	GWL_WNDPROC = -4
 	#}
 
 	attach_function :SetWindowLong, :SetWindowLongW, [
@@ -917,11 +990,8 @@ module WinGUI
 	#{ SW_xxx
 	SW_HIDE = 0
 	SW_SHOW = 5
-	SW_SHOWNA = 8
 	SW_SHOWNORMAL = 1
-	SW_SHOWNOACTIVATE = 4
 	SW_SHOWMINIMIZED = 2
-	SW_SHOWMINNOACTIVE = 7
 	SW_SHOWMAXIMIZED = 3
 	SW_RESTORE = 9
 	#}
@@ -939,21 +1009,11 @@ module WinGUI
 	#}
 
 	#{ SWP_xxx
-	SWP_NOSIZE = 0x0001
-	SWP_NOMOVE = 0x0002
-	SWP_NOZORDER = 0x0004
-	SWP_NOREDRAW = 0x0008
-	SWP_NOACTIVATE = 0x0010
 	SWP_FRAMECHANGED = 0x0020
-	SWP_SHOWWINDOW = 0x0040
-	SWP_HIDEWINDOW = 0x0080
-	SWP_NOCOPYBITS = 0x0100
 	SWP_NOOWNERZORDER = 0x0200
-	SWP_NOSENDCHANGING = 0x0400
-	SWP_DRAWFRAME = SWP_FRAMECHANGED
-	SWP_NOREPOSITION = SWP_NOOWNERZORDER
-	SWP_DEFERERASE = 0x2000
-	SWP_ASYNCWINDOWPOS = 0x4000
+	SWP_NOZORDER = 0x0004
+	SWP_NOMOVE = 0x0002
+	SWP_NOSIZE = 0x0001
 	#}
 
 	attach_function :SetWindowPos, [
@@ -995,10 +1055,6 @@ module WinGUI
 		RECT.by_ref(:out)
 	], :int
 
-	attach_function :GetCursorPos, [
-		POINT.by_ref(:out)
-	], :int
-
 	attach_function :ScreenToClient, [
 		:pointer,
 		POINT.by_ref
@@ -1015,28 +1071,16 @@ module WinGUI
 		:int
 	], :int
 
-	attach_function :UpdateWindow, [
-		:pointer
-	], :int
-
-	attach_function :SetCapture, [
-		:pointer
-	], :pointer
-
-	attach_function :ReleaseCapture, [
-
-	], :int
-
-	attach_function :GetCapture, [
-
-	], :pointer
-
 	attach_function :GetUpdateRect, [
 		:pointer,
 		RECT.by_ref(:out),
 		:int
 	], :int
 
+	attach_function :UpdateWindow, [
+		:pointer
+	], :int
+
 	class PAINTSTRUCT < FFI::Struct
 		extend Util::ScopedStruct
 
@@ -1059,6 +1103,18 @@ module WinGUI
 		PAINTSTRUCT.by_ref(:in)
 	], :int
 
+	attach_function :SetCapture, [
+		:pointer
+	], :pointer
+
+	attach_function :ReleaseCapture, [
+
+	], :int
+
+	attach_function :GetCapture, [
+
+	], :pointer
+
 	attach_function :SetMenu, [
 		:pointer,
 		:pointer
@@ -1077,6 +1133,18 @@ module WinGUI
 		:int
 	], :pointer
 
+	attach_function :GetDlgCtrlID, [
+		:pointer
+	], :int
+
+	attach_function :SetFocus, [
+		:pointer
+	], :pointer
+
+	attach_function :GetFocus, [
+
+	], :pointer
+
 	#{ HWND_xxx
 	HWND_BROADCAST = FFI::Pointer.new(0xffff)
 	#}
@@ -1108,34 +1176,45 @@ module WinGUI
 	WM_DESTROY = 0x0002
 	WM_NCDESTROY = 0x0082
 
+	#{ WA_xxx
+	WA_INACTIVE = 0
+	WA_ACTIVE = 1
+	WA_CLICKACTIVE = 2
+	#}
+
+	WM_ACTIVATE = 0x0006
+
 	WM_SETFONT = 0x0030
 	WM_GETFONT = 0x0031
 
 	WM_PAINT = 0x000F
 
 	def GET_X_LPARAM(lParam)
-		((x = LOWORD(lParam)) > 0x7fff) ?
-			x - 0x1_0000 :
-			x
+		((x = LOWORD(lParam)) > 0x7fff) ? x - 0x1_0000 : x
 	end
 
 	def GET_Y_LPARAM(lParam)
-		((y = HIWORD(lParam)) > 0x7fff) ?
-			y - 0x1_0000 :
-			y
+		((y = HIWORD(lParam)) > 0x7fff) ? y - 0x1_0000 : y
 	end
 
+	module_function :GET_X_LPARAM, :GET_Y_LPARAM
+
 	WM_LBUTTONDOWN = 0x0201
 	WM_LBUTTONUP = 0x0202
 	WM_LBUTTONDBLCLK = 0x0203
+
 	WM_RBUTTONDOWN = 0x0204
 	WM_RBUTTONUP = 0x0205
 	WM_RBUTTONDBLCLK = 0x0206
+
 	WM_MBUTTONDOWN = 0x0207
 	WM_MBUTTONUP = 0x0208
 	WM_MBUTTONDBLCLK = 0x0209
+
 	WM_MOUSEMOVE = 0x0200
 
+	WM_CONTEXTMENU = 0x007B
+
 	WM_COMMAND = 0x0111
 
 	class NMHDR < FFI::Struct
@@ -1149,6 +1228,7 @@ module WinGUI
 
 	WM_NOTIFY = 0x004E
 
+	WM_USER = 0x0400
 	WM_APP = 0x8000
 	#}
 
@@ -1229,6 +1309,7 @@ module WinGUI
 	MF_MENUBARBREAK = 0x00000020
 	MF_MENUBREAK = 0x00000040
 	MF_RIGHTJUSTIFY = 0x00004000
+
 	MF_ENABLED = 0x00000000
 	MF_DISABLED = 0x00000002
 	MF_GRAYED = 0x00000001
@@ -1246,6 +1327,23 @@ module WinGUI
 		:buffer_in
 	], :int
 
+	attach_function :SetMenuDefaultItem, [
+		:pointer,
+		:uint,
+		:uint
+	], :int
+
+	#{ GMDI_xxx
+	GMDI_USEDISABLED = 0x0001
+	GMDI_GOINTOPOPUPS = 0x0002
+	#}
+
+	attach_function :GetMenuDefaultItem, [
+		:pointer,
+		:uint,
+		:uint
+	], :uint
+
 	#{ MF_xxx
 	MF_BYCOMMAND = 0x00000000
 	MF_BYPOSITION = 0x00000400
@@ -1284,6 +1382,79 @@ module WinGUI
 		:uint
 	], :uint
 
+	MIIM_STATE = 0x00000001
+	MIIM_ID = 0x00000002
+	MIIM_SUBMENU = 0x00000004
+	MIIM_CHECKMARKS = 0x00000008
+	MIIM_TYPE = 0x00000010
+	MIIM_DATA = 0x00000020
+	MIIM_STRING = 0x00000040
+	MIIM_BITMAP = 0x00000080
+	MIIM_FTYPE = 0x00000100
+
+	class MENUITEMINFO < FFI::Struct
+		extend Util::ScopedStruct
+
+		layout \
+			:cbSize, :uint,
+			:fMask, :uint,
+			:fType, :uint,
+			:fState, :uint,
+			:wID, :uint,
+			:hSubMenu, :pointer,
+			:hbmpChecked, :pointer,
+			:hbmpUnchecked, :pointer,
+			:dwItemData, :ulong,
+			:dwTypeData, :pointer,
+			:cch, :uint,
+			:hbmpItem, :pointer
+	end
+
+	attach_function :SetMenuItemInfo, :SetMenuItemInfoW, [
+		:pointer,
+		:uint,
+		:int,
+		MENUITEMINFO.by_ref(:in)
+	], :int
+
+	attach_function :GetMenuItemInfo, :GetMenuItemInfoW, [
+		:pointer,
+		:uint,
+		:int,
+		MENUITEMINFO.by_ref
+	], :int
+
+	#{ TPM_xxx
+	TPM_LEFTBUTTON = 0x0000
+	TPM_RIGHTBUTTON = 0x0002
+
+	TPM_LEFTALIGN = 0x0000
+	TPM_CENTERALIGN = 0x0004
+	TPM_RIGHTALIGN = 0x0008
+
+	TPM_TOPALIGN = 0x0000
+	TPM_VCENTERALIGN = 0x0010
+	TPM_BOTTOMALIGN = 0x0020
+
+	TPM_HORIZONTAL = 0x0000
+	TPM_VERTICAL = 0x0040
+
+	TPM_NONOTIFY = 0x0080
+	TPM_RETURNCMD = 0x0100
+
+	TPM_RECURSE = 0x0001
+	#}
+
+	attach_function :TrackPopupMenu, [
+		:pointer,
+		:uint,
+		:int,
+		:int,
+		:int,
+		:pointer,
+		RECT.by_ref(:in)
+	], :int
+
 	#{ Fxxx
 	FVIRTKEY = 1
 	FCONTROL = 0x08