コミット: a689d76504790521946f98ef88f6d553b7322ae8 - ruby-gtk3 (git)

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

コミットメタ情報

• リビジョン: a689d76504790521946f98ef88f6d553b7322ae8 (tree)
• 日時: 2015-03-22 21:21:38
• 作者: Shyouzou Sugitani <shy@user...>
• コミッター: Shyouzou Sugitani

ログメッセージ

update error checking(3)

変更サマリ

• modified: lib/ninix/balloon.rb
• modified: lib/ninix/config.rb
• modified: lib/ninix/home.rb
• modified: lib/ninix/kinoko.rb
• modified: lib/ninix/nekodorif.rb
• modified: lib/ninix/seriko.rb
• modified: lib/ninix/surface.rb
• modified: test/test-balloon.rb
• modified: test/test-kinoko.rb

差分

--- a/lib/ninix/balloon.rb
+++ b/lib/ninix/balloon.rb
@@ -45,18 +45,16 @@ module Balloon
       @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 = {
         'reset_user_interaction' => 'reset_user_interaction',
       }
-#      handler = handlers.get(event)
-#      if handler == nil
       if !handlers.include?(event)
         result = @parent.handle_request(
-                                        event_type, event, *arglist, **argdict)
+          event_type, event, *arglist)
       else
-        result = handler(*arglist, **argdict)
+        result = handlers[event].call(*arglist)
       end
       if event_type == 'GET'
         return result
@@ -142,7 +140,6 @@ module Balloon
       communicate3 = nil
       for key in balloon.keys
         value = balloon[key]
-#      for key, value in balloon.items()
         if ['arrow0', 'arrow1'].include?(key)
           balloon0[key] = value
           balloon1[key] = value
@@ -182,7 +179,7 @@ module Balloon
     end
 
     def add_window(side)
-#      assert @window.length == side
+      #assert @window.length == side
       if side == 0
         name = 'balloon.sakura'
         id_format = 's'
@@ -198,8 +195,7 @@ module Balloon
       end
       gtk_window = create_gtk_window(name)
       balloon_window = BalloonWindow.new(
-                                         gtk_window, side, @desc, balloon,
-                                         id_format)
+        gtk_window, side, @desc, balloon, id_format)
       balloon_window.set_responsible(self)
       @window << balloon_window
     end
@@ -569,7 +565,7 @@ module Balloon
       @parent = parent
     end
 
-#    @property
+    #@property
     def scale
       scaling = @parent.handle_request('GET', 'get_preference', 'balloon_scaling')
       scale = @parent.handle_request('GET', 'get_preference', 'surface_scale')
@@ -580,12 +576,12 @@ module Balloon
       end
     end
 
-#    @property
+    #@property
     def direction
       return @__direction
     end
 
-#    @direction.setter
+    #@direction.setter
     def direction(direction)
       if @__direction != direction
         @__direction = direction # 0: left, 1: right
@@ -658,7 +654,7 @@ module Balloon
 
     def reset_sstp_marker
       if @side == 0
-#        assert @balloon_surface != nil
+        #assert @balloon_surface != nil
         w = @balloon_surface.width
         h = @balloon_surface.height
         # sstp marker position
@@ -677,7 +673,7 @@ module Balloon
     def reset_arrow
       # arrow positions
       @arrow = []
-#      assert @balloon_surface != nil
+      #assert @balloon_surface != nil
       w = @balloon_surface.width
       h = @balloon_surface.height
       x = config_adjust('arrow0.x', w, -10)
@@ -767,7 +763,7 @@ module Balloon
     def get_balloon_size(scaling=true)
       w = @width
       h = @height
-#      scale = @scale
+      #scale = @scale
       if scaling
         w = (w * scale / 100.0).to_i
         h = (h * scale / 100.0).to_i
@@ -787,13 +783,13 @@ module Balloon
         balloon_id = @id_format + (0 + @__direction).to_i.to_s
         @balloon_surface = get_image_surface(balloon_id)
       end
-#      assert @balloon_surface != nil
+      #assert @balloon_surface != nil
       @balloon_id = balloon_id
       # change surface and window position
       x, y = @position
       @width = @balloon_surface.width
       @height = @balloon_surface.height
-#      scale = @scale
+      #scale = @scale
       w = (@width * scale / 100.0).to_i
       h = (@height * scale / 100.0).to_i
       @window.update_size(w, h)
@@ -825,18 +821,6 @@ module Balloon
       return value.to_i
     end
 
-    def __get_with_type(name, conv, default_value)
-      path, config = @balloon[@balloon_id]
-      value = config.get_with_type(name, conv)
-      if value == nil
-        value = @desc.get_with_type(name, conv)
-        if value == nil
-          value = default_value
-        end
-      end
-      return conv(value)
-    end
-
     def __get(name, default_value)
       path, config = @balloon[@balloon_id]
       value = config.get(name)
@@ -849,18 +833,6 @@ module Balloon
       return value
     end
 
-#    def __get_with_scaling(name, conv, default_value)
-#      path, config = @balloon[@balloon_id]
-#      value = config.get_with_type(name, conv)
-#      if value == nil
-#        value = @desc.get_with_type(name, conv)
-#        if value == nil
-#          value = default_value
-#        end
-#      end
-#      return conv(value * scale / 100)
-#    end
-
     def __get_with_scaling(name, default_value)
       path, config = @balloon[@balloon_id]
       value = config.get(name)
@@ -910,11 +882,7 @@ module Balloon
     end
 
     def is_shown
-      if @__shown
-        return 1
-      else
-        return 0
-      end
+      return @__shown
     end
 
     def show
@@ -960,15 +928,14 @@ module Balloon
       end
       @sstp_message = message.to_s + " (" + sender.to_s + ")"
       x, y, w, h = @sstp_region
-#      @sstp_layout.set_text(@sstp_message, -1)
       @sstp_layout.set_text(@sstp_message)
       message_width, message_height = @sstp_layout.pixel_size
       if message_width > w
-        @sstp_message = '... ({0})'.format(sender)
+        @sstp_message = '... (' + sender + ')'
         i = 0
         while 1
           i += 1
-          s = '{0}... ({1})'.format(message[0, i], sender)
+          s = message[0, i] + '... (' + sender + ')'
           @sstp_layout.set_text(s, -1)
           message_width, message_height = \
           @sstp_layout.get_pixel_size()
@@ -999,13 +966,10 @@ module Balloon
       end
       # draw sstp message
       x, y, w, h = @sstp_region
-#      @sstp_layout.set_text(@sstp_message, -1)
       @sstp_layout.set_text(@sstp_message)
       cr.set_source_rgba(*@sstp_message_color)
       cr.move_to(x, y)
       cr.show_pango_layout(@sstp_layout)
-#      PangoCairo.update_layout(cr, @sstp_layout)
-#      PangoCairo.show_layout(cr, @sstp_layout)
       cr.restore()
     end
 
