コミット: 3a5bb10018a848d0d867acf2391387b1c4366e2d - ruby-gtk3 (git)

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

コミットメタ情報

• リビジョン: 3a5bb10018a848d0d867acf2391387b1c4366e2d (tree)
• 日時: 2019-01-04 13:10:28
• 作者: Shyouzou Sugitani <shy@user...>
• コミッター: Shyouzou Sugitani

ログメッセージ

reduce the drawing load(2)

変更サマリ

• modified: ChangeLog
• modified: lib/ninix/balloon.rb
• modified: lib/ninix/dll/bln.rb
• modified: lib/ninix/kinoko.rb
• modified: lib/ninix/nekodorif.rb
• modified: lib/ninix/pix.rb
• modified: lib/ninix/surface.rb

差分

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri January 4 2019   Shyouzou Sugitani <[e-mail]>
+	* 描画処理の負荷低減を「猫どりふ」、「きのこ」、"easyballoon"
+	  まで拡大した.
+
 Thu January 3 2019   Shyouzou Sugitani <[e-mail]>
 	* 5.0.7のバルーンに対する変更から着想を得て
 	  描画処理の負荷低減を更に進め、

--- a/lib/ninix/balloon.rb
+++ b/lib/ninix/balloon.rb
@@ -455,7 +455,6 @@ module Balloon
       @x_fractions = 0
       @y_fractions = 0
       @reshape = true
