reflexion 0.1.21 → 0.1.22

data/include/reflex/defs.h

@@ -68,98 +68,89 @@ namespace Reflex
 
 		KEY_NONE = 0,
 
+		KEY_A,
+		KEY_B,
+		KEY_C,
+		KEY_D,
+		KEY_E,
+		KEY_F,
+		KEY_G,
+		KEY_H,
+		KEY_I,
+		KEY_J,
+		KEY_K,
+		KEY_L,
+		KEY_M,
+		KEY_N,
+		KEY_O,
+		KEY_P,
+		KEY_Q,
+		KEY_R,
+		KEY_S,
+		KEY_T,
+		KEY_U,
+		KEY_V,
+		KEY_W,
+		KEY_X,
+		KEY_Y,
+		KEY_Z,
+
+		KEY_0,
+		KEY_1,
+		KEY_2,
+		KEY_3,
+		KEY_4,
+		KEY_5,
+		KEY_6,
+		KEY_7,
+		KEY_8,
+		KEY_9,
+
+		KEY_MINUS,
+		KEY_EQUAL,
+		KEY_COMMA,
+		KEY_PERIOD,
+		KEY_SEMICOLON,
+		KEY_QUOTE,
+		KEY_SLASH,
+		KEY_BACKSLASH,
+		KEY_UNDERSCORE,
+		KEY_GRAVE,
+		KEY_YEN,
+		KEY_LBRACKET,
+		KEY_RBRACKET,
+
+		KEY_ENTER,
 		KEY_RETURN,
-		KEY_ENTER = KEY_RETURN,
-		KEY_ESCAPE,
 		KEY_SPACE,
-		KEY_BACKSPACE,
 		KEY_TAB,
+		KEY_DELETE,
+		KEY_BACKSPACE,
+		//KEY_INSERT,
+		KEY_ESCAPE,
 
 		KEY_LEFT,
-		KEY_UP,
 		KEY_RIGHT,
+		KEY_UP,
 		KEY_DOWN,
-
-		KEY_INSERT,
-		KEY_DELETE,
 		KEY_HOME,
 		KEY_END,
 		KEY_PAGEUP,
 		KEY_PAGEDOWN,
 
-		KEY_SHIFT,
 		KEY_LSHIFT,
 		KEY_RSHIFT,
-
-		KEY_CONTROL,
 		KEY_LCONTROL,
 		KEY_RCONTROL,
-
-		KEY_ALT,
-		KEY_LALT,
-		KEY_RALT,
-
-		KEY_WIN,
-		KEY_LWIN,
-		KEY_RWIN,
-
-		KEY_OPTION  = KEY_ALT,
-		KEY_LOPTION = KEY_LALT,
-		KEY_ROPTION = KEY_RALT,
-
-		KEY_COMMAND  = KEY_WIN,
-		KEY_LCOMMAND = KEY_LWIN,
-		KEY_RCOMMAND = KEY_RWIN,
-
-		KEY_CAPSLOCK,
-		KEY_NUMLOCK,
-		KEY_SCROLLLOCK,
-
-		KEY_PRINTSCREEN,
-		KEY_PAUSE,
-		KEY_BREAK,
-
-		KEY_SLEEP,
-		KEY_EXEC,//UTE,
-		KEY_HELP,
-		KEY_PRINT,
-		KEY_APPS,
-		KEY_SELECT,
-		KEY_CLEAR,
-		KEY_PLAY,
-		KEY_ZOOM,
-
-		KEY_IME_KANA,
-		KEY_IME_KANJI,
-		KEY_IME_JUNJA,
-		KEY_IME_PROCESS,
-		KEY_IME_ACCEPT,
-		KEY_IME_FINAL,
-		KEY_IME_CONVERT,
-		KEY_IME_NONCONVERT,
-		KEY_IME_MODECHANGE,
-
-		KEY_BROWSER_BACK,
-		KEY_BROWSER_FORWARD,
-		KEY_BROWSER_REFRESH,
-		KEY_BROWSER_STOP,
-		KEY_BROWSER_SEARCH,
-		KEY_BROWSER_FAVORITES,
-		KEY_BROWSER_HOME,
-
-		KEY_VOLUME_MUTE,
-		KEY_VOLUME_DOWN,
-		KEY_VOLUME_UP,
-
-		KEY_MEDIA_NEXT_TRACK,
-		KEY_MEDIA_PREV_TRACK,
-		KEY_MEDIA_STOP,
-		KEY_MEDIA_PLAY_PAUSE,
-
-		KEY_LAUNCH_MAIL,
-		KEY_LAUNCH_MEDIA_SELECT,
-		KEY_LAUNCH_APP1,
-		KEY_LAUNCH_APP2,
+		//KEY_LALT,
+		//KEY_RALT,
+		//KEY_LWIN,
+		//KEY_RWIN,
+		KEY_LCOMMAND,
+		KEY_RCOMMAND,
+		KEY_LOPTION,
+		KEY_ROPTION,
+		KEY_FUNCTION,
 
 		KEY_F1,
 		KEY_F2,
