fzeet 0.6.1 → 0.6.2

data/examples/UIRibbon/TabGroup.xml

@@ -0,0 +1,42 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<Application xmlns='http://schemas.microsoft.com/windows/2009/Ribbon'>
+	<Application.Commands>
+<Command Name='cmdAppMenu' />
+
+<Command Name='cmdQAT' />
+
+<Command Name='cmdTab1' LabelTitle='Tab1' />
+
+<Command Name='cmdTabGroup1' LabelTitle='TabGroup1' />
+
+<Command Name='cmdTabGroup1Tab1' LabelTitle='Tab1' />
+<Command Name='cmdTabGroup1Tab2' LabelTitle='Tab2' />
+	</Application.Commands>
+
+	<Application.Views>
+		<Ribbon>
+			<Ribbon.ApplicationMenu>
+<ApplicationMenu CommandName='cmdAppMenu'>
+
+</ApplicationMenu>
+			</Ribbon.ApplicationMenu>
+
+			<Ribbon.QuickAccessToolbar>
+<QuickAccessToolbar CommandName='cmdQAT'>
+
+</QuickAccessToolbar>
+			</Ribbon.QuickAccessToolbar>
+
+			<Ribbon.Tabs>
+<Tab CommandName='cmdTab1' />
+			</Ribbon.Tabs>
+
+			<Ribbon.ContextualTabs>
+<TabGroup CommandName='cmdTabGroup1'>
+	<Tab CommandName='cmdTabGroup1Tab1' />
+	<Tab CommandName='cmdTabGroup1Tab2' />
+</TabGroup>
+			</Ribbon.ContextualTabs>
+		</Ribbon>
+	</Application.Views>
+</Application>

data/examples/UIRibbon/Viewer.rbw

@@ -5,5 +5,5 @@ include Fzeet
 Application.name += " - #{name = ARGV[0] || 'Minimal'}.xml"
 
 Application.run { |window|
-	UIRibbon.new(window, name)
+	UIRibbon.new(window, name: name)
 }

data/lib/fzeet/Application.rb

@@ -12,10 +12,15 @@ module Fzeet
 		@accelerators = []
 		@dialogs = []
 		@images = {}
+		Fzeet.using(ScreenDC.new) { |dc|
+			@devcaps = {
+				logpixelsy: Windows.GetDeviceCaps(dc.handle, Windows::LOGPIXELSY)
+			}
+		}
 
 		class << self
 			attr_accessor :name, :version, :authors, :quitWhenMainWindowCloses
-			attr_reader :window, :accelerators, :dialogs, :images
+			attr_reader :window, :accelerators, :dialogs, :images, :devcaps
 		end
 
 		def self.window=(window)

data/lib/fzeet/Common.rb

@@ -153,6 +153,10 @@ module Fzeet
 		def rb; Point.new(self[:right], self[:bottom]) end
 	end
 
+	class LOGFONT
+		include Toggle
+	end
+
 	class Message < Windows::MSG
 		def get!(window = nil, msgFilterMin = 0, msgFilterMax = 0)
 			Windows.DetonateLastError(-1, :GetMessage, self, window && window.handle, msgFilterMin, msgFilterMax) != 0
@@ -299,6 +303,9 @@ module Fzeet
 		def color; Windows.GetTextColor(@handle) end
 		def color=(color) Windows.SetTextColor(@handle, color) end
 
+		def background; Windows.GetBkColor(@handle) end
+		def background=(background) Windows.SetBkColor(@handle, background) end
+
 		def fillRect(rect, brush) Windows.DetonateLastError(0, :FillRect, @handle, rect, brush.handle); self end
 
 		def text(text, rect, flags = 0) Windows.DetonateLastError(0, :DrawText, @handle, text, -1, rect, Fzeet.flags(flags, :dt_)); self end
@@ -328,4 +335,14 @@ module Fzeet
 
 		def dispose; Windows.ReleaseDC(@window.handle, @handle); detach end
 	end
+
+	class ScreenDC < Handle
+		include DCMethods
+
+		def initialize
+			@handle = Windows.DetonateLastError(FFI::Pointer::NULL, :GetDC, nil); attach
+		end
+
+		def dispose; Windows.ReleaseDC(nil, @handle); detach end
+	end
 end

data/lib/fzeet/Dialog/ShellFileDialog.rb

@@ -10,78 +10,38 @@ module Fzeet
 			result
 		end
 
