Commit: fe6e2c7f8739c7094c5ef8af829eaa588370f690 - ruby-gtk3 (git)

Ruby GTK3移行後のメインリポジトリ

Commit MetaInfo

• Revisión: fe6e2c7f8739c7094c5ef8af829eaa588370f690 (tree)
• Tiempo: 2015-03-21 23:13:08
• Autor: Shyouzou Sugitani <shy@user...>
• Commiter: Shyouzou Sugitani

Log Message

update error checking(2)

Cambiar Resumen

• modified: lib/ninix/dll.rb
• modified: lib/ninix/install.rb
• modified: lib/ninix/kinoko.rb
• modified: lib/ninix/nekodorif.rb
• modified: lib/ninix/ngm.rb
• modified: test/test-kinoko.rb

Diferencia incremental

--- a/lib/ninix/dll.rb
+++ b/lib/ninix/dll.rb
@@ -100,7 +100,7 @@ module DLL
       for line in req.split("\n")
         line = line.force_encoding(@charset).strip.encode("UTF-8", :invalid => :replace)
         if line.empty?
-          continue
+          next
         end
         if req_type == nil
           for request in ['EXECUTE', 'GET Version'] ## FIXME
@@ -111,7 +111,7 @@ module DLL
           next
         end
         if line.index(':') == nil
-          continue
+          next
         end
         key, value = line.split(':', 2)
         key = key.strip()

--- a/lib/ninix/install.rb
+++ b/lib/ninix/install.rb
@@ -26,13 +26,13 @@ require "ninix/version"
 
 module Install
 
-#  class InstallError(Exception)
-#    # pass
-#  end
+  class InstallError < Exception
+    #pass
+  end
 
   def self.fatal(error)
-    logging.error(error) # XXX
-    raise InstallError(error)
+    #logging.error(error) # XXX
+    raise InstallError.new(error)
   end
 
   class Installer
@@ -75,7 +75,7 @@ module Install
       if ['.nar', '.zip'].include?(ext)
         # pass
       else
-        fatal('unknown archive format')
+        Install.fatal('unknown archive format')
       end
     end
 
@@ -86,7 +86,7 @@ module Install
       begin
         FileUtils.mkdir_p(tmpdir)
       rescue # except:
-        fatal('cannot make temporary directory')
+        Install.fatal('cannot make temporary directory')
       end
       url = nil
       if filename.start_with?('http:') or filename.start_with?('ftp:')
@@ -94,7 +94,7 @@ module Install
         filename = download(filename, tmpdir)
         if filename == nil
           FileUtils.remove_entry_secure(tmpdir)
-          fatal('cannot download the archive file')
+          Install.fatal('cannot download the archive file')
         end
       else
         check_archive(filename)
@@ -119,7 +119,7 @@ module Install
         zf.close()
       rescue # except:
         FileUtils.remove_entry_secure(tmpdir)
-        fatal('cannot extract files from the archive')
+        Install.fatal('cannot extract files from the archive')
       end
       Dir.glob(tmpdir) { |path|
         if File.directory?(path)
@@ -131,7 +131,6 @@ module Install
           File.chmod(st_mode | 128 | 256, path)
         end
       }
-#      print("EXTRACT: ", tmpdir, "\n")
       rename_files(tmpdir)
       return tmpdir
     end
@@ -146,7 +145,7 @@ module Install
         elsif File.exists?(File.join(tmpdir, 'plugin.txt'))
           filetype = 'plugin'
         else
-          fatal('cannot read install.txt from the archive')
+          Install.fatal('cannot read install.txt from the archive')
         end
       else
         filetype = inst.get('type')
@@ -275,15 +274,13 @@ module Install
     end
 
     def rename_files(basedir)