@@ -181,21 +172,82 @@ namespace Reflex
 		KEY_F18,
 		KEY_F19,
 		KEY_F20,
-		KEY_F21,
-		KEY_F22,
-		KEY_F23,
-		KEY_F24,
-		KEY_F25,
-		KEY_F26,
-		KEY_F27,
-		KEY_F28,
-		KEY_F29,
-		KEY_F30,
-		KEY_F31,
-		KEY_F32,
-		KEY_F33,
-		KEY_F34,
-		KEY_F35,
+		//KEY_F21,
+		//KEY_F22,
+		//KEY_F23,
+		//KEY_F24,
+
+		KEY_NUM_0,
+		KEY_NUM_1,
+		KEY_NUM_2,
+		KEY_NUM_3,
+		KEY_NUM_4,
+		KEY_NUM_5,
+		KEY_NUM_6,
+		KEY_NUM_7,
+		KEY_NUM_8,
+		KEY_NUM_9,
+
+		KEY_NUM_PLUS,
+		KEY_NUM_MINUS,
+		KEY_NUM_MULTIPLY,
+		KEY_NUM_DIVIDE,
+		KEY_NUM_EQUAL,
+		KEY_NUM_COMMA,
+		KEY_NUM_DECIMAL,
+		KEY_NUM_CLEAR,
+
+		KEY_CAPSLOCK,
+		//KEY_NUMLOCK,
+		//KEY_SCROLLLOCK,
+
+		//KEY_PRINTSCREEN,
+		//KEY_PAUSE,
+		//KEY_BREAK,
+		KEY_SECTION,
+		KEY_HELP,
+
+		KEY_IME_EISU,
+		KEY_IME_KANA,
+		//KEY_IME_KANJI,
+		//KEY_IME_JUNJA,
+		//KEY_IME_PROCESS,
+		//KEY_IME_ACCEPT,
+		//KEY_IME_FINAL,
+		//KEY_IME_CONVERT,
+		//KEY_IME_NONCONVERT,
+		//KEY_IME_MODECHANGE,
+
+		KEY_VOLUME_UP,
+		KEY_VOLUME_DOWN,
+		KEY_MUTE,
+
+		//KEY_SLEEP,
+		//KEY_EXEC,
+		//KEY_PRINT,
+		//KEY_APPS,
+		//KEY_SELECT,
+		//KEY_CLEAR,
+		//KEY_PLAY,
+		//KEY_ZOOM,
+
+		//KEY_BROWSER_BACK,
+		//KEY_BROWSER_FORWARD,
+		//KEY_BROWSER_REFRESH,
+		//KEY_BROWSER_STOP,
+		//KEY_BROWSER_SEARCH,
+		//KEY_BROWSER_FAVORITES,
+		//KEY_BROWSER_HOME,
+
+		//KEY_MEDIA_NEXT_TRACK,
+		//KEY_MEDIA_PREV_TRACK,
+		//KEY_MEDIA_STOP,
+		//KEY_MEDIA_PLAY_PAUSE,
+
+		//KEY_LAUNCH_MAIL,
+		//KEY_LAUNCH_MEDIA_SELECT,
+		//KEY_LAUNCH_APP1,
+		//KEY_LAUNCH_APP2,
 
 	};// KeyCode
 

data/lib/reflex/application.rb

@@ -18,19 +18,19 @@ module Reflex
 
     universal_accessor :name
 
-    def initialize (options = nil, &block)
+    def initialize(options = nil, &block)
       super()
       set options if options
       @start_block = block if block
     end
 
-    def self.start (*args, &block)
+    def self.start(*args, &block)
       new(*args, &block).start
     end
 
     private
 
-      def call_start_block ()
+      def call_start_block()
         return unless @start_block
         Xot::BlockUtil.instance_eval_or_block_call self, &@start_block
         @start_block = nil

data/lib/reflex/autoinit.rb

