Commit: 1f80298b0afa0126b198301e3c5aedd18125ea1d - ruby-gtk3 (git)

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

Commit MetaInfo

• Revisão: 1f80298b0afa0126b198301e3c5aedd18125ea1d (tree)
• Hora: 2018-01-07 16:10:36
• Autor: Shyouzou Sugitani <shy@user...>
• Commiter: Shyouzou Sugitani

Mensagem de Log

Prepare for Release of 5.0.5

Mudança Sumário

• modified: ChangeLog
• modified: README
• modified: lib/ninix/alias.rb
• modified: lib/ninix/balloon.rb
• modified: lib/ninix/communicate.rb
• modified: lib/ninix/config.rb
• modified: lib/ninix/dll.rb
• modified: lib/ninix/dll/aya.rb
• modified: lib/ninix/dll/aya5.rb
• modified: lib/ninix/dll/bln.rb
• modified: lib/ninix/dll/gomi.rb
• modified: lib/ninix/dll/hanayu.rb
• modified: lib/ninix/dll/httpc.rb
• modified: lib/ninix/dll/kawari.rb
• modified: lib/ninix/dll/kawari8.rb
• modified: lib/ninix/dll/mciaudio.rb
• modified: lib/ninix/dll/mciaudior.rb
• modified: lib/ninix/dll/misaka.rb
• modified: lib/ninix/dll/niseshiori.rb
• modified: lib/ninix/dll/osuwari.rb
• modified: lib/ninix/dll/saori_cpuid.rb
• modified: lib/ninix/dll/satori.rb
• modified: lib/ninix/dll/ssu.rb
• modified: lib/ninix/dll/textcopy.rb
• modified: lib/ninix/dll/wmove.rb
• modified: lib/ninix/dll/yaya.rb
• modified: lib/ninix/entry_db.rb
• modified: lib/ninix/home.rb
• modified: lib/ninix/install.rb
• modified: lib/ninix/keymap.rb
• modified: lib/ninix/kinoko.rb
• modified: lib/ninix/lock.rb
• modified: lib/ninix/logging.rb
• modified: lib/ninix/makoto.rb
• modified: lib/ninix/menu.rb
• modified: lib/ninix/metamagic.rb
• modified: lib/ninix/nekodorif.rb
• modified: lib/ninix/ngm.rb
• modified: lib/ninix/pix.rb
• modified: lib/ninix/prefs.rb
• modified: lib/ninix/sakura.rb
• modified: lib/ninix/script.rb
• modified: lib/ninix/seriko.rb
• modified: lib/ninix/sstp.rb
• modified: lib/ninix/sstplib.rb
• modified: lib/ninix/surface.rb
• modified: lib/ninix/update.rb
• modified: lib/ninix/version.rb
• modified: lib/ninix_main.rb

Diff

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun January 7 2018   Shyouzou Sugitani <[e-mail]>
+	* バージョン5.0.5リリース.
+	* ウインドウの描画方法刷新によりWayland環境に対応.
+	* Copyrightを2018年に更新した.
+
 Wed August 16 2017   Shyouzou Sugitani <[e-mail]>
 	* deprecatedになっているメソッドを使用しないようにした.
 	  (Gtk::Menu.popup)

--- a/README
+++ b/README
@@ -93,7 +93,7 @@ lib/ninix_main.rb をRuby インタプリタで実行してください。
 ----------
 Copyright (C) 2001, 2002 by Tamito KAJIYAMA <[e-mail]>
 Copyright (C) 2002-2007 by MATSUMURA Namihiko <[e-mail]>
-Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
+Copyright (C) 2002-2018 by Shyouzou Sugitani <[e-mail]>
 Copyright (C) 2002, 2003 by ABE Hideaki <[e-mail]>
 Copyright (C) 2003-2005 by Shun-ichi TAHARA <[e-mail]>
 

--- a/lib/ninix/alias.rb
+++ b/lib/ninix/alias.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #  Copyright (C) 2001, 2002 by Tamito KAJIYAMA
-#  Copyright (C) 2004-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2004-2018 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as

--- a/lib/ninix/balloon.rb
+++ b/lib/ninix/balloon.rb
@@ -2,7 +2,7 @@
 #
 #  Copyright (C) 2001, 2002 by Tamito KAJIYAMA
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
-#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2018 by Shyouzou Sugitani <[e-mail]>
 #  Copyright (C) 2003 by Shun-ichi TAHARA <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
