fzeet 0.4.1 → 0.4.2

data/examples/Command.rbw

@@ -3,20 +3,18 @@ require 'fzeet'
 include Fzeet
 
 Application.run { |window|
-	window.
-		on(:create) {
-			window.menu = Menu.new.
-				append(:popup, 'Menu&1', PopupMenu.new.
-					append(:string, "Item&1\tAlt+I", :item1)
-				)
+	window.menu = Menu.new.
+		append(:popup, 'Menu&1', PopupMenu.new.
+			append(:string, "Item&1\tAlt+I", :item1)
+		)
 
-			Application.accelerators << AcceleratorTable.new(
-				[:alt, :I, :item1]
-			)
+	Application.accelerators << AcceleratorTable.new(
+		[:alt, :I, :item1]
+	)
 
-			Button.new(window, :button1, x: 10, y: 10, width: 76, height: 24)
-		}.
+	Button.new(window, :button1, x: 10, y: 10, width: 76, height: 24)
 
+	window.
 		on(:command, :item1) {
 			message 'on(:command, :item1)'
 

data/examples/Control/Button.rbw

@@ -0,0 +1,19 @@
+require 'fzeet'
+
+include Fzeet
+
+Application.run { |window|
+	Button.new(window, :button1, x: 10, y: 10, width: 76, height: 24) {
+		message 'on(:command, :button1)'
+	}
+
+	Button.new(window, :button2, x: 10, y: 40, width: 76, height: 24, style: :notify,
+		doubleclicked: -> { message 'on(:command, :button2, :doubleclicked)' }
+	)
+
+	Button.new(window, :button3, x: 10, y: 70, width: 76, height: 24, style: :splitbutton)
+
+	window[:button3].on(:dropdown) {
+		message 'on(:notify, :button3, :dropdown)'
+	}
+}

data/examples/Dialog.rbw

@@ -0,0 +1,43 @@
+require 'fzeet'
+
+include Fzeet
+
+Application.run { |window|
+	Button.new(window, :modeless, x: 10, y: 10, width: 76, height: 24) {
+		Dialog.new(window, caption: 'Modeless', x: 100, y: 100) { |args|
+			dialog = args[:window]
+
+			Button.new(dialog, :ok, x: 228, y: 242, width: 76, height: 24) {
+				dialog.dispose; window[:modeless].toggle(:enabled)
+			}
+
+			Button.new(dialog, :cancel, x: 308, y: 242, width: 76, height: 24) {
+				dialog.dispose; window[:modeless].toggle(:enabled)
+			}
+
+			Button.new(dialog, :button1, x: 10, y: 10, width: 76, height: 24) {
+				dialog.message 'clicked'
+			}
+		}
+
+		window[:modeless].toggle(:enabled)
+	}
+
+	Button.new(window, :modal, x: 90, y: 10, width: 76, height: 24) {
+		message(Dialog.new(window, modal: true, caption: 'Modal', x: 150, y: 150) { |args|
+			dialog = args[:window]
+
+			Button.new(dialog, :ok, x: 228, y: 242, width: 76, height: 24) {
+				dialog.end(:ok)
+			}
+
+			Button.new(dialog, :cancel, x: 308, y: 242, width: 76, height: 24) {
+				dialog.end(:cancel)
+			}
+
+			Button.new(dialog, :button1, x: 10, y: 10, width: 76, height: 24) {
+				dialog.message 'clicked'
+			}
+		}.result.ok?)
+	}
+}

data/examples/DialogApplication.rbw

@@ -0,0 +1,22 @@
+require 'fzeet'
+
+include Fzeet
+
+Dialog.new(nil, modal: true, style: [:overlappedwindow, :center]) { |args|
+	dialog = Application.window = args[:window]
+
+	dialog.menu = Menu.new.
+		append(:popup, 'Menu&1', PopupMenu.new.
+			append(:string, 'Item&1', :item1).
+			append(:separator).
+			append(:string, 'E&xit', :exit)
+		)
+
+	Button.new(dialog, :button1, caption: '&Button1', x: 10, y: 10, width: 76, height: 24)
+
+	dialog.
+		on(:command, :exit) { dialog.end(:ok) }.
+		on(:command, :cancel) { dialog.end(:cancel) if question('Close?').yes? }.
+		on(:command, :item1) { message 'on(:command, :item1)' }.
+		on(:command, :button1) { message 'on(:command, :button1)' }
+}

data/examples/Inheritance.rbw

@@ -0,0 +1,44 @@
+require 'fzeet'
+
+include Fzeet
+
+class Window1 < Window
+	message <<-MSG
+class: #{self}
+superclass: #{self.superclass}
+WindowClass: #{self::WindowClass.name}
+WindowClass.prototype: #{self::WindowClass.prototype.name}
+	MSG
+
+	def initialize
+		super
+
+		self.menu = Menu.new.
+			append(:popup, 'Menu&1', PopupMenu.new.
+				append(:string, 'Item&1', :item1)
+			)
+
+		on(:command, :item1, &method(:onItem1))
+	end
+
+	def onItem1(args)
+		message "Window1##{__method__}"
+	end
+end
+
+class Window2 < Window1
+	message <<-MSG
+class: #{self}
+superclass: #{self.superclass}
+WindowClass: #{self::WindowClass.name}
+WindowClass.prototype: #{self::WindowClass.prototype.name}
+	MSG
+
+	def onItem1(args)
+		message "Window2##{__method__}"
+
+		super
+	end
+end
+
+Application.run(Window2.new)

data/examples/Inheritance1.rbw

@@ -0,0 +1,43 @@
+require 'fzeet'
+
+include Fzeet
+
+Window1 = Window['X.Window1',
+	background: SystemBrush.new(:appworkspace)
+]
+
+class Window1
+	message <<-MSG
+class: #{self}
+superclass: #{self.superclass}
+WindowClass: #{self::WindowClass.name}
+WindowClass.prototype: #{self::WindowClass.prototype.name}
+	MSG
+
+	def initialize(opts = {})
+		(opts[:style] ||= []) << :hscroll
+
+		super
+	end
+end
+
+Window2 = Window1['X.Window2',
+	cursor: SystemCursor.new(:hand)
+]
+
+class Window2
+	message <<-MSG
+class: #{self}
+superclass: #{self.superclass}
+WindowClass: #{self::WindowClass.name}
+WindowClass.prototype: #{self::WindowClass.prototype.name}
+	MSG
+
+	def initialize(opts = {})
+		(opts[:style] ||= []) << :vscroll
+
+		super
+	end
+end
+
+Application.run(Window2.new)

data/examples/LifeCycle.rbw

@@ -2,7 +2,7 @@ require 'fzeet'
 
 include Fzeet
 
-Application.run { |window|
+Application.run(deferCreateWindow: true) { |window|
 	window.
 		on(:create) { |args|
 			args[:result] = -1 if question('Create?').no?

data/examples/LifeCycle2.rbw

@@ -1,6 +1,6 @@
 require 'fzeet'
 
-Fzeet::Application.run do |window|
+Fzeet::Application.run(deferCreateWindow: true) do |window|
 	window.on :create do |args|
 		args[:result] = -1 if Fzeet.question('Create?').no?
 	end

data/examples/LifeCycleNC.rbw

@@ -4,7 +4,7 @@ include Fzeet
 
 Application.quitWhenMainWindowCloses = false
 
-Application.run { |window|
+Application.run(deferCreateWindow: true) { |window|
 	window.
 		on(:nccreate) { |args|
 			args[:result] = 0 if question('NCCreate?').no?

data/examples/Menu/ContextMenu.rbw

@@ -0,0 +1,15 @@
+require 'fzeet'
+
+include Fzeet
+
+Application.run { |window|
+	window.
+		on(:contextmenu) { |args| using(
+			PopupMenu.new.
+				append(:string, 'Item&1', :item1)
+		) { |popup|
+			popup.track(window, args[:x], args[:y])
+		}}.
+
+		on(:command, :item1) { message 'on(:command, :item1)' }
+}

data/examples/Menu/Menu.rbw

@@ -3,33 +3,30 @@ require 'fzeet'
 include Fzeet
 
 Application.run { |window|
-	window.
-		on(:create) {
-			window.menu = Menu.new.
-				append(:popup, 'Menu&1', PopupMenu.new.
-					append(:string, 'Item&1', :item1).
-					append([:string, :grayed], 'Item&2', :item2).
-					append([:string, :checked], 'Item&3', :item3).
+	window.menu = Menu.new.
+		append(:popup, 'Menu&1', PopupMenu.new.
+			append(:string, 'Item&1', :item1).
+			append([:string, :grayed], 'Item&2', :item2).
+			append([:string, :checked], 'Item&3', :item3).
 
-					append(:separator).
+			append(:separator).
 
-					append([:string, :usecheckbitmaps, :checked], 'Item&4', :item4).
-					append([:string, :usecheckbitmaps], 'Item&5', :item5).
+			append([:string, :radiocheck, :checked], 'Item&4', :item4).
+			append([:string, :radiocheck], 'Item&5', :item5).
 
-					append(:separator).
+			append(:separator).
 
-					append(:popup, 'Menu&2', PopupMenu.new.
-						append([:string, :usecheckbitmaps, :checked], 'Item&6', :item6).
-						append([:string, :usecheckbitmaps], 'Item&7', :item7)
-					)
-				).
+			append(:popup, 'Menu&2', PopupMenu.new.
+				append([:string, :radiocheck, :checked], 'Item&6', :item6).
+				append([:string, :radiocheck], 'Item&7', :item7)
+			)
+		).
 
-				append(:string, 'Item&8', :item8).
+		append(:string, 'Item&8', :item8).
 
-				append([:popup, :rightjustify], 'Menu&3', PopupMenu.new.
-					append(:string, 'Item&9', :item9)
-				)
-		}
+		append([:popup, :rightjustify], 'Menu&3', PopupMenu.new.
+			append(:string, 'Item&9', :item9)
+		)
 
 	window.
 		on(:command, :item1) { window.menu[:item2].toggle(:enabled) }.
@@ -44,5 +41,17 @@ Application.run { |window|
 		window.on(:command, id) { window.menu[id].select(:item6, :item7) }
 	}
 
-	window.on(:command, :item8) { message 'on(:command, :item8)' }
+	window.
+		on(:command, :item8) { message 'on(:command, :item8)' }.
+
+		on(:command, :item9) {
+			message <<-MSG
+window.menu[:item2].enabled? - #{window.menu[:item2].enabled?}
+window.menu[:item3].checked? - #{window.menu[:item3].checked?}
+window.menu[:item4].checked? - #{window.menu[:item4].checked?}
+window.menu[:item5].checked? - #{window.menu[:item5].checked?}
+window.menu[:item6].checked? - #{window.menu[:item6].checked?}
+window.menu[:item7].checked? - #{window.menu[:item7].checked?}
+			MSG
+		}
 }

data/examples/Menu/MenuPARGB32.rbw

@@ -0,0 +1,22 @@
+require 'fzeet'
+
+include Fzeet
+
+Application.run { |window|
+	images = {
+		cut: PARGB32.new('../res/edit-cut.bmp'),
+		copy: PARGB32.new('../res/edit-copy.bmp'),
+		paste: PARGB32.new('../res/edit-paste.bmp')
+	}
+
+	window.menu = Menu.new.
+		append(:popup, '&Edit', PopupMenu.new.
+			append(:string, 'Cu&t', :cut).
+			append(:string, '&Copy', :copy).
+			append(:string, '&Paste', :paste)
+		)
+
+	window.menu.images = images
+
+	window.on(:destroy) { images.values.each(&:dispose) }
+}

data/examples/MinimalOpts.rbw

@@ -0,0 +1,7 @@
+require 'fzeet'
+
+include Fzeet
+
+Application.run(width: 400, height: 300) { |window|
+
+}

data/examples/Scribble.rbw

@@ -0,0 +1,26 @@
+require 'fzeet'
+
+include Fzeet
+
+Application.run { |window|
+	dc = nil
+
+	window.
+		on(:lbuttondown) { |args|
+			window.capture = true
+			dc = ClientDC.new(window)
+
+			dc.move(args[:x], args[:y])
+		}.
+
+		on(:lbuttonup) {
+			dc.dispose; dc = nil
+			window.capture = false
+		}.
+
+		on(:mousemove) { |args|
+			next unless window.capture?
+
+			dc.line(args[:x], args[:y])
+		}
+}

data/lib/fzeet/Accelerator.rb

@@ -13,7 +13,7 @@ module Fzeet
 				args.each_with_index { |data, i|
 					accel = Windows::ACCEL.new(paccels + i * Windows::ACCEL.size)
 
-					accel[:fVirt] = [*data[0]].inject(0) { |flags, flag| flags |= Windows.const_get("F#{flag.upcase}") }
+					accel[:fVirt] = Fzeet.flags(data[0], :f)
 					accel[:fVirt] |= Windows::FVIRTKEY if data[1].kind_of?(Symbol)
 					accel[:key] = data[1].to_s.ord
 					accel[:cmd] = Command[data[2]]

data/lib/fzeet/Application.rb

@@ -2,7 +2,7 @@ require_relative 'common'
 
 module Fzeet
 	class Application
-		@name = File.basename($0, '*.rbw')
+		@name = File.basename($0, '.rbw')
 		@version = '0.1.0'
 		@authors = []
 
@@ -10,14 +10,32 @@ module Fzeet
 
 		@window = nil
 		@accelerators = []
+		@dialogs = []
 
 		class << self
 			attr_accessor :name, :version, :authors, :quitWhenMainWindowCloses
-			attr_reader :window, :accelerators
+			attr_reader :window, :accelerators, :dialogs
 		end
 
-		def self.run(window = nil, &block)
-			return 0 if (@window = window || Window.new(&block)).handle.null?
+		def self.window=(window)
+			raise 'Application.window already set.' if @window
+
+			@window = window
+		end
+
+		def self.run(windowOrOpts = {}, &block)
+			@window = case windowOrOpts
+			when Window; windowOrOpts.tap { |window| block.call(window) if block }
+			when Hash
+				if windowOrOpts[:deferCreateWindow].tap { windowOrOpts.delete_if { |k, v| k == :deferCreateWindow } }
+					Window.new(windowOrOpts, &block)
+				else
+					Window.new(windowOrOpts).tap { |window| block.call(window) if block }
+				end
+			else raise ArgumentError
+			end
+
+			return 0 if window.handle.null?
 
 			@window.on(:destroy) { quit } if @quitWhenMainWindowCloses
 
@@ -27,7 +45,8 @@ module Fzeet
 
 			while msg.get!
 				msg.translate.dispatch unless
-					accelerators.any? { |table| table.translate?(msg, @window) }
+					accelerators.any? { |table| table.translate?(msg, @window) } ||
+					dialogs.any? { |dialog| dialog.dlgmsg?(msg) }
 			end
 
 			msg[:wParam]

data/lib/fzeet/Control.rb

@@ -14,14 +14,24 @@ module Fzeet
 			at_exit { Font.dispose }
 		}
 
+		def self.crackNotification(args) end
+
 		def initialize(className, parent, id, opts = {})
 			@parent = parent
 			@id = Command[id]
 
+			handlers = {}
+
+			opts.delete_if { |k, v|
+				next false unless v.kind_of?(Proc)
+
+				handlers[k] = v; true
+			}
+
 			_opts = {
 				xstyle: [],
 				caption: id.capitalize,
-				style: [:child, :visible],
+				style: [],
 				x: Windows::CW_USEDEFAULT,
 				y: Windows::CW_USEDEFAULT,
 				width: Windows::CW_USEDEFAULT,
@@ -30,9 +40,9 @@ module Fzeet
 			badopts = opts.keys - _opts.keys; raise "Bad option(s): #{badopts.join(', ')}." unless badopts.empty?
 			_opts.merge!(opts)
 
-			_opts[:xstyle] = _opts[:xstyle].inject(0) { |flags, xstyle| flags |= Windows.const_get("WS_EX_#{xstyle.upcase}") }
+			_opts[:xstyle] = Fzeet.flags(_opts[:xstyle], *self.class::Prefix[:xstyle])
 			_opts[:caption] = _opts[:caption].to_s
-			_opts[:style] = _opts[:style].inject(0) { |flags, style| flags |= Windows.const_get("WS_#{style.upcase}") }
+			_opts[:style] = Fzeet.flags([:child, :visible, :tabstop], :ws_) | Fzeet.flags(_opts[:style], *self.class::Prefix[:style])
 
 			@handle = Windows.DetonateLastError(FFI::Pointer::NULL, :CreateWindowEx,
 				_opts[:xstyle], className, _opts[:caption], _opts[:style],
@@ -43,6 +53,8 @@ module Fzeet
 			attach
 
 			sendmsg(:setfont, Font.handle, 1)
+
+			handlers.each { |k, v| on(k, &v) }
 		end
 
 		attr_reader :parent, :id
@@ -51,10 +63,27 @@ module Fzeet
 	end
 
 	class Button < Control
+		Prefix = {
+			xstyle: [:ws_ex_],
+			style: [:bs_, :ws_],
+			message: [:bm_, :bcm_, :ccm_, :wm_],
+			notification: [:bn_, :bcn_, :nm_]
+		}
+
 		def initialize(parent, id, opts = {}, &block)
 			super('Button', parent, id, opts)
 
 			@parent.on(:command, @id, &block) if block
 		end
+
+		def on(notification, &block)
+			if (notification = Fzeet.constant(notification, *self.class::Prefix[:notification])) < Windows::BCN_LAST
+				@parent.on(:command, @id, notification, &block)
+			else
+				@parent.on(:notify, @id, notification, &block)
+			end
+
+			self
+		end
 	end
 end

data/lib/fzeet/Menu.rb

@@ -43,6 +43,38 @@ module Fzeet
 
 			self
 		end
+
+		def info(mask)
+			Windows.DetonateLastError(0, :GetMenuItemInfo,
+				@menu.handle,
+				@id,
+				0,
+				info = Windows::MENUITEMINFO.new.tap { |mii|
+					mii[:cbSize] = mii.size
+					mii[:fMask] = Fzeet.constant(mask, :miim_)
+				}
+			)
+
+			info
+		end
+
+		def info=(mii)
+			Windows.DetonateLastError(0, :SetMenuItemInfo,
+				@menu.handle,
+				@id,
+				0,
+				mii.tap { mii[:cbSize] = mii.size }
+			)
+		end
+
+		def image; (Handle.instance?(handle = info(:bitmap)[:hbmpItem])) ? Handle.instance(handle) : nil end
+
+		def image=(image)
+			self.info = Windows::MENUITEMINFO.new.tap { |mii|
+				mii[:fMask] = Windows::MIIM_BITMAP
+				mii[:hbmpItem] = image.handle
+			}
+		end
 	end
 
 	module MenuMethods
@@ -53,7 +85,7 @@ module Fzeet
 		def append(flags, item = nil, id = 0)
 			Windows.DetonateLastError(0, :AppendMenu,
 				@handle,
-				[*flags].inject(0) { |flags, flag| flags |= Windows.const_get("MF_#{flag.upcase}") },
+				Fzeet.flags(flags, :mf_, :mft_, :mfs_),
 				case id
 				when Integer; id
 				when Symbol; Command[id]
@@ -65,6 +97,8 @@ module Fzeet
 
 			self
 		end
+
+		def images=(images) images.each { |id, image| self[id].image = image } end
 	end
 
 	class Menu < Handle
@@ -93,5 +127,7 @@ module Fzeet
 		attr_reader :submenus
 
 		def dispose; Windows.DestroyMenu(@handle); rdetach end
+
+		def track(window, x, y, flags = 0) Windows.TrackPopupMenu(@handle, Fzeet.flags(flags, :tpm_), x, y, 0, window.handle, nil); self end
 	end
 end