Changeset 3140 for libcaca/trunk/caca-phpTweet

Timestamp:

Oct 29, 2008, 11:58:24 PM (14 years ago)

Author:

nico

Message:

• Rewrite main loop of sample program demo.php

File:

• libcaca/trunk/caca-php/examples/demo.php (modified) (10 diffs)

libcaca/trunk/caca-php/examples/demo.php

@@ -16 +16 @@
  */
 
+
+
 function main() {
         $cv = caca_create_canvas(0, 0);
@@ -34 +36 @@
         /* Main menu */
         display_menu($cv, $dp, $bounds, $outline);
-        caca_refresh_display($dp);
 
         /* Go ! */
         $bounds = $outline = $dithering = 0;
-
+        $need_refresh = false;
         $ev = caca_create_event();
         while(!$quit) {
-                $menu = $mouse = $xmouse = $ymouse = 0;
-
-                while (caca_get_event($dp, CACA_EVENT_ANY, $ev, 0)) {
-                        if ($demo and (caca_get_event_type($ev) & CACA_EVENT_KEY_PRESS)) {
-                                $menu = 1;
-                                $demo = false;
-                        }
-                        else if (caca_get_event_type($ev) & CACA_EVENT_KEY_PRESS) {
+                while (caca_get_event($dp, CACA_EVENT_ANY, $ev, 1000)) {
+                        if (caca_get_event_type($ev) & CACA_EVENT_KEY_PRESS) {
                                 switch (caca_get_event_key_ch($ev)) {
                                         case ord('q'):
@@ -74 +69 @@
                                         case ord('f'):
                                         case ord('F'):
-                                                $demo = "demo_all";
+                                                demo_go($dp, "demo_all", $cv, $bounds, $outline);
                                                 break;
                                         case ord('1'):
-                                                $demo = "demo_dots";
+                                                demo_go($dp, "demo_dots", $cv, $bounds, $outline);
                                                 break;
                                         case ord('2'):
-                                                $demo = "demo_lines";
+                                                demo_go($dp, "demo_lines", $cv, $bounds, $outline);
                                                 break;
                                         case ord('3'):
-                                                $demo = "demo_boxes";
+                                                demo_go($dp, "demo_boxes", $cv, $bounds, $outline);
                                                 break;
                                         case ord('4'):
-                                                $demo = "demo_triangles";
+                                                demo_go($dp, "demo_triangles", $cv, $bounds, $outline);
                                                 break;
                                         case ord('5'):
-                                                $demo = "demo_ellipses";
+                                                demo_go($dp, "demo_ellipses", $cv, $bounds, $outline);
                                                 break;
                                         case ord('s'):
                                         case ord('S'):
-                                                $demo = "demo_sprites";
+                                                demo_go($dp, "demo_sprites", $cv, $bounds, $outline);
                                                 break;
                                         case ord('r'):
                                         case ord('R'):
-                                                $demo = "demo_render";
-                                                break;
-                                }
-
-                                if ($demo) {
-                                        caca_set_color_ansi($cv, CACA_LIGHTGRAY, CACA_BLACK);
-                                        caca_clear_canvas($cv);
+                                                demo_go($dp, "demo_render", $cv, $bounds, $outline);
+                                                break;
                                 }
                         }
                         else if(caca_get_event_type($ev) & CACA_EVENT_MOUSE_MOTION) {
-                                $mouse = 1;
-                                $xmouse = caca_get_event_mouse_x($ev);
-                                $ymouse = caca_get_event_mouse_y($ev);
+                                $x = caca_get_event_mouse_x($ev);
+                                $y = caca_get_event_mouse_y($ev);
+                                display_menu($cv, $dp, $bounds, $outline, false);
+                                caca_set_color_ansi($cv, CACA_RED, CACA_BLACK);
+                                caca_put_str($cv, $x, $y, ".");
+                                caca_put_str($cv, $x, $y + 1, "|\\");
+                                $need_refresh = true;
                         }
                         else if(caca_get_event_type($ev) & CACA_EVENT_RESIZE) {
-                                $mouse = 1; /* old hack */
+                                display_menu($cv, $dp, $bounds, $outline);
                         }
                 }
 
-                if ($menu || ($mouse && !$demo)) {
-                        display_menu($cv, $dp, $bounds, $outline);
-                        if ($mouse && !$demo) {
-                                caca_set_color_ansi($cv, CACA_RED, CACA_BLACK);
-                                caca_put_str($cv, $xmouse, $ymouse,".");
-                                caca_put_str($cv, $xmouse, $ymouse + 1, "|\\");
-                        }
+                if ($need_refresh) {
                         caca_refresh_display($dp);
-                        $mouse = $menu = 0;
+                        $need_refresh = false;
                 }
-
-                if ($demo) {
-                        if (function_exists($demo))
-                                $demo($cv, $bounds, $outline, $dithering);
-
-                        caca_set_color_ansi($cv, CACA_LIGHTGRAY, CACA_BLACK);
-                        caca_draw_thin_box($cv, 1, 1, caca_get_canvas_width($cv) - 2, caca_get_canvas_height($cv) - 2);
-                        $rate = sprintf("%01.2f", 1000000 / caca_get_display_time($dp));
-                        caca_put_str($cv, 4, 1, "[$rate fps]----");
-                        caca_refresh_display($dp);
-                }
-        }
-}
-
-function demo_all($cv, $dp, $bounds, $outline) {
+        }
+}
+
+function demo_go($dp, $demo, $cv, $bounds, $outline) {
+        caca_set_color_ansi($cv, CACA_LIGHTGRAY, CACA_BLACK);
+        caca_clear_canvas($cv);
+
+        while (!caca_get_event($dp, CACA_EVENT_KEY_PRESS)) {
+                if (function_exists($demo))
+                        $demo($cv, $bounds, $outline);
+
+                caca_set_color_ansi($cv, CACA_LIGHTGRAY, CACA_BLACK);
+                caca_draw_thin_box($cv, 1, 1, caca_get_canvas_width($cv) - 2, caca_get_canvas_height($cv) - 2);
+                $rate = sprintf("%01.2f", 1000000 / caca_get_display_time($dp));
+                caca_put_str($cv, 4, 1, "[$rate fps]----");
+                caca_refresh_display($dp);
+        }
+
+        display_menu($cv, $dp, $bounds, $outline);
+        caca_refresh_display($dp);
+}
+
+
+function demo_all($cv, $bounds, $outline) {
         global $i;
 
@@ -224 +221 @@
 }
 
-function display_menu($cv, $dp, $bounds, $outline) {
+function display_menu($cv, $dp, $bounds, $outline, $refresh = true) {
         $xo = caca_get_canvas_width($cv) - 2;
         $yo = caca_get_canvas_height($cv) - 2;
@@ -253 +250 @@
         caca_put_str($cv, 4, $yo - 2, "'q': quit");
 
-        caca_refresh_display($dp);
-}
-
-function demo_dots($cv, $bounds, $outline, $dithering) {
+        if ($refresh)
+                caca_refresh_display($dp);
+}
+
+function demo_dots($cv, $bounds, $outline) {
         $xmax = caca_get_canvas_width($cv);
         $ymax = caca_get_canvas_height($cv);
@@ -269 +267 @@
 }
 
-function demo_lines($cv, $bounds, $outline, $dithering) {
+function demo_lines($cv, $bounds, $outline) {
         $w = caca_get_canvas_width($cv);
         $h = caca_get_canvas_height($cv);
@@ -289 +287 @@
 }
 
-function demo_boxes($cv, $bounds, $outline, $dithering) {
+function demo_boxes($cv, $bounds, $outline) {
         $w = caca_get_canvas_width($cv);
         $h = caca_get_canvas_height($cv);
@@ -312 +310 @@
 }
 
-function demo_ellipses($cv, $bounds, $outline, $dithering) {
+function demo_ellipses($cv, $bounds, $outline) {
         $w = caca_get_canvas_width($cv);
         $h = caca_get_canvas_height($cv);
@@ -337 +335 @@
 }
 
-function demo_triangles($cv, $bounds, $outline, $dithering) {
+function demo_triangles($cv, $bounds, $outline) {
         $w = caca_get_canvas_width($cv);
         $h = caca_get_canvas_height($cv);
@@ -362 +360 @@
 }
 
-function demo_render($cv, $bounds, $outline, $dithering) {
+function demo_render($cv, $bounds, $outline) {
 }
 
 
 main();
-
-?>