Changeset 5846 for trunk/Ohana/src/opihi/lib.data/open_image.c

Timestamp:

Dec 27, 2005, 5:06:32 AM (21 years ago)

Author:

eugene

Message:

converting to use libkapa commands instead of raw graph commands

File:

• trunk/Ohana/src/opihi/lib.data/open_image.c (modified) (4 diffs)

trunk/Ohana/src/opihi/lib.data/open_image.c

@@ -1 +1 @@
 # include "display.h"
+
 # define DEBUG 0
 
@@ -18 +19 @@
   
   for (i = 0; i < NXIMAGE; i++) {
-    if (Ximage[i] > 0) {
-      SendGraphCommand (Ximage[i], 4, "QUIT");
-    }
+    KiiClose (Ximage[i]);
   }
 }
-
 
 void InitImage () {
@@ -48 +46 @@
 int open_image (int N) {
 
-  int InitSocket, status, addreslen;
-  struct sockaddr_un Address;
-  char temp[128], socket_name[64], *kii_exec;
-  int Ntry, fd;
+  int fd;
+  char *kii_exec;
 
   kii_exec = get_variable ("KII");
@@ -59 +55 @@
   }
 
-  sprintf (socket_name, "/tmp/Kii.XXXXXX");
-  if ((fd = mkstemp (socket_name)) == -1) {
+  fd = KiiOpen (kii_exec, NULL);
+  free (kii_exec);
+
+  if (fd < 0) {
     fprintf (stderr, "error starting kii\n");
     return (FALSE);
-  }
-  close (fd);
-  unlink (socket_name);
+  } 
 
-  strcpy (Address.sun_path, socket_name); 
-  Address.sun_family = AF_UNIX; 
-  InitSocket = socket (AF_UNIX, SOCK_STREAM, 0); 
-  status = bind (InitSocket, (struct sockaddr *) &Address, sizeof (Address));
-  status = listen (InitSocket, 1);
-  
-  sprintf (temp, "%s %s &", kii_exec, socket_name);
-  free (kii_exec);
-
-# if DEBUG
-  fprintf (stderr, "start kii, press return: %s\n", temp);
-  fscanf (stdin, "%d", &i);
-# else  
-  system (temp);
-# endif
-  
-  addreslen =  sizeof (Address);
-  fcntl (InitSocket, F_SETFL, O_NONBLOCK); 
-
-# define NTRY 2000
-  Ntry = 0;
-  while (Ntry < NTRY) {
-    Ximage[N] = accept (InitSocket, (struct sockaddr *)&Address, &addreslen);
-    if (Ximage[N] == -1) {
-      if (errno == EAGAIN) {
-        usleep (10000);
-        Ntry ++;
-      } else { 
-        Ntry = NTRY;
-      }
-    } else {
-      Ntry = NTRY;
-    }
-  }
-
-  if (Ximage[N] < 0) {
-    fprintf (stderr, "error starting kii\n");
-    return (FALSE);
-  } else {
-    fcntl (Ximage[N], F_SETFL, !O_NONBLOCK); 
-    return (TRUE);
-  }
-  
+  Ximage[N] = fd;
+  return (TRUE);
 }