@@ -5,7 +5,7 @@ require 'rays/autoinit'
 require 'reflex/ext'
 
 
-unless $REFLEX_NOAUTOINIT
+unless defined?($REFLEX_NOAUTOINIT) && $REFLEX_NOAUTOINIT
   Reflex.init!
   at_exit {Reflex.fin!}
 end

data/lib/reflex/button.rb

@@ -13,21 +13,21 @@ module Reflex
 
     attr_accessor :text
 
-    def initialize (*args, &block)
+    def initialize(*args, &block)
       self.data = false
       super
       self.text = self.name unless self.text
     end
 
-    def content_bounds ()
+    def content_bounds()
       f = window.painter.font
       return f.width(@text) + 2, f.height + 2
     end
 
-    def on_press (e)
+    def on_press(e)
     end
 
-    def on_draw (e)
+    def on_draw(e)
       e.painter.push fill: (pressing? ? :white : :none), stroke: :white do |p|
         p.rect e.bounds
 
@@ -43,7 +43,7 @@ module Reflex
       end
     end
 
-    def on_pointer (e)
+    def on_pointer(e)
       case e.type
       when :down
         self.capture += [:pointer]
@@ -60,13 +60,13 @@ module Reflex
       end
     end
 
-    def on_data_update (e)
+    def on_data_update(e)
       on_press({}) if e.data
     end
 
     private
 
-      def pressing? ()
+      def pressing?()
         capturing? :pointer
       end
 

data/lib/reflex/capture_event.rb

@@ -10,25 +10,25 @@ module Reflex
 
   class CaptureEvent < Event
 
-    def begin ()
+    def begin()
       View.capture_flag.bits2symbols get_begin
     end
 
-    def begin? (*symbols)
-      bits = View.capture_flag.symbols2bits *symbols
+    def begin?(*symbols)
+      bits = View.capture_flag.symbols2bits(*symbols)
       (bits & get_begin) == bits
     end
 
-    def end ()
+    def end()
       View.capture_flag.bits2symbols get_end
     end
 
-    def end? (*symbols)
-      bits = View.capture_flag.symbols2bits *symbols
+    def end?(*symbols)
+      bits = View.capture_flag.symbols2bits(*symbols)
       (bits & get_end) == bits
     end
 
-    def inspect ()
+    def inspect()
       "#<Reflex::CaptureEvent begin:#{self.begin} end:#{self.end}}>"
     end
 

data/lib/reflex/contact_event.rb

@@ -12,21 +12,21 @@ module Reflex
 
     alias get_type type
 
-    const_symbol_reader :type, {
+    const_symbol_reader :type, **{
       none:  TYPE_NONE,
       begin: TYPE_BEGIN,
       end:   TYPE_END
     }
 
-    def begin? ()
+    def begin?()
       get_type == TYPE_BEGIN
     end
 
-    def end? ()
+    def end?()
       get_type == TYPE_END
     end
 
-    def inspect ()
+    def inspect()
       "#<Reflex::ContactEvent type:#{type} shape:#{shape} view:#{view}>"
     end
 

data/lib/reflex/draw_event.rb

@@ -10,11 +10,11 @@ module Reflex
 
   class DrawEvent < Event
 
-    def paint (&block)
+    def paint(&block)
       Xot::BlockUtil.instance_eval_or_block_call painter, &block if block
     end
 
-    def inspect ()
+    def inspect()
       "#<Reflex::DrawEvent painter:#{painter} bounds:#{bounds} dt:#{dt} fps:#{fps}>"
     end
 

data/lib/reflex/ellipse_shape.rb

@@ -10,12 +10,12 @@ module Reflex
 
   class EllipseShape < Shape
 
-    def angle= (range)
+    def angle=(range)
       angle_from range.min
       angle_to   range.max
     end
 
-    def angle ()
+    def angle()
       angle_from..angle_to
     end
 

data/lib/reflex/focus_event.rb

@@ -12,21 +12,21 @@ module Reflex
 
     alias get_type type
 
-    const_symbol_reader :type, {
+    const_symbol_reader :type, **{
       none:  TYPE_NONE,
       focus: TYPE_FOCUS,
       blur:  TYPE_BLUR
     }
 
-    def focus? ()
+    def focus?()
       get_type == TYPE_FOCUS
     end
 
-    def blur? ()
+    def blur?()
       get_type == TYPE_BLUR
     end
 
-    def inspect ()
+    def inspect()
       "#<Reflex::FocusEvent type:#{type} current:#{current} last:#{last}>"
     end