提交: f3a285c88cb27e5b805166739d86d35ac8f7242e - ruby-gtk3 (git)

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

Commit MetaInfo

• 修訂: f3a285c88cb27e5b805166739d86d35ac8f7242e (tree)
• 時間: 2015-05-23 21:35:15
• 作者: Shyouzou Sugitani <shy@user...>
• Commiter: Shyouzou Sugitani

Log Message

assorted fixes(24)

Change Summary

• modified: lib/ninix/balloon.rb
• modified: lib/ninix/sakura.rb
• modified: lib/ninix/sstp.rb
• modified: lib/ninix/sstplib.rb
• modified: lib/ninix_main.rb

差異

--- a/lib/ninix/balloon.rb
+++ b/lib/ninix/balloon.rb
@@ -938,9 +938,9 @@ module Balloon
         while 1
           i += 1
           s = message[0, i] + '... (' + sender + ')'
-          @sstp_layout.set_text(s, -1)
+          @sstp_layout.set_text(s)
           message_width, message_height = \
-          @sstp_layout.get_pixel_size()
+          @sstp_layout.pixel_size
           if message_width > w
             break
           end
@@ -1105,8 +1105,8 @@ module Balloon
             if l == i
               mw = @sstp_surface.width
               mh = @sstp_surface.height
-              @layout.set_text(@text_buffer[i][0, c], -1)
-              text_w, text_h = @layout.get_pixel_size()
+              @layout.set_text(@text_buffer[i][0, c])
+              text_w, text_h = @layout.pixel_size
               mx = x + text_w
               my = y + (@font_height + @line_space) / 2
               my = my - mh / 2
@@ -1144,36 +1144,36 @@ module Balloon
             if sl == el
               markup = set_markup(n, @text_buffer[n][0, sn])
               @layout.set_markup(markup, -1)
-              text_w, text_h =  @layout.get_pixel_size()
+              text_w, text_h =  @layout.pixel_size
               x += text_w
               markup = set_markup(n, @text_buffer[n][sn, en])
               @layout.set_markup(markup, -1)
-              text_w, text_h = @layout.get_pixel_size()
+              text_w, text_h = @layout.pixel_size
               w = text_w
               start = sn
               end_ = en
             elsif n == sl
               markup = set_markup(n, @text_buffer[n][0, sn])
               @layout.set_markup(markup, -1)
-              text_w, text_h = @layout.get_pixel_size()
+              text_w, text_h = @layout.pixel_size
               x += text_w
               markup = set_markup(n, @text_buffer[n][sn, @text_buffer.length])
               @layout.set_markup(markup, -1)
-              text_w, text_h = @layout.get_pixel_size()
+              text_w, text_h = @layout.pixel_size
               w = text_w
               start = sn
               end_ = @text_buffer[n].length
             elsif n == el
               markup = set_markup(n, @text_buffer[n][0, en])
               @layout.set_markup(markup, -1)
-              text_w, text_h = @layout.get_pixel_size()
+              text_w, text_h = @layout.pixel_size
               w = text_w
               start = 0
               end_ = en
             else
               markup = set_markup(n, @text_buffer[n])
               @layout.set_markup(markup, -1)
-              text_w, text_h = @layout.get_pixel_size()
+              text_w, text_h = @layout.pixel_size
               w = text_w
               start = 0
               end_ = @text_buffer[n].length
@@ -1208,7 +1208,7 @@ module Balloon
             if n == sl
               markup = set_markup(n, @text_buffer[n][0, sn])
               @layout.set_markup(markup, -1)
-              text_w, text_h = @layout.get_pixel_size()
+              text_w, text_h = @layout.pixel_size
               x += text_w
             end
             if n == sl and n == el
@@ -1219,7 +1219,7 @@ module Balloon
               markup = set_markup(n, @text_buffer[n])
             end
             @layout.set_markup(markup, -1)
-            text_w, text_h = @layout.get_pixel_size()
+            text_w, text_h = @layout.pixel_size
             w = text_w
             if x <= px and px < x + w and y <= py and py < y + h
               new_selection = i
@@ -1469,8 +1469,8 @@ module Balloon
       i = 1
       while 1
         space = '\u3000' * i ## FIXME
-        @layout.set_text(space, -1)
-        text_w, text_h = @layout.get_pixel_size()
+        @layout.set_text(space)
+        text_w, text_h = @layout.pixel_size
         if text_w > w
           break
         else
@@ -1559,8 +1559,8 @@ module Balloon
             if l == line
               mw = @sstp_surface.width
               mh = @sstp_surface.height
-              @layout.set_text(@text_buffer[l][0, c], -1)
-              text_w, text_h = @layout.get_pixel_size()
+              @layout.set_text(@text_buffer[l][0, c])
+              text_w, text_h = @layout.pixel_size
               mx = x + text_w
               my = y + (@font_height + @line_space) / 2
               my = my - mh / 2

--- a/lib/ninix/sakura.rb
+++ b/lib/ninix/sakura.rb
@@ -1804,7 +1804,7 @@ module Sakura
         event, script, sender, @sstp_handle, \
         host, show_sstp_marker, use_translator, \
         @sstp_entry_db, @sstp_request_handler = \
-                            script_queue.shift
+                        @script_queue.shift
         if @cantalk
           if show_sstp_marker
             @balloon.show_sstp_message(sender, host)

--- a/lib/ninix/sstp.rb
+++ b/lib/ninix/sstp.rb
@@ -21,6 +21,7 @@ require "ninix/sstplib"
 module SSTP
 
   class SSTPServer < SSTPLib::AsynchronousSSTPServer
+    attr_reader :socket
 
     def initialize(address)
       @parent = nil
@@ -41,9 +42,9 @@ module SSTP
       @parent = parent
     end
 