@@ -1134,8 +1098,6 @@ module Balloon
         cr.set_source_rgba(*@text_normal_color)
         cr.move_to(x, y)
         cr.show_pango_layout(@layout)
-#        PangoCairo.update_layout(cr, @layout)
-#        PangoCairo.show_layout(cr, @layout)
         if @sstp_surface != nil
           for l, c in @sstp_marker
             if l == i
@@ -1221,8 +1183,7 @@ module Balloon
             cr.fill()
             cr.move_to(x, y)
             cr.set_source_rgba(*@text_active_color)
-            PangoCairo.update_layout(cr, @layout)
-            PangoCairo.show_layout(cr, @layout)
+            cr.show_pango_layout(@layout)
           end
         end
       end
@@ -1234,7 +1195,7 @@ module Balloon
       for i in 0..(@link_buffer.length - 1)
         sl = @link_buffer[i][0]
         el = @link_buffer[i][2]
-        if @lineno <= sl <= @lineno + @lines
+        if @lineno <= sl and sl <= @lineno + @lines
           sn = @link_buffer[i][1]
           en = @link_buffer[i][3]
           for n in sl..el
@@ -1258,7 +1219,7 @@ module Balloon
             @layout.set_markup(markup, -1)
             text_w, text_h = @layout.get_pixel_size()
             w = text_w
-            if x <= px < x + w and y <= py < y + h
+            if x <= px and px < x + w and y <= py and py < y + h
               new_selection = i
               break
             end
@@ -1270,8 +1231,8 @@ module Balloon
           sl, sn, el, en, link_id, raw_text, text = \
           @link_buffer[new_selection]
           @parent.handle_request(
-                                 'NOTIFY', 'notify_event',
-                                 'OnChoiceEnter', raw_text, link_id, @selection)
+            'NOTIFY', 'notify_event',
+            'OnChoiceEnter', raw_text, link_id, @selection)
         end
       else
         if @selection != nil
@@ -1290,9 +1251,9 @@ module Balloon
       if event.hint?
         _, x, y, state = widget.window.get_device_position(event.device)
       else
-        x, y, state = event.x, event.y, event.get_state()
+        x, y, state = event.x, event.y, event.state
       end
-#      scale = @scale
+      #scale = @scale
       px, py = @window.winpos_to_surfacepos(x, y, scale)
       if @link_buffer
         if check_link_region(px, py)
@@ -1300,7 +1261,7 @@ module Balloon
         end
       end
       if not @parent.handle_request('GET', 'busy')
-        if state & Gdk.ModifierType.BUTTON1_MASK
+        if (state & Gdk::Window::ModifierType::BUTTON1_MASK).nonzero?
           if @x_root != nil and \
             @y_root != nil
             @dragged = true
@@ -1309,8 +1270,8 @@ module Balloon
             @x_fractions = x_delta - x_delta.to_i
             @y_fractions = y_delta - y_delta.to_i
             @parent.handle_request(
-                                   'NOTIFY', 'update_balloon_offset',
-                                   @side, x_delta.to_i, y_delta.to_i)
+              'NOTIFY', 'update_balloon_offset',
+              @side, x_delta.to_i, y_delta.to_i)
             @x_root = event.x_root
             @y_root = event.y_root
           end
@@ -1321,14 +1282,14 @@ module Balloon
 
     def scroll(darea, event)
       px, py = @window.winpos_to_surfacepos(
-                                            event.x.to_i, event.y.to_i, scale)
-      if event.direction == Gdk.ScrollDirection.UP
+            event.x.to_i, event.y.to_i, scale)
+      if event.direction == Gdk::EventScroll::UP
         if @lineno > 0
           @lineno = [@lineno - 2, 0].max
           check_link_region(px, py)
           @darea.queue_draw()
         end
-      elsif event.direction == Gdk.ScrollDirection.DOWN
+      elsif event.direction == Gdk::EventScroll::DOWN
         if @lineno + @lines < @text_buffer.length
           @lineno = [@lineno + 2,
                      @text_buffer.length - @lines].min
@@ -1353,12 +1314,12 @@ module Balloon
       end
       # arrows
       px, py = @window.winpos_to_surfacepos(
-                                            event.x.to_i, event.y.to_i, scale)
+            event.x.to_i, event.y.to_i, scale)
       # up arrow
       w = @arrow0_surface.get_width()
       h = @arrow0_surface.get_height()
       x, y = @arrow[0]
-      if x <= px <= x + w and y <= py <= y + h
+      if x <= px and px <= x + w and y <= py and py <= y + h
         if @lineno > 0
           @lineno = [@lineno - 2, 0].max
           @darea.queue_draw()
@@ -1369,7 +1330,7 @@ module Balloon
       w = @arrow1_surface.get_width()
       h = @arrow1_surface.get_height()
       x, y = @arrow[1]
-      if x <= px <= x + w and y <= py <= y + h
+      if x <= px and px <= x + w and y <= py and py <= y + h
         if @lineno + @lines < @text_buffer.length
           @lineno = [@lineno + 2,
                      @text_buffer.length - @lines].min
@@ -1395,7 +1356,7 @@ module Balloon
 
     def button_release(window, event)
       x, y = @window.winpos_to_surfacepos(
-                                          event.x.to_i, event.y.to_i, scale)
+           event.x.to_i, event.y.to_i, scale)
       if @dragged
         @dragged = false
       end
@@ -1582,7 +1543,7 @@ module Balloon
         return
       end
       line = @text_buffer.length - 1
-      if @lineno <= line && line < @lineno + @lines
+      if @lineno <= line and line < @lineno + @lines
         x, y, w, h = @line_regions[line - @lineno]
         if @text_buffer[line].end_with?('\n[half]')
           offset = line - @lineno + 1
@@ -1654,10 +1615,10 @@ module Balloon
         drag_data_received(w, e)
       end
       # DnD data types
-#      dnd_targets = [Gtk.TargetEntry.new('text/plain', 0, 0)]
-#      @window.drag_dest_set(Gtk.DestDefaults.ALL, dnd_targets,
-#                            Gdk.DragAction.COPY)
-#      @window.drag_dest_add_text_targets()
+      dnd_targets = [['text/plain', 0, 0]]
+      @window.drag_dest_set(Gtk::Drag::DestDefaults::ALL, dnd_targets,
+                            Gdk::DragContext::Action::COPY)
+      @window.drag_dest_add_text_targets()
       @window.set_events(Gdk::Event::BUTTON_PRESS_MASK)
       @window.set_modal(true)
       @window.set_window_position(Gtk::Window::Position::CENTER)
@@ -1709,7 +1670,7 @@ module Balloon
       else
         box = Gtk::HBox.new(spacing=10)
         box.set_border_width(10)
-        if ENTRY
+        if not ENTRY.empty?
           label = Gtk::Label.new(label=ENTRY)
           box.pack_start(label, false, true, 0)
           label.show()
