Changeset 3113Tweet

Timestamp:

Oct 26, 2008, 9:51:04 PM (15 years ago)

Author:

nico

Message:

• Add php binding for 15 new functions
• Add new sample program "examples/drivers.php"

Location:

libcaca/trunk/caca-php

Files:

• examples/drivers.php (added)
• php_caca.c (modified) (7 diffs)

libcaca/trunk/caca-php/php_caca.c

@@ -328 +328 @@
         ZEND_FETCH_RESOURCE(event, caca_event_t*, &_zval, -1, PHP_CACA_EVENT_RES_NAME, le_caca_event); 
 
+#define FETCH_LONG(l) \
+        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &l) == FAILURE) { \
+                RETURN_FALSE; \
+        }
+
 #define RETURN_CHAR(c) \
         char *str = emalloc(2); \
@@ -391 +396 @@
         caca_canvas_t *canvas;
         FETCH_CANVAS(canvas);
-        RETURN_STRING(estrdup(caca_get_canvas_chars(canvas)), 0); //TODO: check that return \0 terminated string
+        RETURN_STRING((char *) caca_get_canvas_chars(canvas), 1); //TODO: check that return \0 terminated string
 }
 
@@ -397 +402 @@
         caca_canvas_t *canvas;
         FETCH_CANVAS(canvas);
-        RETURN_STRING(estrdup(caca_get_canvas_attrs(canvas)), 0); //TODO: check that return \0 terminated string
+        RETURN_STRING((char *) caca_get_canvas_attrs(canvas), 1); //TODO: check that return \0 terminated string
 }
 
@@ -409 +414 @@
 
 PHP_FUNCTION(caca_get_version) {
-        RETURN_STRING(estrdup(caca_get_version()), 0);
+        RETURN_STRING((char *) caca_get_version(), 1);
 }
 
@@ -621 +626 @@
 
 PHP_FUNCTION(caca_set_color_argb) {
+        zval *_zval;
+        long foreground, background = 0;
+        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rll", &_zval, &foreground, &background) == FAILURE) {
+                RETURN_FALSE;
+        }
+        caca_canvas_t *canvas;
+        ZEND_FETCH_RESOURCE(canvas, caca_canvas_t*, &_zval, -1, PHP_CACA_CANVAS_RES_NAME, le_caca_canvas);
+        RETURN_SUCCESS(caca_set_color_argb(canvas, foreground, background));
 }
 
 PHP_FUNCTION(caca_attr_to_ansi) {
+        long l;
+        FETCH_LONG(l);
+        RETURN_LONG(caca_attr_to_ansi(l));
 }
 
 PHP_FUNCTION(caca_attr_to_ansi_fg) {
+        long l;
+        FETCH_LONG(l);
+        RETURN_LONG(caca_attr_to_ansi_fg(l));
 }
 
 PHP_FUNCTION(caca_attr_to_ansi_bg) {
+        long l;
+        FETCH_LONG(l);
+        RETURN_LONG(caca_attr_to_ansi_bg(l));
 }
 
 PHP_FUNCTION(caca_attr_to_rgb12_fg) {
+        long l;
+        FETCH_LONG(l);
+        RETURN_LONG(caca_attr_to_rgb12_fg(l));
 }
 
 PHP_FUNCTION(caca_attr_to_rgb12_bg) {
+        long l;
+        FETCH_LONG(l);
+        RETURN_LONG(caca_attr_to_rgb12_bg(l));
 }
 
