summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-02-08 23:12:32 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-02-08 23:12:32 +0000
commit35cdf6dd40ab7e971a8ab841883a60bc59fbaa38 (patch)
treeb0f0f91e0444acf548b5c4c79f62a07361fbf069
parent2879018f4d95ea623fe9b10517565f1b56740426 (diff)
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added. [ruby-talk:130092] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7925 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog9
-rw-r--r--ext/curses/curses.c17
-rw-r--r--ext/socket/socket.c3
3 files changed, 29 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6421426a49..ee29a288f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,17 @@
+Wed Feb 9 08:07:08 2005 Paul Duncan <pabs@pablotron.org>
+
+ * ext/curses/curses.c (window_color_set): [ruby-core:04393]
+
Tue Feb 8 23:51:47 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* lib/drb/drb.rb: reject :instance_eval, :class_eval, :module_eval
[druby-ja:117]
+Tue Feb 8 13:06:12 2005 Sam Roberts <sroberts@uniserve.com>
+
+ * ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
+ [ruby-talk:130092]
+
Tue Feb 8 09:30:01 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/cgi.rb (CGI::Cookie): [ruby-talk:130040]
diff --git a/ext/curses/curses.c b/ext/curses/curses.c
index a8952bf186..d003f1d5df 100644
--- a/ext/curses/curses.c
+++ b/ext/curses/curses.c
@@ -1195,6 +1195,20 @@ window_setscrreg(VALUE obj, VALUE top, VALUE bottom)
#endif
}
+#ifdef USE_COLOR
+static VALUE
+window_color_set(VALUE obj, VALUE col)
+{
+ struct windata *winp;
+ int res;
+
+ GetWINDOW(obj, winp);
+ res = wcolor_set(winp->window, NUM2INT(col), NULL);
+ return (res == OK) ? Qtrue : Qfalse;
+ return Qfalse;
+}
+#endif /* USE_COLOR */
+
static VALUE
window_scroll(VALUE obj)
{
@@ -1471,6 +1485,9 @@ Init_curses()
rb_define_method(cWindow, "box", window_box, -1);
rb_define_method(cWindow, "move", window_move, 2);
rb_define_method(cWindow, "setpos", window_setpos, 2);
+#ifdef USE_COLOR
+ rb_define_method(cWindow, "color_set", window_color_set, 1);
+#endif /* USE_COLOR */
rb_define_method(cWindow, "cury", window_cury, 0);
rb_define_method(cWindow, "curx", window_curx, 0);
rb_define_method(cWindow, "maxy", window_maxy, 0);
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index 09355b473c..97df7cf780 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -2796,6 +2796,9 @@ Init_socket()
sock_define_const("SO_DEBUG", SO_DEBUG);
#endif
sock_define_const("SO_REUSEADDR", SO_REUSEADDR);
+#ifdef SO_REUSEPORT
+ sock_define_const("SO_REUSEPORT", SO_REUSEPORT);
+#endif
#ifdef SO_TYPE
sock_define_const("SO_TYPE", SO_TYPE);
#endif