Gterm prototypes

iraf-community · Jun 5, 2020 · 998f57d · 998f57d
1 parent c4d4f17
commit 998f57d
Show file tree

Hide file tree

Showing 10 changed files with 204 additions and 13 deletions.
diff --git a/obm/ObmW/Gterm.c b/obm/ObmW/Gterm.c
@@ -529,7 +529,7 @@ static void gm_focusin(), gm_focusout(), gm_refocus();
 static void gm_request_translations(), gm_load_translations();
 static int gm_curpos();
 
-static set_default_color_index();
+static void set_default_color_index();
 static void inherit_default_colormap();
 static void update_default_colormap();
 static void update_transients(), update_cursor();
@@ -586,8 +586,9 @@ static XImage *GetCachedXImage();				/* MF004 */
 
 static char 	*dbg_wSize();			/* debug utils		 */
 static char 	*dbg_visStr();
-
-extern double atof();
+static void dbg_printCmaps();
+static void dbg_printMappings();
+static void dbg_printRasters();
 
 
 

diff --git a/obm/ObmW/Gterm.h b/obm/ObmW/Gterm.h
@@ -303,4 +303,112 @@ typedef struct _GtermClassRec *GtermWidgetClass;
 
 extern WidgetClass gtermWidgetClass;
 
+/*
+ * Gterm function declarations
+ */
+extern void GtActivate();
+extern void GtDeactivate();
+extern void GtReset();
+extern void GtFlush();
+extern int GtReady();
+extern void GtTimerInhibit();
+extern void GtSetDataLevel();
+extern void GtDeleteInputProc();
+extern void GtDeleteResizeProc();
+extern void GtDeleteResetProc();
+extern void GtPostInputProc();
+extern void GtPostResetProc();
+extern void GtPostResizeProc();
+extern int GtQueryRaster();
+extern void GtSetRaster();
+extern int GtGetRaster();
+extern void GtSetCursorPos();
+extern void GtGetCursorPos();
+extern void GtSetCursorType();
+extern void GtBell();
+extern void GtSetLogRes();
+extern void GtGetLogRes();
+extern void GtGetPhysRes();
+extern void GtSetPhysRes();
+extern void GtSetLineWidth();
+extern void GtSetLineStyle();
+extern void GtSetColorIndex();
+extern void GtSetFillType();
+extern void GtClearScreen();
+extern void GtDrawPolyline();
+extern void GtDrawPolymarker();
+extern void GtDrawPolygon();
+extern void GtDrawAlphaText();
+extern void GtGetAlphaTextSize();
+extern void GtStartDialog();
+extern void GtEndDialog();
+extern void GtEraseDialog();
+extern void GtDrawDialogText();
+extern void GtGetDialogTextSize();
+extern void GtRasterInit();
+extern int GtAssignRaster();
+extern int GtCreateRaster();
+extern void GtDestroyRaster();
+extern int GtNextRaster();
+extern int GtNRasters();
+extern int GtWritePixels();
+extern int GtReadPixels();
+extern void GtRefreshPixels();
+extern int GtGetClientPixel();
+extern int GtSetPixels();
+extern Pixmap GtExtractPixmap();
+extern int GtInsertPixmap();
+extern int GtNextColormap();
+extern void GtFreeColormap();
+extern int GtWriteColormap();
+extern int GtReadColormap();
+extern int GtLoadColormap();
+extern int GtQueryColormap();
+extern void GtSetColormapFocus();
+extern void GtInitMappings();
+extern int GtNextMapping();
+extern void GtFreeMapping();
+extern int GtDisableMapping();
+extern void GtLowerMapping();
+extern void GtRaiseMapping();
+extern int GtActiveMapping();
+extern int GtEnableMapping();
+extern void GtRefreshMapping();
+extern int GtSetMapping();
+extern int GtGetMapping();
+extern int GtCompareMappings();
+extern int GtCopyRaster();
+extern int GtSelectRaster();
+extern void GtSetDisplayRaster();
+extern void GtMarkerInit();
+extern void GtMapVector();
+extern void GtPixelToNDC();
+extern void GtNDCToPixel();
+extern void GtOverrideTranslations();
+extern void GtWriteAlphaCursor();
+extern void GtEraseAlphaCursor();
+extern void GtSetTextRes();
+extern void GtReadIomap();
+extern void GtWriteIomap();
+extern void GtReadLUT();
+
+extern void GmAddCallback();
+extern void GmDeleteCallback();
+extern int GmDestroy();
+extern int GmGetAttribute();
+extern void GmGetAttributes();
+extern void GmGetBoundingBox();
+extern int GmGetVertices();
+extern int GmStrToType();
+extern int GmStrToEvent();
+extern int GmStrToFunction();
+extern void GmLower();
+extern int GmSetAttributes();
+extern int GmSetAttribute();
+extern void GmMarkpos();
+extern void GmRedraw();
+extern void GmNotify();
+extern void GmRaise();
+extern void GmSetVertices();
+
 #endif /* _Gterm_h */
diff --git a/obm/ObmW/GtermCnv.c b/obm/ObmW/GtermCnv.c
@@ -211,7 +211,7 @@ int     bpl, bpp, border;
 
 
     if (DBG_TRACE) {
-	start = time ((time_t) NULL);
+	start = time (NULL);
 	fprintf (stderr, "renderPix: ENTER\n");
     }
 
@@ -246,7 +246,7 @@ int     bpl, bpp, border;
 	fprintf (stderr,
 	    "renderPix: pix %d %d  cmap %d %d  xcol 0x%x 0x%x  bpp = %d\n",
 	    min,max, cmin,cmax, xmin,xmax, bpp);
-	end = time ((time_t) NULL);
+	end = time (NULL);
 	fprintf (stderr, "renderPix: DONE  time = %.5f  %ld %ld\n",
 	    difftime(start,end), (long)start, (long)end);
     }
@@ -257,6 +257,7 @@ int     bpl, bpp, border;
 
 /*  Compute the lookup table for the RGB rendering.
 */
+int
 init_lut (bpp, border)
 int	bpp;
 int	border;
@@ -395,8 +396,7 @@ int lowbit(unsigned long i)
 
 /* Debug Utilities.
 */
-bob() { int i = 0; fprintf (stderr, "Hi from Bob\n");  }
-
+static void
 dbg_printCmaps (GtermWidget w)
 {
     int     i, j, first, nelem, maxelem, nc;
@@ -444,6 +444,7 @@ dbg_printCmaps (GtermWidget w)
           w->gterm.cmap_in[i], w->gterm.cmap_out[i]);
 }
 
+static void
 dbg_printMappings (GtermWidget w)
 {
     Mapping mp;
@@ -466,6 +467,7 @@ dbg_printMappings (GtermWidget w)
 }
 
 
+static void
 dbg_printRasters (GtermWidget w)
 {
     register int i;