@@ -1726,15 +1687,25 @@ module Balloon
 
     def redraw(widget, cr, surface)
       cr.set_source_surface(surface, 0, 0)
-      cr.set_operator(cairo.OPERATOR_SOURCE)
+      cr.set_operator(Cairo::OPERATOR_SOURCE)
       cr.paint()
-      region = Gdk.cairo_region_create_from_surface(cr.get_target())
+      w, h = @window.size
+      image_surface = cr.target.map_to_image
+      region = Cairo::Region.new()
+      data = image_surface.data
+      for i in 0..(data.size / 4 - 1)
+        if (data[i * 4 + 3].ord) != 0
+          x = i % image_surface.width
+          y = i / image_surface.width
+          region.union!(x, y, 1, 1)
+        end
+      end
       # XXX: to avoid losing focus in the text input region
       x = @entry.get_margin_left()
       y = @entry.get_margin_top()
       w = @entry.get_allocated_width()
       h = @entry.get_allocated_height()
-      region.union(cairo.RectangleInt(x, y, w, h))
+      region.union!(x, y, w, h)
       @window.input_shape_combine_region(region)
     end
 
@@ -1752,7 +1723,7 @@ module Balloon
     end
 
     def key_press(widget, event)
-      if event.keyval == Gdk.KEY_Escape
+      if event.keyval == Gdk::Keyval::GDK_KEY_Escape
         @window.hide()
         cancel()
         return true
@@ -1763,8 +1734,8 @@ module Balloon
     def button_press(widget, event)
       if [1, 2].include?(event.button)
         @window.begin_move_drag(
-                                event.button, event.x_root.to_i, event.y_root.to_i,
-                                Gtk.get_current_event_time())
+          event.button, event.x_root.to_i, event.y_root.to_i,
+          Gtk.current_event_time())
       end
       return true
     end
@@ -1780,14 +1751,14 @@ module Balloon
       @window.show()
     end
 
-#    @abc.abstractmethod
+    #@abc.abstractmethod
     def enter
-#      pass
+      #pass
     end
 
-#    @abc.abstractmethod
+    #@abc.abstractmethod
     def cancel
-#      pass
+      #pass
     end
   end
 
@@ -1810,7 +1781,7 @@ module Balloon
     end
 
     def key_press(widget, event)
-      if event.keyval == Gdk.KEY_Escape
+      if event.keyval == Gdk::Keyval::GDK_KEY_Escape
         @window.hide()
         cancel()
         @parent.handle_request('NOTIFY', 'reset_user_interaction')

--- a/lib/ninix/config.rb
+++ b/lib/ninix/config.rb
@@ -16,19 +16,6 @@ module NConfig
 
   class Config < Hash
 
-    def get_with_type(name, conv, default=nil)
-      value = self.get(name)
-      if value == nil
-        return default
-      end
-      ##assert conv is not None
-      begin
-        return conv(value)
-      rescue
-        return default # XXX
-      end
-    end
-
     def get(name, default=nil)
       if name.class == Array
         keylist = name
@@ -42,11 +29,6 @@ module NConfig
       end
       return default
     end
-
-#    def __str__
-#       return ''.join(
-#           ['{0},{1}\n'.format(key, value) for key, value in self.items()])
-#    end
   end
 
   def self.create_from_file(path)

--- a/lib/ninix/home.rb
+++ b/lib/ninix/home.rb
@@ -181,7 +181,7 @@ module Home
         next
       end
       if balloon_info.include?('balloon_dir') # XXX
-        logging.warninig('Oops: balloon id confliction')
+        #logging.warninig('Oops: balloon id confliction')
         next
       else
         balloon_info['balloon_dir'] = [subdir, NConfig.null_config()]
@@ -325,7 +325,7 @@ module Home
         end
         line = line.encode('UTF-8', :invalid => :replace)
         if not line.include?('=')
-          error = 'line {0:d}: syntax error'.format(lineno)
+          error = 'line ' + lineno.to_s + ': syntax error'
           break
         end
         x = line.split('=', 2)
@@ -341,7 +341,7 @@ module Home
           kinoko[name] = value.to_i
         end
         if error
-          logging.error('Error: {0}\n{1} (skipped)'.format(error, path))
+          #logging.error('Error: {0}\n{1} (skipped)'.format(error, path))
           return nil
         end
       end
@@ -669,7 +669,7 @@ module Home
           begin
             charset = temp.split(',', 2)[1].strip().force_encoding('ascii')
           rescue #except:
-            pass
+            #pass
           end
           next
         end
@@ -687,8 +687,7 @@ module Home
             buf << temp[0, temp.length - 2]
           end
           if not opened
-            logging.error(
-                          'syntax error: unbalnced "}" in surfaces.txt.')
+            #logging.error('syntax error: unbalnced "}" in surfaces.txt.')
           end
           match = re_alias.match(key)
           if match
@@ -702,7 +701,7 @@ module Home
             begin
               key = key[0, -10]
             rescue #except:
-              pass
+              #pass
             end
             value = {}
             for line in buf
@@ -722,13 +721,13 @@ module Home
                 begin
                   key = [key[0, 7], key[7, key.length - 1].to_i.to_s].join('')
                 rescue #except ValueError:
-                  pass
+                  #pass
                 end
               else
                 begin
                   key = ['surface', key.to_i.to_s].join('')
                 rescue #except ValueError:
-                  pass
+                  #pass
                 end
               end
               config_list << [key, NConfig.create_from_buffer(buf, charset)]
@@ -769,8 +768,8 @@ module Home
         x = x.to_i
         y = y.to_i
       rescue #except ValueError:
-        logging.error(
-                      'invalid element spec for {0}: {1}'.format(key, config[key]))
+        #logging.error(
+        #  'invalid element spec for {0}: {1}'.format(key, config[key]))
         next
       end
       buf << [key, method, filename, x, y]

--- a/lib/ninix/kinoko.rb
+++ b/lib/ninix/kinoko.rb
@@ -44,12 +44,12 @@ module Kinoko
       EOS
       @__menu_list = {
         'settings' => [['Settings', nil, _('Settings...(_O)'), nil,
-                        '', lambda {|a, b| return @parent.handle_request('NOTIFY', 'edit_preferences')}],
+                        '', lambda {|a, b| @parent.handle_request('NOTIFY', 'edit_preferences')}],
                        '/ui/popup/Settings'],
         'skin' => [['Skin', nil, _('Skin(_K)'), nil],
                    nil, '/ui/popup/Skin'],
         'exit' => [['Exit', nil, _('Exit(_Q)'), nil,
-                    '', lambda {|a, b| return @parent.handle_request('NOTIFY', 'close')}],
+                    '', lambda {|a, b| @parent.handle_request('NOTIFY', 'close')}],
                    '/ui/popup/Exit'],
       }
       actions = Gtk::ActionGroup.new('Actions')
