0
@@ -314,7 +314,7 @@ else
0
   PANGO_LIB = ENV['PANGO_LIB'] ? "-L#{ENV['PANGO_LIB']}" : `pkg-config --libs pango`.strip
0
 
0
   LINUX_CFLAGS = %[-I#{ENV['SHOES_DEPS_PATH'] || "/usr"}/include #{CAIRO_CFLAGS} #{PANGO_CFLAGS} -I#{Config::CONFIG['archdir']}]
0
-  LINUX_LIB_NAMES = %W[#{ruby_so} png cairo pangocairo-1.0 ungif rt]
0
+  LINUX_LIB_NAMES = %W[#{ruby_so} png cairo pangocairo-1.0 ungif]
0
   FLAGS.each do |flag|
0
     LINUX_CFLAGS << " -D#{flag}" if ENV[flag]
0
   end
0
@@ -344,6 +344,7 @@ else
0
     LINUX_CFLAGS << " -DSHOES_GTK -fPIC #{`pkg-config --cflags gtk+-2.0`.strip} #{`curl-config --cflags`.strip}"
0
     LINUX_LDFLAGS =" #{`pkg-config --libs gtk+-2.0`.strip} #{`curl-config --libs`.strip} -fPIC -shared"
0
     LINUX_LIB_NAMES << 'jpeg'
0
+    LINUX_LIB_NAMES << 'rt'
0
     LINUX_LIB_NAMES << "vlc" if ENV['VIDEO']
0
   end
0
   LINUX_LIBS = LINUX_LIB_NAMES.map { |x| "-l#{x}" }.join(' ')

0
@@ -548,6 +548,7 @@ VALUE shoes_download_new(VALUE, VALUE, VALUE);
0
 VALUE shoes_download_alloc(VALUE);
0
 VALUE shoes_download_threaded(VALUE, VALUE, VALUE);
0
 int shoes_message_download(VALUE, void *);
0
+int shoes_catch_message(unsigned int name, VALUE obj, void *data);
0
 VALUE shoes_p(VALUE, VALUE);
0
 
0
 extern const double SHOES_PIM2, SHOES_PI, SHOES_RAD2PI;

0
@@ -126,6 +126,7 @@ typedef struct {
0
 #define DC(slot) slot.view
0
 #define HAS_DRAWABLE(slot) slot.context != NULL
0
 #define DRAWABLE(ref) ref
0
+#define SHOES_TIME struct timeval
0
 
0
 #endif
0
 

0
@@ -21,7 +21,7 @@ void shoes_native_cleanup(shoes_world_t *world);
0
 void shoes_native_quit();
0
 void shoes_get_time(SHOES_TIME *);
0
 unsigned long shoes_diff_time(SHOES_TIME *, SHOES_TIME *);
0
-int shoes_native_message(unsigned int, VALUE, void *);
0
+int shoes_throw_message(unsigned int, VALUE, void *);
0
 void shoes_native_slot_mark(SHOES_SLOT_OS *);
0
 void shoes_native_slot_reset(SHOES_SLOT_OS *);
0
 void shoes_native_slot_clear(shoes_canvas *);

0
@@ -506,6 +506,29 @@ void shoes_native_quit()
0
   RELEASE;
0
 }
0
 
0
+void shoes_get_time(SHOES_TIME *ts)
0
+{
0
+  gettimeofday(ts, NULL);
0
+}
0
+
0
+unsigned long shoes_diff_time(SHOES_TIME *start, SHOES_TIME *end)
0
+{
0
+  unsigned long usec;
0
+  if ((end->tv_usec-start->tv_usec)<0) {
0
+    usec = (end->tv_sec-start->tv_sec - 1) * 1000;
0
+    usec += (1000000 + end->tv_usec - start->tv_usec) / 1000;
0
+  } else {
0
+    usec = (end->tv_sec - start->tv_sec) * 1000;
0
+    usec += (end->tv_usec - start->tv_usec) / 1000;
0
+  }
0
+  return usec;
0
+}
0
+
0
+int shoes_throw_message(unsigned int name, VALUE obj, void *data)
0
+{
0
+  return shoes_catch_message(name, obj, data);
0
+}
0
+
0
 void shoes_native_slot_mark(SHOES_SLOT_OS *slot)
0
 {
0
   rb_gc_mark_maybe(slot->controls);

0
@@ -64,18 +64,13 @@ static gboolean
0
 shoes_gtk_catch_message(gpointer user) {
0
   shoes_gtk_msg *msg = (shoes_gtk_msg *)user;
0
   pthread_mutex_lock(&msg->mutex);
0
-  switch (msg->name) {
0
-    case SHOES_THREAD_DOWNLOAD:
0
-      msg->ret = shoes_message_download(msg->obj, msg->data);
0
-      free(msg->data);
0
-    break;
0
-  }
0
+  msg->ret = shoes_catch_message(msg->name, msg->obj, msg->data);
0
   pthread_cond_signal(&msg->cond);
0
   pthread_mutex_unlock(&msg->mutex);
0
   return FALSE;
0
 }
0
 
0
-int shoes_native_message(unsigned int name, VALUE obj, void *data)
0
+int shoes_throw_message(unsigned int name, VALUE obj, void *data)
0
 {
0
   int ret;
0
   shoes_gtk_msg *msg = SHOE_ALLOC(shoes_gtk_msg);

0
@@ -70,18 +70,7 @@ unsigned long shoes_diff_time(SHOES_TIME *start, SHOES_TIME *end)
0
   return *end - *start;
0
 }
0
 
0
-int shoes_windows_catch_message(unsigned int name, VALUE obj, void *data) {
0
-  int ret = 0;
0
-  switch (name) {
0
-    case SHOES_THREAD_DOWNLOAD:
0
-      ret = shoes_message_download(obj, data);
0
-      free(data);
0
-    break;
0
-  }
0
-  return ret;
0
-}
0
-
0
-int shoes_native_message(unsigned int name, VALUE obj, void *data)
0
+int shoes_throw_message(unsigned int name, VALUE obj, void *data)
0
 {
0
   return SendMessage(shoes_world->os.hidden, SHOES_WM_MESSAGE + name, obj, (LPARAM)data);
0
 }
0
@@ -352,7 +341,7 @@ LRESULT CALLBACK
0
 shoes_hidden_win32proc(HWND win, UINT msg, WPARAM w, LPARAM l)
0
 {
0
   if (msg > SHOES_WM_MESSAGE && msg < SHOES_WM_MESSAGE + SHOES_MAX_MESSAGE)
0
-    return shoes_windows_catch_message(msg - SHOES_WM_MESSAGE, (VALUE)w, (void *)l);
0
+    return shoes_catch_message(msg - SHOES_WM_MESSAGE, (VALUE)w, (void *)l);
0
   return DefWindowProc(win, msg, w, l);
0
 }
0
 

0
@@ -3707,7 +3707,7 @@ shoes_doth_handler(shoes_download_event *de, void *data)
0
   shoes_doth_data *doth = (shoes_doth_data *)data;
0
   shoes_download_event *de2 = SHOE_ALLOC(shoes_download_event);
0
   SHOE_MEMCPY(de2, de, shoes_download_event, 1);
0
-  return shoes_native_message(SHOES_THREAD_DOWNLOAD, doth->download, de2);
0
+  return shoes_throw_message(SHOES_THREAD_DOWNLOAD, doth->download, de2);
0
 }
0
 
0
 VALUE
0
@@ -3771,6 +3771,17 @@ EVENT_COMMON(download, download_klass, start);
0
 EVENT_COMMON(download, download_klass, progress);
0
 EVENT_COMMON(download, download_klass, finish);
0
 
0
+int shoes_catch_message(unsigned int name, VALUE obj, void *data) {
0
+  int ret = 0;
0
+  switch (name) {
0
+    case SHOES_THREAD_DOWNLOAD:
0
+      ret = shoes_message_download(obj, data);
0
+      free(data);
0
+    break;
0
+  }
0
+  return ret;
0
+}
0
+
0
 DEBUG_TYPE(info);
0
 DEBUG_TYPE(debug);
0
 DEBUG_TYPE(warn);