Changeset 13391 for branches/kapa-mods-2007-05/Ohana/src/opihi/cmd.data/cursor.c

Timestamp:

May 15, 2007, 3:25:20 PM (19 years ago)

Author:

eugene

Message:

changed device numbers to device names; using inet sockets

File:

• branches/kapa-mods-2007-05/Ohana/src/opihi/cmd.data/cursor.c (modified) (6 diffs)

branches/kapa-mods-2007-05/Ohana/src/opihi/cmd.data/cursor.c

@@ -3 +3 @@
 int cursor (int argc, char **argv) {
 
-  char string[20], key[20];
-  int i, N, Nsource, Source, IsImage;
+  char string[20], key[20], *name;
+  int i, N, kapa, IsImage;
   double X, Y, R, D, Z;
   void *oldsignal;
@@ -10 +10 @@
   Buffer *buf;
 
-  Nsource = -1;
-  if ((N = get_argument (argc, argv, "-n"))) {
-    remove_argument (N, &argc, argv);
-    Nsource = atof (argv[N]);
-    remove_argument (N, &argc, argv);
-  }
+  /* need to be able to specify graph vs image coords
   if ((N = get_argument (argc, argv, "-g"))) {
     remove_argument (N, &argc, argv);
@@ -24 +19 @@
     SetImageDevice (TRUE);
   }  
-  IsImage = GetCurrentDevice ();
-  if (IsImage) {
-    if (!GetImage (&Source, &Nsource)) return (FALSE);
-  } else {
-    if (!GetGraph (&graphmode, &Source, &Nsource)) return (FALSE);
+  */
+
+  name = NULL;
+  if ((N = get_argument (argc, argv, "-n"))) {
+    remove_argument (N, &argc, argv);
+    name = strcreate (argv[N]);
+    remove_argument (N, &argc, argv);
   }
+  if (!GetGraph (&graphmode, &kapa, name)) return (FALSE);
+  FREE (name);
 
   N = 0;
@@ -42 +41 @@
   if (IsImage) buf = SelectBuffer (GetImageName(), OLDBUFFER, FALSE);
   
-  KiiCursorOn (Source);
+  KiiCursorOn (kapa);
   
   oldsignal = signal (SIGINT, handle_interrupt);
@@ -48 +47 @@
   Z = -1.0;
   for (i = 0; ((i < N) || (N == 0)) && !interrupt; i++) {
-    KiiCursorRead (Source, &X, &Y, key);
+    KiiCursorRead (kapa, &X, &Y, key);
 
     sprintf (string, "X%s", key);
@@ -73 +72 @@
 
   signal (SIGINT, oldsignal);
-  KiiCursorOff (Source);
+  KiiCursorOff (kapa);
   return (TRUE);
 }