@@ -730,9 +730,6 @@ module Balloon
       x, y = @position
       @width = @balloon_surface.width
       @height = @balloon_surface.height
-      w = (@width * scale / 100.0).to_i
-      h = (@height * scale / 100.0).to_i
-      @window.update_size(w, h)
       reset_arrow()
       reset_sstp_marker()
       reset_message_regions()

--- a/lib/ninix/communicate.rb
+++ b/lib/ninix/communicate.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #  communicate.rb - ghost-to-ghost communication mechanism
-#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2018 by Shyouzou Sugitani <[e-mail]>
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it

--- a/lib/ninix/config.rb
+++ b/lib/ninix/config.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #  Copyright (C) 2001, 2002 by Tamito KAJIYAMA
-#  Copyright (C) 2003-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2003-2018 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as

--- a/lib/ninix/dll.rb
+++ b/lib/ninix/dll.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #  dll.rb - a pseudo DLL (SHIORI/SAORI API support) module for ninix
-#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2018 by Shyouzou Sugitani <[e-mail]>
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it

--- a/lib/ninix/dll/aya.rb
+++ b/lib/ninix/dll/aya.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #  aya.rb - an aya.dll compatible Shiori module for ninix
-#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2018 by Shyouzou Sugitani <[e-mail]>
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
@@ -245,7 +245,7 @@ module Aya
     def show_description
       Logging::Logging.info(
         "Shiori: AYA compatible module for ninix\n" \
-        "        Copyright (C) 2002-2017 by Shyouzou Sugitani\n" \
+        "        Copyright (C) 2002-2018 by Shyouzou Sugitani\n" \
         "        Copyright (C) 2002, 2003 by MATSUMURA Namihiko")
     end
 

--- a/lib/ninix/dll/aya5.rb
+++ b/lib/ninix/dll/aya5.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #  aya5.rb - an aya.dll(Ver.5) compatible Shiori module for ninix
-#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2018 by Shyouzou Sugitani <[e-mail]>
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
@@ -251,7 +251,7 @@ module Aya5
     def show_description
       Logging::Logging.info(
         "Shiori: AYA5 compatible module for ninix\n" \
-        "        Copyright (C) 2002-2017 by Shyouzou Sugitani\n" \
+        "        Copyright (C) 2002-2018 by Shyouzou Sugitani\n" \
         "        Copyright (C) 2002, 2003 by MATSUMURA Namihiko")
     end
 

--- a/lib/ninix/dll/bln.rb
+++ b/lib/ninix/dll/bln.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #  bln.rb - a easyballoon compatible Saori module for ninix
-#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2018 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as
@@ -468,7 +468,6 @@ module Bln
       h = @balloon_surface.height
       w = [8, (w * @scale / 100).to_i].max
       h = [8, (h * @scale / 100).to_i].max
-      @window.update_size(w, h)
       @base_x, @base_y = get_coordinate(w, h)
     end
 

--- a/lib/ninix/dll/gomi.rb
+++ b/lib/ninix/dll/gomi.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #  gomi.rb - a gomi.dll compatible Saori module for ninix
-#  Copyright (C) 2012-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2012-2018 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as

--- a/lib/ninix/dll/hanayu.rb
+++ b/lib/ninix/dll/hanayu.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #  hanayu.rb - a "花柚" compatible Saori module for ninix
-#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2018 by Shyouzou Sugitani <[e-mail]>
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it

--- a/lib/ninix/dll/httpc.rb
+++ b/lib/ninix/dll/httpc.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #  httpc.rb - a HTTPC compatible Saori module for ninix
-#  Copyright (C) 2011-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2011-2018 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as

--- a/lib/ninix/dll/kawari.rb
+++ b/lib/ninix/dll/kawari.rb
@@ -3,7 +3,7 @@
 #  kawari.rb - a "華和梨" compatible Shiori module for ninix
 #  Copyright (C) 2001, 2002 by Tamito KAJIYAMA
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
-#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2018 by Shyouzou Sugitani <[e-mail]>
 #  Copyright (C) 2003 by Shun-ichi TAHARA <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
@@ -2038,7 +2038,7 @@ module Kawari
         "Shiori: KAWARI compatible module for ninix\n" \
         "        Copyright (C) 2001, 2002 by Tamito KAJIYAMA\n" \
         "        Copyright (C) 2002, 2003 by MATSUMURA Namihiko\n" \
