/*
- * $Id: rb_fd_handler.c 109 2004-09-01 20:33:15Z tilman $
- *
* Copyright (C) 2004 ruby-ecore team (see AUTHORS)
*
* This library is free software; you can redistribute it and/or
free (fdh);
}
-static VALUE c_new (VALUE klass, VALUE fd, VALUE flags)
+static VALUE c_alloc (VALUE klass)
{
- VALUE self;
RbFdHandler *fdh = NULL;
+ ecore_init ();
+
+ return Data_Make_Struct (klass, RbFdHandler, c_mark, c_free, fdh);
+}
+
+static VALUE c_init (VALUE self, VALUE fd, VALUE flags)
+{
+ GET_OBJ (self, RbFdHandler, fdh);
+
if (!rb_block_given_p ())
- return Qnil;
+ rb_raise (rb_eStandardError, "block missing");
Check_Type (fd, T_FIXNUM);
Check_Type (flags, T_FIXNUM);
- self = Data_Make_Struct (klass, RbFdHandler, c_mark, c_free, fdh);
-
- ecore_init ();
-
fdh->callback = rb_block_proc ();
fdh->real = ecore_main_fd_handler_add (FIX2INT (fd),
FIX2INT (flags), on_change,
fdh, NULL, NULL);
- rb_obj_call_init (self, 0, NULL);
-
return self;
}
{
VALUE c = rb_define_class_under (mEcore, "FdHandler", rb_cObject);
- rb_define_singleton_method (c, "new", c_new, 2);
+ rb_define_alloc_func (c, c_alloc);
+ rb_define_method (c, "initialize", c_init, 2);
rb_define_method (c, "delete", c_delete, 0);
rb_define_method (c, "fd", c_fd_get, 0);
rb_define_method (c, "get_active", c_get_active, 1);