@@ -155,7 +155,7 @@ module Kinoko
           @skin.set_position() ## FIXME
         end
       else
-        ##logging.debug('OBSERVER(kinoko): ignore - {0}'.format(event))
+        #logging.debug('OBSERVER(kinoko): ignore - {0}'.format(event))
       end
     end
 

--- a/lib/ninix/nekodorif.rb
+++ b/lib/ninix/nekodorif.rb
@@ -158,7 +158,7 @@ module Nekodorif
       elsif event == 'finalize'
         finalize()
       else
-        ##logging.debug('OBSERVER(nekodorif): ignore - {0}'.format(event))
+        #logging.debug('OBSERVER(nekodorif): ignore - {0}'.format(event))
       end
     end
 

--- a/lib/ninix/seriko.rb
+++ b/lib/ninix/seriko.rb
@@ -103,12 +103,12 @@ module Seriko
       @prev_tick = current_tick
       update_frame(window)
       if @dirty
-        @dirty = false
         window.update_frame_buffer()
+        @dirty = false
       end
       if @move != nil
-        @move = nil
         window.move_surface(*@move)
+        @move = nil
       end
       @timeout_id = GLib::Timeout.add((1000.0 / @fps).to_i) { update(window) } # [msec]
       return false

--- a/lib/ninix/surface.rb
+++ b/lib/ninix/surface.rb
@@ -15,6 +15,7 @@
 
 require "gtk3"
 
+require "ninix/keymap"
 require "ninix/pix"
 require "ninix/seriko"
 
@@ -34,20 +35,19 @@ module Surface
       @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 = {
         'stick_window' => 'window_stick',
       }
       if handlers.include?(event)
-        result = handlers[event].call #( *arglist, **argdict)
+        result = handlers[event].call # no argument
       else
-#      handler = handlers.get(event, getattr(self, event, None))
-#      if handler == nil
-        result = @parent.handle_request(
-                                        event_type, event, *arglist, **argdict)
-#      else
-#        result = handler(*arglist, **argdict)
+        if Surface.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
@@ -103,8 +103,8 @@ module Surface
          
     def window_iconify(flag)
       gtk_window = @window[0].window
-      iconified = gtk_window.window.state & \
-      Gdk::EventWindowState::ICONIFIED
+      iconified = (gtk_window.window.state & \
+                   Gdk::EventWindowState::ICONIFIED).nonzero?
       if flag and not iconified
         gtk_window.iconify()
       elsif not flag and iconified
@@ -116,18 +116,18 @@ module Surface
       if not @parent.handle_request('GET', 'is_running')
         return
       end
-      if not (event.changed_mask & Gdk::EventWindowState::ICONIFIED)
+      if (event.changed_mask & Gdk::EventWindowState::ICONIFIED).zero?
         return
       end
-      if event.new_window_state & Gdk::EventWindowState::ICONIFIED
+      if (event.new_window_state & Gdk::EventWindowState::ICONIFIED).nonzero?
         if window == @window[0].get_window
           @parent.handle_request('NOTIFY', 'notify_iconified')
         end
         for surface_window in @window
           gtk_window = surface_window.get_window
           if gtk_window != window and \
-            not gtk_window.window.state & \
-            Gdk::EventWindowState::ICONIFIED
+            (gtk_window.window.state & \
+             Gdk::EventWindowState::ICONIFIED).nonzero?
             gtk_window.iconify()
           end
         end
@@ -135,8 +135,8 @@ module Surface
         for surface_window in @window
           gtk_window = surface_window.get_window
           if gtk_window != window and \
-            gtk_window.window.state & \
-            Gdk::EventWindowState::ICONIFIED
+            (gtk_window.window.state & \
+             Gdk::EventWindowState::ICONIFIED).nonzero?
             gtk_window.deiconify()
           end
         end
@@ -152,24 +152,25 @@ module Surface
     end
 
     def key_press(window, event)
-      name = @keymap_old.get(event.keyval, event.string)
-      keycode = @keymap_new.get(event.keyval, event.string)
-      if event.type == Gdk.EventType.KEY_RELEASE
+      name = Keymap::Keymap_old[event.keyval]
+      keycode = Keymap::Keymap_new[event.keyval]
+      if event.event_type == Gdk::Event::KEY_RELEASE
         @key_press_count = 0
         return true
       end
-      if not (event.type == Gdk.EventType.KEY_PRESS)
+      if not (event.event_type == Gdk::Event::KEY_PRESS)
         return false
       end
       @key_press_count += 1
-      if event.state & \
-        (Gdk::Window::ModifierType::CONTROL_MASK | Gdk::Window::ModifierType::SHIFT_MASK)
+      if (event.state & \
+          (Gdk::Window::ModifierType::CONTROL_MASK | \
+           Gdk::Window::ModifierType::SHIFT_MASK)).nonzero?
         if name == 'f12'
-          logging.info('reset surface position')
+          #logging.info('reset surface position')
           reset_position()
         end
         if name == 'f10'
-          logging.info('reset balloon offset')
+          #logging.info('reset balloon offset')
           for side in [e-mail]-1
             set_balloon_offset(side, nil)
           end
@@ -177,8 +178,8 @@ module Surface
       end
       if name or keycode
         @parent.handle_request(
-                               'NOTIFY', 'notify_event', 'OnKeyPress', name, keycode,
-                               @key_press_count)
+          'NOTIFY', 'notify_event', 'OnKeyPress', name, keycode,
+          @key_press_count)
       end
       return true
     end
@@ -193,16 +194,12 @@ module Surface
       end
     end
 
-    #re_surface_id = re.compile('^surface([0-9]+)$')
-    #RE_SURFACE_ID = re.compile('^surface([0-9]+)$')
     RE_SURFACE_ID = Regexp.new('^surface([0-9]+)$')
 
     def get_seriko(surface)
       seriko = {}
       for basename in surface.keys
         path, config = surface[basename]
-#      for basename, (path, config) in surface.items()
-        #match = re_surface_id.match(basename)
         match = RE_SURFACE_ID.match(basename)
         if not match
           next
@@ -236,7 +233,6 @@ module Surface
       maxheight = 0
       for basename in surface.keys
         path, config = surface[basename]
-#      for basename, (path, config) in surface.items()
         if path == nil
           next
         end
@@ -247,9 +243,8 @@ module Surface
           if not File.exists?(dgp_path)
             ddp_path = [name, '.ddp'].join('')
             if not File.exists?(ddp_path)
-#              logging.error(
-#                            '{0}: file not found (ignored)'.format(path))
-              print(path + ': file not found (ignored)' + "\n")
+              #logging.error(
+              #  '{0}: file not found (ignored)'.format(path))
               next
             else
               path = ddp_path
@@ -262,7 +257,6 @@ module Surface
         w, h = Pix.get_png_size(path)
         maxwidth = [maxwidth, w].max
         maxheight = [maxheight, h].max