-        "        Copyright (C) 2002-2017 by Shyouzou Sugitani\n" \
+        "        Copyright (C) 2002-2018 by Shyouzou Sugitani\n" \
         "        Copyright (C) 2003 by Shun-ichi TAHARA")
     end
 

--- a/lib/ninix/dll/kawari8.rb
+++ b/lib/ninix/dll/kawari8.rb
@@ -2,7 +2,7 @@
 #
 #  kawari8.rb - a (Real) 華和梨 loader for ninix
 #  Copyright (C) 2002, 2003 by ABE Hideaki <[e-mail]>
-#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2018 by Shyouzou Sugitani <[e-mail]>
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
@@ -63,7 +63,7 @@ module Kawari8
       Logging::Logging.info(
         "Shiori: Real Kawari8 loader for ninix\n" \
         "        Copyright (C) 2002, 2003 by ABE Hideaki\n" \
-        "        Copyright (C) 2002-2017 by Shyouzou Sugitani\n" \
+        "        Copyright (C) 2002-2018 by Shyouzou Sugitani\n" \
         "        Copyright (C) 2002, 2003 by MATSUMURA Namihiko")
     end
 

--- a/lib/ninix/dll/mciaudio.rb
+++ b/lib/ninix/dll/mciaudio.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #  mciaudio.rb - a MCIAUDIO compatible Saori module for ninix
-#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2018 by Shyouzou Sugitani <[e-mail]>
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it

--- a/lib/ninix/dll/mciaudior.rb
+++ b/lib/ninix/dll/mciaudior.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #  mciaudior.rb - a MCIAUDIOR compatible Saori module for ninix
-#  Copyright (C) 2003-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2003-2018 by Shyouzou Sugitani <[e-mail]>
 #  Copyright (C) 2003 by MATSUMURA Namihiko <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it

--- a/lib/ninix/dll/misaka.rb
+++ b/lib/ninix/dll/misaka.rb
@@ -3,7 +3,7 @@
 #  misaka.rb - a "美坂" compatible Shiori module for ninix
 #  Copyright (C) 2002 by Tamito KAJIYAMA
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
-#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2018 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as
@@ -1179,7 +1179,7 @@ module Misaka
         "Shiori: MISAKA compatible module for ninix\n" \
         "        Copyright (C) 2002 by Tamito KAJIYAMA\n" \
         "        Copyright (C) 2002, 2003 by MATSUMURA Namihiko\n" \
-        "        Copyright (C) 2002-2017 by Shyouzou Sugitani")
+        "        Copyright (C) 2002-2018 by Shyouzou Sugitani")
     end
 
     def reset

--- a/lib/ninix/dll/niseshiori.rb
+++ b/lib/ninix/dll/niseshiori.rb
@@ -3,7 +3,7 @@
 #  niseshiori.rb - a "偽栞" compatible Shiori module for ninix
 #  Copyright (C) 2001, 2002 by Tamito KAJIYAMA
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
-#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2018 by Shyouzou Sugitani <[e-mail]>
 #  Copyright (C) 2003 by Shun-ichi TAHARA <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
@@ -1225,7 +1225,7 @@ module Niseshiori
         "Shiori: NiseShiori compatible module for ninix\n" \
         "        Copyright (C) 2001, 2002 by Tamito KAJIYAMA\n" \
         "        Copyright (C) 2002, 2003 by MATSUMURA Namihiko\n" \
-        "        Copyright (C) 2002-2017 by Shyouzou Sugitani\n" \
+        "        Copyright (C) 2002-2018 by Shyouzou Sugitani\n" \
         "        Copyright (C) 2003 by Shun-ichi TAHARA")
     end
 

--- a/lib/ninix/dll/osuwari.rb
+++ b/lib/ninix/dll/osuwari.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #  osuwari.rb - a Osuwari compatible Saori module for ninix
-#  Copyright (C) 2006-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2006-2018 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as

--- a/lib/ninix/dll/saori_cpuid.rb
+++ b/lib/ninix/dll/saori_cpuid.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #  saori_cpuid.rb - a saori_cpuid compatible Saori module for ninix
-#  Copyright (C) 2003-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2003-2018 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as