-		def path
-			result = nil
-
+		def item
 			FFI::MemoryPointer.new(:pointer) { |psi|
 				next unless GetResult(psi) == Windows::S_OK
 
 				si = Windows::ShellItem.new(psi.read_pointer)
 
 				begin
-					FFI::MemoryPointer.new(:pointer) { |pwcs|
-						next unless si.GetDisplayName(Windows::SIGDN_FILESYSPATH, pwcs) == Windows::S_OK
-
-						wcs = pwcs.read_pointer
-
-						begin
-							result = Windows.WCSTOMBS(wcs)
-						ensure
-							Windows.CoTaskMemFree(wcs)
-						end
-					}
+					yield si
 				ensure
 					si.Release
 				end
 			}
-
-			result
 		end
 
-		def paths
-			result = []
-
+		def items
 			FFI::MemoryPointer.new(:pointer) { |psia|
 				next unless GetResults(psia) == Windows::S_OK
 
 				sia = Windows::ShellItemArray.new(psia.read_pointer)
 
 				begin
-					FFI::MemoryPointer.new(:ulong) { |pc|
-						next unless sia.GetCount(pc) == Windows::S_OK
-
-						pc.read_long.times { |i|
-							FFI::MemoryPointer.new(:pointer) { |psi|
-								next unless sia.GetItemAt(i, psi) == Windows::S_OK
-
-								si = Windows::ShellItem.new(psi.read_pointer)
-
-								begin
-									FFI::MemoryPointer.new(:pointer) { |pwcs|
-										next unless si.GetDisplayName(Windows::SIGDN_FILESYSPATH, pwcs) == Windows::S_OK
-
-										wcs = pwcs.read_pointer
-
-										begin
-											result << Windows.WCSTOMBS(wcs)
-										ensure
-											Windows.CoTaskMemFree(wcs)
-										end
-									}
-								ensure
-									si.Release
-								end
-							}
-						}
-					}
+					yield sia
 				ensure
 					sia.Release
 				end
 			}
-
-			result
 		end
 
+		def path; item { |si| return si.path } end
+
+		def paths; items { |sia| return sia.map(&:path) } end
+
 		def show(window = Application.window)
 			DialogResult.new((Show(window.handle) == Windows::S_OK) ? Windows::IDOK : Windows::IDCANCEL)
 		end

data/lib/fzeet/UIRibbon.rb

@@ -7,6 +7,38 @@ module Fzeet
 
 			prop(*args)
 		end
+
+		def update(from)
+			case from
+			when Windows::LOGFONT
+				uiprop(:FontProperties_Family, Windows::PROPVARIANT[:wstring, from.face])
+				uiprop(:FontProperties_Size, Windows::PROPVARIANT[:decimal, from.size.round])
+				uiprop(:FontProperties_Bold, Windows::PROPVARIANT[:uint, (from.bold?) ? 2 : 1])
+				uiprop(:FontProperties_Italic, Windows::PROPVARIANT[:uint, (from.italic?) ? 2 : 1])
+				uiprop(:FontProperties_Underline, Windows::PROPVARIANT[:uint, (from.underline?) ? 2 : 1])
+				uiprop(:FontProperties_Strikethrough, Windows::PROPVARIANT[:uint, (from.strikeout?) ? 2 : 1])
+			else raise ArgumentError
+			end
+
+			self
+		end
+	end
+
+	class Windows::UISimplePropertySet
+		def get(k) Windows::PROPVARIANT.new.tap { |v| GetValue(k, v) } end
+
+		def prop(*args)
+			case args.length
+			when 1; get(*args)
+			else raise ArgumentError
+			end
+		end
+
+		def uiprop(*args)
+			args[0] = Windows.const_get("UI_PKEY_#{args[0]}")
+
+			prop(*args)
+		end
 	end
 
 	class UIRibbon
@@ -102,11 +134,63 @@ module Fzeet
 			}
 		end
 
