Changeset 21153 for trunk/Ohana/src/kapa2

Timestamp:

Jan 22, 2009, 10:43:26 AM (18 years ago)

Author:

eugene

Message:

lots of very minor API mods to satisfy some pickier compilers (supply void to prototypes for argument-less functions)

Location:

trunk/Ohana/src/kapa2

Files:

• include/kii.struct.h (modified) (3 diffs)
• include/prototypes.h (modified) (9 diffs)
• include/structures.h (modified) (1 diff)
• src/ButtonFunctions.c (modified) (1 diff)
• src/CheckVisual.c (modified) (4 diffs)
• src/DefineSection.c (modified) (1 diff)
• src/EraseCurrentPlot.c (modified) (1 diff)
• src/ErasePlots.c (modified) (1 diff)
• src/EraseSections.c (modified) (1 diff)
• src/EventLoop.c (modified) (2 diffs)
• src/FlushDisplay.c (modified) (1 diff)
• src/Image.c (modified) (1 diff)
• src/InvertButton.c (modified) (1 diff)
• src/LoadFrame.c (modified) (1 diff)
• src/MapWindow.c (modified) (1 diff)
• src/Reconfig.c (modified) (1 diff)
• src/Refresh.c (modified) (1 diff)
• src/Resize.c (modified) (1 diff)
• src/Sections.c (modified) (4 diffs)
• src/SetGraphData.c (modified) (1 diff)
• src/SetGraphStyle.c (modified) (1 diff)
• src/SetLimits.c (modified) (1 diff)
• src/SetUpGraphic.c (modified) (1 diff)
• src/TopWindow.c (modified) (1 diff)

trunk/Ohana/src/kapa2/include/kii.struct.h

@@ -29 +29 @@
   int      width, height;
   char    *bitmap;          /* picture on button */
-  int    (*function_1) ();  /* mouse_button 1 function */
-  int    (*function_2) ();  /* mouse_button 2 function */
-  int    (*function_3) ();  /* mouse_button 3 function */
+  int    (*function_1) (void);  /* mouse_button 1 function */
+  int    (*function_2) (void);  /* mouse_button 2 function */
+  int    (*function_3) (void);  /* mouse_button 3 function */
 } Button;
 
@@ -41 +41 @@
   int      outline;        /* draw an outline?  */ 
   int      cursor;         /* location of cursor (if selected) */
-  int    (*function) ();   /* textline function */
+  int    (*function) (void);   /* textline function */
 } TextLine;
 
@@ -54 +54 @@
   int      cursor_x;       /* location of cursor (if selected) */
   int      cursor_y;       /* location of cursor (if selected) */
-  int    (*function) ();   /* textline function */
+  int    (*function) (void);   /* textline function */
 } TextBox;
 

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

@@ -4 +4 @@
 void          SetUpGraphic        PROTO((int *argc, char **argv));
 void          DefineLayout        PROTO((int, char **));
-int           EventLoop           PROTO(());
-void          CloseDisplay        PROTO(());
+int           EventLoop           PROTO((void));
+void          CloseDisplay        PROTO((void));
 
 /* SetUpGraphic */
@@ -43 +43 @@
 /* EventLoop */
 int           PScommand           PROTO((int sock));
-int           CheckPipe           PROTO(());
+int           CheckPipe           PROTO((void));
 int           Reconfig            PROTO((XEvent *event));
-void          Refresh             PROTO(());
+void          Refresh             PROTO((void));
 
 /* CheckPipe */
@@ -79 +79 @@
 
 /* Section Utilities */
-Section      *InitSection         PROTO(());
+Section      *InitSection         PROTO((void));
 void          FreeSection         PROTO((Section *section));
-void          FreeSections        PROTO(());
+void          FreeSections        PROTO((void));
 Section      *AddSection          PROTO((char *name, float x, float y, float dx, float dy));
 int           DelSection          PROTO((char *name));
 int           GetSectionByName    PROTO((char *name));
-int           GetNumberOfSections PROTO(());
+int           GetNumberOfSections PROTO((void));
 Section      *GetSectionByNumber  PROTO((int N));
