• R/O
  • HTTP
  • SSH
  • HTTPS

ruby-gtk3: コミット

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


コミットメタ情報

リビジョン1f80298b0afa0126b198301e3c5aedd18125ea1d (tree)
日時2018-01-07 16:10:36
作者Shyouzou Sugitani <shy@user...>
コミッターShyouzou Sugitani

ログメッセージ

Prepare for Release of 5.0.5

変更サマリ

差分

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
1+Sun January 7 2018 Shyouzou Sugitani <shy@users.osdn.me>
2+ * バージョン5.0.5リリース.
3+ * ウインドウの描画方法刷新によりWayland環境に対応.
4+ * Copyrightを2018年に更新した.
5+
16 Wed August 16 2017 Shyouzou Sugitani <shy@users.osdn.me>
27 * deprecatedになっているメソッドを使用しないようにした.
38 (Gtk::Menu.popup)
--- a/README
+++ b/README
@@ -93,7 +93,7 @@ lib/ninix_main.rb をRuby インタプリタで実行してください。
9393 ----------
9494 Copyright (C) 2001, 2002 by Tamito KAJIYAMA <kajiyama3@geocities.co.jp>
9595 Copyright (C) 2002-2007 by MATSUMURA Namihiko <nie@counterghost.net>
96-Copyright (C) 2002-2017 by Shyouzou Sugitani <shy@users.osdn.me>
96+Copyright (C) 2002-2018 by Shyouzou Sugitani <shy@users.osdn.me>
9797 Copyright (C) 2002, 2003 by ABE Hideaki <abe-xx@eos.dricas.com>
9898 Copyright (C) 2003-2005 by Shun-ichi TAHARA <jado@flowernet.gr.jp>
9999
--- a/lib/ninix/alias.rb
+++ b/lib/ninix/alias.rb
@@ -1,7 +1,7 @@
11 # -*- coding: utf-8 -*-
22 #
33 # Copyright (C) 2001, 2002 by Tamito KAJIYAMA
4-# Copyright (C) 2004-2017 by Shyouzou Sugitani <shy@users.osdn.me>
4+# Copyright (C) 2004-2018 by Shyouzou Sugitani <shy@users.osdn.me>
55 #
66 # This program is free software; you can redistribute it and/or modify it
77 # 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 @@
22 #
33 # Copyright (C) 2001, 2002 by Tamito KAJIYAMA
44 # Copyright (C) 2002, 2003 by MATSUMURA Namihiko <nie@counterghost.net>
5-# Copyright (C) 2002-2017 by Shyouzou Sugitani <shy@users.osdn.me>
5+# Copyright (C) 2002-2018 by Shyouzou Sugitani <shy@users.osdn.me>
66 # Copyright (C) 2003 by Shun-ichi TAHARA <jado@flowernet.gr.jp>
77 #
88 # This program is free software; you can redistribute it and/or modify it
@@ -730,9 +730,6 @@ module Balloon
730730 x, y = @position
731731 @width = @balloon_surface.width
732732 @height = @balloon_surface.height
733- w = (@width * scale / 100.0).to_i
734- h = (@height * scale / 100.0).to_i
735- @window.update_size(w, h)
736733 reset_arrow()
737734 reset_sstp_marker()
738735 reset_message_regions()
--- a/lib/ninix/communicate.rb
+++ b/lib/ninix/communicate.rb
@@ -1,7 +1,7 @@
11 # -*- coding: utf-8 -*-
22 #
33 # communicate.rb - ghost-to-ghost communication mechanism
4-# Copyright (C) 2002-2017 by Shyouzou Sugitani <shy@users.osdn.me>
4+# Copyright (C) 2002-2018 by Shyouzou Sugitani <shy@users.osdn.me>
55 # Copyright (C) 2002, 2003 by MATSUMURA Namihiko <nie@counterghost.net>
66 #
77 # 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 @@
11 # -*- coding: utf-8 -*-
22 #
33 # Copyright (C) 2001, 2002 by Tamito KAJIYAMA
4-# Copyright (C) 2003-2017 by Shyouzou Sugitani <shy@users.osdn.me>
4+# Copyright (C) 2003-2018 by Shyouzou Sugitani <shy@users.osdn.me>
55 #
66 # This program is free software; you can redistribute it and/or modify it
77 # 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 @@
11 # -*- coding: utf-8 -*-
22 #
33 # dll.rb - a pseudo DLL (SHIORI/SAORI API support) module for ninix
4-# Copyright (C) 2002-2017 by Shyouzou Sugitani <shy@users.osdn.me>
4+# Copyright (C) 2002-2018 by Shyouzou Sugitani <shy@users.osdn.me>
55 # Copyright (C) 2002, 2003 by MATSUMURA Namihiko <nie@counterghost.net>
66 #
77 # 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 @@
11 # -*- coding: utf-8 -*-
22 #
33 # aya.rb - an aya.dll compatible Shiori module for ninix
4-# Copyright (C) 2002-2017 by Shyouzou Sugitani <shy@users.osdn.me>
4+# Copyright (C) 2002-2018 by Shyouzou Sugitani <shy@users.osdn.me>
55 # Copyright (C) 2002, 2003 by MATSUMURA Namihiko <nie@counterghost.net>
66 #
77 # This program is free software; you can redistribute it and/or modify it
@@ -245,7 +245,7 @@ module Aya
245245 def show_description
246246 Logging::Logging.info(
247247 "Shiori: AYA compatible module for ninix\n" \
248- " Copyright (C) 2002-2017 by Shyouzou Sugitani\n" \
248+ " Copyright (C) 2002-2018 by Shyouzou Sugitani\n" \
249249 " Copyright (C) 2002, 2003 by MATSUMURA Namihiko")
250250 end
251251
--- a/lib/ninix/dll/aya5.rb
+++ b/lib/ninix/dll/aya5.rb
@@ -1,7 +1,7 @@
11 # -*- coding: utf-8 -*-
22 #
33 # aya5.rb - an aya.dll(Ver.5) compatible Shiori module for ninix
4-# Copyright (C) 2002-2017 by Shyouzou Sugitani <shy@users.osdn.me>
4+# Copyright (C) 2002-2018 by Shyouzou Sugitani <shy@users.osdn.me>
55 # Copyright (C) 2002, 2003 by MATSUMURA Namihiko <nie@counterghost.net>
66 #
77 # This program is free software; you can redistribute it and/or modify it
@@ -251,7 +251,7 @@ module Aya5
251251 def show_description
252252 Logging::Logging.info(
253253 "Shiori: AYA5 compatible module for ninix\n" \
254- " Copyright (C) 2002-2017 by Shyouzou Sugitani\n" \
254+ " Copyright (C) 2002-2018 by Shyouzou Sugitani\n" \
255255 " Copyright (C) 2002, 2003 by MATSUMURA Namihiko")
256256 end
257257
--- a/lib/ninix/dll/bln.rb
+++ b/lib/ninix/dll/bln.rb
@@ -1,7 +1,7 @@
11 # -*- coding: utf-8 -*-
22 #
33 # bln.rb - a easyballoon compatible Saori module for ninix
4-# Copyright (C) 2002-2017 by Shyouzou Sugitani <shy@users.osdn.me>
4+# Copyright (C) 2002-2018 by Shyouzou Sugitani <shy@users.osdn.me>
55 #
66 # This program is free software; you can redistribute it and/or modify it
77 # under the terms of the GNU General Public License (version 2) as
@@ -468,7 +468,6 @@ module Bln
468468 h = @balloon_surface.height
469469 w = [8, (w * @scale / 100).to_i].max
470470 h = [8, (h * @scale / 100).to_i].max
471- @window.update_size(w, h)
472471 @base_x, @base_y = get_coordinate(w, h)
473472 end
474473
--- a/lib/ninix/dll/gomi.rb
+++ b/lib/ninix/dll/gomi.rb
@@ -1,7 +1,7 @@
11 # -*- coding: utf-8 -*-
22 #
33 # gomi.rb - a gomi.dll compatible Saori module for ninix
4-# Copyright (C) 2012-2017 by Shyouzou Sugitani <shy@users.osdn.me>
4+# Copyright (C) 2012-2018 by Shyouzou Sugitani <shy@users.osdn.me>
55 #
66 # This program is free software; you can redistribute it and/or modify it
77 # 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 @@
11 # -*- coding: utf-8 -*-
22 #
33 # hanayu.rb - a "花柚" compatible Saori module for ninix
4-# Copyright (C) 2002-2017 by Shyouzou Sugitani <shy@users.osdn.me>
4+# Copyright (C) 2002-2018 by Shyouzou Sugitani <shy@users.osdn.me>
55 # Copyright (C) 2002, 2003 by MATSUMURA Namihiko <nie@counterghost.net>
66 #
77 # 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 @@
11 # -*- coding: utf-8 -*-
22 #
33 # httpc.rb - a HTTPC compatible Saori module for ninix
4-# Copyright (C) 2011-2017 by Shyouzou Sugitani <shy@users.osdn.me>
4+# Copyright (C) 2011-2018 by Shyouzou Sugitani <shy@users.osdn.me>
55 #
66 # This program is free software; you can redistribute it and/or modify it
77 # 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 @@
33 # kawari.rb - a "華和梨" compatible Shiori module for ninix
44 # Copyright (C) 2001, 2002 by Tamito KAJIYAMA
55 # Copyright (C) 2002, 2003 by MATSUMURA Namihiko <nie@counterghost.net>
6-# Copyright (C) 2002-2017 by Shyouzou Sugitani <shy@users.osdn.me>
6+# Copyright (C) 2002-2018 by Shyouzou Sugitani <shy@users.osdn.me>
77 # Copyright (C) 2003 by Shun-ichi TAHARA <jado@flowernet.gr.jp>
88 #
99 # This program is free software; you can redistribute it and/or modify it
@@ -2038,7 +2038,7 @@ module Kawari
20382038 "Shiori: KAWARI compatible module for ninix\n" \
20392039 " Copyright (C) 2001, 2002 by Tamito KAJIYAMA\n" \
20402040 " Copyright (C) 2002, 2003 by MATSUMURA Namihiko\n" \
2041- " Copyright (C) 2002-2017 by Shyouzou Sugitani\n" \
2041+ " Copyright (C) 2002-2018 by Shyouzou Sugitani\n" \
20422042 " Copyright (C) 2003 by Shun-ichi TAHARA")
20432043 end
20442044
--- a/lib/ninix/dll/kawari8.rb
+++ b/lib/ninix/dll/kawari8.rb
@@ -2,7 +2,7 @@
22 #
33 # kawari8.rb - a (Real) 華和梨 loader for ninix
44 # Copyright (C) 2002, 2003 by ABE Hideaki <abe-xx@eos.dricas.com>
5-# Copyright (C) 2002-2017 by Shyouzou Sugitani <shy@users.sourceforge.jp>
5+# Copyright (C) 2002-2018 by Shyouzou Sugitani <shy@users.sourceforge.jp>
66 # Copyright (C) 2002, 2003 by MATSUMURA Namihiko <nie@counterghost.net>
77 #
88 # This program is free software; you can redistribute it and/or modify it
@@ -63,7 +63,7 @@ module Kawari8
6363 Logging::Logging.info(
6464 "Shiori: Real Kawari8 loader for ninix\n" \
6565 " Copyright (C) 2002, 2003 by ABE Hideaki\n" \
66- " Copyright (C) 2002-2017 by Shyouzou Sugitani\n" \
66+ " Copyright (C) 2002-2018 by Shyouzou Sugitani\n" \
6767 " Copyright (C) 2002, 2003 by MATSUMURA Namihiko")
6868 end
6969
--- a/lib/ninix/dll/mciaudio.rb
+++ b/lib/ninix/dll/mciaudio.rb
@@ -1,7 +1,7 @@
11 # -*- coding: utf-8 -*-
22 #
33 # mciaudio.rb - a MCIAUDIO compatible Saori module for ninix
4-# Copyright (C) 2002-2017 by Shyouzou Sugitani <shy@users.osdn.me>
4+# Copyright (C) 2002-2018 by Shyouzou Sugitani <shy@users.osdn.me>
55 # Copyright (C) 2002, 2003 by MATSUMURA Namihiko <nie@counterghost.net>
66 #
77 # 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 @@
11 # -*- coding: utf-8 -*-
22 #
33 # mciaudior.rb - a MCIAUDIOR compatible Saori module for ninix
4-# Copyright (C) 2003-2017 by Shyouzou Sugitani <shy@users.osdn.me>
4+# Copyright (C) 2003-2018 by Shyouzou Sugitani <shy@users.osdn.me>
55 # Copyright (C) 2003 by MATSUMURA Namihiko <nie@counterghost.net>
66 #
77 # 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 @@
33 # misaka.rb - a "美坂" compatible Shiori module for ninix
44 # Copyright (C) 2002 by Tamito KAJIYAMA
55 # Copyright (C) 2002, 2003 by MATSUMURA Namihiko <nie@counterghost.net>
6-# Copyright (C) 2002-2017 by Shyouzou Sugitani <shy@users.osdn.me>
6+# Copyright (C) 2002-2018 by Shyouzou Sugitani <shy@users.osdn.me>
77 #
88 # This program is free software; you can redistribute it and/or modify it
99 # under the terms of the GNU General Public License (version 2) as
@@ -1179,7 +1179,7 @@ module Misaka
11791179 "Shiori: MISAKA compatible module for ninix\n" \
11801180 " Copyright (C) 2002 by Tamito KAJIYAMA\n" \
11811181 " Copyright (C) 2002, 2003 by MATSUMURA Namihiko\n" \
1182- " Copyright (C) 2002-2017 by Shyouzou Sugitani")
1182+ " Copyright (C) 2002-2018 by Shyouzou Sugitani")
11831183 end
11841184
11851185 def reset
--- a/lib/ninix/dll/niseshiori.rb
+++ b/lib/ninix/dll/niseshiori.rb
@@ -3,7 +3,7 @@
33 # niseshiori.rb - a "偽栞" compatible Shiori module for ninix
44 # Copyright (C) 2001, 2002 by Tamito KAJIYAMA
55 # Copyright (C) 2002, 2003 by MATSUMURA Namihiko <nie@counterghost.net>
6-# Copyright (C) 2002-2017 by Shyouzou Sugitani <shy@users.osdn.me>
6+# Copyright (C) 2002-2018 by Shyouzou Sugitani <shy@users.osdn.me>
77 # Copyright (C) 2003 by Shun-ichi TAHARA <jado@flowernet.gr.jp>
88 #
99 # This program is free software; you can redistribute it and/or modify it
@@ -1225,7 +1225,7 @@ module Niseshiori
12251225 "Shiori: NiseShiori compatible module for ninix\n" \
12261226 " Copyright (C) 2001, 2002 by Tamito KAJIYAMA\n" \
12271227 " Copyright (C) 2002, 2003 by MATSUMURA Namihiko\n" \
1228- " Copyright (C) 2002-2017 by Shyouzou Sugitani\n" \
1228+ " Copyright (C) 2002-2018 by Shyouzou Sugitani\n" \
12291229 " Copyright (C) 2003 by Shun-ichi TAHARA")
12301230 end
12311231
--- a/lib/ninix/dll/osuwari.rb
+++ b/lib/ninix/dll/osuwari.rb
@@ -1,7 +1,7 @@
11 # -*- coding: utf-8 -*-
22 #
33 # osuwari.rb - a Osuwari compatible Saori module for ninix
4-# Copyright (C) 2006-2017 by Shyouzou Sugitani <shy@users.osdn.me>
4+# Copyright (C) 2006-2018 by Shyouzou Sugitani <shy@users.osdn.me>
55 #
66 # This program is free software; you can redistribute it and/or modify it
77 # 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 @@
11 # -*- coding: utf-8 -*-
22 #
33 # saori_cpuid.rb - a saori_cpuid compatible Saori module for ninix
4-# Copyright (C) 2003-2017 by Shyouzou Sugitani <shy@users.osdn.me>
4+# Copyright (C) 2003-2018 by Shyouzou Sugitani <shy@users.osdn.me>
55 #
66 # This program is free software; you can redistribute it and/or modify it
77 # 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 @@
33 # satori.rb - a "里々" compatible Shiori module for ninix
44 # Copyright (C) 2002 by Tamito KAJIYAMA
55 # Copyright (C) 2002, 2003 by MATSUMURA Namihiko <nie@counterghost.net>
6-# Copyright (C) 2002-2017 by Shyouzou Sugitani <shy@users.osdn.me>
6+# Copyright (C) 2002-2018 by Shyouzou Sugitani <shy@users.osdn.me>
77 # Copyright (C) 2003, 2004 by Shun-ichi TAHARA <jado@flowernet.gr.jp>
88 #
99 # This program is free software; you can redistribute it and/or modify it
@@ -2715,7 +2715,7 @@ module Satori
27152715 "Shiori: SATORI compatible module for ninix\n" \
27162716 " Copyright (C) 2002 by Tamito KAJIYAMA\n" \
27172717 " Copyright (C) 2002, 2003 by MATSUMURA Namihiko\n" \
2718- " Copyright (C) 2002-2017 by Shyouzou Sugitani\n" \
2718+ " Copyright (C) 2002-2018 by Shyouzou Sugitani\n" \
27192719 " Copyright (C) 2003, 2004 by Shun-ichi TAHARA")
27202720 end
27212721
--- a/lib/ninix/dll/ssu.rb
+++ b/lib/ninix/dll/ssu.rb
@@ -1,7 +1,7 @@
11 # -*- coding: utf-8 -*-
22 #
33 # ssu.rb - a ssu compatible Saori module for ninix
4-# Copyright (C) 2003-2017 by Shyouzou Sugitani <shy@users.osdn.me>
4+# Copyright (C) 2003-2018 by Shyouzou Sugitani <shy@users.osdn.me>
55 #
66 # This program is free software; you can redistribute it and/or modify it
77 # 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 @@
11 # -*- coding: utf-8 -*-
22 #
33 # textcopy.rb - a TEXTCOPY compatible Saori module for ninix
4-# Copyright (C) 2002-2017 by Shyouzou Sugitani <shy@users.osdn.me>
4+# Copyright (C) 2002-2018 by Shyouzou Sugitani <shy@users.osdn.me>
55 # Copyright (C) 2002, 2003 by MATSUMURA Namihiko <nie@counterghost.net>
66 #
77 # 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 @@
11 # -*- coding: utf-8 -*-
22 #
33 # wmove.rb - a wmove.dll compatible Saori module for ninix
4-# Copyright (C) 2003-2017 by Shyouzou Sugitani <shy@users.osdn.me>
4+# Copyright (C) 2003-2018 by Shyouzou Sugitani <shy@users.osdn.me>
55 #
66 # This program is free software; you can redistribute it and/or modify it
77 # 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 @@
22 #
33 # yaya.rb - a (Real) YAYA loader for ninix
44 # Copyright (C) 2004 by linjian
5-# Copyright (C) 2004-2017 by Shyouzou Sugitani <shy@users.sourceforge.jp>
5+# Copyright (C) 2004-2018 by Shyouzou Sugitani <shy@users.sourceforge.jp>
66 # Copyright (C) 2011 by henryhu
77 #
88 # This program is free software; you can redistribute it and/or modify it
@@ -58,7 +58,7 @@ module Yaya
5858 Logging::Logging.info(
5959 "Shiori: a (Real) YAYA loader for ninix\n" \
6060 " Copyright (C) 2004 by linjian\n" \
61- " Copyright (C) 2004-2017 by Shyouzou Sugitani\n" \
61+ " Copyright (C) 2004-2018 by Shyouzou Sugitani\n" \
6262 " Copyright (C) 2011 by henryhu")
6363 end
6464
--- a/lib/ninix/entry_db.rb
+++ b/lib/ninix/entry_db.rb
@@ -1,7 +1,7 @@
11 # -*- coding: utf-8 -*-
22 #
33 # Copyright (C) 2001, 2002 by Tamito KAJIYAMA
4-# Copyright (C) 2004-2017 by Shyouzou Sugitani <shy@users.osdn.me>
4+# Copyright (C) 2004-2018 by Shyouzou Sugitani <shy@users.osdn.me>
55 #
66 # This program is free software; you can redistribute it and/or modify it
77 # 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 @@
22 #
33 # Copyright (C) 2001, 2002 by Tamito KAJIYAMA
44 # Copyright (C) 2002, 2003 by MATSUMURA Namihiko <nie@counterghost.net>
5-# Copyright (C) 2002-2017 by Shyouzou Sugitani <shy@users.osdn.me>
5+# Copyright (C) 2002-2018 by Shyouzou Sugitani <shy@users.osdn.me>
66 #
77 # This program is free software; you can redistribute it and/or modify it
88 # 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 @@
33 # install.rb - an installer module for ninix
44 # Copyright (C) 2001, 2002 by Tamito KAJIYAMA
55 # Copyright (C) 2002, 2003 by MATSUMURA Namihiko <nie@counterghost.net>
6-# Copyright (C) 2002-2017 by Shyouzou Sugitani <shy@users.osdn.me>
6+# Copyright (C) 2002-2018 by Shyouzou Sugitani <shy@users.osdn.me>
77 # Copyright (C) 2003 by Shun-ichi TAHARA <jado@flowernet.gr.jp>
88 #
99 # 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 @@
11 # -*- coding: utf-8 -*-
22 #
33 # Copyright (C) 2002 by Tamito KAJIYAMA
4-# Copyright (C) 2003-2017 by Shyouzou Sugitani <shy@users.osdn.me>
4+# Copyright (C) 2003-2018 by Shyouzou Sugitani <shy@users.osdn.me>
55 #
66 # This program is free software; you can redistribute it and/or modify it
77 # 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 @@
11 # -*- coding: utf-8 -*-
22 #
3-# Copyright (C) 2004-2017 by Shyouzou Sugitani <shy@users.osdn.me>
3+# Copyright (C) 2004-2018 by Shyouzou Sugitani <shy@users.osdn.me>
44 #
55 # This program is free software; you can redistribute it and/or modify it
66 # under the terms of the GNU General Public License (version 2) as
@@ -311,7 +311,6 @@ module Kinoko
311311 redraw(w, cr)
312312 next true
313313 end
314- @window.update_size(@w, @h)
315314 set_position()
316315 show()
317316 reset_z_order()
@@ -442,8 +441,6 @@ module Kinoko
442441 w = [8, (w * @__scale / 100).to_i].max
443442 h = [8, (h * @__scale / 100).to_i].max
444443 @w, @h = w, h # XXX
445- @window.update_size(w, h)
446- @window.queue_resize()
447444 @seriko.start(self)
448445 @seriko.invoke_kinoko(self)
449446 end
--- a/lib/ninix/lock.rb
+++ b/lib/ninix/lock.rb
@@ -1,6 +1,6 @@
11 # -*- coding: utf-8 -*-
22 #
3-# Copyright (C) 2011-2017 by Shyouzou Sugitani <shy@users.osdn.me>
3+# Copyright (C) 2011-2018 by Shyouzou Sugitani <shy@users.osdn.me>
44 #
55 # This program is free software; you can redistribute it and/or modify it
66 # 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 @@
11 # -*- coding: utf-8 -*-
22 #
3-# Copyright (C) 2015-2017 by Shyouzou Sugitani <shy@users.osdn.me>
3+# Copyright (C) 2015-2018 by Shyouzou Sugitani <shy@users.osdn.me>
44 #
55 # This program is free software; you can redistribute it and/or modify it
66 # 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 @@
11 # -*- coding: utf-8 -*-
22 #
33 # Copyright (C) 2001, 2002 by Tamito KAJIYAMA
4-# Copyright (C) 2004-2017 by Shyouzou Sugitani <shy@users.osdn.me>
4+# Copyright (C) 2004-2018 by Shyouzou Sugitani <shy@users.osdn.me>
55 #
66 # This program is free software; you can redistribute it and/or modify it
77 # 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 @@
11 # -*- coding: utf-8 -*-
22 #
3-# Copyright (C) 2003-2017 by Shyouzou Sugitani <shy@users.osdn.me>
3+# Copyright (C) 2003-2018 by Shyouzou Sugitani <shy@users.osdn.me>
44 # Copyright (C) 2003 by Shun-ichi TAHARA <jado@flowernet.gr.jp>
55 #
66 # 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 @@
11 # -*- coding: utf-8 -*-
22 #
33 # metamagic.rb - unknown unknowns
4-# Copyright (C) 2011-2017 by Shyouzou Sugitani <shy@users.osdn.me>
4+# Copyright (C) 2011-2018 by Shyouzou Sugitani <shy@users.osdn.me>
55 #
66 # This program is free software; you can redistribute it and/or modify it
77 # 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 @@
11 # -*- coding: utf-8 -*-
22 #
3-# Copyright (C) 2004-2017 by Shyouzou Sugitani <shy@users.osdn.me>
3+# Copyright (C) 2004-2018 by Shyouzou Sugitani <shy@users.osdn.me>
44 #
55 # This program is free software; you can redistribute it and/or modify it
66 # under the terms of the GNU General Public License (version 2) as
@@ -395,7 +395,6 @@ module Nekodorif
395395 return
396396 end
397397 @w, @h = w, h
398- @window.update_size(@w, @h)
399398 @image_surface = new_surface
400399 @darea.queue_draw()
401400 end
@@ -636,7 +635,6 @@ module Nekodorif
636635 return
637636 end
638637 @w, @h = w, h
639- @window.update_size(@w, @h)
640638 @image_surface = new_surface
641639 @darea.queue_draw()
642640 end
--- a/lib/ninix/ngm.rb
+++ b/lib/ninix/ngm.rb
@@ -1,7 +1,7 @@
11 # -*- coding: utf-8 -*-
22 #
33 # Copyright (C) 2001-2004 by MATSUMURA Namihiko <nie@counterghost.net>
4-# Copyright (C) 2004-2017 by Shyouzou Sugitani <shy@users.osdn.me>
4+# Copyright (C) 2004-2018 by Shyouzou Sugitani <shy@users.osdn.me>
55 #
66 # This program is free software; you can redistribute it and/or modify it
77 # 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 @@
11 # -*- coding: utf-8 -*-
22 #
3-# Copyright (C) 2003-2017 by Shyouzou Sugitani <shy@users.osdn.me>
3+# Copyright (C) 2003-2018 by Shyouzou Sugitani <shy@users.osdn.me>
44 #
55 # This program is free software; you can redistribute it and/or modify it
66 # under the terms of the GNU General Public License (version 2) as
@@ -54,7 +54,7 @@ module Pix
5454 def initialize(type: Gtk::WindowType::TOPLEVEL)
5555 super(type)
5656 set_decorated(false)
57- set_resizable(false)
57+ #set_resizable(false)
5858 signal_connect("screen-changed") do |widget, old_screen|
5959 screen_changed(widget, :old_screen => old_screen)
6060 next true
@@ -71,8 +71,13 @@ module Pix
7171 end
7272 @supports_alpha = composited?
7373 fail "assert" unless not visual.nil?
74- workarea = screen.display.primary_monitor.workarea # XXX
75- @workarea = [workarea.x, workarea.y, workarea.width, workarea.height]
74+ if realized?
75+ workarea = screen.display.get_monitor_at_window(window).workarea # XXX
76+ else
77+ workarea = screen.display.get_monitor(0).workarea # XXX
78+ end
79+ @workarea = [0, 0, workarea.width, workarea.height]
80+ maximize # not fullscreen
7681 end
7782 end
7883
@@ -85,50 +90,27 @@ module Pix
8590 super()
8691 set_app_paintable(true)
8792 set_focus_on_map(false)
88- @__position = [0, 0]
8993 @__surface_position = [0, 0]
90- signal_connect_after('size_allocate') do |a|
91- size_allocate(a)
92- next false
93- end
9494 # create drawing area
9595 @darea = Gtk::DrawingArea.new
96+ @darea.set_size_request(*size) # XXX
9697 @darea.show()
9798 add(@darea)
9899 end
99100
100- def update_size(w, h)
101- @darea.set_size_request(w, h) # XXX
102- queue_resize()
103- end
104-
105- def size_allocate(allocation)
106- new_x, new_y = @__position
107- base_move(new_x, new_y)
108- end
109-
110101 def move(x, y)
111- left, top, scrn_w, scrn_h = @workarea
112- w, h = @darea.size_request() # XXX
113- new_x = [[left, x].max, left + scrn_w - w].min
114- new_y = [[top, y].max, top + scrn_h - h].min
115- base_move(new_x, new_y)
116- @__position = [new_x, new_y]
117102 @__surface_position = [x, y]
118103 @darea.queue_draw()
119104 end
120105
121106 def get_draw_offset
122- window_x, window_y = @__position
123- surface_x, surface_y = @__surface_position
124- return surface_x - window_x, surface_y - window_y
107+ return @__surface_position
125108 end
126109
127110 def winpos_to_surfacepos(x, y, scale)
128- window_x, window_y = @__position
129111 surface_x, surface_y = @__surface_position
130- new_x = ((x - (surface_x - window_x)) * 100 / scale).to_i
131- new_y = ((y - (surface_y - window_y)) * 100 / scale).to_i
112+ new_x = ((x - surface_x) * 100 / scale).to_i
113+ new_y = ((y - surface_y) * 100 / scale).to_i
132114 return new_x, new_y
133115 end
134116
--- a/lib/ninix/prefs.rb
+++ b/lib/ninix/prefs.rb
@@ -2,7 +2,7 @@
22 #
33 # Copyright (C) 2001, 2002 by Tamito KAJIYAMA
44 # Copyright (C) 2002, 2003 by MATSUMURA Namihiko <nie@counterghost.net>
5-# Copyright (C) 2004-2017 by Shyouzou Sugitani <shy@users.osdn.me>
5+# Copyright (C) 2004-2018 by Shyouzou Sugitani <shy@users.osdn.me>
66 # Copyright (C) 2003-2005 by Shun-ichi TAHARA <jado@flowernet.gr.jp>
77 #
88 # 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 @@
22 #
33 # Copyright (C) 2001, 2002 by Tamito KAJIYAMA
44 # Copyright (C) 2002, 2003 by MATSUMURA Namihiko <nie@counterghost.net>
5-# Copyright (C) 2002-2017 by Shyouzou Sugitani <shy@users.osdn.me>
5+# Copyright (C) 2002-2018 by Shyouzou Sugitani <shy@users.osdn.me>
66 # Copyright (C) 2003 by Shun-ichi TAHARA <jado@flowernet.gr.jp>
77 #
88 # 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 @@
22 #
33 # script.rb - a Sakura Script parser
44 # Copyright (C) 2001, 2002 by Tamito KAJIYAMA
5-# Copyright (C) 2004-2017 by Shyouzou Sugitani <shy@users.osdn.me>
5+# Copyright (C) 2004-2018 by Shyouzou Sugitani <shy@users.osdn.me>
66 #
77 # This program is free software; you can redistribute it and/or modify it
88 # 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 @@
22 #
33 # Copyright (C) 2002 by Tamito KAJIYAMA
44 # Copyright (C) 2002, 2003 by MATSUMURA Namihiko <nie@counterghost.net>
5-# Copyright (C) 2002-2017 by Shyouzou Sugitani <shy@users.osdn.me>
5+# Copyright (C) 2002-2018 by Shyouzou Sugitani <shy@users.osdn.me>
66 #
77 # This program is free software; you can redistribute it and/or modify it
88 # 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 @@
22 #
33 # Copyright (C) 2001, 2002 by Tamito KAJIYAMA
44 # Copyright (C) 2002, 2003 by MATSUMURA Namihiko <nie@counterghost.net>
5-# Copyright (C) 2002-2017 by Shyouzou Sugitani <shy@users.osdn.me>
5+# Copyright (C) 2002-2018 by Shyouzou Sugitani <shy@users.osdn.me>
66 #
77 # This program is free software; you can redistribute it and/or modify it
88 # 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 @@
33 # sstplib.rb - an SSTP library module in Ruby
44 # Copyright (C) 2001, 2002 by Tamito KAJIYAMA
55 # Copyright (C) 2002, 2003 by MATSUMURA Namihiko <nie@counterghost.net>
6-# Copyright (C) 2002-2017 by Shyouzou Sugitani <shy@users.osdn.me>
6+# Copyright (C) 2002-2018 by Shyouzou Sugitani <shy@users.osdn.me>
77 #
88 # This program is free software; you can redistribute it and/or modify it
99 # 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 @@
22 #
33 # Copyright (C) 2001, 2002 by Tamito KAJIYAMA
44 # Copyright (C) 2002, 2003 by MATSUMURA Namihiko <nie@counterghost.net>
5-# Copyright (C) 2002-2017 by Shyouzou Sugitani <shy@users.osdn.me>
5+# Copyright (C) 2002-2018 by Shyouzou Sugitani <shy@users.osdn.me>
66 # Copyright (C) 2003 by Shun-ichi TAHARA <jado@flowernet.gr.jp>
77 #
88 # This program is free software; you can redistribute it and/or modify it
@@ -1116,8 +1116,6 @@ module Surface
11161116 yoffset = ((dh - h) / 2)
11171117 end
11181118 @window_offset = [xoffset, yoffset]
1119- # resize window
1120- @window.update_size(*get_max_size())
11211119 @seriko.start(self)
11221120 # relocate window
11231121 unless @dragged # XXX
--- a/lib/ninix/update.rb
+++ b/lib/ninix/update.rb
@@ -2,7 +2,7 @@
22 #
33 # Copyright (C) 2001, 2002 by Tamito KAJIYAMA
44 # Copyright (C) 2002, 2003 by MATSUMURA Namihiko <nie@counterghost.net>
5-# Copyright (C) 2002-2017 by Shyouzou Sugitani <shy@users.osdn.me>
5+# Copyright (C) 2002-2018 by Shyouzou Sugitani <shy@users.osdn.me>
66 #
77 # This program is free software; you can redistribute it and/or modify it
88 # 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 @@
11 # -*- coding: utf-8 -*-
22 #
3-# Copyright (C) 2005-2017 by Shyouzou Sugitani <shy@users.osdn.me>
3+# Copyright (C) 2005-2018 by Shyouzou Sugitani <shy@users.osdn.me>
44 #
55 # This program is free software; you can redistribute it and/or modify it
66 # under the terms of the GNU General Public License (version 2) as
@@ -18,7 +18,7 @@ module Version
1818 bindtextdomain("ninix-aya")
1919
2020 def self.NUMBER
21- '5.0.4'
21+ '5.0.5'
2222 end
2323
2424 def self.CODENAME
@@ -38,7 +38,7 @@ module Version
3838 .concat('\_q')
3939 .concat('Copyright (c) 2001, 2002 Tamito KAJIYAMA\n')
4040 .concat('Copyright (c) 2002-2006 MATSUMURA Namihiko\n')
41- .concat('Copyright (c) 2002-2017 Shyouzou Sugitani\n')
41+ .concat('Copyright (c) 2002-2018 Shyouzou Sugitani\n')
4242 .concat('Copyright (c) 2002, 2003 ABE Hideaki\n')
4343 .concat('Copyright (c) 2003-2005 Shun-ichi TAHARA\e')
4444 end
--- a/lib/ninix_main.rb
+++ b/lib/ninix_main.rb
@@ -2,7 +2,7 @@
22 #
33 # Copyright (C) 2001, 2002 by Tamito KAJIYAMA
44 # Copyright (C) 2002, 2003 by MATSUMURA Namihiko <nie@counterghost.net>
5-# Copyright (C) 2002-2017 by Shyouzou Sugitani <shy@users.osdn.me>
5+# Copyright (C) 2002-2018 by Shyouzou Sugitani <shy@users.osdn.me>
66 # Copyright (C) 2003-2005 by Shun-ichi TAHARA <jado@flowernet.gr.jp>
77 #
88 # This program is free software; you can redistribute it and/or modify it
旧リポジトリブラウザで表示