-#      print("RENAME: ", basedir, "\n")
-#      if os.name == 'nt' # XXX
-#        return
-#      end
+      if RUBY_PLATFORM.downcase =~ /mswin(?!ce)|mingw|cygwin|bccwin/ # XXX
+        return
+      end
       Dir.foreach(basedir) { |filename|
         next if /^\.+$/ =~ filename
         filename2 = filename.downcase
         path = File.join(basedir, filename2)
-#        print("PATH: ", path, "\n")
         if filename != filename2
           File.rename(File.join(basedir, filename), path)
         end
@@ -338,9 +335,9 @@ module Install
     end
 
     def lower_files(top_dir)
-#      if os.name == 'nt' # XXX
-#        return    
-#      end
+      if RUBY_PLATFORM.downcase =~ /mswin(?!ce)|mingw|cygwin|bccwin/ # XXX
+        return    
+      end
       n = 0
       Dir.foreach(top_dir) { |filename|
         next if /^\.+$/ =~ filename
@@ -348,8 +345,8 @@ module Install
         path = File.join(top_dir, filename2)
         if filename != filename2
           File.rename(File.join(top_dir, filename), path)
-#          logging.info(
-#                       'renamed {0}'.format(File.join(top_dir, filename)))
+          #logging.info(
+          #  'renamed {0}'.format(File.join(top_dir, filename)))
           n += 1
         end
         if File.directory?(path)
@@ -380,13 +377,13 @@ module Install
 
     def select(candidates)
       #assert len(candidates) >= 1
-      if len(candidates) == 1
+      if candidates.length == 1
         return candidates[0]
       end
       ls = @treeview.get_model()
       ls.clear()
       for i, item in enumerate(candidates)
-        ls.append([i, item])
+        ls << [i, item]
       end
       ts = @treeview.get_selection()
       ts.select_iter(ls.get_iter_first())
@@ -402,13 +399,12 @@ module Install
     def install_ghost(archive, tmpdir, homedir)
       # find install.txt
       inst = Home.read_install_txt(tmpdir)
-#      print("INST: ", inst, "\n")
       if inst == nil
-        fatal('install.txt not found')
+        Install.fatal('install.txt not found')
       end
       target_dir = inst.get('directory')
       if target_dir == nil
-        fatal('"directory" not found in install.txt')
+        Install.fatal('"directory" not found in install.txt')
       end
       prefix = File.join(homedir, 'ghost', target_dir)
       ghost_src = File.join(tmpdir, 'ghost', 'master')
@@ -448,7 +444,6 @@ module Install
       end
       balloon_name = nil
       if balloon_dir
-#        print("BALLOON DIR: ", balloon_dir, "\n")
         balloon_dir = Home.get_normalized_path(balloon_dir)
         balloon_dst = File.join(homedir, 'balloon', balloon_dir)
         if inst
@@ -459,7 +454,6 @@ module Install
         else
           balloon_src = balloon_dir
         end
-#        print("INSTALL.TXT(B): ", File.join(tmpdir, balloon_src), "\n") 
         inst_balloon = Home.read_install_txt(
                                              File.join(tmpdir, balloon_src))
         if Dir.exists?(balloon_dst) and \
@@ -483,7 +477,7 @@ module Install
       end
       if Dir.exists?(prefix)
         inst_dst = Home.read_install_txt(prefix)
-        if inst.get('refresh', 0).to_i
+        if inst.get('refresh', 0).to_i != 0
           # uninstall older versions of the ghost
           if confirm_refresh(prefix, 'ghost')
             mask = []
@@ -502,7 +496,7 @@ module Install
         end
       end
       # install files
-#      logging.info('installing {0} (ghost)'.format(archive))
+      #logging.info('installing {0} (ghost)'.format(archive))
       install_files(filelist)
       # create SETTINGS
       path = File.join(prefix, 'SETTINGS')
@@ -514,7 +508,7 @@ module Install
           end
         rescue # except IOError as e:
           code, message = e.args
-#          logging.error('cannot write {0}'.format(path))
+          #logging.error('cannot write {0}'.format(path))
         ensure
           f.close()
         end
@@ -528,7 +522,7 @@ module Install
     def install_supplement(archive, tmpdir, homedir)
       inst = Home.read_install_txt(tmpdir)
       if inst and inst.include?('accept')
-        logging.info('searching supplement target ...')
+        #logging.info('searching supplement target ...')
         candidates = []
         begin
           dirlist = Dir.entries(File.join(homedir, 'ghost'))
@@ -538,7 +532,7 @@ module Install
         for dirname in dirlist
           path = File.join(homedir, 'ghost', dirname)
           if File.exists?(File.join(path, 'shell', 'surface.txt'))
-            continue # ghost.inverse(obsolete)
+            next # ghost.inverse(obsolete)
           end
           desc = Home.read_descript_txt(
                                         File.join(path, 'ghost', 'master'))
@@ -546,8 +540,8 @@ module Install
             candidates << dirname
           end
         end
-        if not candidates
-          logging.info('not found')
+        if candidates.empty?
+          #logging.info('not found')
           return nil, nil, 4
         else
           target = self.select(candidates)
@@ -560,7 +554,7 @@ module Install
               path = File.join(path, 'shell', inst['directory'])
             else
               if not inst.include?('type')
-#                logging.error('supplement type not specified')
+                #logging.error('supplement type not specified')
               else
 #                logging.error('unsupported supplement type: {0}'.format(inst['type']))
               end
@@ -582,11 +576,11 @@ module Install
       # find install.txt
       inst = Home.read_install_txt(srcdir)
       if inst == nil
-        fatal('install.txt not found')
+        Install.fatal('install.txt not found')
       end
       target_dir = inst.get('directory')
       if target_dir == nil
-        fatal('"directory" not found in install.txt')
+        Install.fatal('"directory" not found in install.txt')
       end
       dstdir = File.join(homedir, 'balloon', target_dir)
       filelist = []
@@ -616,7 +610,7 @@ module Install
         end
       end
       # install files
-#      logging.info('installing {0} (balloon)'.format(archive))
+      #logging.info('installing {0} (balloon)'.format(archive))
       install_files(filelist)
       return target_dir, inst.get('name'), 0
     end
@@ -631,7 +625,7 @@ module Install
         path = File.join(homedir, 'plugin', subdir)
         plugin = Home.read_plugin_txt(path)
         if plugin == nil
-          continue
+          next
         end
         plugin_name, plugin_dir, startup, menu_items = plugin
         if plugin_name == name
@@ -648,7 +642,7 @@ module Install
       # find plugin.txt
       plugin = Home.read_plugin_txt(srcdir)
       if plugin == nil
-        fatal('failed to read plugin.txt')
+        Install.fatal('failed to read plugin.txt')
       end
       plugin_name, plugin_dir, startup, menu_items = plugin
       # find files
@@ -662,7 +656,7 @@ module Install
       # uninstall older versions of the plugin
       uninstall_plugin(homedir, plugin_name)
       # install files
-#      print('installing {0} (plugin)'.format(archive))
+      #logging.info('installing {0} (plugin)'.format(archive))
       install_files(filelist)
       return plugin_dir, plugin_name, 0
     end
@@ -677,7 +671,7 @@ module Install
         path = File.join(homedir, 'kinoko', subdir)
         kinoko = Home.read_kinoko_ini(path)
         if kinoko == nil
-          continue
+          next
         end
         kinoko_name = kinoko['title']
         if kinoko_name == name
@@ -693,7 +687,7 @@ module Install
       # find kinoko.ini
       kinoko = Home.read_kinoko_ini(srcdir)
       if kinoko == nil
-        fatal('failed to read kinoko.ini')
+        Install.fatal('failed to read kinoko.ini')
       end
       kinoko_name = kinoko['title']
       if kinoko['extractpath'] != nil
@@ -713,7 +707,7 @@ module Install
       # uninstall older versions of the kinoko
       uninstall_kinoko(homedir, kinoko_name)
       # install files
-#      logging.info('installing {0} (kinoko)'.format(archive))
+      #logging.info('installing {0} (kinoko)'.format(archive))
       install_files(filelist)
       return dstdir, [kinoko_name, kinoko['ghost'], kinoko['category']], 0
     end
@@ -732,11 +726,11 @@ module Install
       # find install.txt
       inst = Home.read_install_txt(srcdir)
       if inst == nil
-        fatal('install.txt not found')
+        Install.fatal('install.txt not found')
       end
       target_dir = inst.get('directory')
       if target_dir == nil
-        fatal('"directory" not found in install.txt')
+        Install.fatal('"directory" not found in install.txt')
       end
       dstdir = File.join(homedir, 'nekodorif', 'skin', target_dir)
       # find files
@@ -751,7 +745,7 @@ module Install
       # uninstall older versions of the skin
       uninstall_nekoninni(homedir, target_dir)
       # install files
-#      logging.info('installing {0} (nekodorif skin)'.format(archive))
+      #logging.info('installing {0} (nekodorif skin)'.format(archive))
       install_files(filelist)
       return target_dir, inst.get('name'), 0
     end
@@ -770,11 +764,11 @@ module Install
       # find install.txt
       inst = Home.read_install_txt(srcdir)
       if inst == nil
-        fatal('install.txt not found')
+        Install.fatal('install.txt not found')
       end
       target_dir = inst.get('directory')
       if target_dir == nil
-        fatal('"directory" not found in install.txt')
+        Install.fatal('"directory" not found in install.txt')
       end
       dstdir = File.join(homedir, 'nekodorif', 'katochan', target_dir)
       # find files
@@ -789,7 +783,7 @@ module Install
       # uninstall older versions of the skin
       uninstall_katochan(homedir, target_dir)
       # install files
-#      logging.info('installing {0} (nekodorif katochan)'.format(archive))
+      #logging.info('installing {0} (nekodorif katochan)'.format(archive))
       install_files(filelist)
       return target_dir, inst.get('name'), 0
     end
@@ -814,7 +808,6 @@ module Install
         if not Dir.exists?(dirname)
           FileUtils.mkdir_p(dirname)
         end
-#        print("INSTALL FILES: ", from_path, " to ", to_path, "\n")
         FileUtils.copy(from_path, to_path)
       end
     end

--- a/lib/ninix/kinoko.rb
+++ b/lib/ninix/kinoko.rb
@@ -52,7 +52,6 @@ module Kinoko
                     '', lambda {|a, b| return @parent.handle_request('NOTIFY', 'close')}],
                    '/ui/popup/Exit'],
       }