-        #match = re_surface_id.match(basename)
         match = RE_SURFACE_ID.match(basename)
         if not match
           next
@@ -274,16 +268,13 @@ module Surface
       composite_surface = {}
       for basename in surface.keys
         path, config = surface[basename]
-#      for basename, (path, config) in surface.items()
-        #match = re_surface_id.match(basename)
         match = RE_SURFACE_ID.match(basename)
         if not match
           next
         end
         key = match[1]
         if config.include?('element0')
-#          logging.debug('surface {0}'.format(key))
-          print('surface ' + key.to_s, "\n")
+          #logging.debug('surface {0}'.format(key))
           composite_surface[key] = compose_elements(elements, config)
         end
       end
@@ -292,7 +283,7 @@ module Surface
       for key in [default_sakura, default_kero]
         if not surfaces.include?(key.to_s)
           raise SystemExit(
-                           'cannot load default surface #' + key.to_s + ' (abort)\n')
+                  'cannot load default surface #' + key.to_s + ' (abort)\n')
         end
       end
       @__surfaces = surfaces
@@ -300,8 +291,6 @@ module Surface
       region = {}
       for basename in surface.keys
         path, config = surface[basename]
-#      for basename, (path, config) in surface.items()
-        #match = re_surface_id.match(basename)
         match = RE_SURFACE_ID.match(basename)
         if not match
           next
@@ -320,12 +309,10 @@ module Surface
             next
           end
           begin
-            for value in values[0, 4]
-              x1 = value[0].to_i
-              y1 = value[1].to_i
-              x2 = value[2].to_i
-              y2 = value[3].to_i
-            end
+            x1 = values[0].to_i
+            y1 = values[1].to_i
+            x2 = values[2].to_i
+            y2 = values[3].to_i
           rescue # except ValueError:
             next
           end
@@ -338,14 +325,13 @@ module Surface
             next
           end
           begin
-            for value in rect.split(',')
-              x1 = value[0].to_i
-              y1 = value[1].to_i
-              x2 = value[2].to_i
-              y2 = value[3].to_i
-            end
+            values = rect.split(',')
+            x1 = values[0].to_i
+            y1 = values[1].to_i
+            x2 = values[2].to_i
+            y2 = values[3].to_i
           rescue # except ValueError:
-            pass
+            #pass
           end
           buf << [part.capitalize(), x1, y1, x2, y2].join('')
         end
@@ -356,8 +342,6 @@ module Surface
       mayuna = {}
       for basename in surface.keys
         path, config = surface[basename]
-#      for basename, (path, config) in surface.items()
-        #match = re_surface_id.match(basename)
         match = RE_SURFACE_ID.match(basename)
         if not match
           next
@@ -409,22 +393,16 @@ module Surface
     end
 
     def get_menu_fontcolor
-      fontcolor_r = @desc.get_with_type(
-                                        'menu.background.font.color.r', int, 0)
-      fontcolor_g = @desc.get_with_type(
-                                        'menu.background.font.color.g', int, 0)
-      fontcolor_b = @desc.get_with_type(
-                                        'menu.background.font.color.b', int, 0)
+      fontcolor_r = @desc.get('menu.background.font.color.r', 0).to_i
+      fontcolor_g = @desc.get('menu.background.font.color.g', 0).to_i
+      fontcolor_b = @desc.get('menu.background.font.color.b', 0).to_i
       fontcolor_r = [0, [255, fontcolor_r].min].max
       fontcolor_g = [0, [255, fontcolor_g].min].max
       fontcolor_b = [0, [255, fontcolor_b].min].max
       background = [fontcolor_r, fontcolor_g, fontcolor_b]
-      fontcolor_r = @desc.get_with_type(
-                                        'menu.foreground.font.color.r', int, 0)
-      fontcolor_g = @desc.get_with_type(
-                                        'menu.foreground.font.color.g', int, 0)
-      fontcolor_b = @desc.get_with_type(
-                                        'menu.foreground.font.color.b', int, 0)
+      fontcolor_r = @desc.get('menu.foreground.font.color.r', 0).to_i
+      fontcolor_g = @desc.get('menu.foreground.font.color.g', 0).to_i
+      fontcolor_b = @desc.get('menu.foreground.font.color.b', 0).to_i
       fontcolor_r = [0, [255, fontcolor_r].min].max
       fontcolor_g = [0, [255, fontcolor_g].min].max
       fontcolor_b = [0, [255, fontcolor_b].min].max
@@ -455,9 +433,9 @@ module Surface
       bind = {}
       for index in 0..127
         group = @desc.get(
-                          name + '.bindgroup' + index.to_i.to_s + '.name', nil)
+          name + '.bindgroup' + index.to_i.to_s + '.name', nil)
         default = @desc.get(
-                            name + '.bindgroup' + index.to_i.to_s + '.default', 0)
+          name + '.bindgroup' + index.to_i.to_s + '.default', 0)
         if group != nil
           bind[index] = [group, default]
         end
@@ -471,7 +449,7 @@ module Surface
           begin
             key = key.to_i
           rescue # except:
-            pass
+            #pass
           else
             if bind.include?(key)
               group = bind[key][0].split(',')
@@ -488,10 +466,10 @@ module Surface
         tooltips = @__tooltips[name]
       end
       surface_window = SurfaceWindow.new(
-                                         gtk_window, side, @desc, surface_alias, @__surface, tooltips,
-                                         @__surfaces, seriko, @__region, mayuna, bind,
-                                         default_id, @maxsize)
-      surface_window.set_responsible(self)#.handle_request)
+        gtk_window, side, @desc, surface_alias, @__surface, tooltips,
+        @__surfaces, seriko, @__region, mayuna, bind,
+        default_id, @maxsize)
+      surface_window.set_responsible(self)
       @window << surface_window
     end
 
@@ -517,7 +495,6 @@ module Surface
         for value in config[key].split(',')
           spec << value.strip()
         end
-#            spec = [value.strip() for value in config[key].split(',')]
         begin
           method, filename, x, y = spec
           x = x.to_i
@@ -550,12 +527,10 @@ module Surface
           error = 'unknown method for ' + key + ': ' + method
           break
         end
-#        logging.debug(key + ': ' + meyhod + ' ' + filename + ', x=' + x.to_i.to_s + ', y=' + y.to_i.to_s)
-        print(key + ': ' + method + ' ' + filename + ', x=' + x.to_i.to_s + ', y=' + y.to_i.to_s, "\n")
+        #logging.debug(key + ': ' + meyhod + ' ' + filename + ', x=' + x.to_i.to_s + ', y=' + y.to_i.to_s)
       end
       if error != nil
-#        logging.error(error)
-        print(error, "\n")
+        #logging.error(error)
         surface_list = []
       end
       return surface_list
