Changeset 5849

Timestamp:

Dec 27, 2005, 8:38:11 AM (20 years ago)

Author:

eugene

Message:

updating to libkapa

Location:

trunk/Ohana/src

Files:

• kii/include/constants.h (modified) (1 diff)
• kii/include/prototypes.h (modified) (1 diff)
• kii/notes (deleted)
• kii/setup/NameWindow.c (modified) (2 diffs)
• kii/setup/SetUpWindow.c (modified) (2 diffs)
• kii/setup/args.c (modified) (1 diff)
• libdvo (modified) (1 prop)
• libdvo/.cvsignore (added)
• libkapa/src/KapaWindow.c (added)
• opihi/cmd.data/box.c (modified) (1 diff)

trunk/Ohana/src/kii/include/constants.h

@@ -27 +27 @@
 int USE_XWINDOW;
 int MAP_WINDOW;
+char *NAME_WINDOW;
 
 # define EVENT_MASK (long) \

trunk/Ohana/src/kii/include/prototypes.h

@@ +1 @@
+RotFont *GetRotFontData (double *scale);
+int SetRotFont PROTO((char *name, int size));
+void InitRotFonts PROTO(());
+int DrawRotText PROTO((int x, int y, char *string, int pos, double angle));
+int DrawRotBitmap PROTO((int x, int y, int dx, int dy, unsigned char *bitmap, int mode, double angle, double scale));
+char *GetRotFont PROTO((int *size));
+int RotStrlen PROTO((char *c));
+void PSRotText PROTO((FILE *f, int x, int y, char *string, int pos, double angle));
+void PSDumpRotSegment PROTO((FILE *f, char *segment, int *Nseg));
+void PSSetFont PROTO((FILE *f, char *name, int size));
+
 int SetColormap (Graphic *graphic, Layout *layout, char *name);
 void FlushDisplay (Display *display);

trunk/Ohana/src/kii/setup/NameWindow.c

@@ -2 +2 @@
 
 /************** NameWindow *************/
-void
-NameWindow (graphic, Name)
-Graphic     graphic[];
-char       *Name;
-{
+void NameWindow (Graphic *graphic, char *name) {
 
-  char       *name;
   char       *class_name;
   char       *class_type;
   XClassHint *classhints;
 
-  name = strrchr (Name, '/');
-  if (name != NULL) 
-    name ++;
-  else 
-    name = Name;
   class_type = class_name = name;
-
 
   classhints = XAllocClassHint ();
@@ -33 +22 @@
   XSetIconName (graphic[0].display, graphic[0].window, name);
 }
-

trunk/Ohana/src/kii/setup/SetUpWindow.c

@@ -7 +7 @@
   int N;
   Icon icon;
+  char *name;
 
   icon.width = icon_width;
@@ -21 +22 @@
   SetNormalHints (graphic);
   SetWMHints (graphic, &icon);
-  NameWindow (graphic, "Ki'i");
+
+  if (NAME_WINDOW == NULL) {
+    NameWindow (graphic, "Ki'i");
+  } else {
+    ALLOCATE (name, char, strlen(NAME_WINDOW) + 10);
+    sprintf (name, "Ki'i %s", NAME_WINDOW);
+    NameWindow (graphic, name);
+    free (name);
+  }
 
   if (MAP_WINDOW) MapWindow (graphic);
 }
-
-
-

trunk/Ohana/src/kii/setup/args.c

@@ -9 +9 @@
     remove_argument(N, argc, argv);
     MAP_WINDOW = FALSE;
+  }
+
+  NAME_WINDOW = NULL;
+  if ((N = get_argument (*argc, argv, "-name"))) {
+    remove_argument(N, argc, argv);
+    NAME_WINDOW = strcreate (argv[N]);
+    remove_argument(N, argc, argv);
   }
 

trunk/Ohana/src/opihi/cmd.data/box.c

@@ -50 +50 @@
   if (argc != 1) goto usage;
 
-  SendGraphCommand (Xgraph, 4, "DBOX");
-  SendGraphMessage (Xgraph, "%12.6g %12.6g %12.6g %12.6g", graphmode.xmin, graphmode.xmax, graphmode.ymin, graphmode.ymax);
-  SendGraphMessage (Xgraph, "%s %s %s", Axis, Labels, Ticks);
+  KapaBox (Xgraph, &graphmode, Axis, Labels, Ticks);
   return (TRUE);