Ansification and compile warning fixes.

  This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, corrects
make distcheck and most gcc 4.3 and sparse warnings.

1 files changed, 140 insertions, 1 deletions

diff --git a/main.c b/main.c
index dcf277b..0002350 100644
--- a/main.c
+++ b/main.c
@@ -49,7 +49,6 @@ from the X Consortium.
 #include "xgc.h"
 #define DEFINE_TILE
 #include "tile"
-#include "main.h"
 
 static void fill_up_commandform(Widget);
 static void quit(void);
@@ -58,6 +57,146 @@ static void clear_test_window(void);
 static void clear_result_window(void);
 static void set_foreground_and_background(void);
 
+/* The three columns in the XgcData arrays are:
+**   name: the name of the toggle button
+**   text: the corresponding text in the xgc syntax
+**   code: the integer that the text corresponds to, for sending stuff
+**         to X calls, etc.
+*/
+
+static XgcData FunctionData[NUM_FUNCTIONS] = {
+  {"clear",        "clear",        GXclear},
+  {"and",          "and",          GXand},
+  {"andReverse",   "andReverse",   GXandReverse},
+  {"copy",         "copy",         GXcopy},
+  {"andInverted",  "andInverted",  GXandInverted},
+  {"noop",         "noop",         GXnoop},
+  {"xor",          "xor",          GXxor},
+  {"or",           "or",           GXor},
+  {"nor",          "nor",          GXnor},
+  {"equiv",        "equiv",        GXequiv},
+  {"invert",       "invert",       GXinvert},
+  {"orReverse",    "orReverse",    GXorReverse},
+  {"copyInverted", "copyInverted", GXcopyInverted},
+  {"orInverted",   "orInverted",   GXorInverted},
+  {"nand",         "nand",         GXnand},
+  {"set",          "set",          GXset}
+}; 
+
+/* The two rows in the XgcStuff structure are:
+**   name of label, xgc syntax text, # of toggles, # of columns of toggles
+**     (0 columns means 1 row, as many columns as necessary)
+**   appropriate XgcData
+*/
+
+XgcStuff FunctionStuff = {
+  {"Function","function",NUM_FUNCTIONS,4},
+  FunctionData
+};
+
+static XgcData TestData[NUM_TESTS] = {
+  {"Copy Area",          "CopyArea",      CopyArea},
+  {"Copy Plane",         "CopyPlane",     CopyPlane},
+  {"Points",             "PolyPoint",     PolyPoint},
+  {"Lines",              "PolyLine",      PolyLine},
+  {"Segments",           "PolySegment",   PolySegment},
+  {"Rectangles",         "PolyRectangle", PolyRectangle},
+  {"Arcs",               "PolyArc",       PolyArc},
+  {"(Filled Polygons)",  "FillPolygon",   FillPolygon},
+  {"Filled Rectangles",  "PolyFillRect",  PolyFillRect},
+  {"Filled Arcs",        "PolyFillArc",   PolyFillArc},
+  {"Put Image",          "PutImage",      PutImage},
+  {"(Get Image)",        "GetImage",      GetImage},
+  {"Text 8",             "PolyText8",     PolyText8},
+  {"Image Text 8",       "ImageText8",    ImageText8},
+  {"Text 16",            "PolyText16",    PolyText16},
+  {"Image Text 16",      "ImageText16",   ImageText16}
+};
+
+XgcStuff TestStuff = {
+  {"Test","test",NUM_TESTS,2},
+  TestData
+};
+
+static XgcData LinestyleData[NUM_LINESTYLES] = {
+  {"Solid",      "Solid",       LineSolid},
+  {"OnOffDash",  "OnOffDash",   LineOnOffDash},
+  {"DoubleDash", "DoubleDash",  LineDoubleDash}
+};
+
+XgcStuff LinestyleStuff = {
+  {"LineStyle","linestyle",NUM_LINESTYLES,0},
+  LinestyleData
+};
+
+static XgcData CapstyleData[NUM_CAPSTYLES] = {
+  {"NotLast",    "NotLast",     CapNotLast},
+  {"Butt",       "Butt",        CapButt},
+  {"Round",      "Round",       CapRound},
+  {"Projecting", "Projecting",  CapProjecting}
+};
+
+XgcStuff CapstyleStuff = {
+  {"CapStyle","capstyle",NUM_CAPSTYLES,2},
+  CapstyleData
+};
+
+static XgcData JoinstyleData[NUM_JOINSTYLES] = {
+  {"Miter",   "Miter",   JoinMiter},
+  {"Round",   "Round",   JoinRound},
+  {"Bevel",   "Bevel",   JoinBevel}
+};
+
+XgcStuff JoinstyleStuff = {
+  {"JoinStyle","joinstyle",NUM_JOINSTYLES,0},
+  JoinstyleData
+};
+
+static XgcData FillstyleData[NUM_FILLSTYLES] = {
+  {"Solid",          "Solid",          FillSolid},
+  {"Tiled",          "Tiled",          FillTiled},
+  {"Stippled",       "Stippled",       FillStippled},
+  {"OpaqueStippled", "OpaqueStippled", FillOpaqueStippled}
+};
+
+XgcStuff FillstyleStuff = {
+  {"FillStyle","fillstyle",NUM_FILLSTYLES,2},
+  FillstyleData
+};
+
+static XgcData FillruleData[NUM_FILLRULES] = {
+  {"EvenOdd",  "EvenOdd",  EvenOddRule},
+  {"Winding",  "Winding",  WindingRule}
+};
+
+XgcStuff FillruleStuff = {
+  {"FillRule","fillrule",NUM_FILLRULES,0},
+  FillruleData
+};
+
+static XgcData ArcmodeData[NUM_ARCMODES] = {
+  {"Chord",    "Chord",    ArcChord},
+ {"PieSlice", "PieSlice", ArcPieSlice}
+};
+
+XgcStuff ArcmodeStuff = {
+  {"ArcMode","arcmode",NUM_ARCMODES,0},
+  ArcmodeData
+};
+
+/* Pointers to all the Xgcstuffs so we can run them through a loop */
+
+static XgcStuff *Everything[8] = {
+  &FunctionStuff,
+  &LinestyleStuff,
+  &CapstyleStuff,
+  &JoinstyleStuff,
+  &FillstyleStuff,
+  &FillruleStuff,
+  &ArcmodeStuff,
+  &TestStuff
+};
+
 #ifdef notdef
 int fildes[2];			/* for pipe */
 FILE *outend;