@@ -841 +869 @@
 
 PHP_FUNCTION(caca_get_frame_count) {
+        zval *_zval;
+        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &_zval) == FAILURE) {
+                RETURN_FALSE;
+        }
+        caca_canvas_t *canvas;
+        ZEND_FETCH_RESOURCE(canvas, caca_canvas_t*, &_zval, -1, PHP_CACA_CANVAS_RES_NAME, le_caca_canvas);
+        RETURN_LONG(caca_get_canvas_count(canvas));
 }
 
 PHP_FUNCTION(caca_set_frame) {
+        zval *_zval;
+        long id;
+        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &_zval, &id) == FAILURE) {
+                RETURN_FALSE;
+        }
+        caca_canvas_t *canvas;
+        ZEND_FETCH_RESOURCE(canvas, caca_canvas_t*, &_zval, -1, PHP_CACA_CANVAS_RES_NAME, le_caca_canvas);
+        RETURN_SUCCESS(caca_set_frame(canvas, id));
 }
 
 PHP_FUNCTION(caca_set_frame_name) {
+        zval *_zval;
+        char *str;
+        long str_len;
+        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &_zval, &str, &str_len) == FAILURE) {
+                RETURN_FALSE;
+        }
+        caca_canvas_t *canvas;
+        ZEND_FETCH_RESOURCE(canvas, caca_canvas_t*, &_zval, -1, PHP_CACA_CANVAS_RES_NAME, le_caca_canvas);
+        RETURN_SUCCESS(caca_set_frame_name(canvas, str));
 }
 
 PHP_FUNCTION(caca_create_frame) {
+        zval *_zval;
+        long id;
+        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &_zval, &id) == FAILURE) {
+                RETURN_FALSE;
+        }
+        caca_canvas_t *canvas;
+        ZEND_FETCH_RESOURCE(canvas, caca_canvas_t*, &_zval, -1, PHP_CACA_CANVAS_RES_NAME, le_caca_canvas);
+        RETURN_SUCCESS(caca_create_frame(canvas, id));
 }
 
 PHP_FUNCTION(caca_free_frame) {
+        zval *_zval;
+        long id;
+        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &_zval, &id) == FAILURE) {
+                RETURN_FALSE;
+        }
+        caca_canvas_t *canvas;
+        ZEND_FETCH_RESOURCE(canvas, caca_canvas_t*, &_zval, -1, PHP_CACA_CANVAS_RES_NAME, le_caca_canvas);
+        RETURN_SUCCESS(caca_free_frame(canvas, id));
 }
 
@@ -1022 +1090 @@
 
 PHP_FUNCTION(caca_get_display_driver_list) {
+        char const * const *list = caca_get_display_driver_list();
+        int i;
+        array_init(return_value);       
+        for(i = 0; list[i]; i += 2)
+                add_assoc_string(return_value, (char*) list[i], (char*) list[i + 1], 1);
 }
 
 PHP_FUNCTION(caca_get_display_driver) {
+        zval *_zval;
+        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &_zval) == FAILURE) {
+                RETURN_FALSE;
+        }
+        caca_display_t *display;
+        ZEND_FETCH_RESOURCE(display, caca_display_t*, &_zval, -1, PHP_CACA_DISPLAY_RES_NAME, le_caca_display);
+        RETURN_STRING((char *) caca_get_display_driver(display), 1);
 }
 
 PHP_FUNCTION(caca_set_display_driver) {
+        zval *_zval;
+        char *str;
+        long str_len;
+        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &_zval, &str, &str_len) == FAILURE) {
+                RETURN_FALSE;
+        }
+        caca_display_t *display;
+        ZEND_FETCH_RESOURCE(display, caca_display_t*, &_zval, -1, PHP_CACA_DISPLAY_RES_NAME, le_caca_display);
+        RETURN_SUCESS(caca_set_display_driver(display, str));
 }
 
 PHP_FUNCTION(caca_get_canvas) {
+        zval *_zval;
+        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &_zval) == FAILURE) {
+                RETURN_FALSE;
+        }
+        caca_display_t *display;
+        ZEND_FETCH_RESOURCE(display, caca_display_t*, &_zval, -1, PHP_CACA_DISPLAY_RES_NAME, le_caca_display);
+        caca_canvas_t *canvas = caca_get_canvas(display);
+        ZEND_REGISTER_RESOURCE(return_value, canvas, le_caca_canvas);
 }