-Section      *GetActiveSection    PROTO(());
+Section      *GetActiveSection    PROTO((void));
 int           SetActiveSectionByNumber PROTO((int N));
 int           ListSection         PROTO((int sock));
 void          SetSectionSizes     PROTO((Section *section));
 
-KapaGraphWidget *InitGraph        PROTO(());
+KapaGraphWidget *InitGraph        PROTO((void));
 void          DrawGraph           PROTO((KapaGraphWidget *graph));
 void          SetGraphSize        PROTO((Section *section));
@@ -131 +131 @@
 void          bDrawTick           PROTO((double fx, double fy, double dfx, double dfy, int P, double min, double max, double value, int IsLabel, int IsMajor, int naxis));
 void          bDrawClipLine       PROTO((double x0, double y0, double x1, double y1, double X0, double Y1, double X1, double Y0));
-bDrawBuffer  *bDrawIt             PROTO(());
+bDrawBuffer  *bDrawIt             PROTO((void));
 void          bDrawGraph          PROTO((KapaGraphWidget *graph));
 
@@ -137 +137 @@
 int           LastEvent           PROTO((Display *display, int type, XEvent *event));
 void          FreeObjectData      PROTO((Gobjects *object));
-void          FlushDisplay        PROTO(());
+void          FlushDisplay        PROTO((void));
 unsigned long GetColor            PROTO((Display *display, char *name, Colormap colormap, unsigned long default_color));
 void          QuitX               PROTO((Display *display, char *message));
-Graphic      *GetGraphic          PROTO(());
+Graphic      *GetGraphic          PROTO((void));
 int           GetPixelCount       PROTO((int sock));
 
-int           Center              PROTO(());
-int           Parity              PROTO(());
+int           Center              PROTO((int sock));
+int           Parity              PROTO((int sock));
 void          SetColorScale       PROTO((Graphic *graphic, KapaImageWidget *image));
 void          SetColorScale1D     PROTO((Graphic *graphic, KapaImageWidget *image));
@@ -155 +155 @@
 int           LoadPicture         PROTO((int sock));
 
-KapaImageWidget *InitImageWidget  PROTO(());
+KapaImageWidget *InitImageWidget  PROTO((void));
 int           InitImageChannel    PROTO((KapaImageChannel *channel));
 void          FreeImage           PROTO((KapaImageWidget *image));
@@ -161 +161 @@
 
 void          InitButtonSize      PROTO((Button *button, int width, int height, char *bitmap));
-void          InitButtonFunc      PROTO((Button *button, int (*function)()));
+void          InitButtonFunc      PROTO((Button *button, int (*function)(Graphic *graphic, KapaImageWidget *image)));
 void          DrawImage           PROTO((KapaImageWidget *image));
 void          DrawButton          PROTO((Graphic *graphic, Button *button));
@@ -232 +232 @@
 // void               CreateZoom32 (KapaImageWidget *image, Graphic *graphic, double x, double y);
 
-int           GetActiveSocket ();
+int           GetActiveSocket (void);
 void          InvertButton (Graphic *graphic, Button *button);
 void          bDrawOverlay (KapaImageWidget *image, int N);
 
 /* color cube tools */
-CCNode *CCNodeAlloc ();
+CCNode *CCNodeAlloc (void);
 CCNode *CCFindChild (CCNode *node, float x, float y, float z);
 int CCSplitNode (CCNode *node);
@@ -253 +253 @@
 
 int SetColorScale3D_CC (Graphic *graphic, KapaImageWidget *image);
-int SetColorCubeHistogram ();
+int SetColorCubeHistogram (void);

trunk/Ohana/src/kapa2/include/structures.h

@@ -78 +78 @@
   int      cursor_x;       /* location of cursor (if selected) */
   int      cursor_y;       /* location of cursor (if selected) */
-  int    (*function) ();   /* textline function */
+  int    (*function) (void);   /* textline function */
 } TextBox;
 

trunk/Ohana/src/kapa2/src/ButtonFunctions.c

@@ -102 +102 @@
   image[0].DecimalDegrees = image[0].DecimalDegrees ^ TRUE;
   StatusBox (graphic, image);
