Changeset 199 for libcaca/trunk/examples/demo.cTweet

Timestamp:

Nov 19, 2003, 6:32:10 PM (19 years ago)

Author:

Sam Hocevar

Message:

• src/io.c: + Renamed sdl_get_key() into sdl_get_event(). + Handle mouse clicks.
• src/caca.c: + Activate the terminal's mouse handling if supported.

File:

• libcaca/trunk/examples/demo.c (modified) (5 diffs)

libcaca/trunk/examples/demo.c

@@ -79 +79 @@
     //pixbuf = gdk_pixbuf_new_from_file("/home/sam/pix/gradient.png", NULL);
     //pixbuf = gdk_pixbuf_new_from_file("/home/sam/pix/beastie.png", NULL);
-    pixbuf = gdk_pixbuf_new_from_file("/home/sam/pix/stitch.jpg", NULL);
+    //pixbuf = gdk_pixbuf_new_from_file("/home/sam/pix/stitch.jpg", NULL);
+    //pixbuf = gdk_pixbuf_new_from_file("/home/sam/pix/caca.jpg", NULL);
     //pixbuf = gdk_pixbuf_new_from_file("/home/sam/pix/dranac.jpeg", NULL);
     //pixbuf = gdk_pixbuf_new_from_file("/home/sam/artwork/aboire.png", NULL);
@@ -85 +86 @@
     //pixbuf = gdk_pixbuf_new_from_file("/home/sam/lilkim02.jpg", NULL);
     //pixbuf = gdk_pixbuf_new_from_file("/home/sam/etw.bmp", NULL);
+    pixbuf = gdk_pixbuf_new_from_file("/home/sam/pix/lena_std.png", NULL);
 if(!pixbuf) return -2;
     pixels = gdk_pixbuf_get_pixels(pixbuf);
@@ -100 +102 @@
     while(!quit)
     {
-        char key = caca_get_key();
-
-        if(key && demo)
+        int event = caca_get_event();
+
+        if(event && demo)
         {
             display_menu();
@@ -108 +110 @@
             demo = NULL;
         }
-        else if(key)
+        else if(event & CACA_EVENT_KEY_PRESS)
         {
         handle_key:
-            switch(key)
+            switch(event & 0xff)
             {
             case 'q':
@@ -171 +173 @@
                 caca_clear();
 
-            key = caca_get_key();
-            if(key)
+        handle_event:
+            event = caca_get_event();
+            if(event & CACA_EVENT_KEY_PRESS)
                 goto handle_key;
+            else if(event)
+                goto handle_event;
 
             caca_refresh();