Changeset 2049 for libcaca/trunk/srcTweet

Timestamp:

Nov 25, 2007, 12:11:54 PM (12 years ago)

Author:

Sam Hocevar

Message:

• Made the caca_event_t structure opaque and created a whole bunch of functions to access its real data. This is a big API change that will break your software, sorry :(

Location:

libcaca/trunk/src

Files:

• aafire.c (modified) (1 diff)
• cacademo.c (modified) (1 diff)
• cacadraw.c (modified) (1 diff)
• cacaplay.c (modified) (1 diff)
• cacaview.c (modified) (3 diffs)

libcaca/trunk/src/aafire.c

@@ -273 +273 @@
       if(caca_get_event(dp, CACA_EVENT_KEY_PRESS, &ev, 0))
         {
-          switch(ev.data.key.ch)
+          switch(caca_get_event_key_ch(&ev))
             {
                 case CACA_KEY_CTRL_C:

libcaca/trunk/src/cacademo.c

@@ -109 +109 @@
                                   | CACA_EVENT_QUIT, &ev, 0))
         {
-            if(ev.type == CACA_EVENT_QUIT)
+            if(caca_get_event_type(&ev) == CACA_EVENT_QUIT)
                 goto end;
 
-            switch(ev.data.key.ch)
+            switch(caca_get_event_key_ch(&ev))
             {
                 case CACA_KEY_ESCAPE:

libcaca/trunk/src/cacadraw.c

@@ -81 +81 @@
         while(caca_get_event(dp, CACA_EVENT_ANY, &ev, -1))
         {
-            switch(ev.type)
+            switch(caca_get_event_type(&ev))
             {
                 case CACA_EVENT_QUIT:
                     goto quit;
                 case CACA_EVENT_KEY_PRESS:
-                    switch(ev.data.key.ch)
+                    switch(caca_get_event_key_ch(&ev))
                     {
                     case CACA_KEY_LEFT: dx -= 2; break;

libcaca/trunk/src/cacaplay.c

@@ -72 +72 @@
         int eof = 0;
 
-        if(ret && ev.type & CACA_EVENT_KEY_PRESS)
+        if(ret && caca_get_event_type(&ev) & CACA_EVENT_KEY_PRESS)
             break;
 

libcaca/trunk/src/cacaview.c

@@ -146 +146 @@
         while(event)
         {
-            if(ev.type & CACA_EVENT_MOUSE_PRESS)
+            if(caca_get_event_type(&ev) & CACA_EVENT_MOUSE_PRESS)
             {
-                if(ev.data.mouse.button == 1)
+                if(caca_get_event_mouse_button(&ev) == 1)
                 {
                     if(items) current = (current + 1) % items;
                     reload = 1;
                 }
-                else if(ev.data.mouse.button == 2)
+                if(caca_get_event_mouse_button(&ev) == 2)
                 {
                     if(items) current = (items + current - 1) % items;
@@ -159 +159 @@
                 }
             }
-            else if(ev.type & CACA_EVENT_KEY_PRESS) switch(ev.data.key.ch)
+            else if(caca_get_event_type(&ev) & CACA_EVENT_KEY_PRESS)
+                switch(caca_get_event_key_ch(&ev))
             {
             case 'n':
@@ -287 +288 @@
                 break;
             }
-            else if(ev.type == CACA_EVENT_RESIZE)
+            else if(caca_get_event_type(&ev) == CACA_EVENT_RESIZE)
             {
                 caca_refresh_display(dp);
-                ww = ev.data.resize.w;
-                wh = ev.data.resize.h;
+                ww = caca_get_event_resize_width(&ev);
+                wh = caca_get_event_resize_height(&ev);
                 update = 1;
                 set_zoom(zoom);
             }
-            else if(ev.type & CACA_EVENT_QUIT)
+            else if(caca_get_event_type(&ev) & CACA_EVENT_QUIT)
                 quit = 1;