コミット: 57dc26d0b131baddc3b57fb4b723c3dba63ec32a - ruby-gtk3 (git)

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

コミットメタ情報

• リビジョン: 57dc26d0b131baddc3b57fb4b723c3dba63ec32a (tree)
• 日時: 2019-01-06 22:22:58
• 作者: Shyouzou Sugitani <shy@user...>
• コミッター: Shyouzou Sugitani

ログメッセージ

introduce Gtk::ApplicationWindow

変更サマリ

• modified: ChangeLog
• modified: lib/ninix/balloon.rb
• modified: lib/ninix/dll/bln.rb
• modified: lib/ninix/dll/osuwari.rb
• modified: lib/ninix/dll/wmove.rb
• modified: lib/ninix/nekodorif.rb
• modified: lib/ninix/pix.rb
• modified: lib/ninix/sakura.rb
• modified: lib/ninix/surface.rb
• modified: lib/ninix_main.rb

差分

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 Sun January 6 2019   Shyouzou Sugitani <[e-mail]>
+	* Gtk::ApplicationWindowを生成し、画面サイズ算出に利用するようにした.
 	* Gtk::Applicationを使用するようにした.
 	* AYA, AYA5互換モジュールにおいてFixnum(deprecated)を
 	  使用しないよう修正した.

--- a/lib/ninix/balloon.rb
+++ b/lib/ninix/balloon.rb
@@ -798,7 +798,7 @@ module Balloon
         x = (base_x + px)
       end
       y = (base_y + py)
-      left, top, scrn_w, scrn_h = @window.workarea
+      left, top, scrn_w, scrn_h = @parent.handle_request('GET', 'get_workarea')
       if (y + h) > scrn_h # XXX
         y = (scrn_h - h)
       end
@@ -1537,7 +1537,7 @@ module Balloon
         Gtk::StateFlags::NORMAL, Gdk::RGBA.new(0, 0, 0, 0))
       w = desc.get('communicatebox.width', :default => 250).to_i
       h = desc.get('communicatebox.height', :default => -1).to_i
-      left, top, scrn_w, scrn_h = @window.workarea
+      left, top, scrn_w, scrn_h = @parent.handle_request('GET', 'get_workarea')
       @__surface_position = [(scrn_w - w) / 2, (scrn_h - h) / 2] # XXX
       @entry = Gtk::Entry.new
       @entry.signal_connect('activate') do |w|

--- a/lib/ninix/dll/bln.rb
+++ b/lib/ninix/dll/bln.rb
@@ -210,7 +210,7 @@ module Bln
       else
         @position = 'sakura'
       end
-      left, top, scrn_w, scrn_h = @window.workarea
+      left, top, scrn_w, scrn_h = @__sakura.get_workarea
       # -1: left, 1: right
       if @position == 'sakura'
         s0_x, s0_y, s0_w, s0_h = get_sakura_status('SurfaceSakura')
@@ -501,7 +501,7 @@ module Bln
     end
 
     def get_coordinate(w, h)
-      left, top, scrn_w, scrn_h = @window.workarea
+      left, top, scrn_w, scrn_h = @__sakura.get_workarea
       s0_x, s0_y, s0_w, s0_h = get_sakura_status('SurfaceSakura')
       s1_x, s1_y, s1_w, s1_h = get_sakura_status('SurfaceKero')
       b0_x, b0_y, b0_w, b0_h = get_sakura_status('BalloonSakura')

--- a/lib/ninix/dll/osuwari.rb
+++ b/lib/ninix/dll/osuwari.rb
@@ -103,7 +103,7 @@ module Osuwari
     def do_idle_tasks
       return false if @timeout_id.nil?
       target = @settings['target']
-      left, top, scrn_w, scrn_h = @__sakura.get_workarea(0) # XXX
+      left, top, scrn_w, scrn_h = @__sakura.get_workarea
       target_flag = [false, false]
       if target == 'ACTIVE'
         active_window = get_active_window()

--- a/lib/ninix/dll/wmove.rb
+++ b/lib/ninix/dll/wmove.rb
@@ -142,7 +142,7 @@ module Wmove
           end
         elsif name == 'GET_DESKTOP_SIZE'
           begin