--- a/lib/ninix/dll/satori.rb
+++ b/lib/ninix/dll/satori.rb
@@ -3,7 +3,7 @@
 #  satori.rb - a "里々" compatible Shiori module for ninix
 #  Copyright (C) 2002 by Tamito KAJIYAMA
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
-#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2018 by Shyouzou Sugitani <[e-mail]>
 #  Copyright (C) 2003, 2004 by Shun-ichi TAHARA <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
@@ -2715,7 +2715,7 @@ module Satori
         "Shiori: SATORI compatible module for ninix\n" \
         "        Copyright (C) 2002 by Tamito KAJIYAMA\n" \
         "        Copyright (C) 2002, 2003 by MATSUMURA Namihiko\n" \
-        "        Copyright (C) 2002-2017 by Shyouzou Sugitani\n" \
+        "        Copyright (C) 2002-2018 by Shyouzou Sugitani\n" \
         "        Copyright (C) 2003, 2004 by Shun-ichi TAHARA")
     end
 

--- a/lib/ninix/dll/ssu.rb
+++ b/lib/ninix/dll/ssu.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #  ssu.rb - a ssu compatible Saori module for ninix
-#  Copyright (C) 2003-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2003-2018 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as

--- a/lib/ninix/dll/textcopy.rb
+++ b/lib/ninix/dll/textcopy.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #  textcopy.rb - a TEXTCOPY compatible Saori module for ninix
-#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2018 by Shyouzou Sugitani <[e-mail]>
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it

--- a/lib/ninix/dll/wmove.rb
+++ b/lib/ninix/dll/wmove.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #  wmove.rb - a wmove.dll compatible Saori module for ninix
-#  Copyright (C) 2003-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2003-2018 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as

--- a/lib/ninix/dll/yaya.rb
+++ b/lib/ninix/dll/yaya.rb
@@ -2,7 +2,7 @@
 #
 #  yaya.rb - a (Real) YAYA loader for ninix
 #  Copyright (C) 2004 by linjian
-#  Copyright (C) 2004-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2004-2018 by Shyouzou Sugitani <[e-mail]>
 #  Copyright (C) 2011 by henryhu
 #
 #  This program is free software; you can redistribute it and/or modify it
@@ -58,7 +58,7 @@ module Yaya
       Logging::Logging.info(
         "Shiori: a (Real) YAYA loader for ninix\n" \
         "        Copyright (C) 2004 by linjian\n" \
-        "        Copyright (C) 2004-2017 by Shyouzou Sugitani\n" \
+        "        Copyright (C) 2004-2018 by Shyouzou Sugitani\n" \
         "        Copyright (C) 2011 by henryhu")
     end
 

--- a/lib/ninix/entry_db.rb
+++ b/lib/ninix/entry_db.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #  Copyright (C) 2001, 2002 by Tamito KAJIYAMA
-#  Copyright (C) 2004-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2004-2018 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as

--- a/lib/ninix/home.rb
+++ b/lib/ninix/home.rb
@@ -2,7 +2,7 @@
 #
 #  Copyright (C) 2001, 2002 by Tamito KAJIYAMA
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
-#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2018 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as

--- a/lib/ninix/install.rb
+++ b/lib/ninix/install.rb
@@ -3,7 +3,7 @@
 #  install.rb - an installer module for ninix
 #  Copyright (C) 2001, 2002 by Tamito KAJIYAMA
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
-#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2018 by Shyouzou Sugitani <[e-mail]>
 #  Copyright (C) 2003 by Shun-ichi TAHARA <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it

--- a/lib/ninix/keymap.rb
+++ b/lib/ninix/keymap.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #  Copyright (C) 2002 by Tamito KAJIYAMA
-#  Copyright (C) 2003-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2003-2018 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as

--- a/lib/ninix/kinoko.rb
+++ b/lib/ninix/kinoko.rb
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-#  Copyright (C) 2004-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2004-2018 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as
@@ -311,7 +311,6 @@ module Kinoko
         redraw(w, cr)
         next true
       end
-      @window.update_size(@w, @h)
       set_position()
       show()
       reset_z_order()
@@ -442,8 +441,6 @@ module Kinoko
       w = [8, (w * @__scale / 100).to_i].max
       h = [8, (h * @__scale / 100).to_i].max
       @w, @h = w, h # XXX
-      @window.update_size(w, h)
-      @window.queue_resize()
       @seriko.start(self)
       @seriko.invoke_kinoko(self)
     end

--- a/lib/ninix/lock.rb
+++ b/lib/ninix/lock.rb
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-#  Copyright (C) 2011-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2011-2018 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as