-		def initialize(_window, name = Application.name, resname = 'APPLICATION_RIBBON')
+		class GalleryItem < Windows::UISimplePropertySetCallback
+			def initialize(label, categoryId = 0, image = nil)
+				@label, @categoryId, @image = label, categoryId, image
+
+				super()
+			end
+
+			attr_reader :label, :categoryId, :image
+
+			def GetValue(pkey, pvalue)
+				key, value = Windows::PROPERTYKEY.new(pkey), Windows::PROPVARIANT.new(pvalue)
+
+				case key
+				when Windows::UI_PKEY_CategoryId
+					value.uint = @categoryId; Windows::S_OK
+				when Windows::UI_PKEY_Label
+					value.wstring = @label; Windows::S_OK
+				when Windows::UI_PKEY_ItemImage
+					FFI::MemoryPointer.new(:pointer) { |punk|
+						Windows::UIImageFromBitmap.new.CreateImage(PARGB32.new(@image).handle, Windows::UI_OWNERSHIP_TRANSFER, punk)
+
+						unk = Windows::Unknown.new(punk.read_pointer)
+						value.unknown = unk
+						unk.Release
+					}
+
+					Windows::S_OK
+				else
+					Windows::E_NOTIMPL
+				end
+			end
+		end
+
+		def initialize(_window, opts = {})
+			handlers = {}
+
+			opts.delete_if { |k, v|
+				next false unless v.kind_of?(Proc)
+
+				handlers[k] = v; true
+			}
+
+			_opts = {
+				name: Application.name,
+				resname: 'APPLICATION_RIBBON'
+			}
+			badopts = opts.keys - _opts.keys; raise "Bad option(s): #{badopts.join(', ')}." unless badopts.empty?
+			_opts.merge!(opts)
+
 			@creates = []
 			@destroys = []
 			@sizes = []
 			@executesAllVerbs = {}
+			@executesExecute = {}
+			@executesPreview = {}
+			@executesCancelPreview = {}
+			@updatesAllKeys = {}
 
 			@window = _window
 
@@ -124,6 +208,7 @@ module Fzeet
 				attr_reader :ribbon
 
 				def Execute(*args) ribbon.execute(*args); Windows::S_OK end
+				def UpdateProperty(*args) ribbon.update(*args); Windows::S_OK end
 			end
 
 			@uia = Windows::UIApplication.new
@@ -183,10 +268,18 @@ module Fzeet
 				def OnCreateUICommand(*args) uich.QueryInterface(uich.class::IID, args[-1]); Windows::S_OK end
 			end
 
+			@hdll = Windows.LoadRibbonDll(_opts[:name])
+
+			handlers.each { |k, v|
+				k[1] = Object.const_get(k[1]) if k.length > 1
+
+				on(*k, &v)
+			}
+
 			@uif = Windows::UIFramework.new
 
 			uif.Initialize(window.handle, uia)
