Changeset 27636

Timestamp:

Apr 7, 2010, 5:00:10 PM (16 years ago)

Author:

eugene

Message:

adding section backgrouns

Location:

branches/eam_branches/Ohana.20100407/src

Files:

• kapa2/src/CheckPipe.c (modified) (1 diff)
• kapa2/src/DefineSection.c (modified) (3 diffs)
• kapa2/src/Sections.c (modified) (4 diffs)
• libkapa/include/kapa.h (modified) (1 diff)
• libkapa/src/KapaWindow.c (modified) (1 diff)
• opihi/cmd.data/section.c (modified) (4 diffs)

branches/eam_branches/Ohana.20100407/src/kapa2/src/CheckPipe.c

@@ -221 +221 @@
   }
   
+  if (!strcmp (word, "BSEC")) {
+    status = SetSectionBG (sock);
+    KiiSendCommand (sock, 4, "DONE");
+    FINISHED (TRUE);
+  }
+  
   if (!strcmp (word, "FONT")) {
     status = SetFont (sock);

branches/eam_branches/Ohana.20100407/src/kapa2/src/DefineSection.c

@@ -9 +9 @@
   Section *section;
 
-  KiiScanMessage (sock, "%s %lf %lf %lf %lf", name, &x, &y, &dx, &dy);
+  KiiScanMessage (sock, "%s %lf %lf %lf %lf %d", name, &x, &y, &dx, &dy, &bg);
 
   MoveSection = FALSE;
@@ -15 +15 @@
   N = GetSectionByName (name);
   if (N < 0) {
-    section = AddSection (name, x, y, dx, dy);
+    section = AddSection (name, x, y, dx, dy, bg);
     MoveSection = TRUE;
   } else {
@@ -30 +30 @@
     section[0].dx = dx;
     section[0].dy = dy;
+    section[0].bg = bg;
   }
 

branches/eam_branches/Ohana.20100407/src/kapa2/src/Sections.c

@@ -16 +16 @@
   section[0].dx = 0;
   section[0].dy = 0;
+  section[0].bg = -1;
 
   section[0].name = NULL;
@@ -42 +43 @@
 }
 
-Section *AddSection (char *name, float x, float y, float dx, float dy) {
+Section *AddSection (char *name, float x, float y, float dx, float dy, int bg) {
 
   int N;
@@ -61 +62 @@
   sections[N][0].dx = dx;
   sections[N][0].dy = dy;
+  sections[N][0].bg = bg;
   ActiveSection = N;
   return (sections[N]);
@@ -91 +93 @@
 }
 
+int SetSectionBG (char *name) {
+
+  int i;
+
+  for (i = 0; i < Nsections; i++) {
+    if (strcmp (name, sections[i][0].name)) continue;
+    sections[i][0].bg = 
+  }
+  return (-1);
+}
+
 int GetNumberOfSections () {
   return (Nsections);

branches/eam_branches/Ohana.20100407/src/libkapa/include/kapa.h

@@ -72 +72 @@
   float dx;
   float dy;
+  int bg;
 } KapaSection;
 

branches/eam_branches/Ohana.20100407/src/libkapa/src/KapaWindow.c

@@ -312 +312 @@
 
   KiiSendCommand (fd, 4, "DSEC");
-  KiiSendMessage (fd, "%s %6.3f %6.3f %6.3f %6.3f", 
+  KiiSendMessage (fd, "%s %6.3f %6.3f %6.3f %6.3f %3d", 
                   section[0].name, 
                   section[0].x,
                   section[0].y,
                   section[0].dx,
-                  section[0].dy);
+                  section[0].dy,
+                  section[0].bg);
+  KiiWaitAnswer (fd, "DONE");
+  return (TRUE);
+}
+
+int KapaSectionBG (int fd, char *name, int bg) {
+
+  KiiSendCommand (fd, 4, "BSEC");
+  KiiSendMessage (fd, "%s %3d", name, bg);
   KiiWaitAnswer (fd, "DONE");
   return (TRUE);

branches/eam_branches/Ohana.20100407/src/opihi/cmd.data/section.c

@@ -1 +1 @@
 # include "data.h"
 
-enum {NONE, LIST, UP, DOWN, TOP, BOTTOM, TOOL};
+enum {NONE, LIST, UP, DOWN, TOP, BOTTOM, TOOL, BG};
 
 int section (int argc, char **argv) {
@@ -37 +37 @@
     location = argv[N];
     remove_argument (N, &argc, argv);
+  }
+
+  background = -1; // invisible
+  if ((N = get_argument (argc, argv, "-bg"))) {
+    remove_argument (N, &argc, argv);
+    background = KapaColorByName(argv[N]);
+    remove_argument (N, &argc, argv);
+    action = BG;
   }
 
@@ -82 +90 @@
         break;
 
+      case BG:
+        KapaSectionBG (kapa, argv[1], bg);
+        break;
+
       case TOOL:
         if (!strcmp(location, "-x")) {
@@ -121 +133 @@
     section.dx = atof (argv[4]);
     section.dy = atof (argv[5]);
+    section.bg = background;
     KapaSetSection (kapa, &section);
     return (TRUE);