@@ -676,11 +651,11 @@ module Surface
           x = left + scrn_w - w
         else
           b0w, b0h = @parent.handle_request(
-                                            'GET', 'get_balloon_size', side - 1)
+                 'GET', 'get_balloon_size', side - 1)
           b1w, b1h = @parent.handle_request(
-                                            'GET', 'get_balloon_size', side)
+                 'GET', 'get_balloon_size', side)
           bpx, bpy = @parent.handle_request(
-                                            'GET', 'get_balloon_windowposition', side)
+                 'GET', 'get_balloon_windowposition', side)
           o0x, o0y = get_balloon_offset(side - 1)
           o1x, o1y = get_balloon_offset(side)
           offset = [0, b1w - (b0w - o0x)].max
@@ -925,8 +900,14 @@ module Surface
       end
       x1, y1 = get_position(1)
       s1w, s1h = get_surface_size(1)
-      if (x0 < x1 + s1w / 2 < x0 + s0w and y0 < y1 + s1h / 2 < y0 + s0h) or \
-        (x1 < x0 + s0w / 2 < x1 + s1w and y1 < y0 + s0h / 2 < y1 + s1h)
+      if (x0 < x1 + s1w / 2 and
+          x1 + s1w / 2 < x0 + s0w and
+          y0 < y1 + s1h / 2 and
+          y1 + s1h / 2 < y0 + s0h) or
+        (x1 < x0 + s0w / 2 and
+         x0 + s0w / 2 < x1 + s1w and
+         y1 < y0 + s0h / 2 and
+         y0 + s0h / 2 < y1 + s1h)
         kasanari = true
       else
         kasanari = false
@@ -955,7 +936,7 @@ module Surface
       @surfaces = surfaces
       @image_surface = nil # XXX
       @seriko = Seriko::Controller.new(seriko)
-      @seriko.set_responsible(self)#.handle_request)
+      @seriko.set_responsible(self)
       @region = region
       @mayuna = mayuna
       @bind = bind
@@ -1007,11 +988,10 @@ module Surface
         end
       end
       # DnD data types
-## FIXME
-#      dnd_targets = [Gtk.TargetEntry.new('text/uri-list', 0, 0)]
-#      @darea.drag_dest_set(Gtk.DestDefaults.ALL, dnd_targets,
-#                           Gdk.DragAction.COPY)
-#      @darea.drag_dest_add_uri_targets()
+      dnd_targets = [['text/uri-list', 0, 0]]
+      @darea.drag_dest_set(Gtk::Drag::DestDefaults::ALL, dnd_targets,
+                           Gdk::DragContext::Action::COPY)
+      @darea.drag_dest_add_uri_targets()
     end
 
     def get_seriko
@@ -1031,8 +1011,8 @@ module Surface
         @parent.handle_request('NOTIFY', 'reset_position') # XXX
         left, top, scrn_w, scrn_h = Pix.get_workarea()
         @parent.handle_request(
-                               'NOTIFY', 'notify_event', 'OnDisplayChange',
-                               Gdk.Visual.get_best_depth(), scrn_w, scrn_h)
+          'NOTIFY', 'notify_event', 'OnDisplayChange',
+          Gdk.Visual.get_best_depth(), scrn_w, scrn_h)
       end
     end
 
@@ -1040,19 +1020,18 @@ module Surface
       @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 = {
             }
       if handlers.include?(event)
-        result = handlers[event].call #( *arglist, **argdict)
+        result = handlers[event].call # no argument
       else
-#      handler = handlers.get(event, getattr(self, event, nil))
-#      if handler == nil
-        result = @parent.handle_request(
-                                        event_type, event, *arglist, **argdict)
-#      else
-#        result = handler(*arglist, **argdict)
+        if SurfaceWindow.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
@@ -1067,7 +1046,7 @@ module Surface
     def direction=(direction)
       @__direction = direction # 0: left, 1: right
       @parent.handle_request(
-                             'NOTIFY', 'set_balloon_direction', @side, direction)
+        'NOTIFY', 'set_balloon_direction', @side, direction)
     end
 
 #    @property
@@ -1082,18 +1061,10 @@ module Surface
         side = @side
         if side == 0
           name = 'sakura'
-#          x = config.get_with_type(
-#                                   name + '.balloon.offsetx', int)
-#          y = config.get_with_type(
-#                                   name + '.balloon.offsety', int)
           x = config.get(name + '.balloon.offsetx').to_i
           y = config.get(name + '.balloon.offsety').to_i
         elsif side == 1
           name = 'kero'
-#          x = config.get_with_type(
-#                                   name + '.balloon.offsetx', int)
-#          y = config.get_with_type(
-#                                   name + '.balloon.offsety', int)
           x = config.get(name + '.balloon.offsetx').to_i
           y = config.get(name + '.balloon.offsety').to_i
         else
@@ -1101,8 +1072,6 @@ module Surface
           x, y = nil, nil # XXX
         end
         if x == nil
-#          x = @desc.get_with_type(
-#                                  name + '.balloon.offsetx', int, 0)
           x = @desc.get(name + '.balloon.offsetx')
           if x == nil
             x = 0
@@ -1111,8 +1080,6 @@ module Surface
           end
         end
         if y == nil
-#          y = @desc.get_with_type(
-#                                  name + '.balloon.offsety', int, 0)
           y = @desc.get(name + '.balloon.offsety')
           if y == nil
             y = 0
@@ -1143,8 +1110,8 @@ module Surface
       end
       if filelist
         @parent.handle_request(
-                               'NOTIFY', 'enqueue_event',
-                               'OnFileDrop2', chr(1).join(filelist), @side)
+          'NOTIFY', 'enqueue_event',
+          'OnFileDrop2', chr(1).join(filelist), @side)
       end
     end
 
@@ -1185,7 +1152,7 @@ module Surface
         @seriko.terminate(self)
       end
       if ['-1', '-2'].include?(surface_id)
-        pass
+        #pass
       elsif not @surfaces.include?(surface_id)
         @surface_id = @default_id
       else
@@ -1222,13 +1189,13 @@ module Surface
       w, h = get_surface_size(@surface_id)
       new_x, new_y = get_position()
       @parent.handle_request(
-                             'NOTIFY', 'notify_event',
-                             'OnSurfaceChange',
-                             @parent.handle_request('GET', 'get_surface_id', 0),
-                             @parent.handle_request('GET', 'get_surface_id', 1),
-                             [@side, @surface_id, w, h].join(','),
-                             prev_id.to_s,
-                             [new_x, new_y, new_x + w, new_y + h].join(','))
+        'NOTIFY', 'notify_event',
+        'OnSurfaceChange',
+        @parent.handle_request('GET', 'get_surface_id', 0),
+        @parent.handle_request('GET', 'get_surface_id', 1),
+        [@side, @surface_id, w, h].join(','),
+        prev_id.to_s,
+        [new_x, new_y, new_x + w, new_y + h].join(','))
       update_frame_buffer() #XXX
     end
 
