Added Ecore::Evas::EcoreEvas#has_alpha? and #has_alpha=.

[ruby-ecore.git] / src / ecore_job / rb_job.c

diff --git a/src/ecore_job/rb_job.c b/src/ecore_job/rb_job.c
index 7db2f687a926d31754386a37e7ee2ca83b7c70a6..5c4ff46c00cc55620c414ac9abacb77b28c8ce95 100644 (file)
--- a/src/ecore_job/rb_job.c
+++ b/src/ecore_job/rb_job.c
@@ -1,7 +1,7 @@
 /*
- * $Id$
+ * $Id: rb_job.c 351 2006-02-10 15:25:40Z tilman $
  *
- * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
+ * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,70 +20,90 @@
 
 #include <ruby.h>
 
+#include <Ecore.h>
 #include <Ecore_Job.h>
 #include <stdbool.h>
 
 #include "rb_ecore_job.h"
 
 typedef struct {
-       Ecore_Job *job;
-       void *cb;
+       Ecore_Job *real;
+       VALUE callback;
        bool deleted;
-} RbEcoreJob;
-
-VALUE cEcoreJob;
+} RbJob;
 
 static void on_job (void *data)
 {
-       RbEcoreJob *job = data;
+       RbJob *job = data;
 
-       rb_funcall ((VALUE) job->cb, rb_intern ("call"), 0);
+       rb_funcall (job->callback, rb_intern ("call"), 0);
        job->deleted = true;
 }
 
-static VALUE c_init (VALUE self)
+static void c_mark (RbJob *job)
 {
-       RbEcoreJob *job = NULL;
+       rb_gc_mark (job->callback);
+}
 
-       Data_Get_Struct (self, RbEcoreJob, job);
+static void c_free (RbJob *job)
+{
+       if (job->real && !job->deleted)
+               ecore_job_del (job->real);
 
-       job->cb = (void *) rb_block_proc ();
-       job->job = ecore_job_add (on_job, job);
+       ecore_shutdown ();
 
-       return self;
+       free (job);
 }
 
-static void c_free (RbEcoreJob *job)
+static VALUE c_alloc (VALUE klass)
 {
-       if (job->job && !job->deleted)
-               ecore_job_del (job->job);
+       RbJob *job = NULL;
 
-       free (job);
+       ecore_init ();
+
+       return Data_Make_Struct (klass, RbJob, c_mark, c_free, job);
 }
 
-static VALUE c_new (VALUE klass)
+/*
+ * call-seq:
+ *  Ecore::Job::Job.new { block } => job
+ *
+ * Creates an Ecore::Job::Job object.
+ * After execution, the object will be deleted.
+ */
+static VALUE c_init (VALUE self)
 {
-       VALUE self;
-       RbEcoreJob *job;
+       RbJob *job = NULL;
+
+       if (!rb_block_given_p ())
+               rb_raise (rb_eStandardError, "block missing");
 
-       self = Data_Make_Struct (klass, RbEcoreJob, NULL, c_free, job);
+       Data_Get_Struct (self, RbJob, job);
 
-       rb_obj_call_init (self, 0, NULL);
+       job->callback = rb_block_proc ();
+       job->deleted = false;
+       job->real = ecore_job_add (on_job, job);
 
        return self;
 }
 
+/*
+ * call-seq:
+ *  job.delete => nil
+ *
+ * Deletes <i>job</i>.
+ */
 static VALUE c_delete (VALUE self)
 {
        VALUE ret = Qfalse;
-       RbEcoreJob *job = NULL;
+       RbJob *job = NULL;
 
-       Data_Get_Struct (self, RbEcoreJob, job);
+       Data_Get_Struct (self, RbJob, job);
 
-       if (job->job && !job->deleted) {
-               ecore_job_del (job->job);
+       if (job->real && !job->deleted) {
+               ecore_job_del (job->real);
                job->deleted = true;
-               job->job = NULL;
+               job->real = NULL;
                ret = Qtrue;
        }
 
@@ -92,10 +112,9 @@ static VALUE c_delete (VALUE self)
 
 void Init_Job (void)
 {
-       cEcoreJob = rb_define_class_under (mJob, "Job", rb_cObject);
+       VALUE c = rb_define_class_under (mJob, "Job", rb_cObject);
 
-       rb_define_singleton_method (cEcoreJob, "new", c_new, 0);
-       rb_define_method (cEcoreJob, "initialize", c_init, 0);
-       rb_define_method (cEcoreJob, "delete", c_delete, 0);
+       rb_define_alloc_func (c, c_alloc);
+       rb_define_method (c, "initialize", c_init, 0);
+       rb_define_method (c, "delete", c_delete, 0);
 }
-