X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pandora_liveinfo.git;a=blobdiff_plain;f=main.c;fp=main.c;h=010f63c06cca999d87812c5306dba4849b4826ef;hp=75799b475fb0968e9ce8c1bb65fc7ceb787a7b08;hb=b7d8fc1a0be728e8830c04fa6d836c8d18c6bc3a;hpb=15f42220856460f67c375c1e64de4ffc4bdf6f47

diff --git a/main.c b/main.c
index 75799b4..010f63c 100644
--- a/main.c
+++ b/main.c
@@ -42,6 +42,7 @@ static int g_flip_id;
 static int g_exit, g_hide;
 static pthread_cond_t g_cond;
 
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
 #define IS_START(buf, str) \
   !strncmp(buf, str, sizeof(str) - 1)
 
@@ -218,6 +219,70 @@ static void handle_usr1(int num)
   pthread_cond_signal(&g_cond);
 }
 
+static struct {
+  char text[16];
+  int idle;
+} user_msgs[16];
+
+static int handle_socket(int sock)
+{
+  char buf[256], *p;
+  int i, ret;
+
+  ret = recv(sock, buf, sizeof(buf) - 1, 0);
+  if (ret < 0) {
+    perror("recv");
+    return ret;
+  }
+  if (ret == 0)
+    return 0;
+
+  buf[ret] = 0;
+  p = strchr(buf, ':');
+  if (p != NULL) {
+    for (i = 0; i < ARRAY_SIZE(user_msgs); i++) {
+      if (user_msgs[i].text[0] == 0)
+        break;
+      if (!strncmp(user_msgs[i].text, buf, p - buf + 1))
+        break;
+    }
+    if (i == ARRAY_SIZE(user_msgs)) {
+      printf("out of user_msg slots\n");
+      return 0;
+    }
+    memcpy(user_msgs[i].text, buf, sizeof(user_msgs[i].text) - 1);
+    user_msgs[i].text[sizeof(user_msgs[i].text) - 1] = 0;
+    user_msgs[i].idle = 0;
+  }
+  else if (!strcmp(buf, "poke")) {
+    // if hidden, show up
+    // if visible, exit
+    if (g_hide) {
+      g_hide = 0;
+      return 1;
+    }
+    g_exit = 1;
+    return 1;
+  }
+  else if (!strcmp(buf, "hide")) {
+    g_hide = 1;
+    return 1;
+  }
+  else if (!strcmp(buf, "show")) {
+    g_hide = 0;
+    return 1;
+  }
+  else if (!strcmp(buf, "quit")) {
+    g_exit = 1;
+    return 1;
+  }
+  else {
+    printf("unknown command: '%s'\n", buf);
+  }
+
+  return 0;
+}
+
 #define s_printf(x, y, fmt, ...) \
   basic_text_out16(g_screen, WIDTH, x, y, fmt, ##__VA_ARGS__);
 
@@ -678,10 +743,10 @@ int main(int argc, char *argv[])
   int y = 0, y_max = 0;
   int fd = -1;
   int sock;
-  int ret;
+  int i, ret;
 
   // look for other instance
-  sock = socket(PF_UNIX, SOCK_STREAM, 0);
+  sock = socket(PF_UNIX, SOCK_DGRAM, 0);
   if (sock == -1) {
     perror("socket PF_UNIX");
     return 1;
@@ -694,11 +759,11 @@ int main(int argc, char *argv[])
   ret = connect(sock, (struct sockaddr *)&sun, sizeof(sun));
   if (ret == 0) {
     printf("other instance detected, sending poke command\n");
-    ret = send(sock, "poke", 5, 0);
-    if (ret != 5)
+    ret = send(sock, "poke", 4, 0);
+    if (ret != 4)
       perror("send");
     close(sock);
-    return ret == 5 ? 0 : 1;
+    return ret == 4 ? 0 : 1;
   }
 
   fd = open(fbname, O_RDWR);
@@ -729,12 +794,14 @@ int main(int argc, char *argv[])
     return 1;
   }
 
+#if 0
   ret = listen(sock, 1);
   if (ret != 0) {
     perror("listen");
     close(sock);
     return 1;
   }
+#endif
 
   pfd.fd = sock;
   pfd.events = POLLIN | POLLPRI;
@@ -768,6 +835,19 @@ int main(int argc, char *argv[])
 
   while (!g_exit)
   {
+    // anything on unix socket?
+    ret = poll(&pfd, 1, 0);
+    if (ret < 0) {
+      perror("poll");
+      break;
+    }
+    if (ret > 0) {
+      ret = handle_socket(sock);
+      if (ret < 0)
+        break;
+      continue;
+    }
+
     // handle hiding
     if (g_hide) {
       if (!is_hidden) {
@@ -783,6 +863,9 @@ int main(int argc, char *argv[])
       is_hidden = 0;
     }
 
+    if (check_layer(fd) != 0)
+      break;
+
     collect_stats();
 
     y += Y_STEP;
@@ -823,18 +906,27 @@ int main(int argc, char *argv[])
     get_bwatts (0, y += Y_STEP);
     get_btemp  (0, y += Y_STEP);
 
-    flip_fb(fd);
-
-    if (check_layer(fd) != 0)
-      break;
+    // print user messages
+    y += Y_STEP;
+    for (i = 0; i < ARRAY_SIZE(user_msgs); i++) {
+      if (user_msgs[i].text[0] == 0)
+        break;
+      user_msgs[i].idle++;
+      if (user_msgs[i].idle > 6) {
+        // drop old entry, shift others up
+        memmove(&user_msgs[i], &user_msgs[i + 1],
+          (ARRAY_SIZE(user_msgs) - i - 1) * sizeof(user_msgs[0]));
+        user_msgs[ARRAY_SIZE(user_msgs) - 1].text[0] = 0;
+        // reprocess
+        i--;
+        continue;
+      }
 
-    // anything on unix socket?
-    ret = poll(&pfd, 1, 0);
-    if (ret != 0) {
-      printf("poll returned %d\n", ret);
-      break;
+      s_printf(0, y += Y_STEP, user_msgs[i].text);
     }
 
+    flip_fb(fd);
+
 do_sleep:
     ts.tv_sec++;
     pthread_cond_timedwait(&g_cond, &mutex, &ts);