--- a/lib/ninix/logging.rb
+++ b/lib/ninix/logging.rb
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-#  Copyright (C) 2015-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2015-2018 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as

--- a/lib/ninix/makoto.rb
+++ b/lib/ninix/makoto.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #  Copyright (C) 2001, 2002 by Tamito KAJIYAMA
-#  Copyright (C) 2004-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2004-2018 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as

--- a/lib/ninix/menu.rb
+++ b/lib/ninix/menu.rb
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-#  Copyright (C) 2003-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2003-2018 by Shyouzou Sugitani <[e-mail]>
 #  Copyright (C) 2003 by Shun-ichi TAHARA <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it

--- a/lib/ninix/metamagic.rb
+++ b/lib/ninix/metamagic.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #  metamagic.rb - unknown unknowns
-#  Copyright (C) 2011-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2011-2018 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as

--- a/lib/ninix/nekodorif.rb
+++ b/lib/ninix/nekodorif.rb
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-#  Copyright (C) 2004-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2004-2018 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as
@@ -395,7 +395,6 @@ module Nekodorif
         return
       end
       @w, @h = w, h
-      @window.update_size(@w, @h)
       @image_surface = new_surface
       @darea.queue_draw()
     end
@@ -636,7 +635,6 @@ module Nekodorif
         return
       end
       @w, @h = w, h
-      @window.update_size(@w, @h)
       @image_surface = new_surface
       @darea.queue_draw()
     end

--- a/lib/ninix/ngm.rb
+++ b/lib/ninix/ngm.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #  Copyright (C) 2001-2004 by MATSUMURA Namihiko <[e-mail]>
-#  Copyright (C) 2004-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2004-2018 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as

--- a/lib/ninix/pix.rb
+++ b/lib/ninix/pix.rb
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-#  Copyright (C) 2003-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2003-2018 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as
@@ -54,7 +54,7 @@ module Pix
     def initialize(type: Gtk::WindowType::TOPLEVEL)
       super(type)
       set_decorated(false)
-      set_resizable(false)
+      #set_resizable(false)
       signal_connect("screen-changed") do |widget, old_screen|
         screen_changed(widget, :old_screen => old_screen)
         next true
@@ -71,8 +71,13 @@ module Pix
       end
       @supports_alpha = composited?
       fail "assert" unless not visual.nil?
-      workarea = screen.display.primary_monitor.workarea # XXX
-      @workarea = [workarea.x, workarea.y, workarea.width, workarea.height]
+      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
 
@@ -85,50 +90,27 @@ module Pix
       super()
       set_app_paintable(true)
       set_focus_on_map(false)
-      @__position = [0, 0]
       @__surface_position = [0, 0]
-      signal_connect_after('size_allocate') do |a|
-        size_allocate(a)
-        next false
-      end
       # create drawing area
       @darea = Gtk::DrawingArea.new
+      @darea.set_size_request(*size) # XXX
       @darea.show()
       add(@darea)
     end
 
-    def update_size(w, h)
-      @darea.set_size_request(w, h) # XXX
-      queue_resize()
-    end
-
-    def size_allocate(allocation)
-      new_x, new_y = @__position
-      base_move(new_x, new_y)
-    end
-
     def move(x, y)
-      left, top, scrn_w, scrn_h = @workarea
-      w, h = @darea.size_request() # XXX
-      new_x = [[left, x].max, left + scrn_w - w].min
-      new_y = [[top, y].max, top + scrn_h - h].min
-      base_move(new_x, new_y)
-      @__position = [new_x, new_y]
       @__surface_position = [x, y]
       @darea.queue_draw()
     end
 
     def get_draw_offset
-      window_x, window_y = @__position
-      surface_x, surface_y = @__surface_position
-      return surface_x - window_x, surface_y - window_y
+      return @__surface_position
     end
 
     def winpos_to_surfacepos(x, y, scale)
-      window_x, window_y = @__position
       surface_x, surface_y = @__surface_position
-      new_x = ((x - (surface_x - window_x)) * 100 / scale).to_i
-      new_y = ((y - (surface_y - window_y)) * 100 / scale).to_i
+      new_x = ((x - surface_x) * 100 / scale).to_i
+      new_y = ((y - surface_y) * 100 / scale).to_i
       return new_x, new_y
     end
 

