Changeset 3104 for libcaca/trunk/caca-php/php_caca.cTweet

Timestamp:

Oct 25, 2008, 5:41:39 PM (14 years ago)

Author:

nico

Message:

• Add binding for 6 new caca's functions
• Add a nice php sample file examples/example1.php that shows a smart pink ping

File:

• libcaca/trunk/caca-php/php_caca.c (modified) (12 diffs)

libcaca/trunk/caca-php/php_caca.c

@@ -329 +329 @@
                 RETURN_FALSE;
         }
-        RETURN_BOOL(caca_create_canvas(width, height) == 0);
+        caca_canvas_t *canvas = caca_create_canvas(width, height);
+        if (!canvas) {
+                RETURN_FALSE;
+        }
+        ZEND_REGISTER_RESOURCE(return_value, canvas, le_caca_canvas);
 }
 
@@ -391 +395 @@
                 RETURN_FALSE;
         }
-
         caca_canvas_t *canvas;
         ZEND_FETCH_RESOURCE(canvas, caca_canvas_t*, &_zval, -1, PHP_CACA_CANVAS_RES_NAME, le_caca_canvas);
@@ -415 +418 @@
                 RETURN_FALSE;
         }
-
         caca_canvas_t *canvas;
         ZEND_FETCH_RESOURCE(canvas, caca_canvas_t*, &_zval, -1, PHP_CACA_CANVAS_RES_NAME, le_caca_canvas);
@@ -427 +429 @@
                 RETURN_FALSE;
         }
-
         caca_canvas_t *canvas;
         ZEND_FETCH_RESOURCE(canvas, caca_canvas_t*, &_zval, -1, PHP_CACA_CANVAS_RES_NAME, le_caca_canvas);
@@ -440 +441 @@
                 RETURN_FALSE;
         }
-
         caca_canvas_t *canvas;
         ZEND_FETCH_RESOURCE(canvas, caca_canvas_t*, &_zval, -1, PHP_CACA_CANVAS_RES_NAME, le_caca_canvas);
@@ -461 +461 @@
                 RETURN_FALSE;
         }
-
         caca_canvas_t *canvas;
         ZEND_FETCH_RESOURCE(canvas, caca_canvas_t*, &_zval, -1, PHP_CACA_CANVAS_RES_NAME, le_caca_canvas);
@@ -480 +479 @@
 
 PHP_FUNCTION(caca_blit) {
-        zval *_zval1, *_zval2, *_zval3;
+        zval *_zval1, *_zval2, *_zval3 = NULL;
         long x, y = 0;
-        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rllrr", &_zval1, &x, &y, &_zval2, &_zval3) == FAILURE) {
-                RETURN_FALSE;
-        }
-
-        caca_canvas_t *dst, *src, *mask;
+        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rllr|r", &_zval1, &x, &y, &_zval2, &_zval3) == FAILURE) {
+                RETURN_FALSE;
+        }
+        caca_canvas_t *dst, *src, *mask = NULL;
         ZEND_FETCH_RESOURCE(dst, caca_canvas_t*, &_zval1, -1, PHP_CACA_CANVAS_RES_NAME, le_caca_canvas);
         ZEND_FETCH_RESOURCE(src, caca_canvas_t*, &_zval2, -1, PHP_CACA_CANVAS_RES_NAME, le_caca_canvas);
-        ZEND_FETCH_RESOURCE(mask, caca_canvas_t*, &_zval3, -1, PHP_CACA_CANVAS_RES_NAME, le_caca_canvas);
-
-        RETURN_BOOL(caca_blit(dst, x, y, src, mask) == 0);
+        if (_zval3) {
+                ZEND_FETCH_RESOURCE(mask, caca_canvas_t*, &_zval3, -1, PHP_CACA_CANVAS_RES_NAME, le_caca_canvas);
+        }
+        RETURN_BOOL(caca_blit(dst, x, y, src, NULL) == 0);
 }
 
@@ -500 +499 @@
                 RETURN_FALSE;
         }
-
         caca_canvas_t *canvas;
         ZEND_FETCH_RESOURCE(canvas, caca_canvas_t*, &_zval, -1, PHP_CACA_CANVAS_RES_NAME, le_caca_canvas);
@@ -564 +562 @@
 
 PHP_FUNCTION(caca_set_color_ansi) {
+        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_BOOL(caca_set_color_ansi(canvas, foreground, background) == 0);
 }
 
@@ -735 +741 @@
 
 PHP_FUNCTION(caca_import_memory) {
+        zval *_zval;
+        char *src, *type;
+        long src_len, type_len = 0;
+        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rss", &_zval, &src, &src_len, &type, &type_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_LONG(caca_import_memory(canvas, src, src_len, type));
 }
 
@@ -747 +763 @@
 
 PHP_FUNCTION(caca_create_display) {
+        caca_canvas_t *canvas;
+        FETCH_CANVAS(canvas);
+
+        caca_display_t *display = caca_create_display(canvas);
+        ZEND_REGISTER_RESOURCE(return_value, display, le_caca_display);
 }
 
 PHP_FUNCTION(caca_create_display_with_driver) {
+        zval *_zval;
+        char *str;
+        long str_len = 0;
+        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);
+
+        caca_display_t *display = caca_create_display_with_driver(canvas, str);
+        if (!display) {
+                RETURN_FALSE;
+        }
+        ZEND_REGISTER_RESOURCE(return_value, display, le_caca_display);
 }
 
@@ -765 +800 @@
 
 PHP_FUNCTION(caca_refresh_display) {
+        caca_display_t *display;
+        FETCH_DISPLAY(display);
+        RETURN_BOOL(caca_refresh_display(display) == 0);
 }