Changeset 1660Tweet

Timestamp:

Jul 21, 2012, 12:22:10 AM (11 years ago)

Author:

sam

Message:

neercs: add a way to activate the old neercs code for testing purposes.

Location:

trunk/tools/neercs

Files:

• neercs.cpp (modified) (4 diffs)
• neercs.h (modified) (2 diffs)
• old/attach.c (modified) (1 diff)
• old/client.c (modified) (2 diffs)
• old/main.c (modified) (1 diff)

trunk/tools/neercs/neercs.cpp

@@ -40 +40 @@
 #include "video/render.h"
 
+#define USE_OLD_NEERCS 0
+
 extern "C"
 {
@@ -52 +54 @@
 {
     Ticker::Ref(m_render);
+
+#if USE_OLD_NEERCS
+    m_buf = NULL;
+    m_screen_list = init_neercs(argc, argv);
+    if (!m_screen_list)
+        exit(-1);
+    m_screen_list->last_key_time = get_us();
+#endif
 }
 
 int Neercs::hex_color(float r, float g, float b)
 {
-return ((int)(r * 15.99f) << 8) | ((int)(g * 15.99f) << 4) | (int)(b * 15.99f);
+    return ((int)(r * 15.99f) << 8) | ((int)(g * 15.99f) << 4) | (int)(b * 15.99f);
 }
 
@@ -62 +72 @@
 {
     WorldEntity::TickGame(seconds);
+
+#if USE_OLD_NEERCS
+    mainloop_tick(&m_buf, m_screen_list);
+#endif
 
     m_time += seconds;
@@ -129 +143 @@
 Neercs::~Neercs()
 {
+#if USE_OLD_NEERCS
+    free(m_buf);
+    free_screen_list(m_screen_list);
+#endif
+
     Ticker::Unref(m_render);
 }

trunk/tools/neercs/neercs.h

@@ -11 +11 @@
 
 #include "video/render.h"
+
+extern "C"
+{
+#include "old/neercs.h"
+}
 
 class Neercs : public WorldEntity
@@ -31 +36 @@
     Render *m_render;
     float m_time;
+
+    /* Old neercs stuff */
+    char *m_buf;
+    struct screen_list *m_screen_list;
 };
 

trunk/tools/neercs/old/attach.c

@@ -239 +239 @@
                     break;
                 case ECONNREFUSED:
-                    fprintf(stderr, "%s is dead\n", sockets[i]);
+                    fprintf(stderr, "%s is dead, removing\n", sockets[i]);
+                    unlink(sockets[i]);
                     break;
                 default:

trunk/tools/neercs/old/client.c

@@ -160 +160 @@
  *  - wait for an input event with a 10ms timeout
  */
-void mainloop(struct screen_list *screen_list)
-{
-    char *buf = NULL;
-    screen_list->last_key_time = get_us();
-
-    while (mainloop_tick(&buf, screen_list))
-        ;
-
-    free(buf);
-}
-
 int mainloop_tick(char **pbuf, struct screen_list *screen_list)
 {
@@ -190 +179 @@
                  NEERCS_RECV_BUFSIZE - 1)) > 0)
     {
-        *pbuf[n] = 0;
+        (*pbuf)[n] = 0;
         debug("Received from server: '%s' (%d bytes)", *pbuf, n);
         if (!strncmp("DETACH", *pbuf, 6))

trunk/tools/neercs/old/main.c

@@ -82 +82 @@
 }
 
-#if 0
-int main(int argc, char **argv)
-{
-    struct screen_list *screen_list = init_neercs(argc, argv);
-    if (!screen_list)
-        return -1;
-
-    mainloop(screen_list);
-}
-#endif
-
 struct screen_list *init_neercs(int argc, char **argv)
 {