-  FlushDisplay (graphic[0].display);
+  FlushDisplay ();
   return (TRUE);
 

trunk/Ohana/src/kapa2/src/CheckVisual.c

@@ -34 +34 @@
   }
   
+// skip the default and the PseudoColor visuals, go for TrueColor first
+# if (0)
   /* check default visual first */ 
   for (i = 0; (i < Nfound) && (graphic[0].visual != visual_list[i].visual); i++);
@@ -40 +42 @@
     exit (0);
   }
+# endif
 
   // set these based on selected visual
   isColor = isDefault = isDynamic = FALSE;
 
+# if (0)
   // attempt to select the most desirable type of visual: Default as PseudoColor (XXX is it still true?)
   if (DEBUG) fprintf (stderr, "default visual class is %d\n", visual_list[i].class);
@@ -52 +56 @@
     goto test_pixels;
   }
+# endif
+
+  // attempt to select the most desirable type of visual: TrueColor (XXX is it still true?)
+  for (i = 0; (i < Nfound) && (visual_list[i].class != TrueColor); i++);
+  if (i != Nfound) {
+    isColor = TRUE;
+    if (DEBUG) fprintf (stderr, "visual class is %d\n", visual_list[i].class);
+    isDefault = (graphic[0].visual == visual_list[i].visual);
+    graphic[0].visual = visual_list[i].visual;
+    graphic[0].visualclass = FALSE;
+    goto test_pixels;
+  }
 
   // attempt to select the most desirable type of visual: PseudoColor (XXX is it still true?)
@@ -72 +88 @@
     graphic[0].visual = visual_list[i].visual;
     graphic[0].visualclass = TRUE;
-    goto test_pixels;
-  }
-
-  // attempt to select the most desirable type of visual: TrueColor (XXX is it still true?)
-  for (i = 0; (i < Nfound) && (visual_list[i].class != TrueColor); i++);
-  if (i != Nfound) {
-    isColor = TRUE;
-    if (DEBUG) fprintf (stderr, "visual class is %d\n", visual_list[i].class);
-    isDefault = (graphic[0].visual == visual_list[i].visual);
-    graphic[0].visual = visual_list[i].visual;
-    graphic[0].visualclass = FALSE;
     goto test_pixels;
   }

trunk/Ohana/src/kapa2/src/DefineSection.c

@@ -34 +34 @@
   if (MoveSection) {
     SetSectionSizes (section);
-    Refresh (1);
+    Refresh ();
   }
 

trunk/Ohana/src/kapa2/src/EraseCurrentPlot.c

@@ -15 +15 @@
   
   if (USE_XWINDOW) XClearWindow (graphic->display, graphic->window);
-  Refresh (1);
+  Refresh ();
 
   return (TRUE);

trunk/Ohana/src/kapa2/src/ErasePlots.c

@@ -18 +18 @@
 
   if (USE_XWINDOW) XClearWindow (graphic->display, graphic->window);
-  Refresh (1);
+  Refresh ();
 
   return (TRUE);

trunk/Ohana/src/kapa2/src/EraseSections.c

@@ -11 +11 @@
 
   if (USE_XWINDOW) XClearWindow (graphic->display, graphic->window);
-  Refresh (1);
+  Refresh ();
 
   return (TRUE);

trunk/Ohana/src/kapa2/src/EventLoop.c

@@ -25 +25 @@
   display = graphic->display;
   
-  if (USE_XWINDOW) Refresh (1);
+  if (USE_XWINDOW) Refresh ();
 
   status = TRUE;
@@ -46 +46 @@
     if (LastEvent (display, ConfigureNotify, &event)) Reconfig (&event);
     if (LastEvent (display, CirculateNotify, &event)) Reconfig (&event);
-    if (LastEvent (display, Expose,          &event)) Refresh (1);
+    if (LastEvent (display, Expose,          &event)) Refresh ();
     if (LastEvent (display, MappingNotify,   &event)) XRefreshKeyboardMapping ((XMappingEvent *) &event);
     if (LastEvent (display, MotionNotify,    &event)) UpdatePointer (graphic, (XMotionEvent *) &event);