-      @__skin_list = nil
       actions = Gtk::ActionGroup.new('Actions')
       entry = []
       for value in @__menu_list.values()
@@ -81,14 +80,13 @@ module Kinoko
 
     def set_skin_menu(list) ## FIXME
       key = 'skin'
-      if list
-        menu = Gtk.Menu()
+      if not list.empty?
+        menu = Gtk::Menu.new
         for skin in list
-          item = Gtk.MenuItem(skin['title'])
-          item.signal_connect(
-                       'activate',
-                       lambda {|a, k| return @parent.handle_request('NOTIFY', 'select_skin', k)},
-                       [skin])
+          item = Gtk::MenuItem.new(skin['title'])
+          item.signal_connect('activate', skin) do |a, k|
+            @parent.handle_request('NOTIFY', 'select_skin', k)
+          end
           menu.add(item)
           item.show()
         end
@@ -119,42 +117,42 @@ module Kinoko
 
     def finalize()
       @__running = false
-      self.target.detach_observer(self)
-      if self.skin != nil
-        self.skin.destroy()
+      @target.detach_observer(self)
+      if @skin != nil
+        @skin.destroy()
       end
     end
 
     def observer_update(event, args)
-      if self.skin == nil
+      if @skin == nil
         return
       end
       if ['set position', 'set surface'].include?(event)
