Changeset 796 for libcaca/trunk/cppTweet

Timestamp:

Apr 17, 2006, 3:23:28 PM (14 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Fixed compile problem, put Event outside Caca class

Location:

libcaca/trunk/cpp

Files:

• caca++.cpp (modified) (1 diff)
• caca++.h (modified) (4 diffs)
• cpptest.cpp (modified) (2 diffs)

libcaca/trunk/cpp/caca++.cpp

@@ -68 +68 @@
     return caca_set_window_title(kk, s);
 }
-int     Caca::get_event (unsigned int g, Caca::Event *n, int aa)
+int     Caca::get_event (unsigned int g, Event *n, int aa)
 {
     return caca_get_event(kk, g, n->e, aa);

libcaca/trunk/cpp/caca++.h

@@ -30 +30 @@
 
 
+class Event {
+    friend class Caca;
+ public:
+    enum caca_event_type
+    {
+        CACA_EVENT_NONE =          0x0000, /**< No event. */
+
+        CACA_EVENT_KEY_PRESS =     0x0001, /**< A key was pressed. */
+        CACA_EVENT_KEY_RELEASE =   0x0002, /**< A key was released. */
+        CACA_EVENT_MOUSE_PRESS =   0x0004, /**< A mouse button was pressed. */
+        CACA_EVENT_MOUSE_RELEASE = 0x0008, /**< A mouse button was released. */
+        CACA_EVENT_MOUSE_MOTION =  0x0010, /**< The mouse was moved. */
+        CACA_EVENT_RESIZE =        0x0020, /**< The window was resized. */
+
+        CACA_EVENT_ANY =           0xffff  /**< Bitmask for any event. */
+    } type;
+
+ protected:
+    caca_event *e;
+};
+
 class Caca {
  public:
@@ -35 +56 @@
     Caca(Cucul *qq);
     ~Caca();
-
-    class Event {
-        friend class Caca;
-    protected:
-        caca_event *e;
-    };
-
 
     void    attach (Cucul *qq);
@@ -51 +65 @@
     unsigned int        get_window_height ();
     int         set_window_title (char const *);
-    int         get_event (unsigned int, Caca::Event*, int);
+    int         get_event (unsigned int, Event*, int);
     unsigned int        get_mouse_x ();
     unsigned int        get_mouse_y ();
@@ -60 +74 @@
     private:
     caca_t *kk;
-
-
 };
 

libcaca/trunk/cpp/cpptest.cpp

@@ -44 +44 @@
     Cucul *qq;
     Caca  *kk;
-    Caca::Event ev;
+    Event ev;
+
     int x = 0, y = 0, ix = 1, iy = 1;
 
@@ -67 +68 @@
     kk->set_delay(20000);
 
-    while(!kk->get_event(CACA_EVENT_KEY_PRESS, &ev, 0)) {
+    while(!kk->get_event(ev.CACA_EVENT_KEY_PRESS, &ev, 0)) {
         
         /* Draw pig */