-            left, top, scrn_w, scrn_h = @__sakura.get_workarea(0) # XXX
+            left, top, scrn_w, scrn_h = @__sakura.get_workarea
             result = ("SAORI/1.0 200 OK\r\n" \
                       + "Result: " + scrn_w.to_s + "\r\n" \
                       + "Value0: " + scrn_w.to_s + "\r\n" \
@@ -194,7 +194,7 @@ module Wmove
             speed = args[1].to_i
             if command == 'MOVE_INSIDE'
               w, h = @__sakura.get_surface_size(side)
-              left, top, scrn_w, scrn_h = @__sakura.get_workarea(side)
+              left, top, scrn_w, scrn_h = @__sakura.get_workarea
               if vx < 0 and x + vx <0
                 vx = [-x, 0].min
               elsif vx > 0 and x + vx + w > left + scrn_w
@@ -222,7 +222,7 @@ module Wmove
             speed = args[1].to_i
             if command == 'MOVETO_INSIDE'
               w, h = @__sakura.get_surface_size(side)
-              left, top, scrn_w, scrn_h = @__sakura.get_workarea(side)
+              left, top, scrn_w, scrn_h = @__sakura.get_workarea
               if to < 0
                 to = 0
               elsif to > left + scrn_w - w

--- a/lib/ninix/nekodorif.rb
+++ b/lib/ninix/nekodorif.rb
@@ -150,6 +150,7 @@ module Nekodorif
       scale = @target.get_surface_scale()
       @skin = Skin.new(@dir, @accelgroup, scale)
       @skin.set_responsible(self)
+      @skin.setup
       return 0 if @skin.nil?
       @katochan_list = katochan
       @katochan = nil
@@ -164,6 +165,7 @@ module Nekodorif
       handlers = {
         'get_katochan_list' =>  lambda { return @katochan_list },
         'get_mode' =>  lambda { return @mode },
+        'get_workarea' => lambda { return @target.get_workarea },
       }
       if handlers.include?(event)
         result = handlers[event].call # no argument
@@ -302,9 +304,6 @@ module Nekodorif
         next true
       end
       @id = [0, nil]
-      set_surface()
-      set_position(:reset => 1)
-      @window.show_all()
     end
 
     def set_responsible(parent)
@@ -327,6 +326,12 @@ module Nekodorif
       return result if event_type == 'GET'
     end
 
+    def setup
+      set_surface()
+      set_position(:reset => 1)
+      @window.show_all()
+    end
+
     def set_scale(scale)
       @__scale = scale
       set_surface()
@@ -402,7 +407,7 @@ module Nekodorif
     end
 
     def set_position(reset: 0)
-      left, top, scrn_w, scrn_h = @window.workarea
+      left, top, scrn_w, scrn_h = @parent.handle_request('GET', 'get_workarea')
       unless reset.zero?
         @x = left
         @y = (top + scrn_h - @h)
@@ -621,7 +626,7 @@ module Nekodorif
       return if @settings['state'] != 'before'
       target_x, target_y = @target.get_surface_position(@side)
       target_w, target_h = @target.get_surface_size(@side)
-      left, top, scrn_w, scrn_h = @window.workarea
+      left, top, scrn_w, scrn_h = @parent.handle_request('GET', 'get_workarea')
       @x = (target_x + target_w / 2 - @w / 2 + (@offset_x * @__scale / 100).to_i)
       @y = (top + (@offset_y * @__scale / 100).to_i)
       @window.move(@x, @y)
@@ -782,7 +787,7 @@ module Nekodorif
     end
 
     def check_mikire
-      left, top, scrn_w, scrn_h = @window.workarea
+      left, top, scrn_w, scrn_h = @parent.handle_request('GET', 'get_workarea')
       if (@x + @w - @w / 3) > (left + scrn_w) or \
         (@x + @w / 3) < left or \
         (@y + @h - @h / 3) > (top + scrn_h) or \

--- a/lib/ninix/pix.rb
+++ b/lib/ninix/pix.rb
@@ -83,7 +83,7 @@ module Pix
 
   class BaseTransparentWindow < Gtk::Window
     alias :base_move :move
-    attr_reader :workarea, :supports_alpha
+    attr_reader :supports_alpha
 
     def initialize(type: Gtk::WindowType::TOPLEVEL)
       super(type)
@@ -105,12 +105,6 @@ module Pix
       end
       @supports_alpha = composited?
       fail "assert" unless not visual.nil?
-      if realized?
-        workarea = screen.display.get_monitor_at_window(window).workarea # XXX
-      else
-        workarea = screen.display.get_monitor(0).workarea # XXX
-      end
-      @workarea = [0, 0, workarea.width, workarea.height]
       maximize # not fullscreen
     end
   end
@@ -200,6 +194,36 @@ module Pix
   end
 
 
+  class TransparentApplicationWindow < Gtk::ApplicationWindow
+
+    def initialize(application)
+      super(application)
+      set_decorated(false)
+      set_app_paintable(true)
+      set_focus_on_map(false)
+      if composited?
+        input_shape_combine_region(Cairo::Region.new) # empty region
+      end
+      signal_connect("screen-changed") do |widget, old_screen|
+        screen_changed(widget, :old_screen => old_screen)
+        next true
+      end
+      screen_changed(self)
+    end
+
+    def screen_changed(widget, old_screen: nil)
+      if composited?
+        set_visual(screen.rgba_visual)
+      else
+        set_visual(screen.system_visual)
+        Logging::Logging.debug("screen does NOT support alpha.\n")
+      end
+      fail "assert" unless not visual.nil?
+      maximize # not fullscreen
+    end
+  end
+
+
   def self.get_png_size(path)
     return 0, 0 if not File.exists?(path)
     buf =

--- a/lib/ninix/sakura.rb
+++ b/lib/ninix/sakura.rb
@@ -577,8 +577,8 @@ module Sakura
       @balloon.reset_balloon()
     end
 
-    def get_workarea(side)
-      @surface.get_workarea(side)
+    def get_workarea
+      @parent.handle_request('GET', 'get_workarea')
     end
 
     def get_surface_position(side)
@@ -867,7 +867,7 @@ module Sakura
                          :default => default)
           end
         end
