X-Git-Url: https://git.llucax.com/software/libev.git/blobdiff_plain/a1558a0f509cece0efa6164c6b8ee42d6cdf7f25..b7e58d7ed7f85d7cb7fe1c34cfe3fa2484a6dc31:/ev%20%20.h/software/libev.git/blobdiff_plain/a1558a0f509cece0efa6164c6b8ee42d6cdf7f25..b7e58d7ed7f85d7cb7fe1c34cfe3fa2484a6dc31:/ev++.h?ds=sidebyside

diff --git a/ev++.h b/ev++.h
index 48c3a93..0f51bd5 100644
--- a/ev++.h
+++ b/ev++.h
@@ -1,7 +1,7 @@
 #ifndef EVPP_H__
 #define EVPP_H__
 
-/* work in progress, don't use unless you know what you are doing */
+#include "ev.h"
 
 namespace ev {
 
@@ -44,8 +44,6 @@ namespace ev {
     }
   };
 
-  #include "ev.h"
-
   enum {
     UNDEF    = EV_UNDEF,
     NONE     = EV_NONE,
@@ -95,13 +93,11 @@ namespace ev {
    * so a macro solution was chosen */
   #define EV_BEGIN_WATCHER(cppstem,cstem)	                                        \
                                                                                         \
-  static void cb_ ## cppstem (struct ev_ ## cstem *w, int revents);                     \
-                                                                                        \
   struct cppstem : ev_ ## cstem, callback<cppstem>                                      \
   {                                                                                     \
     EV_CONSTRUCT (cppstem)                                                              \
     {                                                                                   \
-      ev_init (static_cast<ev_ ## cstem *>(this), cb_ ## cppstem);                      \
+      ev_init (static_cast<ev_ ## cstem *>(this), thunk);                               \
     }                                                                                   \
                                                                                         \
     bool is_active () const                                                             \
@@ -139,17 +135,18 @@ namespace ev {
     cppstem (const cppstem &o)								\
     : callback<cppstem> (this, (void (cppstem::*)(cppstem &, int))0)                    \
     { /* disabled */ }                                        				\
+                                                                                        \
     void operator =(const cppstem &o) { /* disabled */ }                                \
                                                                                         \
+    static void thunk (EV_P_ struct ev_ ## cstem *w, int revents)                       \
+    {                                                                                   \
+      (*static_cast<cppstem *>(w))(revents);                                            \
+    }                                                                                   \
+                                                                                        \
   public:
 
   #define EV_END_WATCHER(cppstem,cstem)	                                                \
-  };                                                                                    \
-                                                                                        \
-  static void cb_ ## cppstem (struct ev_ ## cstem *w, int revents)                      \
-  {                                                                                     \
-    (*static_cast<cppstem *>(w))(revents);                                              \
-  }
+  };
 
   EV_BEGIN_WATCHER (io, io)
     void set (int fd, int events)
@@ -220,12 +217,15 @@ namespace ev {
   #endif
 
   EV_BEGIN_WATCHER (idle, idle)
+    void set () { }
   EV_END_WATCHER (idle, idle)
 
   EV_BEGIN_WATCHER (prepare, prepare)
+    void set () { }
   EV_END_WATCHER (prepare, prepare)
 
   EV_BEGIN_WATCHER (check, check)
+    void set () { }
   EV_END_WATCHER (check, check)
 
   EV_BEGIN_WATCHER (sig, signal)
@@ -260,8 +260,34 @@ namespace ev {
     }
   EV_END_WATCHER (child, child)
 
+  #if EV_MULTIPLICITY
+
+  EV_BEGIN_WATCHER (embed, embed)
+    void set (struct ev_loop *loop)
+    {
+      int active = is_active ();
+      if (active) stop ();
+      ev_embed_set (static_cast<ev_embed *>(this), loop);
+      if (active) start ();
+    }
+
+    void start (struct ev_loop *embedded_loop)
+    {
+      set (embedded_loop);
+      start ();
+    }
+
+    void sweep ()
+    {
+      ev_embed_sweep (EV_A_ static_cast<ev_embed *>(this));
+    }
+  EV_END_WATCHER (embed, embed)
+
+  #endif
+
   #undef EV_CONSTRUCT
   #undef EV_BEGIN_WATCHER
+  #undef EV_END_WATCHER
 }
 
 #endif