-			uif.LoadUI(@hdll = Windows.LoadRibbonDll(name), "#{resname}\0".encode('utf-16le'))
+			uif.LoadUI(@hdll, "#{_opts[:resname]}\0".encode('utf-16le'))
 
 			window.on(:destroy) {
 				uich.Release
@@ -203,15 +296,28 @@ module Fzeet
 			args = {
 				commandId: commandId,
 				verb: verb,
-				key: key,
-				value: value,
-				props: props,
+				key: (key.null?) ? nil : Windows::PROPERTYKEY.new(key),
+				value: (value.null?) ? nil : Windows::PROPVARIANT.new(value),
+				props: (props.null?) ? nil : Windows::UISimplePropertySet.new(props),
 				ribbon: self,
 				sender: Command.new(self, commandId)
 			}
 
-			if @executesAllVerbs.include?(commandId)
-				@executesAllVerbs[commandId].each { |handler|
+			(handlers = @executesAllVerbs[commandId]) and handlers.each { |handler|
+				(handler.arity == 0) ? handler.call : handler.call(args)
+			}
+
+			case verb
+			when Windows::UI_EXECUTIONVERB_EXECUTE
+				(handlers = @executesExecute[commandId]) and handlers.each { |handler|
+					(handler.arity == 0) ? handler.call : handler.call(args)
+				}
+			when Windows::UI_EXECUTIONVERB_PREVIEW
+				(handlers = @executesPreview[commandId]) and handlers.each { |handler|
+					(handler.arity == 0) ? handler.call : handler.call(args)
+				}
+			when Windows::UI_EXECUTIONVERB_CANCELPREVIEW
+				(handlers = @executesCancelPreview[commandId]) and handlers.each { |handler|
 					(handler.arity == 0) ? handler.call : handler.call(args)
 				}
 			end
@@ -223,6 +329,33 @@ module Fzeet
 			self
 		end
 
+		def update(commandId, key, value, newValue)
+			args = {
+				commandId: commandId,
+				key: (key.null?) ? nil : Windows::PROPERTYKEY.new(key),
+				value: (value.null?) ? nil : Windows::PROPVARIANT.new(value),
+				newValue: (newValue.null?) ? nil : Windows::PROPVARIANT.new(newValue),
+				ribbon: self,
+				sender: Command.new(self, commandId)
+			}
+
+			(handlers = @updatesAllKeys[commandId]) and handlers.each { |handler|
+				(handler.arity == 0) ? handler.call : handler.call(args)
+			}
+
+			self
+		rescue
+			Fzeet.message %Q{#{$!}\n\n#{$!.backtrace.join("\n")}}, icon: :error
+
+			self
+		end
+
+		def invalidate(commandId, flags = Windows::UI_INVALIDATIONS_ALLPROPERTIES, key = nil)
+			@uif.InvalidateUICommand(commandId, flags, key)
+
+			self
+		end
+
 		def on(*args, &block)
 			case args.size
 			when 1
@@ -233,12 +366,46 @@ module Fzeet
 				when Integer; (@executesAllVerbs[args[0]] ||= []) << block
 				else raise ArgumentError
 				end
+			when 2
+				case args[0]
+				when /^execute$/i; (@executesExecute[args[1]] ||= []) << block
+				when /^preview$/i; (@executesPreview[args[1]] ||= []) << block
+				when /^cancelpreview$/i; (@executesCancelPreview[args[1]] ||= []) << block
+				when /^update$/i; (@updatesAllKeys[args[1]] ||= []) << block
+				else raise ArgumentError
+				end
 			else raise ArgumentError
 			end
 
 			self
 		end
 
+		def fontPropsUpdate(args)
+			return self unless args[:key] == Windows::UI_PKEY_FontProperties
+
+			args[:value].unknown { |current|
+				current.QueryInstance(Windows::PropertyStore) { |ps|
+					yield ps
+
+					args[:newValue].unknown = current
+				}
+			}
+
+			self
+		end
+
+		def fontPropsChanged(args)
+			return self unless args[:key] == Windows::UI_PKEY_FontProperties
+
+			args[:props].uiprop(:FontProperties_ChangedProperties).unknown { |changed|
+				changed.QueryInstance(Windows::PropertyStore) { |ps|
+					yield ps
+				}
+			}
+
+			self
+		end
+
 		def contextualUI(id, x, y)
 			uif.UseInstance(Windows::UIContextualUI, :GetView, id) { |view|
 				view.ShowAtLocation(x, y)

data/lib/fzeet/windows/com.rb

@@ -64,6 +64,8 @@ module Fzeet
 					}
 				}
 			end
+
+			def ==(other) Windows.memcmp(other, self, size) == 0 end
 		end
 
 		CLSCTX_INPROC_SERVER = 0x1

data/lib/fzeet/windows/common.rb

@@ -87,13 +87,17 @@ module Fzeet
 		def GET_Y_LPARAM(l) ((w = HIWORD(l)) > 0x7fff) ? w - 0x1_0000 : w end
 
 		def LPWSTR(s)
-			FFI::MemoryPointer.new(:uchar, (s.length + 2) * 2) { |p|
-				"#{s}\0".encode('utf-16le').each_byte.with_index { |b, i|
-					p.put_char(i, b)
+			p = FFI::MemoryPointer.new(:uchar, (s.length + 2) * 2)
 
-					yield p
-				}
-			}
+			"#{s}\0".encode('utf-16le').each_byte.with_index { |b, i| p.put_char(i, b) }
+
+			begin
+				yield p; return nil
+			ensure
+				p.free
+			end if block_given?
+
+			p
 		end
 
 		def WCSTOMBS(p)
@@ -172,6 +176,43 @@ module Fzeet
 				:lfQuality, :uchar,
 				:lfPitchAndFamily, :uchar,
 				:lfFaceName, [:char, 32]
+
+			def face; self[:lfFaceName].to_s end
+			def face=(face) self[:lfFaceName] = face end
+
+			def size; -Rational(self[:lfHeight] * 72, Application.devcaps[:logpixelsy]) end
+			def size=(size) self[:lfHeight] = -Windows.MulDiv((size * 10).to_i, Application.devcaps[:logpixelsy], 720) end
+
+			def bold?; self[:lfWeight] >= 700 end
+			def bold=(bold) self[:lfWeight] = (bold) ? 700 : 0 end
+
+			def italic?; self[:lfItalic] == 1 end
+			def italic=(italic) self[:lfItalic] = (italic) ? 1 : 0 end
+
+			def underline?; self[:lfUnderline] == 1 end
+			def underline=(underline) self[:lfUnderline] = (underline) ? 1 : 0 end
+
+			def strikeout?; self[:lfStrikeOut] == 1 end
+			def strikeout=(strikeout) self[:lfStrikeOut] = (strikeout) ? 1 : 0 end
+
+			def update(from)
+				case from
+				when PropertyStore
+					from.each { |k, v|
+						case k
+						when UI_PKEY_FontProperties_Family; self.face = v.wstring
+						when UI_PKEY_FontProperties_Size; self.size = v.decimal.to_f
+						when UI_PKEY_FontProperties_Bold; self.bold = v.uint == 2
+						when UI_PKEY_FontProperties_Italic; self.italic = v.uint == 2
+						when UI_PKEY_FontProperties_Underline; self.underline = v.uint == 2
+						when UI_PKEY_FontProperties_Strikethrough; self.strikeout = v.uint == 2
+						end
+					}
+				else raise ArgumentError
+				end
+
+				self
+			end
 		end
 
 		class SYSTEMTIME < FFI::Struct

data/lib/fzeet/windows/gdi.rb

@@ -13,6 +13,11 @@ module Fzeet
 		module_function \
 			:GetRValue, :GetGValue, :GetBValue, :RGB
 
+		LOGPIXELSX = 88
+		LOGPIXELSY = 90
+
+		attach_function :GetDeviceCaps, [:pointer, :int], :int
+
 		DEFAULT_GUI_FONT = 17
 
 		attach_function :GetStockObject, [:int], :pointer
@@ -46,6 +51,9 @@ module Fzeet
 		attach_function :GetTextColor, [:pointer], :ulong
 		attach_function :SetTextColor, [:pointer, :ulong], :ulong
 
+		attach_function :GetBkColor, [:pointer], :ulong
+		attach_function :SetBkColor, [:pointer, :ulong], :ulong
+
 		attach_function :MoveToEx, [:pointer, :int, :int, :pointer], :int
 		attach_function :LineTo, [:pointer, :int, :int], :int
 	end

data/lib/fzeet/windows/kernel.rb

@@ -84,5 +84,7 @@ module Fzeet
 		end
 
 		module_function :EnableVisualStyles
+
+		attach_function :MulDiv, [:int, :int, :int], :int
 	end
 end

data/lib/fzeet/windows/ole.rb

@@ -85,6 +85,8 @@ module Fzeet
 					key[:pid] = type
 				}
 			end
+
+			def ==(other) Windows.memcmp(other, self, size) == 0 end
 		end
 
 		class LARGE_INTEGER < FFI::Union
@@ -246,6 +248,38 @@ module Fzeet
 
 			def uint; raise 'Wrong type tag.' unless self[:vt] == VT_UI4; self[:uintVal] end
 			def uint=(uint) self[:vt] = VT_UI4; self[:uintVal] = uint end
+
+			def unknown
+				raise 'Wrong type tag.' unless self[:vt] == VT_UNKNOWN
+
+				yield Unknown.new(self[:punkVal])
+			ensure
+				Windows.PropVariantClear(self)
+			end
+
+			def unknown=(unknown) self[:vt] = VT_UNKNOWN; self[:punkVal] = unknown.pointer; unknown.AddRef end
+
+			def wstring; raise 'Wrong type tag.' unless self[:vt] == VT_LPWSTR; Windows.WCSTOMBS(self[:pwszVal]) end
+
+			def wstring=(string)
+				self[:vt] = VT_LPWSTR
+
+				FFI::MemoryPointer.new(:pointer) { |p|
+					Windows.DetonateHresult(:SHStrDup, string, p)
+
+					self[:pwszVal] = p.read_pointer
+				}
+			end
+
+			def decimal
+				raise 'Wrong type tag.' unless self[:vt] == VT_DECIMAL
+
+				Rational(self[:decVal][:Lo64], 10 ** self[:decVal][:scale]) + self[:decVal][:Hi32]
+			end
+
+			def decimal=(decimal) self[:vt] = VT_DECIMAL; self[:decVal][:Lo64] = decimal end
 		end
+
+		attach_function :PropVariantClear, [:pointer], :long
 	end
 end

data/lib/fzeet/windows/propsys.rb

@@ -18,10 +18,14 @@ module Fzeet
 		PropertyStore = COM::Instance[IPropertyStore]
 
 		class PropertyStore
-			def count; count = 0; FFI::MemoryPointer.new(:ulong) { |p| count = p.get_ulong(0) }; count end
+			include Enumerable
+
+			def count; FFI::MemoryPointer.new(:ulong) { |pc| GetCount(pc); return pc.get_ulong(0) } end
 			alias :size :count
 			alias :length :count
 
+			def key(i) PROPERTYKEY.new.tap { |k| GetAt(i, k) } end
+
 			# superclass.superclass is FFI::Struct, so do NOT touch [] and []=
 			def get(k) PROPVARIANT.new.tap { |v| GetValue(k, v) } end
 			def set(k, v) SetValue(k, v); self end
@@ -35,6 +39,8 @@ module Fzeet
 			end
 
 			def commit; Commit(); self end
+
+			def each; length.times { |i| v = get(k = key(i)); yield k, v }; self end
 		end
 	end
 end