-        self.skin.set_position()
-        self.skin.show()
+        @skin.set_position()
+        @skin.show()
       elsif event == 'set scale'
-        scale = self.target.get_surface_scale()
-        self.skin.set_scale(scale)
+        scale = @target.get_surface_scale()
+        @skin.set_scale(scale)
       elsif event == 'hide'
         side = args
         if side == 0 # sakura side
-          self.skin.hide()
+          @skin.hide()
         end
       elsif event == 'iconified'
-        self.skin.hide()
+        @skin.hide()
       elsif event == 'deiconified'
-        self.skin.show()
+        @skin.show()
       elsif event == 'finalize'
-        self.finalize()
+        finalize()
       elsif event == 'move surface'
         side, xoffset, yoffset = args
         if side == 0 # sakura side
-          self.skin.set_position(xoffset, yoffset)
+          @skin.set_position(xoffset, yoffset)
         end
       elsif event == 'raise'
         side = args
         if side == 0 # sakura side
-          self.skin.set_position() ## FIXME
+          @skin.set_position() ## FIXME
         end
       else
         ##logging.debug('OBSERVER(kinoko): ignore - {0}'.format(event))
@@ -164,21 +162,25 @@ module Kinoko
     def load_skin()
       scale = @target.get_surface_scale()
       @skin = Skin.new(@accelgroup)
-      @skin.set_responsible(@target)
+      @skin.set_responsible(self)
       @skin.load(@data, scale)
