Changeset 2017Tweet

Timestamp:

Nov 18, 2007, 2:37:24 PM (15 years ago)

Author:

Pascal Terjan

Message:

• Add missing methods in Caca::Display and add empty Caca::Event

Location:

libcaca/trunk/ruby

Files:

• Makefile.am (modified) (2 diffs)
• caca-display.c (modified) (3 diffs)
• caca-event.c (added)
• caca-event.h (added)

libcaca/trunk/ruby/Makefile.am

@@ -13 +13 @@
 
 caca_la_CPPFLAGS = -I$(top_srcdir)/caca -I$(RUBY_ARCHDIR)
-caca_la_SOURCES = caca.c caca-display.c
+caca_la_SOURCES = caca.c caca-display.c caca-event.c
 caca_la_LDFLAGS = -module -avoid-version -shared -L$(RUBY_LIBDIR) -l$(RUBY_SO_NAME)
 caca_la_LIBADD = ../caca/libcaca.la
@@ -20 +20 @@
              cucul-dither.h \
              cucul-font.h \
+             caca-display.h \
+             caca-event.h \
              common.h \
              test.rb \

libcaca/trunk/ruby/caca-display.c

@@ -13 +13 @@
 #include <caca.h>
 #include <errno.h>
+#include "caca-event.h"
 #include "cucul-canvas.h"
 #include "common.h"
@@ -98 +99 @@
 }
 
+static VALUE get_mouse_x(VALUE self)
+{
+    return NUM2UINT(caca_get_mouse_x(_SELF));
+}
+
+static VALUE get_mouse_y(VALUE self)
+{
+    return NUM2UINT(caca_get_mouse_y(_SELF));
+}
+
+static VALUE set_mouse(VALUE self, VALUE visible)
+{
+    caca_set_display_time(_SELF, visible);
+    return visible;
+}
+
+static VALUE set_mouse2(VALUE self, VALUE visible)
+{
+    set_mouse(self, visible);
+    return self;
+}
+
+static VALUE get_event(VALUE self, VALUE event_mask, VALUE timeout)
+{
+    caca_event_t ev;
+    if(caca_get_event(_SELF, NUM2UINT(event_mask), &ev, NUM2INT(timeout)) == 0)
+    {
+        return Qnil;
+    }
+    //FIXME
+    return Qnil;
+}
+
 void Init_caca_display(VALUE mCaca)
 {
@@ -112 +146 @@
     rb_define_method(cDisplay, "title=", set_title, 1);
     rb_define_method(cDisplay, "set_title", set_title2, 1);
+    rb_define_method(cDisplay, "mouse_x", get_mouse_x, 0);
+    rb_define_method(cDisplay, "mouse_y", get_mouse_y, 0);
+    rb_define_method(cDisplay, "mouse=", set_mouse, 1);
+    rb_define_method(cDisplay, "set_mouse", set_mouse2, 1);
+    rb_define_method(cDisplay, "get_event", get_event, 3);
 }