luikore-cici 0.1.2 → 0.1.3

data/lib/cici/config.rb

@@ -1,6 +1,5 @@
 # coding: utf-8
-module Cici
-  Config = Object.new
+class Cici
 
   ANSI_CHARSET            = 0
   DEFAULT_CHARSET         = 1
@@ -11,16 +10,7 @@ module Cici
   GB2312_CHARSET          = 134
   CHINESEBIG5_CHARSET     = 136
 
-  KEYMAP = {'LEFT'=>37,'UP'=>38,'RIGHT'=>39,'DOWN'=>40,
-        'PAGE UP'=>33,'PAGE DOWN'=>34,'END'=>35,'HOME'=>36,
-        '`'=>192,'-'=>189,'='=>187,'BACKSPACE'=>8,
-        '['=>219,']'=>221,'\\'=>220,
-        ';'=>186,'\''=>222,'ENTER'=>13,
-        ','=>188,'.'=>190,'/'=>191,
-        'F1'=>112,'F2'=>113,'F3'=>114,'F4'=>115,'F5'=>116,'F6'=>117,'F7'=>118,'F8'=>119,'F9'=>120,'F10'=>121,
-        'PRINT SCREEN'=>44,'PAUSE'=>19,'INSERT'=>45,'DELETE'=>46
-  }
-
+  Config = Object.new
   class << Config
   	@@config = {
 	    :default_font => Font['宋体', 12, '', GB2312_CHARSET],
@@ -40,5 +30,10 @@ module Cici
 	  def [] k
 	    @@config[k]
 	  end
+
+    def []= k, v
+      @@config[k] = v
+    end
   end
+
 end

data/lib/cici/dlg.rb

@@ -1,24 +1,24 @@
 # coding: utf-8
-module Cici
-  module View
-    def choose_file filter = nil
-      arg = "All (*.*)\0*.*\0"
-      if filter.is_a? Hash
-        arg = filter.map do |(k, v)|
+class Cici
+  def choose_file filter = nil
+    arg = "All (*.*)\0*.*\0"
+    if filter.is_a? Hash
+      arg = filter.map do |(k, v)|
           "#{k} (#{v})\0#{v}\0"
-        end.join
-      end
-      Cici.choose_file "#{arg}\0"
+      end.join
     end
+    _choose_file "#{arg}\0"
+  end
 
-    def save_file filter = nil
-      arg = "All (*.*)\0*.*\0"
-      if filter.is_a? Hash
-        arg = filter.map do |(k, v)|
+  def save_file filter = nil
+    arg = "All (*.*)\0*.*\0"
+    if filter.is_a? Hash
+      arg = filter.map do |(k, v)|
           "#{k} (#{v})\0#{v}\0"
-        end.join
-      end
-      Cici.save_file "#{arg}\0"
+      end.join
     end
+    _save_file "#{arg}\0"
   end
+
+  private :_choose_file, :_save_file
 end

data/lib/cici/element.rb

@@ -1,8 +1,9 @@
 # Coding: utf-8
-module Cici
+class Cici
   class ElementBase
     def parent= p
       @parent.children.delete self
+      # TODO deal with pool allocation issues
       self._parent = p
       @parent = p
       p.children << self
@@ -11,38 +12,3 @@ module Cici
   end
 end
 
-module Cici
-  module View
-    def button txt, sz=nil, &block
-      b = Button.create nil, txt.toString, 0
-      b.onclick = block if block
-      b.size = sz if sz.is_a? Array
-      b
-    end
-
-    # BS_AUTOCHECKBOX
-    def checkbox &block
-      b = Button.create nil, '', 3
-      b.onclick = block if block
-      b
-    end
-
-    def text txt, font = nil
-      font = nil unless font.is_a? FontClass
-      Text.create nil, txt.toString, font
-    end
-
-    def image path, sz = nil
-      x, y = nil, nil
-      if sz.is_a? Array
-        x, y = *sz
-      end
-      Image.create nil, path, x, y
-    end
-
-    def edit sz = nil
-      sz = [200, 28] unless (sz.is_a? Array)
-      Edit.create nil, sz[0], sz[1], nil
-    end
-  end
-end

data/lib/cici/keymap.rb

@@ -1,23 +1,47 @@
 # coding: utf-8
-module Cici
-  module View
-    def keymap char, *mods, &block
-      modnum = 0
-      mods.each do |mod|
-        modnum |= 1 if mod == :shift
-        modnum |= 2 if mod == :ctrl
-        modnum |= 4 if mod == :alt
-      end
-      charnum = nil
-      if char.is_a? Fixnum
-        charnum = char.to_i
-      else
-        charnum = Cici::KEYMAP[char]
-        charnum ||= char.upcase.ord
-      end
-      raise 'char not valid' unless charnum
-      Cici.register_key charnum, modnum, block
+class Cici
+
+  KEYMAP = {
+    'LEFT'=>37,'UP'=>38,'RIGHT'=>39,'DOWN'=>40,
+
+    'PAGE UP'=>33,'PAGE DOWN'=>34,'END'=>35,'HOME'=>36,
+    'PAGEUP'=>33,'PAGEDOWN'=>34,'PGUP'=>33,'PGDN'=>34, # fuzzy alias
+
+    'F1'=>112,'F2'=>113,'F3'=>114,'F4'=>115,'F5'=>116,'F6'=>117,'F7'=>118,'F8'=>119,'F9'=>120,'F10'=>121,
+
+    'PRINT SCREEN'=>44,'PAUSE'=>19,'INSERT'=>45,'DELETE'=>46,
+    'PRTSC'=>44,'PRINTSCR'=>44,'INS'=>45,'DEL'=>46, # fuzzy alias
+
+    '`'=>192,'-'=>189,'='=>187,'BACKSPACE'=>8,'BS'=>8,
+    '['=>219,']'=>221,'\\'=>220,
+    ';'=>186,'\''=>222,'ENTER'=>13,'RETURN'=>13,
+    ','=>188,'.'=>190,'/'=>191,
+
+    'CAPS LOCK'=>20,'CAPSLOCK'=>20,'TAB'=>9,
+    'WIN'=>91,'WINDOWS'=>91,'CONTEXTMENU'=>93,
+  }
+  
+  def keymap char, *mods, &block
+    modnum = 0
+    mods.each do |mod|
+      modnum |= 1 if mod == :shift
+      modnum |= 2 if mod == :ctrl
+      modnum |= 4 if mod == :alt
+    end
+    charnum = nil
+    if char.is_a? Fixnum
+      charnum = char.to_i
+    else
+      charnum = KEYMAP[char]
+      charnum ||= char.upcase.ord
     end
+    raise 'char not valid' unless charnum
+    register_key charnum, modnum, block
   end
+
+  def ctrl_key char, block
+    keymap char, :ctrl, &block
+  end
+
 end
 

data/lib/cici/list.rb

@@ -1,5 +1,5 @@
 # Coding: utf-8
-module Cici
+class Cici
   module ListBase
     def items= args
       args.each do |e|
@@ -21,15 +21,3 @@ module Cici
   end
 end
 
-module Cici
-  module View
-    def listbox sz
-      ListBox.create(nil, sz[0].to_i, sz[1].to_i)
-    end
-
-    def droplist sz = nil
-      sz = [200, 28] unless (sz.is_a? Array)
-      DropList.create(nil, sz[0].to_i, sz[1].to_i)
-    end
-  end
-end

data/lib/cici/scintilla.rb

@@ -1,23 +1,6 @@
-module Cici
+class Cici
   class Scintilla
 
-    # set all font to f
-    def font= f
-      style_set_default_font f
-      @font = f
-    end
-    attr_reader :font
-
-    # ------------------------------------------------------------------------------
-    # events
-
-    # event binding example
-    #   @s.onchar  = proc do |sci, lparam|
-    #     scn = Cici::Scintilla.scn lparam
-    #     puts scn.ch.chr 'utf-8'
-    #   end
-    attr_accessor :onstyle
-
     # called when an indentation is needed
     # lineno: current line number
     def onindentneeded lineno
@@ -46,10 +29,3 @@ module Cici
   end # class Scintilla
 end
 
-module Cici
-  module View
-    def scintilla sz
-      Scintilla.create nil, sz[0], sz[1]
-    end
-  end
-end

data/lib/cici/support.rb

@@ -11,13 +11,6 @@ class String
   end
 end
 
-# TODO not used yet
-class Fixnum
-  def percent
-    @percent = true
-  end
-end
-
 Size = Object.new
 def Size.[] x, y
   [x, y]
@@ -52,7 +45,7 @@ def Font.[] face, sz, style = '', charset = 0
   else
     @mem[[face, sz, style, charset]] =
       Cici::FontClass.create face.toString,
-      sz, (style ? style.downcase : ''), charset
+        sz, (style ? style.downcase : ''), charset
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: luikore-cici
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - luikore
@@ -32,7 +32,6 @@ files:
 - lib/cici/element.rb
 - lib/cici/keymap.rb
 - lib/cici/list.rb
-- lib/cici/menu.rb
 - lib/cici/mingw32
 - lib/cici/mingw32/ext.so
 - lib/cici/mswin32_90
@@ -41,8 +40,6 @@ files:
 - lib/cici/scintilla.rb
 - lib/cici/support.rb
 - lib/cici.rb
-- examples/button.rb
-- examples/calculator.rb
 - examples/cici.rb
 - examples/Collective Intelligence.png
 - examples/common_dialogs.rb
@@ -60,7 +57,6 @@ files:
 - examples/regexp_test.rb
 - examples/scintilla.rb
 - examples/style.rb
-- examples/tab.rb
 - examples/timer.rb
 has_rdoc: false
 homepage: http://wiki.github.com/luikore/cici

data/examples/button.rb

@@ -1,11 +0,0 @@
-require 'cici.rb'
-include Cici::View
-
-view [300, 80] do
-  @cb = checkbox
-  text 'checkbox'
-
-  button 'see if checked' do
-    alert "checked = #{@cb.checked ? 'true' : 'false'}"
-  end
-end

data/examples/calculator.rb

@@ -1,43 +0,0 @@
-require 'cici.rb'
-include Cici::View
-
-def calculate txt 
-  (eval txt).to_s
-rescue Exception => ex
-  ex.message
-end
-
-def calc_button x
-  b = button x
-  b.onclick = proc do |this|
-	@edt.text = @edt.text + x
-	@edt.focus
-  end
-  b
-end
-
-view [200, 200] do
-  paint [200, 90] do
-    (0..9).each do |i|
-	  br if (i == 4 or i == 8)
-      num = i.to_s
-      calc_button num
-    end
-	button 'C' do
-	  @edt.text = ''
-	end
-  end
-  br
-  paint [200, 30] do
-    %w[+ - * /].each do |op|
-      calc_button op
-    end
-	button('=').onclick = proc do |this|
-	  @edt.text = calculate @edt.text
-	  @edt.focus
-	end
-  end
-  br
-  @edt = edit [180, 20]
-end
-

data/examples/tab.rb

@@ -1,21 +0,0 @@
-require 'cici'
-include Cici::View
-
-view [200, 250] do
-  @t = paint [170, 170], :layout => :tab do
-  end
-
-  @t['one'] = paint [170, 170] do
-    button 'one inside'
-  end
-
-  @t['two'] = paint [170, 170] do
-    button 'two inside'
-  end
-
-  @t['three'] = paint [170, 170] do
-    button 'three inside'
-  end
-
-  @t.tab_index = 0
-end

data/lib/cici/menu.rb

@@ -1,41 +0,0 @@
-# Coding: utf-8
-module Cici
-  # the menu part
-  class Menu
-    def build hash
-      hash.each do |key, val| # key.toString called in C
-        sz = self.size
-        if val.is_a? Proc
-          self.insert_item sz, key, val
-        elsif val.is_a? Hash
-          self.insert_menu sz, key, Menu.popup(@parent).build(val)
-        elsif val.nil?
-          self.insert_line sz
-        else
-          raise 'Menu item processor should be a proc or hash or nil(separate line)'
-        end
-      end
-      return self
-    end
-  end
-
-  class Canvas
-    def menu hash
-      Menu.sys(self).build(hash).draw
-    end
-  end
-
-  class ElementBase
-    def menu hash
-      self.menu = Menu.popup(@parent).build hash
-    end
-  end
-end
-
-module Cici
-  module View
-    def popup_menu hash
-      Menu.popup(Canvas.current).build hash
-    end
-  end
-end