-      print("SKIN: ", @skin, "\n")
     end
 
     def handle_request(event_type, event, *arglist, **argdict)
       #assert ['GET', 'NOTIFY'].include?(event_type)
       handlers = {
-        'get_target_window' =>  lambda {|a| return self.target.surface.window[0].window}, # XXX
-        'get_kinoko_position' => self.target.get_kinoko_position,
+        'get_target_window' =>  lambda { return @target.get_window }, # XXX
+        'get_kinoko_position' => lambda { return @target.get_kinoko_position }
       }
-      handler = handlers.get(event,
-                             getattr(self, event,
-                                     lambda {|a| return nil})) ## FIXME
-      result = handler(*arglist, **argdict)
+      if handlers.include?(event)
+        result = handlers[event].call # no argument
+      else
+        if Kinoko.method_defined?(event)
+          result = method(event).call(*arglist)
+        else
+          result = nil
+        end
+      end
       if event_type == 'GET'
         return result
       end
@@ -193,7 +195,7 @@ module Kinoko
       if @skin == nil
         return 0
       else
-        self.send_event('OnKinokoObjectCreate')
+        send_event('OnKinokoObjectCreate')
       end
       @__running = true
       GLib::Timeout.add(10) { do_idle_tasks } # 10[ms]
@@ -209,8 +211,8 @@ module Kinoko
     end
 
     def close()
-      self.finalize()
-      self.send_event('OnKinokoObjectDestroy')
+      finalize()
+      send_event('OnKinokoObjectDestroy')
     end
 
     def send_event(event)
@@ -232,14 +234,14 @@ module Kinoko
     end
 
     def select_skin(args)
-      self.send_event('OnKinokoObjectChanging')
-      self.skin.destroy()
-      self.data = args
-      self.load_skin()
-      if self.skin == nil
+      send_event('OnKinokoObjectChanging')
+      @skin.destroy()
+      @data = args
+      load_skin()
+      if @skin == nil
         return 0
       else
-        self.send_event('OnKinokoObjectChanged')
+        send_event('OnKinokoObjectChanged')
       end
       return 1
     end
@@ -263,18 +265,18 @@ module Kinoko
       @parent = parent
     end
 
-    def handle_request(event_type, event, *arglist, **argdict)
+    def handle_request(event_type, event, *arglist)
       #assert ['GET', 'NOTIFY'].include?(event_type)
       handlers = {
       }
-#      handler = handlers.get(event, getattr(self, event, nil))
-#      if handler == nil
-      if not handlers.include?(event)
-        result = @parent.handle_request(event_type, event, *arglist, **argdict)
+      if handlers.include?(event)
+        result = handlers[event].call # no argument
       else
-#        result = handler(*arglist, **argdict)
-        ## FIXME
-        result = class_eval(event) #( *arglist, **argdict)
+        if Skin.method_defined?(event)
+          result = method(event).call(*arglist)
+        else
+          result = @parent.handle_request(event_type, event, *arglist)
+        end
       end
       if event_type == 'GET'
         return result
@@ -306,11 +308,9 @@ module Kinoko
           actors = {'' =>  []}
         end
       end
-      print("ACTORS: ", actors, "\n")
       @seriko = Seriko::Controller.new(actors)
       @seriko.set_responsible(self) ## FIXME
       path = File.join(@data['dir'], @data['base'])
-      print("PATH: ", path, "\n")
       begin
         @image_surface = Pix.create_surface_from_file(path)
         w = [8, (@image_surface.width * @__scale / 100).to_i].max
@@ -319,7 +319,6 @@ module Kinoko
         @parent.handle_request('NOTIFY', 'close')
         return
       end
-      print("SURFACE: ", w, " , ", h, "\n")
       @path = path
       @w, @h = w, h
       @darea = @window.darea # @window.get_child()
@@ -434,16 +433,14 @@ module Kinoko
     end
 
     def update_frame_buffer()
-      print("UPDATE FRAME: ", @seriko.get_base_id, "\n")
       new_surface = create_image_surface(@seriko.get_base_id)
       #assert new_surface != nil
       # draw overlays
       for surface_id, x, y, method in @seriko.iter_overlays()
-        print("OVERLAY: ", surface_id, x, y, method, "\n")
-        if 1#begin
+        begin
           overlay_surface = get_image_surface(surface_id)
