diff options
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | Written/FilledRects | 6 | ||||
| -rw-r--r-- | Written/Interface | 2 | ||||
| -rw-r--r-- | Written/Jim | 12 | ||||
| -rw-r--r-- | Written/Notes | 6 | ||||
| -rw-r--r-- | Written/Notes2 | 46 | ||||
| -rw-r--r-- | Written/Outline | 12 | ||||
| -rw-r--r-- | Written/Widget | 2 | ||||
| -rw-r--r-- | choice.c | 16 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | constants.h | 2 | ||||
| -rw-r--r-- | dashlist.c | 10 | ||||
| -rw-r--r-- | getfile.c | 6 | ||||
| -rw-r--r-- | gram.y | 18 | ||||
| -rw-r--r-- | interpret.c | 16 | ||||
| -rw-r--r-- | main.c | 16 | ||||
| -rw-r--r-- | planemask.c | 2 | ||||
| -rw-r--r-- | record.c | 16 | ||||
| -rw-r--r-- | testfrac.c | 6 | ||||
| -rw-r--r-- | tests.c | 18 | ||||
| -rw-r--r-- | text.c | 6 | ||||
| -rw-r--r-- | xgc.h | 2 |
22 files changed, 115 insertions, 115 deletions
diff --git a/Makefile.am b/Makefile.am index 4f45449..f2e0b84 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ -# +# # Copyright 2005 Red Hat, Inc. -# +# # Permission to use, copy, modify, distribute, and sell this software and its # documentation for any purpose is hereby granted without fee, provided that # the above copyright notice appear in all copies and that both that @@ -10,7 +10,7 @@ # specific, written prior permission. Red Hat makes no # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. -# +# # RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO # EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR diff --git a/Written/FilledRects b/Written/FilledRects index 83cf106..56178c1 100644 --- a/Written/FilledRects +++ b/Written/FilledRects @@ -26,11 +26,11 @@ Things to look for: Otherwise, the speed of a single rectangle should be about equal to its size. -Data: +Data: Pixels per second. Average size of rectangle. -GC fields: +GC fields: function: Tiling: likely to be a lot slower, although for whole words you're just setting it to a certain value, rather than 0. @@ -58,7 +58,7 @@ GC fields: more thought has to be given to what is drawn or not. Software vs. hardware, I suppose. -Possibly +Possibly foreground: similar to plane-mask in its effect, I would think. tile: "nice" width tiles would probably be better. A width which diff --git a/Written/Interface b/Written/Interface index 7b40562..1e8028c 100644 --- a/Written/Interface +++ b/Written/Interface @@ -1,6 +1,6 @@ The command buttons at the top - - Benchmark Options, Graphics Options, etc. + Benchmark Options, Graphics Options, etc. should just bring up the window, not force you to use it. diff --git a/Written/Jim b/Written/Jim index e370cd5..5ab6630 100644 --- a/Written/Jim +++ b/Written/Jim @@ -55,8 +55,8 @@ document. The Graphics Options area would contain the following entries: - Function - one-of { clear, and, andReverse, copy, andInverted, noop, xor, - or, nor, equiv, invert, orReverse, copyInverted, + Function - one-of { clear, and, andReverse, copy, andInverted, noop, xor, + or, nor, equiv, invert, orReverse, copyInverted, orInverted, nand, set } PlaneMask - unsigned value or many-of-n representing bits Foreground - unsigned value in range 0..2^nplanes @@ -158,7 +158,7 @@ sophisticated as what is provided in many UIMS's, it would be nice to keep the application section of the benchmark as separate as possible from the user interface. - test { CopyArea, CopyPlane, PolyPoint, PolyLine, PolySegment, + test { CopyArea, CopyPlane, PolyPoint, PolyLine, PolySegment, PolyRectangle, PolyArc, FillPolygon, PolyFillRect, PolyFillArc, PutImage, GetImage, ImageText8, PolyText8, ImageText16, PolyText16 } @@ -177,7 +177,7 @@ user interface. - specifies the name of the file into which commands are recorded. describe BOOLEAN - - indicates whether or not a description of the test should be + - indicates whether or not a description of the test should be displayed whenever a test is selected (or when this option is specified). @@ -194,11 +194,11 @@ user interface. colormap is being used, the RGB value for this slot may be changed. forecolor COLORNAME - - specifies the RGB value or name of the color to be used for the + - specifies the RGB value or name of the color to be used for the foreground pixel, if settable. backcolor COLORNAME - - specifies the RGB value or name of the color to be used for the + - specifies the RGB value or name of the color to be used for the background pixel, if settable. linewidth NUMBER diff --git a/Written/Notes b/Written/Notes index 971e67a..7c50d0e 100644 --- a/Written/Notes +++ b/Written/Notes @@ -9,7 +9,7 @@ credit to servers for optimizing small ones. Data: Pixels per second. Breaking that down into large and small areas would probably not be useful. - + GC Fields: None. @@ -22,7 +22,7 @@ We probably want to see what happens when the source area is clipped, as that as mentioned specifically in the protocol document. Data: Pixels per second. - + GC Fields: function (*) plane-mask subwindow-mode @@ -64,7 +64,7 @@ Data: Lines per second. Pixels per second (is this valid - do lines that are twice as long take twice as long to draw? Also, is it valid to compare thin lines and fat lines?) - + GC fields: function (*) plane-mask line-width (*) diff --git a/Written/Notes2 b/Written/Notes2 index cf3d99d..9f3b269 100644 --- a/Written/Notes2 +++ b/Written/Notes2 @@ -19,50 +19,50 @@ | | | | | | | | | | | | | | | | | ----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ function |XX| |XX|XX|XX|XX|XX|XX|XX|XX|XX| |XX|XX| | | -----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ +----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ plane_mask |XX| |XX|XX|XX|XX|XX|XX|XX|XX|XX| |XX|XX|XX|XX| -----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ +----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ foreground | | |XX|**|**|**|**|**|**|**|**| |**|**|XX|XX| -----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ +----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ background | | | |**|**|**|**|**|**|**|**| |**|**|XX|XX| -----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ +----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ line_width | | | |XX|XX|XX|XX| | | | | | | | | | -----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ +----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ line_style | | | |XX|XX|XX|XX| | | | | | | | | | -----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ +----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ cap_style | | | |XX|XX| |XX| | | | | | | | | | -----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ +----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ join_style | | | |XX| |XX|XX| | | | | | | | | | -----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ +----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ fill_style | | | |XX|XX|XX|XX|XX|XX|XX| | |XX|XX| | | -----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ +----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ fill_rule | | | | | | | |XX| | | | | | | | | -----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ +----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ arc_mode | | | | | | | | | |XX| | | | | | | -----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ +----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ tile | | | |**|**|**|**|**|**|**| | |**|**| | | -----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ +----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ stipple | | | |**|**|**|**|**|**|**| | |**|**| | | -----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ +----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ ts_x_origin | | | |**|**|**|**|**|**|**| | |**|**| | | -----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ +----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ ts_y_origin | | | |**|**|**|**|**|**|**| | |**|**| | | -----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ +----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ font | | | | | | | | | | | | |XX|XX|XX|XX| -----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ +----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ subwindow_mode |XX| |XX|XX|XX|XX|XX|XX|XX|XX|XX| |XX|XX|XX|XX| -----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ +----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ exposures |XX| | | | | | | | | | | | | | | | -----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ +----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ clip_x_origin |XX| |XX|XX|XX|XX|XX|XX|XX|XX|XX| |XX|XX|XX|XX| -----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ +----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ clip_y_origin |XX| |XX|XX|XX|XX|XX|XX|XX|XX|XX| |XX|XX|XX|XX| -----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ +----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ clip_mask |XX| |XX|XX|XX|XX|XX|XX|XX|XX|XX| |XX|XX|XX|XX| -----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ +----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ dash_offset | | | |**|**|**|**| | | | | | | | | | -----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ +----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ dashes | | | |**|**|**|**| | | | | | | | | | -----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ +----------------+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ diff --git a/Written/Outline b/Written/Outline index d83f3e5..c0a5c15 100644 --- a/Written/Outline +++ b/Written/Outline @@ -70,7 +70,7 @@ MenuLine contains these Commands: - read from file until EOF Quit - quit - + The toggling command buttons exist in pairs, of which only one is visible at any one point. This makes callbacks/names of buttons easier to implement. @@ -84,7 +84,7 @@ BenchmarkOptions contains: - call disable_gc_choices() with the GC field flags Iterations (text) the number of times to run. - put "iterations <>" in buffer - + --- GraphicsOptions (form) describing graphics options (owned by Toplevel?) @@ -134,9 +134,9 @@ Description (text) describing the current test (owned by Toplevel?) I really need to find out how to use sources and sinks for Text widgets - the documentation does not say how to do it. -Every test will have a block of text associated with it. When a new +Every test will have a block of text associated with it. When a new benchmark is chosen, its associated text will become the source for the -Description widget. Note that we don't have to worry about whether +Description widget. Note that we don't have to worry about whether Description is mapped or not; we're just setting a source. --- @@ -165,9 +165,9 @@ When the user presses Playback, pretty much all we have to do is to 1) change the buffer to the file that he wants, and 2) start reading. The rest should be taken care of the buffer-interpreting module. -RecordingOn changes the output buffer _and_ the input buffer to the +RecordingOn changes the output buffer _and_ the input buffer to the desired file. - + RecordingOff changes them both back to the usual. diff --git a/Written/Widget b/Written/Widget index c653dfd..a603323 100644 --- a/Written/Widget +++ b/Written/Widget @@ -1,5 +1,5 @@ What we need is a widget which presents a collection of buttons. The user -can select only one of them at a time. When one is selected, its +can select only one of them at a time. When one is selected, its foreground and background colors should be reversed and stay that way until another one is selected. Exactly one button can be selected at any one time. @@ -52,8 +52,8 @@ create_choice(Widget w, XgcStuff *info) ** toggle widget is selected. */ /* ArgList for the label widget */ - static Arg labelargs[] = { - {XtNborderWidth, (XtArgVal) 0}, + static Arg labelargs[] = { + {XtNborderWidth, (XtArgVal) 0}, {XtNjustify, (XtArgVal) XtJustifyRight}, {XtNvertDistance, (XtArgVal) 4} }; @@ -76,7 +76,7 @@ create_choice(Widget w, XgcStuff *info) /* Allocate space for the widgets and initialize choice */ choice = (ChoiceDesc *) XtMalloc(sizeof(ChoiceDesc)); - choice->widgets = (WidgetList) XtMalloc(sizeof(Widget) * + choice->widgets = (WidgetList) XtMalloc(sizeof(Widget) * info->choice.num_toggles); choice->size = info->choice.num_toggles; choice->label = XtCreateManagedWidget(info->choice.name,labelWidgetClass,w, @@ -97,8 +97,8 @@ create_choice(Widget w, XgcStuff *info) else { toggleargs[4].value = (XtArgVal) choice->widgets[0]; /* are we starting a new row? */ - if (info->choice.columns > 0 && - i > 1 && + if (info->choice.columns > 0 && + i > 1 && (i % (info->choice.columns) == 0)) { toggleargs[0].value = (XtArgVal) choice->label; /* under the appropriate toggle */ @@ -130,15 +130,15 @@ create_choice(Widget w, XgcStuff *info) strcat(text, (info->data)[i].text); strcat(text, "\n"); callbacklist[0].closure = (caddr_t) text; - + /* Create it finally */ - choice->widgets[i] = XtCreateManagedWidget((info->data[i]).name, + choice->widgets[i] = XtCreateManagedWidget((info->data[i]).name, toggleWidgetClass, w, toggleargs, XtNumber(toggleargs)); } - + /* The toggle widgets have all been created; ** now make the all the same width if that's ** what we want to do. */ diff --git a/configure.ac b/configure.ac index 905d925..a16c026 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl Copyright 2005 Red Hat, Inc. -dnl +dnl dnl Permission to use, copy, modify, distribute, and sell this software and its dnl documentation for any purpose is hereby granted without fee, provided that dnl the above copyright notice appear in all copies and that both that @@ -9,7 +9,7 @@ dnl advertising or publicity pertaining to distribution of the software without dnl specific, written prior permission. Red Hat makes no dnl representations about the suitability of this software for any purpose. It dnl is provided "as is" without express or implied warranty. -dnl +dnl dnl RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO dnl EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR diff --git a/constants.h b/constants.h index 495ff94..acbe32c 100644 --- a/constants.h +++ b/constants.h @@ -21,7 +21,7 @@ #define MAXCHOICES 16 /* Max # of choices for any option */ -#define Black BlackPixel(X.dpy,0) +#define Black BlackPixel(X.dpy,0) #define White WhitePixel(X.dpy,0) #define CopyArea 0 /* different tests */ @@ -136,15 +136,15 @@ change_dashlist(Widget w, caddr_t closure, caddr_t call_data) XtGetValues(w,args,XtNumber(args)); /* modify the dashlist as appropriate. */ - if (on) { - dashlist |= 1<<num; + if (on) { + dashlist |= 1<<num; } - else { - dashlist &= ~(1<<num); + else { + dashlist &= ~(1<<num); } /* now tell interpret() about it */ - snprintf(buf, sizeof buf, "dashlist %d\n",dashlist); + snprintf(buf, sizeof buf, "dashlist %d\n",dashlist); interpret(buf); } @@ -39,7 +39,7 @@ get_filename( ** confirm the user's choice. Other keys which would move out of ** the range of a one-line window are disabled. */ - static const char *translationtable = + static const char *translationtable = "Ctrl<Key>J: KillPopup() Done()\n\ Ctrl<Key>M: KillPopup() Done()\n\ <Key>Linefeed: KillPopup() Done()\n\ @@ -99,10 +99,10 @@ get_filename( (void) XQueryPointer(X.dpy,XtWindow(topform),&dummy1,&dummy2,&x1,&y1, &x2,&y2,&mask); - + popupshellargs[0].value = (XtArgVal) x2; popupshellargs[1].value = (XtArgVal) y2; - + popupshell = XtCreatePopupShell("popup",overrideShellWidgetClass, topform,popupshellargs,XtNumber(popupshellargs)); @@ -46,23 +46,23 @@ stmts : /* empty */ ; stmt : error - | RUN - { run_test(); } - | TEST TESTTYPE + | RUN + { run_test(); } + | TEST TESTTYPE { change_test ($2, TRUE); } - | FUNCTION FUNCTIONTYPE + | FUNCTION FUNCTIONTYPE { GC_change_function ($2, TRUE); } - | LINESTYLE LINESTYLETYPE + | LINESTYLE LINESTYLETYPE { GC_change_linestyle ($2, TRUE); } | LINESTYLE SOLID { GC_change_linestyle (LineSolid, TRUE); } - | CAPSTYLE CAPSTYLETYPE + | CAPSTYLE CAPSTYLETYPE { GC_change_capstyle ($2, TRUE); } - | CAPSTYLE ROUND + | CAPSTYLE ROUND { GC_change_capstyle (CapRound, TRUE); } - | JOINSTYLE JOINSTYLETYPE + | JOINSTYLE JOINSTYLETYPE { GC_change_joinstyle ($2, TRUE); } - | JOINSTYLE ROUND + | JOINSTYLE ROUND { GC_change_joinstyle (JoinRound, TRUE); } | FILLSTYLE FILLSTYLETYPE { GC_change_fillstyle ($2, TRUE); } diff --git a/interpret.c b/interpret.c index 3978ed3..d8a4356 100644 --- a/interpret.c +++ b/interpret.c @@ -38,7 +38,7 @@ interpret(const char *string) /* So word1 is the first word on the line and word2 is the second. Now the fun begins... */ - + if (!strcmp(word1,TestStuff.choice.text)) { for (i=0;i<NUM_TESTS;++i) { if (!strcmp(word2,(TestStuff.data)[i].text)) { @@ -105,7 +105,7 @@ interpret(const char *string) } } } - else if (!strcmp(word1,"planemask")) + else if (!strcmp(word1,"planemask")) GC_change_planemask((unsigned long) atoi(word2),FALSE); else if (!strcmp(word1,"dashlist")) GC_change_dashlist(atoi(word2),FALSE); @@ -126,7 +126,7 @@ void interpret(const char *instring) { FILE *inend; - + print_if_recording(instring); yyin = outend; inend = fdopen(fildes[1],"w"); @@ -264,7 +264,7 @@ GC_change_arcmode(int arcmode, Boolean feedback) */ void -GC_change_dashlist(int dashlist, Boolean feedback) +GC_change_dashlist(int dashlist, Boolean feedback) { char dasharray[DASHLENGTH]; /* what we're going to pass to XSetDashes */ int dashnumber = 0; /* which element of dasharray we're currently @@ -272,7 +272,7 @@ GC_change_dashlist(int dashlist, Boolean feedback) int i; /* which bit of the dashlist we're on */ int state = 1; /* whether the list bit we checked was on (1) or off (0) */ - + /* Initialize the dasharray */ for (i = 0; i < DASHLENGTH; ++i) dasharray[i] = 0; @@ -294,11 +294,11 @@ GC_change_dashlist(int dashlist, Boolean feedback) if (((dashlist&1<<i) && state) || (!(dashlist&1<<i) && !state)) ++dasharray[dashnumber]; - else { + else { state = state^1; /* reverse the state */ ++dasharray[++dashnumber]; /* start a new dash */ } - } + } XSetDashes(X.dpy,X.gc,0,dasharray,dashnumber+1); X.gcv.dashes = dashlist; @@ -315,7 +315,7 @@ GC_change_planemask(unsigned long planemask, Boolean feedback) } void -change_test(int test, Boolean feedback) +change_test(int test, Boolean feedback) { X.test = test; if (feedback) select_button(testchoicedesc,test); @@ -79,7 +79,7 @@ static XgcData FunctionData[NUM_FUNCTIONS] = { {"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 @@ -252,7 +252,7 @@ main(int argc, char *argv[]) {XtNinput, (XtArgVal) True} }; - static Arg testformargs[] = { + static Arg testformargs[] = { {XtNfromVert, (XtArgVal) NULL} /* put it under GCform */ }; @@ -377,7 +377,7 @@ main(int argc, char *argv[]) backgroundchoice = XtCreateManagedWidget("background",formWidgetClass,GCform, gcchoiceargs,XtNumber(gcchoiceargs)); backgroundtext = create_text_choice(backgroundchoice,TBackground,9,50); - + gcchoiceargs[1].value = (XtArgVal) NULL; gcchoiceargs[0].value = (XtArgVal) foregroundchoice; percentchoice = XtCreateManagedWidget("testpercent",formWidgetClass,GCform, @@ -392,7 +392,7 @@ main(int argc, char *argv[]) testformargs[0].value = (XtArgVal) GCform; Testform = XtCreateManagedWidget("Testform",formWidgetClass,topform, testformargs,XtNumber(testformargs)); - + testchoiceform = XtCreateManagedWidget("testchoiceform",formWidgetClass, Testform,testchoiceargs,XtNumber(testchoiceargs)); testchoicedesc = create_choice(testchoiceform,Everything[CTest]); @@ -445,7 +445,7 @@ main(int argc, char *argv[]) choose_defaults(GCdescs,(int)XtNumber(GCdescs)); choose_defaults(&testchoicedesc,1); - + /* Loop forever, dealing with events */ XtAppMainLoop(appcontext); @@ -553,8 +553,8 @@ fill_up_commandform(Widget w) quitargs[1].value = (XtArgVal) keyinputbutton; /* under */ (void) XtCreateManagedWidget("Quit",commandWidgetClass, w,quitargs,XtNumber(quitargs)); - -} + +} /* quit() ** ------ ** Leave the program nicely. @@ -571,7 +571,7 @@ static void quitAction(Widget w, XEvent *e, String *p, Cardinal *n) { if (e->type == ClientMessage && e->xclient.data.l[0] != wm_delete_window) XBell(XtDisplay(w), 0); - else + else quit(); } diff --git a/planemask.c b/planemask.c index b55cf6b..535d6d5 100644 --- a/planemask.c +++ b/planemask.c @@ -20,7 +20,7 @@ static void choose_plane(Widget, caddr_t, caddr_t); -static unsigned long planemask; +static unsigned long planemask; static Widget *pm; /* create_planemask_choice(w) @@ -42,9 +42,9 @@ toggle_recordbutton(Widget w, caddr_t closure, caddr_t call_data) static Arg recordargs[] = { {XtNlabel, (XtArgVal) NULL} }; - + char tmp[20]; /* new label */ - + if (!recording) { start_recording(); } @@ -65,7 +65,7 @@ toggle_recordbutton(Widget w, caddr_t closure, caddr_t call_data) */ static void -start_recording(void) +start_recording(void) { get_filename(done_choosing_filename,cancel_record); } @@ -76,7 +76,7 @@ start_recording(void) */ static void -stop_recording(void) +stop_recording(void) { fclose(recordfile); } @@ -87,7 +87,7 @@ stop_recording(void) */ static void -cancel_record(void) +cancel_record(void) { } @@ -99,7 +99,7 @@ cancel_record(void) */ static void -done_choosing_filename(void) +done_choosing_filename(void) { static Arg recordargs[] = { {XtNlabel, (XtArgVal) NULL}, @@ -138,7 +138,7 @@ print_if_recording(const char *str) ** If we're recording, stop. */ -void +void close_file_if_recording(void) { if (recording) @@ -217,7 +217,7 @@ print_out_gc_values(void) fprintf(recordfile,"planemask %ld\n",X.gcv.plane_mask); fprintf(recordfile,"dashlist %d\n",X.gcv.dashes); fprintf(recordfile,"font %s\n",X.fontname); -} +} /********************************************/ @@ -50,7 +50,7 @@ slider_jump(Widget w, caddr_t data, caddr_t position) ** hits the end of the scrollbar, not the left edge. When the right edge ** is at 1.0, the left edge is at 1.0 - SLIDER_LENGTH. Normalize ** accordingly. */ - + newpercent = oldpercent / (1.0 - SLIDER_LENGTH); /* If the slider's partially out of the scrollbar, move it back in. */ @@ -73,7 +73,7 @@ slider_jump(Widget w, caddr_t data, caddr_t position) /* slider_scroll(w,data,position) ** ------------------------------ -** This function is called when the user does incremental scrolling, +** This function is called when the user does incremental scrolling, ** generally with the left or right button. Right now it just ignores it. */ @@ -144,7 +144,7 @@ create_testfrac_choice(Widget w) {XtNjumpProc, (XtArgVal) NULL}, {XtNscrollProc, (XtArgVal) NULL} }; - + static const char *translationtable = "<Leave>: Update()"; static XtActionsRec actiontable[] = { @@ -52,7 +52,7 @@ timer(int flag) switch (flag) { case StartTimer: /* store initial values */ - gettimeofday(&starttime,&tz); + gettimeofday(&starttime,&tz); #if !defined(__UNIXOS2__) && !defined(QNX4) getrusage(RUSAGE_SELF,&startusage); #endif @@ -63,8 +63,8 @@ timer(int flag) getrusage(RUSAGE_SELF,&endusage); #endif - /* all the following line does is use the formula - elapsed time = ending time - starting time, but there are three + /* all the following line does is use the formula + elapsed time = ending time - starting time, but there are three different timers and two different units of time, ack... */ #if !defined(__UNIXOS2__) && !defined(QNX4) @@ -79,15 +79,15 @@ timer(int flag) elapsedtime = (long)( ((long)endtime.tv_sec-(long)starttime.tv_sec)*1000000 +((long)endtime.tv_usec-(long)starttime.tv_usec)); #endif - return(elapsedtime); + return(elapsedtime); - default: + default: fprintf(stderr,"Invalid flag in timer()\n"); return((long) NULL); } #else static time_t starttime; - + switch (flag) { case StartTimer: time(&starttime); @@ -233,7 +233,7 @@ polysegment_test(void) XDrawSegments(X.dpy,X.win,X.gc,segments,num_segments); XSync(X.dpy,0); totaltime = end_timer(); - + snprintf(buf,sizeof buf,"%d segments in %.3f seconds.",num_segments, (double)totaltime/1000000.); show_result(buf); @@ -249,7 +249,7 @@ polypoint_test(void) long totaltime; char buf[80]; int i; - + num_points *= X.percent; points = (XPoint *) malloc(sizeof(XPoint) * num_points); @@ -586,7 +586,7 @@ run_test(void) XClearWindow(X.dpy,X.win); print_if_recording("run\n"); - + switch (X.test) { case CopyArea: copyarea_test(); break; case CopyPlane: copyplane_test(); break; @@ -98,11 +98,11 @@ create_text_choice(Widget w, int type, int length, int width) /* label uses type to find out what its title is */ label = XtCreateManagedWidget(labels[type],labelWidgetClass,w, labelargs,XtNumber(labelargs)); - + /* text uses type to find out what its string is */ switch (type) { case TForeground: - snprintf(textstrings[type],sizeof textstrings[type], + snprintf(textstrings[type],sizeof textstrings[type], "%d",(int) X.gcv.foreground); snprintf(oldtextstrings[type],sizeof oldtextstrings[type], "%d",(int) X.gcv.foreground); @@ -153,7 +153,7 @@ WriteText(Widget w, XEvent *event, String *params, Cardinal *num_params) } if (strcmp(textstrings[type],oldtextstrings[type])) { strcpy(oldtextstrings[type],textstrings[type]); - snprintf(mbuf,sizeof mbuf,"%s%s\n", + snprintf(mbuf,sizeof mbuf,"%s%s\n", names[type], /* the right first half */ textstrings[type]); /* the right second half */ interpret(mbuf); /* send it off */ @@ -36,7 +36,7 @@ typedef struct { char name[40]; /* name as it will appear on the screen */ char text[40]; /* Xgc command it translates to */ } command_data[MAXCHOICES]; -} ChoiceStuff; /* All the info needed to deal with a +} ChoiceStuff; /* All the info needed to deal with a choice widget */ typedef struct { const char *name; |