trunk/Ohana/src/kapa2/src/FlushDisplay.c

@@ -5 +5 @@
 # define DTIME(A,B) ((A.tv_sec - B.tv_sec) + 1e-6*(A.tv_usec - B.tv_usec))
 
-void FlushDisplay () {
+void FlushDisplay (void) {
 
   struct timeval now;

trunk/Ohana/src/kapa2/src/Image.c

@@ -190 +190 @@
   }
 
-  FlushDisplay (graphic[0].display);
+  FlushDisplay ();
 }
 

trunk/Ohana/src/kapa2/src/InvertButton.c

@@ -12 +12 @@
 
   DrawButton (graphic, button);
-  FlushDisplay (graphic[0].display);
+  FlushDisplay ();
   
   graphic[0].fore = fore;

trunk/Ohana/src/kapa2/src/LoadFrame.c

@@ -81 +81 @@
     }
     if (USE_XWINDOW) XClearWindow (graphic.display, graphic.window);
-    Refresh (1);
+    Refresh ();
   } else {
     FlushDisplay ();

trunk/Ohana/src/kapa2/src/MapWindow.c

@@ -6 +6 @@
   XMapRaised (graphic->display, graphic->window);
   XMapSubwindows (graphic->display, graphic->window);
-  FlushDisplay (graphic);
+  FlushDisplay ();
 }

trunk/Ohana/src/kapa2/src/Reconfig.c

@@ -29 +29 @@
 
   if (USE_XWINDOW) XClearWindow (graphic->display, graphic->window);
-  Refresh (1);
+  Refresh ();
 
   return (TRUE);

trunk/Ohana/src/kapa2/src/Refresh.c

@@ -1 +1 @@
 # include "Ximage.h"
 
-void Refresh () {
+void Refresh (void) {
 
   int i, Nsection;

trunk/Ohana/src/kapa2/src/Resize.c

@@ -34 +34 @@
 
   if (USE_XWINDOW) XClearWindow (graphic->display, graphic->window);
-  Refresh (1);
+  Refresh ();
 
   return (TRUE);

trunk/Ohana/src/kapa2/src/Sections.c

@@ -177 +177 @@
       sections[N] = sections[N+1];
       sections[N+1] = tmpSection;
-      Refresh (1);
+      Refresh ();
       return (TRUE);
   }
@@ -187 +187 @@
       sections[N] = sections[N-1];
       sections[N-1] = tmpSection;
-      Refresh (1);
+      Refresh ();
       return (TRUE);
   }
@@ -199 +199 @@
       }
       sections[i] = tmpSection;
-      Refresh (1);
+      Refresh ();
       return (TRUE);
   }
@@ -211 +211 @@
       }
       sections[i] = tmpSection;
-      Refresh (1);
+      Refresh ();
       return (TRUE);
   }

trunk/Ohana/src/kapa2/src/SetGraphData.c

@@ -73 +73 @@
 
   if (USE_XWINDOW) XClearWindow (graphic->display, graphic->window);
-  Refresh (1);
+  Refresh ();
 
   return (TRUE);  

trunk/Ohana/src/kapa2/src/SetGraphStyle.c

@@ -55 +55 @@
 
   if (USE_XWINDOW) XClearWindow (graphic->display, graphic->window);
-  Refresh (1);
+  Refresh ();
 
   return (TRUE);  

trunk/Ohana/src/kapa2/src/SetLimits.c

@@ -33 +33 @@
 
   if (USE_XWINDOW) XClearWindow (graphic->display, graphic->window);
-  Refresh (1);
+  Refresh ();
 
   return (TRUE);  

trunk/Ohana/src/kapa2/src/SetUpGraphic.c

@@ -44 +44 @@
   LoadFont (graphic, argc, argv, "fixed"); 
 
-  // FlushDisplay (graphic);
   XSetWindowBackground (graphic->display, graphic->window, graphic->back);
 

trunk/Ohana/src/kapa2/src/TopWindow.c

@@ -15 +15 @@
   MakeCursor (graphic, DEFAULT_CURSOR);
   XFreeCursor (graphic->display, graphic->cursor);
-  // FlushDisplay (graphic);
 }