-        else#rescue #except:
-          continue
+        rescue #except:
+          next
         end
         # overlay surface
         cr = Cairo::Context.new(new_surface)
@@ -451,7 +448,7 @@ module Kinoko
         cr.mask(overlay_surface, x, y)
         #del cr
       end
-      #self.darea.queue_draw_area(0, 0, w, h)
+      #@darea.queue_draw_area(0, 0, w, h)
       @image_surface = new_surface
       @darea.queue_draw()
     end
@@ -499,7 +496,7 @@ module Kinoko
       @seriko.invoke(self, actor_id, update)
     end
 
-    def delete() #widget, event)
+    def delete()
       @parent.handle_request('NOTIFY', 'close')
     end
 

--- a/lib/ninix/nekodorif.rb
+++ b/lib/ninix/nekodorif.rb
@@ -184,25 +184,20 @@ module Nekodorif
       return 1
     end
 
-    def handle_request(event_type, event, *arglist, **argdict)
+    def handle_request(event_type, event, *arglist)
       ##assert ['GET', 'NOTIFY'].include?(event_type)
       handlers = {
         'get_katochan_list' =>  lambda { return @katochan_list },
         'get_mode' =>  lambda { return @mode },
       }
-#      handler = handlers.get(event,
-#                             getattr(self, event,
-#                                     lambda {|a| return nil})) ## FIXME
-#      result = handler(*arglist, **argdict)
-#      if not handlers.include?(event)
-#        result = @parent.handle_request(event_type, event, *arglist, **argdict)
-#      else
       if handlers.include?(event)
-        result = handlers[event].call #( *arglist, **argdict)
+        result = handlers[event].call # no argument
       else
-        ## FIXME
-        print("REQ: ", Nekoninni.method_defined?(event), " , ", *arglist, "\n")
-        result = method(event).call(*arglist)#, **argdict)
+        if Nekoninni.method_defined?(event)
+          result = method(event).call(*arglist)
+        else
+          result = nil # XXX
+        end
       end
       if event_type == 'GET'
         return result
@@ -217,7 +212,7 @@ module Nekodorif
       if @katochan != nil
         @katochan.update()
       end
-      #self.process_script()
+      #process_script()
       return true
     end
 
@@ -350,16 +345,18 @@ module Nekodorif
       @parent = parent
     end
 
-    def handle_request(event_type, event, *arglist, **argdict)
+    def handle_request(event_type, event, *arglist)
       ##assert ['GET', 'NOTIFY'].include?(event_type)
       handlers = {
       }
-#      handler = handlers.get(event, getattr(self, event, nil))
-#      if handler == nil
       if not handlers.include?(event)
-        result = @parent.handle_request(event_type, event, *arglist, **argdict)
+        result = @parent.handle_request(event_type, event, *arglist)
       else
-        result = method(event).call(*arglist)#, **argdict)
+        if Skin.method_defined?(event)
+          result = method(event).call(*arglist)
+        else
+          result = nil
+        end
       end
       if event_type == 'GET'
         return result
@@ -442,11 +439,11 @@ module Nekodorif
 
     def set_position(reset=0)
       left, top, scrn_w, scrn_h = Pix.get_workarea()
-      if reset
+      if reset != 0
         @x = left
         @y = top + scrn_h - @h
       else
-        if not @omni
+        if @omni != 0
           @y = top + scrn_h - @h
         end
       end
@@ -455,7 +452,7 @@ module Nekodorif
 
     def move(x_delta, y_delta)
       @x = @x + x_delta
-      if @omni
+      if @omni != 0
         @y = @y + y_delta
       end
       set_position()
@@ -499,7 +496,6 @@ module Nekodorif
       else
         x, y, state = event.x, event.y, event.state
       end
-      #x, y = self.window.winpos_to_surfacepos(x, y, self.__scale)
       if state & Gdk::Window::ModifierType::BUTTON1_MASK
         if @x_root != nil and \
           @y_root != nil
@@ -601,11 +597,8 @@ module Nekodorif
     end
 
     def redraw(widget, cr)
-      scale = @__scale
-      cr.scale(scale / 100.0, scale / 100.0)
-      cr.set_source(@image_surface, 0, 0)
-      cr.set_operator(Cairo::OPERATOR_SOURCE)
-      cr.paint()
+      @window.set_surface(cr, @image_surface, @__scale)
+      @window.set_shape(cr)
     end
 
     def set_movement(timing)