-      @translate = [0, 0]
       @darea = @window.darea
       @darea.set_events(Gdk::EventMask::EXPOSURE_MASK|
                         Gdk::EventMask::BUTTON_PRESS_MASK|
@@ -806,10 +805,9 @@ module Balloon
       if y < top # XXX
         y = top
       end
-      @translate = [x, y].zip(@position).map {|new, prev| new - prev}
       @position = [x, y]
       __move()
-      end
+    end
 
     def get_position
       @position
@@ -1055,13 +1053,8 @@ module Balloon
       update_link_region(widget, cr, @selection) unless @selection.nil?
       redraw_arrow0(widget, cr)
       redraw_arrow1(widget, cr)
-      if @reshape
-        @window.set_shape(cr)
-      else
-        @window.translate(cr, *@translate)
-      end
+      @window.set_shape(cr, @reshape)
       @reshape = false
-      @translate = [0, 0]
       return false
     end
 

--- a/lib/ninix/dll/bln.rb
+++ b/lib/ninix/dll/bln.rb
@@ -258,6 +258,7 @@ module Bln
         destroy()
         return
       end
+      @reshape = true
       @balloon_surface = balloon_surface
       w = balloon_surface.width
       h = balloon_surface.height
@@ -763,7 +764,8 @@ module Bln
         cr.move_to(@left.to_i, @top.to_i)
         cr.show_pango_layout(@layout)
       end
-      @window.set_shape(cr)
+      @window.set_shape(cr, @reshape)
+      @reshape = false
     end
 
     def get_state

--- a/lib/ninix/kinoko.rb
+++ b/lib/ninix/kinoko.rb
@@ -277,6 +277,7 @@ module Kinoko
       @seriko.set_responsible(self)
       path = File.join(@data['dir'], @data['base'])
       begin
+        @reshape = true
         @image_surface = Pix.create_surface_from_file(path)
         w = [8, (@image_surface.width * @__scale / 100).to_i].max
         h = [8, (@image_surface.height * @__scale / 100).to_i].max
@@ -375,7 +376,8 @@ module Kinoko
 
     def redraw(widget, cr)
       @window.set_surface(cr, @image_surface, @__scale)
-      @window.set_shape(cr)
+      @window.set_shape(cr, @reshape)
+      @reshape = false
     end
 
     def get_image_surface(surface_id)
@@ -399,6 +401,7 @@ module Kinoko
     end
 
     def update_frame_buffer()
+      @reshape = true # FIXME: depends on Seriko
       new_surface = create_image_surface(@seriko.get_base_id)
       raise "assert" if new_surface.nil?
       # draw overlays

--- a/lib/ninix/nekodorif.rb
+++ b/lib/ninix/nekodorif.rb
@@ -335,7 +335,8 @@ module Nekodorif
 
     def redraw(widget, cr)
       @window.set_surface(cr, @image_surface, @__scale)
-      @window.set_shape(cr)
+      @window.set_shape(cr, @reshape)
+      @reshape = false
     end
 
     def delete(widget, event)
@@ -395,6 +396,7 @@ module Nekodorif
         return
       end
       @w, @h = w, h
+      @reshape = true
       @image_surface = new_surface
       @darea.queue_draw()
     end
@@ -553,7 +555,8 @@ module Nekodorif
 
     def redraw(widget, cr)
       @window.set_surface(cr, @image_surface, @__scale)
-      @window.set_shape(cr)
+      @window.set_shape(cr, @reshape)
+      @reshape = false
     end
 
     def set_movement(timing)
@@ -635,6 +638,7 @@ module Nekodorif
         return
       end
       @w, @h = w, h
+      @reshape = true
       @image_surface = new_surface
       @darea.queue_draw()
     end

--- a/lib/ninix/pix.rb
+++ b/lib/ninix/pix.rb
@@ -91,6 +91,7 @@ module Pix
       set_app_paintable(true)
       set_focus_on_map(false)
       @__surface_position = [0, 0]
+      @prev_position = [0, 0]
       # create drawing area
       @darea = Gtk::DrawingArea.new
       @darea.set_size_request(*size) # XXX
@@ -132,31 +133,21 @@ module Pix
       cr.restore()
     end
 
-    def set_shape(cr)
+    def set_shape(cr, reshape)
       return if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
-      region = Pix.surface_to_region(cr.target.map_to_image)
+      if @region.nil? or reshape
+        @region = Pix.surface_to_region(cr.target.map_to_image)
+      else
+        dx, dy = @__surface_position.zip(@prev_position).map {|new, prev| new - prev}
+        @region.translate!(dx, dy)
+      end
+      @prev_position = @__surface_position
       if @supports_alpha
         input_shape_combine_region(nil)
-        input_shape_combine_region(region)
+        input_shape_combine_region(@region)
       else
         shape_combine_region(nil)
-        shape_combine_region(region)
-      end
-      @region = region
-    end
-
-    def translate(cr, x, y)
-      if @region.nil?
-        set_shape(cr)
-      else
-        @region.translate!(x, y)
-        if @supports_alpha
-          input_shape_combine_region(nil)
-          input_shape_combine_region(@region)
-        else
-          shape_combine_region(nil)
-          shape_combine_region(@region)
-        end
+        shape_combine_region(@region)
       end
     end
   end

--- a/lib/ninix/surface.rb
+++ b/lib/ninix/surface.rb
@@ -912,7 +912,6 @@ module Surface
       @click_count = 0
       @__balloon_offset = nil
       @reshape = true
-      @translate = [0, 0]
       @window.signal_connect('leave_notify_event') do |w, e|
         next window_leave_notify(w, e) # XXX
       end
@@ -1308,7 +1307,7 @@ module Surface
 
     def update_frame_buffer
       return if @parent.handle_request('GET', 'lock_repaint')
-      @reshape = true
+      @reshape = true # FIXME: depends on Seriko
       new_surface = create_image_surface(@seriko.get_base_id)
       fail "assert" if new_surface.nil?
       # update collision areas
@@ -1350,13 +1349,8 @@ module Surface
       unless @parent.handle_request('GET', 'get_preference', 'check_collision').zero?
         draw_region(cr)
       end
-      if @reshape
-        @window.set_shape(cr)
-      else
-        @window.translate(cr, *@translate)
-      end
+      @window.set_shape(cr, @reshape)
       @reshape = false
-      @translate = [0, 0]
     end
 
     def remove_overlay(actor)
@@ -1472,7 +1466,6 @@ module Surface
 
     def set_position(x, y)
       return if @parent.handle_request('GET', 'lock_repaint')
-      @translate = [x, y].zip(@position).map {|new, prev| new - prev}
       @position = [x, y]
       new_x, new_y = get_position()
       @window.move(new_x, new_y)
@@ -1544,6 +1537,7 @@ module Surface
     def show
       return if @parent.handle_request('GET', 'lock_repaint')
       return if @__shown
+      @reshape = true
       @__shown = true
       x, y = get_position()
       @window.move(x, y) # XXX: call before showing the window