-        left, top, scrn_w, scrn_h = @surface.get_workarea(0) # XXX
+        left, top, scrn_w, scrn_h = get_workarea
         notify_event('OnDisplayChange',
                      Gdk::Visual.best_depth,
                      scrn_w, scrn_h, :event_type => 'NOTIFY')
@@ -1964,7 +1964,7 @@ module Sakura
       end
       w, h = get_surface_size(@script_side)
       x, y = get_surface_position(@script_side)
-      left, top, scrn_w, scrn_h = @surface.get_workarea(@script_side)
+      left, top, scrn_w, scrn_h = get_workarea
       if (sx + (sw / 2).to_i) > (left + (scrn_w / 2).to_i)
         new_x = [x - (scrn_w / 20).to_i, sx - (scrn_w / 20).to_i].min
       else
@@ -1994,7 +1994,7 @@ module Sakura
       end
       w, h = get_surface_size(@script_side)
       x, y = get_surface_position(@script_side)
-      left, top, scrn_w, scrn_h = @surface.get_workarea(@script_side)
+      left, top, scrn_w, scrn_h = get_workarea
       if (x < (sx + (sw / 2).to_i) and (sx + (sw / 2).to_i) < (x + w)) or
         (sx < (x + (w / 2).to_i) and (x + (w / 2).to_i) < (sx + sw))
         return
@@ -2818,10 +2818,10 @@ module Sakura
         elsif chunk[1] == '%friendname'
           buf << get_friendname()
         elsif chunk[1] == '%screenwidth'
-          left, top, scrn_w, scrn_h = @surface.get_workarea(@script_side)
+          left, top, scrn_w, scrn_h = get_workarea
           buf << scrn_w.to_s
         elsif chunk[1] == '%screenheight'
-          left, top, scrn_w, scrn_h = @surface.get_workarea(@script_side)
+          left, top, scrn_w, scrn_h = get_workarea
           buf << scrn_h.to_s
         elsif chunk[1] == '%et'
           buf << @current_time[5].to_s[-1] + '万年'

--- a/lib/ninix/surface.rb
+++ b/lib/ninix/surface.rb
@@ -595,7 +595,7 @@ module Surface
     end
 
     def reset_position
-      left, top, scrn_w, scrn_h = get_workarea(0) # XXX
+      left, top, scrn_w, scrn_h = @parent.handle_request('GET', 'get_workarea')
       s0x, s0y, s0w, s0h = 0, 0, 0, 0 # XXX
       for side in [e-mail]-1
         align = get_alignment(side)
@@ -628,14 +628,6 @@ module Surface
       end
     end
 
-    def get_workarea(side)
-      if @window.length > side
-        return @window[side].get_window.workarea
-      else
-        return [0, 0, 0, 0]
-      end
-    end
-
     def set_position(side, x, y)
       if @window.length > side
         @window[side].set_position(x, y)