--- a/lib/ninix/prefs.rb
+++ b/lib/ninix/prefs.rb
@@ -2,7 +2,7 @@
 #
 #  Copyright (C) 2001, 2002 by Tamito KAJIYAMA
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
-#  Copyright (C) 2004-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2004-2018 by Shyouzou Sugitani <[e-mail]>
 #  Copyright (C) 2003-2005 by Shun-ichi TAHARA <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it

--- a/lib/ninix/sakura.rb
+++ b/lib/ninix/sakura.rb
@@ -2,7 +2,7 @@
 #
 #  Copyright (C) 2001, 2002 by Tamito KAJIYAMA
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
-#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2018 by Shyouzou Sugitani <[e-mail]>
 #  Copyright (C) 2003 by Shun-ichi TAHARA <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it

--- a/lib/ninix/script.rb
+++ b/lib/ninix/script.rb
@@ -2,7 +2,7 @@
 #
 #  script.rb - a Sakura Script parser
 #  Copyright (C) 2001, 2002 by Tamito KAJIYAMA
-#  Copyright (C) 2004-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2004-2018 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as

--- a/lib/ninix/seriko.rb
+++ b/lib/ninix/seriko.rb
@@ -2,7 +2,7 @@
 #
 #  Copyright (C) 2002 by Tamito KAJIYAMA
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
-#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2018 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as

--- a/lib/ninix/sstp.rb
+++ b/lib/ninix/sstp.rb
@@ -2,7 +2,7 @@
 #
 #  Copyright (C) 2001, 2002 by Tamito KAJIYAMA
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
-#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2018 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as

--- a/lib/ninix/sstplib.rb
+++ b/lib/ninix/sstplib.rb
@@ -3,7 +3,7 @@
 #  sstplib.rb - an SSTP library module in Ruby
 #  Copyright (C) 2001, 2002 by Tamito KAJIYAMA
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
-#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2018 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as

--- a/lib/ninix/surface.rb
+++ b/lib/ninix/surface.rb
@@ -2,7 +2,7 @@
 #
 #  Copyright (C) 2001, 2002 by Tamito KAJIYAMA
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
-#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2018 by Shyouzou Sugitani <[e-mail]>
 #  Copyright (C) 2003 by Shun-ichi TAHARA <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
@@ -1116,8 +1116,6 @@ module Surface
         yoffset = ((dh - h) / 2)
       end
       @window_offset = [xoffset, yoffset]
-      # resize window
-      @window.update_size(*get_max_size())
       @seriko.start(self)
       # relocate window
       unless @dragged # XXX

--- a/lib/ninix/update.rb
+++ b/lib/ninix/update.rb
@@ -2,7 +2,7 @@
 #
 #  Copyright (C) 2001, 2002 by Tamito KAJIYAMA
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
-#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2018 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as

--- a/lib/ninix/version.rb
+++ b/lib/ninix/version.rb
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-#  Copyright (C) 2005-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2005-2018 by Shyouzou Sugitani <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License (version 2) as
@@ -18,7 +18,7 @@ module Version
   bindtextdomain("ninix-aya")
 
   def self.NUMBER
-    '5.0.4'
+    '5.0.5'
   end
 
   def self.CODENAME
@@ -38,7 +38,7 @@ module Version
       .concat('\_q')
       .concat('Copyright (c) 2001, 2002 Tamito KAJIYAMA\n')
       .concat('Copyright (c) 2002-2006 MATSUMURA Namihiko\n')
-      .concat('Copyright (c) 2002-2017 Shyouzou Sugitani\n')
+      .concat('Copyright (c) 2002-2018 Shyouzou Sugitani\n')
       .concat('Copyright (c) 2002, 2003 ABE Hideaki\n')
       .concat('Copyright (c) 2003-2005 Shun-ichi TAHARA\e')
   end

--- a/lib/ninix_main.rb
+++ b/lib/ninix_main.rb
@@ -2,7 +2,7 @@
 #
 #  Copyright (C) 2001, 2002 by Tamito KAJIYAMA
 #  Copyright (C) 2002, 2003 by MATSUMURA Namihiko <[e-mail]>
-#  Copyright (C) 2002-2017 by Shyouzou Sugitani <[e-mail]>
+#  Copyright (C) 2002-2018 by Shyouzou Sugitani <[e-mail]>
 #  Copyright (C) 2003-2005 by Shun-ichi TAHARA <[e-mail]>
 #
 #  This program is free software; you can redistribute it and/or modify it