@@ -1277,10 +1244,9 @@ module Surface
       end
       begin
         surface = Pix.create_surface_from_file(
-                                               @surfaces[surface_id][0], is_pnr=is_pnr, use_pna=use_pna)
+          @surfaces[surface_id][0], is_pnr=is_pnr, use_pna=use_pna)
       rescue # except:
-#        logging.debug('cannot load surface #{0}'.format(surface_id))
-        print('cannot load surface #' + surface_id, "\n")
+        #logging.debug('cannot load surface #{0}'.format(surface_id))
         return Pix.create_blank_surface(100, 100)
       end
       for element, x, y, method in @surfaces[surface_id][1, @surfaces[surface_id].length - 1]
@@ -1291,10 +1257,10 @@ module Surface
           else
             is_pnr = true
             use_pna = @parent.handle_request(
-                                             'GET', 'get_preference', 'use_pna')
+              'GET', 'get_preference', 'use_pna')
           end
           overlay = Pix.create_surface_from_file(
-                                                 element, is_pnr=is_pnr, use_pna=use_pna)
+            element, is_pnr=is_pnr, use_pna=use_pna)
         rescue # except:
           next
         end
@@ -1322,8 +1288,7 @@ module Surface
 
     def get_image_surface(surface_id, is_asis=false)
       if not @surfaces.include?(surface_id)
-#        logging.debug('cannot load surface #{0}'.format(surface_id))
-        print('cannot load surface #' + surface_id.to_s, "\n")
+        #logging.debug('cannot load surface #{0}'.format(surface_id))
         return Pix.create_blank_surface(100, 100)
       end
       return create_surface_from_file(surface_id, is_asis=is_asis)
@@ -1347,13 +1312,10 @@ module Surface
           font_desc = Pango::FontDescription.new
           font_desc.set_size(8 * Pango::SCALE)
           layout = cr.create_pango_layout
-#          layout = Pango::Layout.new(@darea.pango_context)
           layout.set_font_description(font_desc)
           layout.set_wrap(Pango::WRAP_WORD_CHAR) # XXX
           layout.set_text(part)
           cr.show_pango_layout(layout)
-#          PangoCairo.update_layout(cr, layout)
-#          PangoCairo.show_layout(cr, layout)
         end
         cr.set_operator(Cairo::OPERATOR_ATOP)
         cr.set_source_rgba(0.2, 0.0, 0.0, 0.4) # XXX
@@ -1415,7 +1377,7 @@ module Surface
       for surface_id, x, y, method in @seriko.iter_overlays()
         begin
           overlay_surface = get_image_surface(
-                                              surface_id, is_asis=(method == 'asis'))
+            surface_id, is_asis=(method == 'asis'))
         rescue # except:
           next
         end
@@ -1437,7 +1399,7 @@ module Surface
         else
           cr.paint()
         end
-#        del cr
+        #del cr
       end
       @image_surface = new_surface
       @darea.queue_draw()
@@ -1471,7 +1433,7 @@ module Surface
       if @side < 2
         args = [@side, xoffset, yoffset]
         @parent.handle_request(
-                               'NOTIFY', 'notify_observer', 'move surface', args) # animation
+          'NOTIFY', 'notify_observer', 'move surface', args) # animation
       end
     end
 
@@ -1526,33 +1488,45 @@ module Surface
       end
       for part, x1, y1, x2, y2 in @collisions
         if x1 <= x and x <= x2 and y1 <= y and y <= y2
-          ##logging.debug('{0} touched'.format(part))
+          #logging.debug('{0} touched'.format(part))
           return part
         end
       end
       return ''
     end
 
-    def __get_with_scaling(name, conv)
+    def __get_with_scaling(name)
       basename = ['surface', @surface_id].join('')
       path, config = @surface_info[basename]
-      value = config.get_with_type(name, conv)
+      value = config.get(name)
       if value != nil
         scale = get_scale
-        value = conv(value * scale / 100)
+        value = value.to_f * scale / 100
       end
       return value
     end
 
     def get_center
-      centerx = __get_with_scaling('point.centerx', int)
-      centery = __get_with_scaling('point.centery', int)
+      centerx = __get_with_scaling('point.centerx')
+      centery = __get_with_scaling('point.centery')
+      if centerx
+        centerx = centerx.to_i
+      end
+      if centery
+        centery = centery.to_i
+      end
       return centerx, centery
     end
 
     def get_kinoko_center
-      centerx = __get_with_scaling('point.kinoko.centerx', int)
-      centery = __get_with_scaling('point.kinoko.centery', int)
+      centerx = __get_with_scaling('point.kinoko.centerx')
+      centery = __get_with_scaling('point.kinoko.centery')
+      if centerx
+        centerx = centerx.to_i
+      end
+      if centery
+        centery = centery.to_i
+      end
       return centerx, centery
     end
 
@@ -1582,7 +1556,7 @@ module Surface
       end
       base_y = new_y + oy
       @parent.handle_request(
-                             'NOTIFY', 'set_balloon_position', @side, base_x, base_y)
+        'NOTIFY', 'set_balloon_position', @side, base_x, base_y)
       @parent.handle_request('NOTIFY', 'notify_observer', 'set position')
       @parent.handle_request('NOTIFY', 'check_mikire_kasanari')
     end
@@ -1615,7 +1589,7 @@ module Surface
         sy = top
         set_position(sx, sy)
       else # free
-        pass
+        #pass
       end
     end
 
@@ -1652,69 +1626,65 @@ module Surface
         @window.hide()
         @__shown = false
         @parent.handle_request(
-                               'NOTIFY', 'notify_observer', 'hide', (@side))
+          'NOTIFY', 'notify_observer', 'hide', (@side))
       end
     end
 
     def raise_
-      @window.get_window().raise_()
+      @window.window.raise_()
       @parent.handle_request('NOTIFY', 'notify_observer', 'raise', (@side))
     end
 
     def lower
-      @window.get_window().lower()
+      @window.window.lower()
       @parent.handle_request('NOTIFY', 'notify_observer', 'lower', (@side))
     end
 
     def button_press(window, event)
       @parent.handle_request('NOTIFY', 'reset_idle_time')
       x, y = @window.winpos_to_surfacepos(
-                                          event.x.to_i, event.y.to_i, get_scale)
+           event.x.to_i, event.y.to_i, get_scale)
       @x_root = event.x_root
       @y_root = event.y_root
       # automagical raise
       @parent.handle_request('NOTIFY', 'notify_observer', 'raise', (@side))
       if event.event_type == Gdk::Event::BUTTON2_PRESS