-    def handle_request(event_type, event, *arglist, **argdict)
+    def handle_request(event_type, event, *arglist)
       if @parent != nil
-        @parent.handle_request(event_type, event, *arglist, **argdict)
+        @parent.handle_request(event_type, event, *arglist)
       end
     end
     
@@ -93,7 +94,7 @@ module SSTP
     end
 
     def close
-      socket.close()
+      # NOP
     end
   end
   
@@ -183,6 +184,7 @@ module SSTP
     end
 
     def handle_notify(version)
+      script_odict = {}
       if not check_decoder()
         return
       end
@@ -239,7 +241,7 @@ module SSTP
       if not local_request()
         parser = Script::Parser.new
         nodes = []
-        while 1
+        while true
           begin
             nodes.concat(parser.parse(script))
           rescue #except ninix.script.ParserError as e:

--- a/lib/ninix/sstplib.rb
+++ b/lib/ninix/sstplib.rb
@@ -109,11 +109,11 @@ module SSTPLib
       if not match
         @equestline = '-'
         send_error(400, :message => 'Bad Request ' + requestline.to_s)
-        return 0
+        return false
       end
       @command, @version = match[1, 2]
       @headers = parse_headers()
-      return 1
+      return true
     end
 
     def handle(line)

--- a/lib/ninix_main.rb
+++ b/lib/ninix_main.rb
@@ -197,16 +197,19 @@ module Ninix_Main
       @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
-        result = self.request_parent(
-          event_type, event, *arglist, **argdict)
+      if not handlers.include?(event)
+        if SSTPControler.method_defined?(event)
+          result = method(event).call(*arglist)
+        else
+          result = @parent.handle_request(
+            event_type, event, *arglist)
+        end
       else
-        result = handler(*arglist, **argdict)
+        result = method(handlers[event]).call(*arglist)
       end
       if event_type == 'GET'
         return result
@@ -251,19 +254,19 @@ module Ninix_Main
       end
       event, script_odict, sender, handle, address, \
       show_sstp_marker, use_translator, \
-      entry_db, request_handler = @__sstp_queue.pop(0)
+      entry_db, request_handler = @__sstp_queue.shift
       working = (event != nil)
       break_flag = false
       for if_ghost in script_odict.keys()
-        if if_ghost and request_parent('GET', 'if_ghost', if_ghost, :working => working)
-          request_parent('NOTIFY', 'select_current_sakura', :if_ghost => if_ghost)
+        if not if_ghost.empty? and @parent.handle_request('GET', 'if_ghost', if_ghost, :working => working)
+          @parent.handle_request('NOTIFY', 'select_current_sakura', :if_ghost => if_ghost)
           default_script = script_odict[if_ghost]
           break_flag = true
           break
         end
       end
       if not break_flag
-        if request_parent('GET', 'get_preference', 'allowembryo') == 0
+        if @parent.handle_request('GET', 'get_preference', 'allowembryo') == 0
           if event == nil
             if request_handler
               request_handler.send_response(420) # Refuse
@@ -280,7 +283,7 @@ module Ninix_Main
           end
         end
         if event != nil
-          script = request_parent('GET', 'get_event_response', event)
+          script = @parent.handle_request('GET', 'get_event_response', event)
         else
           script = nil
         end
@@ -294,7 +297,7 @@ module Ninix_Main
           return
         end
         set_sstp_flag(sender)
-        request_parent(
+        @parent.handle_request(
           'NOTIFY', 'enqueue_script',
           event, script, sender, handle, address,
           show_sstp_marker, use_translator, :db => entry_db,
@@ -303,15 +306,21 @@ module Ninix_Main
     end
 
     def receive_sstp_request
-      begin
-        for sstp_server in self.sstp_servers
-          sstp_server.handle_request()
+      for sstp_server in @sstp_servers
+        begin
+          socket = sstp_server.accept_nonblock
+        rescue
+          next
+        #rescue # except socket.error as e:
+          #code, message = e.args
+          #logging.error('socket.error: {0} ({1:d})'.format(message, code))
+        #rescue # except ValueError: # may happen when ninix is terminated
+          #return
         end
-      rescue # except socket.error as e:
-        #code, message = e.args
-        #logging.error('socket.error: {0} ({1:d})'.format(message, code))
-      rescue # except ValueError: # may happen when ninix is terminated
-        return
+        handler = SSTP::SSTPRequestHandler.new(sstp_server, socket)
+        buffer = socket.gets
+        handler.handle(buffer)
+        socket.close
       end
     end
 
@@ -331,14 +340,14 @@ module Ninix_Main
     def start_servers
       for port in @sstp_port
         begin
-          server = SSTP.SSTPServer.new(port)
+          server = SSTP::SSTPServer.new(port)
         rescue # except socket.error as e:
           #code, message = e.args
           #logging.warning(
           #  'Port {0:d}: {1} (ignored)'.format(port, message))
           next
         end
-        server.set_responsible(self.handle_request)
+        server.set_responsible(self)
         @sstp_servers << server
         #logging.info('Serving SSTP on port {0:d}'.format(port))
       end
@@ -544,7 +553,7 @@ module Ninix_Main
       if plugin_module == nil
         return
       end
-      port = self.request_parent('GET', 'get_sstp_port')
+      port = @parent.handle_request('GET', 'get_sstp_port')
       queue = multiprocessing.JoinableQueue()
       if not @data.include?(plugin_dir)
         @data[plugin_dir] = load_data(plugin_dir)
@@ -1269,7 +1278,7 @@ module Ninix_Main
       instance_list = []
       for value in @ghosts.values()
         if value.instance != nil
-          instance_list << value
+          instance_list << value.instance
         end
       end
       for sakura in instance_list