@@ -690,7 +683,6 @@ module Nekodorif
       end
       @w, @h = w, h
       @window.update_size(@w, @h)
-      #self.darea.queue_draw_area(0, 0, self.w, self.h)
       @image_surface = new_surface
       @darea.queue_draw()
     end
@@ -701,9 +693,9 @@ module Nekodorif
       set_state('before')
       if @data.include?('category')
         category = @data['category'].split(',')
-        if category
+        if not category.empty?
           if not CATEGORY_LIST.include?(category[0])
-            logging.warning('WARNING: unknown major category - {0}'.format(category[0]))
+            #logging.warning('WARNING: unknown major category - {0}'.format(category[0]))
             ##self.data['category'] = self.CATEGORY_LIST[-1]
           end
         else
@@ -847,7 +839,7 @@ module Nekodorif
       if @settings['state'] == 'fall'
         update_surface()
         update_position()
-        if check_collision()
+        if check_collision() != 0
           set_state('hit')
           @hit = 1
           if @parent.handle_request('GET', 'get_mode') == 1
@@ -858,11 +850,16 @@ module Nekodorif
             #pass ## FIXME
           end
         end
-        if check_mikire()
+        if check_mikire() != 0
           set_state('dodge')
         end
       elsif @settings['state'] == 'hit'
-        if @hit_stop >= @data.get('hit.waittime', 0)
+        if @data.include?('hit.waittime')
+          wait_time = @data['hit.waittime']
+        else
+          wait_time = 0
+        end
+        if @hit_stop >= wait_time
           set_state('after')
           set_movement('after')
           if @parent.handle_request('GET', 'get_mode') == 1
@@ -879,7 +876,7 @@ module Nekodorif
       elsif @settings['state'] == 'after'
         update_surface()
         update_position()
-        if check_mikire()
+        if check_mikire() != 0
           set_state('end')
         end
       elsif @settings['state'] == 'end'

--- a/lib/ninix/ngm.rb
+++ b/lib/ninix/ngm.rb
@@ -798,21 +798,20 @@ module NGM
       @parent = parent
     end
 
-    def handle_request(event_type, event, *arglist, **argdict)
+    def handle_request(event_type, event, *arglist)
       #assert event_type in ['GET', 'NOTIFY']
       handlers = {
-        'get_home_dir' => lambda { return  @home_dir },
-        'network_update' => lambda { return network_update },
-        'get' => lambda { return get(arglist[0]) }
+        'get_home_dir' => lambda {|*a| return  @home_dir },
+        'network_update' => lambda {|*a| return network_update },
+        'get' => lambda {|*a| return get(a[0]) }
       }
       if handlers.include?(event)
-        result = handlers[event].call #( *arglist, **argdict)
+        result = handlers[event].call(*arglist)
       else
         begin
           result = public_send(event, *arglist)
         rescue
-          result = @parent.handle_request(
-            event_type, event, *arglist, **argdict)
+          result = @parent.handle_request(event_type, event, *arglist)
         end
       end
       if event_type == 'GET'

--- a/test/test-kinoko.rb
+++ b/test/test-kinoko.rb
@@ -17,8 +17,9 @@ module NinixTest
       @win.set_default_size(@surface.width, @surface.height)
       @win.show_all
       kinoko_list = Home.search_kinoko()
+      print("K: ", kinoko_list, "\n")
       kinoko = Kinoko::Kinoko.new(kinoko_list)
-      print("K: ", kinoko, "\n")
+      #print("K: ", kinoko, "\n")
       kinoko.load(kinoko_list.sample, self)
       Gtk.main
     end
@@ -26,10 +27,16 @@ module NinixTest
     def notify_event(event, *args) # dummy
     end
 
+    def get_window # dummy
+      return @win
+    end
+
+    def get_kinoko_position # dummy
+      return 100, 200
+    end
+
     def handle_request(type, event, *a) # dummy
-      if event == 'get_kinoko_position'
-        return 0, 0
-      elsif event == 'get_preference' and a[0] == 'animation_quality'
+      if event == 'get_preference' and a[0] == 'animation_quality'
         return 1
       end
     end