@@ -844,7 +836,7 @@ module Surface
         @mikire = @kasanari = 0
         return
       end
-      left, top, scrn_w, scrn_h = get_workarea(0)
+      left, top, scrn_w, scrn_h = @parent.handle_request('GET', 'get_workarea')
       x0, y0 = get_position(0)
       s0w, s0h = get_surface_size(0)
       if (x0 + s0w / 3) < left or (x0 + s0w * 2 / 3) > (left + scrn_w) or \
@@ -976,7 +968,7 @@ module Surface
       return unless @side.zero?
       @reshape = true # XXX
       @parent.handle_request('NOTIFY', 'reset_position') # XXX
-      left, top, scrn_w, scrn_h = @window.workarea
+      left, top, scrn_w, scrn_h = @parent.handle_request('GET', 'get_workarea')
       @parent.handle_request(
         'NOTIFY', 'notify_event', 'OnDisplayChange',
         Gdk.Visual.get_best_depth(), scrn_w, scrn_h)
@@ -1111,7 +1103,7 @@ module Surface
       case get_alignment()
       when 0
         yoffset = (dh - h)
-        left, top, scrn_w, scrn_h = @window.workarea
+        left, top, scrn_w, scrn_h = @parent.handle_request('GET', 'get_workarea')
         y = (top + scrn_h - dh)
       when 1
         yoffset = 0
@@ -1391,7 +1383,7 @@ module Surface
     end
 
     def get_max_size
-      left, top, scrn_w, scrn_h = @window.workarea
+      left, top, scrn_w, scrn_h = @parent.handle_request('GET', 'get_workarea')
       w, h = @maxsize
       scale = get_scale
       w = [scrn_w, [8, (w * scale / 100).to_i].max].min
@@ -1469,7 +1461,7 @@ module Surface
       @position = [x, y]
       new_x, new_y = get_position()
       @window.move(new_x, new_y)
-      left, top, scrn_w, scrn_h = @window.workarea
+      left, top, scrn_w, scrn_h = @parent.handle_request('GET', 'get_workarea')
       if x > (left + scrn_w / 2)
         new_direction = 0
       else
@@ -1506,13 +1498,13 @@ module Surface
       return if @dragged # XXX: position will be reset after button release event
       case align
       when 0
-        left, top, scrn_w, scrn_h = @window.workarea
+        left, top, scrn_w, scrn_h = @parent.handle_request('GET', 'get_workarea')
         sw, sh = get_max_size()
         sx, sy = @position # XXX: without window_offset
         sy = (top + scrn_h - sh)
         set_position(sx, sy)
       when 1
-        left, top, scrn_w, scrn_h = @window.workarea
+        left, top, scrn_w, scrn_h = @parent.handle_request('GET', 'get_workarea')
         sx, sy = @position # XXX: without window_offset
         sy = top
         set_position(sx, sy)

--- a/lib/ninix_main.rb
+++ b/lib/ninix_main.rb
@@ -364,6 +364,7 @@ module Ninix_Main
         'reset_sstp_flag' => 'reset_sstp_flag',
         'get_sstp_port' => 'get_sstp_port',
         'get_prefix' => 'get_sakura_prefix',
+        'get_workarea' => 'get_workarea'
       }
       unless handlers.include?(event)
         if Application.method_defined?(event)
@@ -825,8 +826,9 @@ module Ninix_Main
       return nil
     end
 
-    def run(abend)
+    def run(abend, app_window)
       @abend = abend
+      @app_window = app_window
       if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
         # The SIGTERM signal is not generated under Windows NT.
         # Win32::Console::API.SetConsoleCtrlHandler will probably not be implemented.
@@ -1258,6 +1260,10 @@ module Ninix_Main
       end
       return true
     end
+
+    def get_workarea
+      [0, 0, *@app_window.size]
+    end
   end
 
   class Console
@@ -1687,15 +1693,20 @@ gtk_app.signal_connect 'activate' do |application|
   rescue
     raise SystemExit("ninix-aya is already running")
   end
+  app_window = Pix::TransparentApplicationWindow.new(application)
+  app_window.set_title("Ninix-aya")
+  app_window.show_all
   # start
   app = Ninix_Main::Application.new(f, :sstp_port => sstp_port)
-  app.run(abend)
+  app.run(abend, app_window)
+  # end
   f.truncate(0)
   begin
     Lock.unlockfile(f)
   rescue
     #pass
   end
+  app_window.destroy
 end
 
 begin