-        click_count = 2
-      else
-        click_count = 1
-      end
-      ## FIXME
-      #delivered, click_count = event.get_click_count()
-      #if delivered
-      if true
-        @click_count = click_count
-        if [1, 2, 3].include?(event.button)
-          num_button = [0, 2, 1][event.button - 1]
-          @parent.handle_request('NOTIFY', 'notify_event', 'OnMouseDown',
-                                 x, y, 0, @side, @__current_part,
-                                 num_button,
-                                 'mouse') # FIXME
-        end
-        if [2, 8, 9].include?(event.button)
-          ex_button = {
-            2 => 'middle',
-            8 => 'xbutton1',
-            9 => 'xbutton2'
-          }[event.button]
-          @parent.handle_request('NOTIFY', 'notify_event', 'OnMouseDownEx',
-                                 x, y, 0, @side, @__current_part,
-                                 ex_button,
-                                 'mouse') # FIXME
-        end
+        @click_count = 2
+      else # XXX
+        @click_count = 1
+      end
+      if [1, 2, 3].include?(event.button)
+        num_button = [0, 2, 1][event.button - 1]
+        @parent.handle_request('NOTIFY', 'notify_event', 'OnMouseDown',
+                               x, y, 0, @side, @__current_part,
+                               num_button,
+                               'mouse') # FIXME
+      end
+      if [2, 8, 9].include?(event.button)
+        ex_button = {
+          2 => 'middle',
+          8 => 'xbutton1',
+          9 => 'xbutton2'
+        }[event.button]
+        @parent.handle_request('NOTIFY', 'notify_event', 'OnMouseDownEx',
+                               x, y, 0, @side, @__current_part,
+                               ex_button,
+                               'mouse') # FIXME
       end
       return true
     end
 
+    CURSOR_HAND1 = Gdk::Cursor.new(Gdk::Cursor::Type::HAND1)
+
     def button_release(window, event)
       x, y = @window.winpos_to_surfacepos(
-                                          event.x.to_i, event.y.to_i, get_scale)
+           event.x.to_i, event.y.to_i, get_scale)
       if @dragged
         @dragged = false
         set_alignment_current()
         @parent.handle_request(
-                               'NOTIFY', 'notify_event',
-                               'OnMouseDragEnd', x, y, '', @side, @__current_part, '')
+          'NOTIFY', 'notify_event',
+          'OnMouseDragEnd', x, y, '', @side, @__current_part, '')
       end
       @x_root = nil
       @y_root = nil
@@ -1738,10 +1708,10 @@ module Surface
       if part != @__current_part
         if part == ''
           @window.set_tooltip_text('')
-          @darea.get_window().set_cursor(nil)
+          @darea.window.set_cursor(nil)
           @parent.handle_request(
-                                 'NOTIFY', 'notify_event',
-                                 'OnMouseLeave', x, y, '', @side, @__current_part)
+            'NOTIFY', 'notify_event',
+            'OnMouseLeave', x, y, '', @side, @__current_part)
         else
           if @tooltips.include?(part)
             tooltip = @tooltips[part]
@@ -1749,23 +1719,22 @@ module Surface
           else
             @window.set_tooltip_text('')
           end
-          cursor = Gdk.Cursor.new(Gdk.CursorType.HAND1)
-          @darea.get_window().set_cursor(cursor)
+          @darea.window.set_cursor(CURSOR_HAND1)
           @parent.handle_request(
-                                 'NOTIFY', 'notify_event',
-                                 'OnMouseEnter', x, y, '', @side, part)
+            'NOTIFY', 'notify_event',
+            'OnMouseEnter', x, y, '', @side, part)
         end
       end
       @__current_part = part
       if not @parent.handle_request('GET', 'busy')
-        if state & Gdk.ModifierType.BUTTON1_MASK
+        if (state & Gdk::Window::ModifierType::BUTTON1_MASK).nonzero?
           if @x_root != nil and \
             @y_root != nil
             if not @dragged
               @parent.handle_request(
-                                     'NOTIFY', 'notify_event',
-                                     'OnMouseDragStart', x, y, '',
-                                     @side, @__current_part, '')
+                'NOTIFY', 'notify_event',
+                'OnMouseDragStart', x, y, '',
+                @side, @__current_part, '')
             end
             @dragged = true
             x_delta = (event.x_root - @x_root).to_i
@@ -1775,9 +1744,9 @@ module Surface
             @x_root = event.x_root
             @y_root = event.y_root
           end
-        elsif state & Gdk.ModifierType.BUTTON2_MASK or \
-          state & Gdk.ModifierType.BUTTON3_MASK
-          pass
+        elsif (state & Gdk::Window::ModifierType::BUTTON2_MASK).nonzero? or \
+             (state & Gdk::Window::ModifierType::BUTTON3_MASK).nonzero?
+          #pass
         else
           @parent.handle_request('NOTIFY', 'notify_surface_mouse_motion',
                                  @side, x, y, part)
@@ -1788,10 +1757,10 @@ module Surface
 
     def scroll(darea, event)
       x, y = @window.winpos_to_surfacepos(
-                                          event.x.to_i, event.y.to_i, get_scale)
-      if event.direction == Gdk.ScrollDirection.UP
+           event.x.to_i, event.y.to_i, get_scale)
+      if event.direction == Gdk::EventScroll::UP
         count = 1
-      elsif event.direction == Gdk.ScrollDirection.DOWN
+      elsif event.direction == Gdk::EventScroll::DOWN
         count = -1
       else
         count = 0
@@ -1838,13 +1807,13 @@ module Surface
       x, y = @window.winpos_to_surfacepos(x, y, get_scale)
       if @__current_part != '' # XXX
         @parent.handle_request(
-                               'NOTIFY', 'notify_event',
-                               'OnMouseLeave', x, y, '', @side, @__current_part)
+          'NOTIFY', 'notify_event',
+          'OnMouseLeave', x, y, '', @side, @__current_part)
         @__current_part = ''
       end
       @parent.handle_request(
-                             'NOTIFY', 'notify_event',
-                             'OnMouseLeaveAll', x, y, '', @side, '')
+        'NOTIFY', 'notify_event',
+        'OnMouseLeaveAll', x, y, '', @side, '')
       return true
     end
   end

--- a/test/test-balloon.rb
+++ b/test/test-balloon.rb
@@ -14,8 +14,8 @@ module NinixTest
       balloon.new_(*balloons[key])
       balloon.set_balloon(0, 0)
       balloon.set_balloon(1, 0)
-      balloon.set_position(0, 200, 200)
-      balloon.set_position(1, 100, 100)
+      balloon.set_position(0, 400, 200)
+      balloon.set_position(1, 200, 100)
       balloon.show(0)
       balloon.show(1)
       balloon.show_sstp_message("TEST: SSTP", "TEST class")

--- a/test/test-kinoko.rb
+++ b/test/test-kinoko.rb
@@ -44,6 +44,9 @@ module NinixTest
     def attach_observer(arg) # dummy
     end
 
+    def detach_observer(arg) # dummy
+    end
+
     def get_surface_scale() # dummy
       return 100
     end