From d04892d7d0c6bb29457fe19822c4aad251135ee0 Mon Sep 17 00:00:00 2001 From: Ole Streicher Date: Sat, 13 Jul 2024 10:16:29 +0200 Subject: [PATCH 01/21] First protoizing of obm --- obm/Obm.c | 127 +++------- obm/Obm.h | 30 ++- obm/ObmP.h | 39 ++- obm/client.c | 61 ++--- obm/geom.c | 6 +- obm/gterm.c | 688 ++++++++++++++++----------------------------------- obm/html.c | 219 ++++++---------- obm/marker.c | 243 +++++++----------- obm/obmres.c | 4 +- obm/param.c | 76 ++---- obm/server.c | 407 +++++++++++------------------- obm/widget.c | 626 +++++++++++++--------------------------------- obm/widget.h | 14 +- 13 files changed, 827 insertions(+), 1713 deletions(-) diff --git a/obm/Obm.c b/obm/Obm.c index a65952d..2de58a1 100644 --- a/obm/Obm.c +++ b/obm/Obm.c @@ -104,16 +104,13 @@ static void obm_call_activate_callbacks(); */ #if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION < 6) int -Tcl_GetErrorLine(tcl) -Tcl_Interp *tcl; +Tcl_GetErrorLine(Tcl_Interp *tcl) { return tcl->errorLine; } void -Tcl_SetErrorLine(tcl, lineNum) -Tcl_Interp *tcl; -int lineNum; +Tcl_SetErrorLine(Tcl_Interp *tcl, int lineNum) { tcl->errorLine = lineNum; } @@ -123,10 +120,7 @@ int lineNum; /* ObmOpen -- Open the object manager. */ ObmContext -ObmOpen (app_context, argc, argv) -XtAppContext app_context; -int argc; -char *argv[]; +ObmOpen (XtAppContext app_context, int argc, char *argv[]) { register ObmContext obm; register ObjClassRec classrec; @@ -167,8 +161,7 @@ char *argv[]; /* ObmClose -- Close the object manager. */ void -ObmClose (obm) -ObmContext obm; +ObmClose (ObmContext obm) { register ObjClassRec classrec; register int i; @@ -198,8 +191,7 @@ ObmContext obm; * user interface. */ void -ObmInitialize (obm) -register ObmContext obm; +ObmInitialize (ObmContext obm) { register ObmObject obj, nextobj; register ObmCallback cb; @@ -287,8 +279,7 @@ register ObmContext obm; * such a state as to be ready for client i/o. */ void -ObmActivate (obm) -register ObmContext obm; +ObmActivate (ObmContext obm) { register ObmObject obj; char defaultUI[SZ_MESSAGE]; @@ -341,13 +332,10 @@ register ObmContext obm; * was deactivated. */ void -ObmDeactivate (obm, unmap) -register ObmContext obm; -Boolean unmap; +ObmDeactivate (ObmContext obm, Boolean unmap) { register ObmObject obj; register ObmCallback cb; - ObmFunc deactivate; /* The Obm "activated" flag is not affected by deactivation. * Deactivation merely means that control has temporarily been @@ -374,9 +362,7 @@ Boolean unmap; * lists and call any activate/deactivate callbacks. */ static void -obm_call_activate_callbacks (obm, state) -register ObmContext obm; -int state; +obm_call_activate_callbacks (ObmContext obm, int state) { register ObmCallback cb; register int type; @@ -414,8 +400,7 @@ int state; * and mapped. */ int -ObmActivated (obm) -register ObmContext obm; +ObmActivated (ObmContext obm) { return (obm->activated && obm->mapped); } @@ -424,10 +409,7 @@ register ObmContext obm; /* ObmStatus -- Get the Object Manager status. */ int -ObmStatus (obm, app_name, app_class) -register ObmContext obm; -char *app_name; -char *app_class; +ObmStatus (ObmContext obm, char *app_name, char *app_class) { if (obm->specified) { if (app_name) @@ -448,8 +430,7 @@ char *app_class; * by the GUI code. */ XtPointer -ObmGetInterp (obm) -register ObmContext obm; +ObmGetInterp (ObmContext obm) { return ((XtPointer)obm->tcl); } @@ -458,12 +439,9 @@ register ObmContext obm; /* ObmDeliverMsg -- Deliver a message to a UI object. */ int -ObmDeliverMsg (obm, object, message) -register ObmContext obm; -char *object; -char *message; +ObmDeliverMsg (ObmContext obm, char *object, char *message) { - register ObmFunc evaluate; + register ObmEvaluateFunc evaluate; register ObmObject obj; int status = TCL_ERROR; @@ -506,10 +484,7 @@ char *message; * message from the named text file. */ int -ObmDeliverMsgFromFile (obm, object, fname) -register ObmContext obm; -char *object; -char *fname; +ObmDeliverMsgFromFile (ObmContext obm, char *object, char *fname) { struct stat fs; char *message = NULL; @@ -546,11 +521,7 @@ char *fname; * callback list. */ void -ObmAddCallback (obm, callback_type, fcn, client_data) -register ObmContext obm; -int callback_type; -ObmFunc fcn; -XtPointer client_data; +ObmAddCallback (ObmContext obm, int callback_type, ObmFunc fcn, XtPointer client_data) { register ObmCallback cb; @@ -567,9 +538,7 @@ XtPointer client_data; /* ObmRemoveCallback -- Remove a callback from the OBM global callback list. */ void -ObmRemoveCallback (obm, callback) -register ObmContext obm; -ObmCallback callback; +ObmRemoveCallback (ObmContext obm, ObmCallback callback) { obmRemoveCallback (&obm->callback_list, callback); } @@ -586,9 +555,7 @@ ObmCallback callback; * may be given to specify which object to use. */ ObmObject -obmFindObject (obm, object) -ObmContext obm; -char *object; +obmFindObject (ObmContext obm, char *object) { register int hashval, n; register char *ip, *op; @@ -643,12 +610,12 @@ char *object; * is returned. */ int -obm_nameToObjectList (obm, object, pobjs, nobjs, objs) -ObmContext obm; -char *object; /* object name */ -ObmObject *pobjs; /* list of parent objects */ -int *nobjs; /* number of objects found (output) */ -ObmObject *objs; /* list of objects (output) */ +obm_nameToObjectList ( + ObmContext obm, + char *object, /* object name */ + ObmObject *pobjs, /* list of parent objects */ + int *nobjs, /* number of objects found (output) */ + ObmObject *objs) /* list of objects (output) */ { register char *ip; register int hashval, n; @@ -691,13 +658,13 @@ ObmObject *objs; /* list of objects (output) */ /* obmNewObject -- Create a new object of the given type. */ void -obmNewObject (obm, name, class, parent, args, nargs) -register ObmContext obm; -char *name; /* name of new object */ -char *class; /* name of class to which object belongs */ -char *parent; /* name of parent widget, for widget objects */ -ArgList args; /* optional argument list */ -int nargs; /* optional argument list */ +obmNewObject ( + ObmContext obm, + char *name, /* name of new object */ + char *class, /* name of class to which object belongs */ + char *parent, /* name of parent widget, for widget objects */ + ArgList args, /* optional argument list */ + int nargs) /* optional argument list */ { register char *ip; register int hashval, n; @@ -778,9 +745,7 @@ int nargs; /* optional argument list */ /* obmDestroyObject -- Destroy an object and all its descendents. */ void -obmDestroyObject (obm, object) -ObmContext obm; -ObmObject object; +obmDestroyObject (ObmContext obm, ObmObject object) { register ObmObjectCore cp = &object->core; register ObmObject obj; @@ -881,9 +846,7 @@ ObmObject object; * shells. */ void -obmDisplay (obm, obj) -ObmContext obm; -ObmObject obj; +obmDisplay (ObmContext obm, ObmObject obj) { register Widget w = widgetGetPointer (obj); register ObmObject child; @@ -910,9 +873,7 @@ ObmObject obj; * shells. */ void -obmUndisplay (obm, obj) -ObmContext obm; -ObmObject obj; +obmUndisplay (ObmContext obm, ObmObject obj) { register int i; register ObmObject child; @@ -947,8 +908,7 @@ ObmObject obj; /* obmGetClassrec -- Get the class record for the named class. */ ObjClassRec -obmGetClassrec (classname) -char *classname; +obmGetClassrec (char *classname) { register ObjClassRec classrec; register int i; @@ -966,9 +926,7 @@ char *classname; /* obmGenericClassDestroy - Free any resources associated with a class record. */ void -obmGenericClassDestroy (obm, classrec) -ObmContext obm; -register ObjClassRec classrec; +obmGenericClassDestroy (ObmContext obm, ObjClassRec classrec) { } @@ -976,9 +934,7 @@ register ObjClassRec classrec; /* obmClass -- Test if a class record belongs to the given object class. */ int -obmClass (classrec, flag1, flag2) -register ObjClassRec classrec; -unsigned long flag1, flag2; +obmClass (ObjClassRec classrec, unsigned long flag1, unsigned long flag2) { return ((classrec->flag1 & flag1) || (classrec->flag2 & flag2)); } @@ -987,8 +943,7 @@ unsigned long flag1, flag2; /* obmAddCallback -- Add a callback descriptor to a callback list. */ ObmCallback -obmAddCallback (callback_list) -ObmCallback *callback_list; +obmAddCallback (ObmCallback *callback_list) { register ObmCallback cb, last_cb; @@ -1011,9 +966,7 @@ ObmCallback *callback_list; /* obmRemoveCallback -- Remove a callback descriptor from a callback list. */ void -obmRemoveCallback (callback_list, callback) -ObmCallback *callback_list; -ObmCallback callback; +obmRemoveCallback (ObmCallback *callback_list, ObmCallback callback) { register ObmCallback cb, last_cb; @@ -1041,9 +994,7 @@ ObmCallback callback; * the given Tcl interepter. */ int -obmClientCommand (tcl, commmand) -Tcl_Interp *tcl; -char *commmand; +obmClientCommand (Tcl_Interp *tcl, char *commmand) { register char *ip, *op; char name[SZ_NAME]; diff --git a/obm/Obm.h b/obm/Obm.h index a5cdacf..395438c 100644 --- a/obm/Obm.h +++ b/obm/Obm.h @@ -11,19 +11,23 @@ typedef struct { int dummy; } *ObmContext; #endif -ObmContext ObmOpen (/* app_context, argc, argv */); -void ObmClose (/* obm */); -void ObmInitialize (/* obm */); -void ObmActivate (/* obm */); -void ObmDeactivate (/* obm, unmap */); -int ObmActivated (/* obm */); -int ObmStatus (/* obm, app_name, app_class */); -XtPointer ObmGetInterp (/* obm, object */); -int ObmDeliverMsg (/* obm, object, message */); -int ObmDeliverMsgFromFile (/* obm, object, filename */); -void ObmAddCallback (/* obm, fcn, callback_type, client_data */); -void ObmRemoveCallback (/* obm, callback_id */); -void obmNewObject(); +typedef int (*ObmFunc)(); +typedef struct _obmCallback *ObmCallback; + +ObmContext ObmOpen (XtAppContext app_context, int argc, char *argv[]); +void ObmClose (ObmContext); +void ObmInitialize (ObmContext); +void ObmActivate (ObmContext); +void ObmDeactivate (ObmContext, Boolean); +int ObmActivated (ObmContext); +int ObmStatus (ObmContext, char *, char *); +XtPointer ObmGetInterp (ObmContext); +int ObmDeliverMsg (ObmContext, char *, char *); +int ObmDeliverMsgFromFile (ObmContext, char *, char *); +void ObmAddCallback (ObmContext, int, ObmFunc, XtPointer); +void ObmRemoveCallback (ObmContext, ObmCallback); +void obmNewObject(ObmContext, char *, char *, char *, ArgList, int); + /* Callback type flags. */ #define OBMCB_preserve 0000001 /* preserve over ObmInit */ diff --git a/obm/ObmP.h b/obm/ObmP.h index 69beab2..ff5da11 100644 --- a/obm/ObmP.h +++ b/obm/ObmP.h @@ -74,8 +74,14 @@ #include #include -int Tcl_GetErrorLine(); -void Tcl_SetErrorLine(); +/* Backward compatibility patch for errorLine access. These functions were + * introduced only in Tcl 8.6, and direct access to errorLine is deprecated + * since then. + */ +#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION < 6) +int Tcl_GetErrorLine(Tcl_Interp *); +void Tcl_SetErrorLine(Tcl_Interp *, int); +#endif /* Size limiting definitions. */ #define SZ_NAME 128 /* class or object name */ @@ -118,16 +124,24 @@ void Tcl_SetErrorLine(); #define OtNClasses 6 typedef struct obmObject *ObmObject; +typedef struct obmContext *ObmContext; +typedef struct objClassRec *ObjClassRec; typedef int (*ObmFunc)(); -typedef ObmObject (*ObmCreateFunc)(); -typedef void (*ObmMethod)(); - -extern void ServerClassInit(), ClientClassInit(), ParameterClassInit(); -extern void WidgetClassInit(), GenericClassDestroy(); -extern void GtermClassInit(), MarkerClassInit(); +typedef int (*ObmEvaluateFunc)(ObmObject, char *); +typedef ObmObject (*ObmCreateFunc)(ObmContext, char *, ObjClassRec, char *, ArgList, int); +typedef void (*ObmMethod)(ObmContext, ObjClassRec); +typedef void (*ObmDestroyFunc)(ObmObject); + +extern void ServerClassInit(ObmContext, ObjClassRec); +extern void ClientClassInit(ObmContext, ObjClassRec); +extern void ParameterClassInit(ObmContext, ObjClassRec); +extern void WidgetClassInit(ObmContext, ObjClassRec); +extern void GenericClassDestroy(ObmContext, ObjClassRec); +extern void GtermClassInit(ObmContext, ObjClassRec); +extern void MarkerClassInit(ObmContext, ObjClassRec); #ifndef OSI_COMPLIANT -extern void HTMLClassInit(); +extern void HTMLClassInit(ObmContext, ObjClassRec); #endif /* Dummy WtClass bit flag definitions for initializers. */ @@ -198,7 +212,7 @@ typedef struct { } baseClassRec, *BaseClassRec; /* UI object class descriptor. */ -typedef struct { +typedef struct objClassRec { char name[SZ_NAME]; /* object class name */ int object_type; /* widget type (shell etc.) */ WidgetClass *widget_class; /* for Xt/Athena widgets */ @@ -206,11 +220,12 @@ typedef struct { ObmMethod ClassInit; /* initializes class record */ ObmMethod ClassDestroy; /* close class record */ ObmCreateFunc Create; /* create proc */ - ObmMethod Destroy; /* destroy proc */ - ObmFunc Evaluate; /* evaluate proc */ + ObmDestroyFunc Destroy; /* destroy proc */ + ObmEvaluateFunc Evaluate; /* evaluate proc */ XtPointer class_data; /* class specific data */ } objClassRec, *ObjClassRec; + /* Class descriptors for all UI object classes and subclasses. In the * following only the class initializer function needs to be set statically, * since the class initializer function will initialize the remaining fields diff --git a/obm/client.c b/obm/client.c index 7263c9a..7e68f81 100644 --- a/obm/client.c +++ b/obm/client.c @@ -50,19 +50,19 @@ struct clientObject { typedef struct clientObject *ClientObject; -static void ClientDestroy(); -static int ClientEvaluate(); -static ObmObject ClientCreate(); -static int clientGcmd(), clientGkey(), clientLiteral(); -static int client_output(); +static void ClientDestroy(ObmObject); +static int ClientEvaluate(ObmObject, char *); +static ObmObject ClientCreate(ObmContext, char *, ObjClassRec, char *, ArgList, int); +static int clientGcmd(ObmObject, Tcl_Interp *, int, char **); +static int clientGkey(ObmObject, Tcl_Interp *, int, char **); +static int clientLiteral(ObmObject, Tcl_Interp *, int, char **); +static int client_output(ObmContext, char *, int, char *); /* ClientClassInit -- Initialize the class record for the client class. */ void -ClientClassInit (obm, classrec) -ObmContext obm; -register ObjClassRec classrec; +ClientClassInit (ObmContext obm, register ObjClassRec classrec) { classrec->ClassDestroy = obmGenericClassDestroy; classrec->Create = ClientCreate; @@ -74,13 +74,13 @@ register ObjClassRec classrec; /* ClientCreate -- Create an instance of a client object. */ static ObmObject -ClientCreate (obm, name, classrec, parent, args, nargs) -ObmContext obm; -char *name; -ObjClassRec classrec; -char *parent; -ArgList args; -int nargs; +ClientCreate ( + ObmContext obm, + char *name, + ObjClassRec classrec, + char *parent, + ArgList args, + int nargs) { register ClientObject obj; register Tcl_Interp *tcl; @@ -104,8 +104,7 @@ int nargs; /* ClientDestroy -- Destroy an instance of a client object. */ static void -ClientDestroy (object) -ObmObject object; +ClientDestroy (ObmObject object) { register ClientObject obj = (ClientObject) object; @@ -117,9 +116,7 @@ ObmObject object; /* ClientEvaluate -- Evaluate a client command or message. */ static int -ClientEvaluate (object, command) -ObmObject object; -char *command; +ClientEvaluate (ObmObject object, char *command) { register ClientObject obj = (ClientObject) object; register Tcl_Interp *tcl = obj->client.tcl; @@ -159,11 +156,7 @@ literal: if (Tcl_SplitList (tcl, command, &argc, &argvp) == TCL_OK) { * Usage: gcmd */ static int -clientGcmd (object, tcl, argc, argv) -ObmObject object; -Tcl_Interp *tcl; -int argc; -char **argv; +clientGcmd (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { register ClientObject obj = (ClientObject) object; register ObmContext obm = obj->client.obm; @@ -187,11 +180,7 @@ char **argv; * Usage: gkey */ static int -clientGkey (object, tcl, argc, argv) -ObmObject object; -Tcl_Interp *tcl; -int argc; -char **argv; +clientGkey (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { register ClientObject obj = (ClientObject) object; register ObmContext obm = obj->client.obm; @@ -211,11 +200,7 @@ char **argv; * Usage: literal */ static int -clientLiteral (object, tcl, argc, argv) -ObmObject object; -Tcl_Interp *tcl; -int argc; -char **argv; +clientLiteral (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { register ClientObject obj = (ClientObject) object; register ObmContext obm = obj->client.obm; @@ -235,11 +220,7 @@ char **argv; /* client_output -- Call the client output callbacks if any. */ static int -client_output (obm, objname, key, strval) -register ObmContext obm; -char *objname; -int key; -char *strval; +client_output (ObmContext obm, char *objname, int key, char *strval) { register ObmCallback cb; register int stat = 0; diff --git a/obm/geom.c b/obm/geom.c index 4b37bdd..3a1e2f5 100644 --- a/obm/geom.c +++ b/obm/geom.c @@ -23,11 +23,7 @@ static Display *dpy; * returned as the function value. */ char * -get_geometry (display, screen, window, origin) - Display *display; - Screen *screen; - Window window; - int origin; /* return only origin-relative coords */ +get_geometry (Display *display, Screen *screen, Window window, int origin) { register char *op; int screen_number = XScreenNumberOfScreen (screen); diff --git a/obm/gterm.c b/obm/gterm.c index b579a96..b891422 100644 --- a/obm/gterm.c +++ b/obm/gterm.c @@ -188,54 +188,104 @@ typedef struct { } gtermClassData, *GtermClassData; -void GtermDestroy(); -void GtermClassDestroy(); -ObmObject GtermCreate(); - -static int gtermActivate(), gtermActiveMapping(), gtermActiveRasters(); -static int gtermAddCallback(), gtermDeleteCallback(); -static int gtermAssignRaster(), gtermBell(), gtermGetBias(); -static int gtermClearScreen(), gtermClientPixel(), gtermCopyRaster(); -static int gtermCreateMarker(), gtermCreateRaster(), gtermDeactivate(); -static int gtermDestroyRaster(), gtermDisableMapping(), gtermDrawAlphaText(); -static int gtermDrawDialogText(), gtermDrawMarker(), gtermDrawPolygon(); -static int gtermDrawPolyline(), gtermDrawPolymarker(), gtermEnableMapping(); -static int gtermEndDialog(), gtermEraseDialog(), gtermExtractPixmap(); -static int gtermFlip(), gtermFlush(), gtermFreeColormap(); -static int gtermFreeMapping(), gtermRaiseMapping(), gtermLowerMapping(); -static int gtermGetAlphaTextSize(), gtermGetCursorPos(); -static int gtermGetDialogTextSize(), gtermGetLogRes(), gtermGetMapping(); -static int gtermGetPhysRes(), gtermGetPixel(), gtermGetRaster(); -static int gtermInitMappings(), gtermInsertPixmap(), gtermLoadColormap(); -static int gtermMarkerInit(), gtermNextColormap(), gtermNextMapping(); -static int gtermNextRaster(), gtermQueryRaster(), gtermRasterInit(); -static int gtermReadColormap(), gtermReadPixels(), gtermRefreshMapping(); -static int gtermRefreshPixels(), gtermReset(), gtermSelectRaster(); -static int gtermSetColorIndex(), gtermSetCursorPos(), gtermSetCursorType(); -static int gtermSetDataLevel(), gtermSetFillType(), gtermSetGterm(); -static int gtermSetLineStyle(), gtermSetLineWidth(), gtermSetLogRes(); -static int gtermSetMapping(), gtermSetPhysRes(), gtermSetPixel(); -static int gtermSetPixels(), gtermSetRaster(), gtermSetTextRes(); -static int gtermStartDialog(), gtermUnmapPixel(), gtermWriteColormap(); -static int gtermWritePixels(); - -static void gtermInputCallback(); -static void gtermResizeCallback(), gtermResetCallback(); -static void get_mapping(), put_mapping(); -static XPoint *get_points(); - -static int dataLevelType(); -static int lineStyle(); -static int fillType(); -static int colorToIndex(); -static void ndcToPixel(); +void GtermDestroy(ObmObject); +void GtermClassDestroy(ObmContext, ObjClassRec); +ObmObject GtermCreate(ObmContext, char *, ObjClassRec, char *, ArgList, int nargs); + +static int gtermActivate(MsgContext, Tcl_Interp *, int, char **); +static int gtermActiveMapping(MsgContext, Tcl_Interp *, int, char **); +static int gtermActiveRasters(MsgContext, Tcl_Interp *, int, char **); +static int gtermAddCallback(MsgContext, Tcl_Interp *, int, char **); +static int gtermDeleteCallback(MsgContext, Tcl_Interp *, int, char **); +static int gtermAssignRaster(MsgContext, Tcl_Interp *, int, char **); +static int gtermBell(MsgContext, Tcl_Interp *, int, char **); +static int gtermGetBias(MsgContext, Tcl_Interp *, int, char **); +static int gtermClearScreen(MsgContext, Tcl_Interp *, int, char **); +static int gtermClientPixel(MsgContext, Tcl_Interp *, int, char **); +static int gtermCopyRaster(MsgContext, Tcl_Interp *, int, char **); +static int gtermCreateMarker(MsgContext, Tcl_Interp *, int, char **); +static int gtermCreateRaster(MsgContext, Tcl_Interp *, int, char **); +static int gtermDeactivate(MsgContext, Tcl_Interp *, int, char **); +static int gtermDestroyRaster(MsgContext, Tcl_Interp *, int, char **); +static int gtermDisableMapping(MsgContext, Tcl_Interp *, int, char **); +static int gtermDrawAlphaText(MsgContext, Tcl_Interp *, int, char **); +static int gtermDrawDialogText(MsgContext, Tcl_Interp *, int, char **); +static int gtermDrawMarker(MsgContext, Tcl_Interp *, int, char **); +static int gtermDrawPolygon(MsgContext, Tcl_Interp *, int, char **); +static int gtermDrawPolyline(MsgContext, Tcl_Interp *, int, char **); +static int gtermDrawPolymarker(MsgContext, Tcl_Interp *, int, char **); +static int gtermEnableMapping(MsgContext, Tcl_Interp *, int, char **); +static int gtermEndDialog(MsgContext, Tcl_Interp *, int, char **); +static int gtermEraseDialog(MsgContext, Tcl_Interp *, int, char **); +static int gtermExtractPixmap(MsgContext, Tcl_Interp *, int, char **); +static int gtermFlip(MsgContext, Tcl_Interp *, int, char **); +static int gtermFlush(MsgContext, Tcl_Interp *, int, char **); +static int gtermFreeColormap(MsgContext, Tcl_Interp *, int, char **); +static int gtermFreeMapping(MsgContext, Tcl_Interp *, int, char **); +static int gtermRaiseMapping(MsgContext, Tcl_Interp *, int, char **); +static int gtermLowerMapping(MsgContext, Tcl_Interp *, int, char **); +static int gtermGetAlphaTextSize(MsgContext, Tcl_Interp *, int, char **); +static int gtermGetCursorPos(MsgContext, Tcl_Interp *, int, char **); +static int gtermGetDialogTextSize(MsgContext, Tcl_Interp *, int, char **); +static int gtermGetLogRes(MsgContext, Tcl_Interp *, int, char **); +static int gtermGetMapping(MsgContext, Tcl_Interp *, int, char **); +static int gtermGetPhysRes(MsgContext, Tcl_Interp *, int, char **); +static int gtermGetPixel(MsgContext, Tcl_Interp *, int, char **); +static int gtermGetRaster(MsgContext, Tcl_Interp *, int, char **); +static int gtermInitMappings(MsgContext, Tcl_Interp *, int, char **); +static int gtermInsertPixmap(MsgContext, Tcl_Interp *, int, char **); +static int gtermLoadColormap(MsgContext, Tcl_Interp *, int, char **); +static int gtermMarkerInit(MsgContext, Tcl_Interp *, int, char **); +static int gtermNextColormap(MsgContext, Tcl_Interp *, int, char **); +static int gtermNextMapping(MsgContext, Tcl_Interp *, int, char **); +static int gtermNextRaster(MsgContext, Tcl_Interp *, int, char **); +static int gtermQueryRaster(MsgContext, Tcl_Interp *, int, char **); +static int gtermRasterInit(MsgContext, Tcl_Interp *, int, char **); +static int gtermReadColormap(MsgContext, Tcl_Interp *, int, char **); +static int gtermReadPixels(MsgContext, Tcl_Interp *, int, char **); +static int gtermRefreshMapping(MsgContext, Tcl_Interp *, int, char **); +static int gtermRefreshPixels(MsgContext, Tcl_Interp *, int, char **); +static int gtermReset(MsgContext, Tcl_Interp *, int, char **); +static int gtermSelectRaster(MsgContext, Tcl_Interp *, int, char **); +static int gtermSetColorIndex(MsgContext, Tcl_Interp *, int, char **); +static int gtermSetCursorPos(MsgContext, Tcl_Interp *, int, char **); +static int gtermSetCursorType(MsgContext, Tcl_Interp *, int, char **); +static int gtermSetDataLevel(MsgContext, Tcl_Interp *, int, char **); +static int gtermSetFillType(MsgContext, Tcl_Interp *, int, char **); +static int gtermSetGterm(MsgContext, Tcl_Interp *, int, char **); +static int gtermSetLineStyle(MsgContext, Tcl_Interp *, int, char **); +static int gtermSetLineWidth(MsgContext, Tcl_Interp *, int, char **); +static int gtermSetLogRes(MsgContext, Tcl_Interp *, int, char **); +static int gtermSetMapping(MsgContext, Tcl_Interp *, int, char **); +static int gtermSetPhysRes(MsgContext, Tcl_Interp *, int, char **); +static int gtermSetPixel(MsgContext, Tcl_Interp *, int, char **); +static int gtermSetPixels(MsgContext, Tcl_Interp *, int, char **); +static int gtermSetRaster(MsgContext, Tcl_Interp *, int, char **); +static int gtermSetTextRes(MsgContext, Tcl_Interp *, int, char **); +static int gtermStartDialog(MsgContext, Tcl_Interp *, int, char **); +static int gtermUnmapPixel(MsgContext, Tcl_Interp *, int, char **); +static int gtermWriteColormap(MsgContext, Tcl_Interp *, int, char **); +static int gtermWritePixels(MsgContext, Tcl_Interp *, int, char **); + +static void gtermInputCallback(ObmCallback, Widget, XEvent *); +static void gtermResizeCallback(ObmCallback, Widget); +static void gtermResetCallback(ObmCallback cb, Widget); +static void get_mapping(char **, int *, int *, int *, int *, int *, int *, int *, int *, + int *, int *, int *, int *); +static void put_mapping(Tcl_Interp *, char **, int, int, int, int, int, int, int, + int, int, int, int, int); +static XPoint *get_points(char *, int *); + +static int dataLevelType(char *); +static int lineStyle(char *); +static int fillType(char *); +static int colorToIndex(char *); +static void ndcToPixel(Widget, int, int, int, float *, float *); /* GtermClassInit -- Initialize the class record for the gterm widget class. */ void -GtermClassInit (obm, classrec) -ObmContext obm; -register ObjClassRec classrec; +GtermClassInit (ObmContext obm, ObjClassRec classrec) { register GtermClassData gcd; register Tcl_Interp *tcl; @@ -243,7 +293,7 @@ register ObjClassRec classrec; /* Install the class methods. */ classrec->ClassDestroy = GtermClassDestroy; - classrec->Create = (ObmFunc) GtermCreate; + classrec->Create = GtermCreate; classrec->Destroy = GtermDestroy; classrec->Evaluate = WidgetEvaluate; @@ -414,9 +464,7 @@ register ObjClassRec classrec; /* GtermClassDestroy -- Custom destroy procedure for the widget class. */ void -GtermClassDestroy (obm, classrec) -ObmContext obm; -register ObjClassRec classrec; +GtermClassDestroy (ObmContext obm, register ObjClassRec classrec) { register GtermClassData gcd = (GtermClassData) classrec->class_data; @@ -432,13 +480,13 @@ register ObjClassRec classrec; /* GtermCreate -- Create an instance of a gterm object. */ ObmObject -GtermCreate (obm, name, classrec, parent, args, nargs) -ObmContext obm; -char *name; -ObjClassRec classrec; -char *parent; -ArgList args; -int nargs; +GtermCreate ( + ObmContext obm, + char *name, + ObjClassRec classrec, + char *parent, + ArgList args, + int nargs) { register GtermObject obj; Widget w, pw; @@ -465,8 +513,7 @@ int nargs; /* GtermDestroy -- Destroy an instance of a gterm object. */ void -GtermDestroy (object) -ObmObject object; +GtermDestroy (ObmObject object) { GtermObject obj = (GtermObject) object; ObjClassRec classrec = obj->core.classrec; @@ -528,11 +575,7 @@ ObmObject object; * to the client code so that it can talk directly to the gterm widget. */ static int -gtermSetGterm (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermSetGterm (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { register GtermClassData gcd = (GtermClassData) msg; GtermObject obj = (GtermObject) gcd->object[gcd->level]; @@ -560,11 +603,7 @@ char **argv; * Usage: activate */ static int -gtermActivate (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermActivate (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; register WidgetPrivate wp = &obj->widget; @@ -583,11 +622,7 @@ char **argv; * Usage: deactivate */ static int -gtermDeactivate (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermDeactivate (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; register WidgetPrivate wp = &obj->widget; @@ -605,11 +640,7 @@ char **argv; * Usage: reset */ static int -gtermReset (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermReset (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; register WidgetPrivate wp = &obj->widget; @@ -636,11 +667,7 @@ char **argv; * could cause the display to appear "jerky". */ static int -gtermFlush (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermFlush (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; register WidgetPrivate wp = &obj->widget; @@ -681,11 +708,7 @@ char **argv; * applications that use the default translations. */ static int -gtermAddCallback (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermAddCallback (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; register WidgetPrivate wp = &obj->widget; @@ -746,11 +769,7 @@ char **argv; * Usage: deleteCallback procedure */ static int -gtermDeleteCallback (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermDeleteCallback (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; register GtermPrivate gp = &obj->gterm; @@ -802,10 +821,7 @@ char **argv; * "control" and so on). */ static void -gtermInputCallback (cb, w, event) -ObmCallback cb; -Widget w; -XEvent *event; +gtermInputCallback (ObmCallback cb, Widget w, XEvent *event) { GtermObject obj = (GtermObject) cb->u.obj; register WidgetPrivate wp = &obj->widget; @@ -905,9 +921,7 @@ XEvent *event; * Callback: userproc widget-name width height */ static void -gtermResizeCallback (cb, w) -ObmCallback cb; -Widget w; +gtermResizeCallback (ObmCallback cb, Widget w) { GtermObject obj = (GtermObject) cb->u.obj; register WidgetPrivate wp = &obj->widget; @@ -941,9 +955,7 @@ Widget w; * Callback: userproc */ static void -gtermResetCallback (cb, w) -ObmCallback cb; -Widget w; +gtermResetCallback (ObmCallback cb, Widget w) { GtermObject obj = (GtermObject) cb->u.obj; register WidgetPrivate wp = &obj->widget; @@ -975,11 +987,7 @@ Widget w; * to be used. raster=0 yields screen coordinates. */ static int -gtermSetCursorPos (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermSetCursorPos (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; register WidgetPrivate wp = &obj->widget; @@ -1014,11 +1022,7 @@ char **argv; * Usage: getCursorPos x y */ static int -gtermGetCursorPos (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermGetCursorPos (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; register WidgetPrivate wp = &obj->widget; @@ -1054,11 +1058,7 @@ char **argv; * waiting for graphics input */ static int -gtermSetCursorType (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermSetCursorType (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; register WidgetPrivate wp = &obj->widget; @@ -1091,11 +1091,7 @@ char **argv; * Usage: bell */ static int -gtermBell (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermBell (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; register WidgetPrivate wp = &obj->widget; @@ -1113,11 +1109,7 @@ char **argv; * Usage: setRaster raster-number */ static int -gtermSetRaster (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermSetRaster (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; register WidgetPrivate wp = &obj->widget; @@ -1144,11 +1136,7 @@ char **argv; * directly in that variable. */ static int -gtermGetRaster (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermGetRaster (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; register WidgetPrivate wp = &obj->widget; @@ -1179,11 +1167,7 @@ char **argv; * of the physical resolution of the drawing surface. */ static int -gtermSetLogRes (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermSetLogRes (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; register WidgetPrivate wp = &obj->widget; @@ -1208,11 +1192,7 @@ char **argv; * Usage: getLogRes width height */ static int -gtermGetLogRes (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermGetLogRes (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; register WidgetPrivate wp = &obj->widget; @@ -1248,11 +1228,7 @@ char **argv; * raster. The default raster is the current drawing raster. */ static int -gtermSetPhysRes (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermSetPhysRes (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; register WidgetPrivate wp = &obj->widget; @@ -1281,11 +1257,7 @@ char **argv; * raster are returned. */ static int -gtermGetPhysRes (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermGetPhysRes (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; register WidgetPrivate wp = &obj->widget; @@ -1325,11 +1297,7 @@ char **argv; * number to select the best font. */ static int -gtermSetTextRes (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermSetTextRes (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; register WidgetPrivate wp = &obj->widget; @@ -1358,11 +1326,7 @@ char **argv; * reset. */ static int -gtermSetDataLevel (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermSetDataLevel (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; register WidgetPrivate wp = &obj->widget; @@ -1390,11 +1354,7 @@ char **argv; * reset. */ static int -gtermSetLineWidth (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermSetLineWidth (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; register WidgetPrivate wp = &obj->widget; @@ -1422,11 +1382,7 @@ char **argv; * clearScreen or reset. */ static int -gtermSetLineStyle (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermSetLineStyle (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; register WidgetPrivate wp = &obj->widget; @@ -1466,11 +1422,7 @@ char **argv; * reset. */ static int -gtermSetColorIndex (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermSetColorIndex (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; register WidgetPrivate wp = &obj->widget; @@ -1496,11 +1448,7 @@ char **argv; * in effect until the next clearScreen or reset. */ static int -gtermSetFillType (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermSetFillType (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; register WidgetPrivate wp = &obj->widget; @@ -1525,11 +1473,7 @@ char **argv; * Usage: clearScreen */ static int -gtermClearScreen (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermClearScreen (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; register WidgetPrivate wp = &obj->widget; @@ -1552,11 +1496,7 @@ char **argv; * if any, and so on will affect the drawing operation. */ static int -gtermDrawPolyline (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermDrawPolyline (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -1588,11 +1528,7 @@ char **argv; * if any, and so on will affect the drawing operation. */ static int -gtermDrawPolymarker (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermDrawPolymarker (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -1624,11 +1560,7 @@ char **argv; * if any, and so on will affect the drawing operation. */ static int -gtermDrawPolygon (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermDrawPolygon (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -1657,11 +1589,7 @@ char **argv; * The marker type is one of "box", "circle", "ellipse", and so on. */ static int -gtermDrawMarker (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermDrawMarker (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -1688,11 +1616,7 @@ char **argv; * is "E", the coordinates x,y refer to the lower left corner of the E. */ static int -gtermDrawAlphaText (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermDrawAlphaText (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -1725,11 +1649,7 @@ char **argv; * top of the string to the baseline of the characters forming the string. */ static int -gtermGetAlphaTextSize (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermGetAlphaTextSize (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -1786,11 +1706,7 @@ char **argv; * text mode, prior to drawing dialog text with drawDialogText. */ static int -gtermStartDialog (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermStartDialog (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -1811,11 +1727,7 @@ char **argv; * the dialog text area and terminating dialog text mode. */ static int -gtermEndDialog (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermEndDialog (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -1836,11 +1748,7 @@ char **argv; * exiting dialog text mode. */ static int -gtermEraseDialog (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermEraseDialog (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -1868,11 +1776,7 @@ char **argv; * of the E. */ static int -gtermDrawDialogText (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermDrawDialogText (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -1906,11 +1810,7 @@ char **argv; * top of the string to the baseline of the characters forming the string. */ static int -gtermGetDialogTextSize (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermGetDialogTextSize (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -1959,11 +1859,7 @@ char **argv; * Usage: rasterInit */ static int -gtermRasterInit (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermRasterInit (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; register WidgetPrivate wp = &obj->widget; @@ -1992,11 +1888,7 @@ char **argv; * and displayed in multiple destination windows. */ static int -gtermAssignRaster (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermAssignRaster (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject gt_obj = (GtermObject) msg->object[msg->level]; register WidgetPrivate wp = >_obj->widget; @@ -2076,11 +1968,7 @@ char **argv; * set by the gterm widget resource maxRasters at widget creation. */ static int -gtermCreateRaster (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermCreateRaster (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -2119,11 +2007,7 @@ char **argv; * number zero (the widget's window) are ignored. */ static int -gtermDestroyRaster (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermDestroyRaster (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -2151,11 +2035,7 @@ char **argv; * raster does not exist the output variables may be undefined after the call. */ static int -gtermQueryRaster (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermQueryRaster (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -2208,11 +2088,7 @@ char **argv; * */ static int -gtermNextRaster (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermNextRaster (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -2238,11 +2114,7 @@ char **argv; * */ static int -gtermActiveRasters (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermActiveRasters (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -2272,11 +2144,7 @@ char **argv; * be set. */ static int -gtermSetPixel (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermSetPixel (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -2311,11 +2179,7 @@ char **argv; * be read. */ static int -gtermGetPixel (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermGetPixel (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -2401,11 +2265,7 @@ char **argv; * applications, e.g., where the image is computed or modified by the GUI. */ static int -gtermWritePixels (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermWritePixels (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -2585,11 +2445,7 @@ err: XtFree ((char *)data); * of a single pixel. */ static int -gtermReadPixels (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermReadPixels (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -2826,11 +2682,7 @@ char **argv; * are zero indexed. */ static int -gtermRefreshPixels (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermRefreshPixels (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -2874,11 +2726,7 @@ char **argv; * form this word. Most applications do not need to specify a rasterop. */ static int -gtermSetPixels (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermSetPixels (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -2932,11 +2780,7 @@ char **argv; * extracted region. If no region is given the entire raster is assumed. */ static int -gtermExtractPixmap (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermExtractPixmap (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -2946,7 +2790,8 @@ char **argv; int raster, ctype; Pixmap pixmap; char *s_pixmap; - int createPixmap(); + int createPixmap(ObmContext, char *, int, int, int, Pixmap, char *, + unsigned long, unsigned long); if (argc < 3) return (TCL_ERROR); @@ -2985,11 +2830,7 @@ char **argv; * location. If no region is given the entire raster is assumed. */ static int -gtermInsertPixmap (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermInsertPixmap (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -3038,11 +2879,7 @@ char **argv; * number of colormaps. */ static int -gtermNextColormap (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermNextColormap (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -3065,11 +2902,7 @@ char **argv; * the given colormap is not defined. */ static int -gtermFreeColormap (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermFreeColormap (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -3106,11 +2939,7 @@ char **argv; * the same way for both types of colormaps. */ static int -gtermWriteColormap (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermWriteColormap (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; ObmContext obm = obj->widget.obm; @@ -3173,11 +3002,7 @@ char **argv; * For example, { {R G B} {R G B} ...}. */ static int -gtermReadColormap (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermReadColormap (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; ObmContext obm = obj->widget.obm; @@ -3233,11 +3058,7 @@ char **argv; * has offset=0.5, scale=1.0. Colormap zero is the hardware colormap. */ static int -gtermLoadColormap (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermLoadColormap (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; ObmContext obm = obj->widget.obm; @@ -3276,11 +3097,7 @@ char **argv; * color. */ static int -gtermClientPixel (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermClientPixel (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -3318,11 +3135,7 @@ char **argv; * i.e. nelem=0 if no dynamic colors have been allocated. */ static int -gtermGetBias (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermGetBias (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -3355,11 +3168,7 @@ char **argv; * Usage: initMappings */ static int -gtermInitMappings (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermInitMappings (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; register WidgetPrivate wp = &obj->widget; @@ -3378,11 +3187,7 @@ char **argv; * Returns the mapping number as the function value. */ static int -gtermNextMapping (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermNextMapping (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -3407,11 +3212,7 @@ char **argv; * are freed. */ static int -gtermFreeMapping (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermFreeMapping (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -3441,11 +3242,7 @@ char **argv; * of the mapping stacking order, making it be drawn below all other mappings. */ static int -gtermLowerMapping (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermLowerMapping (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -3475,11 +3272,7 @@ char **argv; * of the mapping stacking order, making it be drawn above all other mappings. */ static int -gtermRaiseMapping (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermRaiseMapping (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -3506,11 +3299,7 @@ char **argv; * if the mapping is already enabled. */ static int -gtermEnableMapping (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermEnableMapping (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -3539,11 +3328,7 @@ char **argv; * if the mapping is not enabled. */ static int -gtermDisableMapping (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermDisableMapping (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -3571,11 +3356,7 @@ char **argv; * Returns True if the mapping is defined and enabled, False otherwise. */ static int -gtermActiveMapping (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermActiveMapping (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -3603,11 +3384,7 @@ char **argv; * rect is repainted. */ static int -gtermRefreshMapping (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermRefreshMapping (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -3646,11 +3423,7 @@ char **argv; * refreshed properly in response to window system expose events). */ static int -gtermCopyRaster (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermCopyRaster (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -3736,11 +3509,7 @@ char **argv; * infinite loops can result. */ static int -gtermSetMapping (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermSetMapping (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -3777,11 +3546,7 @@ char **argv; * not defined, but the mapping need not be enabled. */ static int -gtermGetMapping (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermGetMapping (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -3836,11 +3601,7 @@ char **argv; * this coordinate to a raster pixel number. */ static int -gtermSelectRaster (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermSelectRaster (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; register WidgetPrivate wp = &obj->widget; @@ -3914,11 +3675,7 @@ char **argv; * return the raster number and coordinates for raster A. */ static int -gtermUnmapPixel (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermUnmapPixel (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; register WidgetPrivate wp = &obj->widget; @@ -3979,11 +3736,7 @@ char **argv; * the flip portion of a mapping. */ static int -gtermFlip (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermFlip (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -4028,11 +3781,7 @@ char **argv; * Usage: markerInit */ static int -gtermMarkerInit (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermMarkerInit (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; register WidgetPrivate wp = &obj->widget; @@ -4089,11 +3838,7 @@ char **argv; * by sending setAttribute messages to the marker. */ static int -gtermCreateMarker (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +gtermCreateMarker (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; register WidgetPrivate wp = &obj->widget; @@ -4148,8 +3893,7 @@ char **argv; * integer code. */ int -coordType (name) -char *name; +coordType (char *name) { if (strcmp (name, "pixel") == 0 || strcmp (name, "Pixel") == 0 || @@ -4171,8 +3915,7 @@ char *name; /* dataLevelType -- Convert a data level type string to an integer code. */ static int -dataLevelType (name) -char *name; +dataLevelType (char *name) { if (strcmp (name, "set") == 0) return (GtSet); @@ -4188,8 +3931,7 @@ char *name; /* lineStyle -- Convert a line style string to an integer code. */ static int -lineStyle (name) -char *name; +lineStyle (char *name) { if (strcmp (name, "solid") == 0) return (GtSolid); @@ -4209,8 +3951,7 @@ char *name; /* fillType -- Convert a fill type string to an integer code. */ static int -fillType (name) -char *name; +fillType (char *name) { if (strcmp (name, "solid") == 0) return (GtSolid); @@ -4225,8 +3966,7 @@ char *name; * index. */ static int -colorToIndex (name) -char *name; +colorToIndex (char *name) { if (isdigit (*name)) return (atoi (name)); @@ -4262,11 +4002,7 @@ char *name; /* ncdToPixel -- Convert NDC (integer) to raster pixel (floating) coordinates. */ static void -ndcToPixel (w, raster, nx, ny, rx, ry) -Widget w; -int raster; -int nx, ny; -float *rx, *ry; +ndcToPixel (Widget w, int raster, int nx, int ny, float *rx, float *ry) { int rtype, width, height, depth; int x2, y2; @@ -4280,9 +4016,7 @@ float *rx, *ry; } static XPoint * -get_points (points, npoints) -char *points; -int *npoints; +get_points (char *points, int *npoints) { register int i; register char *ip; @@ -4326,12 +4060,20 @@ int *npoints; /* get_mapping -- Read a mapping from an argument list into local variables. */ static void -get_mapping (argv, src, st, sx,sy,snx,sny, dst, dt, dx,dy,dnx,dny) -register char **argv; /* mapping values */ -int *src, *st; -int *sx, *sy, *snx, *sny; -int *dst, *dt; -int *dx, *dy, *dnx, *dny; +get_mapping ( + char **argv, /* mapping values */ + int *src, + int *st, + int *sx, + int *sy, + int *snx, + int *sny, + int *dst, + int *dt, + int *dx, + int *dy, + int *dnx, + int *dny) { register int ndc; register double v; @@ -4374,13 +4116,21 @@ int *dx, *dy, *dnx, *dny; * variables. */ static void -put_mapping (tcl, argv, src, st, sx,sy,snx,sny, dst, dt, dx,dy,dnx,dny) -register Tcl_Interp *tcl; -register char **argv; /* mapping variables */ -int src, st; -int sx, sy, snx, sny; -int dst, dt; -int dx, dy, dnx, dny; +put_mapping ( + Tcl_Interp *tcl, + char **argv, /* mapping variables */ + int src, + int st, + int sx, + int sy, + int snx, + int sny, + int dst, + int dt, + int dx, + int dy, + int dnx, + int dny) { register int ndc; char buf[SZ_NUMBER]; diff --git a/obm/html.c b/obm/html.c index 4d3d250..bd4a4a5 100644 --- a/obm/html.c +++ b/obm/html.c @@ -1,6 +1,7 @@ /* Copyright(c) 1993 Association of Universities for Research in Astronomy Inc. */ +#include #include "ObmP.h" #include "widget.h" @@ -88,33 +89,43 @@ typedef struct { } htmlClassData, *HTMLClassData; -void HTMLDestroy(); -void HTMLClassDestroy(); -ObmObject HTMLCreate(); - -static int htmlSetText(), htmlGetText(), htmlGetHRefs(); -static int htmlGetImageSrcs(), htmlGetLinks(); -static int htmlRetestAnchors(), htmlPositionToId(), htmlIdToPosition(); -static int htmlAnchorToPosition(), htmlAnchorToId(); -static int htmlGotoId(), htmlAddCallback(), htmlDeleteCallback(); -static int htmlSetSelection(), htmlGetSelection(), htmlClearSelection(); -static int htmlSearchText(); - -static void anchorCallback(), pointerMotionCallback(); -static void submitFormCallback(), linkCallback(); -static char *cb_encode(), *makeList(); -static int testAnchorCallback(); -static void cb_error(); -static int cb_decode(); -extern long strtol(); +void HTMLDestroy(ObmObject); +void HTMLClassDestroy(ObmContext, ObjClassRec); +ObmObject HTMLCreate(ObmContext, char *, ObjClassRec, char *, ArgList, int); + +static int htmlSetText(MsgContext, Tcl_Interp *, int, char **); +static int htmlGetText(MsgContext, Tcl_Interp *, int, char **); +static int htmlGetHRefs(MsgContext, Tcl_Interp *, int, char **); +static int htmlGetImageSrcs(MsgContext, Tcl_Interp *, int, char **); +static int htmlGetLinks(MsgContext, Tcl_Interp *, int, char **); +static int htmlRetestAnchors(MsgContext, Tcl_Interp *, int, char **); +static int htmlPositionToId(MsgContext, Tcl_Interp *, int, char **); +static int htmlIdToPosition(MsgContext, Tcl_Interp *, int, char **); +static int htmlAnchorToPosition(MsgContext, Tcl_Interp *, int, char **); +static int htmlAnchorToId(MsgContext, Tcl_Interp *, int, char **); +static int htmlGotoId(MsgContext, Tcl_Interp *, int, char **); +static int htmlAddCallback(MsgContext, Tcl_Interp *, int, char **); +static int htmlDeleteCallback(MsgContext, Tcl_Interp *, int, char **); +static int htmlSetSelection(MsgContext, Tcl_Interp *, int, char **); +static int htmlGetSelection(MsgContext, Tcl_Interp *, int, char **); +static int htmlClearSelection(MsgContext, Tcl_Interp *, int, char **); +static int htmlSearchText(MsgContext, Tcl_Interp *, int, char **); + +static void anchorCallback(Widget, XtPointer, XtPointer); +static void pointerMotionCallback(Widget, XtPointer, char *); +static void submitFormCallback(Widget, XtPointer, XtPointer); +static void linkCallback(Widget, XtPointer, XtPointer); +static char *cb_encode(int); +static char *makeList(char **, int); +static int testAnchorCallback(Widget, XtPointer, char *); +static void cb_error(ObmContext, ObmCallback); +static int cb_decode(char *); /* HTMLClassInit -- Initialize the class record for the HTML widget class. */ void -HTMLClassInit (obm, classrec) -ObmContext obm; -register ObjClassRec classrec; +HTMLClassInit (ObmContext obm, ObjClassRec classrec) { register HTMLClassData gcd; register Tcl_Interp *tcl; @@ -122,7 +133,7 @@ register ObjClassRec classrec; /* Install the class methods. */ classrec->ClassDestroy = HTMLClassDestroy; - classrec->Create = (ObmFunc) HTMLCreate; + classrec->Create = HTMLCreate; classrec->Destroy = HTMLDestroy; classrec->Evaluate = WidgetEvaluate; @@ -179,9 +190,7 @@ register ObjClassRec classrec; /* HTMLClassDestroy -- Custom destroy procedure for the HTML class. */ void -HTMLClassDestroy (obm, classrec) -ObmContext obm; -register ObjClassRec classrec; +HTMLClassDestroy (ObmContext obm, ObjClassRec classrec) { register HTMLClassData gcd = (HTMLClassData) classrec->class_data; @@ -197,13 +206,13 @@ register ObjClassRec classrec; /* HTMLCreate -- Create an instance of a HTML object. */ ObmObject -HTMLCreate (obm, name, classrec, parent, a_args, a_nargs) -ObmContext obm; -char *name; -ObjClassRec classrec; -char *parent; -ArgList a_args; -int a_nargs; +HTMLCreate ( + ObmContext obm, + char *name, + ObjClassRec classrec, + char *parent, + ArgList a_args, + int a_nargs) { register HTMLObject obj; register Widget w; @@ -246,8 +255,7 @@ int a_nargs; /* HTMLDestroy -- Destroy an instance of a HTML object. */ void -HTMLDestroy (object) -ObmObject object; +HTMLDestroy (ObmObject object) { HTMLObject obj = (HTMLObject) object; ObjClassRec classrec = obj->core.classrec; @@ -288,11 +296,7 @@ ObmObject object; * this will be displayed before or after the document passed in as "text". */ static int -htmlSetText (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +htmlSetText (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { register HTMLClassData gcd = (HTMLClassData) msg; HTMLObject obj = (HTMLObject) gcd->object[gcd->level]; @@ -337,11 +341,7 @@ char **argv; * The default Postscript font is Times. */ static int -htmlGetText (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +htmlGetText (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { register HTMLClassData gcd = (HTMLClassData) msg; HTMLObject obj = (HTMLObject) gcd->object[gcd->level]; @@ -388,11 +388,7 @@ char **argv; * beginning or the end of the document is returned. */ static int -htmlPositionToId (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +htmlPositionToId (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { register HTMLClassData gcd = (HTMLClassData) msg; HTMLObject obj = (HTMLObject) gcd->object[gcd->level]; @@ -423,11 +419,7 @@ char **argv; * the coordinates x,y are undefined. */ static int -htmlIdToPosition (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +htmlIdToPosition (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { register HTMLClassData gcd = (HTMLClassData) msg; HTMLObject obj = (HTMLObject) gcd->object[gcd->level]; @@ -473,11 +465,7 @@ char **argv; * coordinates x,y are undefined. */ static int -htmlAnchorToPosition (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +htmlAnchorToPosition (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { register HTMLClassData gcd = (HTMLClassData) msg; HTMLObject obj = (HTMLObject) gcd->object[gcd->level]; @@ -522,11 +510,7 @@ char **argv; * If there is no anchor with the given name false is returned. */ static int -htmlAnchorToId (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +htmlAnchorToId (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { register HTMLClassData gcd = (HTMLClassData) msg; HTMLObject obj = (HTMLObject) gcd->object[gcd->level]; @@ -555,11 +539,7 @@ char **argv; * An id of zero means go to the top of the document. */ static int -htmlGotoId (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +htmlGotoId (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { register HTMLClassData gcd = (HTMLClassData) msg; HTMLObject obj = (HTMLObject) gcd->object[gcd->level]; @@ -591,11 +571,7 @@ char **argv; * anchor in the document being displayed. */ static int -htmlGetHRefs (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +htmlGetHRefs (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { HTMLClassData gcd = (HTMLClassData) msg; HTMLObject obj = (HTMLObject) gcd->object[gcd->level]; @@ -646,11 +622,7 @@ char **argv; * A SRC is a HREF pointing to an image file. */ static int -htmlGetImageSrcs (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +htmlGetImageSrcs (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { HTMLClassData gcd = (HTMLClassData) msg; HTMLObject obj = (HTMLObject) gcd->object[gcd->level]; @@ -699,11 +671,7 @@ char **argv; * where the structure {{href} {role}} describes each link. */ static int -htmlGetLinks (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +htmlGetLinks (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { HTMLClassData gcd = (HTMLClassData) msg; HTMLObject obj = (HTMLObject) gcd->object[gcd->level]; @@ -774,9 +742,7 @@ char **argv; * Tcl list of strings. */ static char * -makeList (list, n) -char **list; -int n; +makeList (char **list, int n) { register char *ip, *op; register int i; @@ -819,11 +785,7 @@ int n; * given URL has been visited. */ static int -htmlRetestAnchors (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +htmlRetestAnchors (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { register HTMLClassData gcd = (HTMLClassData) msg; HTMLObject obj = (HTMLObject) gcd->object[gcd->level]; @@ -845,11 +807,7 @@ char **argv; * that element. */ static int -htmlSetSelection (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +htmlSetSelection (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { register HTMLClassData gcd = (HTMLClassData) msg; HTMLObject obj = (HTMLObject) gcd->object[gcd->level]; @@ -884,11 +842,7 @@ char **argv; * An empty string is returned if there is no current text selection. */ static int -htmlGetSelection (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +htmlGetSelection (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { register HTMLClassData gcd = (HTMLClassData) msg; HTMLObject obj = (HTMLObject) gcd->object[gcd->level]; @@ -913,11 +867,7 @@ char **argv; * Usage: clearSelection */ static int -htmlClearSelection (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +htmlClearSelection (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { register HTMLClassData gcd = (HTMLClassData) msg; HTMLObject obj = (HTMLObject) gcd->object[gcd->level]; @@ -944,11 +894,7 @@ char **argv; * */ static int -htmlSearchText (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +htmlSearchText (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { register HTMLClassData gcd = (HTMLClassData) msg; HTMLObject obj = (HTMLObject) gcd->object[gcd->level]; @@ -1033,11 +979,7 @@ retry: start.id = start.pos = 0; * selects a new URL while viewing a document. */ static int -htmlAddCallback (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +htmlAddCallback (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { HTMLObject obj = (HTMLObject) msg->object[msg->level]; register WidgetPrivate wp = &obj->widget; @@ -1082,11 +1024,7 @@ char **argv; * named procedure are deleted. */ static int -htmlDeleteCallback (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +htmlDeleteCallback (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { HTMLObject obj = (HTMLObject) msg->object[msg->level]; register HTMLPrivate hp = &obj->html; @@ -1129,10 +1067,7 @@ char **argv; * are called in the order in which they were registered. */ static void -anchorCallback (w, client_data, call_data) -Widget w; -XtPointer client_data; -XtPointer call_data; +anchorCallback (Widget w, XtPointer client_data, XtPointer call_data) { register char *ip, *op; register ObmCallback cb; @@ -1219,10 +1154,7 @@ XtPointer call_data; * has been visited previously, otherwise a zero should be returned. */ static int -testAnchorCallback (w, client_data, href) -Widget w; -XtPointer client_data; -char *href; +testAnchorCallback (Widget w, XtPointer client_data, char *href) { register ObmCallback cb; register HTMLObject obj = (HTMLObject) client_data; @@ -1273,10 +1205,7 @@ char *href; * while "method" is the method to be used to submit the form. */ static void -submitFormCallback (w, client_data, call_data) -Widget w; -XtPointer client_data; -XtPointer call_data; +submitFormCallback (Widget w, XtPointer client_data, XtPointer call_data) { register char *ip, *op; register ObmCallback cb; @@ -1397,10 +1326,7 @@ XtPointer call_data; * are called in the order in which they were registered. */ static void -linkCallback (w, client_data, call_data) -Widget w; -XtPointer client_data; -XtPointer call_data; +linkCallback (Widget w, XtPointer client_data, XtPointer call_data) { register char *ip, *op; register ObmCallback cb; @@ -1440,10 +1366,7 @@ XtPointer call_data; * userproc widget cbtype href */ static void -pointerMotionCallback (w, client_data, href) -Widget w; -XtPointer client_data; -char *href; +pointerMotionCallback (Widget w, XtPointer client_data, char *href) { register ObmCallback cb; register HTMLObject obj = (HTMLObject) client_data; @@ -1471,9 +1394,7 @@ char *href; /* cb_error -- Convenience routine to return an error from a callback. */ static void -cb_error (obm, cb) -register ObmContext obm; -register ObmCallback cb; +cb_error (ObmContext obm, ObmCallback cb) { register Tcl_Interp *tcl = obm->tcl; const char *errstr = Tcl_GetVar (tcl, "errorInfo", 0); @@ -1485,8 +1406,7 @@ register ObmCallback cb; /* cb_decode -- Convert a callback_type string to a callback type code. */ static int -cb_decode (callback_type) -register char *callback_type; +cb_decode (char *callback_type) { register int type = 0; @@ -1507,8 +1427,7 @@ register char *callback_type; /* cb_encode -- Convert a callback_type string to a callback type code. */ static char * -cb_encode (callback_type) -int callback_type; +cb_encode (int callback_type) { register char *type = "unknown"; diff --git a/obm/marker.c b/obm/marker.c index db7e294..0a9cad5 100644 --- a/obm/marker.c +++ b/obm/marker.c @@ -1,6 +1,7 @@ /* Copyright(c) 1993 Association of Universities for Research in Astronomy Inc. */ +#include #include #include "ObmP.h" #include "widget.h" @@ -123,39 +124,50 @@ typedef struct { markerPrivate marker; } markerObject, *MarkerObject; -static void MarkerDestroy(); -static void MarkerClassDestroy(); -static ObmObject MarkerCreate(); -static int MarkerEvaluate(); -static int markerDestroyCallback(); -static int markerFocusCallback(); - -static int markerMakeCopy(), markerAddCallback(); -static int markerDeleteCallback(), markerCallbackProc(); -static int markerNotify(), markerDestroy(), markerMarkpos(), markerRedraw(); -static int markerRaise(), markerLower(), markerMove(), markerResize(); -static int markerRotate(), markerGetAttribute(), markerSetAttribute(); -static int markerGetAttributes(), markerSetAttributes(); -static int markerGetVertices(), markerSetVertices(); -static int markerGetRegion(), markerGetRect(); - -extern XtPointer GmCreate(), GmCopy(); -extern double strtod(); +static void MarkerDestroy(ObmObject); +static void MarkerClassDestroy(ObmContext, ObjClassRec); +static ObmObject MarkerCreate(ObmContext, char *, ObjClassRec, char *, ArgList, int); +static int MarkerEvaluate(ObmObject, char *); +static int markerDestroyCallback(MarkerObject, XtPointer, int, XEvent *, String *, Cardinal); +static int markerFocusCallback(MarkerObject, XtPointer, int, XEvent *, String *, Cardinal); + +static int markerMakeCopy(MsgContext, Tcl_Interp *, int, char **); +static int markerAddCallback(MsgContext, Tcl_Interp *, int, char **); +static int markerDeleteCallback(MsgContext, Tcl_Interp *, int, char **); +static int markerCallbackProc(ObmCallback, XtPointer, int, XEvent *, String *, Cardinal); +static int markerNotify(MsgContext, Tcl_Interp *, int, char **); +static int markerDestroy(MsgContext, Tcl_Interp *, int, char **); +static int markerMarkpos(MsgContext, Tcl_Interp *, int, char **); +static int markerRedraw(MsgContext, Tcl_Interp *, int, char **); +static int markerRaise(MsgContext, Tcl_Interp *, int, char **); +static int markerLower(MsgContext, Tcl_Interp *, int, char **); +static int markerMove(MsgContext, Tcl_Interp *, int, char **); +static int markerResize(MsgContext, Tcl_Interp *, int, char **); +static int markerRotate(MsgContext, Tcl_Interp *, int, char **); +static int markerGetAttribute(MsgContext, Tcl_Interp *, int, char **); +static int markerSetAttribute(MsgContext, Tcl_Interp *, int, char **); +static int markerGetAttributes(MsgContext, Tcl_Interp *, int, char **); +static int markerSetAttributes(MsgContext, Tcl_Interp *, int, char **); +static int markerGetVertices(MsgContext, Tcl_Interp *, int, char **); +static int markerSetVertices(MsgContext, Tcl_Interp *, int, char **); +static int markerGetRegion(MsgContext, Tcl_Interp *, int, char **); +static int markerGetRect(MsgContext, Tcl_Interp *, int, char **); + +extern XtPointer GmCreate(GtermWidget, int, int); +static XtPointer GmCopy(Marker); /* MarkerClassInit -- Initialize the class record for the marker widget class. */ void -MarkerClassInit (obm, classrec) -ObmContext obm; -register ObjClassRec classrec; +MarkerClassInit (ObmContext obm, ObjClassRec classrec) { register MsgContext msg; register Tcl_Interp *tcl; /* Install the class methods. */ classrec->ClassDestroy = MarkerClassDestroy; - classrec->Create = (ObmFunc) MarkerCreate; + classrec->Create = MarkerCreate; classrec->Destroy = MarkerDestroy; classrec->Evaluate = MarkerEvaluate; @@ -223,9 +235,7 @@ register ObjClassRec classrec; /* MarkerClassDestroy -- Custom destroy procedure for the widget class. */ static void -MarkerClassDestroy (obm, classrec) -ObmContext obm; -register ObjClassRec classrec; +MarkerClassDestroy (ObmContext obm, ObjClassRec classrec) { register MsgContext msg = (MsgContext) classrec->class_data; @@ -241,13 +251,13 @@ register ObjClassRec classrec; /* MarkerCreate -- Create a new instance of a marker object. */ static ObmObject -MarkerCreate (obm, name, classrec, parent, args, nargs) -ObmContext obm; -char *name; -ObjClassRec classrec; -char *parent; -ArgList args; -int nargs; +MarkerCreate ( + ObmContext obm, + char *name, + ObjClassRec classrec, + char *parent, + ArgList args, + int nargs) { register MarkerObject obj; register Widget gt; @@ -336,8 +346,7 @@ int nargs; /* MarkerDestroy -- Destroy an instance of a marker object. */ static void -MarkerDestroy (object) -ObmObject object; +MarkerDestroy (ObmObject object) { MarkerObject obj = (MarkerObject) object; register ObmContext obm = obj->marker.obm; @@ -370,9 +379,7 @@ ObmObject object; /* MarkerEvaluate -- Evaluate a marker command or message. */ static int -MarkerEvaluate (object, command) -ObmObject object; -char *command; +MarkerEvaluate (ObmObject object, char *command) { register MarkerObject obj = (MarkerObject) object; register MsgContext msg = (MsgContext) obj->core.classrec->class_data; @@ -422,11 +429,7 @@ char *command; * Usage: makeCopy name */ static int -markerMakeCopy (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +markerMakeCopy (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { MarkerObject obj = (MarkerObject) msg->object[msg->level]; register MarkerPrivate mp = &obj->marker; @@ -455,11 +458,7 @@ char **argv; * Usage: addCallback procedure [event [event ...]] */ static int -markerAddCallback (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +markerAddCallback (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { MarkerObject obj = (MarkerObject) msg->object[msg->level]; register MarkerPrivate mp = &obj->marker; @@ -511,11 +510,7 @@ char **argv; * Usage: deleteCallback procedure */ static int -markerDeleteCallback (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +markerDeleteCallback (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { MarkerObject obj = (MarkerObject) msg->object[msg->level]; register MarkerPrivate mp = &obj->marker; @@ -546,13 +541,13 @@ char **argv; * marker code when a marker event occurs. */ static int -markerCallbackProc (cb, gm, events, event, params, nparams) -register ObmCallback cb; -XtPointer gm; -int events; -XEvent *event; -String *params; -Cardinal nparams; +markerCallbackProc ( + ObmCallback cb, + XtPointer gm, + int events, + XEvent *event, + String *params, + Cardinal nparams) { MarkerObject obj = (MarkerObject) cb->u.obj; MarkerPrivate mp = &obj->marker; @@ -817,11 +812,7 @@ Cardinal nparams; * Usage: notify [event-type [param [param ...]]] */ static int -markerNotify (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +markerNotify (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { MarkerObject obj = (MarkerObject) msg->object[msg->level]; register MarkerPrivate mp = &obj->marker; @@ -847,11 +838,7 @@ char **argv; * Usage: destroy */ static int -markerDestroy (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +markerDestroy (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { MarkerObject obj = (MarkerObject) msg->object[msg->level]; register MarkerPrivate mp = &obj->marker; @@ -865,13 +852,13 @@ char **argv; * Gterm widget code when a marker is about to be destroyed. */ static int -markerDestroyCallback (obj, gm, events, event, params, nparams) -MarkerObject obj; -XtPointer gm; -int events; -XEvent *event; -String *params; -Cardinal nparams; +markerDestroyCallback ( + MarkerObject obj, + XtPointer gm, + int events, + XEvent *event, + String *params, + Cardinal nparams) { MarkerPrivate mp = &obj->marker; ObmContext obm = mp->obm; @@ -885,13 +872,13 @@ Cardinal nparams; * gets or loses the focus. */ static int -markerFocusCallback (obj, gm, events, event, params, nparams) -MarkerObject obj; -XtPointer gm; -int events; -XEvent *event; -String *params; -Cardinal nparams; +markerFocusCallback ( + MarkerObject obj, + XtPointer gm, + int events, + XEvent *event, + String *params, + Cardinal nparams) { MarkerPrivate mp = &obj->marker; ObmObject gtobj = mp->pobj; @@ -917,11 +904,7 @@ Cardinal nparams; * marker. */ static int -markerMarkpos (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +markerMarkpos (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { MarkerObject obj = (MarkerObject) msg->object[msg->level]; register MarkerPrivate mp = &obj->marker; @@ -951,11 +934,7 @@ char **argv; * A normal marker redraw uses function=copy. */ static int -markerRedraw (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +markerRedraw (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { MarkerObject obj = (MarkerObject) msg->object[msg->level]; register MarkerPrivate mp = &obj->marker; @@ -998,11 +977,7 @@ char **argv; * marker, otherwise the raised marker becomes the topmost marker. */ static int -markerRaise (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +markerRaise (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { MarkerObject obj = (MarkerObject) msg->object[msg->level]; register MarkerPrivate mp = &obj->marker; @@ -1033,11 +1008,7 @@ char **argv; * marker, otherwise the lowered marker becomes the lowest marker. */ static int -markerLower (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +markerLower (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { MarkerObject obj = (MarkerObject) msg->object[msg->level]; register MarkerPrivate mp = &obj->marker; @@ -1066,11 +1037,7 @@ char **argv; * Move the marker center to the indicated coordinates in the display window. */ static int -markerMove (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +markerMove (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { MarkerObject obj = (MarkerObject) msg->object[msg->level]; register MarkerPrivate mp = &obj->marker; @@ -1102,11 +1069,7 @@ char **argv; * is an acceptable value for a text marker dimension. */ static int -markerResize (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +markerResize (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { MarkerObject obj = (MarkerObject) msg->object[msg->level]; register MarkerPrivate mp = &obj->marker; @@ -1136,11 +1099,7 @@ char **argv; * given in radians. */ static int -markerRotate (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +markerRotate (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { MarkerObject obj = (MarkerObject) msg->object[msg->level]; register MarkerPrivate mp = &obj->marker; @@ -1166,11 +1125,7 @@ char **argv; * Usage: value = getAttribute attribute-name */ static int -markerGetAttribute (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +markerGetAttribute (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { MarkerObject obj = (MarkerObject) msg->object[msg->level]; register MarkerPrivate mp = &obj->marker; @@ -1196,11 +1151,7 @@ char **argv; * Usage: setAttribute attribute-name value */ static int -markerSetAttribute (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +markerSetAttribute (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { MarkerObject obj = (MarkerObject) msg->object[msg->level]; register MarkerPrivate mp = &obj->marker; @@ -1230,11 +1181,7 @@ char **argv; * is to be stored. */ static int -markerGetAttributes (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +markerGetAttributes (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { MarkerObject obj = (MarkerObject) msg->object[msg->level]; register MarkerPrivate mp = &obj->marker; @@ -1286,11 +1233,7 @@ char **argv; * where "value" is the new value of the associated marker attribute. */ static int -markerSetAttributes (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +markerSetAttributes (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { MarkerObject obj = (MarkerObject) msg->object[msg->level]; register MarkerPrivate mp = &obj->marker; @@ -1346,11 +1289,7 @@ char **argv; * coordinates. */ static int -markerGetVertices (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +markerGetVertices (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { MarkerObject obj = (MarkerObject) msg->object[msg->level]; MarkerPrivate mp = &obj->marker; @@ -1438,11 +1377,7 @@ char **argv; * point to the list. */ static int -markerSetVertices (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +markerSetVertices (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { MarkerObject obj = (MarkerObject) msg->object[msg->level]; MarkerPrivate mp = &obj->marker; @@ -1528,11 +1463,7 @@ char **argv; * coordinates being the default. */ static int -markerGetRegion (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +markerGetRegion (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { MarkerObject obj = (MarkerObject) msg->object[msg->level]; MarkerPrivate mp = &obj->marker; @@ -1791,11 +1722,7 @@ char **argv; * nonrotated rectangular markers. */ static int -markerGetRect (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +markerGetRect (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { MarkerObject obj = (MarkerObject) msg->object[msg->level]; register MarkerPrivate mp = &obj->marker; diff --git a/obm/obmres.c b/obm/obmres.c index e6acd82..e03e85c 100644 --- a/obm/obmres.c +++ b/obm/obmres.c @@ -2269,9 +2269,7 @@ struct resource_list { /* Prints a table listing the unique resource name/type pairs, with a bitmask * indicating the widget classes using each resource/type pair. */ -main (argc, argv) -int argc; -char *argv[]; +main (int argc, char *argv[]) { register struct resource_list *rp, *np; register unsigned long flags1, flags2; diff --git a/obm/param.c b/obm/param.c index 2d6aa29..a7e2b54 100644 --- a/obm/param.c +++ b/obm/param.c @@ -76,27 +76,28 @@ struct msgContext { }; typedef struct msgContext *MsgContext; -static void ParameterDestroy(); -static int ParameterEvaluate(); -static ObmObject ParameterCreate(); -static void ParameterClassDestroy(); -static int parameterSetValue(), parameterGetValue(), parameterNotify(); -static int parameterAddCallback(), parameterDeleteCallback(); +static void ParameterDestroy(ObmObject); +static int ParameterEvaluate(ObmObject, char *); +static ObmObject ParameterCreate(ObmContext, char *, ObjClassRec, char *, ArgList, int); +static void ParameterClassDestroy(ObmContext, ObjClassRec); +static int parameterSetValue(MsgContext, Tcl_Interp *, int, char **); +static int parameterGetValue(MsgContext, Tcl_Interp *, int, char **); +static int parameterNotify(MsgContext, Tcl_Interp *, int, char **); +static int parameterAddCallback(MsgContext, Tcl_Interp *, int, char **); +static int parameterDeleteCallback(MsgContext, Tcl_Interp *, int, char **); /* ParameterClassInit -- Initialize the class record for the parameter class. */ void -ParameterClassInit (obm, classrec) -ObmContext obm; -register ObjClassRec classrec; +ParameterClassInit (ObmContext obm, ObjClassRec classrec) { register Tcl_Interp *tcl; register MsgContext msg; /* Install the class methods. */ classrec->ClassDestroy = ParameterClassDestroy; - classrec->Create = (ObmFunc) ParameterCreate; + classrec->Create = ParameterCreate; classrec->Destroy = ParameterDestroy; classrec->Evaluate = ParameterEvaluate; @@ -127,9 +128,7 @@ register ObjClassRec classrec; * class. */ static void -ParameterClassDestroy (obm, classrec) -ObmContext obm; -register ObjClassRec classrec; +ParameterClassDestroy (ObmContext obm, ObjClassRec classrec) { register MsgContext msg = (MsgContext) classrec->class_data; @@ -145,13 +144,13 @@ register ObjClassRec classrec; /* ParameterCreate -- Create an instance of a parameter object. */ static ObmObject -ParameterCreate (obm, name, classrec, parent, args, nargs) -ObmContext obm; -char *name; -ObjClassRec classrec; -char *parent; -ArgList args; -int nargs; +ParameterCreate ( + ObmContext obm, + char *name, + ObjClassRec classrec, + char *parent, + ArgList args, + int nargs) { register ParameterObject obj; @@ -165,8 +164,7 @@ int nargs; /* ParameterDestroy -- Destroy an instance of a parameter object. */ static void -ParameterDestroy (object) -ObmObject object; +ParameterDestroy (ObmObject object) { register ParameterObject obj = (ParameterObject) object; register ObmCallback cb, next; @@ -186,9 +184,7 @@ ObmObject object; /* ParameterEvaluate -- Evaluate a parameter command or message. */ static int -ParameterEvaluate (object, command) -ObmObject object; -char *command; +ParameterEvaluate (ObmObject object, char *command) { register ParameterObject obj = (ParameterObject) object; register MsgContext msg = (MsgContext) obj->core.classrec->class_data; @@ -232,11 +228,7 @@ char *command; * Usage: setValue */ static int -parameterSetValue (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +parameterSetValue (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { ParameterObject obj = (ParameterObject) msg->object[msg->level]; register ObmContext obm = obj->parameter.obm; @@ -284,11 +276,7 @@ i, obj->core.name, cb->name, new_value);*/ * Usage: getValue */ static int -parameterGetValue (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +parameterGetValue (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { ParameterObject obj = (ParameterObject) msg->object[msg->level]; register ObmContext obm = obj->parameter.obm; @@ -305,11 +293,7 @@ char **argv; * Usage: notify */ static int -parameterNotify (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +parameterNotify (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { ParameterObject obj = (ParameterObject) msg->object[msg->level]; register ObmContext obm = obj->parameter.obm; @@ -344,11 +328,7 @@ char **argv; * Usage: addCallback */ static int -parameterAddCallback (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +parameterAddCallback (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { ParameterObject obj = (ParameterObject) msg->object[msg->level]; register ParameterPrivate pp = &obj->parameter; @@ -376,11 +356,7 @@ char **argv; * Usage: deleteCallback */ static int -parameterDeleteCallback (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +parameterDeleteCallback (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { ParameterObject obj = (ParameterObject) msg->object[msg->level]; register ParameterPrivate pp = &obj->parameter; diff --git a/obm/server.c b/obm/server.c index 6651bbc..1432981 100644 --- a/obm/server.c +++ b/obm/server.c @@ -1,6 +1,7 @@ /* Copyright(c) 1993 Association of Universities for Research in Astronomy Inc. */ +#include #include "ObmP.h" /* The following internal files are needed for some widget level SmeBSB code @@ -85,31 +86,54 @@ struct serverObject { typedef struct serverObject *ServerObject; -static ObmObject ServerCreate(); -static void ServerDestroy(); -static int ServerEvaluate(), serverQueryObject(); -static int serverCreateMenu(), serverDestroyMenu(); -static int serverAppInitialize(), serverAppExtend(), serverCreateObjects(); -static int serverSend(), serverPrint(), serverDestroyObject(); -static int serverReset(), serverActivate(), serverDeactivate(); -static int serverCreateBitmap(), serverCreatePixmap(), serverCreateCursor(); -static int serverPostActivateCallback(), serverPostDeactivateCallback(); -static int serverPostTimedCallback(), serverPostWorkProc(); -static int serverDeleteTimedCallback(), serverDeleteWorkProc(); -static int serverCreateXPixmap(), serverSynchronize(), serverFlush(); -static int serverGetResource(), serverGetResources(); -static void link_callback(), unlink_callback(); -static void serverTimedProc(); -static Boolean serverWorkProc(); - -static int editMenu(); -static void menu_popup(), menu_popdown(), menu_popdown_msgHandler(); -static void createMenu(), menuSelect(), build_colorlist(); -static void menu_classInit(), menu_addEntry(), menu_delEntry(); -static void menu_highlight(), menu_unhighlight(); -static Pixmap menu_pullrightBitmap(); -static MenuPtr findMenu(); -extern long strtol(); +static ObmObject ServerCreate(ObmContext, char *, ObjClassRec, char *, ArgList, int); +static void ServerDestroy(ObmObject); +static int ServerEvaluate(ObmObject, char *); +static int serverQueryObject(ObmObject, Tcl_Interp *, int, char **); +static int serverCreateMenu(ObmObject, Tcl_Interp *, int, char **); +static int serverDestroyMenu(ObmObject, Tcl_Interp *, int, char **); +static int serverAppInitialize(ObmObject, Tcl_Interp *, int, char **); +static int serverAppExtend(ObmObject, Tcl_Interp *, int, char **); +static int serverCreateObjects(ObmObject, Tcl_Interp *, int, char **); +static int serverSend(ObmObject, Tcl_Interp *, int, char **); +static int serverPrint(ObmObject, Tcl_Interp *, int, char **); +static int serverDestroyObject(ObmObject, Tcl_Interp *, int, char **); +static int serverReset(ObmObject, Tcl_Interp *, int, char **); +static int serverActivate(ObmObject, Tcl_Interp *, int, char **); +static int serverDeactivate(ObmObject, Tcl_Interp *, int, char **); +static int serverCreateBitmap(ObmObject, Tcl_Interp *, int, char **); +static int serverCreatePixmap(ObmObject, Tcl_Interp *, int, char **); +static int serverCreateCursor(ObmObject, Tcl_Interp *, int, char **); +static int serverPostActivateCallback(ObmObject, Tcl_Interp *, int, char **); +static int serverPostDeactivateCallback(ObmObject, Tcl_Interp *, int, char **); +static int serverPostTimedCallback(ObmObject, Tcl_Interp *, int, char **); +static int serverPostWorkProc(ObmObject, Tcl_Interp *, int, char **); +static int serverDeleteTimedCallback(ObmObject, Tcl_Interp *, int, char **); +static int serverDeleteWorkProc(ObmObject, Tcl_Interp *, int, char **); +static int serverCreateXPixmap(ObmObject, Tcl_Interp *, int, char **); +static int serverSynchronize(ObmObject, Tcl_Interp *, int, char **); +static int serverFlush(ObmObject, Tcl_Interp *, int, char **); +static int serverGetResource(ObmObject, Tcl_Interp *, int, char **); +static int serverGetResources(ObmObject, Tcl_Interp *, int, char **); +static void link_callback(ServerPrivate, ServerCallback); +static void unlink_callback(ServerPrivate, ServerCallback); +static void serverTimedProc(XtPointer, XtIntervalId *); +static Boolean serverWorkProc(XtPointer); + +static int editMenu(MenuPtr, MenuPtr); +static void menu_popup(Widget, XtPointer, XtPointer); +static void menu_popdown(Widget, XtPointer, XtPointer); +static void menu_popdown_msgHandler(String, String, String, String, String*, Cardinal*); +static void createMenu(ObmContext, MenuPtr, char *, char *, Widget); +static void menuSelect(Widget, XtPointer, XtPointer); +static void build_colorlist(Widget, XpmColorSymbol *, Cardinal, Cardinal *); +static void menu_classInit(void); +static void menu_addEntry(Widget, char *, char *, ObmContext); +static void menu_delEntry(Widget); +static void menu_highlight(Widget); +static void menu_unhighlight(Widget); +static Pixmap menu_pullrightBitmap(ObmContext, int); +static MenuPtr findMenu(ObmContext, char *); /* The pull-right bitmap for menus. */ #define MB_WIDTH 16 @@ -127,9 +151,7 @@ extern long strtol(); /* ServerClassInit -- Initialize the class record for the server class. */ void -ServerClassInit (obm, classrec) -ObmContext obm; -register ObjClassRec classrec; +ServerClassInit (ObmContext obm, ObjClassRec classrec) { classrec->ClassDestroy = obmGenericClassDestroy; classrec->Create = ServerCreate; @@ -141,13 +163,13 @@ register ObjClassRec classrec; /* ServerCreate -- Create an instance of a server object. */ static ObmObject -ServerCreate (obm, name, classrec, parent, args, nargs) -ObmContext obm; -char *name; -ObjClassRec classrec; -char *parent; -ArgList args; -int nargs; +ServerCreate ( + ObmContext obm, + char *name, + ObjClassRec classrec, + char *parent, + ArgList args, + int nargs) { register ServerObject obj; register Tcl_Interp *tcl; @@ -223,8 +245,7 @@ int nargs; /* ServerDestroy -- Destroy an instance of a server object. */ static void -ServerDestroy (object) -ObmObject object; +ServerDestroy (ObmObject object) { register ServerObject obj = (ServerObject) object; register ObmContext obm = obj->server.obm; @@ -262,9 +283,7 @@ ObmObject object; /* ServerEvaluate -- Evaluate a server command or message. */ static int -ServerEvaluate (object, command) -ObmObject object; -char *command; +ServerEvaluate (ObmObject object, char *command) { register ServerObject obj = (ServerObject) object; register ObmContext obm = obj->server.obm; @@ -316,11 +335,7 @@ char *command; * Usage: appInitialize appname, appclass, resources */ static int -serverAppInitialize (object, tcl, argc, argv) -ObmObject object; -Tcl_Interp *tcl; -int argc; -char **argv; +serverAppInitialize (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { register ServerObject obj = (ServerObject) object; register ObmContext obm = obj->server.obm; @@ -425,11 +440,7 @@ char **argv; * Usage: appExtend new-resources [overwrite] */ static int -serverAppExtend (object, tcl, argc, argv) -ObmObject object; -Tcl_Interp *tcl; -int argc; -char **argv; +serverAppExtend (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { register ServerObject obj = (ServerObject) object; register ObmContext obm = obj->server.obm; @@ -473,11 +484,7 @@ char **argv; * Usage: createObjects [resource-name] */ static int -serverCreateObjects (object, tcl, argc, argv) -ObmObject object; -Tcl_Interp *tcl; -int argc; -char **argv; +serverCreateObjects (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { register char *ip, *op; register ServerObject obj = (ServerObject) object; @@ -541,11 +548,7 @@ char **argv; * Usage: destroyObject object-name */ static int -serverDestroyObject (object, tcl, argc, argv) -ObmObject object; -Tcl_Interp *tcl; -int argc; -char **argv; +serverDestroyObject (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { register ServerObject obj = (ServerObject) object; register ObmContext obm = obj->server.obm; @@ -573,11 +576,7 @@ char **argv; * variables given on the command line. */ static int -serverQueryObject (object, tcl, argc, argv) -ObmObject object; -Tcl_Interp *tcl; -int argc; -char **argv; +serverQueryObject (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { register ServerObject obj = (ServerObject) object; register ObmContext obm = obj->server.obm; @@ -626,11 +625,7 @@ char **argv; * Usage: activate */ static int -serverActivate (object, tcl, argc, argv) -ObmObject object; -Tcl_Interp *tcl; -int argc; -char **argv; +serverActivate (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { register ServerObject obj = (ServerObject) object; register ObmContext obm = obj->server.obm; @@ -680,11 +675,7 @@ char **argv; * Usage: deactivate [unmap] */ static int -serverDeactivate (object, tcl, argc, argv) -ObmObject object; -Tcl_Interp *tcl; -int argc; -char **argv; +serverDeactivate (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { register ServerObject obj = (ServerObject) object; register ObmContext obm = obj->server.obm; @@ -704,11 +695,7 @@ char **argv; * hence should be done only when necessary. Try "flush" below first. */ static int -serverSynchronize (object, tcl, argc, argv) -ObmObject object; -Tcl_Interp *tcl; -int argc; -char **argv; +serverSynchronize (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { register ServerObject obj = (ServerObject) object; register ObmContext obm = obj->server.obm; @@ -729,11 +716,7 @@ char **argv; * execution continues. */ static int -serverFlush (object, tcl, argc, argv) -ObmObject object; -Tcl_Interp *tcl; -int argc; -char **argv; +serverFlush (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { register ServerObject obj = (ServerObject) object; register ObmContext obm = obj->server.obm; @@ -755,11 +738,7 @@ char **argv; * Usage: postActivateCallback */ static int -serverPostActivateCallback (object, tcl, argc, argv) -ObmObject object; -Tcl_Interp *tcl; -int argc; -char **argv; +serverPostActivateCallback (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { register ServerObject obj = (ServerObject) object; register ObmContext obm = obj->server.obm; @@ -783,11 +762,7 @@ char **argv; * Usage: postDeactivateCallback */ static int -serverPostDeactivateCallback (object, tcl, argc, argv) -ObmObject object; -Tcl_Interp *tcl; -int argc; -char **argv; +serverPostDeactivateCallback (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { register ServerObject obj = (ServerObject) object; register ObmContext obm = obj->server.obm; @@ -812,11 +787,7 @@ char **argv; * Usage: send */ static int -serverSend (object, tcl, argc, argv) -ObmObject object; -Tcl_Interp *tcl; -int argc; -char **argv; +serverSend (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { register ServerObject obj = (ServerObject) object; register ObmContext obm = obj->server.obm; @@ -843,11 +814,7 @@ char **argv; * Usage: print arg [arg ...] */ static int -serverPrint (object, tcl, argc, argv) -ObmObject object; -Tcl_Interp *tcl; -int argc; -char **argv; +serverPrint (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { register ServerObject obj = (ServerObject) object; register ObmContext obm = obj->server.obm; @@ -875,11 +842,7 @@ char **argv; * things, it must be the first command in a message to the server. */ static int -serverReset (object, tcl, argc, argv) -ObmObject object; -Tcl_Interp *tcl; -int argc; -char **argv; +serverReset (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { return (TCL_OK); } @@ -916,11 +879,7 @@ char **argv; * See also getResources, used to get multiple resources in one call. */ static int -serverGetResource (object, tcl, argc, argv) -ObmObject object; -Tcl_Interp *tcl; -int argc; -char **argv; +serverGetResource (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { register ServerObject obj = (ServerObject) object; register ObmContext obm = obj->server.obm; @@ -966,11 +925,7 @@ char **argv; * resource value. The class name and default value fields are optional. */ static int -serverGetResources (object, tcl, argc, argv) -ObmObject object; -Tcl_Interp *tcl; -int argc; -char **argv; +serverGetResources (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { register ServerObject obj = (ServerObject) object; register ObmContext obm = obj->server.obm; @@ -1066,11 +1021,7 @@ err: sprintf (buf, "bad item '%d' in resource list", item + 1); * */ static int -serverPostTimedCallback (object, tcl, argc, argv) -ObmObject object; -Tcl_Interp *tcl; -int argc; -char **argv; +serverPostTimedCallback (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { register ServerObject obj = (ServerObject) object; register ObmContext obm = obj->server.obm; @@ -1122,9 +1073,7 @@ char **argv; /* serverTimedProc -- Xt callback procedure for interval timers. */ static void -serverTimedProc (cb_ptr, id) -XtPointer cb_ptr; -XtIntervalId *id; +serverTimedProc (XtPointer cb_ptr, XtIntervalId *id) { register ServerCallback cb = (ServerCallback) cb_ptr; register ServerObject obj = (ServerObject) cb->obj; @@ -1156,11 +1105,7 @@ XtIntervalId *id; * The ID string is returned by postTimedCallback when a timer is posted. */ static int -serverDeleteTimedCallback (object, tcl, argc, argv) -ObmObject object; -Tcl_Interp *tcl; -int argc; -char **argv; +serverDeleteTimedCallback (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { register ServerObject obj = (ServerObject) object; ServerCallback cb; @@ -1197,11 +1142,7 @@ char **argv; * delete the work procedure. */ static int -serverPostWorkProc (object, tcl, argc, argv) -ObmObject object; -Tcl_Interp *tcl; -int argc; -char **argv; +serverPostWorkProc (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { register ServerObject obj = (ServerObject) object; register ObmContext obm = obj->server.obm; @@ -1247,8 +1188,7 @@ char **argv; /* serverWorkProc -- Xt callback procedure for work procedures. */ static Boolean -serverWorkProc (cb_ptr) -XtPointer cb_ptr; +serverWorkProc (XtPointer cb_ptr) { register ServerCallback cb = (ServerCallback) cb_ptr; register ServerObject obj = (ServerObject) cb->obj; @@ -1287,11 +1227,7 @@ XtPointer cb_ptr; * posted. */ static int -serverDeleteWorkProc (object, tcl, argc, argv) -ObmObject object; -Tcl_Interp *tcl; -int argc; -char **argv; +serverDeleteWorkProc (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { register ServerObject obj = (ServerObject) object; ServerCallback cb; @@ -1312,9 +1248,7 @@ char **argv; * callback list. */ static void -link_callback (server, cb) -register ServerPrivate server; -register ServerCallback cb; +link_callback (ServerPrivate server, ServerCallback cb) { if (!server->cb_head) { server->cb_head = cb; @@ -1330,9 +1264,7 @@ register ServerCallback cb; * callback list. */ static void -unlink_callback (server, cb) -register ServerPrivate server; -register ServerCallback cb; +unlink_callback (ServerPrivate server, ServerCallback cb) { register ServerCallback cp; @@ -1355,11 +1287,7 @@ register ServerCallback cb; * pixmap cache. */ int -createBitmap (obm, name, width, height, pixels) -ObmContext obm; -char *name; -int width, height; -char *pixels; +createBitmap (ObmContext obm, char *name, int width, int height, char *pixels) { register char *ip, *op; register ObjList lp, last_lp; @@ -1429,11 +1357,7 @@ char *pixels; * 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 } */ static int -serverCreateBitmap (object, tcl, argc, argv) -ObmObject object; -Tcl_Interp *tcl; -int argc; -char **argv; +serverCreateBitmap (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { ServerObject obj = (ServerObject) object; ObmContext obm = (ObmContext) obj->server.obm; @@ -1459,9 +1383,7 @@ char **argv; * cache. */ Pixmap -findBitmap (obm, name) -ObmContext obm; -char *name; +findBitmap (ObmContext obm, char *name) { return (findPixmap (obm, name)); } @@ -1475,13 +1397,16 @@ char *name; * foreground colors. */ int -createPixmap (obm, name, width, height, depth, pixmap, pixels, bg, fg) -ObmContext obm; -char *name; -int width, height, depth; -Pixmap pixmap; -char *pixels; -unsigned long fg, bg; +createPixmap ( + ObmContext obm, + char *name, + int width, + int height, + int depth, + Pixmap pixmap, + char *pixels, + unsigned long fg, + unsigned long bg) { register char *ip, *op; register ObjList lp, last_lp; @@ -1565,11 +1490,7 @@ unsigned long fg, bg; * 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 } */ static int -serverCreatePixmap (object, tcl, argc, argv) -ObmObject object; -Tcl_Interp *tcl; -int argc; -char **argv; +serverCreatePixmap (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { ServerObject obj = (ServerObject) object; ObmContext obm = (ObmContext) obj->server.obm; @@ -1628,11 +1549,7 @@ char **argv; * may be given to associate color resources with the pixmap. */ int -createXPixmap (obm, name, widget, description) -ObmContext obm; -char *name; -char *widget; -char *description; +createXPixmap (ObmContext obm, char *name, char *widget, char *description) { register char *ip, *op; register ObjList lp, last_lp; @@ -1791,11 +1708,7 @@ char *description; * command to set the value of any Pixmap or Icon class widget resource. */ static int -serverCreateXPixmap (object, tcl, argc, argv) -ObmObject object; -Tcl_Interp *tcl; -int argc; -char **argv; +serverCreateXPixmap (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { ServerObject obj = (ServerObject) object; ObmContext obm = (ObmContext) obj->server.obm; @@ -1829,11 +1742,7 @@ char **argv; * This code is based on build_colortable from icon.c in the FWF sources. */ static void -build_colorlist (w, table, size, n) -Widget w; -register XpmColorSymbol *table; -Cardinal size; -Cardinal *n; +build_colorlist (Widget w, XpmColorSymbol *table, Cardinal size, Cardinal *n) { Cardinal nres, i; XtResourceList res; @@ -1856,9 +1765,7 @@ Cardinal *n; /* findPixmap -- Search the pixmap cache for the named pixmap. */ Pixmap -findPixmap (obm, name) -ObmContext obm; -char *name; +findPixmap (ObmContext obm, char *name) { register ObjList lp; @@ -1873,9 +1780,7 @@ char *name; /* findIcon -- Search the pixmap cache for the named icon. */ Icon * -findIcon (obm, name) -ObmContext obm; -char *name; +findIcon (ObmContext obm, char *name) { register ObjList lp; @@ -1890,9 +1795,7 @@ char *name; /* freeIcon -- Free an icon descriptor (pixmap list). */ void -freeIcon (obm, icon) -register ObmContext obm; -register Icon *icon; +freeIcon (ObmContext obm, Icon *icon) { if (icon->pixmap) XFreePixmap (obm->display, icon->pixmap); @@ -1913,11 +1816,7 @@ register Icon *icon; * The named bitmaps must be created first with createBitmap. */ static int -serverCreateCursor (object, tcl, argc, argv) -ObmObject object; -Tcl_Interp *tcl; -int argc; -char **argv; +serverCreateCursor (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { ServerObject obj = (ServerObject) object; ObmContext obm = (ObmContext) obj->server.obm; @@ -2014,9 +1913,7 @@ char **argv; /* findCursor -- Search the cursor cache for the named cursor. */ Cursor -findCursor (obm, name) -ObmContext obm; -char *name; +findCursor (ObmContext obm, char *name) { register ObjList lp; @@ -2098,11 +1995,7 @@ char *name; * detailed changes to the widgets used to implement the menu. */ static int -serverCreateMenu (object, tcl, argc, argv) -ObmObject object; -Tcl_Interp *tcl; -int argc; -char **argv; +serverCreateMenu (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { ServerObject obj = (ServerObject) object; ObmContext obm = (ObmContext) obj->server.obm; @@ -2318,11 +2211,7 @@ char **argv; * Usage: destroyMenu menu-name */ static int -serverDestroyMenu (object, tcl, argc, argv) -ObmObject object; -Tcl_Interp *tcl; -int argc; -char **argv; +serverDestroyMenu (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { ServerObject obj = (ServerObject) object; ObmContext obm = (ObmContext) obj->server.obm; @@ -2361,12 +2250,12 @@ char **argv; /* createMenu -- Create a new menu from a menu descriptor. */ static void -createMenu (obm, mp, menu_name, parent, pw) -ObmContext obm; -register MenuPtr mp; -char *menu_name; -char *parent; -Widget pw; +createMenu ( + ObmContext obm, + MenuPtr mp, + char *menu_name, + char *parent, + Widget pw) { register MenuItem ip; int itemno, menuno, lineno, spaceno; @@ -2533,9 +2422,9 @@ Widget pw; * caller should delete the old one and create a new menu from scratch. */ static int -editMenu (mp, request) -register MenuPtr mp; /* existing menu */ -MenuPtr request; /* requested values */ +editMenu ( + MenuPtr mp, /* existing menu */ + MenuPtr request) /* requested values */ { register MenuItem old, new; register int i; @@ -2688,8 +2577,7 @@ MenuPtr request; /* requested values */ /* freeMenu -- Free a menu descriptor. */ void -freeMenu (mp) -register MenuPtr mp; +freeMenu (MenuPtr mp) { register MenuItem ip; register int i; @@ -2720,10 +2608,7 @@ register MenuPtr mp; /* menuSelect -- Callback routine, called when a menu item is selected. */ static void -menuSelect (w, client_data, call_data) -Widget w; -XtPointer client_data; -XtPointer call_data; +menuSelect (Widget w, XtPointer client_data, XtPointer call_data) { register MenuPtr mp = (MenuPtr) client_data; register MenuItem ip; @@ -2802,15 +2687,15 @@ typedef struct _menuEntry menuEntry, *MenuEntry; MenuEntry menuWidgetList; static char menu_bitmap1[] = "BSB_pullright1"; static char menu_bitmap2[] = "BSB_pullright2"; -static void (*BSB_highlight)(); -static void (*BSB_unhighlight)(); +static void (*BSB_highlight)(Widget); +static void (*BSB_unhighlight)(Widget); /* menu_classInit -- Edit the SME class record to interpose our custom * highlight/unhighlight class procedures. */ static void -menu_classInit() +menu_classInit(void) { register SmeClassPart *sme = &smeBSBClassRec.sme_class; @@ -2829,9 +2714,7 @@ menu_classInit() * displayed on the right side of a menu entry that brings up a submenu. */ static Pixmap -menu_pullrightBitmap (obm, state) -ObmContext obm; -int state; +menu_pullrightBitmap (ObmContext obm, int state) { Pixmap bitmap; @@ -2851,11 +2734,11 @@ int state; /* menu_addEntry -- Add a widget to the menuWidgetList list. */ static void -menu_addEntry (w, name, child, obm) -Widget w; /* menu entry which calls submenu */ -char *name; /* name of menu containing this widget */ -char *child; /* name of submenu shell widget */ -ObmContext obm; +menu_addEntry ( + Widget w, /* menu entry which calls submenu */ + char *name, /* name of menu containing this widget */ + char *child, /* name of submenu shell widget */ + ObmContext obm) { register MenuEntry mw, new; @@ -2881,10 +2764,7 @@ ObmContext obm; /* menu_delEntry -- Delete a widget from the menuWidgetList list. */ static void -menu_delEntry (w, client_data, call_data) -register Widget w; -XtPointer client_data; /* not used */ -XtPointer call_data; /* not used */ +menu_delEntry (Widget w) { register MenuEntry mw, prev_mw; @@ -2905,10 +2785,7 @@ XtPointer call_data; /* not used */ /* menu_popup -- Called when a menu is popped up. */ static void -menu_popup (w, client_data, call_data) -Widget w; -XtPointer client_data; -XtPointer call_data; /* not used */ +menu_popup (Widget w, XtPointer client_data, XtPointer call_data) { register MenuPtr mp = (MenuPtr) client_data; mp->popped_up = True; @@ -2919,10 +2796,7 @@ XtPointer call_data; /* not used */ * child menus are popped down before popping down the parent. */ static void -menu_popdown (w, client_data, call_data) -Widget w; -XtPointer client_data; -XtPointer call_data; /* not used */ +menu_popdown (Widget w, XtPointer client_data, XtPointer call_data) { register MenuPtr mp = (MenuPtr) client_data; ObmContext obm = (ObmContext) mp->obm; @@ -2976,10 +2850,13 @@ XtPointer call_data; /* not used */ * popdown above. */ static void -menu_popdown_msgHandler (name,type,class,defaultp,params,num_params) -String name,type,class,defaultp; -String* params; -Cardinal* num_params; +menu_popdown_msgHandler ( + String name, + String type, + String class, + String defaultp, + String* params, + Cardinal* num_params) { } @@ -2991,8 +2868,7 @@ Cardinal* num_params; * is a submenu, and if so, popup the submenu. */ static void -menu_highlight (w) -register Widget w; +menu_highlight (Widget w) { register MenuEntry mw, sm; ObmContext obm = global_obm_handle; @@ -3087,8 +2963,7 @@ register Widget w; * front of the standard class procedure. */ static void -menu_unhighlight (w) -register Widget w; +menu_unhighlight (Widget w) { register MenuEntry mw; @@ -3164,9 +3039,7 @@ register Widget w; /* findMenu -- Return the menu descriptor of a menu given its name. */ static MenuPtr -findMenu (obm, name) -register ObmContext obm; -char *name; +findMenu (ObmContext obm, char *name) { register ObjList lp; diff --git a/obm/widget.c b/obm/widget.c index 5433e14..f2f382e 100644 --- a/obm/widget.c +++ b/obm/widget.c @@ -4,6 +4,7 @@ #include #include "ObmP.h" #include "widget.h" +#include "ObmW/ListTree.h" /* * WIDGET class. @@ -193,13 +194,13 @@ static fontProp fontNamePropTable[] = { /* | */ /* | */ #define NUMITEMS(arr) ((int) (sizeof(arr) / sizeof(arr[0]))) /* \ | / */ /* \|/ */ -static char *widgetGetFontName(); /* MF016 */ +static char *widgetGetFontName(Display *, XFontStruct *); /* MF016 */ -static void do_text(); -static void do_userproc(); -static void do_popup(); -static void do_popdown(); +static void do_text(Widget, XEvent *, String *, Cardinal *); +static void do_userproc(Widget, XEvent *, String *, Cardinal *); +static void do_popup(Widget, XEvent *, String *, Cardinal *); +static void do_popdown(Widget, XEvent *, String *, Cardinal *); static XtActionsRec widget_actions[] = { {"call", do_userproc}, {"do_text", do_text}, @@ -207,44 +208,88 @@ static XtActionsRec widget_actions[] = { {"popdown", do_popdown}, }; -static void call_callbacks(); -static void widgetEvent(), widgetSetDestroy(), widgetDestroy(); -static void widgetCallback(), widgetSCCallback(), widgetJPCallback(); -static void widgetSPCallback(), widgetPUCallback(), widgetPDCallback(); -static void widgetSBCallback(), widgetSECallback(), widgetRPCallback(); -static void widgetRGCallback(), widgetLTHCallback(), widgetLTACallback(); -static void widgetTCCCallback(); -static int widgetSet(), widgetGet(), widgetMap(), widgetUnmap(); -static int widgetRealize(), widgetUnrealize(), widgetIsRealized(); -static int widgetPopup(), widgetPopupSpringLoaded(), widgetPopdown(); -static int widgetAddCallback(), widgetDeleteCallback(); -static int widgetMove(), widgetResize(), widgetConfigure(); -static int widgetParseGeometry(), widgetGetGeometry(); -static int widgetSetSensitive(), widgetIsSensitive(); -static int widgetManage(), widgetUnmanage(), widgetAppend(); -static int widgetAddEventHandler(), widgetRemoveEventHandler(); -static int widgetHighlight(), widgetUnhighlight(), widgetSetTop(); -static int widgetSetList(), widgetGetItem(), widgetGetValue(); -static int widgetGetThumb(), widgetMoveThumb(), widgetResizeThumb(); -static int widgetSetScrollbar(), widgetSetTTName(), widgetGetTTName(); -static int widgetSetListTree(), widgetListTreeSelect(); -static int widgetListTreeHighlight(), widgetListTreeDelete(); -static int widgetSetLocation(), widgetSetCoordinates(); +static void call_callbacks(WidgetObject, int, char *); +static void widgetEvent(Widget, ObmCallback, XEvent *, Boolean *); +static void widgetSetDestroy(ObmObject); +static void widgetDestroy(ObmObject); +static void widgetCallback(Widget, WidgetObject, caddr_t); +static void widgetSCCallback(Widget w, WidgetObject obj, caddr_t); +static void widgetJPCallback(Widget w, WidgetObject obj, caddr_t); +static void widgetSPCallback(Widget w, WidgetObject obj, caddr_t); +static void widgetPUCallback(Widget w, WidgetObject obj, caddr_t); +static void widgetPDCallback(Widget w, WidgetObject obj, caddr_t); +static void widgetSBCallback(Widget w, WidgetObject obj, caddr_t); +static void widgetSECallback(Widget w, WidgetObject obj, caddr_t); +static void widgetRPCallback(Widget w, WidgetObject obj, caddr_t); +static void widgetRGCallback(Widget w, WidgetObject obj, caddr_t); +static void widgetLTHCallback(Widget w, WidgetObject obj, caddr_t); +static void widgetLTACallback(Widget w, WidgetObject obj, caddr_t); +static void widgetTCCCallback(Widget w, WidgetObject obj, caddr_t); +static int widgetSet(MsgContext, Tcl_Interp *, int, char **); +static int widgetGet(MsgContext, Tcl_Interp *, int, char **); +static int widgetMap(MsgContext, Tcl_Interp *, int, char **); +static int widgetUnmap(MsgContext, Tcl_Interp *, int, char **); +static int widgetRealize(MsgContext, Tcl_Interp *, int, char **); +static int widgetUnrealize(MsgContext, Tcl_Interp *, int, char **); +static int widgetIsRealized(MsgContext, Tcl_Interp *, int, char **); +static int widgetPopup(MsgContext, Tcl_Interp *, int, char **); +static int widgetPopupSpringLoaded(MsgContext, Tcl_Interp *, int, char **); +static int widgetPopdown(MsgContext, Tcl_Interp *, int, char **); +static int widgetAddCallback(MsgContext, Tcl_Interp *, int, char **); +static int widgetDeleteCallback(MsgContext, Tcl_Interp *, int, char **); +static int widgetMove(MsgContext, Tcl_Interp *, int, char **); +static int widgetResize(MsgContext, Tcl_Interp *, int, char **); +static int widgetConfigure(MsgContext, Tcl_Interp *, int, char **); +static int widgetParseGeometry(MsgContext, Tcl_Interp *, int, char **); +static int widgetGetGeometry(MsgContext, Tcl_Interp *, int, char **); +static int widgetSetSensitive(MsgContext, Tcl_Interp *, int, char **); +static int widgetIsSensitive(MsgContext, Tcl_Interp *, int, char **); +static int widgetManage(MsgContext, Tcl_Interp *, int, char **); +static int widgetUnmanage(MsgContext, Tcl_Interp *, int, char **); +static int widgetAppend(MsgContext, Tcl_Interp *, int, char **); +static int widgetAddEventHandler(MsgContext, Tcl_Interp *, int, char **); +static int widgetRemoveEventHandler(MsgContext, Tcl_Interp *, int, char **); +static int widgetHighlight(MsgContext, Tcl_Interp *, int, char **); +static int widgetUnhighlight(MsgContext, Tcl_Interp *, int, char **); +static int widgetSetTop(MsgContext, Tcl_Interp *, int, char **); +static int widgetSetList(MsgContext, Tcl_Interp *, int, char **); +static int widgetGetItem(MsgContext, Tcl_Interp *, int, char **); +static int widgetGetValue(MsgContext, Tcl_Interp *, int, char **); +static int widgetGetThumb(MsgContext, Tcl_Interp *, int, char **); +static int widgetMoveThumb(MsgContext, Tcl_Interp *, int, char **); +static int widgetResizeThumb(MsgContext, Tcl_Interp *, int, char **); +static int widgetSetScrollbar(MsgContext, Tcl_Interp *, int, char **); +static int widgetSetTTName(MsgContext, Tcl_Interp *, int, char **); +static int widgetGetTTName(MsgContext, Tcl_Interp *, int, char **); +static int widgetSetListTree(MsgContext, Tcl_Interp *, int, char **); +static int widgetListTreeSelect(MsgContext, Tcl_Interp *, int, char **); +static int widgetListTreeHighlight(MsgContext, Tcl_Interp *, int, char **); +static int widgetListTreeDelete(MsgContext, Tcl_Interp *, int, char **); +static int widgetSetLocation(MsgContext, Tcl_Interp *, int, char **); +static int widgetSetCoordinates(MsgContext, Tcl_Interp *, int, char **); #ifndef OSI_COMPLIANT -static int widgetSetTable(), widgetSetCellAttr(), widgetGetCellAttr(); -static int widgetGetColAttr(), widgetSetColAttr(), widgetSetRowAttr(); -static int widgetDeleteRow(), widgetAddRow(), widgetGetTableSize(); -static int widgetDeleteCol(), widgetAddCol(), widgetSetTableSize(); +static int widgetSetTable(MsgContext, Tcl_Interp *, int, char **); +static int widgetSetCellAttr(MsgContext, Tcl_Interp *, int, char **); +static int widgetGetCellAttr(MsgContext, Tcl_Interp *, int, char **); +static int widgetGetColAttr(MsgContext, Tcl_Interp *, int, char **); +static int widgetSetColAttr(MsgContext, Tcl_Interp *, int, char **); +static int widgetSetRowAttr(MsgContext, Tcl_Interp *, int, char **); +static int widgetDeleteRow(MsgContext, Tcl_Interp *, int, char **); +static int widgetAddRow(MsgContext, Tcl_Interp *, int, char **); +static int widgetGetTableSize(MsgContext, Tcl_Interp *, int, char **); +static int widgetDeleteCol(MsgContext, Tcl_Interp *, int, char **); +static int widgetAddCol(MsgContext, Tcl_Interp *, int, char **); +static int widgetSetTableSize(MsgContext, Tcl_Interp *, int, char **); #endif -static int get_itemno(), buildTreeList(), widgetGetRowAttr(); +static int get_itemno(WidgetObject, char *); +static int buildTreeList(Widget, Tcl_Interp *, ListTreeItem *, char *); +static int widgetGetRowAttr(MsgContext, Tcl_Interp *, int, char **); /* WidgetClassInit -- Initialize the class record for the widget class. */ void -WidgetClassInit (obm, classrec) -ObmContext obm; -register ObjClassRec classrec; +WidgetClassInit (ObmContext obm, ObjClassRec classrec) { register int hashval, n; register char *ip; @@ -260,7 +305,7 @@ register ObjClassRec classrec; /* Install the class methods. */ classrec->ClassDestroy = WidgetClassDestroy; - classrec->Create = (ObmFunc) WidgetCreate; + classrec->Create = WidgetCreate; classrec->Destroy = WidgetDestroy; classrec->Evaluate = WidgetEvaluate; @@ -444,9 +489,7 @@ register ObjClassRec classrec; /* WidgetClassDestroy -- Custom destroy procedure for the widget class. */ void -WidgetClassDestroy (obm, classrec) -ObmContext obm; -register ObjClassRec classrec; +WidgetClassDestroy (ObmContext obm, ObjClassRec classrec) { register MsgContext msg = (MsgContext) classrec->class_data; @@ -462,13 +505,13 @@ register ObjClassRec classrec; /* WidgetCreate -- Create an instance of a widget object. */ ObmObject -WidgetCreate (obm, name, classrec, parent, args, nargs) -ObmContext obm; -char *name; -ObjClassRec classrec; -char *parent; -ArgList args; -int nargs; +WidgetCreate ( + ObmContext obm, + char *name, + ObjClassRec classrec, + char *parent, + ArgList args, + int nargs) { register WidgetObject obj, pobj; Widget w, pw; @@ -579,8 +622,7 @@ int nargs; /* WidgetDestroy -- Destroy an instance of a widget object. */ void -WidgetDestroy (object) -ObmObject object; +WidgetDestroy (ObmObject object) { register WidgetObject obj = (WidgetObject) object; register WidgetPrivate wp = &obj->widget; @@ -625,8 +667,7 @@ ObmObject object; * while the widgets have already been destroyed. */ static void -widgetSetDestroy (obj) -register ObmObject obj; +widgetSetDestroy (ObmObject obj) { register int i; ObmObject child; @@ -649,8 +690,7 @@ register ObmObject obj; * shells and their children. */ static void -widgetDestroy (obj) -register ObmObject obj; +widgetDestroy (ObmObject obj) { register int i; WidgetObject wobj = (WidgetObject) obj; @@ -673,9 +713,7 @@ register ObmObject obj; /* WidgetEvaluate -- Evaluate a widget command or message. */ int -WidgetEvaluate (object, command) -ObmObject object; -char *command; +WidgetEvaluate (ObmObject object, char *command) { register WidgetObject obj = (WidgetObject) object; register Tcl_Interp *tcl, *server = obj->widget.obm->tcl; @@ -743,8 +781,7 @@ char *command; * object descriptor. */ Widget -widgetGetPointer (object) -ObmObject object; +widgetGetPointer (ObmObject object) { register WidgetObject obj = (WidgetObject) object; return (obj->widget.w); @@ -754,9 +791,7 @@ ObmObject object; /* widgetToObject -- Convert a widget pointer to an OBM object name. */ WidgetObject -widgetToObject (obm, w) -ObmContext obm; -Widget w; +widgetToObject (ObmContext obm, Widget w) { register int i; register WidgetPrivate wp; @@ -783,11 +818,7 @@ Widget w; * wrong type of callback can be registered, but it will never be called. */ static int -widgetAddCallback (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetAddCallback (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { register WidgetObject obj = (WidgetObject) msg->object[msg->level]; register WidgetPrivate wp = &obj->widget; @@ -856,11 +887,7 @@ char **argv; * Usage: deleteCallback */ static int -widgetDeleteCallback (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetDeleteCallback (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { register WidgetObject obj = (WidgetObject) msg->object[msg->level]; register WidgetPrivate wp = &obj->widget; @@ -887,10 +914,7 @@ char **argv; * the callback type. */ static void -widgetCallback (w, obj, call_data) -Widget w; -WidgetObject obj; -caddr_t call_data; +widgetCallback (Widget w, WidgetObject obj, caddr_t call_data) { register WidgetPrivate wp = &obj->widget; register ObjClassRec classrec = obj->core.classrec; @@ -1031,10 +1055,7 @@ caddr_t call_data; * are currently selected. */ static void -widgetRGCallback (w, obj, call_data) -Widget w; -WidgetObject obj; -caddr_t call_data; +widgetRGCallback (Widget w, WidgetObject obj, caddr_t call_data) { register WidgetPrivate wp = &obj->widget; long selection = (long) call_data; @@ -1088,10 +1109,7 @@ caddr_t call_data; /* widgetLTHCallback -- ListTree highlight callback. */ static void -widgetLTHCallback (w, obj, call_data) -Widget w; -WidgetObject obj; -caddr_t call_data; +widgetLTHCallback (Widget w, WidgetObject obj, caddr_t call_data) { ListTreeMultiReturnStruct *list; ListTreeItem *item; @@ -1129,10 +1147,7 @@ caddr_t call_data; /* widgetLTACallback -- ListTree activate callback. */ static void -widgetLTACallback (w, obj, call_data) -Widget w; -WidgetObject obj; -caddr_t call_data; +widgetLTACallback (Widget w, WidgetObject obj, caddr_t call_data) { ListTreeActivateStruct *ret; ListTreeMultiReturnStruct ret2; @@ -1165,10 +1180,7 @@ caddr_t call_data; /* widgetSBCallback -- Repeater start callback. */ static void -widgetSBCallback (w, obj, call_data) -Widget w; -WidgetObject obj; -caddr_t call_data; +widgetSBCallback (Widget w, WidgetObject obj, caddr_t call_data) { register WidgetPrivate wp = &obj->widget; call_callbacks (obj, CtstartCallback, NULL); @@ -1178,10 +1190,7 @@ caddr_t call_data; /* widgetSECallback -- Repeater stop callback. */ static void -widgetSECallback (w, obj, call_data) -Widget w; -WidgetObject obj; -caddr_t call_data; +widgetSECallback (Widget w, WidgetObject obj, caddr_t call_data) { register WidgetPrivate wp = &obj->widget; call_callbacks (obj, CtstopCallback, NULL); @@ -1193,10 +1202,7 @@ caddr_t call_data; * thumb (panner) or child widget (porthole, viewport). */ static void -widgetRPCallback (w, obj, call_data) -Widget w; -WidgetObject obj; -caddr_t call_data; +widgetRPCallback (Widget w, WidgetObject obj, caddr_t call_data) { register WidgetPrivate wp = &obj->widget; register XawPannerReport *rp = (XawPannerReport *) call_data; @@ -1215,10 +1221,7 @@ caddr_t call_data; * called when the thumb port of the scroll bar is dragged or moved (button 2). */ static void -widgetJPCallback (w, obj, call_data) -Widget w; -WidgetObject obj; -caddr_t call_data; +widgetJPCallback (Widget w, WidgetObject obj, caddr_t call_data) { register WidgetPrivate wp = &obj->widget; XfwfScrollInfo *info = (XfwfScrollInfo *) call_data; @@ -1264,10 +1267,7 @@ caddr_t call_data; * used for incremental scrolling (button 1 or 3). */ static void -widgetSPCallback (w, obj, call_data) -Widget w; -WidgetObject obj; -caddr_t call_data; +widgetSPCallback (Widget w, WidgetObject obj, caddr_t call_data) { register WidgetPrivate wp = &obj->widget; char message[100]; @@ -1321,16 +1321,12 @@ caddr_t call_data; * plotted. */ static void -widgetSCCallback (w, obj, call_data) -Widget w; -WidgetObject obj; -caddr_t call_data; +widgetSCCallback (Widget w, WidgetObject obj, caddr_t call_data) { register WidgetPrivate wp = &obj->widget; register ObmContext obm = wp->obm; char *callback_name; ObmCallback cb; - double atof(); int status, i; callback_name = "getValue"; @@ -1371,10 +1367,7 @@ caddr_t call_data; * widgets. Called when the window pops up. */ static void -widgetPUCallback (w, obj, call_data) -Widget w; -WidgetObject obj; -caddr_t call_data; +widgetPUCallback (Widget w, WidgetObject obj, caddr_t call_data) { register WidgetPrivate wp = &obj->widget; call_callbacks (obj, CtpopupCallback, NULL); @@ -1385,10 +1378,7 @@ caddr_t call_data; * widgets. Called when the window pops down. */ static void -widgetPDCallback (w, obj, call_data) -Widget w; -WidgetObject obj; -caddr_t call_data; +widgetPDCallback (Widget w, WidgetObject obj, caddr_t call_data) { register WidgetPrivate wp = &obj->widget; call_callbacks (obj, CtpopdownCallback, NULL); @@ -1399,10 +1389,7 @@ caddr_t call_data; * widget object, passing the given message on the argument list. */ static void -call_callbacks (obj, callback_type, message) -WidgetObject obj; -int callback_type; -char *message; +call_callbacks (WidgetObject obj, int callback_type, char *message) { register WidgetPrivate wp = &obj->widget; register ObmContext obm = wp->obm; @@ -1458,11 +1445,7 @@ char *message; * return is typed to process an input string ("linemode" callback type). */ static void -do_text (w, event, params, num_params) -Widget w; -XEvent *event; -String *params; -Cardinal *num_params; +do_text (Widget w, XEvent *event, String *params, Cardinal *num_params) { char *message, *s; WidgetObject obj; @@ -1507,11 +1490,7 @@ Cardinal *num_params; * The "user procedure" can be any server procedure. */ static void -do_userproc (w, event, params, num_params) -Widget w; -XEvent *event; -String *params; -Cardinal *num_params; +do_userproc (Widget w, XEvent *event, String *params, Cardinal *num_params) { register char *ip, *op; ObmContext obm = global_obm_handle; @@ -1639,11 +1618,7 @@ Cardinal *num_params; * automatically when the widget changes the translation table. */ static int -widgetSetTTName (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetSetTTName (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { register WidgetObject obj = (WidgetObject) msg->object[msg->level]; register WidgetPrivate wp = &obj->widget; @@ -1656,9 +1631,7 @@ char **argv; } void -widget_setTTName (obj, name) -WidgetObject obj; -char *name; +widget_setTTName (WidgetObject obj, char *name) { register WidgetPrivate wp = &obj->widget; strncpy (wp->translation_table_name, name, SZ_NAME); @@ -1671,11 +1644,7 @@ char *name; * Usage: name = getTTName */ static int -widgetGetTTName (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetGetTTName (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { register WidgetObject obj = (WidgetObject) msg->object[msg->level]; register WidgetPrivate wp = &obj->widget; @@ -1685,8 +1654,7 @@ char **argv; } char * -widget_getTTName (obj) -WidgetObject obj; +widget_getTTName (WidgetObject obj) { register WidgetPrivate wp = &obj->widget; return (wp->translation_table_name); @@ -1699,11 +1667,7 @@ WidgetObject obj; * Usage: popup(menu-name [xoffset [yoffset]]) */ static void -do_popup (w, event, params, num_params) -Widget w; -XEvent *event; -String *params; -Cardinal *num_params; +do_popup (Widget w, XEvent *event, String *params, Cardinal *num_params) { register char *ip, *op; ObmContext obm = global_obm_handle; @@ -1788,11 +1752,7 @@ Cardinal *num_params; * Usage: popdown(menu-name) */ static void -do_popdown (w, event, params, num_params) -Widget w; -XEvent *event; -String *params; -Cardinal *num_params; +do_popdown (Widget w, XEvent *event, String *params, Cardinal *num_params) { register char *ip, *op; ObmContext obm = global_obm_handle; @@ -1817,11 +1777,7 @@ Cardinal *num_params; * Usage: set */ static int -widgetSet (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetSet (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -2054,11 +2010,7 @@ set_bval: XtSetArg (args[0], rp->name, value); * Usage: get */ static int -widgetGet (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetGet (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -2176,11 +2128,7 @@ char **argv; * Usage: append */ static int -widgetAppend (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetAppend (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -2241,11 +2189,7 @@ char **argv; * special characters). */ static int -widgetSetList (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetSetList (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -2300,11 +2244,7 @@ char **argv; * ITEMNO will be set to "none" ({}) on output. */ static int -widgetGetItem (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetGetItem (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -2423,11 +2363,7 @@ char **argv; * List items may be specified by either the element number or by name. */ static int -widgetHighlight (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetHighlight (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -2466,11 +2402,7 @@ char **argv; * the actual item number, or the name of the list element. */ static int -widgetUnhighlight (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetUnhighlight (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -2508,9 +2440,7 @@ char **argv; * either the ascii representation of the item number, or the item string. */ static int -get_itemno (obj, itemstr) -WidgetObject obj; -char *itemstr; +get_itemno (WidgetObject obj, char *itemstr) { WidgetPrivate wp = &obj->widget; register int i; @@ -2549,11 +2479,7 @@ char *itemstr; * Usage: value = getValue */ static int -widgetGetValue (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetGetValue (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -2578,11 +2504,7 @@ char **argv; * Usage: getThumb x [y [width [height]]] */ static int -widgetGetThumb (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetGetThumb (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -2631,17 +2553,12 @@ char **argv; * arguments should be floating point values in the range 0.0 to 1.0. */ static int -widgetMoveThumb (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetMoveThumb (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; double x, y; - double atof(); if (!(obmClass (obj->core.classrec, WtSlider2d))) { Tcl_SetResult (obm->tcl, "not a slider2d widget", TCL_STATIC); @@ -2673,17 +2590,12 @@ char **argv; * values in the range 0.0 to 1.0. */ static int -widgetResizeThumb (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetResizeThumb (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; double width, height; - double atof(); if (!(obmClass (obj->core.classrec, WtSlider2d))) { Tcl_SetResult (obm->tcl, "not a slider2d widget", TCL_STATIC); @@ -2715,17 +2627,12 @@ char **argv; * height arguments should be floating point values in the range 0.0 to 1.0. */ static int -widgetSetScrollbar (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetSetScrollbar (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; double position, size; - double atof(); if (!(obmClass (obj->core.classrec, WtScrollbar) || obmClass (obj->core.classrec, WtScrollbar2))) { @@ -2759,17 +2666,12 @@ char **argv; * */ static int -widgetSetLocation (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetSetLocation (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; float x, y; - double atof(); if (!(obmClass (obj->core.classrec, WtViewport))) { Tcl_SetResult (obm->tcl, "not a viewport widget", TCL_STATIC); @@ -2796,17 +2698,12 @@ char **argv; * */ static int -widgetSetCoordinates (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetSetCoordinates (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; int x, y; - double atof(); if (!(obmClass (obj->core.classrec, WtViewport))) { Tcl_SetResult (obm->tcl, "not a viewport widget", TCL_STATIC); @@ -2833,11 +2730,7 @@ char **argv; * */ static int -widgetSetTop (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetSetTop (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -2881,11 +2774,7 @@ char **argv; * */ static int -widgetSetListTree (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetSetListTree (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -2897,7 +2786,6 @@ char **argv; static char **sv_items = NULL; static int sv_nitems; ListTreeItem *val; - extern ListTreeItem *ListTreeAdd(), *ListTreeFirstItem(); /* Do some error checking first. */ @@ -2955,11 +2843,7 @@ ret: Tcl_Free ((char *) items); * lists. This is used to fill out the ListTree widget values. */ static int -buildTreeList (w, tcl, parent, item) -Widget w; -Tcl_Interp *tcl; -ListTreeItem *parent; -char *item; +buildTreeList (Widget w, Tcl_Interp *tcl, ListTreeItem *parent, char *item) { const char **fields, **entry; int i, nentries, nfields, field; @@ -3017,11 +2901,7 @@ char *item; * */ static int -widgetListTreeSelect (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetListTreeSelect (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -3031,10 +2911,6 @@ char **argv; int i, count; ListTreeItem *item, *titem, *first; - extern ListTreeItem *ListTreeFindSiblingName(); - extern ListTreeItem *ListTreeFindChildName(); - extern ListTreeItem *ListTreeFindChildNameInTree(); - if (argc < 2) return (TCL_ERROR); @@ -3131,11 +3007,7 @@ char **argv; * */ static int -widgetListTreeHighlight (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetListTreeHighlight (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -3145,10 +3017,6 @@ char **argv; int i, count; ListTreeItem *item, *titem, *first, *op; - extern ListTreeItem *ListTreeFindSiblingName(); - extern ListTreeItem *ListTreeFindChildName(); - extern ListTreeItem *ListTreeFindChildNameInTree(); - if (argc < 2) return (TCL_ERROR); @@ -3220,11 +3088,7 @@ char **argv; * */ static int -widgetListTreeDelete (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetListTreeDelete (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -3232,10 +3096,6 @@ char **argv; char *top, *name; ListTreeItem *item, *titem, *first; - extern ListTreeItem *ListTreeFindSiblingName(); - extern ListTreeItem *ListTreeFindChildName(); - extern ListTreeItem *ListTreeFirstItem(); - if (argc < 2) return (TCL_ERROR); @@ -3303,11 +3163,7 @@ char **argv; * */ static int -widgetSetTable (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetSetTable (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -3367,11 +3223,7 @@ char **argv; * */ static int -widgetGetCellAttr (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetGetCellAttr (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -3413,11 +3265,7 @@ char **argv; * */ static int -widgetSetCellAttr (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetSetCellAttr (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -3481,11 +3329,7 @@ char **argv; * */ static int -widgetSetColAttr (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetSetColAttr (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -3594,11 +3438,7 @@ char **argv; * */ static int -widgetGetColAttr (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetGetColAttr (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -3655,11 +3495,7 @@ char **argv; * foreground foreground color */ static int -widgetSetRowAttr (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetSetRowAttr (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -3723,11 +3559,7 @@ char **argv; * */ static int -widgetGetRowAttr (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetGetRowAttr (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -3758,11 +3590,7 @@ char **argv; * */ static int -widgetDeleteCol (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetDeleteCol (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -3798,11 +3626,7 @@ char **argv; * */ static int -widgetAddCol (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetAddCol (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -3839,11 +3663,7 @@ char **argv; * */ static int -widgetDeleteRow (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetDeleteRow (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -3878,11 +3698,7 @@ char **argv; * */ static int -widgetAddRow (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetAddRow (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -3918,11 +3734,7 @@ char **argv; * */ static int -widgetSetTableSize (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetSetTableSize (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -3949,11 +3761,7 @@ char **argv; * */ static int -widgetGetTableSize (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetGetTableSize (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -3987,11 +3795,7 @@ char **argv; * Usage: realize */ static int -widgetRealize (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetRealize (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -4007,11 +3811,7 @@ char **argv; * Usage: unrealize */ static int -widgetUnrealize (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetUnrealize (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -4026,11 +3826,7 @@ char **argv; * Usage: isRealized */ static int -widgetIsRealized (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetIsRealized (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -4049,11 +3845,7 @@ char **argv; * Usage: map */ static int -widgetMap (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetMap (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -4069,11 +3861,7 @@ char **argv; * Usage: unmap */ static int -widgetUnmap (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetUnmap (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -4102,11 +3890,7 @@ char **argv; * of the children. */ static int -widgetManage (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetManage (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -4134,11 +3918,7 @@ char **argv; * of the children. */ static int -widgetUnmanage (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetUnmanage (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -4160,11 +3940,7 @@ char **argv; * Usage: popup [grab-kind] */ static int -widgetPopup (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetPopup (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -4190,11 +3966,7 @@ char **argv; * Usage: popdown */ static int -widgetPopdown (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetPopdown (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -4210,11 +3982,7 @@ char **argv; * Usage: popupSpringLoaded */ static int -widgetPopupSpringLoaded (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetPopupSpringLoaded (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -4229,11 +3997,7 @@ char **argv; * Usage: move x y */ static int -widgetMove (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetMove (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -4256,11 +4020,7 @@ char **argv; * Usage: resize width height [border-width] */ static int -widgetResize (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetResize (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -4288,11 +4048,7 @@ char **argv; * Usage: configure x y width height [border-width] */ static int -widgetConfigure (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetConfigure (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -4325,11 +4081,7 @@ char **argv; * must be fully specified. */ static int -widgetParseGeometry (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetParseGeometry (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -4423,11 +4175,7 @@ char **argv; * of the region are returned. */ static int -widgetGetGeometry (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetGetGeometry (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -4478,11 +4226,7 @@ char **argv; * Usage: setSensitive */ static int -widgetSetSensitive (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetSetSensitive (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -4508,11 +4252,7 @@ char **argv; * Usage: isSensitive */ static int -widgetIsSensitive (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetIsSensitive (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; @@ -4614,11 +4354,7 @@ struct evType { * Usage: addEventHandler [...] */ static int -widgetAddEventHandler (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetAddEventHandler (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; register WidgetPrivate wp = &obj->widget; @@ -4672,11 +4408,7 @@ char **argv; * Usage: removeEventHandler procname */ static int -widgetRemoveEventHandler (msg, tcl, argc, argv) -MsgContext msg; -Tcl_Interp *tcl; -int argc; -char **argv; +widgetRemoveEventHandler (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; register WidgetPrivate wp = &obj->widget; @@ -4720,11 +4452,7 @@ char **argv; * the event. */ static void -widgetEvent (w, cb, event, continue_to_dispatch) -Widget w; -ObmCallback cb; -XEvent *event; -Boolean *continue_to_dispatch; +widgetEvent (Widget w, ObmCallback cb, XEvent *event, Boolean *continue_to_dispatch) { WidgetObject obj = (WidgetObject) cb->u.obj; WidgetPrivate wp = &obj->widget; @@ -4944,9 +4672,7 @@ Boolean *continue_to_dispatch; /* widgetEventState -- Encode the "state" field of an event struct. */ char * -widgetEventState (op, state) -register char *op; -unsigned int state; +widgetEventState (char *op, unsigned int state) { if (state & ShiftMask) { sprintf (op, "shift "); while (*op) op++; } @@ -4977,9 +4703,7 @@ unsigned int state; #define SZ_FONT_NAME 128 static char * -widgetGetFontName (display, fs) /* MF016 */ -Display *display; -XFontStruct *fs; +widgetGetFontName (Display *display, XFontStruct *fs) /* MF016 */ { register int i; unsigned long val; diff --git a/obm/widget.h b/obm/widget.h index ffaef86..affcb62 100644 --- a/obm/widget.h +++ b/obm/widget.h @@ -38,10 +38,10 @@ struct msgContext { }; typedef struct msgContext *MsgContext; -extern int WidgetEvaluate(); -extern void WidgetDestroy(); -extern void WidgetClassDestroy(); -extern ObmObject WidgetCreate(); -extern WidgetObject widgetToObject(); -extern int coordType(); -extern char *widgetEventState(); +extern int WidgetEvaluate(ObmObject, char *); +extern void WidgetDestroy(ObmObject); +extern void WidgetClassDestroy(ObmContext, ObjClassRec); +extern ObmObject WidgetCreate(ObmContext, char *, ObjClassRec, char *, ArgList, int); +extern WidgetObject widgetToObject(ObmContext, Widget); +extern int coordType(char *); +extern char *widgetEventState(char *, unsigned int); From 5aa04ffc9c8afc9b01c12a0786cee64838faf34c Mon Sep 17 00:00:00 2001 From: Ole Streicher Date: Sun, 14 Jul 2024 15:55:59 +0200 Subject: [PATCH 02/21] Remove "register" spec from obm --- obm/Obm.c | 74 +++---- obm/ObmW/Container.c | 6 +- obm/ObmW/DrawIString.c | 4 +- obm/ObmW/DrawString.c | 4 +- obm/ObmW/DrawingArea.c | 4 +- obm/ObmW/Gterm.c | 48 ++--- obm/ObmW/GtermCmap.c | 18 +- obm/ObmW/GtermCnv.c | 10 +- obm/ObmW/GtermGraphics.c | 74 +++---- obm/ObmW/GtermImaging.c | 216 +++++++++---------- obm/ObmW/GtermMapping.c | 98 ++++----- obm/ObmW/GtermMarker.c | 434 +++++++++++++++++++-------------------- obm/ObmW/HTML.c | 2 +- obm/ObmW/MultiList.c | 4 +- obm/ObmW/Separator.c | 2 +- obm/ObmW/Table.c | 44 ++-- obm/ObmW/TableUtil.c | 102 ++++----- obm/ObmW/TableUtil.h | 4 +- obm/ObmW/Tablist2Tabs.c | 4 +- obm/ObmW/Tabs.c | 2 +- obm/ObmW/TextWidth.c | 4 +- obm/client.c | 30 +-- obm/geom.c | 2 +- obm/gterm.c | 380 +++++++++++++++++----------------- obm/html.c | 116 +++++------ obm/listres/listres.c | 10 +- obm/marker.c | 110 +++++----- obm/obmres.c | 4 +- obm/param.c | 34 +-- obm/server.c | 178 ++++++++-------- obm/widget.c | 144 ++++++------- 31 files changed, 1083 insertions(+), 1083 deletions(-) diff --git a/obm/Obm.c b/obm/Obm.c index 2de58a1..13510ac 100644 --- a/obm/Obm.c +++ b/obm/Obm.c @@ -122,9 +122,9 @@ Tcl_SetErrorLine(Tcl_Interp *tcl, int lineNum) ObmContext ObmOpen (XtAppContext app_context, int argc, char *argv[]) { - register ObmContext obm; - register ObjClassRec classrec; - register int i; + ObmContext obm; + ObjClassRec classrec; + int i; char *s; /* Initialize object manager global context. */ @@ -163,8 +163,8 @@ ObmOpen (XtAppContext app_context, int argc, char *argv[]) void ObmClose (ObmContext obm) { - register ObjClassRec classrec; - register int i; + ObjClassRec classrec; + int i; /* Get rid of any current UI. */ ObmInitialize (obm); @@ -193,9 +193,9 @@ ObmClose (ObmContext obm) void ObmInitialize (ObmContext obm) { - register ObmObject obj, nextobj; - register ObmCallback cb; - register MenuItem ip; + ObmObject obj, nextobj; + ObmCallback cb; + MenuItem ip; ObjList lp, lp_next; Menu mp; int i; @@ -281,7 +281,7 @@ ObmInitialize (ObmContext obm) void ObmActivate (ObmContext obm) { - register ObmObject obj; + ObmObject obj; char defaultUI[SZ_MESSAGE]; /* UI has already been activated? */ @@ -334,8 +334,8 @@ ObmActivate (ObmContext obm) void ObmDeactivate (ObmContext obm, Boolean unmap) { - register ObmObject obj; - register ObmCallback cb; + ObmObject obj; + ObmCallback cb; /* The Obm "activated" flag is not affected by deactivation. * Deactivation merely means that control has temporarily been @@ -364,8 +364,8 @@ ObmDeactivate (ObmContext obm, Boolean unmap) static void obm_call_activate_callbacks (ObmContext obm, int state) { - register ObmCallback cb; - register int type; + ObmCallback cb; + int type; /* Call any client activate callbacks. */ type = state ? OBMCB_activate : OBMCB_deactivate; @@ -441,8 +441,8 @@ ObmGetInterp (ObmContext obm) int ObmDeliverMsg (ObmContext obm, char *object, char *message) { - register ObmEvaluateFunc evaluate; - register ObmObject obj; + ObmEvaluateFunc evaluate; + ObmObject obj; int status = TCL_ERROR; if (obm->debug) { @@ -523,7 +523,7 @@ ObmDeliverMsgFromFile (ObmContext obm, char *object, char *fname) void ObmAddCallback (ObmContext obm, int callback_type, ObmFunc fcn, XtPointer client_data) { - register ObmCallback cb; + ObmCallback cb; if (!(cb = obmAddCallback (&obm->callback_list))) return; @@ -557,8 +557,8 @@ ObmRemoveCallback (ObmContext obm, ObmCallback callback) ObmObject obmFindObject (ObmContext obm, char *object) { - register int hashval, n; - register char *ip, *op; + int hashval, n; + char *ip, *op; ObmObject objlist1[MAXOBJ], objlist2[MAXOBJ]; ObmObject obj, *otemp, *objs, *pobjs; char name[SZ_NAME]; @@ -617,9 +617,9 @@ obm_nameToObjectList ( int *nobjs, /* number of objects found (output) */ ObmObject *objs) /* list of objects (output) */ { - register char *ip; - register int hashval, n; - register ObmObject obj; + char *ip; + int hashval, n; + ObmObject obj; int accept, i; if (object == NULL) @@ -666,8 +666,8 @@ obmNewObject ( ArgList args, /* optional argument list */ int nargs) /* optional argument list */ { - register char *ip; - register int hashval, n; + char *ip; + int hashval, n; ObmObject newobj, obj, pobj; ObjClassRec classrec; @@ -747,9 +747,9 @@ obmNewObject ( void obmDestroyObject (ObmContext obm, ObmObject object) { - register ObmObjectCore cp = &object->core; - register ObmObject obj; - register int i; + ObmObjectCore cp = &object->core; + ObmObject obj; + int i; int hashval, n; char *ip; @@ -848,9 +848,9 @@ obmDestroyObject (ObmContext obm, ObmObject object) void obmDisplay (ObmContext obm, ObmObject obj) { - register Widget w = widgetGetPointer (obj); - register ObmObject child; - register int i; + Widget w = widgetGetPointer (obj); + ObmObject child; + int i; char buf[SZ_NAME]; for (i=0; i < obj->core.nchildren; i++) { @@ -875,9 +875,9 @@ obmDisplay (ObmContext obm, ObmObject obj) void obmUndisplay (ObmContext obm, ObmObject obj) { - register int i; - register ObmObject child; - register Widget w = widgetGetPointer (obj); + int i; + ObmObject child; + Widget w = widgetGetPointer (obj); XWindowAttributes wa; char *s; @@ -910,8 +910,8 @@ obmUndisplay (ObmContext obm, ObmObject obj) ObjClassRec obmGetClassrec (char *classname) { - register ObjClassRec classrec; - register int i; + ObjClassRec classrec; + int i; for (i=0; i < XtNumber(UiObjects); i++) { classrec = &UiObjects[i]; @@ -945,7 +945,7 @@ obmClass (ObjClassRec classrec, unsigned long flag1, unsigned long flag2) ObmCallback obmAddCallback (ObmCallback *callback_list) { - register ObmCallback cb, last_cb; + ObmCallback cb, last_cb; /* Find tail of list. */ for (cb = last_cb = *callback_list; cb; cb = cb->next) @@ -968,7 +968,7 @@ obmAddCallback (ObmCallback *callback_list) void obmRemoveCallback (ObmCallback *callback_list, ObmCallback callback) { - register ObmCallback cb, last_cb; + ObmCallback cb, last_cb; if (!callback) return; @@ -996,7 +996,7 @@ obmRemoveCallback (ObmCallback *callback_list, ObmCallback callback) int obmClientCommand (Tcl_Interp *tcl, char *commmand) { - register char *ip, *op; + char *ip, *op; char name[SZ_NAME]; Tcl_CmdInfo info; diff --git a/obm/ObmW/Container.c b/obm/ObmW/Container.c index c082ce3..00f6396 100644 --- a/obm/ObmW/Container.c +++ b/obm/ObmW/Container.c @@ -63,7 +63,7 @@ static void InsPixel(w, off, value) int off; XrmValue *value; { - register ContainerWidget p = (ContainerWidget) w; + ContainerWidget p = (ContainerWidget) w; static Pixel pixel; if (off == offset(top_shadow_color)) @@ -205,7 +205,7 @@ static void initialize(request, new, args, num_args) static void destroy(w) Widget w; { - register ContainerWidget c = (ContainerWidget)w; + ContainerWidget c = (ContainerWidget)w; XtReleaseGC(w, c->container.top_shadow_GC); XtReleaseGC(w, c->container.bottom_shadow_GC); @@ -280,7 +280,7 @@ static void Redisplay(gw, event, region) XEvent *event; /* unused */ Region region; /* unused */ { - register ContainerWidget c = (ContainerWidget) gw; + ContainerWidget c = (ContainerWidget) gw; XClearWindow (XtDisplay(gw), XtWindow(gw)); diff --git a/obm/ObmW/DrawIString.c b/obm/ObmW/DrawIString.c index 6f81404..0032799 100644 --- a/obm/ObmW/DrawIString.c +++ b/obm/ObmW/DrawIString.c @@ -20,8 +20,8 @@ XfwfDrawImageString(display, drawable, gc, x, y, string, length, tabs) int length; int *tabs; { - register char *p, *ep; - register int tx, tab; + char *p, *ep; + int tx, tab; tab = tx = 0; for (p = string; length; ) diff --git a/obm/ObmW/DrawString.c b/obm/ObmW/DrawString.c index 280504e..2a58e68 100644 --- a/obm/ObmW/DrawString.c +++ b/obm/ObmW/DrawString.c @@ -20,8 +20,8 @@ XfwfDrawString(display, drawable, gc, x, y, string, length, tabs) int length; int *tabs; { - register char *p, *ep; - register int tx, tab; + char *p, *ep; + int tx, tab; tab = tx = 0; for (p = string; length; ) diff --git a/obm/ObmW/DrawingArea.c b/obm/ObmW/DrawingArea.c index a316b03..268d429 100644 --- a/obm/ObmW/DrawingArea.c +++ b/obm/ObmW/DrawingArea.c @@ -157,9 +157,9 @@ static Boolean ConstraintSetValues(current, request, new, args, num_args) Cardinal *num_args; { /* - register DrawingAreaConstraints cfc = + DrawingAreaConstraints cfc = (DrawingAreaConstraints) current->core.constraints; - register DrawingAreaConstraints nfc = + DrawingAreaConstraints nfc = (DrawingAreaConstraints) new->core.constraints; */ return( FALSE ); diff --git a/obm/ObmW/Gterm.c b/obm/ObmW/Gterm.c index 2fd3b77..7b135dd 100644 --- a/obm/ObmW/Gterm.c +++ b/obm/ObmW/Gterm.c @@ -659,8 +659,8 @@ static void Initialize (request, new) Widget request, new; { - register GtermWidget w = (GtermWidget)new; - register GC gc; + GtermWidget w = (GtermWidget)new; + GC gc; XColor fg_color, bg_color; XFontStruct **fp; @@ -1369,7 +1369,7 @@ Destroy (gw) Widget gw; { GtermWidget w = (GtermWidget) gw; - register GtCallback *cb, *cb_next; + GtCallback *cb, *cb_next; Display *display = w->gterm.display; @@ -1448,7 +1448,7 @@ Resize (gw) Widget gw; { GtermWidget w = (GtermWidget) gw; - register GtCallback *cb; + GtCallback *cb; int char_width, char_height, char_base; int bestfont, fonterr, dx, dy, i; unsigned int width, height, u_junk; @@ -1604,8 +1604,8 @@ Redisplay (gw, event, region) XEvent *event; Region region; { - register GtermWidget w = (GtermWidget) gw; - register XExposeEvent *ev = (XExposeEvent *)event; + GtermWidget w = (GtermWidget) gw; + XExposeEvent *ev = (XExposeEvent *)event; int x, y, width, height; if (!w || !XtIsRealized (gw)) @@ -1661,10 +1661,10 @@ SetValues (current, request, set) { GtermWidget old = (GtermWidget) current; GtermWidget req = (GtermWidget) request; - register GtermWidget w = (GtermWidget) set; + GtermWidget w = (GtermWidget) set; Display *display = w->gterm.display; Boolean redisplay = False; - register GC gc; + GC gc; if (old->gterm.dialogBgColor != req->gterm.dialogBgColor) { @@ -1713,12 +1713,12 @@ SetValues (current, request, set) static void color_crosshair (w) - register GtermWidget w; + GtermWidget w; { - register Display *display = w->gterm.display; + Display *display = w->gterm.display; XColor fg_color, bg_color; Colormap defcmap; - register GC gc; + GC gc; erase_crosshair (w); defcmap = DefaultColormapOfScreen (w->gterm.screen); @@ -1739,9 +1739,9 @@ color_crosshair (w) static void color_ginmodeCursor (w) - register GtermWidget w; + GtermWidget w; { - register Display *display = w->gterm.display; + Display *display = w->gterm.display; XColor fg_color, bg_color; Colormap defcmap; @@ -1778,9 +1778,9 @@ static void HandleGraphicsInput (widget, event, params, param_count) String *params; /* unused */ Cardinal *param_count; /* unused */ { - register GtermWidget w = (GtermWidget)widget; - register XKeyEvent *ev = (XKeyEvent *) event; - register GtCallback *cb; + GtermWidget w = (GtermWidget)widget; + XKeyEvent *ev = (XKeyEvent *) event; + GtCallback *cb; GtCallback cbl[128]; int ncb, i; @@ -1800,7 +1800,7 @@ static void HandleDisplayCrosshair (widget, event, params, nparams) String *params; /* unused */ Cardinal *nparams; /* unused */ { - register GtermWidget w = (GtermWidget)widget; + GtermWidget w = (GtermWidget)widget; XButtonEvent *ev = &event->xbutton; /* Ignore if cursor is in a marker. */ @@ -1825,7 +1825,7 @@ static void HandleTrackCursor (widget, event, params, param_count) String *params; /* unused */ Cardinal *param_count; /* unused */ { - register GtermWidget w = (GtermWidget)widget; + GtermWidget w = (GtermWidget)widget; XMotionEvent *ev = &event->xmotion; gmSelection what; Marker gm; @@ -1862,8 +1862,8 @@ static void HandleEnterWindow (widget, event, params, param_count) String *params; /* unused */ Cardinal *param_count; /* unused */ { - register GtermWidget w = (GtermWidget)widget; - register XEnterWindowEvent *ev = (XEnterWindowEvent *) event; + GtermWidget w = (GtermWidget)widget; + XEnterWindowEvent *ev = (XEnterWindowEvent *) event; /* Deep Frame */ if (!w->gterm.useDefaultCM && w->gterm.haveColormap && @@ -1894,8 +1894,8 @@ static void HandleLeaveWindow (widget, event, params, param_count) String *params; /* unused */ Cardinal *param_count; /* unused */ { - register GtermWidget w = (GtermWidget)widget; - register XLeaveWindowEvent *ev = (XLeaveWindowEvent *) event; + GtermWidget w = (GtermWidget)widget; + XLeaveWindowEvent *ev = (XLeaveWindowEvent *) event; /*printf ("HandleLeaveWindow....");*/ if (!w->gterm.useDefaultCM && w->gterm.haveColormap) { @@ -1925,8 +1925,8 @@ static void HandleSoftReset (widget, event, params, param_count) String *params; /* unused */ Cardinal *param_count; /* unused */ { - register GtermWidget w = (GtermWidget)widget; - register GtCallback *cb; + GtermWidget w = (GtermWidget)widget; + GtCallback *cb; GtCallback cbl[128]; int ncb, i; diff --git a/obm/ObmW/GtermCmap.c b/obm/ObmW/GtermCmap.c index 71bf97e..abad673 100644 --- a/obm/ObmW/GtermCmap.c +++ b/obm/ObmW/GtermCmap.c @@ -30,7 +30,7 @@ static Colormap get_colormap (w) GtermWidget w; { - register int i, j; + int i, j; Display *display = w->gterm.display; Screen *screen = w->gterm.screen; XColor def_colors[SZ_STATIC_CMAP], *cp, *c1, *c2; @@ -289,7 +289,7 @@ request_colormap_focus (w) if (p) { Window window = XtWindow (p); Window *wl = NULL, n_wl[MAX_WMWIN+1]; - register int n_nw, i; + int n_nw, i; int nw; /* If WM_COLORMAP_WINDOWS is already set save its value, otherwise @@ -326,7 +326,7 @@ static void restore_colormap_focus (w) GtermWidget w; { - register int nw, n_nw, i; + int nw, n_nw, i; Window *wl, n_wl[MAX_WMWIN+1], old; if (!w || !XtIsRealized ((Widget)w)) @@ -360,8 +360,8 @@ static void inherit_default_colormap (w) GtermWidget w; { - register XColor *cp, *ap; - register int ncolors, i; + XColor *cp, *ap; + int ncolors, i; Display *display = w->gterm.display; Screen *screen = w->gterm.screen; Window root = w->gterm.root; @@ -444,9 +444,9 @@ static void update_default_colormap (w) GtermWidget w; { - register XColor *ip, *op; - register int j, n; - register Pixel v; + XColor *ip, *op; + int j, n; + Pixel v; XColor colors[MAX_SZCMAP]; Pixel pixels[MAX_SZCMAP]; @@ -629,7 +629,7 @@ static int ParseGlobalCmap(w) static int GetMaxCmapColors(w) GtermWidget w; { - register int n; + int n; unsigned long plane_masks[1]; int req; int first, nelem, maxelem; diff --git a/obm/ObmW/GtermCnv.c b/obm/ObmW/GtermCnv.c index 3ef36b3..6007fce 100644 --- a/obm/ObmW/GtermCnv.c +++ b/obm/ObmW/GtermCnv.c @@ -198,7 +198,7 @@ int width, height, depth; int sx, sy, dnx, dny; int bpl, bpp, border; { - register int i, j, npix = (width * height); + int i, j, npix = (width * height); uint32_t *lp, xcol, lval; int nbytes = ((depth == ColormapDepth) ? 1 : 4); uchar *ip = in, pv; @@ -258,7 +258,7 @@ int bpl, bpp, border; static int init_lut (int bpp, int border) { - register int i; + int i; unsigned long rmask, gmask, bmask, rpix, gpix, bpix, xcol, lval; int rshift, gshift, bshift, nbytes; uchar *op, pv; @@ -350,7 +350,7 @@ init_lut (int bpp, int border) */ int highbit(unsigned long i) { - register int h = 1; + int h = 1; if (i == 0) return (0); #ifdef _LP64 @@ -372,7 +372,7 @@ int highbit(unsigned long i) */ int lowbit(unsigned long i) { - register int h = 1; + int h = 1; if (i == 0) return (0); @@ -466,7 +466,7 @@ dbg_printMappings (GtermWidget w) static void dbg_printRasters (GtermWidget w) { - register int i; + int i; Raster rp; diff --git a/obm/ObmW/GtermGraphics.c b/obm/ObmW/GtermGraphics.c index cddbeb6..500da43 100644 --- a/obm/ObmW/GtermGraphics.c +++ b/obm/ObmW/GtermGraphics.c @@ -77,10 +77,10 @@ GtTimerInhibit (w, state) void GtAugmentTranslations (w, translations) - register GtermWidget w; + GtermWidget w; char *translations; { - register int i; + int i; if ((i = w->gterm.nauxTrans) < MAX_AUXTRANS) { w->gterm.auxTrans[i] = @@ -93,10 +93,10 @@ GtAugmentTranslations (w, translations) void GtOverrideTranslations (w, translations) - register GtermWidget w; + GtermWidget w; char *translations; { - register int i; + int i; if ((i = w->gterm.nauxTrans) < MAX_AUXTRANS) { w->gterm.auxTrans[i] = @@ -139,7 +139,7 @@ GtGetPhysRes (w, raster, width, height) int *width, *height; { if (raster) { - register Raster rp = &w->gterm.rasters[raster]; + Raster rp = &w->gterm.rasters[raster]; *width = rp->width; *height = rp->height; } else { @@ -303,11 +303,11 @@ GtSetColorIndex (w, ival) GtermWidget w; int ival; { - register int color = w->gterm.iomap[ival]; + int color = w->gterm.iomap[ival]; if (color >= 0 && color < w->gterm.ncolors) { if (w->gterm.useGlobalCmap) { - register int i, found = 0; + int i, found = 0; for (i=0; i < num_static_colors; i++) { if (ival == static_colors[i].index) { @@ -348,7 +348,7 @@ void GtClearScreen (w) GtermWidget w; { - register Mapping mp; + Mapping mp; if (!w || !XtIsRealized ((Widget)w)) @@ -399,8 +399,8 @@ GtDrawPolyline (w, pv, npts) { XPoint *points, o_pv[MAX_POINTS]; DrawContext dx = get_draw_context (w); - register MappingContext mx; - register int i; + MappingContext mx; + int i; for (i=0; i < dx->nmappings; i++) { mx = &dx->mapContext[i]; @@ -425,8 +425,8 @@ GtDrawPolymarker (w, pv, npts) { XPoint *points, o_pv[MAX_POINTS]; DrawContext dx = get_draw_context (w); - register MappingContext mx; - register int i; + MappingContext mx; + int i; for (i=0; i < dx->nmappings; i++) { mx = &dx->mapContext[i]; @@ -451,8 +451,8 @@ GtDrawPolygon (w, pv, npts) { XPoint *points, o_pv[MAX_POINTS]; DrawContext dx = get_draw_context (w); - register MappingContext mx; - register int i; + MappingContext mx; + int i; for (i=0; i < dx->nmappings; i++) { mx = &dx->mapContext[i]; @@ -544,9 +544,9 @@ GtSetCursorPos (w, x, y) GtermWidget w; int x, y; { - register MappingContext mx; - register DrawContext dx; - register Mapping mp; + MappingContext mx; + DrawContext dx; + Mapping mp; Window window = w->gterm.window; int sv_raster = w->gterm.raster; @@ -871,7 +871,7 @@ GtPostInputProc (w, userfcn, client_data) GtCallbackProc userfcn; XtPointer client_data; { - register GtCallback *cb, *new; + GtCallback *cb, *new; new = (GtCallback *) XtMalloc (sizeof (GtCallback)); new->proc = userfcn; @@ -892,7 +892,7 @@ GtDeleteInputProc (w, userfcn, client_data) GtCallbackProc userfcn; XtPointer client_data; { - register GtCallback *cb, *prev; + GtCallback *cb, *prev; for (prev=NULL, cb = w->gterm.inputCallback; cb; cb = cb->next) if (cb->proc == userfcn && cb->client_data == client_data) { @@ -912,7 +912,7 @@ GtPostResetProc (w, userfcn, client_data) GtCallbackProc userfcn; XtPointer client_data; { - register GtCallback *cb, *new; + GtCallback *cb, *new; new = (GtCallback *) XtMalloc (sizeof (GtCallback)); new->proc = userfcn; @@ -933,7 +933,7 @@ GtDeleteResetProc (w, userfcn, client_data) GtCallbackProc userfcn; XtPointer client_data; { - register GtCallback *cb, *prev; + GtCallback *cb, *prev; for (prev=NULL, cb = w->gterm.resetCallback; cb; cb = cb->next) if (cb->proc == userfcn && cb->client_data == client_data) { @@ -953,7 +953,7 @@ GtPostResizeProc (w, userfcn, client_data) GtCallbackProc userfcn; XtPointer client_data; { - register GtCallback *cb, *new; + GtCallback *cb, *new; new = (GtCallback *) XtMalloc (sizeof (GtCallback)); new->proc = userfcn; @@ -974,7 +974,7 @@ GtDeleteResizeProc (w, userfcn, client_data) GtCallbackProc userfcn; XtPointer client_data; { - register GtCallback *cb, *prev; + GtCallback *cb, *prev; for (prev=NULL, cb = w->gterm.resizeCallback; cb; cb = cb->next) if (cb->proc == userfcn && cb->client_data == client_data) { @@ -996,8 +996,8 @@ GtDrawAlphaText (w, x, y, text) { XPoint *points, pv[1], o_pv[1]; DrawContext dx = get_draw_context (w); - register MappingContext mx; - register int npts, i; + MappingContext mx; + int npts, i; pv[0].x = x; pv[0].y = y; @@ -1213,8 +1213,8 @@ erase_crosshair (w) return; if (w->gterm.cursor_drawn) { - register int x = w->gterm.cur_x; - register int y = w->gterm.cur_y; + int x = w->gterm.cur_x; + int y = w->gterm.cur_y; XSetClipMask (w->gterm.display, w->gterm.exposeGC, None); if (w->gterm.pixmap) { @@ -1265,8 +1265,8 @@ update_cursor (w) GtermWidget w; { if (w->gterm.cursor_type == GtGinmodeCursor && w->gterm.full_crosshair) { - register int x = w->gterm.cur_x; - register int y = w->gterm.cur_y; + int x = w->gterm.cur_x; + int y = w->gterm.cur_y; if (x || y) draw_crosshair (w, x, y); @@ -1303,7 +1303,7 @@ get_draw_context (w) if (!dx->valid) { int raster = w->gterm.raster; Raster rp = &w->gterm.rasters[raster]; - register MappingContext mx = &dx->mapContext[0]; + MappingContext mx = &dx->mapContext[0]; Region clip_region, mask_region; struct mapping *map, *mp, *np, p_mp; int xres = w->gterm.xres; @@ -1457,9 +1457,9 @@ static void invalidate_draw_context (w) GtermWidget w; { - register DrawContext dx = &w->gterm.draw; - register MappingContext mx; - register int i; + DrawContext dx = &w->gterm.draw; + MappingContext mx; + int i; if (dx->valid) { for (i=0; i < dx->nmappings; i++) { @@ -1473,14 +1473,14 @@ invalidate_draw_context (w) static XPoint * mapVector (mx, pv1, pv2, npts) - register MappingContext mx; + MappingContext mx; XPoint *pv1; XPoint *pv2; int npts; { - register XPoint *ip = pv1; - register XPoint *op = pv2; - register int n; + XPoint *ip = pv1; + XPoint *op = pv2; + int n; for (n=npts; --n >= 0; ip++, op++) { op->x = ip->x * mx->xscale + mx->xoffset; diff --git a/obm/ObmW/GtermImaging.c b/obm/ObmW/GtermImaging.c index d6deb80..4710cbf 100644 --- a/obm/ObmW/GtermImaging.c +++ b/obm/ObmW/GtermImaging.c @@ -76,9 +76,9 @@ void GtRasterInit (w) GtermWidget w; { - register int i; - register Raster rp; - register struct colormap *cm; + int i; + Raster rp; + struct colormap *cm; struct colormap *next_cm; @@ -161,9 +161,9 @@ initialize_shadow_pixmap (GtermWidget w, int dst) */ int GtNextRaster (w) - register GtermWidget w; + GtermWidget w; { - register int i; + int i; if (w->gterm.rasters) for (i=1; i < w->gterm.maxRasters; i++) @@ -196,7 +196,7 @@ GtAssignRaster (w, raster, drawable, type) XtPointer drawable; /* object containing pixel array */ int type; /* type of drawable [not used] */ { - register Raster rp; + Raster rp; XWindowAttributes wa; if (raster <= 0 || raster >= w->gterm.maxRasters) @@ -233,8 +233,8 @@ GtCreateRaster (w, raster, type, width, height, depth) int width, height; int depth; { - register uchar *op; - register int npix, pixel; + uchar *op; + int npix, pixel; uchar *data; XImage *xp; Raster rp; @@ -436,8 +436,8 @@ GtDestroyRaster (w, raster) GtermWidget w; int raster; { - register Raster rp; - register Mapping mp, next; + Raster rp; + Mapping mp, next; if (raster <= 0) return; @@ -478,7 +478,7 @@ GtQueryRaster (w, raster, type, width, height, depth) int *width, *height; int *depth; { - register Raster rp; + Raster rp; if (DBG_TRACE && DBG_VERBOSE) @@ -529,9 +529,9 @@ GtWritePixels (w, raster, pixels, nbits, x1, y1, nx, ny) int x1, y1; int nx, ny; { - register uchar *ip, *op; - register Pixel *cmap; - register int i, n, bytes_per_line; + uchar *ip, *op; + Pixel *cmap; + int i, n, bytes_per_line; Mapping mp; Raster rp; uchar *lp; @@ -721,9 +721,9 @@ GtReadPixels (w, raster, pixels, nbits, x1, y1, nx, ny) int x1, y1; int nx, ny; { - register uchar *ip, *op; - register Pixel *cmap; - register int n; + uchar *ip, *op; + Pixel *cmap; + int n; int bytes_per_line, i, nskip = 1; int x, y, delxin = 0; @@ -841,7 +841,7 @@ GtSetPixels (w, raster, ct, x1, y1, nx, ny, color, rop) int color; int rop; { - register Raster rp; + Raster rp; Mapping mp; /* Get raster pointer. */ @@ -897,9 +897,9 @@ GtSetPixels (w, raster, ct, x1, y1, nx, ny, color, rop) XSetForeground (display, gc, w->gterm.color0); } else { - register int n, i; - register uchar *op; - register Pixel pixel; + int n, i; + uchar *op; + Pixel pixel; int bytes_per_line; uchar *lp; @@ -947,8 +947,8 @@ GtRefreshPixels (w, raster, ct, x1, y1, nx, ny) int x1, y1; int nx, ny; { - register Raster rp = &w->gterm.rasters[raster]; - register Mapping mp; + Raster rp = &w->gterm.rasters[raster]; + Mapping mp; if (!w || !XtIsRealized ((Widget)w)) return; @@ -1019,7 +1019,7 @@ GtExtractPixmap (w, src, ctype, x, y, width, height) int x, y; int width, height; { - register Raster rp; + Raster rp; int x1, y1, nx, ny; String cache; int i; @@ -1103,7 +1103,7 @@ GtInsertPixmap (w, pixmap, dst, ctype, x, y, width, height) int x, y; int width, height; { - register Raster rp; + Raster rp; XWindowAttributes wa; int x1, y1, nx, ny; int i; @@ -1196,8 +1196,8 @@ GtWriteColormap (w, map, first, nelem, r, g, b) ushort *r, *g, *b; { XWindowAttributes wa; - register XColor *cp; - register int i, j, v, n, use_wa = 1; + XColor *cp; + int i, j, v, n, use_wa = 1; unsigned long plane_masks[1]; int req, need, ncolors; @@ -1218,10 +1218,10 @@ GtWriteColormap (w, map, first, nelem, r, g, b) /* Create or modify a colormap descriptor. The display colormap * is not affected. */ - register struct colormap *cm; + struct colormap *cm; struct colormap *last_cm; - register XColor *cp; - register int i; + XColor *cp; + int i; @@ -1531,7 +1531,7 @@ GtReadColormap (w, map, first, nelem, r, g, b) int nelem; ushort *r, *g, *b; { - register int i; + int i; if (DBG_TRACE) @@ -1555,8 +1555,8 @@ GtReadColormap (w, map, first, nelem, r, g, b) if (map > 0) { /* Read from a colormap descriptor. */ - register struct colormap *cm; - register int i, j; + struct colormap *cm; + int i, j; /* Locate colormap. */ for (cm = w->gterm.colormaps; cm; cm = cm->next) @@ -1581,7 +1581,7 @@ GtReadColormap (w, map, first, nelem, r, g, b) } else { /* Read the display colormap. */ - register XColor *cp; + XColor *cp; /* Return RGB values. */ for (i=0; i < nelem; i++) { @@ -1633,9 +1633,9 @@ GtLoadColormap (w, map, offset, slope) int map; float offset, slope; { - register int i; - register XColor *cp; - register struct colormap *cm; + int i; + XColor *cp; + struct colormap *cm; struct colormap d_cmap, o_cmap; int noscale, nelem, c1, c2; float x, y, z, frac; @@ -1825,11 +1825,11 @@ GtSetColormapFocus (int box_size) */ int GtQueryColormap (w, map, first, nelem, maxelem) - register GtermWidget w; + GtermWidget w; int map; int *first, *nelem, *maxelem; { - register struct colormap *cm; + struct colormap *cm; int nitems; if (first) @@ -1877,10 +1877,10 @@ GtQueryColormap (w, map, first, nelem, maxelem) */ int GtNextColormap (w) - register GtermWidget w; + GtermWidget w; { - register struct colormap *cm; - register int mapno = 0; + struct colormap *cm; + int mapno = 0; /* Get the next map number. */ for (cm = w->gterm.colormaps; cm; cm = cm->next) @@ -1895,10 +1895,10 @@ GtNextColormap (w) */ void GtFreeColormap (w, colormap) - register GtermWidget w; + GtermWidget w; int colormap; { - register struct colormap *p_cm, *cm; + struct colormap *p_cm, *cm; /* Find the colormap and free it. */ for (p_cm = NULL, cm = w->gterm.colormaps; cm; p_cm = cm, cm = cm->next) @@ -1935,11 +1935,11 @@ GtFreeColormap (w, colormap) */ void GtWriteIomap (w, iomap, first, nelem) - register GtermWidget w; + GtermWidget w; ushort *iomap; int first, nelem; { - register int c1, c2; + int c1, c2; if (w->gterm.useGlobalCmap) return; @@ -1968,11 +1968,11 @@ GtWriteIomap (w, iomap, first, nelem) */ void GtReadIomap (w, iomap, first, nelem) - register GtermWidget w; + GtermWidget w; uchar *iomap; int first, nelem; { - register int c1, c2; + int c1, c2; c1 = max(0, min(MAX_SZCMAP-1, first)); c2 = max(0, min(MAX_SZCMAP-1, first + nelem - 1)); @@ -1986,11 +1986,11 @@ GtReadIomap (w, iomap, first, nelem) */ void GtReadLUT (w, lut, first, nelem) - register GtermWidget w; + GtermWidget w; unsigned long *lut; int first, nelem; { - register int c1, c2; + int c1, c2; c1 = max(0, min(MAX_SZCMAP-1, first)); c2 = max(0, min(MAX_SZCMAP-1, first + nelem - 1)); @@ -2006,8 +2006,8 @@ static void init_iomap (w) GtermWidget w; { - register ushort *iomap = w->gterm.iomap; - register int i; + ushort *iomap = w->gterm.iomap; + int i; for (i=0; i < MAX_SZCMAP; i++) iomap[i] = i; @@ -2019,7 +2019,7 @@ init_iomap (w) static void init_global_cmap () { - register int i; + int i; for (i=0; i < MAX_SZCMAP; i++) global_cmap[i] = (Pixel) i; @@ -2029,7 +2029,7 @@ init_global_cmap () */ static void invalidate_cmap (w) - register GtermWidget w; + GtermWidget w; { w->gterm.cmap_in_valid = w->gterm.cmap_out_valid = 0; } @@ -2040,11 +2040,11 @@ invalidate_cmap (w) */ static Pixel * get_cmap_in (w) - register GtermWidget w; + GtermWidget w; { - register Pixel *cmap, *cmap_in = w->gterm.cmap_in; - register ushort *iomap; - register int i, j; + Pixel *cmap, *cmap_in = w->gterm.cmap_in; + ushort *iomap; + int i, j; int ncolors; @@ -2085,10 +2085,10 @@ static Pixel * get_cmap_out (w) GtermWidget w; { - register Pixel *cmap; - register ushort *iomap; + Pixel *cmap; + ushort *iomap; Pixel *cmap_out = w->gterm.cmap_out; - register int pixel, i; + int pixel, i; int j; @@ -2148,10 +2148,10 @@ get_cmap_out (w) */ static Pixel get_pixel (w, client_pixel) - register GtermWidget w; - register int client_pixel; + GtermWidget w; + int client_pixel; { - register Pixel *cmap = get_cmap_in (w); + Pixel *cmap = get_cmap_in (w); if (client_pixel < 0 || client_pixel >= MAX_SZCMAP) return (w->gterm.cmap[1]); @@ -2165,10 +2165,10 @@ get_pixel (w, client_pixel) int GtGetClientPixel (w, pixel) GtermWidget w; - register int pixel; + int pixel; { - register int i; - register ushort *iomap; + int i; + ushort *iomap; int client_pixel = 0; get_cmap_in (w); @@ -2188,10 +2188,10 @@ GtGetClientPixel (w, pixel) */ void GtInitMappings (w) - register GtermWidget w; + GtermWidget w; { - register Mapping mp; - register int i; + Mapping mp; + int i; invalidate_draw_context (w); @@ -2225,10 +2225,10 @@ GtInitMappings (w) */ int GtNextMapping (w) - register GtermWidget w; + GtermWidget w; { - register Mapping mp; - register int i; + Mapping mp; + int i; for (i=1; i < w->gterm.maxMappings; i++) { mp = &w->gterm.mappings[i]; @@ -2244,7 +2244,7 @@ GtNextMapping (w) */ void GtFreeMapping (w, mapping) - register GtermWidget w; + GtermWidget w; int mapping; { free_mapping (w, &w->gterm.mappings[mapping]); @@ -2257,10 +2257,10 @@ GtFreeMapping (w, mapping) */ void GtRaiseMapping (w, mapping, reference) - register GtermWidget w; + GtermWidget w; int mapping, reference; { - register Mapping mp, ref_mp; + Mapping mp, ref_mp; mp = &w->gterm.mappings[mapping]; if (!mp->defined) @@ -2285,10 +2285,10 @@ GtRaiseMapping (w, mapping, reference) */ void GtLowerMapping (w, mapping, reference) - register GtermWidget w; + GtermWidget w; int mapping, reference; { - register Mapping mp, ref_mp; + Mapping mp, ref_mp; mp = &w->gterm.mappings[mapping]; if (!mp->defined) @@ -2324,10 +2324,10 @@ GtLowerMapping (w, mapping, reference) */ int GtCompareMappings (w, map1, map2) - register GtermWidget w; + GtermWidget w; int map1, map2; { - register Mapping mp, mp1, mp2; + Mapping mp, mp1, mp2; if (map1 == map2) return (0); @@ -2377,7 +2377,7 @@ GtSelectRaster (w, dras, dt, dx, dy, rt, rx, ry, rmap) int *rx, *ry; /* raster coordinates (output) */ int *rmap; /* mapping selected */ { - register Mapping mp; + Mapping mp; float x, y, x2, y2; int raster, mapping; @@ -2546,8 +2546,8 @@ GtSetMapping (w, mapping, rop, src,st,sx,sy,snx,sny, dst,dt,dx,dy,dnx,dny) int dt; /* coordinate type for source raster */ int dx,dy,dnx,dny; /* destination raster */ { - register int i, j; - register Mapping mp, o_mp, n_mp; + int i, j; + Mapping mp, o_mp, n_mp; struct mapping pix_mp, new_mp; int defined, scale_changed, offset, current, state, old_i; int nx, xs[MAX_REGIONS], xe[MAX_REGIONS], xv[MAX_REGIONS]; @@ -2785,7 +2785,7 @@ GtGetMapping (w, mapping, rop, src,st,sx,sy,snx,sny, dst,dt,dx,dy,dnx,dny) int *dt; /* coordinate type for source raster */ int *dx,*dy,*dnx,*dny; /* destination raster */ { - register Mapping mp; + Mapping mp; if (mapping < 0 || mapping >= w->gterm.maxMappings) return (-1); @@ -2806,10 +2806,10 @@ GtGetMapping (w, mapping, rop, src,st,sx,sy,snx,sny, dst,dt,dx,dy,dnx,dny) */ int GtActiveMapping (w, mapping) - register GtermWidget w; + GtermWidget w; int mapping; /* mapping number */ { - register Mapping mp; + Mapping mp; if (mapping < 0 || mapping >= w->gterm.maxMappings) return (0); @@ -2831,7 +2831,7 @@ GtEnableMapping (w, mapping, refresh) int mapping; /* mapping number */ int refresh; /* refresh destination */ { - register Mapping mp; + Mapping mp; if (DBG_TRACE) @@ -2884,8 +2884,8 @@ GtDisableMapping (w, mapping, erase) int mapping; /* mapping number */ int erase; /* erase the destination */ { - register int i; - register Mapping mp, dmp; + int i; + Mapping mp, dmp; XRectangle r, d, in; invalidate_draw_context (w); @@ -2940,7 +2940,7 @@ GtRefreshMapping (w, mapping) GtermWidget w; int mapping; /* mapping number */ { - register Mapping mp; + Mapping mp; struct mapping p_mp; @@ -2987,10 +2987,10 @@ GtMapVector (w, mapping, dir, pv1, pv2, npts) DPoint *pv2; int npts; { - register DPoint *ip = pv1; - register DPoint *op = pv2; - register Mapping mp; - register int n; + DPoint *ip = pv1; + DPoint *op = pv2; + Mapping mp; + int n; struct mapping p_mp; double xscale, xoffset; @@ -3052,10 +3052,10 @@ GtPixelToNDC (w, raster, pv1, pv2, npts) DPoint *pv2; int npts; { - register Raster rp = &w->gterm.rasters[raster]; - register DPoint *ip = pv1; - register DPoint *op = pv2; - register int n; + Raster rp = &w->gterm.rasters[raster]; + DPoint *ip = pv1; + DPoint *op = pv2; + int n; for (n=npts; --n >= 0; ip++, op++) { op->x = ( ip->x) / rp->width * MAXNDC; @@ -3076,10 +3076,10 @@ GtNDCToPixel (w, raster, pv1, pv2, npts) DPoint *pv2; int npts; { - register Raster rp = &w->gterm.rasters[raster]; - register DPoint *ip = pv1; - register DPoint *op = pv2; - register int n; + Raster rp = &w->gterm.rasters[raster]; + DPoint *ip = pv1; + DPoint *op = pv2; + int n; for (n=npts; --n >= 0; ip++, op++) { op->x = ip->x / MAXNDC * rp->width; @@ -3123,8 +3123,8 @@ GtDebug (w, fp, what) /* Print raster information. */ if (what & 002) { - register int i; - register Raster rp; + int i; + Raster rp; if (w->gterm.rasters) { for (i=0; i < w->gterm.maxRasters; i++) { @@ -3141,8 +3141,8 @@ GtDebug (w, fp, what) /* Print mapping information. */ if (what & 004) { - register int i; - register Mapping mp; + int i; + Mapping mp; char flags[32]; if (w->gterm.mappings) { @@ -3180,7 +3180,7 @@ GtDebug (w, fp, what) /* Print colormap information. */ if (what & 010) { - register struct colormap *cm; + struct colormap *cm; fprintf (fp, "cmapName=%s ncolors=%d basePixel=%d\n", w->gterm.cmapName, w->gterm.ncolors, w->gterm.base_pixel); @@ -3190,7 +3190,7 @@ GtDebug (w, fp, what) /* Print marker information. */ if (what & 020) { - register Marker mm; + Marker mm; char value[256]; for (mm = w->gterm.gm_head; mm; mm = mm->next) { diff --git a/obm/ObmW/GtermMapping.c b/obm/ObmW/GtermMapping.c index 2347bd1..59d5496 100644 --- a/obm/ObmW/GtermMapping.c +++ b/obm/ObmW/GtermMapping.c @@ -8,7 +8,7 @@ static int refresh_source (w, mp, x1, y1, nx, ny) GtermWidget w; - register Mapping mp; /* mapping defining refresh operation */ + Mapping mp; /* mapping defining refresh operation */ int x1, y1, nx, ny; /* region of source to be refreshed */ { int sx1, sx2, sy1, sy2, snx, sny; @@ -848,13 +848,13 @@ scale_zoom (idata,ibpl, odata,obpl, xmap,ymap, dx,dy,dnx,dny, clip_region) uchar *idata, *odata; /* input, output data */ int ibpl, obpl; /* bytes per line */ - register int *xmap; /* src coords of each dst pixel */ + int *xmap; /* src coords of each dst pixel */ int *ymap; /* src coords of each dst pixel */ int dx, dy, dnx, dny; /* destination rect */ Region clip_region; /* clip Region or null */ { - register int i, j; - register uchar *ip, *op; + int i, j; + uchar *ip, *op; uchar *last_ip = NULL; uchar *last_op = NULL; @@ -896,9 +896,9 @@ scale_intzoom (idata,ibpl,odata,obpl, sx,sy,dx,dy,dnx,dny, xflip,yflip, nx,ny) int xflip, yflip; /* set if x or y is flipped */ int nx, ny; /* replication factors */ { - register int n; - register int pix; - register uchar *ip, *op; + int n; + int pix; + uchar *ip, *op; uchar *otop, *olast, *lp; int i, j, k; @@ -1086,8 +1086,8 @@ scale_nearest (idata,inx,iny,ibpl, odata,onx,ony,obpl, int dx, dy, dnx, dny; /* destination rect */ Region clip_region; /* clip Region or null */ { - register int m, n, i, j; - register uchar *op; + int m, n, i, j; + uchar *op; for (j=0; j < dny; j++) { op = odata + (j+dy) * obpl + dx; @@ -1123,9 +1123,9 @@ scale_bilinear (idata,inx,iny,ibpl, odata,onx,ony,obpl, int dx, dy, dnx, dny; /* destination rect */ Region clip_region; /* clip Region or null */ { - register int i; - register uchar *op; - register float *lp, *w1, *w2; + int i; + uchar *op; + float *lp, *w1, *w2; int buflen, line, *px, pixel, j; float lo_w, hi_w, x, y; uchar *lo, *hi; @@ -1233,8 +1233,8 @@ lw_convolve (idata,inx,iny,ibpl,ix,iy, odata,onx,ony,obpl,ox,oy, int nx, ny; /* size of output region */ float xscale, yscale; /* determines amount of smoothing */ { - register uchar *ip; - register int l, m, x, hx, pixval; + uchar *ip; + int l, m, x, hx, pixval; int kx, ky, hy, i, j, y; uchar *lp[11], *op; @@ -1390,8 +1390,8 @@ bx_boxcar (idata,inx,iny,ibpl, x1,y1,x2,y2, obuf, xblock, yblock) uchar *obuf; /* output array */ int xblock, yblock; /* blocking factors */ { - register uchar *ip, *op; - register int count, i, *sp; + uchar *ip, *op; + int count, i, *sp; int obpl, block, nxblocks, nyblocks, j, k; uchar *lp, *bp; int *sb; @@ -1439,8 +1439,8 @@ bx_extract (idata,inx,iny,ibpl, odata,onx,ony,obpl, float xstep, ystep; /* scale of input region */ Region clip_region; /* clip Region or null */ { - register int m, n, i; - register uchar *op; + int m, n, i; + uchar *op; int j; for (j=0; j < dny; j++) { @@ -1478,9 +1478,9 @@ bx_interp (idata,inx,iny,ibpl, odata,onx,ony,obpl, int dx, dy, dnx, dny; /* destination rect */ Region clip_region; /* clip Region or null */ { - register int i; - register uchar *op; - register float *lp, *w1, *w2; + int i; + uchar *op; + float *lp, *w1, *w2; int buflen, line, *px, pixel, j; float lo_w, hi_w, x, y; uchar *lo, *hi; @@ -1553,9 +1553,9 @@ mf_getinten (w, idata,inx,iny,ibpl, sx,sy, odata,onx,ony,obpl, dx,dy, nx,ny) int dx, dy; /* destination offset */ int nx, ny; /* size of region */ { - register Pixel *cmap; - register uchar *ip, *op; - register int n; + Pixel *cmap; + uchar *ip, *op; + int n; int j; cmap = get_cmap_out (w); @@ -1582,9 +1582,9 @@ mf_getpixel (w, idata,inx,iny,ibpl, sx,sy, odata,onx,ony,obpl, dx,dy, nx,ny) int dx, dy; /* destination offset */ int nx, ny; /* size of region */ { - register Pixel *cmap; - register uchar *ip, *op; - register int n; + Pixel *cmap; + uchar *ip, *op; + int n; int j; cmap = get_cmap_in (w); @@ -1609,8 +1609,8 @@ get_regions (xs,xe,xv, max_regions, dx, dnx, xmap, alt_dx, alt_dnx, alt_xmap) int dx, dnx, *xmap; int alt_dx, alt_dnx, *alt_xmap; { - register int state, current; - register int nx, i; + int state, current; + int nx, i; int offset, old_i; offset = dx - alt_dx; @@ -1660,7 +1660,7 @@ get_rects (o_rl, max_rects, xs,xe,xv,nx, ys,ye,yv,ny, xcond,ycond) int *ys, *ye, *yv, ny; /* Y list of regions */ int xcond, ycond; /* X,Y condition bitflags */ { - register int i, j; + int i, j; XRectangle rl[MAX_REGIONS]; int limit = min (max_rects, MAX_REGIONS); int o_nrects=0, nrects=0; @@ -1736,8 +1736,8 @@ get_rects (o_rl, max_rects, xs,xe,xv,nx, ys,ye,yv,ny, xcond,ycond) */ static int rect_intersect (in, r1, r2) - register XRectangle *in; - register XRectangle *r1, *r2; + XRectangle *in; + XRectangle *r1, *r2; { int x1, y1, x2, y2; @@ -1759,7 +1759,7 @@ rect_intersect (in, r1, r2) */ static void save_mapping (mp, mapping, rop, src, st, sx,sy,sw,sh, dst, dt, dx,dy,dw,dh) - register Mapping mp; + Mapping mp; int mapping, rop; int src, st, sx,sy,sw,sh; int dst, dt, dx,dy,dw,dh; @@ -1777,7 +1777,7 @@ save_mapping (mp, mapping, rop, src, st, sx,sy,sw,sh, dst, dt, dx,dy,dw,dh) */ static void load_mapping (mp, mapping, rop, src, st, sx,sy,sw,sh, dst, dt, dx,dy,dw,dh) - register Mapping mp; + Mapping mp; int *mapping, *rop; int *src, *st, *sx,*sy,*sw,*sh; int *dst, *dt, *dx,*dy,*dw,*dh; @@ -1797,8 +1797,8 @@ load_mapping (mp, mapping, rop, src, st, sx,sy,sw,sh, dst, dt, dx,dy,dw,dh) static void get_pixel_mapping (w, mp1, mp2, update) GtermWidget w; - register Mapping mp1; /* input mapping */ - register Mapping mp2; /* output mapping */ + Mapping mp1; /* input mapping */ + Mapping mp2; /* output mapping */ int update; /* update mapping */ { float maxndc = (float)MAXNDC; @@ -1878,9 +1878,9 @@ get_pixel_mapping (w, mp1, mp2, update) static int valid_mapping (w, mp) GtermWidget w; - register Mapping mp; + Mapping mp; { - register int x, y; + int x, y; int snx, sny, dnx, dny; int s_width, s_height, d_width, d_height; Raster sr, dr; @@ -1947,7 +1947,7 @@ valid_mapping (w, mp) */ static void initialize_mapping (mp) - register Mapping mp; + Mapping mp; { memset ((char *)mp, 0, sizeof(struct mapping)); } @@ -1961,10 +1961,10 @@ initialize_mapping (mp) static void update_mapping (w, mp) GtermWidget w; - register Mapping mp; + Mapping mp; { - register uchar *op; - register int i, j, k; + uchar *op; + int i, j, k; int snx, sny, dnx, dny, sx, sy, dx, dy; int xmax, ymax, lo, hi, edge1, edge2; int temp, xflip=0, yflip=0; @@ -2121,7 +2121,7 @@ update_mapping (w, mp) static void free_mapping (w, mp) GtermWidget w; - register Mapping mp; + Mapping mp; { mp_unlink (w, mp); mp->defined = mp->enabled = mp->updated = 0; @@ -2138,11 +2138,11 @@ free_mapping (w, mp) static void mp_linkafter (w, mp, ref_mp) - register GtermWidget w; - register Mapping mp; - register Mapping ref_mp; + GtermWidget w; + Mapping mp; + Mapping ref_mp; { - register Mapping map; + Mapping map; /* Don't use the reference mapping unless it is already linked or * the list is empty. @@ -2170,8 +2170,8 @@ mp_linkafter (w, mp, ref_mp) static void mp_unlink (w, mp) - register GtermWidget w; - register Mapping mp; + GtermWidget w; + Mapping mp; { if (mp->prev) mp->prev->next = mp->next; diff --git a/obm/ObmW/GtermMarker.c b/obm/ObmW/GtermMarker.c index 45c3936..1ab0143 100644 --- a/obm/ObmW/GtermMarker.c +++ b/obm/ObmW/GtermMarker.c @@ -126,7 +126,7 @@ void GtMarkerInit (w) GtermWidget w; { - register Marker gm, prev; + Marker gm, prev; XColor fg_color, bg_color; Display *display = w->gterm.display; int type, i; @@ -251,10 +251,10 @@ GtMarkerInit (w) */ static void GtMarkerFree (w) - register GtermWidget w; + GtermWidget w; { - register Display *display = w->gterm.display; - register Marker gm; + Display *display = w->gterm.display; + Marker gm; /* Cancel any load translation table interval timer. */ if (w->gterm.gm_timer_id) { @@ -290,8 +290,8 @@ GtMarkerFree (w) */ static void gm_focusin (w, gm, what) - register GtermWidget w; - register Marker gm; + GtermWidget w; + Marker gm; GmSelection what; { Cursor cursor; @@ -345,11 +345,11 @@ gm_focusin (w, gm, what) */ static void gm_focusout (w, enableSetTrans) - register GtermWidget w; + GtermWidget w; int enableSetTrans; /* replace translations */ { - register Display *display = w->gterm.display; - register Marker gm = w->gterm.gm_active; + Display *display = w->gterm.display; + Marker gm = w->gterm.gm_active; int erase, i; if (!w || !XtIsRealized ((Widget)w)) @@ -408,7 +408,7 @@ gm_refocus (w) */ static void gm_request_translations (w, gm) - register GtermWidget w; + GtermWidget w; Marker gm; { w->gterm.gm_reqTranslations = gm; @@ -428,11 +428,11 @@ gm_request_translations (w, gm) */ static void gm_load_translations (w, id) - register GtermWidget w; + GtermWidget w; XtIntervalId id; { - register Marker am, gm; - register int i; + Marker am, gm; + int i; w->gterm.gm_timer_id = (XtIntervalId) NULL; @@ -477,7 +477,7 @@ GmCreate (w, type, interactive) int type; /* marker type */ int interactive; /* use pointer to set position */ { - register Marker gm; + Marker gm; /* Allocate descriptor. */ if (type < 1 || type > Gm_NTypes) @@ -512,9 +512,9 @@ GmCreate (w, type, interactive) */ int GmDestroy (gm) - register Marker gm; + Marker gm; { - register GtermWidget w = gm->w; + GtermWidget w = gm->w; Region old_region, cur_region; /* GmDestroy can be called recursively during a destroy operation as a @@ -575,10 +575,10 @@ GmDestroy (gm) */ Marker GmCopy (gm) - register Marker gm; + Marker gm; { - register GtermWidget w = gm->w; - register Marker nm; + GtermWidget w = gm->w; + Marker nm; if (!(nm = (Marker) XtCalloc (1, sizeof (struct marker)))) return (NULL); @@ -645,13 +645,13 @@ GmCopy (gm) */ void GmAddCallback (gm, events, func, client_data) - register Marker gm; + Marker gm; int events; /* events callback is to receive */ GmIMethod func; /* function to be called */ XtPointer client_data; /* client data for above */ { - register struct markerCallback *cb; - register int i; + struct markerCallback *cb; + int i; /* Find an empty callback slot. */ for (i=0; i < GM_MAXCALLBACKS; i++) @@ -677,12 +677,12 @@ GmAddCallback (gm, events, func, client_data) */ void GmDeleteCallback (gm, func, client_data) - register Marker gm; + Marker gm; GmIMethod func; /* callback function */ XtPointer client_data; /* client data for above */ { - register struct markerCallback *cb; - register int i, n; + struct markerCallback *cb; + int i, n; for (i=n=0; i < GM_MAXCALLBACKS; i++) { cb = &gm->callback[i]; @@ -712,9 +712,9 @@ GmSelect (w, x, y, what) int x, y; GmSelection what; { - register int flags = (Gm_Activated|Gm_Visible|Gm_Sensitive); - register XRectangle *r; - register Marker gm; + int flags = (Gm_Activated|Gm_Visible|Gm_Sensitive); + XRectangle *r; + Marker gm; for (gm = w->gterm.gm_tail; gm; gm = gm->prev) { if (!((gm->flags & (flags|Gm_BeingDestroyed)) == flags)) @@ -737,7 +737,7 @@ GmSelect (w, x, y, what) */ void GmMarkpos (gm) - register Marker gm; + Marker gm; { gm->markpos (gm); } @@ -755,8 +755,8 @@ GmRedraw (gm, func, erase) int func; int erase; { - register Marker mm; - register XRectangle *o, *n, *r; + Marker mm; + XRectangle *o, *n, *r; int flags = (Gm_Activated|Gm_Visible); Region clip_region, temp_region, temp; GtermWidget w = gm->w; @@ -871,9 +871,9 @@ GmRedisplay (w, region) GtermWidget w; Region region; { - register int flags = (Gm_Activated|Gm_Visible); - register XRectangle *r; - register Marker gm; + int flags = (Gm_Activated|Gm_Visible); + XRectangle *r; + Marker gm; if (!w || !XtIsRealized ((Widget)w)) return; @@ -908,9 +908,9 @@ GmRedisplay (w, region) */ void GmRaise (gm, ref_gm) - register Marker gm, ref_gm; + Marker gm, ref_gm; { - register GtermWidget w = gm->w; + GtermWidget w = gm->w; int erase; /* Already on top? */ @@ -932,9 +932,9 @@ GmRaise (gm, ref_gm) */ void GmLower (gm, ref_gm) - register Marker gm, ref_gm; + Marker gm, ref_gm; { - register GtermWidget w = gm->w; + GtermWidget w = gm->w; int erase; /* Already lowered? */ @@ -965,7 +965,7 @@ GmLower (gm, ref_gm) */ void GmNotify (gm, events, event, params, nparams) - register Marker gm; + Marker gm; int events; XEvent *event; String *params; @@ -979,7 +979,7 @@ GmNotify (gm, events, event, params, nparams) */ void GmAddPt (gm, x, y) - register Marker gm; + Marker gm; int x, y; { int erase; @@ -996,7 +996,7 @@ GmAddPt (gm, x, y) */ void GmDeletePt (gm, x, y) - register Marker gm; + Marker gm; int x, y; { int erase; @@ -1013,7 +1013,7 @@ GmDeletePt (gm, x, y) */ void GmMovePt (gm, x, y) - register Marker gm; + Marker gm; int x, y; { int erase; @@ -1029,7 +1029,7 @@ GmMovePt (gm, x, y) */ void GmMove (gm, x, y) - register Marker gm; + Marker gm; int x, y; { int erase; @@ -1045,7 +1045,7 @@ GmMove (gm, x, y) */ void GmResize (gm, x, y) - register Marker gm; + Marker gm; int x, y; { int erase; @@ -1061,7 +1061,7 @@ GmResize (gm, x, y) */ void GmRotate (gm, x, y) - register Marker gm; + Marker gm; int x, y; { int erase; @@ -1079,12 +1079,12 @@ GmRotate (gm, x, y) */ int GmSetAttributes (gm, args, nargs, argtype) - register Marker gm; + Marker gm; ArgList args; int nargs; char *argtype; { - register int i; + int i; int autoredraw, erase; int status = OK; @@ -1112,7 +1112,7 @@ GmSetAttributes (gm, args, nargs, argtype) */ int GmSetAttribute (gm, attribute, value, type) - register Marker gm; + Marker gm; char *attribute; XtArgVal value; char *type; @@ -1361,12 +1361,12 @@ GmSetAttribute (gm, attribute, value, type) */ void GmGetAttributes (gm, args, nargs, argtype) - register Marker gm; + Marker gm; ArgList args; int nargs; char *argtype; { - register int i; + int i; for (i=0; i < nargs; i++) GmGetAttribute (gm, args[i].name, args[i].value, argtype); @@ -1377,7 +1377,7 @@ GmGetAttributes (gm, args, nargs, argtype) */ int GmGetAttribute (gm, attribute, value, type) - register Marker gm; + Marker gm; char *attribute; XtArgVal value; char *type; @@ -1607,9 +1607,9 @@ GmSetVertices (gm, points, first, npts) int first; /* first point to be set */ int npts; /* number of points to set */ { - register DPoint *ip, *pp; - register XPoint *op; - register int i; + DPoint *ip, *pp; + XPoint *op; + int i; int erase; /* The point vector is automatically extended if more space is needed. @@ -1679,14 +1679,14 @@ GmSetVertices (gm, points, first, npts) */ int GmGetVertices (gm, points, first, maxpts) - register Marker gm; - register DPoint *points; /* output array of points */ + Marker gm; + DPoint *points; /* output array of points */ int first; /* first point to be returned */ int maxpts; /* max number of points to return */ { - register XPoint *ip; - register DPoint *op; - register int i; + XPoint *ip; + DPoint *op; + int i; int top, nout; if (first >= gm->npoints) @@ -1717,11 +1717,11 @@ GmGetVertices (gm, points, first, maxpts) */ void GmGetBoundingBox (gm, x, y, width, height) - register Marker gm; + Marker gm; int *x, *y; int *width, *height; { - register XRectangle *r = &gm->cur_rect; + XRectangle *r = &gm->cur_rect; *x = r->x; *y = r->y; @@ -1734,9 +1734,9 @@ GmGetBoundingBox (gm, x, y, width, height) */ int GmStrToType (marker_type) -register char *marker_type; +char *marker_type; { - register int type; + int type; if (strcmp (marker_type, GmText) == 0) type = Gm_Text; @@ -1765,9 +1765,9 @@ register char *marker_type; */ int GmStrToEvent (event_type) -register char *event_type; +char *event_type; { - register int type; + int type; if (strcmp (event_type, "notify") == 0) type = GmEvNotify; @@ -1799,9 +1799,9 @@ register char *event_type; */ int GmStrToFunction (function) -register char *function; +char *function; { - register int code; + int code; if (strcmp (function, "clear") == 0) code = GXclear; @@ -1851,7 +1851,7 @@ gm_getint (value, type) XtArgVal value; char *type; { - register int ch; + int ch; switch (gm_gettype (type)) { case Gt_Bool: @@ -2139,10 +2139,10 @@ gm_getattribute (attribute) static void gm_linkafter (gm, prev) - register Marker gm; - register Marker prev; + Marker gm; + Marker prev; { - register GtermWidget w = gm->w; + GtermWidget w = gm->w; gm->prev = prev; gm->next = prev ? prev->next : NULL; @@ -2160,9 +2160,9 @@ gm_linkafter (gm, prev) static void gm_unlink (gm) - register Marker gm; + Marker gm; { - register GtermWidget w = gm->w; + GtermWidget w = gm->w; if (gm->prev) gm->prev->next = gm->next; @@ -2185,13 +2185,13 @@ gm_unlink (gm) static int gm_do_callbacks (gm, events, event, params, nparams) Marker gm; - register int events; + int events; XEvent *event; String *params; Cardinal nparams; { - register int n; - register struct markerCallback *cb; + int n; + struct markerCallback *cb; struct markerCallback callback[GM_MAXCALLBACKS]; int ncallbacks, status; @@ -2222,10 +2222,10 @@ gm_do_callbacks (gm, events, event, params, nparams) */ static void gm_constraint (gm, new_gm, what) - register Marker gm, new_gm; - register int what; + Marker gm, new_gm; + int what; { - register char *ip, *op; + char *ip, *op; char argbuf[2048]; char *argv[30]; int argc = 0; @@ -2299,10 +2299,10 @@ gm_constraint (gm, new_gm, what) static void gm_erase (gm) - register Marker gm; + Marker gm; { - register GtermWidget w = gm->w; - register XRectangle *r = &gm->old_rect; + GtermWidget w = gm->w; + XRectangle *r = &gm->old_rect; if (!w || !XtIsRealized ((Widget)w)) return; @@ -2328,9 +2328,9 @@ M_create (widget, event, params, nparams) String *params; Cardinal *nparams; { - register GtermWidget w = (GtermWidget)widget; - register XButtonEvent *ev = (XButtonEvent *) event; - register Marker gm; + GtermWidget w = (GtermWidget)widget; + XButtonEvent *ev = (XButtonEvent *) event; + Marker gm; int interactive, type; gmSelection what; @@ -2369,9 +2369,9 @@ M_destroy (widget, event, params, nparams) String *params; Cardinal *nparams; { - register GtermWidget w = (GtermWidget)widget; - register XButtonEvent *ev = (XButtonEvent *) event; - register Marker gm; + GtermWidget w = (GtermWidget)widget; + XButtonEvent *ev = (XButtonEvent *) event; + Marker gm; savepos (w, event); @@ -2393,9 +2393,9 @@ M_destroyNull (widget, event, params, nparams) String *params; Cardinal *nparams; { - register GtermWidget w = (GtermWidget)widget; - register XButtonEvent *ev = (XButtonEvent *) event; - register Marker gm; + GtermWidget w = (GtermWidget)widget; + XButtonEvent *ev = (XButtonEvent *) event; + Marker gm; savepos (w, event); @@ -2418,9 +2418,9 @@ M_set (widget, event, params, nparams) String *params; Cardinal *nparams; { - register GtermWidget w = (GtermWidget)widget; - register XButtonEvent *ev = (XButtonEvent *) event; - register Marker gm; + GtermWidget w = (GtermWidget)widget; + XButtonEvent *ev = (XButtonEvent *) event; + Marker gm; int i; savepos (w, event); @@ -2444,9 +2444,9 @@ M_raise (widget, event, params, nparams) String *params; Cardinal *nparams; { - register GtermWidget w = (GtermWidget)widget; - register XButtonEvent *ev = (XButtonEvent *) event; - register Marker gm; + GtermWidget w = (GtermWidget)widget; + XButtonEvent *ev = (XButtonEvent *) event; + Marker gm; int i; savepos (w, event); @@ -2468,9 +2468,9 @@ M_lower (widget, event, params, nparams) String *params; Cardinal *nparams; { - register GtermWidget w = (GtermWidget)widget; - register XButtonEvent *ev = (XButtonEvent *) event; - register Marker gm; + GtermWidget w = (GtermWidget)widget; + XButtonEvent *ev = (XButtonEvent *) event; + Marker gm; int i; savepos (w, event); @@ -2493,9 +2493,9 @@ M_notify (widget, event, params, nparams) String *params; Cardinal *nparams; { - register GtermWidget w = (GtermWidget)widget; - register XButtonEvent *ev = (XButtonEvent *) event; - register Marker gm; + GtermWidget w = (GtermWidget)widget; + XButtonEvent *ev = (XButtonEvent *) event; + Marker gm; int events, i; savepos (w, event); @@ -2536,9 +2536,9 @@ M_input (widget, event, params, nparams) String *params; Cardinal *nparams; { - register GtermWidget w = (GtermWidget)widget; - register XKeyEvent *ev = (XKeyEvent *) event; - register Marker gm; + GtermWidget w = (GtermWidget)widget; + XKeyEvent *ev = (XKeyEvent *) event; + Marker gm; savepos (w, event); @@ -2560,9 +2560,9 @@ M_markpos (widget, event, params, nparams) String *params; Cardinal *nparams; { - register GtermWidget w = (GtermWidget)widget; - register XButtonEvent *ev = (XButtonEvent *) event; - register Marker gm; + GtermWidget w = (GtermWidget)widget; + XButtonEvent *ev = (XButtonEvent *) event; + Marker gm; savepos (w, event); @@ -2587,10 +2587,10 @@ M_markposAdd (widget, event, params, nparams) String *params; Cardinal *nparams; { - register GtermWidget w = (GtermWidget)widget; - register XButtonEvent *ev = (XButtonEvent *) event; + GtermWidget w = (GtermWidget)widget; + XButtonEvent *ev = (XButtonEvent *) event; GmSelection what = &w->gterm.gm_selection; - register Marker gm; + Marker gm; savepos (w, event); @@ -2618,9 +2618,9 @@ M_redraw (widget, event, params, nparams) String *params; Cardinal *nparams; { - register GtermWidget w = (GtermWidget)widget; - register XButtonEvent *ev = (XButtonEvent *) event; - register Marker gm; + GtermWidget w = (GtermWidget)widget; + XButtonEvent *ev = (XButtonEvent *) event; + Marker gm; int erase; savepos (w, event); @@ -2647,10 +2647,10 @@ M_addPt (widget, event, params, nparams) String *params; Cardinal *nparams; { - register GtermWidget w = (GtermWidget)widget; - register XButtonEvent *ev = (XButtonEvent *) event; + GtermWidget w = (GtermWidget)widget; + XButtonEvent *ev = (XButtonEvent *) event; GmSelection what = &w->gterm.gm_selection; - register Marker gm; + Marker gm; savepos (w, event); @@ -2675,10 +2675,10 @@ M_deletePt (widget, event, params, nparams) String *params; Cardinal *nparams; { - register GtermWidget w = (GtermWidget)widget; - register XButtonEvent *ev = (XButtonEvent *) event; + GtermWidget w = (GtermWidget)widget; + XButtonEvent *ev = (XButtonEvent *) event; GmSelection what = &w->gterm.gm_selection; - register Marker gm; + Marker gm; savepos (w, event); @@ -2701,10 +2701,10 @@ M_movePt (widget, event, params, nparams) String *params; Cardinal *nparams; { - register GtermWidget w = (GtermWidget)widget; - register XButtonEvent *ev = (XButtonEvent *) event; + GtermWidget w = (GtermWidget)widget; + XButtonEvent *ev = (XButtonEvent *) event; GmSelection what = &w->gterm.gm_selection; - register Marker gm; + Marker gm; savepos (w, event); @@ -2730,10 +2730,10 @@ M_deleteDestroy (widget, event, params, nparams) String *params; Cardinal *nparams; { - register GtermWidget w = (GtermWidget)widget; - register XButtonEvent *ev = (XButtonEvent *) event; + GtermWidget w = (GtermWidget)widget; + XButtonEvent *ev = (XButtonEvent *) event; GmSelection what = &w->gterm.gm_selection; - register Marker gm; + Marker gm; savepos (w, event); @@ -2762,9 +2762,9 @@ M_move (widget, event, params, nparams) String *params; Cardinal *nparams; { - register GtermWidget w = (GtermWidget)widget; - register XButtonEvent *ev = (XButtonEvent *) event; - register Marker gm; + GtermWidget w = (GtermWidget)widget; + XButtonEvent *ev = (XButtonEvent *) event; + Marker gm; savepos (w, event); @@ -2790,9 +2790,9 @@ M_resize (widget, event, params, nparams) String *params; Cardinal *nparams; { - register GtermWidget w = (GtermWidget)widget; - register XButtonEvent *ev = (XButtonEvent *) event; - register Marker gm; + GtermWidget w = (GtermWidget)widget; + XButtonEvent *ev = (XButtonEvent *) event; + Marker gm; savepos (w, event); @@ -2819,10 +2819,10 @@ M_moveResize (widget, event, params, nparams) String *params; Cardinal *nparams; { - register GtermWidget w = (GtermWidget)widget; - register XButtonEvent *ev = (XButtonEvent *) event; + GtermWidget w = (GtermWidget)widget; + XButtonEvent *ev = (XButtonEvent *) event; GmSelection what = &w->gterm.gm_selection; - register Marker gm; + Marker gm; savepos (w, event); @@ -2861,9 +2861,9 @@ M_rotate (widget, event, params, nparams) String *params; Cardinal *nparams; { - register GtermWidget w = (GtermWidget)widget; - register XButtonEvent *ev = (XButtonEvent *) event; - register Marker gm; + GtermWidget w = (GtermWidget)widget; + XButtonEvent *ev = (XButtonEvent *) event; + Marker gm; savepos (w, event); @@ -2889,10 +2889,10 @@ M_rotateResize (widget, event, params, nparams) String *params; Cardinal *nparams; { - register GtermWidget w = (GtermWidget)widget; - register XButtonEvent *ev = (XButtonEvent *) event; + GtermWidget w = (GtermWidget)widget; + XButtonEvent *ev = (XButtonEvent *) event; GmSelection what = &w->gterm.gm_selection; - register Marker gm; + Marker gm; savepos (w, event); @@ -2956,10 +2956,10 @@ static void gm_text_update(), gm_text_updatePolygon(); static void gm_text_init (gm, interactive) - register Marker gm; + Marker gm; int interactive; { - register GtermWidget w = gm->w; + GtermWidget w = gm->w; gm->type = Gm_Text; if (!(gm->flags & Gm_Activated)) { @@ -3006,7 +3006,7 @@ gm_text_init (gm, interactive) static int gm_text_select (gm, x, y, what) - register Marker gm; + Marker gm; int x, y; GmSelection what; { @@ -3021,7 +3021,7 @@ gm_text_select (gm, x, y, what) static void gm_text_markpos (gm) - register Marker gm; + Marker gm; { gm_markpos (gm); } @@ -3029,10 +3029,10 @@ gm_text_markpos (gm) static void gm_text_redraw (gm, function) - register Marker gm; + Marker gm; int function; { - register GtermWidget w = gm->w; + GtermWidget w = gm->w; int flags = (Gm_Activated|Gm_Visible); int char_width, char_height, xsize, ysize; int breakline, l_pix, r_pix, maxch, x, y; @@ -3146,9 +3146,9 @@ gm_text_redraw (gm, function) static void gm_text_update (gm) - register Marker gm; + Marker gm; { - register GtermWidget w = gm->w; + GtermWidget w = gm->w; int flags = (Gm_Activated|Gm_Visible); if (!((gm->flags & flags) == flags)) @@ -3165,7 +3165,7 @@ gm_text_update (gm) static void gm_text_move (gm, x, y) - register Marker gm; + Marker gm; int x, y; { struct marker new_gm; @@ -3181,7 +3181,7 @@ gm_text_move (gm, x, y) static void gm_text_resize (gm, x, y) - register Marker gm; + Marker gm; int x, y; { struct marker new_gm; @@ -3197,9 +3197,9 @@ gm_text_resize (gm, x, y) static void gm_text_updatePolygon (gm) - register Marker gm; + Marker gm; { - register XPoint *p = gm->points; + XPoint *p = gm->points; int xsize = gm->width; int ysize = gm->height; @@ -3215,7 +3215,7 @@ gm_text_updatePolygon (gm) */ static void gm_line_init (gm, interactive) - register Marker gm; + Marker gm; int interactive; { gm->type = Gm_Line; @@ -3227,7 +3227,7 @@ gm_line_init (gm, interactive) */ static void gm_plin_init (gm, interactive) - register Marker gm; + Marker gm; int interactive; { gm->type = Gm_Polyline; @@ -3243,10 +3243,10 @@ static void gm_rect_update(), gm_rect_updatePolygon(); static void gm_rect_init (gm, interactive) - register Marker gm; + Marker gm; int interactive; { - register GtermWidget w = gm->w; + GtermWidget w = gm->w; gm->type = Gm_Rectangle; if (!(gm->flags & Gm_Activated)) { @@ -3281,7 +3281,7 @@ gm_rect_init (gm, interactive) static void gm_rect_update (gm) - register Marker gm; + Marker gm; { if (gm->flags & Gm_Modified) { gm_rect_updatePolygon (gm); @@ -3292,7 +3292,7 @@ gm_rect_update (gm) static int gm_rect_select (gm, x, y, what) - register Marker gm; + Marker gm; int x, y; GmSelection what; { @@ -3306,7 +3306,7 @@ gm_rect_select (gm, x, y, what) static void gm_rect_move (gm, x, y) - register Marker gm; + Marker gm; int x, y; { struct marker new_gm; @@ -3320,7 +3320,7 @@ gm_rect_move (gm, x, y) static void gm_rect_resize (gm, x, y) - register Marker gm; + Marker gm; int x, y; { /* double cos_rotangle = cos (-(gm->rotangle)); @@ -3365,7 +3365,7 @@ gm_rect_resize (gm, x, y) static void gm_rect_rotate (gm, x, y) - register Marker gm; + Marker gm; int x, y; { double alpha, theta; @@ -3399,8 +3399,8 @@ static void gm_rect_updatePolygon (gm) Marker gm; { - register int x, y; - register XPoint *p = gm->points; + int x, y; + XPoint *p = gm->points; double cos_rotangle, sin_rotangle; /* cos_rotangle = cos (gm->rotangle); @@ -3439,10 +3439,10 @@ static void gm_boxx_update(), gm_boxx_updatePolygon(); static void gm_boxx_init (gm, interactive) - register Marker gm; + Marker gm; int interactive; { - register GtermWidget w = gm->w; + GtermWidget w = gm->w; gm->type = Gm_Box; if (!(gm->flags & Gm_Activated)) { @@ -3477,7 +3477,7 @@ gm_boxx_init (gm, interactive) static void gm_boxx_update (gm) - register Marker gm; + Marker gm; { if (gm->flags & Gm_Modified) { gm_boxx_updatePolygon (gm); @@ -3488,7 +3488,7 @@ gm_boxx_update (gm) static int gm_boxx_select (gm, x, y, what) - register Marker gm; + Marker gm; int x, y; GmSelection what; { @@ -3502,7 +3502,7 @@ gm_boxx_select (gm, x, y, what) static void gm_boxx_move (gm, x, y) - register Marker gm; + Marker gm; int x, y; { struct marker new_gm; @@ -3516,7 +3516,7 @@ gm_boxx_move (gm, x, y) static void gm_boxx_resize (gm, x, y) - register Marker gm; + Marker gm; int x, y; { /* double cos_rotangle = cos (-(gm->rotangle)); @@ -3547,7 +3547,7 @@ gm_boxx_resize (gm, x, y) static void gm_boxx_rotate (gm, x, y) - register Marker gm; + Marker gm; int x, y; { double alpha, theta; @@ -3576,8 +3576,8 @@ static void gm_boxx_updatePolygon (gm) Marker gm; { - register int x, y; - register XPoint *p = gm->points; + int x, y; + XPoint *p = gm->points; double cos_rotangle, sin_rotangle; double alpha = atan2 ((double)gm->height, (double)gm->width); @@ -3616,10 +3616,10 @@ static void gm_circ_update(), gm_circ_updatePolygon(); static void gm_circ_init (gm, interactive) - register Marker gm; + Marker gm; int interactive; { - register GtermWidget w = gm->w; + GtermWidget w = gm->w; gm->type = Gm_Circle; if (!(gm->flags & Gm_Activated)) { @@ -3657,7 +3657,7 @@ gm_circ_init (gm, interactive) static void gm_circ_update (gm) - register Marker gm; + Marker gm; { if (gm->flags & Gm_Modified) { gm_circ_updatePolygon (gm); @@ -3668,7 +3668,7 @@ gm_circ_update (gm) static int gm_circ_select (gm, x, y, what) - register Marker gm; + Marker gm; int x, y; GmSelection what; { @@ -3682,7 +3682,7 @@ gm_circ_select (gm, x, y, what) static void gm_circ_move (gm, x, y) - register Marker gm; + Marker gm; int x, y; { struct marker new_gm; @@ -3696,7 +3696,7 @@ gm_circ_move (gm, x, y) static void gm_circ_resize (gm, x, y) - register Marker gm; + Marker gm; int x, y; { struct marker new_gm; @@ -3713,8 +3713,8 @@ static void gm_circ_updatePolygon (gm) Marker gm; { - register XPoint *p = gm->points; - register int npts, i, j; + XPoint *p = gm->points; + int npts, i, j; double theta, x, y; /*npts = (gm->npoints - 1) / 4;*/ @@ -3754,10 +3754,10 @@ static void gm_elip_update(), gm_elip_updatePolygon(); static void gm_elip_init (gm, interactive) - register Marker gm; + Marker gm; int interactive; { - register GtermWidget w = gm->w; + GtermWidget w = gm->w; gm->type = Gm_Ellipse; if (!(gm->flags & Gm_Activated)) { @@ -3794,7 +3794,7 @@ gm_elip_init (gm, interactive) static void gm_elip_update (gm) - register Marker gm; + Marker gm; { if (gm->flags & Gm_Modified) { gm_elip_updatePolygon (gm); @@ -3805,7 +3805,7 @@ gm_elip_update (gm) static int gm_elip_select (gm, x, y, what) - register Marker gm; + Marker gm; int x, y; GmSelection what; { @@ -3819,7 +3819,7 @@ gm_elip_select (gm, x, y, what) static void gm_elip_move (gm, x, y) - register Marker gm; + Marker gm; int x, y; { struct marker new_gm; @@ -3833,7 +3833,7 @@ gm_elip_move (gm, x, y) static void gm_elip_resize (gm, x, y) - register Marker gm; + Marker gm; int x, y; { struct marker new_gm; @@ -3863,7 +3863,7 @@ gm_elip_resize (gm, x, y) static void gm_elip_rotate (gm, x, y) - register Marker gm; + Marker gm; int x, y; { struct marker new_gm; @@ -3888,8 +3888,8 @@ static void gm_elip_updatePolygon (gm) Marker gm; { - register XPoint *p = gm->points; - register int npts, i, j; + XPoint *p = gm->points; + int npts, i, j; double cos_rotangle, sin_rotangle; double theta, x, y; @@ -3934,11 +3934,11 @@ static void gm_pgon_redraw(), gm_pgon_update(), gm_pgon_updatePolygon(); static void gm_pgon_init (gm, interactive) - register Marker gm; + Marker gm; int interactive; { - register GtermWidget w = gm->w; - register DPoint *p; + GtermWidget w = gm->w; + DPoint *p; gm->type = Gm_Polygon; if (!(gm->flags & Gm_Activated)) { @@ -4019,7 +4019,7 @@ gm_pgon_init (gm, interactive) static void gm_pgon_redraw (gm, function) - register Marker gm; + Marker gm; int function; { /* The PgonInit flag is set when a polygon marker is interactively created @@ -4034,7 +4034,7 @@ gm_pgon_redraw (gm, function) static void gm_pgon_update (gm) - register Marker gm; + Marker gm; { if (gm->flags & Gm_Modified) { gm_pgon_updatePolygon (gm); @@ -4045,11 +4045,11 @@ gm_pgon_update (gm) static void gm_pgon_addPt (gm, x, y) - register Marker gm; + Marker gm; int x, y; { - register DPoint *pv; - register GtermWidget w = gm->w; + DPoint *pv; + GtermWidget w = gm->w; /* double cos_rotangle = cos (-(gm->rotangle)); double sin_rotangle = sin (-(gm->rotangle)); */ double cos_rotangle = cos ((gm->rotangle)); /* MF019 */ @@ -4101,11 +4101,11 @@ gm_pgon_addPt (gm, x, y) static void gm_pgon_deletePt (gm, x, y) - register Marker gm; + Marker gm; int x, y; { - register DPoint *pv; - register GtermWidget w = gm->w; + DPoint *pv; + GtermWidget w = gm->w; int vertex, nbytes; if (gm->npoints <= 2) @@ -4142,11 +4142,11 @@ gm_pgon_deletePt (gm, x, y) static void gm_pgon_movePt (gm, x, y) - register Marker gm; + Marker gm; int x, y; { - register DPoint *p; - register GtermWidget w = gm->w; + DPoint *p; + GtermWidget w = gm->w; /* double cos_rotangle = cos (-(gm->rotangle)); double sin_rotangle = sin (-(gm->rotangle)); */ double cos_rotangle = cos ((gm->rotangle)); /* MF019 */ @@ -4183,7 +4183,7 @@ gm_pgon_movePt (gm, x, y) static void gm_pgon_move (gm, x, y) - register Marker gm; + Marker gm; int x, y; { struct marker new_gm; @@ -4205,7 +4205,7 @@ gm_pgon_resize (gm, x, y) Marker gm; int x, y; { - register DPoint *p, *q; + DPoint *p, *q; GtermWidget w = gm->w; double cos_rotangle = cos (-(gm->rotangle)); double sin_rotangle = sin (-(gm->rotangle)); @@ -4262,11 +4262,11 @@ gm_pgon_resize (gm, x, y) static void gm_pgon_rotate (gm, x, y) - register Marker gm; + Marker gm; int x, y; { - register DPoint *p; - register GtermWidget w = gm->w; + DPoint *p; + GtermWidget w = gm->w; double cos_rotangle = cos (-(gm->rotangle)); double sin_rotangle = sin (-(gm->rotangle)); double alpha, beta, rx, ry; @@ -4317,9 +4317,9 @@ static void gm_pgon_updatePolygon (gm) Marker gm; { - register int npts, i; - register DPoint *ip = gm->pgon; - register XPoint *op = gm->points; + int npts, i; + DPoint *ip = gm->pgon; + XPoint *op = gm->points; double cos_rotangle, sin_rotangle; int width, height, xp, xn, yp, yn; @@ -4366,10 +4366,10 @@ gm_pgon_updatePolygon (gm) static int gm_select (gm, x, y, what) Marker gm; - register int x, y; + int x, y; GmSelection what; { - register XPoint *p, *ptop; + XPoint *p, *ptop; GtermWidget w = gm->w; int v_dist = w->gterm.gm_nearVertex; int e_dist = w->gterm.gm_nearEdge; @@ -4509,7 +4509,7 @@ float *xp, *yp, x, y; */ static void gm_markpos (gm) - register Marker gm; + Marker gm; { gm->old_rect = gm->cur_rect; XUnionRegion (gm->cur_region, null_region, gm->old_region); @@ -4520,7 +4520,7 @@ gm_markpos (gm) */ static void gm_redraw (gm, function) - register Marker gm; + Marker gm; int function; { GtermWidget w = gm->w; diff --git a/obm/ObmW/HTML.c b/obm/ObmW/HTML.c index 19a5412..73d687b 100644 --- a/obm/ObmW/HTML.c +++ b/obm/ObmW/HTML.c @@ -3561,7 +3561,7 @@ Scroll (w, event, params, num_params) String *params; Cardinal *num_params; { - register HTMLWidget hw = (HTMLWidget)XtParent(w); + HTMLWidget hw = (HTMLWidget)XtParent(w); #ifdef MOTIF int val, size, inc, pageinc; #endif diff --git a/obm/ObmW/MultiList.c b/obm/ObmW/MultiList.c index 100c31f..a563927 100644 --- a/obm/ObmW/MultiList.c +++ b/obm/ObmW/MultiList.c @@ -794,7 +794,7 @@ Boolean width_changeable,height_changeable; { String str; Dimension width,height; - register int i,text_width; + int i,text_width; width = MultiListWidth(mlw); height = MultiListHeight(mlw); @@ -1188,7 +1188,7 @@ static Boolean RowColumnToItem(mlw,row,column,item_ptr) XfwfMultiListWidget mlw; int row,column,*item_ptr; { - register int x_stride,y_stride; + int x_stride,y_stride; if (row < 0 || row >= MultiListNumRows(mlw) || column < 0 || column >= MultiListNumCols(mlw)) diff --git a/obm/ObmW/Separator.c b/obm/ObmW/Separator.c index 7a9a36b..3a51c72 100644 --- a/obm/ObmW/Separator.c +++ b/obm/ObmW/Separator.c @@ -263,7 +263,7 @@ static void Redisplay(gw, event, region) XEvent *event; Region region; { - register SeparatorWidget sw = (SeparatorWidget) gw; + SeparatorWidget sw = (SeparatorWidget) gw; int x1, y1, x2, y2; if (!XtIsRealized(gw)) diff --git a/obm/ObmW/Table.c b/obm/ObmW/Table.c index 5453d27..0c9e0b0 100644 --- a/obm/ObmW/Table.c +++ b/obm/ObmW/Table.c @@ -642,7 +642,7 @@ static NormalReverseGC* GetNormalGC(w, fore, back, font) Pixel back; Font font; { - register XawTableWidget tw = (XawTableWidget)w; + XawTableWidget tw = (XawTableWidget)w; int i = NORMAL_INDEX(fore, back); while (GET_NORMAL(tw,i)->used > 0) @@ -700,7 +700,7 @@ static ShadowGC* GetShadowGC(w, back) Widget w; Pixel back; { - register XawTableWidget tw = (XawTableWidget)w; + XawTableWidget tw = (XawTableWidget)w; int i = SHADOW_INDEX(back); while (GET_SHADOW(tw,i)->used > 0) @@ -741,7 +741,7 @@ static void ReleaseNormalGC(w, fore, back) Pixel fore; Pixel back; { - register XawTableWidget tw = (XawTableWidget)w; + XawTableWidget tw = (XawTableWidget)w; int i = NORMAL_INDEX(fore, back); while (GET_NORMAL(tw,i)->used > 0) @@ -763,7 +763,7 @@ static void ReleaseShadowGC(w, back) Widget w; Pixel back; { - register XawTableWidget tw = (XawTableWidget)w; + XawTableWidget tw = (XawTableWidget)w; int i = SHADOW_INDEX(back); while (GET_SHADOW(tw,i)->used > 0) @@ -849,9 +849,9 @@ static void CalculatePreferredSize(w, width, height) Dimension *width; Dimension *height; { - register XawTableWidget tw = (XawTableWidget)w; - register int wid; - register int hei; + XawTableWidget tw = (XawTableWidget)w; + int wid; + int hei; int i; /* @@ -883,18 +883,18 @@ static void CalculatePreferredSize(w, width, height) } static Position GetX(tw,j) - register XawTableWidget tw; + XawTableWidget tw; int j; { - register TablePart* table = (TablePart*)&tw->table; - register Position x; + TablePart* table = (TablePart*)&tw->table; + Position x; x = j * (table->col_margin + 2 * table->label_shadow_thickness) + (table->tab_margin + tw->container.shadow_thickness); for(; j > 0 ; j--) { - register int tmp = j - 1; + int tmp = j - 1; x += (Position)COLUMN_WIDTH(tw, tmp); } return x; @@ -917,7 +917,7 @@ static Position GetY(tw,i) static void SetLabelHeight(tw) XawTableWidget tw; { - register XFontStruct *fs = tw->table.font; + XFontStruct *fs = tw->table.font; int row_height = tw->table.row_height; if (tw->table.row_height < 1) @@ -955,7 +955,7 @@ static void SetLabelWidth(tw,i,j) XawTableWidget tw; int i,j; { - register XFontStruct *fs = tw->table.font; + XFontStruct *fs = tw->table.font; XawTableCell cell; cell = (XawTableCell)get_cell(STUFF(tw),i,j); @@ -1094,7 +1094,7 @@ static void DrawCage(tw, b_row, e_row, b_column, e_column) } static void Reposition(tw, cell, i, j) - register XawTableWidget tw; + XawTableWidget tw; XawTableCell cell; int i,j; { @@ -1274,7 +1274,7 @@ static void Initialize(request, new, args, num_args) ArgList args; Cardinal *num_args; { - register XawTableWidget tw = (XawTableWidget) new; + XawTableWidget tw = (XawTableWidget) new; Dimension width; Dimension height; int i; @@ -1508,7 +1508,7 @@ static void PaintLabel(w, i, j, x, y, cell) if (CELL(label_len) > 0) { GC gc; - register XFontStruct *fs = tw->table.font; + XFontStruct *fs = tw->table.font; if (CELL(special_colour)) gc = CELL(highlight) ? CELL(reverse) : CELL(normal); @@ -1570,7 +1570,7 @@ static Boolean PaintCell(p, i, j, call_data, client_data) static void WhatCellsToBeDraw(tw, rect, b_row, e_row, b_column , e_column) XawTableWidget tw; XRectangle rect; - register int *b_row, *e_row, *b_column , *e_column; + int *b_row, *e_row, *b_column , *e_column; { Position x1 = (Position)rect.x, y1 = (Position)rect.y, @@ -1711,7 +1711,7 @@ static Boolean SetValues(current, request, new, args, num_args) { XawTableWidget curtw = (XawTableWidget) current; XawTableWidget newtw = (XawTableWidget) new; - register int i; + int i; int j; Boolean resize = False; Boolean redisplay = False; @@ -3230,7 +3230,7 @@ XawTableSetLabel(w, row, column, raw_label) const char *raw_label; #endif { - register XawTableWidget tw = (XawTableWidget)w; + XawTableWidget tw = (XawTableWidget)w; XawTableCallbackStruct callback_str; XawTableCell cell; char* label = NULL; @@ -3879,7 +3879,7 @@ XawTableSetColumnWidth(w, column, width) { XawTableWidget tw = (XawTableWidget)w; XawTableCallbackStruct callback_str; - register int row; + int row; if (column != InRange (column, 0, COLUMNS(tw)-1)) return; @@ -3921,7 +3921,7 @@ XawTableSetMultiColumnWidths (w, columns, widths, ncols) { XawTableWidget tw = (XawTableWidget)w; XawTableCallbackStruct callback_str; - register int i, row, col, width; + int i, row, col, width; for (i=0; i < ncols; i++ ) { if (columns[i] != InRange (columns[i], 0, COLUMNS(tw)-1)) @@ -4568,7 +4568,7 @@ static void InsertSelection(w, event, params, num_params) static int GetCutBufferNumber(atom) - register Atom atom; + Atom atom; { if (atom == XA_CUT_BUFFER0) return(0); if (atom == XA_CUT_BUFFER1) return(1); diff --git a/obm/ObmW/TableUtil.c b/obm/ObmW/TableUtil.c index 572ab59..9d26721 100644 --- a/obm/ObmW/TableUtil.c +++ b/obm/ObmW/TableUtil.c @@ -30,9 +30,9 @@ Commercial usage is also possible with participation of the author. #define FREE(t) if((t) != null)XtFree((char*)(t)) static void vert_tab_node_insert(f,s,p) - register XawTableNode f; /* insert after */ - register XawTableNode s; /* insert before */ - register XawTableNode p; /* to be inserted */ + XawTableNode f; /* insert after */ + XawTableNode s; /* insert before */ + XawTableNode p; /* to be inserted */ { if (f != null) f->b = p; if (s != null) s->t = p; @@ -40,9 +40,9 @@ static void vert_tab_node_insert(f,s,p) } static void horiz_tab_node_insert(f,s,p) - register XawTableNode f; /* insert after */ - register XawTableNode s; /* insert before */ - register XawTableNode p; /* to be inserted */ + XawTableNode f; /* insert after */ + XawTableNode s; /* insert before */ + XawTableNode p; /* to be inserted */ { if (f != null) f->r = p; if (s != null) s->l = p; @@ -50,7 +50,7 @@ static void horiz_tab_node_insert(f,s,p) } static void vert_tab_node_reject(p) - register XawTableNode p; + XawTableNode p; { if (p == null) return; @@ -59,7 +59,7 @@ static void vert_tab_node_reject(p) } static void horiz_tab_node_reject(p) - register XawTableNode p; + XawTableNode p; { if (p == null) return; @@ -95,7 +95,7 @@ row_delete(f) XtPointer f; #endif { - register XawTableNode p = (XawTableNode) f; + XawTableNode p = (XawTableNode) f; if (p == null) return; @@ -137,7 +137,7 @@ column_delete(f) XtPointer f; #endif { - register XawTableNode p = (XawTableNode) f; + XawTableNode p = (XawTableNode) f; if (p == null) return; @@ -182,8 +182,8 @@ row_insert_after(d, node_size) int node_size; #endif { - register XawTableNode f = (XawTableNode) d; - register XawTableNode p; + XawTableNode f = (XawTableNode) d; + XawTableNode p; XawTableNode left; if (f == null) @@ -254,8 +254,8 @@ row_insert_before(d, node_size) int node_size; #endif { - register XawTableNode f = (XawTableNode) d; - register XawTableNode p; + XawTableNode f = (XawTableNode) d; + XawTableNode p; XawTableNode left; if (f == null) @@ -326,8 +326,8 @@ column_insert_after(d, node_size) int node_size; #endif { - register XawTableNode f = (XawTableNode) d; - register XawTableNode p; + XawTableNode f = (XawTableNode) d; + XawTableNode p; XawTableNode top; if (f == null) @@ -399,8 +399,8 @@ column_insert_before(d, node_size) int node_size; #endif { - register XawTableNode f = (XawTableNode)d; - register XawTableNode p; + XawTableNode f = (XawTableNode)d; + XawTableNode p; XawTableNode top; if (f == null) @@ -470,7 +470,7 @@ get_table(f) XtPointer f; #endif { - register XawTableNode p = (XawTableNode) f; + XawTableNode p = (XawTableNode) f; if (p == null) return (XtPointer)NULL; @@ -494,15 +494,15 @@ get_table(f) XtPointer #if NeedFunctionPrototypes -get_cell (XtPointer f, register int i, register int j) +get_cell (XtPointer f, int i, int j) #else get_cell (f, i, j) XtPointer f; - register int i; - register int j; + int i; + int j; #endif { - register XawTableNode p = (XawTableNode) f; + XawTableNode p = (XawTableNode) f; if (p == null) return (XtPointer)NULL; @@ -574,8 +574,8 @@ go_table ( int begin_column, int end_column, int direction, - register int *i, /* returned */ - register int *j, /* returned */ + int *i, /* returned */ + int *j, /* returned */ XtPointer client_data) #else go_table(w, proc, table, begin_row, end_row, begin_column, end_column, @@ -588,13 +588,13 @@ go_table(w, proc, table, begin_row, end_row, begin_column, end_column, int begin_column; int end_column; int direction; - register int *i; /* returned */ - register int *j; /* returned */ + int *i; /* returned */ + int *j; /* returned */ XtPointer client_data; #endif { - register XawTableNode p; - register XawTableNode n; + XawTableNode p; + XawTableNode n; table = get_table(table); @@ -604,12 +604,12 @@ go_table(w, proc, table, begin_row, end_row, begin_column, end_column, for (*j = begin_column; *j <= end_column && p != null; (*j)++) { - register XawTableNode sp = p; /* protect against deallocated node !! */ + XawTableNode sp = p; /* protect against deallocated node !! */ p = p->r; for (*i = begin_row, n = sp; *i <= end_row && n != null; (*i)++) { - register XawTableNode sn = n; /* protect against deallocated node !! */ + XawTableNode sn = n; /* protect against deallocated node !! */ n = n->b; if (proc(w, *i, *j, (XtPointer)sn, client_data)) @@ -623,12 +623,12 @@ go_table(w, proc, table, begin_row, end_row, begin_column, end_column, for (*i = begin_row; *i <= end_row && p != null; (*i)++) { - register XawTableNode sp = p; /* protect against deallocated node !! */ + XawTableNode sp = p; /* protect against deallocated node !! */ p = p->b; for (*j = begin_column, n = sp; *j <= end_column && n != null; (*j)++) { - register XawTableNode sn = n; /* protect against deallocated node !! */ + XawTableNode sn = n; /* protect against deallocated node !! */ n = n->r; if (proc(w, *i, *j, (XtPointer)sn, client_data)) @@ -651,16 +651,16 @@ go_table(w, proc, table, begin_row, end_row, begin_column, end_column, void #if NeedFunctionPrototypes get_table_size (XtPointer f, - register int *i, /* returned */ - register int *j) /* returned */ + int *i, /* returned */ + int *j) /* returned */ #else get_table_size(f,i,j) XtPointer f; - register int *i; /* returned */ - register int *j; /* returned */ + int *i; /* returned */ + int *j; /* returned */ #endif { - register XawTableNode p = (XawTableNode)f; + XawTableNode p = (XawTableNode)f; if (p == null){ *i = 0; *j = 0; @@ -691,7 +691,7 @@ delete_table(f) XtPointer f; #endif { - register XawTableNode p = (XawTableNode)f; + XawTableNode p = (XawTableNode)f; int i,j; int end_row, end_column; @@ -717,16 +717,16 @@ delete_table(f) void #if NeedFunctionPrototypes get_cell_positions (XtPointer f, - register int *i, /* returned */ - register int *j) /* returned */ + int *i, /* returned */ + int *j) /* returned */ #else get_cell_positions(f, i, j) XtPointer f; - register int *i; /* returned */ - register int *j; /* returned */ + int *i; /* returned */ + int *j; /* returned */ #endif { - register XawTableNode p = (XawTableNode)f; + XawTableNode p = (XawTableNode)f; if ( p == null ) return; @@ -759,15 +759,15 @@ create_table(rows, columns, node_size) int node_size; #endif { - register XawTableNode *area; - register XawTableNode p; - register int i,j; + XawTableNode *area; + XawTableNode p; + int i,j; XawTableNode table; if (rows == 0 || columns == 0) return (XtPointer)NULL; else{ - register XawTableNode *s; + XawTableNode *s; /* allocate temporary two-dimension array to make first node's binding */ if ( (s = area = (XawTableNode*) @@ -827,7 +827,7 @@ static Boolean check_cell (w, row, column, call_data, client_data) XtPointer call_data; XtPointer client_data; { - register XawTableNode p = (XawTableNode)call_data; + XawTableNode p = (XawTableNode)call_data; int real_row, real_column; char *halt = NULL;; @@ -879,9 +879,9 @@ _check_table (f, rows, columns) int columns; #endif { - register XawTableNode table = (XawTableNode)f; + XawTableNode table = (XawTableNode)f; int real_rows, real_columns; - register int i,j; + int i,j; char *halt = NULL; if (f == NULL && (rows == 0 || columns == 0)) diff --git a/obm/ObmW/TableUtil.h b/obm/ObmW/TableUtil.h index afd752f..0b83ed6 100644 --- a/obm/ObmW/TableUtil.h +++ b/obm/ObmW/TableUtil.h @@ -79,8 +79,8 @@ extern Boolean go_table F_PROTO((XtPointer w, int begin_column, int end_column, int direction, - register int *row, - register int *column, + int *row, + int *column, XtPointer client_data)); #ifdef EBUG_XRAW_MALLOC diff --git a/obm/ObmW/Tablist2Tabs.c b/obm/ObmW/Tablist2Tabs.c index df4e133..a18fab8 100644 --- a/obm/ObmW/Tablist2Tabs.c +++ b/obm/ObmW/Tablist2Tabs.c @@ -10,8 +10,8 @@ int * XfwfTablist2Tabs(tablist) char *tablist; { - register int *tabs; - register int ntabs = 0; + int *tabs; + int ntabs = 0; if (!tablist) return NULL; diff --git a/obm/ObmW/Tabs.c b/obm/ObmW/Tabs.c index 767bd75..c8ef3b9 100644 --- a/obm/ObmW/Tabs.c +++ b/obm/ObmW/Tabs.c @@ -851,7 +851,7 @@ static XtGeometryResult TabsQueryGeometry(Widget w, XtWidgetGeometry *intended, XtWidgetGeometry *preferred) { - register TabsWidget tw = (TabsWidget)w ; + TabsWidget tw = (TabsWidget)w ; XtGeometryMask mode = intended->request_mode ; preferred->request_mode = CWWidth | CWHeight ; diff --git a/obm/ObmW/TextWidth.c b/obm/ObmW/TextWidth.c index f97a3c8..92d8435 100644 --- a/obm/ObmW/TextWidth.c +++ b/obm/ObmW/TextWidth.c @@ -16,8 +16,8 @@ XfwfTextWidth(font, str, length, tabs) int length; int *tabs; { - register char *p, *ep; - register int tx, tab, rc; + char *p, *ep; + int tx, tab, rc; tab = tx = 0; if (length == 0) return 0; diff --git a/obm/client.c b/obm/client.c index 7e68f81..74d3029 100644 --- a/obm/client.c +++ b/obm/client.c @@ -62,7 +62,7 @@ static int client_output(ObmContext, char *, int, char *); /* ClientClassInit -- Initialize the class record for the client class. */ void -ClientClassInit (ObmContext obm, register ObjClassRec classrec) +ClientClassInit (ObmContext obm, ObjClassRec classrec) { classrec->ClassDestroy = obmGenericClassDestroy; classrec->Create = ClientCreate; @@ -82,14 +82,14 @@ ClientCreate ( ArgList args, int nargs) { - register ClientObject obj; - register Tcl_Interp *tcl; + ClientObject obj; + Tcl_Interp *tcl; obj = (ClientObject) XtCalloc (1, sizeof (struct clientObject)); obj->client.tcl = tcl = Tcl_CreateInterp(); obj->client.obm = obm; - /* Register client-object actions. */ + /* client-object actions. */ Tcl_CreateCommand (tcl, "gcmd", clientGcmd, (ClientData)obj, NULL); Tcl_CreateCommand (tcl, @@ -106,7 +106,7 @@ ClientCreate ( static void ClientDestroy (ObmObject object) { - register ClientObject obj = (ClientObject) object; + ClientObject obj = (ClientObject) object; if (obj->core.being_destroyed++) Tcl_DeleteInterp (obj->client.tcl); @@ -118,8 +118,8 @@ ClientDestroy (ObmObject object) static int ClientEvaluate (ObmObject object, char *command) { - register ClientObject obj = (ClientObject) object; - register Tcl_Interp *tcl = obj->client.tcl; + ClientObject obj = (ClientObject) object; + Tcl_Interp *tcl = obj->client.tcl; int status, argc, i; char *argv[MAX_ARGS]; char **argvp; @@ -158,8 +158,8 @@ literal: if (Tcl_SplitList (tcl, command, &argc, &argvp) == TCL_OK) { static int clientGcmd (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { - register ClientObject obj = (ClientObject) object; - register ObmContext obm = obj->client.obm; + ClientObject obj = (ClientObject) object; + ObmContext obm = obj->client.obm; int stat; if (argc >= 2) { @@ -182,8 +182,8 @@ clientGcmd (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) static int clientGkey (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { - register ClientObject obj = (ClientObject) object; - register ObmContext obm = obj->client.obm; + ClientObject obj = (ClientObject) object; + ObmContext obm = obj->client.obm; int stat; if (argc >= 2) @@ -202,8 +202,8 @@ clientGkey (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) static int clientLiteral (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { - register ClientObject obj = (ClientObject) object; - register ObmContext obm = obj->client.obm; + ClientObject obj = (ClientObject) object; + ObmContext obm = obj->client.obm; int stat; if (argc >= 2) { @@ -222,8 +222,8 @@ clientLiteral (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) static int client_output (ObmContext obm, char *objname, int key, char *strval) { - register ObmCallback cb; - register int stat = 0; + ObmCallback cb; + int stat = 0; for (cb = obm->callback_list; cb; cb = cb->next) if ((cb->callback_type & OBMCB_clientOutput) && cb->u.fcn) diff --git a/obm/geom.c b/obm/geom.c index 3a1e2f5..27549ec 100644 --- a/obm/geom.c +++ b/obm/geom.c @@ -25,7 +25,7 @@ static Display *dpy; char * get_geometry (Display *display, Screen *screen, Window window, int origin) { - register char *op; + char *op; int screen_number = XScreenNumberOfScreen (screen); XWindowAttributes win_attributes; XVisualInfo vistemplate, *vinfo; diff --git a/obm/gterm.c b/obm/gterm.c index b891422..901c4e2 100644 --- a/obm/gterm.c +++ b/obm/gterm.c @@ -287,9 +287,9 @@ static void ndcToPixel(Widget, int, int, int, float *, float *); void GtermClassInit (ObmContext obm, ObjClassRec classrec) { - register GtermClassData gcd; - register Tcl_Interp *tcl; - register ClientData c_gcd; + GtermClassData gcd; + Tcl_Interp *tcl; + ClientData c_gcd; /* Install the class methods. */ classrec->ClassDestroy = GtermClassDestroy; @@ -464,9 +464,9 @@ GtermClassInit (ObmContext obm, ObjClassRec classrec) /* GtermClassDestroy -- Custom destroy procedure for the widget class. */ void -GtermClassDestroy (ObmContext obm, register ObjClassRec classrec) +GtermClassDestroy (ObmContext obm, ObjClassRec classrec) { - register GtermClassData gcd = (GtermClassData) classrec->class_data; + GtermClassData gcd = (GtermClassData) classrec->class_data; if (gcd) { if (gcd->tcl) @@ -488,7 +488,7 @@ GtermCreate ( ArgList args, int nargs) { - register GtermObject obj; + GtermObject obj; Widget w, pw; obj = (GtermObject) WidgetCreate (obm, name, @@ -517,8 +517,8 @@ GtermDestroy (ObmObject object) { GtermObject obj = (GtermObject) object; ObjClassRec classrec = obj->core.classrec; - register GtermClassData gcd = (GtermClassData) classrec->class_data; - register ObmCallback cb, cb_next; + GtermClassData gcd = (GtermClassData) classrec->class_data; + ObmCallback cb, cb_next; ObmContext obm = obj->widget.obm; Widget w = obj->widget.w; @@ -577,10 +577,10 @@ GtermDestroy (ObmObject object) static int gtermSetGterm (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { - register GtermClassData gcd = (GtermClassData) msg; + GtermClassData gcd = (GtermClassData) msg; GtermObject obj = (GtermObject) gcd->object[gcd->level]; - register WidgetPrivate wp = &obj->widget; - register ObmCallback cb; + WidgetPrivate wp = &obj->widget; + ObmCallback cb; ObmContext obm = wp->obm; char *message; @@ -606,9 +606,9 @@ static int gtermActivate (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; - register WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + WidgetPrivate wp = &obj->widget; + ObmContext obm = wp->obm; + Widget w = wp->w; GtActivate (w); return (TCL_OK); @@ -625,9 +625,9 @@ static int gtermDeactivate (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; - register WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + WidgetPrivate wp = &obj->widget; + ObmContext obm = wp->obm; + Widget w = wp->w; GtDeactivate (w); return (TCL_OK); @@ -643,9 +643,9 @@ static int gtermReset (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; - register WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + WidgetPrivate wp = &obj->widget; + ObmContext obm = wp->obm; + Widget w = wp->w; GtReset (w); return (TCL_OK); @@ -670,9 +670,9 @@ static int gtermFlush (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; - register WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + WidgetPrivate wp = &obj->widget; + ObmContext obm = wp->obm; + Widget w = wp->w; GtFlush (w); return (TCL_OK); @@ -711,9 +711,9 @@ static int gtermAddCallback (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; - register WidgetPrivate wp = &obj->widget; - register GtermPrivate gp = &obj->gterm; - register Widget w = wp->w; + WidgetPrivate wp = &obj->widget; + GtermPrivate gp = &obj->gterm; + Widget w = wp->w; char *userproc, *callback_type; ObmCallback cb, new; int type; @@ -772,8 +772,8 @@ static int gtermDeleteCallback (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; - register GtermPrivate gp = &obj->gterm; - register ObmCallback cb, prev; + GtermPrivate gp = &obj->gterm; + ObmCallback cb, prev; Widget w = obj->widget.w; char *procedure; @@ -824,8 +824,8 @@ static void gtermInputCallback (ObmCallback cb, Widget w, XEvent *event) { GtermObject obj = (GtermObject) cb->u.obj; - register WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; + WidgetPrivate wp = &obj->widget; + ObmContext obm = wp->obm; char s_x[SZ_NUMBER], s_y[SZ_NUMBER]; char message_data[SZ_LINE]; char *event_type; @@ -835,7 +835,7 @@ gtermInputCallback (ObmCallback cb, Widget w, XEvent *event) case KeyPress: case KeyRelease: { XKeyPressedEvent *ev = (XKeyPressedEvent *) event; - register char *ip, *op = message_data; + char *ip, *op = message_data; char buf[SZ_MESSAGE]; int n; @@ -872,7 +872,7 @@ gtermInputCallback (ObmCallback cb, Widget w, XEvent *event) case ButtonPress: case ButtonRelease: { XButtonPressedEvent *ev = (XButtonPressedEvent *) event; - register char *op = message_data; + char *op = message_data; if (event->type == KeyPress) event_type = "buttonPress"; @@ -924,8 +924,8 @@ static void gtermResizeCallback (ObmCallback cb, Widget w) { GtermObject obj = (GtermObject) cb->u.obj; - register WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; + WidgetPrivate wp = &obj->widget; + ObmContext obm = wp->obm; int rtype, width, height, depth, status; char s_width[SZ_NUMBER], s_height[SZ_NUMBER]; @@ -958,8 +958,8 @@ static void gtermResetCallback (ObmCallback cb, Widget w) { GtermObject obj = (GtermObject) cb->u.obj; - register WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; + WidgetPrivate wp = &obj->widget; + ObmContext obm = wp->obm; int status; status = Tcl_VarEval (obm->tcl, @@ -990,8 +990,8 @@ static int gtermSetCursorPos (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; - register WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; + WidgetPrivate wp = &obj->widget; + ObmContext obm = wp->obm; int raster, sv_raster, x, y; if (argc < 3) @@ -1025,8 +1025,8 @@ static int gtermGetCursorPos (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; - register WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; + WidgetPrivate wp = &obj->widget; + ObmContext obm = wp->obm; char *xout, *yout, buf[SZ_NUMBER]; int x, y; @@ -1061,9 +1061,9 @@ static int gtermSetCursorType (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; - register WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + WidgetPrivate wp = &obj->widget; + ObmContext obm = wp->obm; + Widget w = wp->w; char *cursor_type; int type; @@ -1094,9 +1094,9 @@ static int gtermBell (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; - register WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + WidgetPrivate wp = &obj->widget; + ObmContext obm = wp->obm; + Widget w = wp->w; GtBell (w); return (TCL_OK); @@ -1112,9 +1112,9 @@ static int gtermSetRaster (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; - register WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + WidgetPrivate wp = &obj->widget; + ObmContext obm = wp->obm; + Widget w = wp->w; int raster; if (argc < 2) @@ -1139,9 +1139,9 @@ static int gtermGetRaster (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; - register WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + WidgetPrivate wp = &obj->widget; + ObmContext obm = wp->obm; + Widget w = wp->w; char buf[SZ_NUMBER], *raster_var; int raster; @@ -1170,9 +1170,9 @@ static int gtermSetLogRes (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; - register WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + WidgetPrivate wp = &obj->widget; + ObmContext obm = wp->obm; + Widget w = wp->w; int width, height; if (argc < 3) @@ -1195,9 +1195,9 @@ static int gtermGetLogRes (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; - register WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + WidgetPrivate wp = &obj->widget; + ObmContext obm = wp->obm; + Widget w = wp->w; char *s_width, *s_height; char buf[SZ_NUMBER]; int width, height; @@ -1231,9 +1231,9 @@ static int gtermSetPhysRes (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; - register WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + WidgetPrivate wp = &obj->widget; + ObmContext obm = wp->obm; + Widget w = wp->w; int raster, width, height; if (argc < 3) @@ -1260,9 +1260,9 @@ static int gtermGetPhysRes (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; - register WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + WidgetPrivate wp = &obj->widget; + ObmContext obm = wp->obm; + Widget w = wp->w; char *s_width, *s_height; int raster, width, height; char buf[SZ_NUMBER]; @@ -1300,9 +1300,9 @@ static int gtermSetTextRes (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; - register WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + WidgetPrivate wp = &obj->widget; + ObmContext obm = wp->obm; + Widget w = wp->w; int rows, cols; if (argc < 3) @@ -1329,9 +1329,9 @@ static int gtermSetDataLevel (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; - register WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + WidgetPrivate wp = &obj->widget; + ObmContext obm = wp->obm; + Widget w = wp->w; int level; if (argc < 2) @@ -1357,9 +1357,9 @@ static int gtermSetLineWidth (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; - register WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + WidgetPrivate wp = &obj->widget; + ObmContext obm = wp->obm; + Widget w = wp->w; int width; if (argc < 2) @@ -1385,9 +1385,9 @@ static int gtermSetLineStyle (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; - register WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + WidgetPrivate wp = &obj->widget; + ObmContext obm = wp->obm; + Widget w = wp->w; int style; if (argc < 2) @@ -1425,9 +1425,9 @@ static int gtermSetColorIndex (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; - register WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + WidgetPrivate wp = &obj->widget; + ObmContext obm = wp->obm; + Widget w = wp->w; int color; if (argc < 2) @@ -1451,9 +1451,9 @@ static int gtermSetFillType (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; - register WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + WidgetPrivate wp = &obj->widget; + ObmContext obm = wp->obm; + Widget w = wp->w; int filltype; if (argc < 2) @@ -1476,9 +1476,9 @@ static int gtermClearScreen (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; - register WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + WidgetPrivate wp = &obj->widget; + ObmContext obm = wp->obm; + Widget w = wp->w; GtClearScreen (w); return (TCL_OK); @@ -1500,9 +1500,9 @@ gtermDrawPolyline (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; - register XPoint *pv; + ObmContext obm = wp->obm; + Widget w = wp->w; + XPoint *pv; int npoints; if (argc < 2) @@ -1532,9 +1532,9 @@ gtermDrawPolymarker (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; - register XPoint *pv; + ObmContext obm = wp->obm; + Widget w = wp->w; + XPoint *pv; int npoints; if (argc < 2) @@ -1564,9 +1564,9 @@ gtermDrawPolygon (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; - register XPoint *pv; + ObmContext obm = wp->obm; + Widget w = wp->w; + XPoint *pv; int npoints; if (argc < 2) @@ -1593,8 +1593,8 @@ gtermDrawMarker (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + ObmContext obm = wp->obm; + Widget w = wp->w; /* not yet implemented. */ return (TCL_ERROR); @@ -1620,8 +1620,8 @@ gtermDrawAlphaText (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + ObmContext obm = wp->obm; + Widget w = wp->w; char *text; int x, y; @@ -1653,9 +1653,9 @@ gtermGetAlphaTextSize (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; - register XPoint *pv; + ObmContext obm = wp->obm; + Widget w = wp->w; + XPoint *pv; char *s_width, *s_height, *s_base; int width, height, base; @@ -1711,8 +1711,8 @@ gtermStartDialog (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - register Widget w = wp->w; - register XPoint *pv; + Widget w = wp->w; + XPoint *pv; GtStartDialog (w); return (TCL_OK); @@ -1732,8 +1732,8 @@ gtermEndDialog (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - register Widget w = wp->w; - register XPoint *pv; + Widget w = wp->w; + XPoint *pv; GtEndDialog (w); return (TCL_OK); @@ -1753,8 +1753,8 @@ gtermEraseDialog (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - register Widget w = wp->w; - register XPoint *pv; + Widget w = wp->w; + XPoint *pv; GtEraseDialog (w); return (TCL_OK); @@ -1781,8 +1781,8 @@ gtermDrawDialogText (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - register Widget w = wp->w; - register XPoint *pv; + Widget w = wp->w; + XPoint *pv; char *text; int x, y; @@ -1814,9 +1814,9 @@ gtermGetDialogTextSize (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; - register XPoint *pv; + ObmContext obm = wp->obm; + Widget w = wp->w; + XPoint *pv; char *s_width, *s_height, *s_base; int width, height, base; @@ -1862,9 +1862,9 @@ static int gtermRasterInit (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; - register WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + WidgetPrivate wp = &obj->widget; + ObmContext obm = wp->obm; + Widget w = wp->w; GtRasterInit (w); return (TCL_OK); @@ -1891,9 +1891,9 @@ static int gtermAssignRaster (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject gt_obj = (GtermObject) msg->object[msg->level]; - register WidgetPrivate wp = >_obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + WidgetPrivate wp = >_obj->widget; + ObmContext obm = wp->obm; + Widget w = wp->w; XtPointer drawable; ObmObject obj; int raster, type; @@ -1972,8 +1972,8 @@ gtermCreateRaster (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + ObmContext obm = wp->obm; + Widget w = wp->w; int raster, width, height, type, depth; char *s_type; @@ -2011,8 +2011,8 @@ gtermDestroyRaster (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + ObmContext obm = wp->obm; + Widget w = wp->w; int raster; if (argc < 2) @@ -2039,8 +2039,8 @@ gtermQueryRaster (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + ObmContext obm = wp->obm; + Widget w = wp->w; char *s_width, *s_height, *s_type, *s_depth; int exists, raster, width, height, type, depth; @@ -2092,8 +2092,8 @@ gtermNextRaster (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + ObmContext obm = wp->obm; + Widget w = wp->w; char buf[SZ_NUMBER]; int raster; @@ -2118,8 +2118,8 @@ gtermActiveRasters (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + ObmContext obm = wp->obm; + Widget w = wp->w; char buf[SZ_NUMBER]; sprintf (buf, "%d", GtNRasters(w)); @@ -2272,9 +2272,9 @@ gtermWritePixels (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) ObmContext obm = wp->obm; Widget w = wp->w; - register char *ip; - register uchar *op; - register int v, i, j; + char *ip; + uchar *op; + int v, i, j; static uchar hex1[256], hex2[256]; static int have_tables = 0; int raster, nbits, bias; @@ -2452,8 +2452,8 @@ gtermReadPixels (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) ObmContext obm = wp->obm; Widget w = wp->w; - register int v, i; - register uchar *ip, *op; + int v, i; + uchar *ip, *op; int bias, nchars, npix, n, j; char *pixels, *encoding; int x1, y1, nx, ny; @@ -2686,8 +2686,8 @@ gtermRefreshPixels (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + ObmContext obm = wp->obm; + Widget w = wp->w; float x1, y1, nx, ny; int raster, ctype; @@ -2730,8 +2730,8 @@ gtermSetPixels (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + ObmContext obm = wp->obm; + Widget w = wp->w; int color, rop, raster, ctype; float x1, y1, nx, ny; @@ -2784,8 +2784,8 @@ gtermExtractPixmap (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + ObmContext obm = wp->obm; + Widget w = wp->w; float x1, y1, nx, ny; int raster, ctype; Pixmap pixmap; @@ -2834,8 +2834,8 @@ gtermInsertPixmap (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + ObmContext obm = wp->obm; + Widget w = wp->w; float x1, y1, nx, ny; int raster, ctype; Pixmap pixmap; @@ -2883,8 +2883,8 @@ gtermNextColormap (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + ObmContext obm = wp->obm; + Widget w = wp->w; char buf[SZ_NUMBER]; sprintf (buf, "%d", GtNextColormap (w)); @@ -2906,8 +2906,8 @@ gtermFreeColormap (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + ObmContext obm = wp->obm; + Widget w = wp->w; int colormap; if (argc < 2) @@ -2946,8 +2946,8 @@ gtermWriteColormap (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermPrivate gp = &obj->gterm; Widget w = obj->widget.w; - register int ncolors; - register char *ip; + int ncolors; + char *ip; char *colors, *ip_save; ushort r[MAX_COLORS]; ushort g[MAX_COLORS]; @@ -3009,8 +3009,8 @@ gtermReadColormap (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermPrivate gp = &obj->gterm; Widget w = obj->widget.w; - register int i; - register char *op; + int i; + char *op; char colors[MAX_COLORS * 3 * 20]; ushort r[MAX_COLORS]; ushort g[MAX_COLORS]; @@ -3101,8 +3101,8 @@ gtermClientPixel (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + ObmContext obm = wp->obm; + Widget w = wp->w; int pixel, client_pixel; char buf[SZ_NUMBER]; @@ -3139,8 +3139,8 @@ gtermGetBias (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + ObmContext obm = wp->obm; + Widget w = wp->w; int first, nelem, maxelem; char buf[SZ_NUMBER]; @@ -3171,9 +3171,9 @@ static int gtermInitMappings (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; - register WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + WidgetPrivate wp = &obj->widget; + ObmContext obm = wp->obm; + Widget w = wp->w; GtInitMappings (w); return (TCL_OK); @@ -3216,8 +3216,8 @@ gtermFreeMapping (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + ObmContext obm = wp->obm; + Widget w = wp->w; int mapping, erase; if (argc < 2) @@ -3246,8 +3246,8 @@ gtermLowerMapping (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + ObmContext obm = wp->obm; + Widget w = wp->w; int mapping, reference; if (argc < 2) @@ -3276,8 +3276,8 @@ gtermRaiseMapping (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + ObmContext obm = wp->obm; + Widget w = wp->w; int mapping, reference; if (argc < 2) @@ -3303,8 +3303,8 @@ gtermEnableMapping (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + ObmContext obm = wp->obm; + Widget w = wp->w; int mapping, refresh; if (argc < 2) @@ -3332,8 +3332,8 @@ gtermDisableMapping (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + ObmContext obm = wp->obm; + Widget w = wp->w; int mapping, erase; if (argc < 2) @@ -3360,8 +3360,8 @@ gtermActiveMapping (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + ObmContext obm = wp->obm; + Widget w = wp->w; char buf[SZ_NUMBER]; int mapping, active; @@ -3388,8 +3388,8 @@ gtermRefreshMapping (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + ObmContext obm = wp->obm; + Widget w = wp->w; int mapping; if (argc < 2) @@ -3427,8 +3427,8 @@ gtermCopyRaster (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + ObmContext obm = wp->obm; + Widget w = wp->w; int rop, src, st, dst, dt, status; int sx, sy, snx, sny, dx, dy, dnx, dny; @@ -3513,8 +3513,8 @@ gtermSetMapping (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + ObmContext obm = wp->obm; + Widget w = wp->w; int mapping, rop, src, st, dst, dt, status; int sx, sy, snx, sny, dx, dy, dnx, dny; @@ -3550,8 +3550,8 @@ gtermGetMapping (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register Widget w = wp->w; + ObmContext obm = wp->obm; + Widget w = wp->w; int mapping, rop, src, st, dst, dt, status; int sx, sy, snx, sny, dx, dy, dnx, dny; char buf[SZ_NUMBER]; @@ -3604,8 +3604,8 @@ static int gtermSelectRaster (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; - register WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; + WidgetPrivate wp = &obj->widget; + ObmContext obm = wp->obm; int raster, dras, dt, dx, dy, rt, rx, ry, mp; char *xout, *yout, *mpout; float fx, fy; @@ -3678,8 +3678,8 @@ static int gtermUnmapPixel (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; - register WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; + WidgetPrivate wp = &obj->widget; + ObmContext obm = wp->obm; int dst, dx, dy, src, sx, sy, mapping; char *raster_out, *x_out, *y_out, *z_out; char buf[SZ_NUMBER]; @@ -3741,7 +3741,7 @@ gtermFlip (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - register Widget w = wp->w; + Widget w = wp->w; int mapping, rop, flipX, flipY, i; int src, st, sx, sy, snx, sny; int dst, dt, dx, dy, dnx, dny; @@ -3784,7 +3784,7 @@ static int gtermMarkerInit (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; - register WidgetPrivate wp = &obj->widget; + WidgetPrivate wp = &obj->widget; GtMarkerInit (wp->w); return (TCL_OK); @@ -3841,8 +3841,8 @@ static int gtermCreateMarker (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { GtermObject obj = (GtermObject) msg->object[msg->level]; - register WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; + WidgetPrivate wp = &obj->widget; + ObmContext obm = wp->obm; Arg args[MAX_ARGS]; int nargs, i; char **items; @@ -4018,9 +4018,9 @@ ndcToPixel (Widget w, int raster, int nx, int ny, float *rx, float *ry) static XPoint * get_points (char *points, int *npoints) { - register int i; - register char *ip; - register XPoint *pv; + int i; + char *ip; + XPoint *pv; char *ipp, *ip_save; int maxpts, npts; @@ -4075,8 +4075,8 @@ get_mapping ( int *dnx, int *dny) { - register int ndc; - register double v; + int ndc; + double v; *src = atoi (argv[0]); *st = (strcmp(argv[1],"pixel")==0 || strcmp(argv[1],"Pixel")==0) ? @@ -4132,7 +4132,7 @@ put_mapping ( int dnx, int dny) { - register int ndc; + int ndc; char buf[SZ_NUMBER]; sprintf (buf, "%d", src); diff --git a/obm/html.c b/obm/html.c index bd4a4a5..6847a9a 100644 --- a/obm/html.c +++ b/obm/html.c @@ -127,9 +127,9 @@ static int cb_decode(char *); void HTMLClassInit (ObmContext obm, ObjClassRec classrec) { - register HTMLClassData gcd; - register Tcl_Interp *tcl; - register ClientData c_gcd; + HTMLClassData gcd; + Tcl_Interp *tcl; + ClientData c_gcd; /* Install the class methods. */ classrec->ClassDestroy = HTMLClassDestroy; @@ -192,7 +192,7 @@ HTMLClassInit (ObmContext obm, ObjClassRec classrec) void HTMLClassDestroy (ObmContext obm, ObjClassRec classrec) { - register HTMLClassData gcd = (HTMLClassData) classrec->class_data; + HTMLClassData gcd = (HTMLClassData) classrec->class_data; if (gcd) { if (gcd->tcl) @@ -214,8 +214,8 @@ HTMLCreate ( ArgList a_args, int a_nargs) { - register HTMLObject obj; - register Widget w; + HTMLObject obj; + Widget w; Arg args[128]; int nargs = 0; @@ -259,8 +259,8 @@ HTMLDestroy (ObmObject object) { HTMLObject obj = (HTMLObject) object; ObjClassRec classrec = obj->core.classrec; - register HTMLClassData gcd = (HTMLClassData) classrec->class_data; - register ObmCallback cb, cb_next; + HTMLClassData gcd = (HTMLClassData) classrec->class_data; + ObmCallback cb, cb_next; ObmContext obm = obj->widget.obm; Widget w = obj->widget.w; @@ -298,9 +298,9 @@ HTMLDestroy (ObmObject object) static int htmlSetText (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { - register HTMLClassData gcd = (HTMLClassData) msg; + HTMLClassData gcd = (HTMLClassData) msg; HTMLObject obj = (HTMLObject) gcd->object[gcd->level]; - register WidgetPrivate wp = &obj->widget; + WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; char *text, *target_anchor; char *header_text, *footer_text; @@ -343,9 +343,9 @@ htmlSetText (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) static int htmlGetText (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { - register HTMLClassData gcd = (HTMLClassData) msg; + HTMLClassData gcd = (HTMLClassData) msg; HTMLObject obj = (HTMLObject) gcd->object[gcd->level]; - register WidgetPrivate wp = &obj->widget; + WidgetPrivate wp = &obj->widget; char *text, *format, *font; int pretty = 0; @@ -390,9 +390,9 @@ htmlGetText (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) static int htmlPositionToId (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { - register HTMLClassData gcd = (HTMLClassData) msg; + HTMLClassData gcd = (HTMLClassData) msg; HTMLObject obj = (HTMLObject) gcd->object[gcd->level]; - register WidgetPrivate wp = &obj->widget; + WidgetPrivate wp = &obj->widget; int element_id, x, y; char buf[SZ_NUMBER]; @@ -421,9 +421,9 @@ htmlPositionToId (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) static int htmlIdToPosition (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { - register HTMLClassData gcd = (HTMLClassData) msg; + HTMLClassData gcd = (HTMLClassData) msg; HTMLObject obj = (HTMLObject) gcd->object[gcd->level]; - register WidgetPrivate wp = &obj->widget; + WidgetPrivate wp = &obj->widget; ObmContext obm = obj->widget.obm; int status, element_id, x, y; char buf[SZ_NUMBER]; @@ -467,9 +467,9 @@ htmlIdToPosition (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) static int htmlAnchorToPosition (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { - register HTMLClassData gcd = (HTMLClassData) msg; + HTMLClassData gcd = (HTMLClassData) msg; HTMLObject obj = (HTMLObject) gcd->object[gcd->level]; - register WidgetPrivate wp = &obj->widget; + WidgetPrivate wp = &obj->widget; ObmContext obm = obj->widget.obm; char *anchor, *s_x, *s_y; char buf[SZ_NUMBER]; @@ -512,9 +512,9 @@ htmlAnchorToPosition (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) static int htmlAnchorToId (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { - register HTMLClassData gcd = (HTMLClassData) msg; + HTMLClassData gcd = (HTMLClassData) msg; HTMLObject obj = (HTMLObject) gcd->object[gcd->level]; - register WidgetPrivate wp = &obj->widget; + WidgetPrivate wp = &obj->widget; char buf[SZ_NUMBER]; int element_id; char *anchor; @@ -541,9 +541,9 @@ htmlAnchorToId (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) static int htmlGotoId (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { - register HTMLClassData gcd = (HTMLClassData) msg; + HTMLClassData gcd = (HTMLClassData) msg; HTMLObject obj = (HTMLObject) gcd->object[gcd->level]; - register WidgetPrivate wp = &obj->widget; + WidgetPrivate wp = &obj->widget; int element_id; if (argc < 2) @@ -688,8 +688,8 @@ htmlGetLinks (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) a_list = argv[1]; if ((list = HTMLGetLinks (wp->w, &n))) { - register char *ip, *op; - register int i; + char *ip, *op; + int i; /* Determine how much storage we need for the list. */ for (i=0, nchars=0; i < n; i++) { @@ -744,8 +744,8 @@ htmlGetLinks (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) static char * makeList (char **list, int n) { - register char *ip, *op; - register int i; + char *ip, *op; + int i; int nchars; char *buf; @@ -787,9 +787,9 @@ makeList (char **list, int n) static int htmlRetestAnchors (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { - register HTMLClassData gcd = (HTMLClassData) msg; + HTMLClassData gcd = (HTMLClassData) msg; HTMLObject obj = (HTMLObject) gcd->object[gcd->level]; - register WidgetPrivate wp = &obj->widget; + WidgetPrivate wp = &obj->widget; HTMLRetestAnchors (wp->w, NULL, 0); return (TCL_OK); @@ -809,9 +809,9 @@ htmlRetestAnchors (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) static int htmlSetSelection (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { - register HTMLClassData gcd = (HTMLClassData) msg; + HTMLClassData gcd = (HTMLClassData) msg; HTMLObject obj = (HTMLObject) gcd->object[gcd->level]; - register WidgetPrivate wp = &obj->widget; + WidgetPrivate wp = &obj->widget; ElementRef start, end; char *ip = (char *)NULL; @@ -844,9 +844,9 @@ htmlSetSelection (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) static int htmlGetSelection (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { - register HTMLClassData gcd = (HTMLClassData) msg; + HTMLClassData gcd = (HTMLClassData) msg; HTMLObject obj = (HTMLObject) gcd->object[gcd->level]; - register WidgetPrivate wp = &obj->widget; + WidgetPrivate wp = &obj->widget; char *text, *start, *end, *insert; text = HTMLGetTextAndSelection (wp->w, &start, &end, &insert); @@ -869,9 +869,9 @@ htmlGetSelection (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) static int htmlClearSelection (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { - register HTMLClassData gcd = (HTMLClassData) msg; + HTMLClassData gcd = (HTMLClassData) msg; HTMLObject obj = (HTMLObject) gcd->object[gcd->level]; - register WidgetPrivate wp = &obj->widget; + WidgetPrivate wp = &obj->widget; HTMLClearSelection (wp->w); return (TCL_OK); @@ -896,9 +896,9 @@ htmlClearSelection (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) static int htmlSearchText (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { - register HTMLClassData gcd = (HTMLClassData) msg; + HTMLClassData gcd = (HTMLClassData) msg; HTMLObject obj = (HTMLObject) gcd->object[gcd->level]; - register WidgetPrivate wp = &obj->widget; + WidgetPrivate wp = &obj->widget; ObmContext obm = obj->widget.obm; char *pattern, *a_start, *a_end; int backward = 0, caseless = 1; @@ -982,9 +982,9 @@ static int htmlAddCallback (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { HTMLObject obj = (HTMLObject) msg->object[msg->level]; - register WidgetPrivate wp = &obj->widget; - register HTMLPrivate hp = &obj->html; - register Widget w = wp->w; + WidgetPrivate wp = &obj->widget; + HTMLPrivate hp = &obj->html; + Widget w = wp->w; char *userproc, *callback_type; ObmCallback cb, new; int type; @@ -1027,8 +1027,8 @@ static int htmlDeleteCallback (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { HTMLObject obj = (HTMLObject) msg->object[msg->level]; - register HTMLPrivate hp = &obj->html; - register ObmCallback cb, prev, next; + HTMLPrivate hp = &obj->html; + ObmCallback cb, prev, next; char *procedure, *callback_type; int type; @@ -1069,9 +1069,9 @@ htmlDeleteCallback (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) static void anchorCallback (Widget w, XtPointer client_data, XtPointer call_data) { - register char *ip, *op; - register ObmCallback cb; - register WbAnchorCallbackData *ap = (WbAnchorCallbackData *)call_data; + char *ip, *op; + ObmCallback cb; + WbAnchorCallbackData *ap = (WbAnchorCallbackData *)call_data; HTMLObject obj = (HTMLObject) client_data; ObmContext obm = obj->widget.obm; char *text, *href, *none = "none"; @@ -1156,9 +1156,9 @@ anchorCallback (Widget w, XtPointer client_data, XtPointer call_data) static int testAnchorCallback (Widget w, XtPointer client_data, char *href) { - register ObmCallback cb; - register HTMLObject obj = (HTMLObject) client_data; - register ObmContext obm = obj->widget.obm; + ObmCallback cb; + HTMLObject obj = (HTMLObject) client_data; + ObmContext obm = obj->widget.obm; int status, retval = 0; /* Call any registered callback functions. */ @@ -1207,9 +1207,9 @@ testAnchorCallback (Widget w, XtPointer client_data, char *href) static void submitFormCallback (Widget w, XtPointer client_data, XtPointer call_data) { - register char *ip, *op; - register ObmCallback cb; - register WbFormCallbackData *fp = (WbFormCallbackData *)call_data; + char *ip, *op; + ObmCallback cb; + WbFormCallbackData *fp = (WbFormCallbackData *)call_data; HTMLObject obj = (HTMLObject) client_data; ObmContext obm = obj->widget.obm; @@ -1328,8 +1328,8 @@ submitFormCallback (Widget w, XtPointer client_data, XtPointer call_data) static void linkCallback (Widget w, XtPointer client_data, XtPointer call_data) { - register char *ip, *op; - register ObmCallback cb; + char *ip, *op; + ObmCallback cb; LinkInfo *l_info = (LinkInfo *) call_data; HTMLObject obj = (HTMLObject) client_data; ObmContext obm = obj->widget.obm; @@ -1368,9 +1368,9 @@ linkCallback (Widget w, XtPointer client_data, XtPointer call_data) static void pointerMotionCallback (Widget w, XtPointer client_data, char *href) { - register ObmCallback cb; - register HTMLObject obj = (HTMLObject) client_data; - register ObmContext obm = obj->widget.obm; + ObmCallback cb; + HTMLObject obj = (HTMLObject) client_data; + ObmContext obm = obj->widget.obm; int status; /* Call any registered callback functions. */ @@ -1396,7 +1396,7 @@ pointerMotionCallback (Widget w, XtPointer client_data, char *href) static void cb_error (ObmContext obm, ObmCallback cb) { - register Tcl_Interp *tcl = obm->tcl; + Tcl_Interp *tcl = obm->tcl; const char *errstr = Tcl_GetVar (tcl, "errorInfo", 0); fprintf (stderr, "Error on line %d in %s: %s\n", Tcl_GetErrorLine (tcl), cb->name, @@ -1408,7 +1408,7 @@ cb_error (ObmContext obm, ObmCallback cb) static int cb_decode (char *callback_type) { - register int type = 0; + int type = 0; if (strcmp (callback_type, "anchor") == 0) type = CB_Anchor; @@ -1429,7 +1429,7 @@ cb_decode (char *callback_type) static char * cb_encode (int callback_type) { - register char *type = "unknown"; + char *type = "unknown"; switch (callback_type) { case CB_Anchor: diff --git a/obm/listres/listres.c b/obm/listres/listres.c index 1586c1c..a5efc52 100644 --- a/obm/listres/listres.c +++ b/obm/listres/listres.c @@ -104,10 +104,10 @@ usage () } static void print_tree_level (wn, level) - register XmuWidgetNode *wn; - register int level; + XmuWidgetNode *wn; + int level; { - register int i; + int i; if (!wn) return; @@ -121,8 +121,8 @@ static void print_tree_level (wn, level) static void tree_known_widgets () { - register int i; - register XmuWidgetNode *wn; + int i; + XmuWidgetNode *wn; for (i = 0, wn = widget_list; i < nwidgets; i++, wn++) { if (!wn->superclass) { /* list all rooted objects */ diff --git a/obm/marker.c b/obm/marker.c index 0a9cad5..1689a2d 100644 --- a/obm/marker.c +++ b/obm/marker.c @@ -162,8 +162,8 @@ static XtPointer GmCopy(Marker); void MarkerClassInit (ObmContext obm, ObjClassRec classrec) { - register MsgContext msg; - register Tcl_Interp *tcl; + MsgContext msg; + Tcl_Interp *tcl; /* Install the class methods. */ classrec->ClassDestroy = MarkerClassDestroy; @@ -237,7 +237,7 @@ MarkerClassInit (ObmContext obm, ObjClassRec classrec) static void MarkerClassDestroy (ObmContext obm, ObjClassRec classrec) { - register MsgContext msg = (MsgContext) classrec->class_data; + MsgContext msg = (MsgContext) classrec->class_data; if (msg) { if (msg->tcl) @@ -259,8 +259,8 @@ MarkerCreate ( ArgList args, int nargs) { - register MarkerObject obj; - register Widget gt; + MarkerObject obj; + Widget gt; ObmObject gterm_obj; int type, interactive; int erase, visible, i; @@ -349,8 +349,8 @@ static void MarkerDestroy (ObmObject object) { MarkerObject obj = (MarkerObject) object; - register ObmContext obm = obj->marker.obm; - register ObmCallback cb, next; + ObmContext obm = obj->marker.obm; + ObmCallback cb, next; /* Destroy the object in the second final call to Destroy. */ if (!obj->core.being_destroyed++) @@ -381,9 +381,9 @@ MarkerDestroy (ObmObject object) static int MarkerEvaluate (ObmObject object, char *command) { - register MarkerObject obj = (MarkerObject) object; - register MsgContext msg = (MsgContext) obj->core.classrec->class_data; - register ObmContext obm = obj->marker.obm; + MarkerObject obj = (MarkerObject) object; + MsgContext msg = (MsgContext) obj->core.classrec->class_data; + ObmContext obm = obj->marker.obm; int status; /* Since the class wide interpreter is used to evaluate the message @@ -432,8 +432,8 @@ static int markerMakeCopy (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { MarkerObject obj = (MarkerObject) msg->object[msg->level]; - register MarkerPrivate mp = &obj->marker; - register ObmContext obm = mp->obm; + MarkerPrivate mp = &obj->marker; + ObmContext obm = mp->obm; XtPointer gm; Arg args[10]; char *name; @@ -461,9 +461,9 @@ static int markerAddCallback (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { MarkerObject obj = (MarkerObject) msg->object[msg->level]; - register MarkerPrivate mp = &obj->marker; + MarkerPrivate mp = &obj->marker; ObmContext obm = mp->obm; - register ObmCallback cb, new_cb; + ObmCallback cb, new_cb; char *procedure; int events=0, i; @@ -513,8 +513,8 @@ static int markerDeleteCallback (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { MarkerObject obj = (MarkerObject) msg->object[msg->level]; - register MarkerPrivate mp = &obj->marker; - register ObmCallback cb, prev; + MarkerPrivate mp = &obj->marker; + ObmCallback cb, prev; char *procedure; if (argc < 2) @@ -553,7 +553,7 @@ markerCallbackProc ( MarkerPrivate mp = &obj->marker; ObmContext obm = mp->obm; char message_data[SZ_MESSAGE]; - register char *op; + char *op; int status = 0; /* Call the user callback procedure. The callback procedure is called @@ -635,7 +635,7 @@ markerCallbackProc ( case KeyPress: case KeyRelease: { XKeyPressedEvent *ev = (XKeyPressedEvent *) event; - register char *ip, *op = message_data; + char *ip, *op = message_data; char buf[SZ_MESSAGE]; int n; @@ -671,7 +671,7 @@ markerCallbackProc ( case ButtonPress: case ButtonRelease: { XButtonPressedEvent *ev = (XButtonPressedEvent *) event; - register char *op = message_data; + char *op = message_data; if (event->type == ButtonPress) strcpy (op, "buttonPress "); @@ -815,8 +815,8 @@ static int markerNotify (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { MarkerObject obj = (MarkerObject) msg->object[msg->level]; - register MarkerPrivate mp = &obj->marker; - register ObmContext obm = mp->obm; + MarkerPrivate mp = &obj->marker; + ObmContext obm = mp->obm; char *event_type; int first_param; XEvent event; @@ -841,7 +841,7 @@ static int markerDestroy (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { MarkerObject obj = (MarkerObject) msg->object[msg->level]; - register MarkerPrivate mp = &obj->marker; + MarkerPrivate mp = &obj->marker; GmDestroy (mp->gm); return (TCL_OK); @@ -907,8 +907,8 @@ static int markerMarkpos (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { MarkerObject obj = (MarkerObject) msg->object[msg->level]; - register MarkerPrivate mp = &obj->marker; - register ObmContext obm = mp->obm; + MarkerPrivate mp = &obj->marker; + ObmContext obm = mp->obm; int erase; GmMarkpos (mp->gm); @@ -937,8 +937,8 @@ static int markerRedraw (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { MarkerObject obj = (MarkerObject) msg->object[msg->level]; - register MarkerPrivate mp = &obj->marker; - register ObmContext obm = mp->obm; + MarkerPrivate mp = &obj->marker; + ObmContext obm = mp->obm; Boolean markpos = False; Boolean erase = True; int function = GXcopy; @@ -980,8 +980,8 @@ static int markerRaise (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { MarkerObject obj = (MarkerObject) msg->object[msg->level]; - register MarkerPrivate mp = &obj->marker; - register ObmContext obm = mp->obm; + MarkerPrivate mp = &obj->marker; + ObmContext obm = mp->obm; XtPointer ref_gm = NULL; MarkerObject ref; @@ -1011,8 +1011,8 @@ static int markerLower (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { MarkerObject obj = (MarkerObject) msg->object[msg->level]; - register MarkerPrivate mp = &obj->marker; - register ObmContext obm = mp->obm; + MarkerPrivate mp = &obj->marker; + ObmContext obm = mp->obm; XtPointer ref_gm = NULL; MarkerObject ref; @@ -1040,8 +1040,8 @@ static int markerMove (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { MarkerObject obj = (MarkerObject) msg->object[msg->level]; - register MarkerPrivate mp = &obj->marker; - register ObmContext obm = mp->obm; + MarkerPrivate mp = &obj->marker; + ObmContext obm = mp->obm; Arg args[10]; int erase; @@ -1072,8 +1072,8 @@ static int markerResize (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { MarkerObject obj = (MarkerObject) msg->object[msg->level]; - register MarkerPrivate mp = &obj->marker; - register ObmContext obm = mp->obm; + MarkerPrivate mp = &obj->marker; + ObmContext obm = mp->obm; Arg args[10]; int erase; @@ -1102,8 +1102,8 @@ static int markerRotate (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { MarkerObject obj = (MarkerObject) msg->object[msg->level]; - register MarkerPrivate mp = &obj->marker; - register ObmContext obm = mp->obm; + MarkerPrivate mp = &obj->marker; + ObmContext obm = mp->obm; Arg args[10]; int erase; @@ -1128,8 +1128,8 @@ static int markerGetAttribute (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { MarkerObject obj = (MarkerObject) msg->object[msg->level]; - register MarkerPrivate mp = &obj->marker; - register ObmContext obm = mp->obm; + MarkerPrivate mp = &obj->marker; + ObmContext obm = mp->obm; char *name, value[SZ_COMMAND]; if (argc < 2) @@ -1154,8 +1154,8 @@ static int markerSetAttribute (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { MarkerObject obj = (MarkerObject) msg->object[msg->level]; - register MarkerPrivate mp = &obj->marker; - register ObmContext obm = mp->obm; + MarkerPrivate mp = &obj->marker; + ObmContext obm = mp->obm; char *name, *value; if (argc < 3) @@ -1184,8 +1184,8 @@ static int markerGetAttributes (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { MarkerObject obj = (MarkerObject) msg->object[msg->level]; - register MarkerPrivate mp = &obj->marker; - register ObmContext obm = mp->obm; + MarkerPrivate mp = &obj->marker; + ObmContext obm = mp->obm; char *name, *variable, value[SZ_COMMAND]; int i, status = 0; char **items; @@ -1236,8 +1236,8 @@ static int markerSetAttributes (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { MarkerObject obj = (MarkerObject) msg->object[msg->level]; - register MarkerPrivate mp = &obj->marker; - register ObmContext obm = mp->obm; + MarkerPrivate mp = &obj->marker; + ObmContext obm = mp->obm; char *name, *value; Arg args[MAX_ARGS]; int status, argno, i; @@ -1295,9 +1295,9 @@ markerGetVertices (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) MarkerPrivate mp = &obj->marker; ObmContext obm = mp->obm; - register int i; - register char *op; - register DPoint *pv; + int i; + char *op; + DPoint *pv; int first, maxpts, npts, ngot; int nchars, status, buflen; char *points, *buf; @@ -1383,9 +1383,9 @@ markerSetVertices (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) MarkerPrivate mp = &obj->marker; ObmContext obm = mp->obm; - register int i; - register char *ip; - register DPoint *pv; + int i; + char *ip; + DPoint *pv; int first, maxpts, npts, ngot; char *ipp, *points, *ip_save; @@ -1468,9 +1468,9 @@ markerGetRegion (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) MarkerObject obj = (MarkerObject) msg->object[msg->level]; MarkerPrivate mp = &obj->marker; ObmContext obm = mp->obm; - register DPoint *pv, *vv; - register char *op; - register int i; + DPoint *pv, *vv; + char *op; + int i; Boolean unmap = False; int ctype_out = GtPixel; @@ -1725,8 +1725,8 @@ static int markerGetRect (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { MarkerObject obj = (MarkerObject) msg->object[msg->level]; - register MarkerPrivate mp = &obj->marker; - register ObmContext obm = mp->obm; + MarkerPrivate mp = &obj->marker; + ObmContext obm = mp->obm; char *dx_out, *dy_out, *dnx_out, *dny_out; int marker_type, x, y, width, height, status; int dx, dy, dnx, dny; diff --git a/obm/obmres.c b/obm/obmres.c index e03e85c..b143410 100644 --- a/obm/obmres.c +++ b/obm/obmres.c @@ -2271,8 +2271,8 @@ struct resource_list { */ main (int argc, char *argv[]) { - register struct resource_list *rp, *np; - register unsigned long flags1, flags2; + struct resource_list *rp, *np; + unsigned long flags1, flags2; int decorate = 0; if (argc >= 2 && !strcmp(argv[1],"-decorate")) diff --git a/obm/param.c b/obm/param.c index a7e2b54..288248d 100644 --- a/obm/param.c +++ b/obm/param.c @@ -92,8 +92,8 @@ static int parameterDeleteCallback(MsgContext, Tcl_Interp *, int, char **); void ParameterClassInit (ObmContext obm, ObjClassRec classrec) { - register Tcl_Interp *tcl; - register MsgContext msg; + Tcl_Interp *tcl; + MsgContext msg; /* Install the class methods. */ classrec->ClassDestroy = ParameterClassDestroy; @@ -130,7 +130,7 @@ ParameterClassInit (ObmContext obm, ObjClassRec classrec) static void ParameterClassDestroy (ObmContext obm, ObjClassRec classrec) { - register MsgContext msg = (MsgContext) classrec->class_data; + MsgContext msg = (MsgContext) classrec->class_data; if (msg) { if (msg->tcl) @@ -152,7 +152,7 @@ ParameterCreate ( ArgList args, int nargs) { - register ParameterObject obj; + ParameterObject obj; obj = (ParameterObject) XtCalloc (1, sizeof (struct parameterObject)); obj->parameter.obm = obm; @@ -166,8 +166,8 @@ ParameterCreate ( static void ParameterDestroy (ObmObject object) { - register ParameterObject obj = (ParameterObject) object; - register ObmCallback cb, next; + ParameterObject obj = (ParameterObject) object; + ObmCallback cb, next; /* Destroy the object in the second final call to Destroy. */ if (!obj->core.being_destroyed++) @@ -186,9 +186,9 @@ ParameterDestroy (ObmObject object) static int ParameterEvaluate (ObmObject object, char *command) { - register ParameterObject obj = (ParameterObject) object; - register MsgContext msg = (MsgContext) obj->core.classrec->class_data; - register ObmContext obm = obj->parameter.obm; + ParameterObject obj = (ParameterObject) object; + MsgContext msg = (MsgContext) obj->core.classrec->class_data; + ObmContext obm = obj->parameter.obm; int status; /* Since the class wide interpreter is used to evaluate the message @@ -231,8 +231,8 @@ static int parameterSetValue (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { ParameterObject obj = (ParameterObject) msg->object[msg->level]; - register ObmContext obm = obj->parameter.obm; - register ParameterPrivate pp = &obj->parameter; + ObmContext obm = obj->parameter.obm; + ParameterPrivate pp = &obj->parameter; char *new_value, *old_value; ObmCallback cb, cbl[128]; int ncb, status, i; @@ -279,8 +279,8 @@ static int parameterGetValue (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { ParameterObject obj = (ParameterObject) msg->object[msg->level]; - register ObmContext obm = obj->parameter.obm; - register ParameterPrivate pp = &obj->parameter; + ObmContext obm = obj->parameter.obm; + ParameterPrivate pp = &obj->parameter; Tcl_SetResult (obm->tcl, pp->value, TCL_STATIC); return (TCL_OK); @@ -296,8 +296,8 @@ static int parameterNotify (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { ParameterObject obj = (ParameterObject) msg->object[msg->level]; - register ObmContext obm = obj->parameter.obm; - register ParameterPrivate pp = &obj->parameter; + ObmContext obm = obj->parameter.obm; + ParameterPrivate pp = &obj->parameter; ObmCallback cb; int status; @@ -331,7 +331,7 @@ static int parameterAddCallback (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { ParameterObject obj = (ParameterObject) msg->object[msg->level]; - register ParameterPrivate pp = &obj->parameter; + ParameterPrivate pp = &obj->parameter; ObmCallback cb, new_cb; /* Create callback record. */ @@ -359,7 +359,7 @@ static int parameterDeleteCallback (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { ParameterObject obj = (ParameterObject) msg->object[msg->level]; - register ParameterPrivate pp = &obj->parameter; + ParameterPrivate pp = &obj->parameter; ObmCallback cb, prev; /* Locate and delete procedure entry in callback list. */ diff --git a/obm/server.c b/obm/server.c index 1432981..4b0523e 100644 --- a/obm/server.c +++ b/obm/server.c @@ -171,8 +171,8 @@ ServerCreate ( ArgList args, int nargs) { - register ServerObject obj; - register Tcl_Interp *tcl; + ServerObject obj; + Tcl_Interp *tcl; obj = (ServerObject) XtCalloc (1, sizeof (struct serverObject)); obm->tcl = tcl = Tcl_CreateInterp(); @@ -247,9 +247,9 @@ ServerCreate ( static void ServerDestroy (ObmObject object) { - register ServerObject obj = (ServerObject) object; - register ObmContext obm = obj->server.obm; - register ServerCallback cb, next; + ServerObject obj = (ServerObject) object; + ObmContext obm = obj->server.obm; + ServerCallback cb, next; /* Destroy the object in the second final call to Destroy. */ if (!obj->core.being_destroyed++) @@ -285,10 +285,10 @@ ServerDestroy (ObmObject object) static int ServerEvaluate (ObmObject object, char *command) { - register ServerObject obj = (ServerObject) object; - register ObmContext obm = obj->server.obm; + ServerObject obj = (ServerObject) object; + ObmContext obm = obj->server.obm; static char reset[] = "reset-server"; - register char *ip; + char *ip; /* The command "reset-server" is a special case. This destroys the * current user interface including all objects and widgets. One @@ -337,9 +337,9 @@ ServerEvaluate (ObmObject object, char *command) static int serverAppInitialize (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { - register ServerObject obj = (ServerObject) object; - register ObmContext obm = obj->server.obm; - register ObmCallback cb; + ServerObject obj = (ServerObject) object; + ObmContext obm = obj->server.obm; + ObmCallback cb; char *resource_buf, *resource_list[MAX_RESOURCES]; char *appname, *appclass, *resources; @@ -442,8 +442,8 @@ serverAppInitialize (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) static int serverAppExtend (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { - register ServerObject obj = (ServerObject) object; - register ObmContext obm = obj->server.obm; + ServerObject obj = (ServerObject) object; + ObmContext obm = obj->server.obm; XrmDatabase old_db, extended_db; Boolean overwrite = False; char *resources; @@ -486,9 +486,9 @@ serverAppExtend (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) static int serverCreateObjects (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { - register char *ip, *op; - register ServerObject obj = (ServerObject) object; - register ObmContext obm = obj->server.obm; + char *ip, *op; + ServerObject obj = (ServerObject) object; + ObmContext obm = obj->server.obm; char name[SZ_NAME], class[SZ_NAME], parent[SZ_NAME]; char *objects = NULL; XtResource r; @@ -550,8 +550,8 @@ serverCreateObjects (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) static int serverDestroyObject (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { - register ServerObject obj = (ServerObject) object; - register ObmContext obm = obj->server.obm; + ServerObject obj = (ServerObject) object; + ObmContext obm = obj->server.obm; char *object_name; ObmObject killobj; @@ -578,8 +578,8 @@ serverDestroyObject (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) static int serverQueryObject (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { - register ServerObject obj = (ServerObject) object; - register ObmContext obm = obj->server.obm; + ServerObject obj = (ServerObject) object; + ObmContext obm = obj->server.obm; char *object_name, *s_class, *s_subclass; ObjClassRec classrec; ObmObject o; @@ -627,10 +627,10 @@ serverQueryObject (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) static int serverActivate (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { - register ServerObject obj = (ServerObject) object; - register ObmContext obm = obj->server.obm; + ServerObject obj = (ServerObject) object; + ObmContext obm = obj->server.obm; XWMHints hints; - register int i; + int i; ObmObject child; Widget w; @@ -677,8 +677,8 @@ serverActivate (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) static int serverDeactivate (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { - register ServerObject obj = (ServerObject) object; - register ObmContext obm = obj->server.obm; + ServerObject obj = (ServerObject) object; + ObmContext obm = obj->server.obm; ObmDeactivate (obm, argc >=2 && strcmp(argv[1],"unmap") == 0); return (TCL_OK); @@ -697,8 +697,8 @@ serverDeactivate (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) static int serverSynchronize (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { - register ServerObject obj = (ServerObject) object; - register ObmContext obm = obj->server.obm; + ServerObject obj = (ServerObject) object; + ObmContext obm = obj->server.obm; XSync (obm->display, False); while (XtAppPending (obm->app_context)) @@ -718,8 +718,8 @@ serverSynchronize (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) static int serverFlush (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { - register ServerObject obj = (ServerObject) object; - register ObmContext obm = obj->server.obm; + ServerObject obj = (ServerObject) object; + ObmContext obm = obj->server.obm; XFlush (obm->display); @@ -740,9 +740,9 @@ serverFlush (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) static int serverPostActivateCallback (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { - register ServerObject obj = (ServerObject) object; - register ObmContext obm = obj->server.obm; - register ObmCallback cb; + ServerObject obj = (ServerObject) object; + ObmContext obm = obj->server.obm; + ObmCallback cb; if (argc < 2) return (TCL_ERROR); @@ -764,9 +764,9 @@ serverPostActivateCallback (ObmObject object, Tcl_Interp *tcl, int argc, char ** static int serverPostDeactivateCallback (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { - register ServerObject obj = (ServerObject) object; - register ObmContext obm = obj->server.obm; - register ObmCallback cb; + ServerObject obj = (ServerObject) object; + ObmContext obm = obj->server.obm; + ObmCallback cb; if (argc < 2) return (TCL_ERROR); @@ -789,8 +789,8 @@ serverPostDeactivateCallback (ObmObject object, Tcl_Interp *tcl, int argc, char static int serverSend (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { - register ServerObject obj = (ServerObject) object; - register ObmContext obm = obj->server.obm; + ServerObject obj = (ServerObject) object; + ObmContext obm = obj->server.obm; int status; /* The object which interprets the message leaves the string result, @@ -816,8 +816,8 @@ serverSend (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) static int serverPrint (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { - register ServerObject obj = (ServerObject) object; - register ObmContext obm = obj->server.obm; + ServerObject obj = (ServerObject) object; + ObmContext obm = obj->server.obm; if (argc >= 2) { char *message = Tcl_Concat (argc-1, &argv[1]); @@ -881,8 +881,8 @@ serverReset (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) static int serverGetResource (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { - register ServerObject obj = (ServerObject) object; - register ObmContext obm = obj->server.obm; + ServerObject obj = (ServerObject) object; + ObmContext obm = obj->server.obm; char *resource_name, *class_name, *default_value; char *value = NULL; XtResource r; @@ -927,9 +927,9 @@ serverGetResource (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) static int serverGetResources (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { - register ServerObject obj = (ServerObject) object; - register ObmContext obm = obj->server.obm; - register XtResource *r; + ServerObject obj = (ServerObject) object; + ObmContext obm = obj->server.obm; + XtResource *r; XtResource resources[MAX_RESOURCES]; char *resource_name, *class_name, *default_value; char *resource_list, *variable; @@ -1023,8 +1023,8 @@ err: sprintf (buf, "bad item '%d' in resource list", item + 1); static int serverPostTimedCallback (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { - register ServerObject obj = (ServerObject) object; - register ObmContext obm = obj->server.obm; + ServerObject obj = (ServerObject) object; + ObmContext obm = obj->server.obm; char *userproc, *client_data; unsigned long interval; char buf[SZ_NUMBER]; @@ -1075,8 +1075,8 @@ serverPostTimedCallback (ObmObject object, Tcl_Interp *tcl, int argc, char **arg static void serverTimedProc (XtPointer cb_ptr, XtIntervalId *id) { - register ServerCallback cb = (ServerCallback) cb_ptr; - register ServerObject obj = (ServerObject) cb->obj; + ServerCallback cb = (ServerCallback) cb_ptr; + ServerObject obj = (ServerObject) cb->obj; ObmContext obm = obj->server.obm; int status; @@ -1107,7 +1107,7 @@ serverTimedProc (XtPointer cb_ptr, XtIntervalId *id) static int serverDeleteTimedCallback (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { - register ServerObject obj = (ServerObject) object; + ServerObject obj = (ServerObject) object; ServerCallback cb; XtIntervalId id; @@ -1144,8 +1144,8 @@ serverDeleteTimedCallback (ObmObject object, Tcl_Interp *tcl, int argc, char **a static int serverPostWorkProc (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { - register ServerObject obj = (ServerObject) object; - register ObmContext obm = obj->server.obm; + ServerObject obj = (ServerObject) object; + ObmContext obm = obj->server.obm; char *userproc, *client_data; char buf[SZ_NUMBER]; ServerCallback cb; @@ -1190,9 +1190,9 @@ serverPostWorkProc (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) static Boolean serverWorkProc (XtPointer cb_ptr) { - register ServerCallback cb = (ServerCallback) cb_ptr; - register ServerObject obj = (ServerObject) cb->obj; - register ObmContext obm = obj->server.obm; + ServerCallback cb = (ServerCallback) cb_ptr; + ServerObject obj = (ServerObject) cb->obj; + ObmContext obm = obj->server.obm; Boolean done; int status; @@ -1229,7 +1229,7 @@ serverWorkProc (XtPointer cb_ptr) static int serverDeleteWorkProc (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { - register ServerObject obj = (ServerObject) object; + ServerObject obj = (ServerObject) object; ServerCallback cb; XtIntervalId id; @@ -1266,7 +1266,7 @@ link_callback (ServerPrivate server, ServerCallback cb) static void unlink_callback (ServerPrivate server, ServerCallback cb) { - register ServerCallback cp; + ServerCallback cp; if (cb == server->cb_head) { if (!(server->cb_head = cb->next)) @@ -1289,8 +1289,8 @@ unlink_callback (ServerPrivate server, ServerCallback cb) int createBitmap (ObmContext obm, char *name, int width, int height, char *pixels) { - register char *ip, *op; - register ObjList lp, last_lp; + char *ip, *op; + ObjList lp, last_lp; char numbuf[32], *data, *dp; Icon *icon; int nchars; @@ -1408,8 +1408,8 @@ createPixmap ( unsigned long fg, unsigned long bg) { - register char *ip, *op; - register ObjList lp, last_lp; + char *ip, *op; + ObjList lp, last_lp; char numbuf[32], *data, *dp; Icon *icon; int nchars; @@ -1551,8 +1551,8 @@ serverCreatePixmap (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) int createXPixmap (ObmContext obm, char *name, char *widget, char *description) { - register char *ip, *op; - register ObjList lp, last_lp; + char *ip, *op; + ObjList lp, last_lp; XpmImage image; ObmObject obj; String *data; @@ -1767,7 +1767,7 @@ build_colorlist (Widget w, XpmColorSymbol *table, Cardinal size, Cardinal *n) Pixmap findPixmap (ObmContext obm, char *name) { - register ObjList lp; + ObjList lp; for (lp = obm->pixmap_cache; lp; lp = lp->next) if (lp->ptr && strcmp (name, lp->name) == 0) @@ -1782,7 +1782,7 @@ findPixmap (ObmContext obm, char *name) Icon * findIcon (ObmContext obm, char *name) { - register ObjList lp; + ObjList lp; for (lp = obm->pixmap_cache; lp; lp = lp->next) if (lp->ptr && strcmp (name, lp->name) == 0) @@ -1820,7 +1820,7 @@ serverCreateCursor (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { ServerObject obj = (ServerObject) object; ObmContext obm = (ObmContext) obj->server.obm; - register ObjList lp, last_lp; + ObjList lp, last_lp; XColor fg_color, bg_color; unsigned long fg, bg; Pixmap source, mask; @@ -1915,7 +1915,7 @@ serverCreateCursor (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) Cursor findCursor (ObmContext obm, char *name) { - register ObjList lp; + ObjList lp; for (lp = obm->cursor_cache; lp; lp = lp->next) if (lp->ptr && strcmp (name, lp->name) == 0) @@ -1999,9 +1999,9 @@ serverCreateMenu (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { ServerObject obj = (ServerObject) object; ObmContext obm = (ObmContext) obj->server.obm; - register MenuPtr mp, o_mp; - register MenuItem ip; - register ObjList lp, newobj; + MenuPtr mp, o_mp; + MenuItem ip; + ObjList lp, newobj; char *menu_name, *menu_label; char *parent, *item_list; char **items, **fields; @@ -2215,8 +2215,8 @@ serverDestroyMenu (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) { ServerObject obj = (ServerObject) object; ObmContext obm = (ObmContext) obj->server.obm; - register ObjList lp, lpp; - register MenuPtr mp; + ObjList lp, lpp; + MenuPtr mp; char *menu_name; if (argc < 2) @@ -2257,7 +2257,7 @@ createMenu ( char *parent, Widget pw) { - register MenuItem ip; + MenuItem ip; int itemno, menuno, lineno, spaceno; Widget menu, entry; char name[SZ_NAME]; @@ -2426,8 +2426,8 @@ editMenu ( MenuPtr mp, /* existing menu */ MenuPtr request) /* requested values */ { - register MenuItem old, new; - register int i; + MenuItem old, new; + int i; int ncolors=0, nargs=0; XrmValue from, to[2]; Pixel value[2]; @@ -2579,8 +2579,8 @@ editMenu ( void freeMenu (MenuPtr mp) { - register MenuItem ip; - register int i; + MenuItem ip; + int i; for (i=0; i < mp->nitems; i++) { ip = &mp->items[i]; @@ -2610,9 +2610,9 @@ freeMenu (MenuPtr mp) static void menuSelect (Widget w, XtPointer client_data, XtPointer call_data) { - register MenuPtr mp = (MenuPtr) client_data; - register MenuItem ip; - register int i; + MenuPtr mp = (MenuPtr) client_data; + MenuItem ip; + int i; ObmContext obm = (ObmContext) mp->obm; /* Locate the menu item to which the callback refers. */ @@ -2697,7 +2697,7 @@ static void (*BSB_unhighlight)(Widget); static void menu_classInit(void) { - register SmeClassPart *sme = &smeBSBClassRec.sme_class; + SmeClassPart *sme = &smeBSBClassRec.sme_class; if (sme->highlight != menu_highlight) { BSB_highlight = sme->highlight; @@ -2740,7 +2740,7 @@ menu_addEntry ( char *child, /* name of submenu shell widget */ ObmContext obm) { - register MenuEntry mw, new; + MenuEntry mw, new; for (mw=menuWidgetList; mw && mw->next; mw = mw->next) if (mw->w == w) @@ -2766,7 +2766,7 @@ menu_addEntry ( static void menu_delEntry (Widget w) { - register MenuEntry mw, prev_mw; + MenuEntry mw, prev_mw; for (mw=menuWidgetList, prev_mw=NULL; mw; prev_mw=mw, mw=mw->next) if (mw->w == w) @@ -2787,7 +2787,7 @@ menu_delEntry (Widget w) static void menu_popup (Widget w, XtPointer client_data, XtPointer call_data) { - register MenuPtr mp = (MenuPtr) client_data; + MenuPtr mp = (MenuPtr) client_data; mp->popped_up = True; } @@ -2798,10 +2798,10 @@ menu_popup (Widget w, XtPointer client_data, XtPointer call_data) static void menu_popdown (Widget w, XtPointer client_data, XtPointer call_data) { - register MenuPtr mp = (MenuPtr) client_data; + MenuPtr mp = (MenuPtr) client_data; ObmContext obm = (ObmContext) mp->obm; - register MenuEntry mw; - register MenuPtr mm; + MenuEntry mw; + MenuPtr mm; MenuItem mi; int i; @@ -2870,7 +2870,7 @@ menu_popdown_msgHandler ( static void menu_highlight (Widget w) { - register MenuEntry mw, sm; + MenuEntry mw, sm; ObmContext obm = global_obm_handle; MenuPtr mp; @@ -2965,7 +2965,7 @@ menu_highlight (Widget w) static void menu_unhighlight (Widget w) { - register MenuEntry mw; + MenuEntry mw; /* Is the menu entry being unhighlighted on our list of call-submenu * widgets? @@ -3041,7 +3041,7 @@ menu_unhighlight (Widget w) static MenuPtr findMenu (ObmContext obm, char *name) { - register ObjList lp; + ObjList lp; for (lp = obm->menu_list; lp; lp = lp->next) if (strcmp (lp->name, name) == 0) diff --git a/obm/widget.c b/obm/widget.c index f2f382e..5b903b0 100644 --- a/obm/widget.c +++ b/obm/widget.c @@ -291,8 +291,8 @@ static int widgetGetRowAttr(MsgContext, Tcl_Interp *, int, char **); void WidgetClassInit (ObmContext obm, ObjClassRec classrec) { - register int hashval, n; - register char *ip; + int hashval, n; + char *ip; ObjClassRec widgetclass; static int hashed = 0; Tcl_Interp *tcl; @@ -491,7 +491,7 @@ WidgetClassInit (ObmContext obm, ObjClassRec classrec) void WidgetClassDestroy (ObmContext obm, ObjClassRec classrec) { - register MsgContext msg = (MsgContext) classrec->class_data; + MsgContext msg = (MsgContext) classrec->class_data; if (msg) { if (msg->tcl) @@ -513,7 +513,7 @@ WidgetCreate ( ArgList args, int nargs) { - register WidgetObject obj, pobj; + WidgetObject obj, pobj; Widget w, pw; /* Create the widget object descriptor. */ @@ -624,9 +624,9 @@ WidgetCreate ( void WidgetDestroy (ObmObject object) { - register WidgetObject obj = (WidgetObject) object; - register WidgetPrivate wp = &obj->widget; - register ObmCallback cb, next; + WidgetObject obj = (WidgetObject) object; + WidgetPrivate wp = &obj->widget; + ObmCallback cb, next; /* Ignore the second call to Destroy. */ if (obj->core.being_destroyed++) @@ -669,7 +669,7 @@ WidgetDestroy (ObmObject object) static void widgetSetDestroy (ObmObject obj) { - register int i; + int i; ObmObject child; int object_type; @@ -692,7 +692,7 @@ widgetSetDestroy (ObmObject obj) static void widgetDestroy (ObmObject obj) { - register int i; + int i; WidgetObject wobj = (WidgetObject) obj; WidgetClass *widget_class; ObmObject child; @@ -715,8 +715,8 @@ widgetDestroy (ObmObject obj) int WidgetEvaluate (ObmObject object, char *command) { - register WidgetObject obj = (WidgetObject) object; - register Tcl_Interp *tcl, *server = obj->widget.obm->tcl; + WidgetObject obj = (WidgetObject) object; + Tcl_Interp *tcl, *server = obj->widget.obm->tcl; MsgContext omsg = (MsgContext) obj->core.classrec->class_data; MsgContext pmsg = (MsgContext) obj->core.superclass->class_data; @@ -783,7 +783,7 @@ WidgetEvaluate (ObmObject object, char *command) Widget widgetGetPointer (ObmObject object) { - register WidgetObject obj = (WidgetObject) object; + WidgetObject obj = (WidgetObject) object; return (obj->widget.w); } @@ -793,8 +793,8 @@ widgetGetPointer (ObmObject object) WidgetObject widgetToObject (ObmContext obm, Widget w) { - register int i; - register WidgetPrivate wp; + int i; + WidgetPrivate wp; ObmObject objs[256]; int nobjs; @@ -820,8 +820,8 @@ widgetToObject (ObmContext obm, Widget w) static int widgetAddCallback (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { - register WidgetObject obj = (WidgetObject) msg->object[msg->level]; - register WidgetPrivate wp = &obj->widget; + WidgetObject obj = (WidgetObject) msg->object[msg->level]; + WidgetPrivate wp = &obj->widget; ObmCallback cb, new_cb; char *s_proc, *s_type; int callback_type, i; @@ -889,8 +889,8 @@ widgetAddCallback (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) static int widgetDeleteCallback (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { - register WidgetObject obj = (WidgetObject) msg->object[msg->level]; - register WidgetPrivate wp = &obj->widget; + WidgetObject obj = (WidgetObject) msg->object[msg->level]; + WidgetPrivate wp = &obj->widget; ObmCallback cb, prev; /* Locate and delete procedure entry in callback list. */ @@ -916,8 +916,8 @@ widgetDeleteCallback (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) static void widgetCallback (Widget w, WidgetObject obj, caddr_t call_data) { - register WidgetPrivate wp = &obj->widget; - register ObjClassRec classrec = obj->core.classrec; + WidgetPrivate wp = &obj->widget; + ObjClassRec classrec = obj->core.classrec; char buffer[SZ_COMMAND]; char *message = buffer; int callback_type, i; @@ -962,7 +962,7 @@ widgetCallback (Widget w, WidgetObject obj, caddr_t call_data) XfwfMultiListReturnStruct *list = (XfwfMultiListReturnStruct *) call_data; Boolean state, sensitive; - register char *ip, *op; + char *ip, *op; int buflen, need, i; char *string; @@ -1057,10 +1057,10 @@ widgetCallback (Widget w, WidgetObject obj, caddr_t call_data) static void widgetRGCallback (Widget w, WidgetObject obj, caddr_t call_data) { - register WidgetPrivate wp = &obj->widget; + WidgetPrivate wp = &obj->widget; long selection = (long) call_data; - register char *op; - register int i; + char *op; + int i; char message[SZ_COMMAND]; SelectionType selectionType; @@ -1114,7 +1114,7 @@ widgetLTHCallback (Widget w, WidgetObject obj, caddr_t call_data) ListTreeMultiReturnStruct *list; ListTreeItem *item; char message[SZ_COMMAND], buf[SZ_LINE]; - register int i; + int i; list = (ListTreeMultiReturnStruct *) call_data; if (!list->items) @@ -1182,7 +1182,7 @@ widgetLTACallback (Widget w, WidgetObject obj, caddr_t call_data) static void widgetSBCallback (Widget w, WidgetObject obj, caddr_t call_data) { - register WidgetPrivate wp = &obj->widget; + WidgetPrivate wp = &obj->widget; call_callbacks (obj, CtstartCallback, NULL); } @@ -1192,7 +1192,7 @@ widgetSBCallback (Widget w, WidgetObject obj, caddr_t call_data) static void widgetSECallback (Widget w, WidgetObject obj, caddr_t call_data) { - register WidgetPrivate wp = &obj->widget; + WidgetPrivate wp = &obj->widget; call_callbacks (obj, CtstopCallback, NULL); } @@ -1204,8 +1204,8 @@ widgetSECallback (Widget w, WidgetObject obj, caddr_t call_data) static void widgetRPCallback (Widget w, WidgetObject obj, caddr_t call_data) { - register WidgetPrivate wp = &obj->widget; - register XawPannerReport *rp = (XawPannerReport *) call_data; + WidgetPrivate wp = &obj->widget; + XawPannerReport *rp = (XawPannerReport *) call_data; char message[100]; /* Return args: changed x y w h cw ch */ @@ -1223,10 +1223,10 @@ widgetRPCallback (Widget w, WidgetObject obj, caddr_t call_data) static void widgetJPCallback (Widget w, WidgetObject obj, caddr_t call_data) { - register WidgetPrivate wp = &obj->widget; + WidgetPrivate wp = &obj->widget; XfwfScrollInfo *info = (XfwfScrollInfo *) call_data; XfwfScrollInfo update_info; - register int flags = info->flags; + int flags = info->flags; char message[100]; if (obmClass (obj->core.classrec, WtScrollbar)) { @@ -1269,7 +1269,7 @@ widgetJPCallback (Widget w, WidgetObject obj, caddr_t call_data) static void widgetSPCallback (Widget w, WidgetObject obj, caddr_t call_data) { - register WidgetPrivate wp = &obj->widget; + WidgetPrivate wp = &obj->widget; char message[100]; if (obmClass (obj->core.classrec, WtScrollbar)) { @@ -1285,7 +1285,7 @@ widgetSPCallback (Widget w, WidgetObject obj, caddr_t call_data) */ XfwfScrollInfo *info = (XfwfScrollInfo *) call_data; XfwfScrollInfo update_info; - register int flags = info->flags; + int flags = info->flags; /* Slider2d callback: widget-name x y * Scrollbar2 callback: widget-name fraction @@ -1323,8 +1323,8 @@ widgetSPCallback (Widget w, WidgetObject obj, caddr_t call_data) static void widgetSCCallback (Widget w, WidgetObject obj, caddr_t call_data) { - register WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; + WidgetPrivate wp = &obj->widget; + ObmContext obm = wp->obm; char *callback_name; ObmCallback cb; int status, i; @@ -1369,7 +1369,7 @@ widgetSCCallback (Widget w, WidgetObject obj, caddr_t call_data) static void widgetPUCallback (Widget w, WidgetObject obj, caddr_t call_data) { - register WidgetPrivate wp = &obj->widget; + WidgetPrivate wp = &obj->widget; call_callbacks (obj, CtpopupCallback, NULL); } @@ -1380,7 +1380,7 @@ widgetPUCallback (Widget w, WidgetObject obj, caddr_t call_data) static void widgetPDCallback (Widget w, WidgetObject obj, caddr_t call_data) { - register WidgetPrivate wp = &obj->widget; + WidgetPrivate wp = &obj->widget; call_callbacks (obj, CtpopdownCallback, NULL); } @@ -1391,9 +1391,9 @@ widgetPDCallback (Widget w, WidgetObject obj, caddr_t call_data) static void call_callbacks (WidgetObject obj, int callback_type, char *message) { - register WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register ObmCallback cb; + WidgetPrivate wp = &obj->widget; + ObmContext obm = wp->obm; + ObmCallback cb; char *callback_name; int status, i; @@ -1492,7 +1492,7 @@ do_text (Widget w, XEvent *event, String *params, Cardinal *num_params) static void do_userproc (Widget w, XEvent *event, String *params, Cardinal *num_params) { - register char *ip, *op; + char *ip, *op; ObmContext obm = global_obm_handle; char cmd[SZ_COMMAND], *param; int x, y, x_root, y_root; @@ -1620,8 +1620,8 @@ do_userproc (Widget w, XEvent *event, String *params, Cardinal *num_params) static int widgetSetTTName (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { - register WidgetObject obj = (WidgetObject) msg->object[msg->level]; - register WidgetPrivate wp = &obj->widget; + WidgetObject obj = (WidgetObject) msg->object[msg->level]; + WidgetPrivate wp = &obj->widget; if (argc < 2) return (TCL_ERROR); @@ -1633,7 +1633,7 @@ widgetSetTTName (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) void widget_setTTName (WidgetObject obj, char *name) { - register WidgetPrivate wp = &obj->widget; + WidgetPrivate wp = &obj->widget; strncpy (wp->translation_table_name, name, SZ_NAME); wp->translation_table_name[SZ_NAME-1] = '\0'; } @@ -1646,8 +1646,8 @@ widget_setTTName (WidgetObject obj, char *name) static int widgetGetTTName (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { - register WidgetObject obj = (WidgetObject) msg->object[msg->level]; - register WidgetPrivate wp = &obj->widget; + WidgetObject obj = (WidgetObject) msg->object[msg->level]; + WidgetPrivate wp = &obj->widget; Tcl_SetResult (wp->obm->tcl, widget_getTTName(obj), TCL_VOLATILE); return (TCL_OK); @@ -1656,7 +1656,7 @@ widgetGetTTName (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) char * widget_getTTName (WidgetObject obj) { - register WidgetPrivate wp = &obj->widget; + WidgetPrivate wp = &obj->widget; return (wp->translation_table_name); } @@ -1669,7 +1669,7 @@ widget_getTTName (WidgetObject obj) static void do_popup (Widget w, XEvent *event, String *params, Cardinal *num_params) { - register char *ip, *op; + char *ip, *op; ObmContext obm = global_obm_handle; XKeyEvent *ev = (XKeyEvent *) event; Boolean spring_loaded; @@ -1754,7 +1754,7 @@ do_popup (Widget w, XEvent *event, String *params, Cardinal *num_params) static void do_popdown (Widget w, XEvent *event, String *params, Cardinal *num_params) { - register char *ip, *op; + char *ip, *op; ObmContext obm = global_obm_handle; XKeyEvent *ev = (XKeyEvent *) event; char *menu_name; @@ -1782,9 +1782,9 @@ widgetSet (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) WidgetObject obj = (WidgetObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - register char *ip; - register int hashval, n; - register Rtype rp; + char *ip; + int hashval, n; + Rtype rp; XrmValue from, to; Arg args[1]; @@ -1822,7 +1822,7 @@ widgetSet (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) /* The following is for text widgets. */ if (obmClass (obj->core.classrec, WtAsciiText)) { - register ObmCallback cb; + ObmCallback cb; wp->text_newline = 0; wp->text_pos = strlen (argv[2]); @@ -2016,9 +2016,9 @@ widgetGet (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) WidgetPrivate wp = &obj->widget; char rbuf[SZ_MESSAGE]; char *result = rbuf; - register char *ip; - register int hashval, n; - register Rtype rp; + char *ip; + int hashval, n; + Rtype rp; if (argc < 2) return (TCL_ERROR); @@ -2134,7 +2134,7 @@ widgetAppend (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - register char *ip, *op; + char *ip, *op; char buf[SZ_COMMAND]; XawTextBlock tx; char *text; @@ -2250,9 +2250,9 @@ widgetGetItem (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - register int nelem; - register String *list; - register char *ip, *op; + int nelem; + String *list; + char *ip, *op; XawListReturnStruct *itemp; char *s_itemno, *s_item; char buf[SZ_NUMBER]; @@ -2443,7 +2443,7 @@ static int get_itemno (WidgetObject obj, char *itemstr) { WidgetPrivate wp = &obj->widget; - register int i; + int i; if (isdigit (*itemstr)) return (atoi(itemstr)); @@ -3169,7 +3169,7 @@ widgetSetTable (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - register int i, j; + int i, j; int nrows, ncols, ndrows=0, ndcols=0, onrows, oncols; const char *list = NULL, **rows = NULL, **cols = NULL; @@ -4087,7 +4087,7 @@ widgetParseGeometry (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - register int uflags, dflags; + int uflags, dflags; Dimension winWidth, winHeight; int need, x, y, width, height; char *user_geom, *def_geom; @@ -4181,7 +4181,7 @@ widgetGetGeometry (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - register char *op; + char *op; Dimension winWidth, winHeight; int dist, gravity, x, y, width, height; char buf[128]; @@ -4357,8 +4357,8 @@ static int widgetAddEventHandler (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; - register WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; + WidgetPrivate wp = &obj->widget; + ObmContext obm = wp->obm; ObmCallback cb, new_cb; int event_mask, i, j; Boolean nonmaskable; @@ -4411,9 +4411,9 @@ static int widgetRemoveEventHandler (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) { WidgetObject obj = (WidgetObject) msg->object[msg->level]; - register WidgetPrivate wp = &obj->widget; - register ObmContext obm = wp->obm; - register ObmCallback cb, pcb; + WidgetPrivate wp = &obj->widget; + ObmContext obm = wp->obm; + ObmCallback cb, pcb; Boolean nonmaskable; char *procname; @@ -4458,8 +4458,8 @@ widgetEvent (Widget w, ObmCallback cb, XEvent *event, Boolean *continue_to_dispa WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; char cmd[SZ_COMMAND]; - register char *ip, *op; - register int i, j; + char *ip, *op; + int i, j; int status; /* Our job is to translate the X event into a call to a widget server @@ -4705,7 +4705,7 @@ widgetEventState (char *op, unsigned int state) static char * widgetGetFontName (Display *display, XFontStruct *fs) /* MF016 */ { - register int i; + int i; unsigned long val; char *name = (char *) malloc (SZ_FONT_NAME), *str, *lp; From d373779782e3d0337e65f2ffa69c9ab276a88a62 Mon Sep 17 00:00:00 2001 From: Ole Streicher Date: Wed, 17 Jul 2024 21:16:09 +0200 Subject: [PATCH 03/21] Force function type for arg3 of Tcl_CreateCommand --- obm/client.c | 6 +- obm/gterm.c | 148 ++++++++++++++++++++++---------------------- obm/html.c | 34 +++++----- obm/marker.c | 46 +++++++------- obm/param.c | 10 +-- obm/server.c | 54 ++++++++-------- obm/widget.c | 110 ++++++++++++++++---------------- ximtool/ximclient.c | 74 +++++++++++----------- 8 files changed, 241 insertions(+), 241 deletions(-) diff --git a/obm/client.c b/obm/client.c index 74d3029..a172a54 100644 --- a/obm/client.c +++ b/obm/client.c @@ -91,11 +91,11 @@ ClientCreate ( /* client-object actions. */ Tcl_CreateCommand (tcl, - "gcmd", clientGcmd, (ClientData)obj, NULL); + "gcmd", (Tcl_CmdProc *) clientGcmd, (ClientData)obj, NULL); Tcl_CreateCommand (tcl, - "gkey", clientGkey, (ClientData)obj, NULL); + "gkey", (Tcl_CmdProc *) clientGkey, (ClientData)obj, NULL); Tcl_CreateCommand (tcl, - "literal", clientLiteral, (ClientData)obj, NULL); + "literal", (Tcl_CmdProc *) clientLiteral, (ClientData)obj, NULL); return ((ObmObject) obj); } diff --git a/obm/gterm.c b/obm/gterm.c index 901c4e2..f7d4446 100644 --- a/obm/gterm.c +++ b/obm/gterm.c @@ -310,153 +310,153 @@ GtermClassInit (ObmContext obm, ObjClassRec classrec) gcd->level = 0; Tcl_CreateCommand (tcl, - "activate", gtermActivate, c_gcd, NULL); + "activate", (Tcl_CmdProc *) gtermActivate, c_gcd, NULL); Tcl_CreateCommand (tcl, - "activeMapping", gtermActiveMapping, c_gcd, NULL); + "activeMapping", (Tcl_CmdProc *) gtermActiveMapping, c_gcd, NULL); Tcl_CreateCommand (tcl, - "activeRasters", gtermActiveRasters, c_gcd, NULL); + "activeRasters", (Tcl_CmdProc *) gtermActiveRasters, c_gcd, NULL); Tcl_CreateCommand (tcl, - "addCallback", gtermAddCallback, c_gcd, NULL); + "addCallback", (Tcl_CmdProc *) gtermAddCallback, c_gcd, NULL); Tcl_CreateCommand (tcl, - "deleteCallback", gtermDeleteCallback, c_gcd, NULL); + "deleteCallback", (Tcl_CmdProc *) gtermDeleteCallback, c_gcd, NULL); Tcl_CreateCommand (tcl, - "assignRaster", gtermAssignRaster, c_gcd, NULL); + "assignRaster", (Tcl_CmdProc *) gtermAssignRaster, c_gcd, NULL); Tcl_CreateCommand (tcl, - "bell", gtermBell, c_gcd, NULL); + "bell", (Tcl_CmdProc *) gtermBell, c_gcd, NULL); Tcl_CreateCommand (tcl, - "clearScreen", gtermClearScreen, c_gcd, NULL); + "clearScreen", (Tcl_CmdProc *) gtermClearScreen, c_gcd, NULL); Tcl_CreateCommand (tcl, - "clientPixel", gtermClientPixel, c_gcd, NULL); + "clientPixel", (Tcl_CmdProc *) gtermClientPixel, c_gcd, NULL); Tcl_CreateCommand (tcl, - "copyRaster", gtermCopyRaster, c_gcd, NULL); + "copyRaster", (Tcl_CmdProc *) gtermCopyRaster, c_gcd, NULL); Tcl_CreateCommand (tcl, - "createMarker", gtermCreateMarker, c_gcd, NULL); + "createMarker", (Tcl_CmdProc *) gtermCreateMarker, c_gcd, NULL); Tcl_CreateCommand (tcl, - "createRaster", gtermCreateRaster, c_gcd, NULL); + "createRaster", (Tcl_CmdProc *) gtermCreateRaster, c_gcd, NULL); Tcl_CreateCommand (tcl, - "deactivate", gtermDeactivate, c_gcd, NULL); + "deactivate", (Tcl_CmdProc *) gtermDeactivate, c_gcd, NULL); Tcl_CreateCommand (tcl, - "destroyRaster", gtermDestroyRaster, c_gcd, NULL); + "destroyRaster", (Tcl_CmdProc *) gtermDestroyRaster, c_gcd, NULL); Tcl_CreateCommand (tcl, - "disableMapping", gtermDisableMapping, c_gcd, NULL); + "disableMapping", (Tcl_CmdProc *) gtermDisableMapping, c_gcd, NULL); Tcl_CreateCommand (tcl, - "drawAlphaText", gtermDrawAlphaText, c_gcd, NULL); + "drawAlphaText", (Tcl_CmdProc *) gtermDrawAlphaText, c_gcd, NULL); Tcl_CreateCommand (tcl, - "drawDialogText", gtermDrawDialogText, c_gcd, NULL); + "drawDialogText", (Tcl_CmdProc *) gtermDrawDialogText, c_gcd, NULL); Tcl_CreateCommand (tcl, - "drawMarker", gtermDrawMarker, c_gcd, NULL); + "drawMarker", (Tcl_CmdProc *) gtermDrawMarker, c_gcd, NULL); Tcl_CreateCommand (tcl, - "drawPolygon", gtermDrawPolygon, c_gcd, NULL); + "drawPolygon", (Tcl_CmdProc *) gtermDrawPolygon, c_gcd, NULL); Tcl_CreateCommand (tcl, - "drawPolyline", gtermDrawPolyline, c_gcd, NULL); + "drawPolyline", (Tcl_CmdProc *) gtermDrawPolyline, c_gcd, NULL); Tcl_CreateCommand (tcl, - "drawPolymarker", gtermDrawPolymarker, c_gcd, NULL); + "drawPolymarker", (Tcl_CmdProc *) gtermDrawPolymarker, c_gcd, NULL); Tcl_CreateCommand (tcl, - "enableMapping", gtermEnableMapping, c_gcd, NULL); + "enableMapping", (Tcl_CmdProc *) gtermEnableMapping, c_gcd, NULL); Tcl_CreateCommand (tcl, - "endDialog", gtermEndDialog, c_gcd, NULL); + "endDialog", (Tcl_CmdProc *) gtermEndDialog, c_gcd, NULL); Tcl_CreateCommand (tcl, - "eraseDialog", gtermEraseDialog, c_gcd, NULL); + "eraseDialog", (Tcl_CmdProc *) gtermEraseDialog, c_gcd, NULL); Tcl_CreateCommand (tcl, - "extractPixmap", gtermExtractPixmap, c_gcd, NULL); + "extractPixmap", (Tcl_CmdProc *) gtermExtractPixmap, c_gcd, NULL); Tcl_CreateCommand (tcl, - "flip", gtermFlip, c_gcd, NULL); + "flip", (Tcl_CmdProc *) gtermFlip, c_gcd, NULL); Tcl_CreateCommand (tcl, - "flush", gtermFlush, c_gcd, NULL); + "flush", (Tcl_CmdProc *) gtermFlush, c_gcd, NULL); Tcl_CreateCommand (tcl, - "freeColormap", gtermFreeColormap, c_gcd, NULL); + "freeColormap", (Tcl_CmdProc *) gtermFreeColormap, c_gcd, NULL); Tcl_CreateCommand (tcl, - "freeMapping", gtermFreeMapping, c_gcd, NULL); + "freeMapping", (Tcl_CmdProc *) gtermFreeMapping, c_gcd, NULL); Tcl_CreateCommand (tcl, - "raiseMapping", gtermRaiseMapping, c_gcd, NULL); + "raiseMapping", (Tcl_CmdProc *) gtermRaiseMapping, c_gcd, NULL); Tcl_CreateCommand (tcl, - "lowerMapping", gtermLowerMapping, c_gcd, NULL); + "lowerMapping", (Tcl_CmdProc *) gtermLowerMapping, c_gcd, NULL); Tcl_CreateCommand (tcl, - "getAlphaTextSize", gtermGetAlphaTextSize, c_gcd, NULL); + "getAlphaTextSize", (Tcl_CmdProc *) gtermGetAlphaTextSize, c_gcd, NULL); Tcl_CreateCommand (tcl, - "getBias", gtermGetBias, c_gcd, NULL); + "getBias", (Tcl_CmdProc *) gtermGetBias, c_gcd, NULL); Tcl_CreateCommand (tcl, - "getCursorPos", gtermGetCursorPos, c_gcd, NULL); + "getCursorPos", (Tcl_CmdProc *) gtermGetCursorPos, c_gcd, NULL); Tcl_CreateCommand (tcl, - "getDialogTextSize", gtermGetDialogTextSize, c_gcd, NULL); + "getDialogTextSize", (Tcl_CmdProc *) gtermGetDialogTextSize, c_gcd, NULL); Tcl_CreateCommand (tcl, - "getLogRes", gtermGetLogRes, c_gcd, NULL); + "getLogRes", (Tcl_CmdProc *) gtermGetLogRes, c_gcd, NULL); Tcl_CreateCommand (tcl, - "getMapping", gtermGetMapping, c_gcd, NULL); + "getMapping", (Tcl_CmdProc *) gtermGetMapping, c_gcd, NULL); Tcl_CreateCommand (tcl, - "getPhysRes", gtermGetPhysRes, c_gcd, NULL); + "getPhysRes", (Tcl_CmdProc *) gtermGetPhysRes, c_gcd, NULL); Tcl_CreateCommand (tcl, - "getPixel", gtermGetPixel, c_gcd, NULL); + "getPixel", (Tcl_CmdProc *) gtermGetPixel, c_gcd, NULL); Tcl_CreateCommand (tcl, - "getRaster", gtermGetRaster, c_gcd, NULL); + "getRaster", (Tcl_CmdProc *) gtermGetRaster, c_gcd, NULL); Tcl_CreateCommand (tcl, - "initMappings", gtermInitMappings, c_gcd, NULL); + "initMappings", (Tcl_CmdProc *) gtermInitMappings, c_gcd, NULL); Tcl_CreateCommand (tcl, - "insertPixmap", gtermInsertPixmap, c_gcd, NULL); + "insertPixmap", (Tcl_CmdProc *) gtermInsertPixmap, c_gcd, NULL); Tcl_CreateCommand (tcl, - "loadColormap", gtermLoadColormap, c_gcd, NULL); + "loadColormap", (Tcl_CmdProc *) gtermLoadColormap, c_gcd, NULL); Tcl_CreateCommand (tcl, - "markerInit", gtermMarkerInit, c_gcd, NULL); + "markerInit", (Tcl_CmdProc *) gtermMarkerInit, c_gcd, NULL); Tcl_CreateCommand (tcl, - "nextColormap", gtermNextColormap, c_gcd, NULL); + "nextColormap", (Tcl_CmdProc *) gtermNextColormap, c_gcd, NULL); Tcl_CreateCommand (tcl, - "nextMapping", gtermNextMapping, c_gcd, NULL); + "nextMapping", (Tcl_CmdProc *) gtermNextMapping, c_gcd, NULL); Tcl_CreateCommand (tcl, - "nextRaster", gtermNextRaster, c_gcd, NULL); + "nextRaster", (Tcl_CmdProc *) gtermNextRaster, c_gcd, NULL); Tcl_CreateCommand (tcl, - "queryRaster", gtermQueryRaster, c_gcd, NULL); + "queryRaster", (Tcl_CmdProc *) gtermQueryRaster, c_gcd, NULL); Tcl_CreateCommand (tcl, - "rasterInit", gtermRasterInit, c_gcd, NULL); + "rasterInit", (Tcl_CmdProc *) gtermRasterInit, c_gcd, NULL); Tcl_CreateCommand (tcl, - "readColormap", gtermReadColormap, c_gcd, NULL); + "readColormap", (Tcl_CmdProc *) gtermReadColormap, c_gcd, NULL); Tcl_CreateCommand (tcl, - "readPixels", gtermReadPixels, c_gcd, NULL); + "readPixels", (Tcl_CmdProc *) gtermReadPixels, c_gcd, NULL); Tcl_CreateCommand (tcl, - "refreshMapping", gtermRefreshMapping, c_gcd, NULL); + "refreshMapping", (Tcl_CmdProc *) gtermRefreshMapping, c_gcd, NULL); Tcl_CreateCommand (tcl, - "refreshPixels", gtermRefreshPixels, c_gcd, NULL); + "refreshPixels", (Tcl_CmdProc *) gtermRefreshPixels, c_gcd, NULL); Tcl_CreateCommand (tcl, - "reset", gtermReset, c_gcd, NULL); + "reset", (Tcl_CmdProc *) gtermReset, c_gcd, NULL); Tcl_CreateCommand (tcl, - "selectRaster", gtermSelectRaster, c_gcd, NULL); + "selectRaster", (Tcl_CmdProc *) gtermSelectRaster, c_gcd, NULL); Tcl_CreateCommand (tcl, - "setColorIndex", gtermSetColorIndex, c_gcd, NULL); + "setColorIndex", (Tcl_CmdProc *) gtermSetColorIndex, c_gcd, NULL); Tcl_CreateCommand (tcl, - "setCursorPos", gtermSetCursorPos, c_gcd, NULL); + "setCursorPos", (Tcl_CmdProc *) gtermSetCursorPos, c_gcd, NULL); Tcl_CreateCommand (tcl, - "setCursorType", gtermSetCursorType, c_gcd, NULL); + "setCursorType", (Tcl_CmdProc *) gtermSetCursorType, c_gcd, NULL); Tcl_CreateCommand (tcl, - "setDataLevel", gtermSetDataLevel, c_gcd, NULL); + "setDataLevel", (Tcl_CmdProc *) gtermSetDataLevel, c_gcd, NULL); Tcl_CreateCommand (tcl, - "setFillType", gtermSetFillType, c_gcd, NULL); + "setFillType", (Tcl_CmdProc *) gtermSetFillType, c_gcd, NULL); Tcl_CreateCommand (tcl, - "setGterm", gtermSetGterm, c_gcd, NULL); + "setGterm", (Tcl_CmdProc *) gtermSetGterm, c_gcd, NULL); Tcl_CreateCommand (tcl, - "setLineStyle", gtermSetLineStyle, c_gcd, NULL); + "setLineStyle", (Tcl_CmdProc *) gtermSetLineStyle, c_gcd, NULL); Tcl_CreateCommand (tcl, - "setLineWidth", gtermSetLineWidth, c_gcd, NULL); + "setLineWidth", (Tcl_CmdProc *) gtermSetLineWidth, c_gcd, NULL); Tcl_CreateCommand (tcl, - "setLogRes", gtermSetLogRes, c_gcd, NULL); + "setLogRes", (Tcl_CmdProc *) gtermSetLogRes, c_gcd, NULL); Tcl_CreateCommand (tcl, - "setMapping", gtermSetMapping, c_gcd, NULL); + "setMapping", (Tcl_CmdProc *) gtermSetMapping, c_gcd, NULL); Tcl_CreateCommand (tcl, - "setPhysRes", gtermSetPhysRes, c_gcd, NULL); + "setPhysRes", (Tcl_CmdProc *) gtermSetPhysRes, c_gcd, NULL); Tcl_CreateCommand (tcl, - "setPixel", gtermSetPixel, c_gcd, NULL); + "setPixel", (Tcl_CmdProc *) gtermSetPixel, c_gcd, NULL); Tcl_CreateCommand (tcl, - "setPixels", gtermSetPixels, c_gcd, NULL); + "setPixels", (Tcl_CmdProc *) gtermSetPixels, c_gcd, NULL); Tcl_CreateCommand (tcl, - "setRaster", gtermSetRaster, c_gcd, NULL); + "setRaster", (Tcl_CmdProc *) gtermSetRaster, c_gcd, NULL); Tcl_CreateCommand (tcl, - "setTextRes", gtermSetTextRes, c_gcd, NULL); + "setTextRes", (Tcl_CmdProc *) gtermSetTextRes, c_gcd, NULL); Tcl_CreateCommand (tcl, - "startDialog", gtermStartDialog, c_gcd, NULL); + "startDialog", (Tcl_CmdProc *) gtermStartDialog, c_gcd, NULL); Tcl_CreateCommand (tcl, - "unmapPixel", gtermUnmapPixel, c_gcd, NULL); + "unmapPixel", (Tcl_CmdProc *) gtermUnmapPixel, c_gcd, NULL); Tcl_CreateCommand (tcl, - "writeColormap", gtermWriteColormap, c_gcd, NULL); + "writeColormap", (Tcl_CmdProc *) gtermWriteColormap, c_gcd, NULL); Tcl_CreateCommand (tcl, - "writePixels", gtermWritePixels, c_gcd, NULL); + "writePixels", (Tcl_CmdProc *) gtermWritePixels, c_gcd, NULL); } } diff --git a/obm/html.c b/obm/html.c index 6847a9a..8fa865f 100644 --- a/obm/html.c +++ b/obm/html.c @@ -150,39 +150,39 @@ HTMLClassInit (ObmContext obm, ObjClassRec classrec) gcd->level = 0; Tcl_CreateCommand (tcl, - "addCallback", htmlAddCallback, c_gcd, NULL); + "addCallback", (Tcl_CmdProc *) htmlAddCallback, c_gcd, NULL); Tcl_CreateCommand (tcl, - "deleteCallback", htmlDeleteCallback, c_gcd, NULL); + "deleteCallback", (Tcl_CmdProc *) htmlDeleteCallback, c_gcd, NULL); Tcl_CreateCommand (tcl, - "setText", htmlSetText, c_gcd, NULL); + "setText", (Tcl_CmdProc *) htmlSetText, c_gcd, NULL); Tcl_CreateCommand (tcl, - "getText", htmlGetText, c_gcd, NULL); + "getText", (Tcl_CmdProc *) htmlGetText, c_gcd, NULL); Tcl_CreateCommand (tcl, - "positionToId", htmlPositionToId, c_gcd, NULL); + "positionToId", (Tcl_CmdProc *) htmlPositionToId, c_gcd, NULL); Tcl_CreateCommand (tcl, - "idToPosition", htmlIdToPosition, c_gcd, NULL); + "idToPosition", (Tcl_CmdProc *) htmlIdToPosition, c_gcd, NULL); Tcl_CreateCommand (tcl, - "anchorToPosition", htmlAnchorToPosition, c_gcd, NULL); + "anchorToPosition", (Tcl_CmdProc *) htmlAnchorToPosition, c_gcd, NULL); Tcl_CreateCommand (tcl, - "anchorToId", htmlAnchorToId, c_gcd, NULL); + "anchorToId", (Tcl_CmdProc *) htmlAnchorToId, c_gcd, NULL); Tcl_CreateCommand (tcl, - "gotoId", htmlGotoId, c_gcd, NULL); + "gotoId", (Tcl_CmdProc *) htmlGotoId, c_gcd, NULL); Tcl_CreateCommand (tcl, - "getHRefs", htmlGetHRefs, c_gcd, NULL); + "getHRefs", (Tcl_CmdProc *) htmlGetHRefs, c_gcd, NULL); Tcl_CreateCommand (tcl, - "getImageSrcs", htmlGetImageSrcs, c_gcd, NULL); + "getImageSrcs", (Tcl_CmdProc *) htmlGetImageSrcs, c_gcd, NULL); Tcl_CreateCommand (tcl, - "getLinks", htmlGetLinks, c_gcd, NULL); + "getLinks", (Tcl_CmdProc *) htmlGetLinks, c_gcd, NULL); Tcl_CreateCommand (tcl, - "retestAnchors", htmlRetestAnchors, c_gcd, NULL); + "retestAnchors", (Tcl_CmdProc *) htmlRetestAnchors, c_gcd, NULL); Tcl_CreateCommand (tcl, - "setSelection", htmlSetSelection, c_gcd, NULL); + "setSelection", (Tcl_CmdProc *) htmlSetSelection, c_gcd, NULL); Tcl_CreateCommand (tcl, - "getSelection", htmlGetSelection, c_gcd, NULL); + "getSelection", (Tcl_CmdProc *) htmlGetSelection, c_gcd, NULL); Tcl_CreateCommand (tcl, - "clearSelection", htmlClearSelection, c_gcd, NULL); + "clearSelection", (Tcl_CmdProc *) htmlClearSelection, c_gcd, NULL); Tcl_CreateCommand (tcl, - "searchText", htmlSearchText, c_gcd, NULL); + "searchText", (Tcl_CmdProc *) htmlSearchText, c_gcd, NULL); } } diff --git a/obm/marker.c b/obm/marker.c index 1689a2d..ca9730e 100644 --- a/obm/marker.c +++ b/obm/marker.c @@ -183,51 +183,51 @@ MarkerClassInit (ObmContext obm, ObjClassRec classrec) msg->level = 0; Tcl_CreateCommand (tcl, - "makeCopy", markerMakeCopy, (ClientData)msg, NULL); + "makeCopy", (Tcl_CmdProc *) markerMakeCopy, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "addCallback", markerAddCallback, (ClientData)msg, NULL); + "addCallback", (Tcl_CmdProc *) markerAddCallback, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "deleteCallback", markerDeleteCallback, (ClientData)msg, NULL); + "deleteCallback", (Tcl_CmdProc *) markerDeleteCallback, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "callbackProc", markerCallbackProc, (ClientData)msg, NULL); + "callbackProc", (Tcl_CmdProc *) markerCallbackProc, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "notify", markerNotify, (ClientData)msg, NULL); + "notify", (Tcl_CmdProc *) markerNotify, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "destroy", markerDestroy, (ClientData)msg, NULL); + "destroy", (Tcl_CmdProc *) markerDestroy, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "markpos", markerMarkpos, (ClientData)msg, NULL); + "markpos", (Tcl_CmdProc *) markerMarkpos, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "redraw", markerRedraw, (ClientData)msg, NULL); + "redraw", (Tcl_CmdProc *) markerRedraw, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "raise", markerRaise, (ClientData)msg, NULL); + "raise", (Tcl_CmdProc *) markerRaise, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "lower", markerLower, (ClientData)msg, NULL); + "lower", (Tcl_CmdProc *) markerLower, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "move", markerMove, (ClientData)msg, NULL); + "move", (Tcl_CmdProc *) markerMove, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "resize", markerResize, (ClientData)msg, NULL); + "resize", (Tcl_CmdProc *) markerResize, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "rotate", markerRotate, (ClientData)msg, NULL); + "rotate", (Tcl_CmdProc *) markerRotate, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "set", markerSetAttribute, (ClientData)msg, NULL); + "set", (Tcl_CmdProc *) markerSetAttribute, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "get", markerGetAttribute, (ClientData)msg, NULL); + "get", (Tcl_CmdProc *) markerGetAttribute, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "setAttribute", markerSetAttribute, (ClientData)msg, NULL); + "setAttribute", (Tcl_CmdProc *) markerSetAttribute, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "getAttribute", markerGetAttribute, (ClientData)msg, NULL); + "getAttribute", (Tcl_CmdProc *) markerGetAttribute, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "setAttributes", markerSetAttributes, (ClientData)msg, NULL); + "setAttributes", (Tcl_CmdProc *) markerSetAttributes, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "getAttributes", markerGetAttributes, (ClientData)msg, NULL); + "getAttributes", (Tcl_CmdProc *) markerGetAttributes, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "setVertices", markerSetVertices, (ClientData)msg, NULL); + "setVertices", (Tcl_CmdProc *) markerSetVertices, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "getVertices", markerGetVertices, (ClientData)msg, NULL); + "getVertices", (Tcl_CmdProc *) markerGetVertices, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "getRegion", markerGetRegion, (ClientData)msg, NULL); + "getRegion", (Tcl_CmdProc *) markerGetRegion, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "getRect", markerGetRect, (ClientData)msg, NULL); + "getRect", (Tcl_CmdProc *) markerGetRect, (ClientData)msg, NULL); } } diff --git a/obm/param.c b/obm/param.c index 288248d..ced8032 100644 --- a/obm/param.c +++ b/obm/param.c @@ -112,15 +112,15 @@ ParameterClassInit (ObmContext obm, ObjClassRec classrec) /* Register parameter-object actions. */ Tcl_CreateCommand (tcl, "setValue", - parameterSetValue, (ClientData)msg, NULL); + (Tcl_CmdProc *) parameterSetValue, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, "getValue", - parameterGetValue, (ClientData)msg, NULL); + (Tcl_CmdProc *) parameterGetValue, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, "addCallback", - parameterAddCallback, (ClientData)msg, NULL); + (Tcl_CmdProc *) parameterAddCallback, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, "deleteCallback", - parameterDeleteCallback, (ClientData)msg, NULL); + (Tcl_CmdProc *) parameterDeleteCallback, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, "notify", - parameterNotify, (ClientData)msg, NULL); + (Tcl_CmdProc *) parameterNotify, (ClientData)msg, NULL); } diff --git a/obm/server.c b/obm/server.c index 4b0523e..cfad2dd 100644 --- a/obm/server.c +++ b/obm/server.c @@ -180,63 +180,63 @@ ServerCreate ( /* Register server actions. */ Tcl_CreateCommand (tcl, - "reset-server", serverReset, (ClientData)obj, NULL); + "reset-server", (Tcl_CmdProc *) serverReset, (ClientData)obj, NULL); Tcl_CreateCommand (tcl, - "activate", serverActivate, (ClientData)obj, NULL); + "activate", (Tcl_CmdProc *) serverActivate, (ClientData)obj, NULL); Tcl_CreateCommand (tcl, - "deactivate", serverDeactivate, (ClientData)obj, NULL); + "deactivate", (Tcl_CmdProc *) serverDeactivate, (ClientData)obj, NULL); Tcl_CreateCommand (tcl, - "synchronize", serverSynchronize, (ClientData)obj, NULL); + "synchronize", (Tcl_CmdProc *) serverSynchronize, (ClientData)obj, NULL); Tcl_CreateCommand (tcl, - "flush", serverFlush, (ClientData)obj, NULL); + "flush", (Tcl_CmdProc *) serverFlush, (ClientData)obj, NULL); Tcl_CreateCommand (tcl, - "postActivateCallback", serverPostActivateCallback, + "postActivateCallback", (Tcl_CmdProc *) serverPostActivateCallback, (ClientData)obj, NULL); Tcl_CreateCommand (tcl, - "postDeactivateCallback", serverPostDeactivateCallback, + "postDeactivateCallback", (Tcl_CmdProc *) serverPostDeactivateCallback, (ClientData)obj, NULL); Tcl_CreateCommand (tcl, - "appInitialize", serverAppInitialize, (ClientData)obj, NULL); + "appInitialize", (Tcl_CmdProc *) serverAppInitialize, (ClientData)obj, NULL); Tcl_CreateCommand (tcl, - "appExtend", serverAppExtend, (ClientData)obj, NULL); + "appExtend", (Tcl_CmdProc *) serverAppExtend, (ClientData)obj, NULL); Tcl_CreateCommand (tcl, - "createObjects", serverCreateObjects, (ClientData)obj, NULL); + "createObjects", (Tcl_CmdProc *) serverCreateObjects, (ClientData)obj, NULL); Tcl_CreateCommand (tcl, - "destroyObject", serverDestroyObject, (ClientData)obj, NULL); + "destroyObject", (Tcl_CmdProc *) serverDestroyObject, (ClientData)obj, NULL); Tcl_CreateCommand (tcl, - "queryObject", serverQueryObject, (ClientData)obj, NULL); + "queryObject", (Tcl_CmdProc *) serverQueryObject, (ClientData)obj, NULL); Tcl_CreateCommand (tcl, - "send", serverSend, (ClientData)obj, NULL); + "send", (Tcl_CmdProc *) serverSend, (ClientData)obj, NULL); Tcl_CreateCommand (tcl, - "print", serverPrint, (ClientData)obj, NULL); + "print", (Tcl_CmdProc *) serverPrint, (ClientData)obj, NULL); Tcl_CreateCommand (tcl, - "getResource", serverGetResource, (ClientData)obj, NULL); + "getResource", (Tcl_CmdProc *) serverGetResource, (ClientData)obj, NULL); Tcl_CreateCommand (tcl, - "getResources", serverGetResources, (ClientData)obj, NULL); + "getResources", (Tcl_CmdProc *) serverGetResources, (ClientData)obj, NULL); Tcl_CreateCommand (tcl, - "postTimedCallback", serverPostTimedCallback, + "postTimedCallback", (Tcl_CmdProc *) serverPostTimedCallback, (ClientData)obj, NULL); Tcl_CreateCommand (tcl, - "deleteTimedCallback", serverDeleteTimedCallback, + "deleteTimedCallback", (Tcl_CmdProc *) serverDeleteTimedCallback, (ClientData)obj, NULL); Tcl_CreateCommand (tcl, - "postWorkProc", serverPostWorkProc, (ClientData)obj, NULL); + "postWorkProc", (Tcl_CmdProc *) serverPostWorkProc, (ClientData)obj, NULL); Tcl_CreateCommand (tcl, - "deleteWorkProc", serverDeleteWorkProc, (ClientData)obj, NULL); + "deleteWorkProc", (Tcl_CmdProc *) serverDeleteWorkProc, (ClientData)obj, NULL); Tcl_CreateCommand (tcl, - "createBitmap", serverCreateBitmap, (ClientData)obj, NULL); + "createBitmap", (Tcl_CmdProc *) serverCreateBitmap, (ClientData)obj, NULL); Tcl_CreateCommand (tcl, - "createPixmap", serverCreatePixmap, (ClientData)obj, NULL); + "createPixmap", (Tcl_CmdProc *) serverCreatePixmap, (ClientData)obj, NULL); Tcl_CreateCommand (tcl, - "createXPixmap", serverCreateXPixmap, (ClientData)obj, NULL); + "createXPixmap", (Tcl_CmdProc *) serverCreateXPixmap, (ClientData)obj, NULL); Tcl_CreateCommand (tcl, - "createCursor", serverCreateCursor, (ClientData)obj, NULL); + "createCursor", (Tcl_CmdProc *) serverCreateCursor, (ClientData)obj, NULL); Tcl_CreateCommand (tcl, - "createMenu", serverCreateMenu, (ClientData)obj, NULL); + "createMenu", (Tcl_CmdProc *) serverCreateMenu, (ClientData)obj, NULL); Tcl_CreateCommand (tcl, - "editMenu", serverCreateMenu, (ClientData)obj, NULL); + "editMenu", (Tcl_CmdProc *) serverCreateMenu, (ClientData)obj, NULL); Tcl_CreateCommand (tcl, - "destroyMenu", serverDestroyMenu, (ClientData)obj, NULL); + "destroyMenu", (Tcl_CmdProc *) serverDestroyMenu, (ClientData)obj, NULL); return ((ObmObject) obj); } diff --git a/obm/widget.c b/obm/widget.c index 5b903b0..cbd5747 100644 --- a/obm/widget.c +++ b/obm/widget.c @@ -322,142 +322,142 @@ WidgetClassInit (ObmContext obm, ObjClassRec classrec) /* Register widget-object actions. */ Tcl_CreateCommand (tcl, - "addCallback", widgetAddCallback, (ClientData)msg, NULL); + "addCallback", (Tcl_CmdProc *) widgetAddCallback, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "deleteCallback", widgetDeleteCallback, (ClientData)msg, + "deleteCallback", (Tcl_CmdProc *) widgetDeleteCallback, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "addEventHandler", widgetAddEventHandler, (ClientData)msg, + "addEventHandler", (Tcl_CmdProc *) widgetAddEventHandler, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "removeEventHandler", widgetRemoveEventHandler, + "removeEventHandler", (Tcl_CmdProc *) widgetRemoveEventHandler, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "set", widgetSet, (ClientData)msg, NULL); + "set", (Tcl_CmdProc *) widgetSet, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "get", widgetGet, (ClientData)msg, NULL); + "get", (Tcl_CmdProc *) widgetGet, (ClientData)msg, NULL); /* Text Widget Callbacks */ Tcl_CreateCommand (tcl, - "append", widgetAppend, (ClientData)msg, NULL); + "append", (Tcl_CmdProc *) widgetAppend, (ClientData)msg, NULL); /* List Widget Callbacks */ Tcl_CreateCommand (tcl, - "setList", widgetSetList, (ClientData)msg, NULL); + "setList", (Tcl_CmdProc *) widgetSetList, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "getItem", widgetGetItem, (ClientData)msg, NULL); + "getItem", (Tcl_CmdProc *) widgetGetItem, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "highlight", widgetHighlight, (ClientData)msg, NULL); + "highlight", (Tcl_CmdProc *) widgetHighlight, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "unhighlight", widgetUnhighlight, (ClientData)msg, NULL); + "unhighlight", (Tcl_CmdProc *) widgetUnhighlight, (ClientData)msg, NULL); /* Dialog Widget Callbacks */ Tcl_CreateCommand (tcl, - "getValue", widgetGetValue, (ClientData)msg, NULL); + "getValue", (Tcl_CmdProc *) widgetGetValue, (ClientData)msg, NULL); /* Slider Widget Callbacks */ Tcl_CreateCommand (tcl, - "getThumb", widgetGetThumb, (ClientData)msg, NULL); + "getThumb", (Tcl_CmdProc *) widgetGetThumb, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "moveThumb", widgetMoveThumb, (ClientData)msg, NULL); + "moveThumb", (Tcl_CmdProc *) widgetMoveThumb, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "resizeThumb", widgetResizeThumb, (ClientData)msg, NULL); + "resizeThumb", (Tcl_CmdProc *) widgetResizeThumb, (ClientData)msg, NULL); /* Scrollbar Widget Callbacks */ Tcl_CreateCommand (tcl, - "setScrollbar", widgetSetScrollbar, (ClientData)msg, NULL); + "setScrollbar", (Tcl_CmdProc *) widgetSetScrollbar, (ClientData)msg, NULL); /* Viewport Widget Callbacks */ Tcl_CreateCommand (tcl, - "setLocation", widgetSetLocation, (ClientData)msg, NULL); + "setLocation", (Tcl_CmdProc *) widgetSetLocation, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "setCoordinates", widgetSetCoordinates, (ClientData)msg, NULL); + "setCoordinates", (Tcl_CmdProc *) widgetSetCoordinates, (ClientData)msg, NULL); /* Tabs Widget Callbacks */ Tcl_CreateCommand (tcl, - "setTop", widgetSetTop, (ClientData)msg, NULL); + "setTop", (Tcl_CmdProc *) widgetSetTop, (ClientData)msg, NULL); /* Tree Widget Callbacks */ Tcl_CreateCommand (tcl, - "setListTree", widgetSetListTree, (ClientData)msg, NULL); + "setListTree", (Tcl_CmdProc *) widgetSetListTree, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "listTreeSelect", widgetListTreeSelect, (ClientData)msg, NULL); + "listTreeSelect", (Tcl_CmdProc *) widgetListTreeSelect, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "listTreeDelete", widgetListTreeDelete, (ClientData)msg, NULL); + "listTreeDelete", (Tcl_CmdProc *) widgetListTreeDelete, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "listTreeHighlight", widgetListTreeHighlight, + "listTreeHighlight", (Tcl_CmdProc *) widgetListTreeHighlight, (ClientData)msg, NULL); #ifndef OSI_COMPLIANT /* Table Widget Callbacks */ Tcl_CreateCommand (tcl, - "setTable", widgetSetTable, (ClientData)msg, NULL); + "setTable", (Tcl_CmdProc *) widgetSetTable, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "getCellAttr", widgetGetCellAttr, (ClientData)msg, NULL); + "getCellAttr", (Tcl_CmdProc *) widgetGetCellAttr, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "setCellAttr", widgetSetCellAttr, (ClientData)msg, NULL); + "setCellAttr", (Tcl_CmdProc *) widgetSetCellAttr, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "setColAttr", widgetSetColAttr, (ClientData)msg, NULL); + "setColAttr", (Tcl_CmdProc *) widgetSetColAttr, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "getColAttr", widgetGetColAttr, (ClientData)msg, NULL); + "getColAttr", (Tcl_CmdProc *) widgetGetColAttr, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "setRowAttr", widgetSetRowAttr, (ClientData)msg, NULL); + "setRowAttr", (Tcl_CmdProc *) widgetSetRowAttr, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "getRowAttr", widgetGetRowAttr, (ClientData)msg, NULL); + "getRowAttr", (Tcl_CmdProc *) widgetGetRowAttr, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "deleteCol", widgetDeleteCol, (ClientData)msg, NULL); + "deleteCol", (Tcl_CmdProc *) widgetDeleteCol, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "deleteRow", widgetDeleteRow, (ClientData)msg, NULL); + "deleteRow", (Tcl_CmdProc *) widgetDeleteRow, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "addCol", widgetAddCol, (ClientData)msg, NULL); + "addCol", (Tcl_CmdProc *) widgetAddCol, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "addRow", widgetAddRow, (ClientData)msg, NULL); + "addRow", (Tcl_CmdProc *) widgetAddRow, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "setTableSize", widgetSetTableSize, (ClientData)msg, NULL); + "setTableSize", (Tcl_CmdProc *) widgetSetTableSize, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "getTableSize", widgetGetTableSize, (ClientData)msg, NULL); + "getTableSize", (Tcl_CmdProc *) widgetGetTableSize, (ClientData)msg, NULL); #endif Tcl_CreateCommand (tcl, - "realize", widgetRealize, (ClientData)msg, NULL); + "realize", (Tcl_CmdProc *) widgetRealize, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "unrealize", widgetUnrealize, (ClientData)msg, NULL); + "unrealize", (Tcl_CmdProc *) widgetUnrealize, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "isRealized", widgetIsRealized, (ClientData)msg, NULL); + "isRealized", (Tcl_CmdProc *) widgetIsRealized, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "map", widgetMap, (ClientData)msg, NULL); + "map", (Tcl_CmdProc *) widgetMap, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "unmap", widgetUnmap, (ClientData)msg, NULL); + "unmap", (Tcl_CmdProc *) widgetUnmap, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "manage", widgetManage, (ClientData)msg, NULL); + "manage", (Tcl_CmdProc *) widgetManage, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "unmanage", widgetUnmanage, (ClientData)msg, NULL); + "unmanage", (Tcl_CmdProc *) widgetUnmanage, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "popup", widgetPopup, (ClientData)msg, NULL); + "popup", (Tcl_CmdProc *) widgetPopup, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "popupSpringLoaded", widgetPopupSpringLoaded, + "popupSpringLoaded", (Tcl_CmdProc *) widgetPopupSpringLoaded, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "popdown", widgetPopdown, (ClientData)msg, NULL); + "popdown", (Tcl_CmdProc *) widgetPopdown, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "setSensitive", widgetSetSensitive, (ClientData)msg, NULL); + "setSensitive", (Tcl_CmdProc *) widgetSetSensitive, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "isSensitive", widgetIsSensitive, (ClientData)msg, NULL); + "isSensitive", (Tcl_CmdProc *) widgetIsSensitive, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "move", widgetMove, (ClientData)msg, NULL); + "move", (Tcl_CmdProc *) widgetMove, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "resize", widgetResize, (ClientData)msg, NULL); + "resize", (Tcl_CmdProc *) widgetResize, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "configure", widgetConfigure, (ClientData)msg, NULL); + "configure", (Tcl_CmdProc *) widgetConfigure, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "parseGeometry", widgetParseGeometry, (ClientData)msg, NULL); + "parseGeometry", (Tcl_CmdProc *) widgetParseGeometry, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "getGeometry", widgetGetGeometry, (ClientData)msg, NULL); + "getGeometry", (Tcl_CmdProc *) widgetGetGeometry, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "setTTName", widgetSetTTName, (ClientData)msg, NULL); + "setTTName", (Tcl_CmdProc *) widgetSetTTName, (ClientData)msg, NULL); Tcl_CreateCommand (tcl, - "getTTName", widgetGetTTName, (ClientData)msg, NULL); + "getTTName", (Tcl_CmdProc *) widgetGetTTName, (ClientData)msg, NULL); /* Register any actions. */ XtAppAddActions (obm->app_context, widget_actions, diff --git a/ximtool/ximclient.c b/ximtool/ximclient.c index 0291f6e..386e673 100644 --- a/ximtool/ximclient.c +++ b/ximtool/ximclient.c @@ -115,74 +115,74 @@ XimDataPtr xim; xim_clientExecute, (XtPointer)xc); Tcl_CreateCommand (tcl, - "Quit", Quit, (ClientData)xc, NULL); + "Quit", (Tcl_CmdProc *) Quit, (ClientData)xc, NULL); Tcl_CreateCommand (tcl, - "Reset", Reset, (ClientData)xc, NULL); + "Reset", (Tcl_CmdProc *) Reset, (ClientData)xc, NULL); Tcl_CreateCommand (tcl, - "initialize", initialize, (ClientData)xc, NULL); + "initialize", (Tcl_CmdProc *) initialize, (ClientData)xc, NULL); Tcl_CreateCommand (tcl, - "setFrame", setFrame, (ClientData)xc, NULL); + "setFrame", (Tcl_CmdProc *) setFrame, (ClientData)xc, NULL); Tcl_CreateCommand (tcl, - "getFrame", getFrame, (ClientData)xc, NULL); + "getFrame", (Tcl_CmdProc *) getFrame, (ClientData)xc, NULL); Tcl_CreateCommand (tcl, - "getRaster", getRaster, (ClientData)xc, NULL); + "getRaster", (Tcl_CmdProc *) getRaster, (ClientData)xc, NULL); Tcl_CreateCommand (tcl, - "getSource", getSource, (ClientData)xc, NULL); + "getSource", (Tcl_CmdProc *) getSource, (ClientData)xc, NULL); Tcl_CreateCommand (tcl, - "nextFrame", nextFrame, (ClientData)xc, NULL); + "nextFrame", (Tcl_CmdProc *) nextFrame, (ClientData)xc, NULL); Tcl_CreateCommand (tcl, - "prevFrame", prevFrame, (ClientData)xc, NULL); + "prevFrame", (Tcl_CmdProc *) prevFrame, (ClientData)xc, NULL); Tcl_CreateCommand (tcl, - "fitFrame", fitFrame, (ClientData)xc, NULL); + "fitFrame", (Tcl_CmdProc *) fitFrame, (ClientData)xc, NULL); Tcl_CreateCommand (tcl, - "matchFrames", matchFrames, (ClientData)xc, NULL); + "matchFrames", (Tcl_CmdProc *) matchFrames, (ClientData)xc, NULL); Tcl_CreateCommand (tcl, - "registerFrames", registerFrames, (ClientData)xc, NULL); + "registerFrames", (Tcl_CmdProc *) registerFrames, (ClientData)xc, NULL); Tcl_CreateCommand (tcl, - "offsetRegister", registerFrames, (ClientData)xc, NULL); + "offsetRegister", (Tcl_CmdProc *) registerFrames, (ClientData)xc, NULL); Tcl_CreateCommand (tcl, - "clearFrame", clearFrame, (ClientData)xc, NULL); + "clearFrame", (Tcl_CmdProc *) clearFrame, (ClientData)xc, NULL); Tcl_CreateCommand (tcl, - "setOption", setOption, (ClientData)xc, NULL); + "setOption", (Tcl_CmdProc *) setOption, (ClientData)xc, NULL); Tcl_CreateCommand (tcl, - "setColormap", setColormap, (ClientData)xc, NULL); + "setColormap", (Tcl_CmdProc *) setColormap, (ClientData)xc, NULL); Tcl_CreateCommand (tcl, - "setOffset", setOffset, (ClientData)xc, NULL); + "setOffset", (Tcl_CmdProc *) setOffset, (ClientData)xc, NULL); Tcl_CreateCommand (tcl, - "windowColormap", windowColormap, (ClientData)xc, NULL); + "windowColormap", (Tcl_CmdProc *) windowColormap, (ClientData)xc, NULL); Tcl_CreateCommand (tcl, - "updateColormap", updateColormap, (ClientData)xc, NULL); + "updateColormap", (Tcl_CmdProc *) updateColormap, (ClientData)xc, NULL); Tcl_CreateCommand (tcl, - "zoom", zoom, (ClientData)xc, NULL); + "zoom", (Tcl_CmdProc *) zoom, (ClientData)xc, NULL); Tcl_CreateCommand (tcl, - "zoomAbs", zoom, (ClientData)xc, NULL); + "zoomAbs", (Tcl_CmdProc *) zoom, (ClientData)xc, NULL); Tcl_CreateCommand (tcl, - "centroid", centroid, (ClientData)xc, NULL); + "centroid", (Tcl_CmdProc *) centroid, (ClientData)xc, NULL); Tcl_CreateCommand (tcl, - "getPixels", getPixels, (ClientData)xc, NULL); + "getPixels", (Tcl_CmdProc *) getPixels, (ClientData)xc, NULL); Tcl_CreateCommand (tcl, - "pan", pan, (ClientData)xc, NULL); + "pan", (Tcl_CmdProc *) pan, (ClientData)xc, NULL); Tcl_CreateCommand (tcl, - "flip", flip, (ClientData)xc, NULL); + "flip", (Tcl_CmdProc *) flip, (ClientData)xc, NULL); Tcl_CreateCommand (tcl, - "retCursorVal", retCursorVal, (ClientData)xc, NULL); + "retCursorVal", (Tcl_CmdProc *) retCursorVal, (ClientData)xc, NULL); Tcl_CreateCommand (tcl, - "encodewcs", encodewcs, (ClientData)xc, NULL); + "encodewcs", (Tcl_CmdProc *) encodewcs, (ClientData)xc, NULL); Tcl_CreateCommand (tcl, - "setPrintOption", setPrintOption, (ClientData)xc, NULL); + "setPrintOption", (Tcl_CmdProc *) setPrintOption, (ClientData)xc, NULL); Tcl_CreateCommand (tcl, - "print", print, (ClientData)xc, NULL); + "print", (Tcl_CmdProc *) print, (ClientData)xc, NULL); Tcl_CreateCommand (tcl, - "setSaveOption", setSaveOption, (ClientData)xc, NULL); + "setSaveOption", (Tcl_CmdProc *) setSaveOption, (ClientData)xc, NULL); Tcl_CreateCommand (tcl, - "save", save, (ClientData)xc, NULL); + "save", (Tcl_CmdProc *) save, (ClientData)xc, NULL); Tcl_CreateCommand (tcl, - "setLoadOption", setLoadOption, (ClientData)xc, NULL); + "setLoadOption", (Tcl_CmdProc *) setLoadOption, (ClientData)xc, NULL); Tcl_CreateCommand (tcl, - "load", load, (ClientData)xc, NULL); + "load", (Tcl_CmdProc *) load, (ClientData)xc, NULL); Tcl_CreateCommand (tcl, - "help", help, (ClientData)xc, NULL); + "help", (Tcl_CmdProc *) help, (ClientData)xc, NULL); Tcl_CreateCommand (tcl, "info", info, (ClientData)xc, NULL); Tcl_CreateCommand (tcl, @@ -190,11 +190,11 @@ XimDataPtr xim; /* ISM module callbacks. */ Tcl_CreateCommand (tcl, - "ism_start", ism_start, (ClientData)xc, NULL); + "ism_start", (Tcl_CmdProc *) ism_start, (ClientData)xc, NULL); Tcl_CreateCommand (tcl, - "ism_stop", ism_stop, (ClientData)xc, NULL); + "ism_stop", (Tcl_CmdProc *) ism_stop, (ClientData)xc, NULL); Tcl_CreateCommand (tcl, - "ism_cmd", ism_cmd, (ClientData)xc, NULL); + "ism_cmd", (Tcl_CmdProc *) ism_cmd, (ClientData)xc, NULL); Tcl_Preserve(tcl); } From fef95d73655e97fa71a77b36a9b492ac1afbb2dc Mon Sep 17 00:00:00 2001 From: Ole Streicher Date: Wed, 17 Jul 2024 21:25:31 +0200 Subject: [PATCH 04/21] Force function type for arg2 of XtAddCallback --- obm/ObmW/Group.c | 4 ++-- obm/server.c | 10 +++++----- obm/widget.c | 38 +++++++++++++++++++------------------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/obm/ObmW/Group.c b/obm/ObmW/Group.c index ce8426c..189796d 100644 --- a/obm/ObmW/Group.c +++ b/obm/ObmW/Group.c @@ -365,8 +365,8 @@ WidgetClass class; xfwfRowColClassRec.composite_class.insert_child(child); if (((XfwfGroupWidget)self)->xfwfGroup.selectionStyle != XfwfNoSelection && XtIsSubclass(child, xfwfToggleWidgetClass)) { - XtAddCallback(child, XtNonCallback, on_cb, (XtPointer) ((XfwfGroupWidget)self)->xfwfGroup.toggle_ord); - XtAddCallback(child, XtNoffCallback, off_cb, (XtPointer) ((XfwfGroupWidget)self)->xfwfGroup.toggle_ord); + XtAddCallback(child, XtNonCallback, (XtCallbackProc) on_cb, (XtPointer) ((XfwfGroupWidget)self)->xfwfGroup.toggle_ord); + XtAddCallback(child, XtNoffCallback, (XtCallbackProc) off_cb, (XtPointer) ((XfwfGroupWidget)self)->xfwfGroup.toggle_ord); switch (((XfwfGroupWidget)self)->xfwfGroup.selectionStyle) { case XfwfOneSelection: case XfwfSingleSelection: diff --git a/obm/server.c b/obm/server.c index cfad2dd..122c26c 100644 --- a/obm/server.c +++ b/obm/server.c @@ -2281,8 +2281,8 @@ createMenu ( mp->menuShell = menu = widgetGetPointer (mp->obj); mp->obm = (XtPointer) obm; - XtAddCallback (menu, XtNpopupCallback, menu_popup, (XtPointer)mp); - XtAddCallback (menu, XtNpopdownCallback, menu_popdown, (XtPointer)mp); + XtAddCallback (menu, XtNpopupCallback, (XtCallbackProc) menu_popup, (XtPointer)mp); + XtAddCallback (menu, XtNpopdownCallback, (XtCallbackProc) menu_popdown, (XtPointer)mp); ip = &mp->items[0]; itemno = menuno = lineno = spaceno = 1; @@ -2297,7 +2297,7 @@ createMenu ( sprintf (name, "item%d", itemno++); obmNewObject (obm, name, "SmeBSB", menu_name, NULL, 0); entry = XtNameToWidget (menu, name); - XtAddCallback (entry, XtNcallback, menuSelect, (XtPointer)mp); + XtAddCallback (entry, XtNcallback, (XtCallbackProc) menuSelect, (XtPointer)mp); break; case MI_LINE: @@ -2321,10 +2321,10 @@ createMenu ( sprintf (name, "menu%d", menuno++); obmNewObject (obm, name, "SmeBSB", menu_name, NULL, 0); entry = XtNameToWidget (menu, name); - XtAddCallback (entry, XtNcallback, menuSelect, (XtPointer)mp); + XtAddCallback (entry, XtNcallback, (XtCallbackProc) menuSelect, (XtPointer)mp); menu_addEntry (entry, menu_name, ip->data, obm); - XtAddCallback (entry, XtNdestroyCallback, menu_delEntry, + XtAddCallback (entry, XtNdestroyCallback, (XtCallbackProc) menu_delEntry, (XtPointer)NULL); break; diff --git a/obm/widget.c b/obm/widget.c index cbd5747..7969f9b 100644 --- a/obm/widget.c +++ b/obm/widget.c @@ -563,54 +563,54 @@ WidgetCreate ( obmClass (classrec, WtToggle) || obmClass (classrec, WtArrow)) { - XtAddCallback (w, XtNcallback, widgetCallback, obj); + XtAddCallback (w, XtNcallback, (XtCallbackProc) widgetCallback, obj); } else if (obmClass (classrec, WtListTree)) { - XtAddCallback (w, XtNhighlightCallback, widgetLTHCallback, obj); - XtAddCallback (w, XtNactivateCallback, widgetLTACallback, obj); + XtAddCallback (w, XtNhighlightCallback, (XtCallbackProc) widgetLTHCallback, obj); + XtAddCallback (w, XtNactivateCallback, (XtCallbackProc) widgetLTACallback, obj); } else if (obmClass (classrec, WtRepeater)) { - XtAddCallback (w, XtNcallback, widgetCallback, obj); - XtAddCallback (w, XtNstartCallback, widgetSBCallback, obj); - XtAddCallback (w, XtNstopCallback, widgetSECallback, obj); + XtAddCallback (w, XtNcallback, (XtCallbackProc) widgetCallback, obj); + XtAddCallback (w, XtNstartCallback, (XtCallbackProc) widgetSBCallback, obj); + XtAddCallback (w, XtNstopCallback, (XtCallbackProc) widgetSECallback, obj); } else if (obmClass (classrec, WtStripChart)) { - XtAddCallback (w, XtNgetValue, widgetSCCallback, obj); + XtAddCallback (w, XtNgetValue, (XtCallbackProc) widgetSCCallback, obj); } else if (obmClass (classrec, WtScrollbar)) { - XtAddCallback (w, XtNjumpProc, widgetJPCallback, obj); - XtAddCallback (w, XtNscrollProc, widgetSPCallback, obj); + XtAddCallback (w, XtNjumpProc, (XtCallbackProc) widgetJPCallback, obj); + XtAddCallback (w, XtNscrollProc, (XtCallbackProc) widgetSPCallback, obj); } else if (obmClass (classrec, WtShell) || obmClass (classrec, WtSimpleMenu)) { - XtAddCallback (w, XtNpopupCallback, widgetPUCallback, obj); - XtAddCallback (w, XtNpopdownCallback, widgetPDCallback, obj); + XtAddCallback (w, XtNpopupCallback, (XtCallbackProc) widgetPUCallback, obj); + XtAddCallback (w, XtNpopdownCallback, (XtCallbackProc) widgetPDCallback, obj); } else if (obmClass (classrec, WtPanner) || obmClass (classrec, WtPorthole) || obmClass (classrec, WtViewport)) { - XtAddCallback (w, XtNreportCallback, widgetRPCallback, obj); + XtAddCallback (w, XtNreportCallback, (XtCallbackProc) widgetRPCallback, obj); } else if (obmClass (classrec, WtTextButton) || obmClass (classrec, WtIcon)) { - XtAddCallback (w, XtNactivate, widgetCallback, obj); + XtAddCallback (w, XtNactivate, (XtCallbackProc) widgetCallback, obj); } else if (obmClass (classrec, WtGroup) || obmClass (classrec, WtRadioGroup)) { - XtAddCallback (w, XtNactivate, widgetRGCallback, obj); + XtAddCallback (w, XtNactivate, (XtCallbackProc) widgetRGCallback, obj); } else if (obmClass (classrec, WtTextToggle)) { - XtAddCallback (w, XtNonCallback, widgetCallback, obj); - XtAddCallback (w, XtNoffCallback, widgetCallback, obj); + XtAddCallback (w, XtNonCallback, (XtCallbackProc) widgetCallback, obj); + XtAddCallback (w, XtNoffCallback, (XtCallbackProc) widgetCallback, obj); } else if (obmClass (classrec, WtSlider2d) || obmClass (classrec, WtScrollbar2)) { XtVaGetValues (w, "scrollResponse", &obj->widget.response_cb, NULL); - XtAddCallback (w, XtNscrollCallback, widgetJPCallback, obj); - XtAddCallback (w, XtNscrollCallback, widgetSPCallback, obj); + XtAddCallback (w, XtNscrollCallback, (XtCallbackProc) widgetJPCallback, obj); + XtAddCallback (w, XtNscrollCallback, (XtCallbackProc) widgetSPCallback, obj); } obj->widget.w = w; @@ -861,7 +861,7 @@ widgetAddCallback (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) XtOverrideTranslations (wp->w, translations); } else { XtAddCallback (XawTextGetSource(wp->w), XtNcallback, - widgetCallback, obj); + (XtCallbackProc) widgetCallback, obj); } /* Create callback record. */ From f7612c93598606dd5424b3e000fb1dad8c268b59 Mon Sep 17 00:00:00 2001 From: Ole Streicher Date: Sat, 20 Jul 2024 21:03:32 +0200 Subject: [PATCH 05/21] Replace strncat with const arg with strcat --- obm/widget.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/obm/widget.c b/obm/widget.c index 7969f9b..a200b15 100644 --- a/obm/widget.c +++ b/obm/widget.c @@ -1127,7 +1127,7 @@ widgetLTHCallback (Widget w, WidgetObject obj, caddr_t call_data) sprintf (message, "{%s %d} ", list->items[0]->text, list->items[0]->open); - strncat (message, "{ ", 2); + strcat (message, "{ "); for (i=0; i < list->count; i++) { item = list->items[i]; sprintf (buf, "{ %s } ", item->text); @@ -1138,7 +1138,7 @@ widgetLTHCallback (Widget w, WidgetObject obj, caddr_t call_data) strcat (message, buf); } } - strncat (message, "}", 1); + strcat (message, "}"); call_callbacks (obj, Ctcallback, message); } @@ -1162,7 +1162,7 @@ widgetLTACallback (Widget w, WidgetObject obj, caddr_t call_data) */ sprintf (message, "{%s %d} ", ret->item->text, ret->item->open); - strncat (message, "{ ", 2); + strcat (message, "{ "); item = ret->item; sprintf (buf, "{ %s } ", item->text); strcat (message, buf); @@ -1171,7 +1171,7 @@ widgetLTACallback (Widget w, WidgetObject obj, caddr_t call_data) sprintf (buf, "{ %s } ", item->text); strcat (message, buf); } - strncat (message, "}", 1); + strcat (message, "}"); call_callbacks (obj, Ctcallback, message); } @@ -2969,7 +2969,7 @@ widgetListTreeSelect (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) */ sprintf (message, "{%s %d} ", item->text, item->open); - strncat (message, "{ ", 2); + strcat (message, "{ "); sprintf (buf, "{ %s } ", item->text); strcat (message, buf); while (item->parent) { @@ -2978,7 +2978,7 @@ widgetListTreeSelect (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) strcat (message, buf); } - strncat (message, "}", 1); + strcat (message, "}"); } @@ -3053,7 +3053,7 @@ widgetListTreeHighlight (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) */ sprintf (message, "{%s %d} ", item->text, item->open); - strncat (message, "{ ", 2); + strcat (message, "{ "); sprintf (buf, "{ %s } ", item->text); strcat (message, buf); while (item->parent) { @@ -3061,7 +3061,7 @@ widgetListTreeHighlight (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) sprintf (buf, "{ %s } ", item->text); strcat (message, buf); } - strncat (message, "}", 1); + strcat (message, "}"); /* Call all the callbacks with the message. */ call_callbacks (obj, Ctcallback, message); From 52854e2026c554ba1e623362fa290e5346beb3eb Mon Sep 17 00:00:00 2001 From: Ole Streicher Date: Mon, 22 Jul 2024 23:22:01 +0200 Subject: [PATCH 06/21] Add required 'const' modifiers and casts --- obm/Obm.c | 15 +++++---- obm/Obm.h | 4 +-- obm/ObmP.h | 5 +-- obm/ObmW/HTMLwidgets.c | 2 +- obm/client.c | 25 ++++++++------- obm/gterm.c | 15 +++++---- obm/html.c | 6 ++-- obm/marker.c | 38 ++++++++++++---------- obm/param.c | 17 ++++++---- obm/server.c | 73 +++++++++++++++++++++--------------------- obm/widget.c | 24 +++++++------- obm/widget.h | 5 +-- 12 files changed, 122 insertions(+), 107 deletions(-) diff --git a/obm/Obm.c b/obm/Obm.c index 13510ac..bc88832 100644 --- a/obm/Obm.c +++ b/obm/Obm.c @@ -439,7 +439,7 @@ ObmGetInterp (ObmContext obm) /* ObmDeliverMsg -- Deliver a message to a UI object. */ int -ObmDeliverMsg (ObmContext obm, char *object, char *message) +ObmDeliverMsg (ObmContext obm, const char *object, const char *message) { ObmEvaluateFunc evaluate; ObmObject obj; @@ -555,10 +555,11 @@ ObmRemoveCallback (ObmContext obm, ObmCallback callback) * may be given to specify which object to use. */ ObmObject -obmFindObject (ObmContext obm, char *object) +obmFindObject (ObmContext obm, const char *object) { int hashval, n; - char *ip, *op; + const char *ip; + char *op; ObmObject objlist1[MAXOBJ], objlist2[MAXOBJ]; ObmObject obj, *otemp, *objs, *pobjs; char name[SZ_NAME]; @@ -660,13 +661,13 @@ obm_nameToObjectList ( void obmNewObject ( ObmContext obm, - char *name, /* name of new object */ - char *class, /* name of class to which object belongs */ - char *parent, /* name of parent widget, for widget objects */ + const char *name, /* name of new object */ + const char *class, /* name of class to which object belongs */ + const char *parent, /* name of parent widget, for widget objects */ ArgList args, /* optional argument list */ int nargs) /* optional argument list */ { - char *ip; + const char *ip; int hashval, n; ObmObject newobj, obj, pobj; ObjClassRec classrec; diff --git a/obm/Obm.h b/obm/Obm.h index 395438c..aecb5ab 100644 --- a/obm/Obm.h +++ b/obm/Obm.h @@ -22,11 +22,11 @@ void ObmDeactivate (ObmContext, Boolean); int ObmActivated (ObmContext); int ObmStatus (ObmContext, char *, char *); XtPointer ObmGetInterp (ObmContext); -int ObmDeliverMsg (ObmContext, char *, char *); +int ObmDeliverMsg (ObmContext, const char *, const char *); int ObmDeliverMsgFromFile (ObmContext, char *, char *); void ObmAddCallback (ObmContext, int, ObmFunc, XtPointer); void ObmRemoveCallback (ObmContext, ObmCallback); -void obmNewObject(ObmContext, char *, char *, char *, ArgList, int); +void obmNewObject(ObmContext, const char *, const char *, const char *, ArgList, int); /* Callback type flags. */ diff --git a/obm/ObmP.h b/obm/ObmP.h index ff5da11..5e08d81 100644 --- a/obm/ObmP.h +++ b/obm/ObmP.h @@ -128,8 +128,9 @@ typedef struct obmContext *ObmContext; typedef struct objClassRec *ObjClassRec; typedef int (*ObmFunc)(); -typedef int (*ObmEvaluateFunc)(ObmObject, char *); -typedef ObmObject (*ObmCreateFunc)(ObmContext, char *, ObjClassRec, char *, ArgList, int); +typedef int (*ObmEvaluateFunc)(ObmObject, const char *); +typedef ObmObject (*ObmCreateFunc)(ObmContext, const char *, ObjClassRec, + const char *, ArgList, int); typedef void (*ObmMethod)(ObmContext, ObjClassRec); typedef void (*ObmDestroyFunc)(ObmObject); diff --git a/obm/ObmW/HTMLwidgets.c b/obm/ObmW/HTMLwidgets.c index 931a77b..0927ac9 100644 --- a/obm/ObmW/HTMLwidgets.c +++ b/obm/ObmW/HTMLwidgets.c @@ -3486,7 +3486,7 @@ MakeWidget(hw, text, x, y, id, fptr) XtAddCallback(w, XtNdestroyCallback, CBListDestroy, NULL); - XawListChange(w, string_list, list_cnt, + XawListChange(w, (const char **) string_list, list_cnt, 0, True); if (vlist_cnt > 0) diff --git a/obm/client.c b/obm/client.c index a172a54..e74e9a2 100644 --- a/obm/client.c +++ b/obm/client.c @@ -51,11 +51,12 @@ struct clientObject { typedef struct clientObject *ClientObject; static void ClientDestroy(ObmObject); -static int ClientEvaluate(ObmObject, char *); -static ObmObject ClientCreate(ObmContext, char *, ObjClassRec, char *, ArgList, int); -static int clientGcmd(ObmObject, Tcl_Interp *, int, char **); +static int ClientEvaluate(ObmObject, const char *); +static ObmObject ClientCreate(ObmContext, const char *, ObjClassRec, + const char *, ArgList, int); +static int clientGcmd(ObmObject, Tcl_Interp *, int, const char **); static int clientGkey(ObmObject, Tcl_Interp *, int, char **); -static int clientLiteral(ObmObject, Tcl_Interp *, int, char **); +static int clientLiteral(ObmObject, Tcl_Interp *, int, const char **); static int client_output(ObmContext, char *, int, char *); @@ -76,9 +77,9 @@ ClientClassInit (ObmContext obm, ObjClassRec classrec) static ObmObject ClientCreate ( ObmContext obm, - char *name, + const char *name, ObjClassRec classrec, - char *parent, + const char *parent, ArgList args, int nargs) { @@ -116,18 +117,18 @@ ClientDestroy (ObmObject object) /* ClientEvaluate -- Evaluate a client command or message. */ static int -ClientEvaluate (ObmObject object, char *command) +ClientEvaluate (ObmObject object, const char *command) { ClientObject obj = (ClientObject) object; Tcl_Interp *tcl = obj->client.tcl; int status, argc, i; - char *argv[MAX_ARGS]; - char **argvp; + const char *argv[MAX_ARGS]; + const char **argvp; if (!obmClientCommand (tcl, command)) goto literal; - /* If the command is unrecognized pass it on to the client as a + /* If the command is unrecognized pass it on to the client as a^ * literal to be processed by the client. */ if ((status = Tcl_Eval (tcl, command)) != TCL_OK) { @@ -156,7 +157,7 @@ literal: if (Tcl_SplitList (tcl, command, &argc, &argvp) == TCL_OK) { * Usage: gcmd */ static int -clientGcmd (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) +clientGcmd (ObmObject object, Tcl_Interp *tcl, int argc, const char **argv) { ClientObject obj = (ClientObject) object; ObmContext obm = obj->client.obm; @@ -200,7 +201,7 @@ clientGkey (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) * Usage: literal */ static int -clientLiteral (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) +clientLiteral (ObmObject object, Tcl_Interp *tcl, int argc, const char **argv) { ClientObject obj = (ClientObject) object; ObmContext obm = obj->client.obm; diff --git a/obm/gterm.c b/obm/gterm.c index f7d4446..05c43f2 100644 --- a/obm/gterm.c +++ b/obm/gterm.c @@ -190,7 +190,8 @@ typedef struct { void GtermDestroy(ObmObject); void GtermClassDestroy(ObmContext, ObjClassRec); -ObmObject GtermCreate(ObmContext, char *, ObjClassRec, char *, ArgList, int nargs); +ObmObject GtermCreate(ObmContext, const char *, ObjClassRec, + const char *, ArgList, int nargs); static int gtermActivate(MsgContext, Tcl_Interp *, int, char **); static int gtermActiveMapping(MsgContext, Tcl_Interp *, int, char **); @@ -252,7 +253,7 @@ static int gtermSetCursorPos(MsgContext, Tcl_Interp *, int, char **); static int gtermSetCursorType(MsgContext, Tcl_Interp *, int, char **); static int gtermSetDataLevel(MsgContext, Tcl_Interp *, int, char **); static int gtermSetFillType(MsgContext, Tcl_Interp *, int, char **); -static int gtermSetGterm(MsgContext, Tcl_Interp *, int, char **); +static int gtermSetGterm(MsgContext, Tcl_Interp *, int, const char **); static int gtermSetLineStyle(MsgContext, Tcl_Interp *, int, char **); static int gtermSetLineWidth(MsgContext, Tcl_Interp *, int, char **); static int gtermSetLogRes(MsgContext, Tcl_Interp *, int, char **); @@ -482,9 +483,9 @@ GtermClassDestroy (ObmContext obm, ObjClassRec classrec) ObmObject GtermCreate ( ObmContext obm, - char *name, + const char *name, ObjClassRec classrec, - char *parent, + const char *parent, ArgList args, int nargs) { @@ -575,7 +576,7 @@ GtermDestroy (ObmObject object) * to the client code so that it can talk directly to the gterm widget. */ static int -gtermSetGterm (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) +gtermSetGterm (MsgContext msg, Tcl_Interp *tcl, int argc, const char **argv) { GtermClassData gcd = (GtermClassData) msg; GtermObject obj = (GtermObject) gcd->object[gcd->level]; @@ -3845,7 +3846,7 @@ gtermCreateMarker (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) ObmContext obm = wp->obm; Arg args[MAX_ARGS]; int nargs, i; - char **items; + const char **items; int nitems; char *name; @@ -3861,7 +3862,7 @@ gtermCreateMarker (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) } else if (argc > 3) { /* Attribute list passed as separate arguments. */ nitems = argc - 2; - items = (char **) Tcl_Alloc (nitems * sizeof(char *)); + items = (const char **) Tcl_Alloc (nitems * sizeof(char *)); if (items == NULL) return (TCL_ERROR); for (i=0; i < nitems; i++) diff --git a/obm/html.c b/obm/html.c index 8fa865f..ba0cc3a 100644 --- a/obm/html.c +++ b/obm/html.c @@ -91,7 +91,7 @@ typedef struct { void HTMLDestroy(ObmObject); void HTMLClassDestroy(ObmContext, ObjClassRec); -ObmObject HTMLCreate(ObmContext, char *, ObjClassRec, char *, ArgList, int); +ObmObject HTMLCreate(ObmContext, const char *, ObjClassRec, const char *, ArgList, int); static int htmlSetText(MsgContext, Tcl_Interp *, int, char **); static int htmlGetText(MsgContext, Tcl_Interp *, int, char **); @@ -208,9 +208,9 @@ HTMLClassDestroy (ObmContext obm, ObjClassRec classrec) ObmObject HTMLCreate ( ObmContext obm, - char *name, + const char *name, ObjClassRec classrec, - char *parent, + const char *parent, ArgList a_args, int a_nargs) { diff --git a/obm/marker.c b/obm/marker.c index ca9730e..d115ee9 100644 --- a/obm/marker.c +++ b/obm/marker.c @@ -126,8 +126,9 @@ typedef struct { static void MarkerDestroy(ObmObject); static void MarkerClassDestroy(ObmContext, ObjClassRec); -static ObmObject MarkerCreate(ObmContext, char *, ObjClassRec, char *, ArgList, int); -static int MarkerEvaluate(ObmObject, char *); +static ObmObject MarkerCreate(ObmContext, const char *, ObjClassRec, + const char *, ArgList, int); +static int MarkerEvaluate(ObmObject, const char *); static int markerDestroyCallback(MarkerObject, XtPointer, int, XEvent *, String *, Cardinal); static int markerFocusCallback(MarkerObject, XtPointer, int, XEvent *, String *, Cardinal); @@ -146,8 +147,8 @@ static int markerResize(MsgContext, Tcl_Interp *, int, char **); static int markerRotate(MsgContext, Tcl_Interp *, int, char **); static int markerGetAttribute(MsgContext, Tcl_Interp *, int, char **); static int markerSetAttribute(MsgContext, Tcl_Interp *, int, char **); -static int markerGetAttributes(MsgContext, Tcl_Interp *, int, char **); -static int markerSetAttributes(MsgContext, Tcl_Interp *, int, char **); +static int markerGetAttributes(MsgContext, Tcl_Interp *, int, const char **); +static int markerSetAttributes(MsgContext, Tcl_Interp *, int, const char **); static int markerGetVertices(MsgContext, Tcl_Interp *, int, char **); static int markerSetVertices(MsgContext, Tcl_Interp *, int, char **); static int markerGetRegion(MsgContext, Tcl_Interp *, int, char **); @@ -253,9 +254,9 @@ MarkerClassDestroy (ObmContext obm, ObjClassRec classrec) static ObmObject MarkerCreate ( ObmContext obm, - char *name, + const char *name, ObjClassRec classrec, - char *parent, + const char *parent, ArgList args, int nargs) { @@ -379,7 +380,7 @@ MarkerDestroy (ObmObject object) /* MarkerEvaluate -- Evaluate a marker command or message. */ static int -MarkerEvaluate (ObmObject object, char *command) +MarkerEvaluate (ObmObject object, const char *command) { MarkerObject obj = (MarkerObject) object; MsgContext msg = (MsgContext) obj->core.classrec->class_data; @@ -401,7 +402,8 @@ MarkerEvaluate (ObmObject object, char *command) status = Tcl_Eval (msg->tcl, command); if (status == TCL_ERROR) { if (*Tcl_GetStringResult (msg->tcl)) - Tcl_SetResult (obm->tcl, Tcl_GetStringResult (msg->tcl), TCL_VOLATILE); + Tcl_SetResult (obm->tcl, (char *) Tcl_GetStringResult (msg->tcl), + TCL_VOLATILE); else { /* Supply a default error message if none was returned. */ Tcl_SetResult (obm->tcl, "evaluation error", TCL_VOLATILE); @@ -409,7 +411,8 @@ MarkerEvaluate (ObmObject object, char *command) Tcl_SetErrorLine (obm->tcl, Tcl_GetErrorLine (msg->tcl)); } else if (*Tcl_GetStringResult (msg->tcl)) - Tcl_SetResult (obm->tcl, Tcl_GetStringResult (msg->tcl), TCL_VOLATILE); + Tcl_SetResult (obm->tcl, (char *) Tcl_GetStringResult (msg->tcl), + TCL_VOLATILE); } msg->level--; @@ -1181,14 +1184,15 @@ markerSetAttribute (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) * is to be stored. */ static int -markerGetAttributes (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) +markerGetAttributes (MsgContext msg, Tcl_Interp *tcl, int argc, const char **argv) { MarkerObject obj = (MarkerObject) msg->object[msg->level]; MarkerPrivate mp = &obj->marker; ObmContext obm = mp->obm; - char *name, *variable, value[SZ_COMMAND]; + const char *name, *variable; + char value[SZ_COMMAND]; int i, status = 0; - char **items; + const char **items; int nitems; if (argc < 2) @@ -1201,7 +1205,7 @@ markerGetAttributes (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) } else if (argc > 2) { /* Attribute list passed as separate arguments. */ nitems = argc - 1; - items = (char **) Tcl_Alloc (nitems * sizeof(char *)); + items = (const char **) Tcl_Alloc (nitems * sizeof(char *)); if (items == NULL) return (TCL_ERROR); for (i=0; i < nitems; i++) @@ -1233,15 +1237,15 @@ markerGetAttributes (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) * where "value" is the new value of the associated marker attribute. */ static int -markerSetAttributes (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) +markerSetAttributes (MsgContext msg, Tcl_Interp *tcl, int argc, const char **argv) { MarkerObject obj = (MarkerObject) msg->object[msg->level]; MarkerPrivate mp = &obj->marker; ObmContext obm = mp->obm; - char *name, *value; + const char *name, *value; Arg args[MAX_ARGS]; int status, argno, i; - char **items; + const char **items; int nitems; if (argc < 2) @@ -1254,7 +1258,7 @@ markerSetAttributes (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) } else if (argc > 2) { /* Attribute list passed as separate arguments. */ nitems = argc - 1; - items = (char **) Tcl_Alloc (nitems * sizeof(char *)); + items = (const char **) Tcl_Alloc (nitems * sizeof(char *)); if (items == NULL) return (TCL_ERROR); for (i=0; i < nitems; i++) diff --git a/obm/param.c b/obm/param.c index ced8032..cbb18c2 100644 --- a/obm/param.c +++ b/obm/param.c @@ -77,8 +77,9 @@ struct msgContext { typedef struct msgContext *MsgContext; static void ParameterDestroy(ObmObject); -static int ParameterEvaluate(ObmObject, char *); -static ObmObject ParameterCreate(ObmContext, char *, ObjClassRec, char *, ArgList, int); +static int ParameterEvaluate(ObmObject, const char *); +static ObmObject ParameterCreate(ObmContext, const char *, ObjClassRec, + const char *, ArgList, int); static void ParameterClassDestroy(ObmContext, ObjClassRec); static int parameterSetValue(MsgContext, Tcl_Interp *, int, char **); static int parameterGetValue(MsgContext, Tcl_Interp *, int, char **); @@ -146,9 +147,9 @@ ParameterClassDestroy (ObmContext obm, ObjClassRec classrec) static ObmObject ParameterCreate ( ObmContext obm, - char *name, + const char *name, ObjClassRec classrec, - char *parent, + const char *parent, ArgList args, int nargs) { @@ -184,7 +185,7 @@ ParameterDestroy (ObmObject object) /* ParameterEvaluate -- Evaluate a parameter command or message. */ static int -ParameterEvaluate (ObmObject object, char *command) +ParameterEvaluate (ObmObject object, const char *command) { ParameterObject obj = (ParameterObject) object; MsgContext msg = (MsgContext) obj->core.classrec->class_data; @@ -206,7 +207,8 @@ ParameterEvaluate (ObmObject object, char *command) status = Tcl_Eval (msg->tcl, command); if (status == TCL_ERROR) { if (*Tcl_GetStringResult (msg->tcl)) - Tcl_SetResult (obm->tcl, Tcl_GetStringResult (msg->tcl), TCL_VOLATILE); + Tcl_SetResult (obm->tcl, (char *) Tcl_GetStringResult (msg->tcl), + TCL_VOLATILE); else { /* Supply a default error message if none was returned. */ Tcl_SetResult (obm->tcl, "evaluation error", TCL_VOLATILE); @@ -214,7 +216,8 @@ ParameterEvaluate (ObmObject object, char *command) Tcl_SetErrorLine (obm->tcl, Tcl_GetErrorLine (msg->tcl)); } else if (*Tcl_GetStringResult (msg->tcl)) - Tcl_SetResult (obm->tcl, Tcl_GetStringResult (msg->tcl), TCL_VOLATILE); + Tcl_SetResult (obm->tcl, (char *) Tcl_GetStringResult (msg->tcl), + TCL_VOLATILE); } msg->level--; diff --git a/obm/server.c b/obm/server.c index 122c26c..2c9eec4 100644 --- a/obm/server.c +++ b/obm/server.c @@ -86,17 +86,18 @@ struct serverObject { typedef struct serverObject *ServerObject; -static ObmObject ServerCreate(ObmContext, char *, ObjClassRec, char *, ArgList, int); +static ObmObject ServerCreate(ObmContext, const char *, ObjClassRec, + const char *, ArgList, int); static void ServerDestroy(ObmObject); -static int ServerEvaluate(ObmObject, char *); +static int ServerEvaluate(ObmObject, const char *); static int serverQueryObject(ObmObject, Tcl_Interp *, int, char **); -static int serverCreateMenu(ObmObject, Tcl_Interp *, int, char **); +static int serverCreateMenu(ObmObject, Tcl_Interp *, int, const char **); static int serverDestroyMenu(ObmObject, Tcl_Interp *, int, char **); static int serverAppInitialize(ObmObject, Tcl_Interp *, int, char **); static int serverAppExtend(ObmObject, Tcl_Interp *, int, char **); static int serverCreateObjects(ObmObject, Tcl_Interp *, int, char **); -static int serverSend(ObmObject, Tcl_Interp *, int, char **); -static int serverPrint(ObmObject, Tcl_Interp *, int, char **); +static int serverSend(ObmObject, Tcl_Interp *, int, const char **); +static int serverPrint(ObmObject, Tcl_Interp *, int, const char **); static int serverDestroyObject(ObmObject, Tcl_Interp *, int, char **); static int serverReset(ObmObject, Tcl_Interp *, int, char **); static int serverActivate(ObmObject, Tcl_Interp *, int, char **); @@ -124,11 +125,11 @@ static int editMenu(MenuPtr, MenuPtr); static void menu_popup(Widget, XtPointer, XtPointer); static void menu_popdown(Widget, XtPointer, XtPointer); static void menu_popdown_msgHandler(String, String, String, String, String*, Cardinal*); -static void createMenu(ObmContext, MenuPtr, char *, char *, Widget); +static void createMenu(ObmContext, MenuPtr, const char *, const char *, Widget); static void menuSelect(Widget, XtPointer, XtPointer); static void build_colorlist(Widget, XpmColorSymbol *, Cardinal, Cardinal *); static void menu_classInit(void); -static void menu_addEntry(Widget, char *, char *, ObmContext); +static void menu_addEntry(Widget, const char *, const char *, ObmContext); static void menu_delEntry(Widget); static void menu_highlight(Widget); static void menu_unhighlight(Widget); @@ -165,9 +166,9 @@ ServerClassInit (ObmContext obm, ObjClassRec classrec) static ObmObject ServerCreate ( ObmContext obm, - char *name, + const char *name, ObjClassRec classrec, - char *parent, + const char *parent, ArgList args, int nargs) { @@ -283,12 +284,12 @@ ServerDestroy (ObmObject object) /* ServerEvaluate -- Evaluate a server command or message. */ static int -ServerEvaluate (ObmObject object, char *command) +ServerEvaluate (ObmObject object, const char *command) { ServerObject obj = (ServerObject) object; ObmContext obm = obj->server.obm; static char reset[] = "reset-server"; - char *ip; + const char *ip; /* The command "reset-server" is a special case. This destroys the * current user interface including all objects and widgets. One @@ -787,7 +788,7 @@ serverPostDeactivateCallback (ObmObject object, Tcl_Interp *tcl, int argc, char * Usage: send */ static int -serverSend (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) +serverSend (ObmObject object, Tcl_Interp *tcl, int argc, const char **argv) { ServerObject obj = (ServerObject) object; ObmContext obm = obj->server.obm; @@ -814,7 +815,7 @@ serverSend (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) * Usage: print arg [arg ...] */ static int -serverPrint (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) +serverPrint (ObmObject object, Tcl_Interp *tcl, int argc, const char **argv) { ServerObject obj = (ServerObject) object; ObmContext obm = obj->server.obm; @@ -931,9 +932,9 @@ serverGetResources (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) ObmContext obm = obj->server.obm; XtResource *r; XtResource resources[MAX_RESOURCES]; - char *resource_name, *class_name, *default_value; - char *resource_list, *variable; - char **items, **fields; + const char *resource_name, *class_name, *default_value; + const char *resource_list, *variable; + const char **items, **fields; int nitems, nfields; char buf[SZ_NUMBER]; int item, i; @@ -975,15 +976,15 @@ err: sprintf (buf, "bad item '%d' in resource list", item + 1); default_value = (nfields > 3) ? fields[3] : ""; r = &resources[item]; - r->resource_name = resource_name; - r->resource_class = class_name; + r->resource_name = (char *) resource_name; + r->resource_class = (char *) class_name; r->resource_type = XtRString; r->resource_size = sizeof (char *); r->resource_offset = (unsigned int) &(((Value *)NULL)[item].value); r->default_type = XtRString; r->default_addr = (caddr_t) default_value; - values[item].variable = variable; + values[item].variable = (char *) variable; values[item].item_list = (char *) fields; } @@ -1383,7 +1384,7 @@ serverCreateBitmap (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) * cache. */ Pixmap -findBitmap (ObmContext obm, char *name) +findBitmap (ObmContext obm, const char *name) { return (findPixmap (obm, name)); } @@ -1765,7 +1766,7 @@ build_colorlist (Widget w, XpmColorSymbol *table, Cardinal size, Cardinal *n) /* findPixmap -- Search the pixmap cache for the named pixmap. */ Pixmap -findPixmap (ObmContext obm, char *name) +findPixmap (ObmContext obm, const char *name) { ObjList lp; @@ -1995,16 +1996,16 @@ findCursor (ObmContext obm, char *name) * detailed changes to the widgets used to implement the menu. */ static int -serverCreateMenu (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) +serverCreateMenu (ObmObject object, Tcl_Interp *tcl, int argc, const char **argv) { ServerObject obj = (ServerObject) object; ObmContext obm = (ObmContext) obj->server.obm; MenuPtr mp, o_mp; MenuItem ip; ObjList lp, newobj; - char *menu_name, *menu_label; - char *parent, *item_list; - char **items, **fields; + const char *menu_name, *menu_label; + const char *parent, *item_list; + const char **items, **fields; int nitems, nfields; int field, item; ObmObject pobj; @@ -2065,7 +2066,7 @@ serverCreateMenu (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) const char *cp = fields[field++]; if (Tcl_ExprString (tcl, cp) != TCL_OK) - ip->label = cp; + ip->label = (char *) cp; else { ip->label = XtMalloc (strlen(Tcl_GetStringResult (tcl)) + 1); strcpy (ip->label, Tcl_GetStringResult (tcl)); @@ -2076,7 +2077,7 @@ serverCreateMenu (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) /* Determine menu item type. */ if (strcmp (fields[field], "f.exec") == 0) { ip->type = MI_EXEC; - ip->data = fields[++field]; + ip->data = (char *) fields[++field]; } else if (strcmp (fields[field], "f.line") == 0) { ip->type = MI_LINE; ip->data = NULL; @@ -2085,10 +2086,10 @@ serverCreateMenu (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) ip->data = NULL; } else if (strcmp (fields[field], "f.menu") == 0) { ip->type = MI_MENU; - ip->data = fields[++field]; + ip->data = (char *) fields[++field]; } else if (strcmp (fields[field], "f.space") == 0) { ip->type = MI_SPACE; - ip->data = fields[++field]; + ip->data = (char *) fields[++field]; } else if (strcmp (fields[field], "f.title") == 0) { ip->type = MI_TITLE; ip->data = NULL; @@ -2103,10 +2104,10 @@ serverCreateMenu (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) /* Process any optional menu item attributes. */ for ( ; field < nfields; field++) { if (strcmp (fields[field], "background") == 0) { - ip->background = fields[++field]; + ip->background = (char *) fields[++field]; } else if (strcmp (fields[field], "foreground") == 0) { - ip->foreground = fields[++field]; + ip->foreground = (char *) fields[++field]; } else if (strcmp (fields[field], "bitmap") == 0) { const char *cp = fields[++field]; @@ -2144,7 +2145,7 @@ serverCreateMenu (ObmObject object, Tcl_Interp *tcl, int argc, char **argv) } } else if (strncmp (fields[field], "accelerator", 5) == 0) { - ip->accelerator = fields[++field]; + ip->accelerator = (char *) fields[++field]; } else { fprintf (stderr, "obm: bad menu item parameter `%s'\n", @@ -2253,8 +2254,8 @@ static void createMenu ( ObmContext obm, MenuPtr mp, - char *menu_name, - char *parent, + const char *menu_name, + const char *parent, Widget pw) { MenuItem ip; @@ -2736,8 +2737,8 @@ menu_pullrightBitmap (ObmContext obm, int state) static void menu_addEntry ( Widget w, /* menu entry which calls submenu */ - char *name, /* name of menu containing this widget */ - char *child, /* name of submenu shell widget */ + const char *name, /* name of menu containing this widget */ + const char *child, /* name of submenu shell widget */ ObmContext obm) { MenuEntry mw, new; diff --git a/obm/widget.c b/obm/widget.c index a200b15..50fc829 100644 --- a/obm/widget.c +++ b/obm/widget.c @@ -282,7 +282,7 @@ static int widgetAddCol(MsgContext, Tcl_Interp *, int, char **); static int widgetSetTableSize(MsgContext, Tcl_Interp *, int, char **); #endif static int get_itemno(WidgetObject, char *); -static int buildTreeList(Widget, Tcl_Interp *, ListTreeItem *, char *); +static int buildTreeList(Widget, Tcl_Interp *, ListTreeItem *, const char *); static int widgetGetRowAttr(MsgContext, Tcl_Interp *, int, char **); @@ -507,9 +507,9 @@ WidgetClassDestroy (ObmContext obm, ObjClassRec classrec) ObmObject WidgetCreate ( ObmContext obm, - char *name, + const char *name, ObjClassRec classrec, - char *parent, + const char *parent, ArgList args, int nargs) { @@ -713,7 +713,7 @@ widgetDestroy (ObmObject obj) /* WidgetEvaluate -- Evaluate a widget command or message. */ int -WidgetEvaluate (ObmObject object, char *command) +WidgetEvaluate (ObmObject object, const char *command) { WidgetObject obj = (WidgetObject) object; Tcl_Interp *tcl, *server = obj->widget.obm->tcl; @@ -732,7 +732,8 @@ WidgetEvaluate (ObmObject object, char *command) omsg->object[++omsg->level] = object; if (Tcl_Eval (tcl, command) == TCL_OK) { if (*Tcl_GetStringResult (tcl)) - Tcl_SetResult (server, Tcl_GetStringResult (tcl), TCL_VOLATILE); + Tcl_SetResult (server, (char *) Tcl_GetStringResult (tcl), + TCL_VOLATILE); omsg->level--; return (TCL_OK); @@ -756,7 +757,8 @@ WidgetEvaluate (ObmObject object, char *command) pmsg->object[++pmsg->level] = object; if (Tcl_Eval (tcl, command) == TCL_OK) { if (*Tcl_GetStringResult (tcl)) - Tcl_SetResult (server, Tcl_GetStringResult (tcl), TCL_VOLATILE); + Tcl_SetResult (server, (char *) Tcl_GetStringResult (tcl), + TCL_VOLATILE); pmsg->level--; return (TCL_OK); } else @@ -765,7 +767,7 @@ WidgetEvaluate (ObmObject object, char *command) error: if (*Tcl_GetStringResult (tcl)) - Tcl_SetResult (server, Tcl_GetStringResult (tcl), TCL_VOLATILE); + Tcl_SetResult (server, (char *) Tcl_GetStringResult (tcl), TCL_VOLATILE); else { /* Supply a default error message if none was returned. */ Tcl_SetResult (server, obmClientCommand (tcl, command) ? @@ -2195,7 +2197,7 @@ widgetSetList (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; Boolean resize; - String *items; + const char **items; int nitems; char *list; @@ -2217,10 +2219,10 @@ widgetSetList (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) return (TCL_ERROR); if ((obmClass (obj->core.classrec, WtList))) - XawListChange (wp->w, items, nitems, 0, resize); + XawListChange (wp->w, items, nitems, 0, resize); else if ((obmClass (obj->core.classrec, WtMultiList))) XfwfMultiListSetNewData ((XfwfMultiListWidget)wp->w, - items, nitems, 0, resize, NULL); + (String *) items, nitems, 0, resize, NULL); if (wp->data) Tcl_Free (wp->data); @@ -2843,7 +2845,7 @@ ret: Tcl_Free ((char *) items); * lists. This is used to fill out the ListTree widget values. */ static int -buildTreeList (Widget w, Tcl_Interp *tcl, ListTreeItem *parent, char *item) +buildTreeList (Widget w, Tcl_Interp *tcl, ListTreeItem *parent, const char *item) { const char **fields, **entry; int i, nentries, nfields, field; diff --git a/obm/widget.h b/obm/widget.h index affcb62..dacfeb2 100644 --- a/obm/widget.h +++ b/obm/widget.h @@ -38,10 +38,11 @@ struct msgContext { }; typedef struct msgContext *MsgContext; -extern int WidgetEvaluate(ObmObject, char *); +extern int WidgetEvaluate(ObmObject, const char *); extern void WidgetDestroy(ObmObject); extern void WidgetClassDestroy(ObmContext, ObjClassRec); -extern ObmObject WidgetCreate(ObmContext, char *, ObjClassRec, char *, ArgList, int); +extern ObmObject WidgetCreate(ObmContext, const char *, ObjClassRec, + const char *, ArgList, int); extern WidgetObject widgetToObject(ObmContext, Widget); extern int coordType(char *); extern char *widgetEventState(char *, unsigned int); From 30083e073dd0e4ea9631915ca98ac47c7f11a492 Mon Sep 17 00:00:00 2001 From: Ole Streicher Date: Tue, 23 Jul 2024 20:11:07 +0200 Subject: [PATCH 07/21] Remove prototypes of standard functions from ObmW --- obm/ObmP.h | 2 -- obm/ObmW/Board.c | 1 - obm/ObmW/Gcs.h | 10 ---------- obm/ObmW/HTML.c | 1 - 4 files changed, 14 deletions(-) diff --git a/obm/ObmP.h b/obm/ObmP.h index 5e08d81..7dab5a0 100644 --- a/obm/ObmP.h +++ b/obm/ObmP.h @@ -544,5 +544,3 @@ extern char *get_geometry(); #define Obm_Private #include "Obm.h" #undef Obm_Private - -extern char *getenv(); diff --git a/obm/ObmW/Board.c b/obm/ObmW/Board.c index fc35de9..6139f2c 100644 --- a/obm/ObmW/Board.c +++ b/obm/ObmW/Board.c @@ -150,7 +150,6 @@ Widget Position n; char *t; Boolean minus; - extern double strtod(); *absval = 0; *relval = 0.0; diff --git a/obm/ObmW/Gcs.h b/obm/ObmW/Gcs.h index 93a8982..bc99895 100644 --- a/obm/ObmW/Gcs.h +++ b/obm/ObmW/Gcs.h @@ -92,12 +92,6 @@ extern Pixel AllocGreyPixel(Widget, Pixel fg, Pixel bg, int scale) ; extern Pixel AllocGreyPixelC(Widget, XColor *fg, XColor *bg, int scale) ; extern void Draw3dBox(Widget w, int x, int y, int wid, int hgt, int s, GC topgc, GC botgc) ; - -#if XtSpecificationRelease < 5 -extern GC XtAllocateGC(Widget, int depth, u_long mask, - XGCValues *, u_long dynamic, u_long dontcare) ; -#endif - #else extern GC AllocFgGC() ; @@ -112,10 +106,6 @@ extern Pixel AllocGreyPixel() ; extern Pixel AllocGreyPixelC() ; extern void Draw3dBox() ; -#if XtSpecificationRelease < 5 -extern GC XtAllocateGC() ; -#endif - #endif #endif /* GCS_H */ diff --git a/obm/ObmW/HTML.c b/obm/ObmW/HTML.c index 73d687b..2e8d853 100644 --- a/obm/ObmW/HTML.c +++ b/obm/ObmW/HTML.c @@ -3573,7 +3573,6 @@ Scroll (w, event, params, num_params) if (*num_params > 0) { char *s = params[0]; double fraction; - double atof(); int ch; if (strcmp (s + strlen(s) - 2, "ch") == 0) { From 101966da00415794303aa06ecba6eabd465b7c36 Mon Sep 17 00:00:00 2001 From: Ole Streicher Date: Tue, 23 Jul 2024 21:28:02 +0200 Subject: [PATCH 08/21] Remove unprotoized function declarations from ObmW --- obm/ObmW/Arrow.c | 61 ++------- obm/ObmW/Board.c | 79 +++--------- obm/ObmW/BoardP.h | 6 +- obm/ObmW/Button.c | 12 +- obm/ObmW/Common.c | 199 +++++------------------------ obm/ObmW/Common.h | 2 - obm/ObmW/CommonP.h | 48 ++----- obm/ObmW/ContainerP.h | 4 +- obm/ObmW/Converters.h | 4 - obm/ObmW/Frame.c | 96 +++----------- obm/ObmW/Frame.h | 30 +---- obm/ObmW/Gcs.c | 4 - obm/ObmW/Gcs.h | 18 --- obm/ObmW/Group.c | 73 ++--------- obm/ObmW/HTML-PSformat.c | 72 ++++------- obm/ObmW/HTML.c | 265 ++------------------------------------- obm/ObmW/HTML.h | 21 ---- obm/ObmW/Icon.c | 43 ++----- obm/ObmW/Label.c | 49 ++------ obm/ObmW/LabelP.h | 6 +- obm/ObmW/ListTree.h | 45 +++---- obm/ObmW/MenuBar.c | 31 +---- obm/ObmW/MenuBar.h | 6 +- obm/ObmW/MenuBarP.h | 6 +- obm/ObmW/MultiList.c | 66 ---------- obm/ObmW/MultiList.h | 16 --- obm/ObmW/RadioGrp.c | 49 ++------ obm/ObmW/RowCol.c | 49 ++------ obm/ObmW/RowColP.h | 6 +- obm/ObmW/Scrollbar.c | 67 ++-------- obm/ObmW/Scrollbar.h | 6 +- obm/ObmW/ScrollbarP.h | 6 +- obm/ObmW/SimpleP.h | 4 +- obm/ObmW/Slider2.c | 103 +++------------ obm/ObmW/Slider2.h | 18 +-- obm/ObmW/Slider2P.h | 24 +--- obm/ObmW/TabString.h | 14 --- obm/ObmW/Table.c | 218 -------------------------------- obm/ObmW/Table.h | 190 ++++++++++++++-------------- obm/ObmW/Table3d.c | 109 ---------------- obm/ObmW/Table3d.h | 170 ++++++++++++------------- obm/ObmW/TableUtil.c | 95 -------------- obm/ObmW/TableUtil.h | 84 ++++++------- obm/ObmW/Tabs.c | 59 --------- obm/ObmW/Tabs.h | 17 +-- obm/ObmW/Toggle.c | 55 ++------ obm/ObmW/XrawInit.h | 15 +-- obm/ObmW/color.c | 8 -- obm/ObmW/color.h | 4 +- 49 files changed, 479 insertions(+), 2153 deletions(-) diff --git a/obm/ObmW/Arrow.c b/obm/ObmW/Arrow.c index 1e4edea..a26b279 100644 --- a/obm/ObmW/Arrow.c +++ b/obm/ObmW/Arrow.c @@ -7,16 +7,8 @@ #include #include #include "ArrowP.h" -static void activate_and_start_timer( -#if NeedFunctionPrototypes -Widget,XEvent*,String*,Cardinal* -#endif -); -static void stop_timer( -#if NeedFunctionPrototypes -Widget,XEvent*,String*,Cardinal* -#endif -); +static void activate_and_start_timer(Widget,XEvent*,String*,Cardinal*); +static void stop_timer(Widget,XEvent*,String*,Cardinal*); static XtActionsRec actionsList[] = { {"activate_and_start_timer", activate_and_start_timer}, @@ -27,46 +19,15 @@ static char defaultTranslations[] = "\ : activate_and_start_timer() \n\ : stop_timer() \n\ "; -static void _resolve_inheritance( -#if NeedFunctionPrototypes -WidgetClass -#endif -); -static void initialize( -#if NeedFunctionPrototypes -Widget ,Widget,ArgList ,Cardinal * -#endif -); -static Boolean set_values( -#if NeedFunctionPrototypes -Widget ,Widget ,Widget,ArgList ,Cardinal * -#endif -); -static void expose( -#if NeedFunctionPrototypes -Widget,XEvent *,Region -#endif -); -static void timer_callback( -#if NeedFunctionPrototypes -XtPointer ,XtIntervalId * -#endif -); -static void create_arrowgc( -#if NeedFunctionPrototypes -Widget -#endif -); -static void create_arrowlightgc( -#if NeedFunctionPrototypes -Widget -#endif -); -static void create_arrowdarkgc( -#if NeedFunctionPrototypes -Widget -#endif -); +static void _resolve_inheritance(WidgetClass); +static void initialize(Widget ,Widget,ArgList ,Cardinal *); +static Boolean set_values(Widget ,Widget ,Widget,ArgList ,Cardinal *); +static void expose(Widget,XEvent *,Region ); +static void timer_callback(XtPointer ,XtIntervalId *); +static void create_arrowgc(Widget); +static void create_arrowlightgc(Widget); +static void create_arrowdarkgc(Widget); + /*ARGSUSED*/static void timer_callback(client_data,timer)XtPointer client_data;XtIntervalId * timer; { Widget self = (Widget) client_data; diff --git a/obm/ObmW/Board.c b/obm/ObmW/Board.c index 6139f2c..28394c3 100644 --- a/obm/ObmW/Board.c +++ b/obm/ObmW/Board.c @@ -8,77 +8,26 @@ #include #include #include "BoardP.h" -static void _resolve_inheritance( -#if NeedFunctionPrototypes -WidgetClass -#endif -); -static Boolean set_values( -#if NeedFunctionPrototypes -Widget ,Widget ,Widget,ArgList ,Cardinal * -#endif -); -static void initialize( -#if NeedFunctionPrototypes -Widget ,Widget,ArgList ,Cardinal * -#endif -); -static void set_abs_location( -#if NeedFunctionPrototypes -Widget,unsigned int ,int ,int ,int ,int -#endif -); -static void resize( -#if NeedFunctionPrototypes -Widget -#endif -); -static XtGeometryResult query_geometry( -#if NeedFunctionPrototypes -Widget,XtWidgetGeometry *,XtWidgetGeometry * -#endif -); -static XtGeometryResult geometry_manager( -#if NeedFunctionPrototypes -Widget ,XtWidgetGeometry *,XtWidgetGeometry * -#endif -); -static void change_managed( -#if NeedFunctionPrototypes -Widget -#endif -); +static void _resolve_inheritance(WidgetClass); +static Boolean set_values(Widget ,Widget ,Widget,ArgList ,Cardinal *); +static void initialize(Widget ,Widget,ArgList ,Cardinal *); +static void set_abs_location(Widget,unsigned int ,int ,int ,int ,int ); +static void resize(Widget); +static XtGeometryResult query_geometry(Widget,XtWidgetGeometry *,XtWidgetGeometry *); +static XtGeometryResult geometry_manager(Widget ,XtWidgetGeometry *,XtWidgetGeometry *); +static void change_managed(Widget); #define ceil(r) (-(int )(-(r ))) -static void generate_location( -#if NeedFunctionPrototypes -Widget -#endif -); -static void get_core_geometry( -#if NeedFunctionPrototypes -Widget,Position *,Position *,Dimension *,Dimension * -#endif -); -static void set_location( -#if NeedFunctionPrototypes -Widget,unsigned int -#endif -); +static void generate_location(Widget); +static void get_core_geometry(Widget,Position *,Position *,Dimension *,Dimension *); +static void set_location(Widget,unsigned int ); #define skip_blanks(s) while (isspace (*s ))s ++ -static char * scan( -#if NeedFunctionPrototypes -char *,Position *,float * -#endif -); -static void interpret_location( -#if NeedFunctionPrototypes -Widget -#endif -); +static char * scan(char *,Position *,float *); +static void interpret_location(Widget); + /*ARGSUSED*/static void generate_location(self)Widget self; { char tmp[100]; diff --git a/obm/ObmW/BoardP.h b/obm/ObmW/BoardP.h index 6824bc9..27ffd96 100644 --- a/obm/ObmW/BoardP.h +++ b/obm/ObmW/BoardP.h @@ -5,11 +5,7 @@ #define _XfwfBoardP_H_ #include "FrameP.h" #include "Board.h" -typedef void (*set_abs_location_Proc)( -#if NeedFunctionPrototypes -Widget,unsigned int ,int ,int ,int ,int -#endif -); +typedef void (*set_abs_location_Proc)(Widget,unsigned int ,int ,int ,int ,int ); #define XtInherit_set_abs_location ((set_abs_location_Proc) _XtInherit) typedef struct { /* methods */ diff --git a/obm/ObmW/Button.c b/obm/ObmW/Button.c index 1704a88..2bafbb9 100644 --- a/obm/ObmW/Button.c +++ b/obm/ObmW/Button.c @@ -4,11 +4,7 @@ #include #include #include "ButtonP.h" -static void activate( -#if NeedFunctionPrototypes -Widget,XEvent*,String*,Cardinal* -#endif -); +static void activate(Widget,XEvent*,String*,Cardinal*); static XtActionsRec actionsList[] = { {"activate", activate}, @@ -20,11 +16,7 @@ static char defaultTranslations[] = "\ Button1: set_shadow() \n\ Return: set_shadow(sunken) activate() set_shadow() \n\ "; -static void _resolve_inheritance( -#if NeedFunctionPrototypes -WidgetClass -#endif -); +static void _resolve_inheritance(WidgetClass); static XtResource resources[] = { {XtNactivate,XtCActivate,XtRCallback,sizeof(((XfwfButtonRec*)NULL)->xfwfButton.activate),XtOffsetOf(XfwfButtonRec,xfwfButton.activate),XtRImmediate,(XtPointer)NULL }, diff --git a/obm/ObmW/Common.c b/obm/ObmW/Common.c index 8ac9e10..6ab5335 100644 --- a/obm/ObmW/Common.c +++ b/obm/ObmW/Common.c @@ -12,61 +12,17 @@ #define focus_detail(detail) (detail ==NotifyAncestor ?"NotifyAncestor":detail ==NotifyVirtual ?"NotifyVirtual":detail ==NotifyInferior ?"NotifyInferior":detail ==NotifyNonlinear ?"NotifyNonlinear":detail ==NotifyNonlinearVirtual ?"NotifyNonlinearVirtual":detail ==NotifyPointer ?"NotifyPointer":detail ==NotifyPointerRoot ?"NotifyPointerRoot":detail ==NotifyDetailNone ?"NotifyDetailNone":"???") -static void focusIn( -#if NeedFunctionPrototypes -Widget,XEvent*,String*,Cardinal* -#endif -); -static void focusOut( -#if NeedFunctionPrototypes -Widget,XEvent*,String*,Cardinal* -#endif -); -static void traverseDown( -#if NeedFunctionPrototypes -Widget,XEvent*,String*,Cardinal* -#endif -); -static void traverseUp( -#if NeedFunctionPrototypes -Widget,XEvent*,String*,Cardinal* -#endif -); -static void traverseLeft( -#if NeedFunctionPrototypes -Widget,XEvent*,String*,Cardinal* -#endif -); -static void traverseRight( -#if NeedFunctionPrototypes -Widget,XEvent*,String*,Cardinal* -#endif -); -static void traverseNext( -#if NeedFunctionPrototypes -Widget,XEvent*,String*,Cardinal* -#endif -); -static void traversePrev( -#if NeedFunctionPrototypes -Widget,XEvent*,String*,Cardinal* -#endif -); -static void traverseNextTop( -#if NeedFunctionPrototypes -Widget,XEvent*,String*,Cardinal* -#endif -); -static void traverseHome( -#if NeedFunctionPrototypes -Widget,XEvent*,String*,Cardinal* -#endif -); -static void traverseCurrent( -#if NeedFunctionPrototypes -Widget,XEvent*,String*,Cardinal* -#endif -); +static void focusIn(Widget,XEvent*,String*,Cardinal*); +static void focusOut(Widget,XEvent*,String*,Cardinal*); +static void traverseDown(Widget,XEvent*,String*,Cardinal*); +static void traverseUp(Widget,XEvent*,String*,Cardinal*); +static void traverseLeft(Widget,XEvent*,String*,Cardinal*); +static void traverseRight(Widget,XEvent*,String*,Cardinal*); +static void traverseNext(Widget,XEvent*,String*,Cardinal*); +static void traversePrev(Widget,XEvent*,String*,Cardinal*); +static void traverseNextTop(Widget,XEvent*,String*,Cardinal*); +static void traverseHome(Widget,XEvent*,String*,Cardinal*); +static void traverseCurrent(Widget,XEvent*,String*,Cardinal*); static XtActionsRec actionsList[] = { {"focusIn", focusIn}, @@ -81,81 +37,21 @@ static XtActionsRec actionsList[] = { {"traverseHome", traverseHome}, {"traverseCurrent", traverseCurrent}, }; -static void _resolve_inheritance( -#if NeedFunctionPrototypes -WidgetClass -#endif -); -static void class_initialize( -#if NeedFunctionPrototypes -void -#endif -); -static void initialize( -#if NeedFunctionPrototypes -Widget ,Widget,ArgList ,Cardinal * -#endif -); -static Boolean set_values( -#if NeedFunctionPrototypes -Widget ,Widget ,Widget,ArgList ,Cardinal * -#endif -); -static void compute_inside( -#if NeedFunctionPrototypes -Widget,Position *,Position *,Dimension *,Dimension * -#endif -); -static void expose( -#if NeedFunctionPrototypes -Widget,XEvent *,Region -#endif -); -static void destroy( -#if NeedFunctionPrototypes -Widget -#endif -); -static void highlight_border( -#if NeedFunctionPrototypes -Widget -#endif -); -static void unhighlight_border( -#if NeedFunctionPrototypes -Widget -#endif -); -static Boolean accept_focus( -#if NeedFunctionPrototypes -Widget,Time * -#endif -); -static Boolean would_accept_focus( -#if NeedFunctionPrototypes -Widget -#endif -); -static void traverse( -#if NeedFunctionPrototypes -Widget,TraversalDirection ,Widget ,Time * -#endif -); -static Boolean choose_color( -#if NeedFunctionPrototypes -Widget,double ,Pixel ,Pixel * -#endif -); -static Boolean lighter_color( -#if NeedFunctionPrototypes -Widget,Pixel ,Pixel * -#endif -); -static Boolean darker_color( -#if NeedFunctionPrototypes -Widget,Pixel ,Pixel * -#endif -); +static void _resolve_inheritance(WidgetClass); +static void class_initialize(void); +static void initialize(Widget ,Widget,ArgList ,Cardinal *); +static Boolean set_values(Widget ,Widget ,Widget,ArgList ,Cardinal *); +static void compute_inside(Widget,Position *,Position *,Dimension *,Dimension *); +static void expose(Widget,XEvent *,Region ); +static void destroy(Widget); +static void highlight_border(Widget); +static void unhighlight_border(Widget); +static Boolean accept_focus(Widget,Time *); +static Boolean would_accept_focus(Widget); +static void traverse(Widget,TraversalDirection ,Widget ,Time *); +static Boolean choose_color(Widget,double ,Pixel ,Pixel *); +static Boolean lighter_color(Widget,Pixel ,Pixel *); +static Boolean darker_color(Widget,Pixel ,Pixel *); #define done(type, value) do {\ if (to->addr != NULL) {\ if (to->size < sizeof(type)) {\ @@ -173,16 +69,8 @@ Widget,Pixel ,Pixel * }while (0 ) -static Boolean cvtStringToAlignment( -#if NeedFunctionPrototypes -Display *,XrmValuePtr ,Cardinal *,XrmValuePtr ,XrmValuePtr ,XtPointer * -#endif -); -static Boolean cvtAlignmentToString( -#if NeedFunctionPrototypes -Display *,XrmValuePtr ,Cardinal *,XrmValuePtr ,XrmValuePtr ,XtPointer * -#endif -); +static Boolean cvtStringToAlignment(Display *,XrmValuePtr ,Cardinal *,XrmValuePtr ,XrmValuePtr ,XtPointer *); +static Boolean cvtAlignmentToString(Display *,XrmValuePtr ,Cardinal *,XrmValuePtr ,XrmValuePtr ,XtPointer *); static char extraTranslations[] = "\ : focusIn()\n\ : focusOut()\n\ @@ -196,31 +84,12 @@ static char extraTranslations[] = "\ ShiftTab: traversePrev()\n\ KP_Enter: traverseNextTop()\n\ Home: traverseHome()"; -static void create_bordergc( -#if NeedFunctionPrototypes -Widget -#endif -); -static Boolean traverse_to_direction( -#if NeedFunctionPrototypes -Widget,TraversalDirection ,int ,int ,Widget *,int * -#endif -); -static void traverse_to_next( -#if NeedFunctionPrototypes -Widget,Widget ,Time * -#endif -); -static void traverse_to_prev( -#if NeedFunctionPrototypes -Widget,Widget ,Time * -#endif -); -static void traverse_to_next_top( -#if NeedFunctionPrototypes -Widget,Widget ,Time * -#endif -); +static void create_bordergc(Widget); +static Boolean traverse_to_direction(Widget,TraversalDirection ,int ,int ,Widget *,int *); +static void traverse_to_next(Widget,Widget ,Time *); +static void traverse_to_prev(Widget,Widget ,Time *); +static void traverse_to_next_top(Widget,Widget ,Time *); + /*ARGSUSED*/static Boolean cvtStringToAlignment(display,args,num_args,from,to,converter_data)Display * display;XrmValuePtr args;Cardinal * num_args;XrmValuePtr from;XrmValuePtr to;XtPointer * converter_data; { Alignment a = 0; diff --git a/obm/ObmW/Common.h b/obm/ObmW/Common.h index b1a9a97..1397ddc 100644 --- a/obm/ObmW/Common.h +++ b/obm/ObmW/Common.h @@ -38,9 +38,7 @@ typedef enum { TraverseNext, TraversePrev, TraverseHome, TraverseNextTop } TraversalDirection; void XfwfCallComputeInside( -#if NeedFunctionPrototypes Widget,Position *,Position *,Dimension *,Dimension * -#endif ); #ifndef XtNtraversalOn #define XtNtraversalOn "traversalOn" diff --git a/obm/ObmW/CommonP.h b/obm/ObmW/CommonP.h index e98e231..7a4d06f 100644 --- a/obm/ObmW/CommonP.h +++ b/obm/ObmW/CommonP.h @@ -5,53 +5,21 @@ #define _XfwfCommonP_H_ #include #include "Common.h" -typedef void (*compute_inside_Proc)( -#if NeedFunctionPrototypes -Widget,Position *,Position *,Dimension *,Dimension * -#endif -); +typedef void (*compute_inside_Proc)(Widget,Position *,Position *,Dimension *,Dimension *); #define XtInherit_compute_inside ((compute_inside_Proc) _XtInherit) -typedef void (*highlight_border_Proc)( -#if NeedFunctionPrototypes -Widget -#endif -); +typedef void (*highlight_border_Proc)(Widget); #define XtInherit_highlight_border ((highlight_border_Proc) _XtInherit) -typedef void (*unhighlight_border_Proc)( -#if NeedFunctionPrototypes -Widget -#endif -); +typedef void (*unhighlight_border_Proc)(Widget); #define XtInherit_unhighlight_border ((unhighlight_border_Proc) _XtInherit) -typedef Boolean (*would_accept_focus_Proc)( -#if NeedFunctionPrototypes -Widget -#endif -); +typedef Boolean (*would_accept_focus_Proc)(Widget); #define XtInherit_would_accept_focus ((would_accept_focus_Proc) _XtInherit) -typedef void (*traverse_Proc)( -#if NeedFunctionPrototypes -Widget,TraversalDirection ,Widget ,Time * -#endif -); +typedef void (*traverse_Proc)(Widget,TraversalDirection ,Widget ,Time *); #define XtInherit_traverse ((traverse_Proc) _XtInherit) -typedef Boolean (*choose_color_Proc)( -#if NeedFunctionPrototypes -Widget,double ,Pixel ,Pixel * -#endif -); +typedef Boolean (*choose_color_Proc)(Widget,double ,Pixel ,Pixel *); #define XtInherit_choose_color ((choose_color_Proc) _XtInherit) -typedef Boolean (*lighter_color_Proc)( -#if NeedFunctionPrototypes -Widget,Pixel ,Pixel * -#endif -); +typedef Boolean (*lighter_color_Proc)(Widget,Pixel ,Pixel *); #define XtInherit_lighter_color ((lighter_color_Proc) _XtInherit) -typedef Boolean (*darker_color_Proc)( -#if NeedFunctionPrototypes -Widget,Pixel ,Pixel * -#endif -); +typedef Boolean (*darker_color_Proc)(Widget,Pixel ,Pixel *); #define XtInherit_darker_color ((darker_color_Proc) _XtInherit) typedef struct { /* methods */ diff --git a/obm/ObmW/ContainerP.h b/obm/ObmW/ContainerP.h index 4d6d09d..2ba648d 100644 --- a/obm/ObmW/ContainerP.h +++ b/obm/ObmW/ContainerP.h @@ -65,7 +65,7 @@ typedef struct _ContainerConstraintRec { extern ContainerClassRec containerClassRec; -extern void _XawQueryGeometry Xraw_PROTO((Widget widget, - XtWidgetGeometry *reply_return)); +extern void _XawQueryGeometry (Widget widget, + XtWidgetGeometry *reply_return); #endif /* _CONTEINER_P_H_ */ diff --git a/obm/ObmW/Converters.h b/obm/ObmW/Converters.h index 8bdaffa..dc5d1ea 100644 --- a/obm/ObmW/Converters.h +++ b/obm/ObmW/Converters.h @@ -2,25 +2,21 @@ #define _Converters_h Boolean XfwfCvtLongToString( -#if NeedFunctionPrototypes Display *display, XrmValuePtr args, Cardinal *num_args, XrmValuePtr from, XrmValuePtr to, XtPointer *converter_data -#endif ); Boolean cvtStringToIcon( -#if NeedFunctionPrototypes Display *dpy, XrmValue *args, Cardinal *num_args, XrmValue *from, XrmValue *to, XtPointer *converter_data -#endif ); #ifndef NO_XPM diff --git a/obm/ObmW/Frame.c b/obm/ObmW/Frame.c index 47080b5..341c1cc 100644 --- a/obm/ObmW/Frame.c +++ b/obm/ObmW/Frame.c @@ -9,70 +9,22 @@ #include #include "stip4.bm" #include "FrameP.h" -static void set_shadow( -#if NeedFunctionPrototypes -Widget,XEvent*,String*,Cardinal* -#endif -); +static void set_shadow(Widget,XEvent*,String*,Cardinal*); static XtActionsRec actionsList[] = { {"set_shadow", set_shadow}, }; -static void _resolve_inheritance( -#if NeedFunctionPrototypes -WidgetClass -#endif -); -static void class_initialize( -#if NeedFunctionPrototypes -void -#endif -); -static void initialize( -#if NeedFunctionPrototypes -Widget ,Widget,ArgList ,Cardinal * -#endif -); -static void realize( -#if NeedFunctionPrototypes -Widget,XtValueMask *,XSetWindowAttributes * -#endif -); -static Boolean set_values( -#if NeedFunctionPrototypes -Widget ,Widget ,Widget,ArgList ,Cardinal * -#endif -); -static void expose( -#if NeedFunctionPrototypes -Widget,XEvent *,Region -#endif -); -static void compute_inside( -#if NeedFunctionPrototypes -Widget,Position *,Position *,Dimension *,Dimension * -#endif -); -static XtGeometryResult query_geometry( -#if NeedFunctionPrototypes -Widget,XtWidgetGeometry *,XtWidgetGeometry * -#endif -); -static XtGeometryResult geometry_manager( -#if NeedFunctionPrototypes -Widget ,XtWidgetGeometry *,XtWidgetGeometry * -#endif -); -static void resize( -#if NeedFunctionPrototypes -Widget -#endif -); -static void change_managed( -#if NeedFunctionPrototypes -Widget -#endif -); +static void _resolve_inheritance(WidgetClass); +static void class_initialize(void); +static void initialize(Widget ,Widget,ArgList ,Cardinal *); +static void realize(Widget,XtValueMask *,XSetWindowAttributes *); +static Boolean set_values(Widget ,Widget ,Widget,ArgList ,Cardinal *); +static void expose(Widget,XEvent *,Region ); +static void compute_inside(Widget,Position *,Position *,Dimension *,Dimension *); +static XtGeometryResult query_geometry(Widget,XtWidgetGeometry *,XtWidgetGeometry *); +static XtGeometryResult geometry_manager(Widget ,XtWidgetGeometry *,XtWidgetGeometry *); +static void resize(Widget); +static void change_managed(Widget); #define done(type, value) do {\ if (to->addr != NULL) {\ if (to->size < sizeof(type)) {\ @@ -91,26 +43,12 @@ Widget static char rcsid[] = "$Header: Frame.w,v 1.5 92/11/02 14:07:52 bert Exp $"; -static void create_darkgc( -#if NeedFunctionPrototypes -Widget -#endif -); -static void create_lightgc( -#if NeedFunctionPrototypes -Widget -#endif -); -static void compute_topcolor( -#if NeedFunctionPrototypes -Widget,int ,XrmValue * -#endif -); -static void compute_bottomcolor( -#if NeedFunctionPrototypes -Widget,int ,XrmValue * -#endif +static void create_darkgc(Widget); +static void create_lightgc(Widget); +static void compute_topcolor(Widget,int ,XrmValue *); +static void compute_bottomcolor(Widget,int ,XrmValue * ); + /*ARGSUSED*/static void create_darkgc(self)Widget self; { XtGCMask mask; diff --git a/obm/ObmW/Frame.h b/obm/ObmW/Frame.h index eafe109..3a2353a 100644 --- a/obm/ObmW/Frame.h +++ b/obm/ObmW/Frame.h @@ -11,31 +11,11 @@ typedef enum {XfwfAuto, XfwfColor, XfwfStipple} ShadowScheme; typedef Pixmap Bitmap; -void XfwfDrawFrame( -#if NeedFunctionPrototypes -Widget,int ,int ,int ,int ,FrameType ,int ,GC ,GC -#endif -); -Boolean cvtStringToFrameType( -#if NeedFunctionPrototypes -Display *,XrmValuePtr ,Cardinal *,XrmValuePtr ,XrmValuePtr ,XtPointer * -#endif -); -Boolean cvtFrameTypeToString( -#if NeedFunctionPrototypes -Display *,XrmValuePtr ,Cardinal *,XrmValuePtr ,XrmValuePtr ,XtPointer * -#endif -); -Boolean cvtStringToShadowScheme( -#if NeedFunctionPrototypes -Display *,XrmValuePtr ,Cardinal *,XrmValuePtr ,XrmValuePtr ,XtPointer * -#endif -); -Boolean cvtShadowSchemeToString( -#if NeedFunctionPrototypes -Display *,XrmValuePtr ,Cardinal *,XrmValuePtr ,XrmValuePtr ,XtPointer * -#endif -); +void XfwfDrawFrame(Widget,int ,int ,int ,int ,FrameType ,int ,GC ,GC ); +Boolean cvtStringToFrameType(Display *,XrmValuePtr ,Cardinal *,XrmValuePtr ,XrmValuePtr ,XtPointer *); +Boolean cvtFrameTypeToString(Display *,XrmValuePtr ,Cardinal *,XrmValuePtr ,XrmValuePtr ,XtPointer *); +Boolean cvtStringToShadowScheme(Display *,XrmValuePtr ,Cardinal *,XrmValuePtr ,XrmValuePtr ,XtPointer *); +Boolean cvtShadowSchemeToString(Display *,XrmValuePtr ,Cardinal *,XrmValuePtr ,XrmValuePtr ,XtPointer *); #ifndef XtNcursor #define XtNcursor "cursor" #endif diff --git a/obm/ObmW/Gcs.c b/obm/ObmW/Gcs.c index 0074bf8..fb68600 100644 --- a/obm/ObmW/Gcs.c +++ b/obm/ObmW/Gcs.c @@ -178,11 +178,7 @@ static GC XtAllocateGC(Widget, int, u_long, XGCValues *, u_long, u_long) ; #endif -#if NeedFunctionPrototypes static Pixmap getDitherPixmap(Widget, int contrast) ; -#else -static Pixmap getDitherPixmap() ; -#endif /* return a GC with the specified foreground and optional font */ diff --git a/obm/ObmW/Gcs.h b/obm/ObmW/Gcs.h index bc99895..be487c0 100644 --- a/obm/ObmW/Gcs.h +++ b/obm/ObmW/Gcs.h @@ -77,8 +77,6 @@ * draw a 3-d box. */ -#if NeedFunctionPrototypes - extern GC AllocFgGC( Widget w, Pixel fg, Font font) ; extern GC AllocBackgroundGC( Widget w, Font font) ; extern GC AllocShadeGC( Widget w, Pixel fg, Pixel bg, Font, @@ -92,20 +90,4 @@ extern Pixel AllocGreyPixel(Widget, Pixel fg, Pixel bg, int scale) ; extern Pixel AllocGreyPixelC(Widget, XColor *fg, XColor *bg, int scale) ; extern void Draw3dBox(Widget w, int x, int y, int wid, int hgt, int s, GC topgc, GC botgc) ; -#else - -extern GC AllocFgGC() ; -extern GC AllocBackgroundGC() ; -extern GC AllocShadeGC() ; -extern GC AllocGreyGC() ; -extern GC AllocTopShadowGC() ; -extern GC AllocBotShadowGC() ; -extern GC AllocArmGC() ; -extern Pixel AllocShadowPixel() ; -extern Pixel AllocGreyPixel() ; -extern Pixel AllocGreyPixelC() ; -extern void Draw3dBox() ; - -#endif - #endif /* GCS_H */ diff --git a/obm/ObmW/Group.c b/obm/ObmW/Group.c index 189796d..21ccd5b 100644 --- a/obm/ObmW/Group.c +++ b/obm/ObmW/Group.c @@ -9,56 +9,16 @@ #include #include "Converters.h" #include "GroupP.h" -static void _resolve_inheritance( -#if NeedFunctionPrototypes -WidgetClass -#endif -); -static void class_initialize( -#if NeedFunctionPrototypes -void -#endif -); -static void initialize( -#if NeedFunctionPrototypes -Widget ,Widget,ArgList ,Cardinal * -#endif -); -static Boolean set_values( -#if NeedFunctionPrototypes -Widget ,Widget ,Widget,ArgList ,Cardinal * -#endif -); -static void expose( -#if NeedFunctionPrototypes -Widget,XEvent *,Region -#endif -); -static void insert_child( -#if NeedFunctionPrototypes -Widget -#endif -); -static void make_textgc( -#if NeedFunctionPrototypes -Widget -#endif -); -static void on_cb( -#if NeedFunctionPrototypes -Widget ,XtPointer ,XtPointer -#endif -); -static void off_cb( -#if NeedFunctionPrototypes -Widget ,XtPointer ,XtPointer -#endif -); -static void set_toggles( -#if NeedFunctionPrototypes -Widget -#endif -); +static void _resolve_inheritance(WidgetClass); +static void class_initialize(void); +static void initialize(Widget ,Widget,ArgList ,Cardinal *); +static Boolean set_values(Widget ,Widget ,Widget,ArgList ,Cardinal *); +static void expose(Widget,XEvent *,Region ); +static void insert_child(Widget ); +static void make_textgc(Widget); +static void on_cb(Widget ,XtPointer ,XtPointer ); +static void off_cb(Widget ,XtPointer ,XtPointer ); +static void set_toggles(Widget); #define done(type, value) do {\ if (to->addr != NULL) {\ if (to->size < sizeof(type)) {\ @@ -76,16 +36,9 @@ Widget }while (0 ) -static Boolean cvtStringToSelectionType( -#if NeedFunctionPrototypes -Display *,XrmValuePtr ,Cardinal *,XrmValuePtr ,XrmValuePtr ,XtPointer * -#endif -); -static Boolean cvtSelectionTypeToString( -#if NeedFunctionPrototypes -Display *,XrmValuePtr ,Cardinal *,XrmValuePtr ,XrmValuePtr ,XtPointer * -#endif -); +static Boolean cvtStringToSelectionType(Display *,XrmValuePtr ,Cardinal *,XrmValuePtr ,XrmValuePtr ,XtPointer *); +static Boolean cvtSelectionTypeToString(Display *,XrmValuePtr ,Cardinal *,XrmValuePtr ,XrmValuePtr ,XtPointer *); + /*ARGSUSED*/static void make_textgc(self)Widget self; { XtGCMask mask; diff --git a/obm/ObmW/HTML-PSformat.c b/obm/ObmW/HTML-PSformat.c index b523fd3..677f646 100644 --- a/obm/ObmW/HTML-PSformat.c +++ b/obm/ObmW/HTML-PSformat.c @@ -88,24 +88,6 @@ extern int SwapElements(); #define B_SLASH '\\' #define MAX_ASCII '\177' -#ifdef _NO_PROTO -# define ARG0(v0) () -# define ARG1(t1,v1) (v1) t1 v1; -# define ARG2(t1,v1,t2,v2) (v1,v2) t1 v1;t2 v2; -# define ARG3(t1,v1,t2,v2,t3,v3) (v1,v2,v3) t1 v1;t2 v2;t3 v3; -# define ARG4(t1,v1,t2,v2,t3,v3,t4,v4) (v1,v2,v3,v4) t1 v1;t2 v2;t3 v3;t4 v4; -# define ARG5(t1,v1,t2,v2,t3,v3,t4,v4,t5,v5) (v1,v2,v3,v4,v5) t1 v1;t2 v2;t3 v3;t4 v4; t5 v5; -# define ARG1V(t1,v1,e2) (v1) t1 v1; -#else -# define ARG0(v0) (v0) -# define ARG1(t1,v1) (t1 v1) -# define ARG2(t1,v1,t2,v2) (t1 v1, t2 v2) -# define ARG3(t1,v1,t2,v2,t3,v3) (t1 v1, t2 v2, t3 v3) -# define ARG4(t1,v1,t2,v2,t3,v3,t4,v4) (t1 v1, t2 v2, t3 v3, t4 v4) -# define ARG5(t1,v1,t2,v2,t3,v3,t4,v4,t5,v5) (t1 v1, t2 v2, t3 v3, t4 v4, t5 v5) -# define ARG1V(t1,v1,e2) (t1 v1, e2) -#endif /* _NO_PROTO */ - /* MONO returns total intensity of r,g,b components .33R+ .5G+ .17B */ #define MONO(rd,gn,bl) (((rd)*11 + (gn)*16 + (bl)*5) >> 13) @@ -145,7 +127,7 @@ static XColor fg_color, bg_color; | */ -static float GetDpi ARG1(HTMLWidget, hw) { +static float GetDpi (HTMLWidget hw) { Screen *s = XtScreen(hw); float dpi; @@ -209,7 +191,7 @@ static int PSprintf (char *format, ... ) | */ -static int PShex ARG2(unsigned char,val, int,flush) { +static int PShex (unsigned char val, int flush) { static unsigned char hexline[80]; static char digit[] = "0123456789abcdef"; @@ -241,7 +223,7 @@ static int PShex ARG2(unsigned char,val, int,flush) { | */ -static void PSfont ARG3( HTMLWidget,hw, XFontStruct *,font, int,fontfamily) { +static void PSfont ( HTMLWidget hw, XFontStruct * font, int fontfamily) { PS_fontstyle fn; int style, size; @@ -409,7 +391,7 @@ static void PSfont ARG3( HTMLWidget,hw, XFontStruct *,font, int,fontfamily) { | */ -static void PSshowpage ARG0(void) { +static void PSshowpage (void) { PSprintf("showpage restore\n"); } @@ -424,7 +406,7 @@ static void PSshowpage ARG0(void) { | */ -static void PSnewpage ARG0(void) { +static void PSnewpage (void) { PS_curr_page++; @@ -447,7 +429,7 @@ static void PSnewpage ARG0(void) { | */ -static void PSinit_latin1 ARG0(void) { +static void PSinit_latin1 (void) { static char *txt[] = { @@ -503,7 +485,7 @@ static void PSinit_latin1 ARG0(void) { | */ -static void PSinit ARG0(void) { +static void PSinit (void) { PS_size = PS_len = PS_offset = PS_hexi = PS_page_offset = 0; PS_start_y = 0; PS_string = (char *) malloc(1); @@ -521,7 +503,7 @@ static void PSinit ARG0(void) { | */ -static void PSheader ARG2(char *,title, int,font) { +static void PSheader (char * title, int font) { static char *fontname[] = { /* in order: regular, bold, italic */ @@ -597,7 +579,7 @@ static void PSheader ARG2(char *,title, int,font) { | */ -static void PStrailer ARG0(void) { +static void PStrailer (void) { PSprintf("%%%%Trailer\n"); PSprintf("restore\n"); @@ -614,7 +596,7 @@ static void PStrailer ARG0(void) { | */ -static void PStext ARG2(String,t, int,underline) { +static void PStext (String t, int underline) { String tp, t2; int nspecial=0, nisochar=0; @@ -676,7 +658,7 @@ static void PStext ARG2(String,t, int,underline) { | */ -static void PSbullet ARG2( int, level, int, size) { +static void PSbullet ( int level, int size) { if (size < 6) size = 6; @@ -697,7 +679,7 @@ static void PSbullet ARG2( int, level, int, size) { | */ -static void PShrule ARG1(int, length) { +static void PShrule (int length) { PSprintf("%d HR\n", length); } @@ -712,7 +694,7 @@ static void PShrule ARG1(int, length) { | */ -static void PSmoveto ARG2( int,x, int,y) { +static void PSmoveto ( int x, int y) { if (y > PS_start_y + Pixels_Page) { PS_start_y = y; @@ -732,7 +714,7 @@ static void PSmoveto ARG2( int,x, int,y) { | */ -static void PSmove_offset ARG1( int, offset) { +static void PSmove_offset ( int offset) { if (offset != PS_offset) { PSprintf("0 %d R\n", PS_offset - offset ); @@ -758,9 +740,9 @@ static void PSmove_offset ARG1( int, offset) { | */ -static int PSrle_encode ARG3(unsigned char *, scanline, - unsigned char *,rleline, - int,wide) +static int PSrle_encode (unsigned char * scanline, + unsigned char * rleline, + int wide) { int i, j, blocklen, isrun, rlen; unsigned char block[256], pix; @@ -863,7 +845,7 @@ static int PSrle_encode ARG3(unsigned char *, scanline, | */ -static void PScolor_image ARG0(void) { +static void PScolor_image (void) { static char *txt[] = { @@ -923,12 +905,12 @@ static void PScolor_image ARG0(void) { | */ -static void PScolormap ARG5(int,color, - int,nc, - int *,rmap, - int *,gmap, - int *,bmap) { - +static void PScolormap (int color, + int nc, + int * rmap, + int * gmap, + int * bmap) { + int i; /* define the colormap */ @@ -957,7 +939,7 @@ static void PScolormap ARG5(int,color, | */ -static void PSrle_cmapimage ARG1(int,color) { +static void PSrle_cmapimage (int color) { static char *txt[] = { @@ -1028,7 +1010,7 @@ static void PSrle_cmapimage ARG1(int,color) { | */ -static int PSwrite_bw ARG4(unsigned char *,pic, int,w, int,h, int,flipbw) { +static int PSwrite_bw (unsigned char * pic, int w, int h, int flipbw) { int i, j; int err=0; @@ -1073,7 +1055,7 @@ static int PSwrite_bw ARG4(unsigned char *,pic, int,w, int,h, int,flipbw) { | */ -static void PSimage ARG2( ImageInfo *,img , int, anchor) { +static void PSimage ( ImageInfo *img , int anchor) { int ncolors = img->num_colors; int i, j; diff --git a/obm/ObmW/HTML.c b/obm/ObmW/HTML.c index 2e8d853..899451f 100644 --- a/obm/ObmW/HTML.c +++ b/obm/ObmW/HTML.c @@ -127,27 +127,6 @@ static void SelectionDone(); static void Scroll(); -#ifdef _NO_PROTO - -static void _HTMLInput() ; -#ifndef MOTIF -static void _HTMLpwdInput() ; -#endif -static void Initialize() ; -static void Realize() ; -static void Redisplay() ; -static void Resize() ; -static Boolean SetValues() ; -static XtGeometryResult GeometryManager() ; -static void RecolorInternalHRefs() ; -static Dimension VbarWidth(); -static Dimension HbarHeight(); -static void ViewRedisplay(); -static void ViewClearAndRefresh(); -static void CallLinkCallbacks(); - -#else /* _NO_PROTO */ - static void _HTMLInput(Widget w, XEvent *event, String *params, Cardinal *num_params); #ifndef MOTIF @@ -170,7 +149,6 @@ static void ViewRedisplay(HTMLWidget hw, int x, int y, int width, int height); static void ViewClearAndRefresh(HTMLWidget hw); static void CallLinkCallbacks(HTMLWidget hw); -#endif /* _NO_PROTO */ /* @@ -1094,13 +1072,7 @@ JumpMove(w, client_data, call_data) * Size them later. */ static void -#ifdef _NO_PROTO -CreateScrollbars (hw) - HTMLWidget hw ; -#else -CreateScrollbars( - HTMLWidget hw) -#endif +CreateScrollbars(HTMLWidget hw) { Arg arg[20]; Cardinal argcnt; @@ -1219,13 +1191,7 @@ CreateScrollbars( * Return the width of the vertical scrollbar */ static Dimension -#ifdef _NO_PROTO -VbarWidth (hw) - HTMLWidget hw ; -#else -VbarWidth( - HTMLWidget hw) -#endif +VbarWidth(HTMLWidget hw) { Arg arg[4]; Cardinal argcnt; @@ -1247,13 +1213,7 @@ VbarWidth( * Return the height of the horizontal scrollbar */ static Dimension -#ifdef _NO_PROTO -HbarHeight (hw) - HTMLWidget hw ; -#else -HbarHeight( - HTMLWidget hw) -#endif +HbarHeight(HTMLWidget hw) { Arg arg[4]; Cardinal argcnt; @@ -1276,13 +1236,7 @@ HbarHeight( * area based on scrollbar locations. */ static void -#ifdef _NO_PROTO -ConfigScrollBars (hw) - HTMLWidget hw ; -#else -ConfigScrollBars( - HTMLWidget hw) -#endif +ConfigScrollBars(HTMLWidget hw) { #ifdef MOTIF Arg arg[20]; @@ -1558,13 +1512,7 @@ fprintf (stderr, "real slider size %d\n", ss); * window size. */ static void -#ifdef _NO_PROTO -ReformatWindow (hw) - HTMLWidget hw ; -#else -ReformatWindow( - HTMLWidget hw) -#endif +ReformatWindow(HTMLWidget hw) { int temp; int new_width; @@ -1729,17 +1677,10 @@ fprintf (stderr, "calling in ReformatWindow\n"); * however they want, we don't care. */ static XtGeometryResult -#ifdef _NO_PROTO -GeometryManager (w, request, reply) - Widget w; - XtWidgetGeometry * request; - XtWidgetGeometry * reply; -#else GeometryManager ( Widget w, XtWidgetGeometry * request, XtWidgetGeometry * reply) -#endif { reply->x = request->x; reply->y = request->y; @@ -1756,15 +1697,9 @@ GeometryManager ( * Check to see that all the starting resources are valid. */ static void -#ifdef _NO_PROTO -Initialize (request, new) - HTMLWidget request ; - HTMLWidget new ; -#else Initialize( HTMLWidget request, HTMLWidget new) -#endif { /* * Make sure height and width are not zero. @@ -1882,17 +1817,10 @@ Initialize( * and processes the queued input from the display server.) */ static void -#ifdef _NO_PROTO -Realize (hw, valueMask, attributes) - HTMLWidget hw ; - Mask *valueMask ; - XSetWindowAttributes *attributes ; -#else Realize ( HTMLWidget hw , Mask *valueMask , XSetWindowAttributes *attributes ) -#endif { unsigned long valuemask; XGCValues values; @@ -1938,19 +1866,12 @@ fprintf(stderr, "Redrawing (%d,%d) %dx%d\n", x, y, width, height); * underlying document area. */ static void -#ifdef _NO_PROTO -ViewRedisplay (hw, x, y, width, height) - HTMLWidget hw; - int x, y; - int width, height; -#else ViewRedisplay( HTMLWidget hw, int x, int y, int width, int height) -#endif { int sx, sy; int doc_x, doc_y; @@ -2036,13 +1957,7 @@ ViewRedisplay( static void -#ifdef _NO_PROTO -ViewClearAndRefresh (hw) - HTMLWidget hw; -#else -ViewClearAndRefresh( - HTMLWidget hw) -#endif +ViewClearAndRefresh(HTMLWidget hw) { /* * Only refresh if we have a window already. @@ -2070,17 +1985,10 @@ ViewClearAndRefresh( * Redisplay routine. */ static void -#ifdef _NO_PROTO -Redisplay (hw, event, region) - HTMLWidget hw; - XEvent * event; - Region region; -#else Redisplay( HTMLWidget hw, XEvent * event, Region region) -#endif { XExposeEvent *ExEvent = (XExposeEvent *)event; int dx, dy; @@ -2135,13 +2043,7 @@ Redisplay( * whole window on any resize. */ static void -#ifdef _NO_PROTO -Resize (hw) - HTMLWidget hw; -#else -Resize( - HTMLWidget hw) -#endif +Resize(HTMLWidget hw) { int tempw; Dimension swidth, sheight; @@ -3615,19 +3517,11 @@ Scroll (w, event, params, num_params) * is pressed */ static void -#ifdef _NO_PROTO -_HTMLInput( w, event, params, num_params) - Widget w ; - XEvent *event ; - String *params; /* unused */ - Cardinal *num_params; /* unused */ -#else _HTMLInput( Widget w, XEvent *event, String *params, /* unused */ Cardinal *num_params) /* unused */ -#endif { HTMLWidget hw = (HTMLWidget)XtParent(w); struct ele_rec *eptr; @@ -3905,19 +3799,11 @@ _HTMLInput( * Process key input passwd widgets */ static void -#ifdef _NO_PROTO -_HTMLpwdInput( w, event, params, num_params) - Widget w ; - XEvent *event ; - String *params; /* unused */ - Cardinal *num_params; /* unused */ -#else _HTMLpwdInput( Widget w, XEvent *event, String *params, /* unused */ Cardinal *num_params) /* unused */ -#endif { char buffer[50]; KeySym ks; @@ -4050,17 +3936,10 @@ _HTMLpwdInput( * widget. */ static Boolean -#ifdef _NO_PROTO -SetValues (current, request, new) - HTMLWidget current ; - HTMLWidget request ; - HTMLWidget new ; -#else SetValues( HTMLWidget current, HTMLWidget request, HTMLWidget new) -#endif { int reformatted; @@ -4239,12 +4118,7 @@ SetValues( * call the LinkCallback. */ static void -#ifdef _NO_PROTO -CallLinkCallbacks(hw) - HTMLWidget hw; -#else CallLinkCallbacks(HTMLWidget hw) -#endif { struct mark_up *mptr; LinkInfo l_info; @@ -4279,13 +4153,7 @@ CallLinkCallbacks(HTMLWidget hw) * the passed HREF. */ static void -#ifdef _NO_PROTO -RecolorInternalHRefs(hw, href) - HTMLWidget hw; - char *href; -#else RecolorInternalHRefs(HTMLWidget hw, char *href) -#endif { struct ele_rec *start; unsigned long fg; @@ -4496,13 +4364,7 @@ SelectionDone(w, selection, target) * pretty = 5: Lucida Bright */ char * -#ifdef _NO_PROTO -HTMLGetText (w, pretty) - Widget w; - int pretty; -#else HTMLGetText(Widget w, int pretty) -#endif { HTMLWidget hw = (HTMLWidget)w; char *text; @@ -4568,13 +4430,7 @@ HTMLGetText(Widget w, int pretty) * beginning, or the end of the document. */ int -#ifdef _NO_PROTO -HTMLPositionToId(w, x, y) - Widget w; - int x, y; -#else HTMLPositionToId(Widget w, int x, int y) -#endif { HTMLWidget hw = (HTMLWidget)w; int i; @@ -4629,14 +4485,7 @@ HTMLPositionToId(Widget w, int x, int y) * If there is no such element, x=0, y=0 and -1 is returned. */ int -#ifdef _NO_PROTO -HTMLIdToPosition(w, element_id, x, y) - Widget w; - int element_id; - int *x, *y; -#else HTMLIdToPosition(Widget w, int element_id, int *x, int *y) -#endif { HTMLWidget hw = (HTMLWidget)w; struct ele_rec *start; @@ -4675,13 +4524,7 @@ HTMLIdToPosition(Widget w, int element_id, int *x, int *y) * A passed in id of 0 means goto the top. */ void -#ifdef _NO_PROTO -HTMLGotoId(w, element_id) - Widget w; - int element_id; -#else HTMLGotoId(Widget w, int element_id) -#endif { HTMLWidget hw = (HTMLWidget)w; struct ele_rec *start; @@ -4764,14 +4607,7 @@ HTMLGotoId(Widget w, int element_id) * If there is no such element, x=0, y=0 and -1 is returned. */ int -#ifdef _NO_PROTO -HTMLAnchorToPosition(w, name, x, y) - Widget w; - char *name; - int *x, *y; -#else HTMLAnchorToPosition(Widget w, char *name, int *x, int *y) -#endif { HTMLWidget hw = (HTMLWidget)w; struct ele_rec *start; @@ -4812,13 +4648,7 @@ HTMLAnchorToPosition(Widget w, char *name, int *x, int *y) * If there is no such element, 0 is returned. */ int -#ifdef _NO_PROTO -HTMLAnchorToId(w, name) - Widget w; - char *name; -#else HTMLAnchorToId(Widget w, char *name) -#endif { HTMLWidget hw = (HTMLWidget)w; struct ele_rec *start; @@ -4858,13 +4688,7 @@ HTMLAnchorToId(Widget w, char *name) * If there are no HREFs NULL returned. */ char ** -#ifdef _NO_PROTO -HTMLGetHRefs(w, num_hrefs) - Widget w; - int *num_hrefs; -#else HTMLGetHRefs(Widget w, int *num_hrefs) -#endif { HTMLWidget hw = (HTMLWidget)w; int cnt; @@ -4951,13 +4775,7 @@ HTMLGetHRefs(Widget w, int *num_hrefs) * If there are no SRCs NULL returned. */ char ** -#ifdef _NO_PROTO -HTMLGetImageSrcs(w, num_srcs) - Widget w; - int *num_srcs; -#else HTMLGetImageSrcs(Widget w, int *num_srcs) -#endif { HTMLWidget hw = (HTMLWidget)w; struct mark_up *mptr; @@ -5018,13 +4836,7 @@ HTMLGetImageSrcs(Widget w, int *num_srcs) * If there are no LINKs NULL returned. */ LinkInfo * -#ifdef _NO_PROTO -HTMLGetLinks(w, num_links) - Widget w; - int *num_links; -#else HTMLGetLinks(Widget w, int *num_links) -#endif { HTMLWidget hw = (HTMLWidget)w; struct mark_up *mptr; @@ -5075,12 +4887,7 @@ HTMLGetLinks(Widget w, int *num_links) void * -#ifdef _NO_PROTO -HTMLGetWidgetInfo(w) - Widget w; -#else HTMLGetWidgetInfo(Widget w) -#endif { HTMLWidget hw = (HTMLWidget)w; @@ -5089,12 +4896,7 @@ HTMLGetWidgetInfo(Widget w) void -#ifdef _NO_PROTO -HTMLFreeImageInfo(w) - Widget w; -#else HTMLFreeImageInfo(Widget w) -#endif { HTMLWidget hw = (HTMLWidget)w; @@ -5104,12 +4906,7 @@ HTMLFreeImageInfo(Widget w) void -#ifdef _NO_PROTO -HTMLFreeWidgetInfo(ptr) - void *ptr; -#else HTMLFreeWidgetInfo(void *ptr) -#endif { WidgetInfo *wptr = (WidgetInfo *)ptr; WidgetInfo *tptr; @@ -5151,14 +4948,7 @@ HTMLFreeWidgetInfo(void *ptr) * function. */ void -#ifdef _NO_PROTO -HTMLRetestAnchors(w, testFunc, client_data) - Widget w; - visitTestProc testFunc; - XtPointer client_data; -#else HTMLRetestAnchors(Widget w, visitTestProc testFunc, XtPointer client_data) -#endif { HTMLWidget hw = (HTMLWidget)w; struct ele_rec *start; @@ -5239,12 +5029,7 @@ HTMLRetestAnchors(Widget w, visitTestProc testFunc, XtPointer client_data) void -#ifdef _NO_PROTO -HTMLClearSelection (w) - Widget w; -#else HTMLClearSelection(Widget w) -#endif { LoseSelection (w, NULL); } @@ -5255,14 +5040,7 @@ HTMLClearSelection(Widget w) * Both refs must be valid. */ void -#ifdef _NO_PROTO -HTMLSetSelection (w, start, end) - Widget w; - ElementRef *start; - ElementRef *end; -#else HTMLSetSelection(Widget w, ElementRef *start, ElementRef *end) -#endif { HTMLWidget hw = (HTMLWidget)w; int found; @@ -5430,15 +5208,7 @@ HTMLSetSelection(Widget w, ElementRef *start, ElementRef *end) * to the user to free. */ char * -#ifdef _NO_PROTO -HTMLGetTextAndSelection (w, startp, endp, insertp) - Widget w; - char **startp; - char **endp; - char **insertp; -#else HTMLGetTextAndSelection(Widget w, char **startp, char **endp, char **insertp) -#endif { HTMLWidget hw = (HTMLWidget)w; int length; @@ -5575,18 +5345,7 @@ HTMLGetTextAndSelection(Widget w, char **startp, char **endp, char **insertp) * to that anchor. */ void -#ifdef _NO_PROTO -HTMLSetText (w, text, header_text, footer_text, element_id, target_anchor, ptr) - Widget w; - char *text; - char *header_text; - char *footer_text; - int element_id; - char *target_anchor; - void *ptr; -#else HTMLSetText(Widget w, char *text, char *header_text, char *footer_text, int element_id, char *target_anchor, void *ptr) -#endif { HTMLWidget hw = (HTMLWidget)w; WidgetInfo *wptr = (WidgetInfo *)ptr; @@ -5787,18 +5546,8 @@ extern char map_table[]; * returns -1 otherwise (and start and end are unchanged). */ int -#ifdef _NO_PROTO -HTMLSearchText (w, pattern, m_start, m_end, backward, caseless) - Widget w; - char *pattern; - ElementRef *m_start; - ElementRef *m_end; - int backward; - int caseless; -#else HTMLSearchText (Widget w, char *pattern, ElementRef *m_start, ElementRef *m_end, int backward, int caseless) -#endif { HTMLWidget hw = (HTMLWidget)w; int found, equal; diff --git a/obm/ObmW/HTML.h b/obm/ObmW/HTML.h index 08fbf10..49c3ef0 100644 --- a/obm/ObmW/HTML.h +++ b/obm/ObmW/HTML.h @@ -83,26 +83,6 @@ typedef struct link_rec { /* * Public functions */ -#ifdef _NO_PROTO -extern char *HTMLGetText (); -extern char *HTMLGetTextAndSelection (); -extern char **HTMLGetHRefs (); -extern char **HTMLGetImageSrcs (); -extern void *HTMLGetWidgetInfo (); -extern void HTMLFreeWidgetInfo (); -extern void HTMLFreeImageInfo (); -extern LinkInfo *HTMLGetLinks (); -extern int HTMLPositionToId (); -extern int HTMLIdToPosition (); -extern int HTMLAnchorToPosition (); -extern int HTMLAnchorToId (); -extern void HTMLGotoId (); -extern void HTMLRetestAnchors (); -extern void HTMLClearSelection (); -extern void HTMLSetSelection (); -extern void HTMLSetText (); -extern int HTMLSearchText (); -#else extern char *HTMLGetText (Widget w, int pretty); extern char *HTMLGetTextAndSelection (Widget w, char **startp, char **endp, char **insertp); @@ -126,7 +106,6 @@ extern void HTMLSetText (Widget w, char *text, char *header_text, char *target_anchor, void *ptr); extern int HTMLSearchText (Widget w, char *pattern, ElementRef *m_start, ElementRef *m_end, int backward, int caseless); -#endif /* _NO_PROTO */ /* diff --git a/obm/ObmW/Icon.c b/obm/ObmW/Icon.c index b469666..e73307a 100644 --- a/obm/ObmW/Icon.c +++ b/obm/ObmW/Icon.c @@ -6,11 +6,7 @@ #include #include #include "IconP.h" -static void activate( -#if NeedFunctionPrototypes -Widget,XEvent*,String*,Cardinal* -#endif -); +static void activate(Widget,XEvent*,String*,Cardinal*); static XtActionsRec actionsList[] = { {"activate", activate}, @@ -20,36 +16,13 @@ static char defaultTranslations[] = "\ ,: activate() \n\ Return: activate() \n\ "; -static void _resolve_inheritance( -#if NeedFunctionPrototypes -WidgetClass -#endif -); -static void initialize( -#if NeedFunctionPrototypes -Widget ,Widget,ArgList ,Cardinal * -#endif -); -static void expose( -#if NeedFunctionPrototypes -Widget,XEvent *,Region -#endif -); -static Boolean set_values( -#if NeedFunctionPrototypes -Widget ,Widget ,Widget,ArgList ,Cardinal * -#endif -); -static void realize( -#if NeedFunctionPrototypes -Widget,XtValueMask *,XSetWindowAttributes * -#endif -); -static void create_image_gc( -#if NeedFunctionPrototypes -Widget -#endif -); +static void _resolve_inheritance(WidgetClass); +static void initialize(Widget ,Widget,ArgList ,Cardinal *); +static void expose(Widget,XEvent *,Region ); +static Boolean set_values(Widget ,Widget ,Widget,ArgList ,Cardinal *); +static void realize(Widget,XtValueMask *,XSetWindowAttributes *); +static void create_image_gc(Widget); + /*ARGSUSED*/static void create_image_gc(self)Widget self; { Dimension wd, ht; diff --git a/obm/ObmW/Label.c b/obm/ObmW/Label.c index 116ee13..ad072a3 100644 --- a/obm/ObmW/Label.c +++ b/obm/ObmW/Label.c @@ -7,46 +7,15 @@ #include #include "TabString.h" #include "LabelP.h" -static void _resolve_inheritance( -#if NeedFunctionPrototypes -WidgetClass -#endif -); -static void set_label( -#if NeedFunctionPrototypes -Widget,String -#endif -); -static Boolean set_values( -#if NeedFunctionPrototypes -Widget ,Widget ,Widget,ArgList ,Cardinal * -#endif -); -static void initialize( -#if NeedFunctionPrototypes -Widget ,Widget,ArgList ,Cardinal * -#endif -); -static void expose( -#if NeedFunctionPrototypes -Widget,XEvent *,Region -#endif -); -static void make_gc( -#if NeedFunctionPrototypes -Widget -#endif -); -static void make_graygc( -#if NeedFunctionPrototypes -Widget -#endif -); -static void count_lines( -#if NeedFunctionPrototypes -Widget -#endif -); +static void _resolve_inheritance(WidgetClass); +static void set_label(Widget,String ); +static Boolean set_values(Widget ,Widget ,Widget,ArgList ,Cardinal *); +static void initialize(Widget ,Widget,ArgList ,Cardinal *); +static void expose(Widget,XEvent *,Region ); +static void make_gc(Widget); +static void make_graygc(Widget); +static void count_lines(Widget); + /*ARGSUSED*/static void make_gc(self)Widget self; { XtGCMask mask; diff --git a/obm/ObmW/LabelP.h b/obm/ObmW/LabelP.h index 962b20e..1b3dea7 100644 --- a/obm/ObmW/LabelP.h +++ b/obm/ObmW/LabelP.h @@ -5,11 +5,7 @@ #define _XfwfLabelP_H_ #include "BoardP.h" #include "Label.h" -typedef void (*set_label_Proc)( -#if NeedFunctionPrototypes -Widget,String -#endif -); +typedef void (*set_label_Proc)(Widget,String ); #define XtInherit_set_label ((set_label_Proc) _XtInherit) typedef struct { /* methods */ diff --git a/obm/ObmW/ListTree.h b/obm/ObmW/ListTree.h index 1071a57..e14b170 100644 --- a/obm/ObmW/ListTree.h +++ b/obm/ObmW/ListTree.h @@ -90,37 +90,30 @@ typedef struct _ListTreeActivateStruct { ** Public function declarations */ #ifndef _ListTree_ -#if __STDC__ || defined(__cplusplus) -#define P_(s) s -#else -#define P_(s) () -#endif /* ListTree.c */ -void ListTreeRefresh P_((Widget w)); -void ListTreeRefreshOff P_((Widget w)); -void ListTreeRefreshOn P_((Widget w)); -ListTreeItem *ListTreeAdd P_((Widget w, ListTreeItem *parent, const char *string)); -void ListTreeRenameItem P_((Widget w, ListTreeItem *item, char *string)); -int ListTreeDelete P_((Widget w, ListTreeItem *item)); -int ListTreeDeleteChildren P_((Widget w, ListTreeItem *item)); -int ListTreeReparent P_((Widget w, ListTreeItem *item, ListTreeItem *newparent)); -int ListTreeReparentChildren P_((Widget w, ListTreeItem *item, ListTreeItem *newparent)); -int ListTreeOrderSiblings P_((Widget w, ListTreeItem *item)); -int ListTreeOrderChildren P_((Widget w, ListTreeItem *item)); -ListTreeItem *ListTreeFindSiblingName P_((Widget w, ListTreeItem *item, char *name)); -ListTreeItem *ListTreeFindChildName P_((Widget w, ListTreeItem *item, char *name)); -void ListTreeHighlightItem P_((Widget w, ListTreeItem *item)); -ListTreeItem *ListTreeFirstItem P_((Widget w)); -void ListTreeOpenAll P_((Widget w, ListTreeItem *start, int child_only)); -void ListTreeCloseAll P_((Widget w, ListTreeItem *start, int child_only)); - +void ListTreeRefresh (Widget w); +void ListTreeRefreshOff (Widget w); +void ListTreeRefreshOn (Widget w); +ListTreeItem *ListTreeAdd (Widget w, ListTreeItem *parent, const char *string); +void ListTreeRenameItem (Widget w, ListTreeItem *item, char *string); +int ListTreeDelete (Widget w, ListTreeItem *item); +int ListTreeDeleteChildren (Widget w, ListTreeItem *item); +int ListTreeReparent (Widget w, ListTreeItem *item, ListTreeItem *newparent); +int ListTreeReparentChildren (Widget w, ListTreeItem *item, ListTreeItem *newparent); +int ListTreeOrderSiblings (Widget w, ListTreeItem *item); +int ListTreeOrderChildren (Widget w, ListTreeItem *item); +ListTreeItem *ListTreeFindSiblingName (Widget w, ListTreeItem *item, char *name); +ListTreeItem *ListTreeFindChildName (Widget w, ListTreeItem *item, char *name); +void ListTreeHighlightItem (Widget w, ListTreeItem *item); +ListTreeItem *ListTreeFirstItem (Widget w); +void ListTreeOpenAll (Widget w, ListTreeItem *start, int child_only); +void ListTreeCloseAll (Widget w, ListTreeItem *start, int child_only); #ifdef USE_RDD -void ListTreeHighlightDrop P_((Widget w, XEvent *event, String *params, Cardinal *num_params)); -ListTreeReturnStruct *ListTreeGetDrop P_((Widget w)); +void ListTreeHighlightDrop (Widget w, XEvent *event, String *params, Cardinal *num_params); +ListTreeReturnStruct *ListTreeGetDrop (Widget w); #endif -#undef P_ #endif #endif /* _ListTree_H */ diff --git a/obm/ObmW/MenuBar.c b/obm/ObmW/MenuBar.c index f13a1d1..0bfe407 100644 --- a/obm/ObmW/MenuBar.c +++ b/obm/ObmW/MenuBar.c @@ -7,11 +7,7 @@ #include #include #include "MenuBarP.h" -static void menu_popdown( -#if NeedFunctionPrototypes -Widget,XEvent*,String*,Cardinal* -#endif -); +static void menu_popdown(Widget,XEvent*,String*,Cardinal*); static XtActionsRec actionsList[] = { {"menu_popdown", menu_popdown}, @@ -20,26 +16,11 @@ static XtActionsRec actionsList[] = { static char defaultTranslations[] = "\ : menu_popdown() \n\ "; -static void _resolve_inheritance( -#if NeedFunctionPrototypes -WidgetClass -#endif -); -static void initialize( -#if NeedFunctionPrototypes -Widget ,Widget,ArgList ,Cardinal * -#endif -); -static void process_menu( -#if NeedFunctionPrototypes -Widget,Widget ,Cursor -#endif -); -static void popdown_cb( -#if NeedFunctionPrototypes -Widget ,XtPointer ,XtPointer -#endif -); +static void _resolve_inheritance(WidgetClass); +static void initialize(Widget ,Widget,ArgList ,Cardinal *); +static void process_menu(Widget,Widget ,Cursor ); +static void popdown_cb(Widget ,XtPointer ,XtPointer ); + /*ARGSUSED*/static void popdown_cb(menu,client_data,call_data)Widget menu;XtPointer client_data;XtPointer call_data; { Widget self = (Widget) client_data; diff --git a/obm/ObmW/MenuBar.h b/obm/ObmW/MenuBar.h index a9c9c84..2a8870d 100644 --- a/obm/ObmW/MenuBar.h +++ b/obm/ObmW/MenuBar.h @@ -4,11 +4,7 @@ #ifndef _XfwfMenuBar_H_ #define _XfwfMenuBar_H_ #include "RowCol.h" -Boolean XfwfCallProcessMenu( -#if NeedFunctionPrototypes -Widget,Widget ,Cursor -#endif -); +Boolean XfwfCallProcessMenu(Widget,Widget ,Cursor ); typedef struct _XfwfMenuBarClassRec *XfwfMenuBarWidgetClass; typedef struct _XfwfMenuBarRec *XfwfMenuBarWidget; externalref WidgetClass xfwfMenuBarWidgetClass; diff --git a/obm/ObmW/MenuBarP.h b/obm/ObmW/MenuBarP.h index 9b74d5e..9001f10 100644 --- a/obm/ObmW/MenuBarP.h +++ b/obm/ObmW/MenuBarP.h @@ -5,11 +5,7 @@ #define _XfwfMenuBarP_H_ #include "RowColP.h" #include "MenuBar.h" -typedef void (*process_menu_Proc)( -#if NeedFunctionPrototypes -Widget,Widget ,Cursor -#endif -); +typedef void (*process_menu_Proc)(Widget,Widget ,Cursor ); #define XtInherit_process_menu ((process_menu_Proc) _XtInherit) typedef struct { /* methods */ diff --git a/obm/ObmW/MultiList.c b/obm/ObmW/MultiList.c index a563927..8c497a6 100644 --- a/obm/ObmW/MultiList.c +++ b/obm/ObmW/MultiList.c @@ -100,39 +100,6 @@ extern void XawInitializeWidgetSet(); *===========================================================================*/ -#if (!NeedFunctionPrototypes) - -static void Initialize(); -static void Redisplay(); -static XtGeometryResult PreferredGeometry(); -static void Resize(); -static Boolean SetValues(); - -static void DestroyOldData(); -static void InitializeNewData(); -static void CreateNewGCs(); - -static void RecalcCoords(); -static void NegotiateSizeChange(); -static Boolean Layout(); - -static void RedrawAll(); -static void RedrawItem(); -static void RedrawRowColumn(); - -static void PixelToRowColumn(); -static void RowColumnToPixels(); -static Boolean RowColumnToItem(); -static Boolean ItemToRowColumn(); - -static void Select(); -static void Unselect(); -static void Toggle(); -static void Extend(); -static void Notify(); - -#else - static void Initialize(Widget request, Widget new); static void Redisplay(XfwfMultiListWidget mlw, XEvent *event, Region rectangle_union); @@ -177,7 +144,6 @@ static void Extend(XfwfMultiListWidget mlw, XEvent *event, String *params, Cardinal *num_params); static void Notify(XfwfMultiListWidget mlw, XEvent *event, String *params, Cardinal *num_params); -#endif /*===========================================================================* @@ -781,16 +747,9 @@ XfwfMultiListWidget mlw; *---------------------------------------------------------------------------*/ -#if NeedFunctionPrototypes static void RecalcCoords(XfwfMultiListWidget mlw, Boolean width_changeable, Boolean height_changeable) -#else -static void -RecalcCoords(mlw,width_changeable,height_changeable) -XfwfMultiListWidget mlw; -Boolean width_changeable,height_changeable; -#endif { String str; Dimension width,height; @@ -826,15 +785,8 @@ Boolean width_changeable,height_changeable; *---------------------------------------------------------------------------*/ -#if NeedFunctionPrototypes static void NegotiateSizeChange(XfwfMultiListWidget mlw, Dimension width, Dimension height) -#else -static void -NegotiateSizeChange(mlw,width,height) -XfwfMultiListWidget mlw; -Dimension width,height; -#endif { int attempt_number; Boolean w_fixed,h_fixed; @@ -897,17 +849,9 @@ Dimension width,height; *---------------------------------------------------------------------------*/ -#if NeedFunctionPrototypes static Boolean Layout(XfwfMultiListWidget mlw, Boolean w_changeable, Boolean h_changeable, Dimension *w_ptr, Dimension *h_ptr) -#else -static Boolean -Layout(mlw,w_changeable,h_changeable,w_ptr,h_ptr) -XfwfMultiListWidget mlw; -Boolean w_changeable,h_changeable; -Dimension *w_ptr,*h_ptr; -#endif { Boolean size_changed = False; @@ -1768,20 +1712,10 @@ Boolean *h_ptr,*s_ptr; *---------------------------------------------------------------------------*/ -#if NeedFunctionPrototypes void XfwfMultiListSetNewData(XfwfMultiListWidget mlw, String *list, int nitems, int longest, Boolean resize, Boolean *sensitivity_array) -#else -void -XfwfMultiListSetNewData(mlw,list,nitems,longest,resize,sensitivity_array) -XfwfMultiListWidget mlw; -String *list; -int nitems,longest; -int resize; -Boolean *sensitivity_array; -#endif { DestroyOldData(mlw); MultiListList(mlw) = list; diff --git a/obm/ObmW/MultiList.h b/obm/ObmW/MultiList.h index 1727a45..9a4cddf 100644 --- a/obm/ObmW/MultiList.h +++ b/obm/ObmW/MultiList.h @@ -241,21 +241,6 @@ typedef struct _XfwfMultiListReturnStruct *---------------------------------------------------------------------------*/ -#if (!NeedFunctionPrototypes) - -extern Boolean XfwfMultiListHighlightItem(); -extern void XfwfMultiListHighlightAll(); -extern void XfwfMultiListUnhighlightItem(); -extern void XfwfMultiListUnhighlightAll(); -extern int XfwfMultiListToggleItem(); -extern XfwfMultiListReturnStruct * - XfwfMultiListGetHighlighted(); -extern Boolean XfwfMultiListIsHighlighted(); -extern Boolean XfwfMultiListGetItemInfo(); -extern void XfwfMultiListSetNewData(); - -#else - extern Boolean XfwfMultiListHighlightItem(XfwfMultiListWidget mlw, int item_index); extern void XfwfMultiListHighlightAll(XfwfMultiListWidget mlw); @@ -276,4 +261,3 @@ extern void XfwfMultiListSetNewData(XfwfMultiListWidget mlw, Boolean resize, Boolean *sensitivity_array); #endif -#endif diff --git a/obm/ObmW/RadioGrp.c b/obm/ObmW/RadioGrp.c index 14d3992..666b601 100644 --- a/obm/ObmW/RadioGrp.c +++ b/obm/ObmW/RadioGrp.c @@ -5,31 +5,11 @@ #include #include "Toggle.h" #include "RadioGrpP.h" -static void _resolve_inheritance( -#if NeedFunctionPrototypes -WidgetClass -#endif -); -static void class_initialize( -#if NeedFunctionPrototypes -void -#endif -); -static void initialize( -#if NeedFunctionPrototypes -Widget ,Widget,ArgList ,Cardinal * -#endif -); -static Boolean set_values( -#if NeedFunctionPrototypes -Widget ,Widget ,Widget,ArgList ,Cardinal * -#endif -); -static void create_toggles( -#if NeedFunctionPrototypes -Widget -#endif -); +static void _resolve_inheritance(WidgetClass); +static void class_initialize(void); +static void initialize(Widget ,Widget,ArgList ,Cardinal *); +static Boolean set_values(Widget ,Widget ,Widget,ArgList ,Cardinal *); +static void create_toggles(Widget); #define done(type, value) do {\ if (to->addr != NULL) {\ if (to->size < sizeof(type)) {\ @@ -47,21 +27,10 @@ Widget }while (0 ) -static Boolean cvtStringToStringArray( -#if NeedFunctionPrototypes -Display *,XrmValuePtr ,Cardinal *,XrmValuePtr ,XrmValuePtr ,XtPointer * -#endif -); -static StringArray newStringArray( -#if NeedFunctionPrototypes -StringArray -#endif -); -static void freeStringArray( -#if NeedFunctionPrototypes -StringArray -#endif -); +static Boolean cvtStringToStringArray(Display *,XrmValuePtr ,Cardinal *,XrmValuePtr ,XrmValuePtr ,XtPointer *); +static StringArray newStringArray(StringArray ); +static void freeStringArray(StringArray ); + /*ARGSUSED*/static void create_toggles(self)Widget self; { Cardinal i; diff --git a/obm/ObmW/RowCol.c b/obm/ObmW/RowCol.c index c37fed4..138e4e7 100644 --- a/obm/ObmW/RowCol.c +++ b/obm/ObmW/RowCol.c @@ -4,47 +4,16 @@ #include #include #include "RowColP.h" -static void _resolve_inheritance( -#if NeedFunctionPrototypes -WidgetClass -#endif -); -static void change_managed( -#if NeedFunctionPrototypes -Widget -#endif -); -static void layout( -#if NeedFunctionPrototypes -Widget,int -#endif -); -static XtGeometryResult geometry_manager( -#if NeedFunctionPrototypes -Widget ,XtWidgetGeometry *,XtWidgetGeometry * -#endif -); -static void resize( -#if NeedFunctionPrototypes -Widget -#endif -); -static void initialize( -#if NeedFunctionPrototypes -Widget ,Widget,ArgList ,Cardinal * -#endif -); -static Boolean set_values( -#if NeedFunctionPrototypes -Widget ,Widget ,Widget,ArgList ,Cardinal * -#endif -); +static void _resolve_inheritance(WidgetClass); +static void change_managed(Widget); +static void layout(Widget,int ); +static XtGeometryResult geometry_manager(Widget ,XtWidgetGeometry *,XtWidgetGeometry *); +static void resize(Widget); +static void initialize(Widget ,Widget,ArgList ,Cardinal *); +static Boolean set_values(Widget ,Widget ,Widget,ArgList ,Cardinal *); static char rcsid[] = "$Header: RowCol.w,v 1.1 92/10/14 18:36:36 bert Exp $"; -static void align_child( -#if NeedFunctionPrototypes -Widget,int ,int ,int ,int ,Alignment -#endif -); +static void align_child(Widget,int ,int ,int ,int ,Alignment ); + /*ARGSUSED*/static void align_child(self,cx,cy,width,height,alignment)Widget self;int cx;int cy;int width;int height;Alignment alignment; { Position x, y; diff --git a/obm/ObmW/RowColP.h b/obm/ObmW/RowColP.h index 2ddd950..90ee654 100644 --- a/obm/ObmW/RowColP.h +++ b/obm/ObmW/RowColP.h @@ -5,11 +5,7 @@ #define _XfwfRowColP_H_ #include "BoardP.h" #include "RowCol.h" -typedef void (*layout_Proc)( -#if NeedFunctionPrototypes -Widget,int -#endif -); +typedef void (*layout_Proc)(Widget,int ); #define XtInherit_layout ((layout_Proc) _XtInherit) typedef struct { /* methods */ diff --git a/obm/ObmW/Scrollbar.c b/obm/ObmW/Scrollbar.c index bec84d3..e6521cf 100644 --- a/obm/ObmW/Scrollbar.c +++ b/obm/ObmW/Scrollbar.c @@ -7,66 +7,23 @@ #include "Slider2.h" #include #include "ScrollbarP.h" -static void Scroll( -#if NeedFunctionPrototypes -Widget,XEvent*,String*,Cardinal* -#endif -); +static void Scroll(Widget,XEvent*,String*,Cardinal*); static XtActionsRec actionsList[] = { {"Scroll", Scroll}, }; -static void _resolve_inheritance( -#if NeedFunctionPrototypes -WidgetClass -#endif -); -static void initialize( -#if NeedFunctionPrototypes -Widget ,Widget,ArgList ,Cardinal * -#endif -); -static void resize( -#if NeedFunctionPrototypes -Widget -#endif -); -static void insert_child( -#if NeedFunctionPrototypes -Widget -#endif -); -static Boolean set_values( -#if NeedFunctionPrototypes -Widget ,Widget ,Widget,ArgList ,Cardinal * -#endif -); -static void scroll_response( -#if NeedFunctionPrototypes -Widget ,XtPointer ,XtPointer -#endif -); +static void _resolve_inheritance(WidgetClass); +static void initialize(Widget ,Widget,ArgList ,Cardinal *); +static void resize(Widget); +static void insert_child(Widget ); +static Boolean set_values(Widget ,Widget ,Widget,ArgList ,Cardinal *); +static void scroll_response(Widget ,XtPointer ,XtPointer ); static char rcsid[] = "$Header: Scrollbar.w,v 1.1 92/11/02 14:08:00 bert Exp $"; -static void up( -#if NeedFunctionPrototypes -Widget ,XtPointer ,XtPointer -#endif -); -static void down( -#if NeedFunctionPrototypes -Widget ,XtPointer ,XtPointer -#endif -); -static void thumbscroll( -#if NeedFunctionPrototypes -Widget ,XtPointer ,XtPointer -#endif -); -static void copy_background( -#if NeedFunctionPrototypes -Widget,int ,XrmValue * -#endif -); +static void up(Widget ,XtPointer ,XtPointer ); +static void down(Widget ,XtPointer ,XtPointer ); +static void thumbscroll(Widget ,XtPointer ,XtPointer ); +static void copy_background(Widget,int ,XrmValue *); + /*ARGSUSED*/static void up(arrow,client_data,call_data)Widget arrow;XtPointer client_data;XtPointer call_data; { Widget self = (Widget) client_data; diff --git a/obm/ObmW/Scrollbar.h b/obm/ObmW/Scrollbar.h index 9c5c62e..3425649 100644 --- a/obm/ObmW/Scrollbar.h +++ b/obm/ObmW/Scrollbar.h @@ -4,11 +4,7 @@ #ifndef _XfwfScrollbar_H_ #define _XfwfScrollbar_H_ #include "Board.h" -void XfwfSetScrollbar( -#if NeedFunctionPrototypes -Widget,double ,double -#endif -); +void XfwfSetScrollbar(Widget,double ,double ); #ifndef XtNvertical #define XtNvertical "vertical" #endif diff --git a/obm/ObmW/ScrollbarP.h b/obm/ObmW/ScrollbarP.h index 111ee45..c7643ae 100644 --- a/obm/ObmW/ScrollbarP.h +++ b/obm/ObmW/ScrollbarP.h @@ -5,11 +5,7 @@ #define _XfwfScrollbarP_H_ #include "BoardP.h" #include "Scrollbar.h" -typedef void (*scroll_response_Proc)( -#if NeedFunctionPrototypes -Widget ,XtPointer ,XtPointer -#endif -); +typedef void (*scroll_response_Proc)(Widget ,XtPointer ,XtPointer ); #define XtInherit_scroll_response ((scroll_response_Proc) _XtInherit) typedef struct { /* methods */ diff --git a/obm/ObmW/SimpleP.h b/obm/ObmW/SimpleP.h index f4397f5..da34977 100644 --- a/obm/ObmW/SimpleP.h +++ b/obm/ObmW/SimpleP.h @@ -8,8 +8,8 @@ #define SIMPLE(w) ((SimpleWidget) w)->simple -typedef Boolean (*XawDisplayRectProc) Xraw_PROTO((Widget, XRectangle * )); -typedef Boolean (*XawChangeSensitive) Xraw_PROTO((Widget)); +typedef Boolean (*XawDisplayRectProc) (Widget, XRectangle * ); +typedef Boolean (*XawChangeSensitive) (Widget); typedef struct { XawChangeSensitive change_sensitive; diff --git a/obm/ObmW/Slider2.c b/obm/ObmW/Slider2.c index f90b8eb..6721327 100644 --- a/obm/ObmW/Slider2.c +++ b/obm/ObmW/Slider2.c @@ -6,21 +6,9 @@ #include "stip4.bm" #include #include "Slider2P.h" -static void start( -#if NeedFunctionPrototypes -Widget,XEvent*,String*,Cardinal* -#endif -); -static void finish( -#if NeedFunctionPrototypes -Widget,XEvent*,String*,Cardinal* -#endif -); -static void drag( -#if NeedFunctionPrototypes -Widget,XEvent*,String*,Cardinal* -#endif -); +static void start(Widget,XEvent*,String*,Cardinal*); +static void finish(Widget,XEvent*,String*,Cardinal*); +static void drag(Widget,XEvent*,String*,Cardinal*); static XtActionsRec actionsList[] = { {"start", start}, @@ -33,76 +21,21 @@ static char defaultTranslations[] = "\ : drag() \n\ : finish() \n\ "; -static void _resolve_inheritance( -#if NeedFunctionPrototypes -WidgetClass -#endif -); -static void compute_thumb( -#if NeedFunctionPrototypes -Widget,Position *,Position *,Dimension *,Dimension * -#endif -); -static void compute_inside( -#if NeedFunctionPrototypes -Widget,Position *,Position *,Dimension *,Dimension * -#endif -); -static void expose( -#if NeedFunctionPrototypes -Widget,XEvent *,Region -#endif -); -static void initialize( -#if NeedFunctionPrototypes -Widget ,Widget,ArgList ,Cardinal * -#endif -); -static void move_thumb( -#if NeedFunctionPrototypes -Widget,int ,int ,int ,int ,int ,int -#endif -); -static void compute_info( -#if NeedFunctionPrototypes -Widget,Position *,Position *,Dimension *,Dimension *,float *,float *,float *,float * -#endif -); -static Boolean set_values( -#if NeedFunctionPrototypes -Widget ,Widget ,Widget,ArgList ,Cardinal * -#endif -); -static void scroll_response( -#if NeedFunctionPrototypes -Widget ,XtPointer ,XtPointer -#endif -); -static void create_gc( -#if NeedFunctionPrototypes -Widget -#endif -); -static void create_graygc( -#if NeedFunctionPrototypes -Widget -#endif -); -static void create_thumbgc( -#if NeedFunctionPrototypes -Widget -#endif -); -static void create_thumblightgc( -#if NeedFunctionPrototypes -Widget -#endif -); -static void create_thumbdarkgc( -#if NeedFunctionPrototypes -Widget -#endif -); +static void _resolve_inheritance(WidgetClass); +static void compute_thumb(Widget,Position *,Position *,Dimension *,Dimension *); +static void compute_inside(Widget,Position *,Position *,Dimension *,Dimension *); +static void expose(Widget,XEvent *,Region ); +static void initialize(Widget ,Widget,ArgList ,Cardinal *); +static void move_thumb(Widget,int ,int ,int ,int ,int ,int ); +static void compute_info(Widget,Position *,Position *,Dimension *,Dimension *,float *,float *,float *,float *); +static Boolean set_values(Widget ,Widget ,Widget,ArgList ,Cardinal *); +static void scroll_response(Widget ,XtPointer ,XtPointer ); +static void create_gc(Widget); +static void create_graygc(Widget); +static void create_thumbgc(Widget); +static void create_thumblightgc(Widget); +static void create_thumbdarkgc(Widget); + /*ARGSUSED*/static void create_gc(self)Widget self; { XtGCMask mask; diff --git a/obm/ObmW/Slider2.h b/obm/ObmW/Slider2.h index 962590b..db722fc 100644 --- a/obm/ObmW/Slider2.h +++ b/obm/ObmW/Slider2.h @@ -5,21 +5,9 @@ #define _XfwfSlider2_H_ #include "Label.h" #include "scroll.h" -void XfwfGetThumb( -#if NeedFunctionPrototypes -Widget,XfwfScrollInfo * -#endif -); -void XfwfMoveThumb( -#if NeedFunctionPrototypes -Widget,double ,double -#endif -); -void XfwfResizeThumb( -#if NeedFunctionPrototypes -Widget,double ,double -#endif -); +void XfwfGetThumb(Widget,XfwfScrollInfo *); +void XfwfMoveThumb(Widget,double ,double ); +void XfwfResizeThumb(Widget,double ,double ); #ifndef XtNthumbColor #define XtNthumbColor "thumbColor" #endif diff --git a/obm/ObmW/Slider2P.h b/obm/ObmW/Slider2P.h index c419194..49c3db6 100644 --- a/obm/ObmW/Slider2P.h +++ b/obm/ObmW/Slider2P.h @@ -5,29 +5,13 @@ #define _XfwfSlider2P_H_ #include "LabelP.h" #include "Slider2.h" -typedef void (*compute_thumb_Proc)( -#if NeedFunctionPrototypes -Widget,Position *,Position *,Dimension *,Dimension * -#endif -); +typedef void (*compute_thumb_Proc)(Widget,Position *,Position *,Dimension *,Dimension *); #define XtInherit_compute_thumb ((compute_thumb_Proc) _XtInherit) -typedef void (*move_thumb_Proc)( -#if NeedFunctionPrototypes -Widget,int ,int ,int ,int ,int ,int -#endif -); +typedef void (*move_thumb_Proc)(Widget,int ,int ,int ,int ,int ,int ); #define XtInherit_move_thumb ((move_thumb_Proc) _XtInherit) -typedef void (*compute_info_Proc)( -#if NeedFunctionPrototypes -Widget,Position *,Position *,Dimension *,Dimension *,float *,float *,float *,float * -#endif -); +typedef void (*compute_info_Proc)(Widget,Position *,Position *,Dimension *,Dimension *,float *,float *,float *,float *); #define XtInherit_compute_info ((compute_info_Proc) _XtInherit) -typedef void (*scroll_response_Proc)( -#if NeedFunctionPrototypes -Widget ,XtPointer ,XtPointer -#endif -); +typedef void (*scroll_response_Proc)(Widget ,XtPointer ,XtPointer ); #define XtInherit_scroll_response ((scroll_response_Proc) _XtInherit) typedef struct { /* methods */ diff --git a/obm/ObmW/TabString.h b/obm/ObmW/TabString.h index d706ad5..773bd3f 100644 --- a/obm/ObmW/TabString.h +++ b/obm/ObmW/TabString.h @@ -2,8 +2,6 @@ * Functions for drawing String's with tab characters in them */ -#if (NeedFunctionPrototypes > 0) - extern void XfwfDrawImageString(Display *display, Drawable drawable, GC gc, int x, int y, String string, int length, int *tabs); @@ -17,15 +15,3 @@ extern int * XfwfTablist2Tabs(char *tablist); extern int XfwfTextWidth(XFontStruct *font, String str, int length, int *tabs); extern char * strnchr(char *s, int c, int n); - -#else - -extern void XfwfDrawImageString(); -extern void XfwfDrawString(); -extern void XtabDrawString(); -extern int * XfwfTablist2Tabs(); -extern int XfwfTextWidth(); -extern char * strnchr(); - -#endif - diff --git a/obm/ObmW/Table.c b/obm/ObmW/Table.c index 0c9e0b0..53e59b0 100644 --- a/obm/ObmW/Table.c +++ b/obm/ObmW/Table.c @@ -2141,16 +2141,9 @@ static Boolean CompareCells(p, i, j, call_data, client_data) void -#ifdef Xraw_NEED_PROTO XawTableGetSize (Widget w, int *rows, int *columns) -#else -XawTableGetSize (w, rows, columns) - Widget w; - int *rows; - int *columns; -#endif { XawTableWidget tw = (XawTableWidget)w; @@ -2159,14 +2152,8 @@ XawTableGetSize (w, rows, columns) } void -#ifdef Xraw_NEED_PROTO XawTableDoLayout (Widget w, Boolean do_layout) -#else -XawTableDoLayout (w, do_layout) - Widget w; - Boolean do_layout; -#endif { XawTableWidget tw = (XawTableWidget)w; @@ -2182,16 +2169,9 @@ XawTableDoLayout (w, do_layout) } int -#ifdef Xraw_NEED_PROTO XawTableSetNewSize (Widget w, int rows, int columns) -#else -XawTableSetNewSize (w, rows, columns) - Widget w; - int rows; - int columns; -#endif { if (REJECT == SetTableSize(w, rows, columns)) return REJECT; @@ -2201,25 +2181,13 @@ XawTableSetNewSize (w, rows, columns) } char * -#ifdef Xraw_NEED_PROTO XawTableGetLabelByCell (XawTableCell cell) -#else -XawTableGetLabelByCell (cell) - XawTableCell cell; -#endif { return GET_CELL_LABEL; } void -#ifdef Xraw_NEED_PROTO XawTableGetEditPosition (Widget w, int *row, int *column) -#else -XawTableGetEditPosition(w, row, column) - Widget w; - int *row; - int *column; -#endif { XawTableWidget tw = (XawTableWidget)w; @@ -2228,7 +2196,6 @@ XawTableGetEditPosition(w, row, column) } Boolean -#ifdef Xraw_NEED_PROTO XawTableWalk ( Widget w, XawTableProc proc, @@ -2240,17 +2207,6 @@ XawTableWalk ( int *i, /* returned */ int *j, /* returned */ XtPointer client_data) -#else -XawTableWalk(w, proc, b_row, e_row, b_column, e_column, - direction, i, j, client_data) - Widget w; - XawTableProc proc; - int b_row, e_row, b_column, e_column; - int direction; - int *i; /* returned */ - int *j; /* returned */ - XtPointer client_data; -#endif { return go_table((XtPointer)w, proc, STUFF(w), b_row, e_row, b_column, e_column, @@ -2259,14 +2215,7 @@ XawTableWalk(w, proc, b_row, e_row, b_column, e_column, } Boolean -#ifdef Xraw_NEED_PROTO XawTableSearchLabel (Widget w, char *name, int *row, int *column) -#else -XawTableSearchLabel (w, name, row, column) - Widget w; - char *name; - int *row, *column; -#endif { int row_start = *row; int column_start = *column; @@ -2311,12 +2260,7 @@ XawTableSearchLabel (w, name, row, column) **************************************************************/ int -#ifdef Xraw_NEED_PROTO XawTablePrependRow (Widget w) -#else -XawTablePrependRow(w) - Widget w; -#endif { XawTableWidget tw = (XawTableWidget)w; XawTableCell cell; @@ -2392,12 +2336,7 @@ XawTablePrependRow(w) } int -#ifdef Xraw_NEED_PROTO XawTableAppendRow (Widget w) -#else -XawTableAppendRow (w) - Widget w; -#endif { XawTableWidget tw = (XawTableWidget)w; XawTableCell cell; @@ -2471,13 +2410,7 @@ XawTableAppendRow (w) } int -#ifdef Xraw_NEED_PROTO XawTableInsertRow (Widget w, int row) -#else -XawTableInsertRow (w, row) - Widget w; - int row; -#endif { XawTableWidget tw = (XawTableWidget)w; XawTableCell cell; @@ -2568,13 +2501,7 @@ XawTableInsertRow (w, row) } int -#ifdef Xraw_NEED_PROTO XawTableDeleteRow (Widget w, int row) -#else -XawTableDeleteRow (w, row) - Widget w; - int row; -#endif { XawTableWidget tw = (XawTableWidget)w; XawTableCell cell; @@ -2710,13 +2637,7 @@ XawTableDeleteRow (w, row) **************************************************************/ int -#ifdef Xraw_NEED_PROTO XawTablePrependColumn (Widget w, int width) -#else -XawTablePrependColumn (w, width) - Widget w; - int width; -#endif { XawTableWidget tw = (XawTableWidget)w; int j; @@ -2818,13 +2739,7 @@ XawTablePrependColumn (w, width) } int -#ifdef Xraw_NEED_PROTO XawTableAppendColumn (Widget w, int width) -#else -XawTableAppendColumn (w, width) - Widget w; - int width; -#endif { XawTableWidget tw = (XawTableWidget)w; int j; @@ -2924,14 +2839,7 @@ XawTableAppendColumn (w, width) } int -#ifdef Xraw_NEED_PROTO XawTableInsertColumn (Widget w, int column, int width) -#else -XawTableInsertColumn(w, column, width) - Widget w; - int column; - int width; -#endif { XawTableWidget tw = (XawTableWidget)w; XawTableCell cell; @@ -3051,13 +2959,7 @@ XawTableInsertColumn(w, column, width) } int -#ifdef Xraw_NEED_PROTO XawTableDeleteColumn (Widget w, int column) -#else -XawTableDeleteColumn(w, column) - Widget w; - int column; -#endif { XawTableWidget tw = (XawTableWidget)w; XawTableCell cell; @@ -3207,12 +3109,7 @@ XawTableDeleteColumn(w, column) Boolean -#ifdef Xraw_NEED_PROTO XawTableIsEditManaged (Widget w) -#else -XawTableIsEditManaged (w) - Widget w; -#endif { return XtIsManaged(((XawTableWidget)w)->table.edit); } @@ -3220,15 +3117,7 @@ XawTableIsEditManaged (w) int -#ifdef Xraw_NEED_PROTO XawTableSetLabel (Widget w, int row, int column, const char *raw_label) -#else -XawTableSetLabel(w, row, column, raw_label) - Widget w; - int row; - int column; - const char *raw_label; -#endif { XawTableWidget tw = (XawTableWidget)w; XawTableCallbackStruct callback_str; @@ -3312,17 +3201,8 @@ XawTableSetLabel(w, row, column, raw_label) int -#ifdef Xraw_NEED_PROTO XawTableSetCellColours (Widget w, int row, int column, Pixel fore, Pixel back) -#else -XawTableSetCellColours (w, row, column, fore, back) - Widget w; - int row; - int column; - Pixel fore; - Pixel back; -#endif { XawTableWidget tw = (XawTableWidget)w; XawTableCallbackStruct callback_str; @@ -3421,14 +3301,7 @@ XawTableSetCellColours (w, row, column, fore, back) int -#ifdef Xraw_NEED_PROTO XawTableSetCellDefaultColours (Widget w, int row, int column) -#else -XawTableSetCellDefaultColours (w, row, column) - Widget w; - int row; - int column; -#endif { XawTableWidget tw = (XawTableWidget)w; XawTableCallbackStruct callback_str; @@ -3507,15 +3380,7 @@ Incorrect value of row or column (%s,%s) in Table widget '%s'", } int -#ifdef Xraw_NEED_PROTO XawTableSetCellBackground (Widget w, int row, int column, Pixel back) -#else -XawTableSetCellBackground (w, row, column, back) - Widget w; - int row; - int column; - Pixel back; -#endif { XawTableWidget tw = (XawTableWidget)w; XawTableCallbackStruct callback_str; @@ -3615,15 +3480,7 @@ Incorrect value of row or column (%s,%s) in Table widget '%s'", } int -#ifdef Xraw_NEED_PROTO XawTableSetCellForeground (Widget w, int row, int column, Pixel fore) -#else -XawTableSetCellForeground (w, row, column, fore) - Widget w; - int row; - int column; - Pixel fore; -#endif { XawTableWidget tw = (XawTableWidget)w; XawTableCallbackStruct callback_str; @@ -3722,17 +3579,8 @@ Incorrect value of row or column (%s,%s) in Table widget '%s'", } void -#ifdef Xraw_NEED_PROTO XawTableGetCellColours (Widget w, int row, int column, Pixel *fore, Pixel *back) -#else -XawTableGetCellColours (w, row, column, fore, back) - Widget w; - int row; - int column; - Pixel *fore; - Pixel *back; -#endif { XawTableWidget tw = (XawTableWidget)w; XawTableCell cell = (XawTableCell)get_cell(STUFF(tw), row, column); @@ -3749,16 +3597,8 @@ XawTableGetCellColours (w, row, column, fore, back) } void -#ifdef Xraw_NEED_PROTO XawTableGetCellColoursByCell (Widget w, XawTableCell cell, Pixel *fore, Pixel *back) -#else -XawTableGetCellColoursByCell (w, cell, fore, back) - Widget w; - XawTableCell cell; - Pixel *fore; - Pixel *back; -#endif { XawTableWidget tw = (XawTableWidget)w; @@ -3813,14 +3653,7 @@ static Boolean PaintCellWithClear(p, i, j, call_data, client_data) #endif void -#ifdef Xraw_NEED_PROTO XawTableSetColumnJustify (Widget w, int column, XtJustify justify) -#else -XawTableSetColumnJustify (w, column, justify) - Widget w; - int column; - XtJustify justify; -#endif { XawTableWidget tw = (XawTableWidget)w; int i, j; @@ -3847,13 +3680,7 @@ XawTableSetColumnJustify (w, column, justify) XtJustify -#ifdef Xraw_NEED_PROTO XawTableGetColumnJustify (Widget w, int column) -#else -XawTableGetColumnJustify (w, column) - Widget w; - int column; -#endif { XawTableWidget tw = (XawTableWidget)w; @@ -3868,14 +3695,7 @@ XawTableGetColumnJustify (w, column) void -#ifdef Xraw_NEED_PROTO XawTableSetColumnWidth (Widget w, int column, int width) -#else -XawTableSetColumnWidth(w, column, width) - Widget w; - int column; - int width; -#endif { XawTableWidget tw = (XawTableWidget)w; XawTableCallbackStruct callback_str; @@ -3909,15 +3729,7 @@ XawTableSetColumnWidth(w, column, width) void -#ifdef Xraw_NEED_PROTO XawTableSetMultiColumnWidths (Widget w, int *columns, int *widths, int ncols) -#else -XawTableSetMultiColumnWidths (w, columns, widths, ncols) - Widget w; - int *columns; - int *widths; - int ncols; -#endif { XawTableWidget tw = (XawTableWidget)w; XawTableCallbackStruct callback_str; @@ -3958,13 +3770,7 @@ XawTableSetMultiColumnWidths (w, columns, widths, ncols) int -#ifdef Xraw_NEED_PROTO XawTableGetColumnWidth (Widget w, int column) -#else -XawTableGetColumnWidth(w, column) - Widget w; - int column; -#endif { XawTableWidget tw = (XawTableWidget)w; @@ -3978,13 +3784,7 @@ XawTableGetColumnWidth(w, column) } int -#ifdef Xraw_NEED_PROTO XawTableGetColumnPixelWidth (Widget w, int column) -#else -XawTableGetColumnPixelWidth(w, column) - Widget w; - int column; -#endif { XawTableWidget tw = (XawTableWidget)w; int width; @@ -4004,13 +3804,7 @@ XawTableGetColumnPixelWidth(w, column) } char * -#ifdef Xraw_NEED_PROTO XawTableGetLabelByPosition (Widget w, int i, int j) -#else - XawTableGetLabelByPosition(w,i,j) - Widget w; - int i,j; -#endif { XawTableWidget tw = (XawTableWidget)w; XawTableCell cell; @@ -4037,12 +3831,7 @@ XawTableGetLabelByPosition (Widget w, int i, int j) } void -#ifdef Xraw_NEED_PROTO XawTableUnsetEdit (Widget w) -#else - XawTableUnsetEdit(w) - Widget w; -#endif { XawTableWidget tw = (XawTableWidget)w; char* label; @@ -4069,14 +3858,7 @@ XawTableUnsetEdit (Widget w) } void -#ifdef Xraw_NEED_PROTO XawTableSetEdit (Widget w, int row, int column) -#else - XawTableSetEdit(w, row, column) - Widget w; - int row; - int column; -#endif { XawTableWidget tw = (XawTableWidget)w; XawTableCell cell; diff --git a/obm/ObmW/Table.h b/obm/ObmW/Table.h index 7251ecd..c80bc15 100644 --- a/obm/ObmW/Table.h +++ b/obm/ObmW/Table.h @@ -299,11 +299,11 @@ typedef struct _XawTableColumnRec *XawTableColumn; /* opaque to outside */ /*# Bypass Routine and Direction Types #*/ /*# #*/ /*#########################################################################*/ -typedef Boolean (*XawTableProc) Xraw_PROTO((Widget, - int, - int, - XawTableCell, - XtPointer)); +typedef Boolean (*XawTableProc) (Widget, + int, + int, + XawTableCell, + XtPointer); enum XawTableBypassDirection{ XawTABLE_RIGHT_DOWN, XawTABLE_DOWN_RIGHT @@ -357,8 +357,8 @@ typedef struct { /*# Layout Control Routine #*/ /*# #*/ /*#########################################################################*/ -extern void XawTableDoLayout Xraw_PROTO((Widget w, - Boolean do_layout)); +extern void XawTableDoLayout (Widget w, + Boolean do_layout); /*#########################################################################*/ @@ -366,13 +366,13 @@ extern void XawTableDoLayout Xraw_PROTO((Widget w, /*# Stuff Routines #*/ /*# #*/ /*#########################################################################*/ -extern int XawTableSetNewSize Xraw_PROTO((Widget w, - int rows, - int columns)); +extern int XawTableSetNewSize (Widget w, + int rows, + int columns); -extern void XawTableGetSize Xraw_PROTO((Widget w, - int *rows, - int *columns)); +extern void XawTableGetSize (Widget w, + int *rows, + int *columns); /*#########################################################################*/ @@ -380,13 +380,13 @@ extern void XawTableGetSize Xraw_PROTO((Widget w, /*# Row Routines #*/ /*# #*/ /*#########################################################################*/ -extern int XawTablePrependRow Xraw_PROTO((Widget w)); +extern int XawTablePrependRow (Widget w); -extern int XawTableAppendRow Xraw_PROTO((Widget w)); +extern int XawTableAppendRow (Widget w); -extern int XawTableInsertRow Xraw_PROTO((Widget w, int row)); +extern int XawTableInsertRow (Widget w, int row); -extern int XawTableDeleteRow Xraw_PROTO((Widget w, int row)); +extern int XawTableDeleteRow (Widget w, int row); /*#########################################################################*/ @@ -394,15 +394,15 @@ extern int XawTableDeleteRow Xraw_PROTO((Widget w, int row)); /*# Column Routines #*/ /*# #*/ /*#########################################################################*/ -extern int XawTablePrependColumn Xraw_PROTO((Widget w, int width)); +extern int XawTablePrependColumn (Widget w, int width); -extern int XawTableAppendColumn Xraw_PROTO((Widget w, int width)); +extern int XawTableAppendColumn (Widget w, int width); -extern int XawTableInsertColumn Xraw_PROTO((Widget w, - int column, - int width)); +extern int XawTableInsertColumn (Widget w, + int column, + int width); -extern int XawTableDeleteColumn Xraw_PROTO((Widget w, int column)); +extern int XawTableDeleteColumn (Widget w, int column); /*#########################################################################*/ @@ -410,16 +410,16 @@ extern int XawTableDeleteColumn Xraw_PROTO((Widget w, int column)); /*# Set Label Routines #*/ /*# #*/ /*#########################################################################*/ -extern char *XawTableGetLabelByCell Xraw_PROTO((XawTableCell cell)); +extern char *XawTableGetLabelByCell (XawTableCell cell); -extern char *XawTableGetLabelByPosition Xraw_PROTO((Widget w, - int row, - int column)); +extern char *XawTableGetLabelByPosition (Widget w, + int row, + int column); -extern int XawTableSetLabel Xraw_PROTO((Widget w, - int row, - int column, - const char *label)); +extern int XawTableSetLabel (Widget w, + int row, + int column, + const char *label); /*#########################################################################*/ @@ -427,20 +427,20 @@ extern int XawTableSetLabel Xraw_PROTO((Widget w, /*# Bypass Routines #*/ /*# #*/ /*#########################################################################*/ -extern Boolean XawTableWalk Xraw_PROTO((Widget w, - XawTableProc proc, - int b_row, - int e_row, - int b_column, - int e_column, - int direction, - int *row, int *column, - XtPointer client_data)); +extern Boolean XawTableWalk (Widget w, + XawTableProc proc, + int b_row, + int e_row, + int b_column, + int e_column, + int direction, + int *row, int *column, + XtPointer client_data); -extern Boolean XawTableSearchLabel Xraw_PROTO((Widget w, - char *name, - int *row, - int *column)); +extern Boolean XawTableSearchLabel (Widget w, + char *name, + int *row, + int *column); /*#########################################################################*/ @@ -448,17 +448,17 @@ extern Boolean XawTableSearchLabel Xraw_PROTO((Widget w, /*# Edit Cell Routines #*/ /*# #*/ /*#########################################################################*/ -extern Boolean XawTableIsEditManaged Xraw_PROTO((Widget w)); +extern Boolean XawTableIsEditManaged (Widget w); -extern void XawTableGetEditPosition Xraw_PROTO((Widget w, - int *row, - int *column)); +extern void XawTableGetEditPosition (Widget w, + int *row, + int *column); -extern void XawTableUnsetEdit Xraw_PROTO((Widget w)); +extern void XawTableUnsetEdit (Widget w); -extern void XawTableSetEdit Xraw_PROTO((Widget w, - int row, - int column)); +extern void XawTableSetEdit (Widget w, + int row, + int column); /*#########################################################################*/ @@ -466,37 +466,37 @@ extern void XawTableSetEdit Xraw_PROTO((Widget w, /*# Set Colour Routines #*/ /*# #*/ /*#########################################################################*/ -extern int XawTableSetCellBackground Xraw_PROTO((Widget w, - int row, - int column, - Pixel background)); +extern int XawTableSetCellBackground (Widget w, + int row, + int column, + Pixel background); -extern int XawTableSetCellForeground Xraw_PROTO((Widget w, - int row, - int column, - Pixel foreground)); - -extern int XawTableSetCellDefaultColours Xraw_PROTO((Widget w, - int row, - int column)); - -extern int XawTableSetCellColours Xraw_PROTO((Widget w, - int row, - int column, - Pixel foreground, - Pixel background)); +extern int XawTableSetCellForeground (Widget w, + int row, + int column, + Pixel foreground); + +extern int XawTableSetCellDefaultColours (Widget w, + int row, + int column); + +extern int XawTableSetCellColours (Widget w, + int row, + int column, + Pixel foreground, + Pixel background); -extern void XawTableGetCellColours Xraw_PROTO((Widget w, - int row, - int column, - Pixel *foreground, - Pixel *background)); +extern void XawTableGetCellColours (Widget w, + int row, + int column, + Pixel *foreground, + Pixel *background); -extern void XawTableGetCellColoursByCell Xraw_PROTO((Widget w, - XawTableCell cell, - Pixel *foreground, - Pixel *background)); +extern void XawTableGetCellColoursByCell (Widget w, + XawTableCell cell, + Pixel *foreground, + Pixel *background); /*#########################################################################*/ @@ -504,27 +504,27 @@ extern void XawTableGetCellColoursByCell Xraw_PROTO((Widget w, /*# Column Deta #*/ /*# #*/ /*#########################################################################*/ -extern void XawTableSetColumnJustify Xraw_PROTO((Widget w, - int column, - XtJustify justify)); +extern void XawTableSetColumnJustify (Widget w, + int column, + XtJustify justify); -extern XtJustify XawTableGetColumnJustify Xraw_PROTO((Widget w, - int column)); +extern XtJustify XawTableGetColumnJustify (Widget w, + int column); -extern void XawTableSetColumnWidth Xraw_PROTO((Widget w, - int column, - int width)); +extern void XawTableSetColumnWidth (Widget w, + int column, + int width); -extern int XawTableGetColumnWidth Xraw_PROTO((Widget w, - int column)); +extern int XawTableGetColumnWidth (Widget w, + int column); -extern int XawTableGetColumnPixelWidth Xraw_PROTO((Widget w, - int column)); +extern int XawTableGetColumnPixelWidth (Widget w, + int column); -extern void XawTableSetMultiColumnWidths Xraw_PROTO((Widget w, - int *columns, - int *widths, - int ncols)); +extern void XawTableSetMultiColumnWidths (Widget w, + int *columns, + int *widths, + int ncols); /*#########################################################################*/ diff --git a/obm/ObmW/Table3d.c b/obm/ObmW/Table3d.c index 040045f..760c64d 100644 --- a/obm/ObmW/Table3d.c +++ b/obm/ObmW/Table3d.c @@ -248,13 +248,7 @@ static unsigned char mbshadowpm_bits[] = { GC -#ifdef Xraw_NEED_PROTO AllocGCFromPixmap (Widget w, Pixmap pixmap) -#else -AllocGCFromPixmap(w, pixmap) - Widget w; - Pixmap pixmap; -#endif { XGCValues values; @@ -268,13 +262,7 @@ AllocGCFromPixmap(w, pixmap) } GC -#ifdef Xraw_NEED_PROTO AllocGCFromPixel (Widget w, Pixel fore) -#else -AllocGCFromPixel(w, fore) - Widget w; - Pixel fore; -#endif { XGCValues values; @@ -337,14 +325,7 @@ static Pixmap Depth_NOT_1_ShadowPixmap (w, colour, top_or_bottom) } Pixmap -#ifdef Xraw_NEED_PROTO CreateShadowPixmap (Widget w, Pixel colour, int top_or_bottom) -#else -CreateShadowPixmap (w, colour, top_or_bottom) - Widget w; - Pixel colour; - int top_or_bottom; -#endif { if (DEPTH_SCREEN(w) == 1) return Depth_1_ShadowPixmap (w, top_or_bottom); @@ -357,19 +338,11 @@ CreateShadowPixmap (w, colour, top_or_bottom) Boolean -#ifdef Xraw_NEED_PROTO XrawAllocShadowPixel ( Widget w, Pixel base, int brightness, Pixel *result) -#else -XrawAllocShadowPixel (w, base, brightness, result) - Widget w; - Pixel base; - int brightness; - Pixel *result; /* RETURN */ -#endif { XColor set; XColor get; @@ -404,20 +377,11 @@ XrawAllocShadowPixel (w, base, brightness, result) } GC -#ifdef Xraw_NEED_PROTO MakeGC (Widget w, Pixel base, int brightness, Boolean pseudo, int top_or_bottom) -#else -MakeGC(w, base, brightness, pseudo, top_or_bottom) - Widget w; - Pixel base; - int brightness; - Boolean pseudo; - int top_or_bottom; -#endif { Pixel fore; Pixmap tile; @@ -441,13 +405,7 @@ MakeGC(w, base, brightness, pseudo, top_or_bottom) } GC -#ifdef Xraw_NEED_PROTO MakeTopShadowGC (Widget w, Pixel base) -#else -MakeTopShadowGC(w, base) - Widget w; - Pixel base; -#endif { Pixel fore; Pixmap tile; @@ -467,13 +425,7 @@ MakeTopShadowGC(w, base) GC -#ifdef Xraw_NEED_PROTO MakeBottomShadowGC (Widget w, Pixel base) -#else -MakeBottomShadowGC(w, base) - Widget w; - Pixel base; -#endif { Pixel fore; Pixmap tile; @@ -492,13 +444,7 @@ MakeBottomShadowGC(w, base) } GC -#ifdef Xraw_NEED_PROTO MakeArmedGC (Widget w, Pixel base) -#else -MakeArmedGC(w, base) - Widget w; - Pixel base; -#endif { Pixel fore; Pixmap tile; @@ -517,7 +463,6 @@ MakeArmedGC(w, base) } void -#ifdef Xraw_NEED_PROTO XawDrawFrame (Widget gw, Position x, Position y, @@ -527,18 +472,6 @@ XawDrawFrame (Widget gw, Dimension t, GC lightgc, GC darkgc) -#else -XawDrawFrame (gw, x, y, w, h, frame_type, t, lightgc, darkgc) - Widget gw; - Position x; - Position y; - Dimension w; - Dimension h; - XawFrameType frame_type; - Dimension t; - GC lightgc; - GC darkgc; -#endif { XPoint top_polygon[6]; XPoint bottom_polygon[6]; @@ -664,16 +597,9 @@ XawDrawFrame (gw, x, y, w, h, frame_type, t, lightgc, darkgc) Boolean -#ifdef Xraw_NEED_PROTO BottomShadowColor( Widget widget, Pixel base, Pixel *result) -#else -BottomShadowColor(widget, base, result) - Widget widget; - Pixel base; - Pixel *result; -#endif { Colormap colormap; XColor color; @@ -715,16 +641,9 @@ BottomShadowColor(widget, base, result) } Boolean -#ifdef Xraw_NEED_PROTO TopShadowColor( Widget widget, Pixel base, Pixel *result) -#else -TopShadowColor(widget, base, result) - Widget widget; - Pixel base; - Pixel *result; -#endif { Colormap colormap; XColor color; @@ -766,16 +685,9 @@ TopShadowColor(widget, base, result) } Boolean -#ifdef Xraw_NEED_PROTO ArmedColor( Widget widget, Pixel base, Pixel *result) -#else -ArmedColor(widget, base, result) - Widget widget; - Pixel base; - Pixel *result; -#endif { Colormap colormap; XColor color; @@ -823,7 +735,6 @@ ArmedColor(widget, base, result) void -#ifdef Xraw_NEED_PROTO DrawRhombus ( Widget w, short x, @@ -834,19 +745,6 @@ DrawRhombus ( GC foreground_gc, GC bottom_shadow_GC, Boolean state ) -#else -DrawRhombus(w, x, y, g, t, - top_shadow_GC, foreground_gc, bottom_shadow_GC, state) - Widget w; - short x; - short y; - short g; - short t; - GC top_shadow_GC; - GC foreground_gc; - GC bottom_shadow_GC; - Boolean state; -#endif { XPoint top_shade[6]; XPoint bot_shade[6]; @@ -904,14 +802,7 @@ DrawRhombus(w, x, y, g, t, } Boolean -#ifdef Xraw_NEED_PROTO FetchPixel (Widget w, String name, Pixel* pixel) -#else -FetchPixel(w, name, pixel) - Widget w; - String name; - Pixel* pixel; -#endif { XrmValue source, dest; diff --git a/obm/ObmW/Table3d.h b/obm/ObmW/Table3d.h index 9f54825..297f21e 100644 --- a/obm/ObmW/Table3d.h +++ b/obm/ObmW/Table3d.h @@ -17,126 +17,126 @@ typedef enum { #define TOP (1) #define BOTTOM (2) -extern GC AllocGCFromPixmap Xraw_PROTO((Widget , Pixmap )); -extern GC AllocGCFromPixel Xraw_PROTO((Widget , Pixel )); +extern GC AllocGCFromPixmap (Widget , Pixmap ); +extern GC AllocGCFromPixel (Widget , Pixel ); -extern void RGBtoHLS Xraw_PROTO((double , - double , - double , - double * , - double * , - double * )); +extern void RGBtoHLS (double , + double , + double , + double * , + double * , + double * ); -extern void HLStoRGB Xraw_PROTO((double * , - double * , - double * , - double , - double , - double )); +extern void HLStoRGB (double * , + double * , + double * , + double , + double , + double ); -extern Boolean TopShadowColor Xraw_PROTO((Widget /* self */, - Pixel /* base */, - Pixel* /* result */)); +extern Boolean TopShadowColor (Widget /* self */, + Pixel /* base */, + Pixel* /* result */); -extern Boolean BottomShadowColor Xraw_PROTO((Widget /* self */, - Pixel /* base */, - Pixel* /* result */)); +extern Boolean BottomShadowColor (Widget /* self */, + Pixel /* base */, + Pixel* /* result */); -extern Boolean ArmedColor Xraw_PROTO((Widget /* self */, - Pixel /* base */, - Pixel* /* result */)); +extern Boolean ArmedColor (Widget /* self */, + Pixel /* base */, + Pixel* /* result */); -extern GC MakeTopShadowGC Xraw_PROTO((Widget , Pixel )); -extern GC MakeBottomShadowGC Xraw_PROTO((Widget , Pixel )); -extern GC MakeArmedGC Xraw_PROTO((Widget , Pixel )); +extern GC MakeTopShadowGC (Widget , Pixel ); +extern GC MakeBottomShadowGC (Widget , Pixel ); +extern GC MakeArmedGC (Widget , Pixel ); -extern GC AllocGCFromPixmap Xraw_PROTO((Widget , Pixmap )); +extern GC AllocGCFromPixmap (Widget , Pixmap ); -extern GC AllocGCFromPixel Xraw_PROTO((Widget , Pixel )); +extern GC AllocGCFromPixel (Widget , Pixel ); -extern Pixmap CreateShadowPixmap Xraw_PROTO((Widget , - Pixel , - int )); +extern Pixmap CreateShadowPixmap (Widget , + Pixel , + int ); -extern Boolean AllocShadowPixel Xraw_PROTO((Widget , - Pixel , - int , - Pixel * )); +extern Boolean AllocShadowPixel (Widget , + Pixel , + int , + Pixel * ); -extern GC MakeGC Xraw_PROTO((Widget , - Pixel , - int , - Boolean , - int )); +extern GC MakeGC (Widget , + Pixel , + int , + Boolean , + int ); -extern GC MakeTopShadowGC Xraw_PROTO((Widget , Pixel )); +extern GC MakeTopShadowGC (Widget , Pixel ); -extern GC MakeBottomShadowGC Xraw_PROTO((Widget , Pixel )); +extern GC MakeBottomShadowGC (Widget , Pixel ); -extern GC MakeArmedGC Xraw_PROTO((Widget , Pixel )); +extern GC MakeArmedGC (Widget , Pixel ); -extern void XawDrawFrame Xraw_PROTO((Widget , - Position , - Position , - Dimension , - Dimension , - XawFrameType , - Dimension , - GC , - GC )); +extern void XawDrawFrame (Widget , + Position , + Position , + Dimension , + Dimension , + XawFrameType , + Dimension , + GC , + GC ); -extern void RGBtoHLS Xraw_PROTO((double , - double , - double , - double * , - double * , - double * )); +extern void RGBtoHLS (double , + double , + double , + double * , + double * , + double * ); -extern void HLStoRGB Xraw_PROTO((double * , - double * , - double * , - double , - double , - double )); +extern void HLStoRGB (double * , + double * , + double * , + double , + double , + double ); -extern Boolean BottomShadowColor Xraw_PROTO((Widget , - Pixel , - Pixel * )); +extern Boolean BottomShadowColor (Widget , + Pixel , + Pixel * ); -extern Boolean TopShadowColor Xraw_PROTO((Widget , - Pixel , - Pixel * )); +extern Boolean TopShadowColor (Widget , + Pixel , + Pixel * ); -extern Boolean ArmedColor Xraw_PROTO((Widget , - Pixel , - Pixel * )); +extern Boolean ArmedColor (Widget , + Pixel , + Pixel * ); -extern void DrawRhombus Xraw_PROTO((Widget , - short , - short , - short , - short , - GC , - GC , - GC , - Boolean )); +extern void DrawRhombus (Widget , + short , + short , + short , + short , + GC , + GC , + GC , + Boolean ); -extern Boolean FetchPixel Xraw_PROTO((Widget , - String name , - Pixel* )); +extern Boolean FetchPixel (Widget , + String name , + Pixel* ); #endif /* _3d_h_ */ diff --git a/obm/ObmW/TableUtil.c b/obm/ObmW/TableUtil.c index 9d26721..91dc58a 100644 --- a/obm/ObmW/TableUtil.c +++ b/obm/ObmW/TableUtil.c @@ -88,12 +88,7 @@ static XawTableProc del_cell (w, i, j, call_data, client_data) */ void -#if NeedFunctionPrototypes row_delete (XtPointer f) -#else -row_delete(f) - XtPointer f; -#endif { XawTableNode p = (XawTableNode) f; @@ -130,12 +125,7 @@ row_delete(f) */ void -#if NeedFunctionPrototypes column_delete (XtPointer f) -#else -column_delete(f) - XtPointer f; -#endif { XawTableNode p = (XawTableNode) f; @@ -174,13 +164,7 @@ column_delete(f) */ Boolean -#if NeedFunctionPrototypes row_insert_after (XtPointer d, int node_size) -#else -row_insert_after(d, node_size) - XtPointer d; - int node_size; -#endif { XawTableNode f = (XawTableNode) d; XawTableNode p; @@ -246,13 +230,7 @@ row_insert_after(d, node_size) */ Boolean -#if NeedFunctionPrototypes row_insert_before (XtPointer d, int node_size) -#else -row_insert_before(d, node_size) - XtPointer d; - int node_size; -#endif { XawTableNode f = (XawTableNode) d; XawTableNode p; @@ -318,13 +296,7 @@ row_insert_before(d, node_size) [<*/ Boolean -#if NeedFunctionPrototypes column_insert_after (XtPointer d, int node_size) -#else -column_insert_after(d, node_size) - XtPointer d; - int node_size; -#endif { XawTableNode f = (XawTableNode) d; XawTableNode p; @@ -391,13 +363,7 @@ column_insert_after(d, node_size) */ Boolean -#if NeedFunctionPrototypes column_insert_before (XtPointer d, int node_size) -#else -column_insert_before(d, node_size) - XtPointer d; - int node_size; -#endif { XawTableNode f = (XawTableNode)d; XawTableNode p; @@ -463,12 +429,7 @@ column_insert_before(d, node_size) */ XtPointer -#if NeedFunctionPrototypes get_table (XtPointer f) -#else -get_table(f) - XtPointer f; -#endif { XawTableNode p = (XawTableNode) f; @@ -493,14 +454,7 @@ get_table(f) */ XtPointer -#if NeedFunctionPrototypes get_cell (XtPointer f, int i, int j) -#else -get_cell (f, i, j) - XtPointer f; - int i; - int j; -#endif { XawTableNode p = (XawTableNode) f; @@ -564,7 +518,6 @@ static Boolean go_row(w, proc, p, begin_column, end_column, i, j, client_data) */ Boolean -#if NeedFunctionPrototypes go_table ( XtPointer w, XawTableProc proc, @@ -577,21 +530,6 @@ go_table ( int *i, /* returned */ int *j, /* returned */ XtPointer client_data) -#else -go_table(w, proc, table, begin_row, end_row, begin_column, end_column, - direction, i, j, client_data) - XtPointer w; - XawTableProc proc; - XtPointer table; - int begin_row; - int end_row; - int begin_column; - int end_column; - int direction; - int *i; /* returned */ - int *j; /* returned */ - XtPointer client_data; -#endif { XawTableNode p; XawTableNode n; @@ -649,16 +587,9 @@ go_table(w, proc, table, begin_row, end_row, begin_column, end_column, */ void -#if NeedFunctionPrototypes get_table_size (XtPointer f, int *i, /* returned */ int *j) /* returned */ -#else -get_table_size(f,i,j) - XtPointer f; - int *i; /* returned */ - int *j; /* returned */ -#endif { XawTableNode p = (XawTableNode)f; if (p == null){ @@ -684,12 +615,7 @@ get_table_size(f,i,j) */ void -#if NeedFunctionPrototypes delete_table (XtPointer f) -#else -delete_table(f) - XtPointer f; -#endif { XawTableNode p = (XawTableNode)f; int i,j; @@ -715,16 +641,9 @@ delete_table(f) */ void -#if NeedFunctionPrototypes get_cell_positions (XtPointer f, int *i, /* returned */ int *j) /* returned */ -#else -get_cell_positions(f, i, j) - XtPointer f; - int *i; /* returned */ - int *j; /* returned */ -#endif { XawTableNode p = (XawTableNode)f; if ( p == null ) @@ -750,14 +669,7 @@ get_cell_positions(f, i, j) */ XtPointer -#if NeedFunctionPrototypes create_table ( int rows, int columns, int node_size) -#else -create_table(rows, columns, node_size) - int rows; - int columns; - int node_size; -#endif { XawTableNode *area; XawTableNode p; @@ -870,14 +782,7 @@ static Boolean check_cell (w, row, column, call_data, client_data) void -#if NeedFunctionPrototypes _check_table (XtPointer f, int rows, int columns) -#else -_check_table (f, rows, columns) - XtPointer f; - int rows; - int columns; -#endif { XawTableNode table = (XawTableNode)f; int real_rows, real_columns; diff --git a/obm/ObmW/TableUtil.h b/obm/ObmW/TableUtil.h index 0b83ed6..eaaaa3a 100644 --- a/obm/ObmW/TableUtil.h +++ b/obm/ObmW/TableUtil.h @@ -21,12 +21,6 @@ Commercial usage is also possible with participation of the author. #include #include "Table.h" -#if __STDC__ || defined(__cplusplus) -#define F_PROTO(s) s -#else -#define F_PROTO(s) () -#endif - typedef struct _XawTableNodeRec { /* Node of table grid */ struct _XawTableNodeRec *l; struct _XawTableNodeRec *r; @@ -35,60 +29,58 @@ typedef struct _XawTableNodeRec { /* Node of table grid */ }XawTableNodeRec, *XawTableNode; -extern XtPointer create_table F_PROTO((int rows, - int columns, - int node_size)); +extern XtPointer create_table (int rows, + int columns, + int node_size); -extern Boolean row_insert_after F_PROTO((XtPointer d, - int node_size)); +extern Boolean row_insert_after (XtPointer d, + int node_size); -extern Boolean row_insert_before F_PROTO((XtPointer f, - int node_size)); +extern Boolean row_insert_before (XtPointer f, + int node_size); -extern Boolean column_insert_after F_PROTO((XtPointer d, - int node_size)); +extern Boolean column_insert_after (XtPointer d, + int node_size); -extern Boolean column_insert_before F_PROTO((XtPointer f, - int node_size)); +extern Boolean column_insert_before (XtPointer f, + int node_size); -extern XtPointer get_table F_PROTO((XtPointer f)); +extern XtPointer get_table (XtPointer f); -extern XtPointer get_cell F_PROTO((XtPointer p, - int i, - int j)); +extern XtPointer get_cell (XtPointer p, + int i, + int j); -extern void get_table_size F_PROTO((XtPointer p, - int *i, - int *j)); +extern void get_table_size (XtPointer p, + int *i, + int *j); -extern void get_cell_positions F_PROTO((XtPointer p, - int *i, - int *j)); +extern void get_cell_positions (XtPointer p, + int *i, + int *j); -extern void row_delete F_PROTO((XtPointer p)); +extern void row_delete (XtPointer p); -extern void column_delete F_PROTO((XtPointer p)); +extern void column_delete (XtPointer p); -extern void delete_table F_PROTO((XtPointer p)); +extern void delete_table (XtPointer p); -extern Boolean go_table F_PROTO((XtPointer w, - XawTableProc proc, - XtPointer table, - int begin_row, - int end_row, - int begin_column, - int end_column, - int direction, - int *row, - int *column, - XtPointer client_data)); +extern Boolean go_table (XtPointer w, + XawTableProc proc, + XtPointer table, + int begin_row, + int end_row, + int begin_column, + int end_column, + int direction, + int *row, + int *column, + XtPointer client_data); #ifdef EBUG_XRAW_MALLOC -extern void _check_table F_PROTO((XtPointer table, - int rows, - int columns)); +extern void _check_table (XtPointer table, + int rows, + int columns); #endif -#undef F_PROTO - #endif /* _table_h_ */ diff --git a/obm/ObmW/Tabs.c b/obm/ObmW/Tabs.c index c8ef3b9..1d71f61 100644 --- a/obm/ObmW/Tabs.c +++ b/obm/ObmW/Tabs.c @@ -264,63 +264,6 @@ static XtResource tabsConstraintResources[] = { } ; #undef offset - - - -#if !NeedFunctionPrototypes - - /* FORWARD REFERENCES: */ - - /* member functions */ - -static void TabsClassInit(); -static void TabsInit(); -static void TabsResize(); -static void TabsExpose(); -static void TabsDestroy(); -static void TabsRealize(); -static Boolean TabsSetValues(); -static Boolean TabsAcceptFocus(); -static XtGeometryResult TabsQueryGeometry(); -static XtGeometryResult TabsGeometryManager(); -static void TabsChangeManaged(); -static void TabsConstraintInitialize() ; -static Boolean TabsConstraintSetValues() ; - - /* action procs */ - -static void TabsSelect() ; -static void TabsPage() ; -static void TabsHighlight() ; -static void TabsUnhighlight() ; - - /* internal privates */ - -static void TabsAllocGCs() ; /* get rendering GCs */ -static void TabsFreeGCs() ; /* return rendering GCs */ -static void DrawTabs() ; /* draw all tabs */ -static void DrawTab() ; /* draw one index tab */ -static void DrawFrame() ; /* draw frame around contents */ -static void DrawTrim() ; /* draw trim around a tab */ -static void DrawBorder() ; /* draw border */ -static void DrawHighlight() ; /* draw highlight */ -static void UndrawTab() ; /* undraw interior of a tab */ -static void TabWidth() ; /* recompute tab size */ -static void GetPreferredSizes() ; /* query all children for their sizes */ -static void MaxChild() ; /* find max preferred child size */ -static int PreferredSize() ; /* compute preferred size */ -static int PreferredSize2() ; /* compute preferred size */ -static int PreferredSize3() ; /* compute preferred size */ -static void MakeSizeRequest() ; /* try to change size */ -static void getBitmapInfo() ; -static int TabLayout() ; /* lay out tabs */ -static void TabsShuffleRows() ; /* bring current tab to bottom row */ - -static void TabsAllocFgGC() ; -static void TabsAllocGreyGC() ; - -#else - static void TabsClassInit(void) ; static void TabsInit( Widget req, Widget new, ArgList, Cardinal *nargs) ; static void TabsConstraintInitialize(Widget, Widget, ArgList, Cardinal *) ; @@ -373,8 +316,6 @@ static void getBitmapInfo( TabsWidget tw, TabsConstraints tab) ; static void TabsAllocFgGC( TabsWidget tw) ; static void TabsAllocGreyGC( TabsWidget tw) ; -#endif - #define AddRect(i,xx,yy,w,h) \ do{rects[(i)].x=(xx); rects[i].y=(yy); \ rects[i].width=(w); rects[i].height=(h);}while(0) diff --git a/obm/ObmW/Tabs.h b/obm/ObmW/Tabs.h index d53b56f..cbcfd6a 100644 --- a/obm/ObmW/Tabs.h +++ b/obm/ObmW/Tabs.h @@ -165,21 +165,8 @@ typedef struct _TabsRec *TabsWidget; _XFUNCPROTOBEGIN -extern void -XawTabsSetTop( -#if NeedFunctionPrototypes - Widget w, - Bool callCallbacks -#endif -) ; - -extern void -XawTabsSetHighlight( -#if NeedFunctionPrototypes - Widget tabs, - Widget w -#endif -) ; +extern void XawTabsSetTop(Widget, Bool); +extern void XawTabsSetHighlight(Widget, Widget) ; _XFUNCPROTOEND diff --git a/obm/ObmW/Toggle.c b/obm/ObmW/Toggle.c index 6f55305..28fd619 100644 --- a/obm/ObmW/Toggle.c +++ b/obm/ObmW/Toggle.c @@ -5,21 +5,9 @@ #include #include "Converters.h" #include "ToggleP.h" -static void toggle( -#if NeedFunctionPrototypes -Widget,XEvent*,String*,Cardinal* -#endif -); -static void switch_on( -#if NeedFunctionPrototypes -Widget,XEvent*,String*,Cardinal* -#endif -); -static void switch_off( -#if NeedFunctionPrototypes -Widget,XEvent*,String*,Cardinal* -#endif -); +static void toggle(Widget,XEvent*,String*,Cardinal*); +static void switch_on(Widget,XEvent*,String*,Cardinal*); +static void switch_off(Widget,XEvent*,String*,Cardinal*); static XtActionsRec actionsList[] = { {"toggle", toggle}, @@ -32,36 +20,13 @@ static char defaultTranslations[] = "\ : toggle() set_shadow() \n\ Return: toggle() \n\ "; -static void _resolve_inheritance( -#if NeedFunctionPrototypes -WidgetClass -#endif -); -static void initialize( -#if NeedFunctionPrototypes -Widget ,Widget,ArgList ,Cardinal * -#endif -); -static Boolean set_values( -#if NeedFunctionPrototypes -Widget ,Widget ,Widget,ArgList ,Cardinal * -#endif -); -static void expose( -#if NeedFunctionPrototypes -Widget,XEvent *,Region -#endif -); -static void create_on_gc( -#if NeedFunctionPrototypes -Widget -#endif -); -static void create_off_gc( -#if NeedFunctionPrototypes -Widget -#endif -); +static void _resolve_inheritance(WidgetClass); +static void initialize(Widget ,Widget,ArgList ,Cardinal *); +static Boolean set_values(Widget ,Widget ,Widget,ArgList ,Cardinal *); +static void expose(Widget,XEvent *,Region ); +static void create_on_gc(Widget); +static void create_off_gc(Widget); + /*ARGSUSED*/static void create_on_gc(self)Widget self; { XtGCMask mask = GCFillStyle; diff --git a/obm/ObmW/XrawInit.h b/obm/ObmW/XrawInit.h index cf6bcbc..382105a 100644 --- a/obm/ObmW/XrawInit.h +++ b/obm/ObmW/XrawInit.h @@ -22,19 +22,6 @@ #ifndef _XawInit_ #define _XawInit_ -#if !(defined(__STDC__) && __STDC__) && !defined(__cplusplus) && !defined(c_plusplus) && !defined(FUNCPROTO) && !defined(XTFUNCPROTO) && !defined(XAWFUNCPROTO) && !(defined(NeedFunctionPrototypes) && NeedFunctionPrototypes) -#define Xraw_NO_PROTO -#else -#define Xraw_NEED_PROTO -#endif /* __STDC__ */ - - -#ifdef Xraw_NEED_PROTO -#define Xraw_PROTO(args) args -#else -#define Xraw_PROTO(args) () -#endif - #define Xraw_VERSION 1 #define Xraw_REVISION 2 @@ -51,7 +38,7 @@ #define WNULL (Widget)NULL /* called from ClassInit procs */ -extern void XawInitializeWidgetSet Xraw_PROTO((void)); +extern void XawInitializeWidgetSet (void); #if defined(XtSpecificationRelease) && XtSpecificationRelease < 5 #define XPointer XtPointer diff --git a/obm/ObmW/color.c b/obm/ObmW/color.c index 7533eaa..ee6e0da 100644 --- a/obm/ObmW/color.c +++ b/obm/ObmW/color.c @@ -214,13 +214,9 @@ static void MixHSV(r, alpha, s, beta, t) */ void -#ifdef Xraw_NEED_PROTO -HSVToRGB(HSV *hsv, RGB *rgb) -#else HSVToRGB(hsv, rgb) HSV *hsv; RGB *rgb; -#endif { float p, q, t, f; float h = hsv->h; @@ -265,13 +261,9 @@ HSVToRGB(hsv, rgb) */ void -#ifdef Xraw_NEED_PROTO -RGBToHSV(RGB *rgb, HSV *hsv) -#else RGBToHSV(rgb, hsv) RGB *rgb; HSV *hsv; -#endif { float rr, gg, bb; float min, max; diff --git a/obm/ObmW/color.h b/obm/ObmW/color.h index 993de18..afe08a1 100644 --- a/obm/ObmW/color.h +++ b/obm/ObmW/color.h @@ -67,7 +67,7 @@ typedef struct _CMY { unsigned short c, m, y; } CMY; -extern void HSVToRGB Xraw_PROTO((HSV *, RGB *)); -extern void RGBToHSV Xraw_PROTO((RGB *, HSV *)); +extern void HSVToRGB (HSV *, RGB *); +extern void RGBToHSV (RGB *, HSV *); #endif /* _color_h_ */ From e047a8ce1e15acc1ecc7721ddeb8bdf93a88f9dc Mon Sep 17 00:00:00 2001 From: Ole Streicher Date: Wed, 24 Jul 2024 17:20:20 +0200 Subject: [PATCH 09/21] Add ListTreeFindChildNameInTree prototype --- obm/ObmW/ListTree.h | 1 + obm/widget.c | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/obm/ObmW/ListTree.h b/obm/ObmW/ListTree.h index e14b170..ff98c0e 100644 --- a/obm/ObmW/ListTree.h +++ b/obm/ObmW/ListTree.h @@ -105,6 +105,7 @@ int ListTreeOrderSiblings (Widget w, ListTreeItem *item); int ListTreeOrderChildren (Widget w, ListTreeItem *item); ListTreeItem *ListTreeFindSiblingName (Widget w, ListTreeItem *item, char *name); ListTreeItem *ListTreeFindChildName (Widget w, ListTreeItem *item, char *name); +ListTreeItem *ListTreeFindChildNameInTree(ListTreeWidget w, ListTreeItem *item, char *name); void ListTreeHighlightItem (Widget w, ListTreeItem *item); ListTreeItem *ListTreeFirstItem (Widget w); void ListTreeOpenAll (Widget w, ListTreeItem *start, int child_only); diff --git a/obm/widget.c b/obm/widget.c index 50fc829..ee61b93 100644 --- a/obm/widget.c +++ b/obm/widget.c @@ -655,7 +655,7 @@ WidgetDestroy (ObmObject object) */ if (!wp->widget_destroyed) { widgetSetDestroy (object); - widgetDestroy (obj); + widgetDestroy (object); } } @@ -2954,14 +2954,14 @@ widgetListTreeSelect (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) titem = ListTreeFindSiblingName (wp->w, first, top); if (titem) ListTreeOpenAll (wp->w, titem, 0); - item = ListTreeFindChildNameInTree (wp->w, titem, name); + item = ListTreeFindChildNameInTree ((ListTreeWidget) wp->w, titem, name); item = (item ? item : titem); } else { - titem = ListTreeFindSiblingName (wp->w, first, name); + titem = ListTreeFindSiblingName (wp->w, first, name); if (strcmp (name, titem->text) == 0) item = titem; else - item = ListTreeFindChildNameInTree (wp->w, titem, name); + item = ListTreeFindChildNameInTree ((ListTreeWidget) wp->w, titem, name); } ListTreeHighlightItem (wp->w, item); ListTreeOpenAll (wp->w, item, 0); @@ -3029,7 +3029,7 @@ widgetListTreeHighlight (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) if (argc == 3) { top = argv[2]; titem = ListTreeFindSiblingName (wp->w, first, top); - item = ListTreeFindChildNameInTree (wp->w, titem, name); + item = ListTreeFindChildNameInTree ((ListTreeWidget) wp->w, titem, name); item = (item ? item : titem); /* Now chain back up thru the parents and open the nodes. @@ -3042,11 +3042,11 @@ widgetListTreeHighlight (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) } else { if (first->open == 0) ListTreeOpenAll (wp->w, first, 0); - titem = ListTreeFindChildNameInTree (wp->w, first, name); + titem = ListTreeFindChildNameInTree ((ListTreeWidget) wp->w, first, name); if (titem && strcmp (name, titem->text) == 0) item = titem; else - item = ListTreeFindChildNameInTree (wp->w, titem, name); + item = ListTreeFindChildNameInTree ((ListTreeWidget) wp->w, titem, name); } ListTreeHighlightItem (wp->w, item); From e79a74105e4670aa9ccaf88cffd3713370ba8a15 Mon Sep 17 00:00:00 2001 From: Ole Streicher Date: Sat, 3 Aug 2024 12:52:31 +0200 Subject: [PATCH 10/21] More protoizing on obm --- obm/ObmW/Gterm.h | 71 +++++---- obm/ObmW/GtermGraphics.c | 222 +++++++--------------------- obm/ObmW/GtermImaging.c | 303 ++++++++++++--------------------------- obm/ObmW/GtermP.h | 3 - obm/gterm.c | 156 ++++++++++---------- obm/marker.c | 4 +- obm/widget.c | 5 +- 7 files changed, 272 insertions(+), 492 deletions(-) diff --git a/obm/ObmW/Gterm.h b/obm/ObmW/Gterm.h index dfaf019..93c745b 100644 --- a/obm/ObmW/Gterm.h +++ b/obm/ObmW/Gterm.h @@ -306,20 +306,24 @@ 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(); +typedef unsigned char uchar; +typedef void (*GtCallbackProc)(); + +extern void GtActivate(GtermWidget w); +extern void GtDeactivate(GtermWidget w); +extern void GtReset(GtermWidget w); +extern void GtFlush(GtermWidget w); +extern int GtReady(GtermWidget w); +extern void GtTimerInhibit(GtermWidget w, Boolean state); +extern void GtSetDataLevel(GtermWidget w, int ival); +extern void GtDeleteInputProc(GtermWidget w, GtCallbackProc userfcn, XtPointer client_data); +extern void GtDeleteResizeProc(GtermWidget w, GtCallbackProc userfcn, XtPointer client_data); +extern void GtDeleteResetProc(GtermWidget w, GtCallbackProc userfcn, XtPointer client_data); +extern void GtPostInputProc(GtermWidget w, GtCallbackProc userfcn, XtPointer client_data); +extern void GtPostResetProc(GtermWidget w, GtCallbackProc userfcn, XtPointer client_data); +extern void GtPostResizeProc(GtermWidget w, GtCallbackProc userfcn, XtPointer client_data); +extern int GtQueryRaster(GtermWidget w, int raster, int *type, + int *width, int *height, int *depth); extern void GtSetRaster(); extern int GtGetRaster(); extern void GtSetCursorPos(); @@ -345,25 +349,34 @@ extern void GtEndDialog(); extern void GtEraseDialog(); extern void GtDrawDialogText(); extern void GtGetDialogTextSize(); -extern void GtRasterInit(); +extern void GtRasterInit(GtermWidget w); extern void initialize_shadow_pixmap (); -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 GtAssignRaster(GtermWidget w, int raster, XtPointer drawable, int type); +extern int GtCreateRaster(GtermWidget w, int raster, int type, + int width, int height, int depth); +extern void GtDestroyRaster(GtermWidget w, int raster); +extern int GtNextRaster(GtermWidget w); +extern int GtNRasters(GtermWidget w); +extern int GtWritePixels(GtermWidget w, int raster, uchar *pixels, int nbits, + int x1, int y1, int nx, int ny); +extern int GtReadPixels(GtermWidget w, int raster, uchar *pixels, int nbits, + int x1, int y1, int nx, int ny); +extern void GtRefreshPixels(GtermWidget w, int raster, int ct, + int x1, int y1, int nx, int ny); extern int GtGetClientPixel(); -extern int GtSetPixels(); -extern Pixmap GtExtractPixmap(); -extern int GtInsertPixmap(); +extern int GtSetPixels(GtermWidget w, int raster, int ct, int x1, int y1, + int nx, int ny, int color, int rop); +extern Pixmap GtExtractPixmap(GtermWidget w, int src, int ctype, + int x, int y, int width, int height); +extern int GtInsertPixmap(GtermWidget w, Pixmap pixmap, int dst, int ctype, + int x, int y, int width, int height); extern int GtNextColormap(); extern void GtFreeColormap(); -extern int GtWriteColormap(); -extern int GtReadColormap(); -extern int GtLoadColormap(); +extern int GtWriteColormap(GtermWidget w, int map, int first, int nelem, + ushort *r, ushort *g, ushort *b); +extern int GtReadColormap(GtermWidget w, int map, int first, int nelem, + ushort *r, ushort *g, ushort *b); +extern int GtLoadColormap(GtermWidget w, int map, float offset, float slope); extern int GtQueryColormap(); extern void GtSetColormapFocus(); extern void GtInitMappings(); diff --git a/obm/ObmW/GtermGraphics.c b/obm/ObmW/GtermGraphics.c index 500da43..da0469f 100644 --- a/obm/ObmW/GtermGraphics.c +++ b/obm/ObmW/GtermGraphics.c @@ -5,16 +5,14 @@ */ void -GtActivate (w) - GtermWidget w; +GtActivate (GtermWidget w) { w->gterm.interactive = 0; w->gterm.save_x = w->gterm.save_y = 0; } void -GtDeactivate (w) - GtermWidget w; +GtDeactivate (GtermWidget w) { Display *display = w->gterm.display; Window window = w->gterm.window; @@ -40,15 +38,13 @@ GtDeactivate (w) } int -GtReady (w) - GtermWidget w; +GtReady (GtermWidget w) { return (w->gterm.delay == 0); } void -GtReset (w) - GtermWidget w; +GtReset (GtermWidget w) { invalidate_draw_context (w); set_default_color_index (w); @@ -65,9 +61,7 @@ GtReset (w) } void -GtTimerInhibit (w, state) - GtermWidget w; - Boolean state; +GtTimerInhibit (GtermWidget w, Boolean state) { /* This is a kludge to allow a client (xgterm) to disable use of timers * if they don't work in a given implementation. @@ -76,9 +70,7 @@ GtTimerInhibit (w, state) } void -GtAugmentTranslations (w, translations) - GtermWidget w; - char *translations; +GtAugmentTranslations (GtermWidget w, char *translations) { int i; @@ -92,9 +84,7 @@ GtAugmentTranslations (w, translations) } void -GtOverrideTranslations (w, translations) - GtermWidget w; - char *translations; +GtOverrideTranslations (GtermWidget w, char *translations) { int i; @@ -108,35 +98,27 @@ GtOverrideTranslations (w, translations) } void -GtFlush (w) - GtermWidget w; +GtFlush (GtermWidget w) { XFlush (w->gterm.display); } void -GtSetLogRes (w, width, height) - GtermWidget w; - int width, height; +GtSetLogRes (GtermWidget w, int width, int height) { w->gterm.xres = width; w->gterm.yres = height; } void -GtGetLogRes (w, width, height) - GtermWidget w; - int *width, *height; +GtGetLogRes (GtermWidget w, int *width, int *height) { *width = w->gterm.xres; *height = w->gterm.yres; } void -GtGetPhysRes (w, raster, width, height) - GtermWidget w; - int raster; /* zero for screen size */ - int *width, *height; +GtGetPhysRes (GtermWidget w, int raster, int *width, int *height) { if (raster) { Raster rp = &w->gterm.rasters[raster]; @@ -149,18 +131,13 @@ GtGetPhysRes (w, raster, width, height) } void -GtSetPhysRes (w, raster, width, height) - GtermWidget w; - int raster; - int width, height; +GtSetPhysRes (GtermWidget w, int raster, int width, int height) { GtCreateRaster (w, raster, GtServer, width, height, RasterDepth); } void -GtSetRaster (w, raster) - GtermWidget w; - int raster; +GtSetRaster (GtermWidget w, int raster) { if (raster >= 0 && raster < w->gterm.maxRasters) { w->gterm.raster = raster; @@ -169,17 +146,14 @@ GtSetRaster (w, raster) } int -GtGetRaster (w) - GtermWidget w; +GtGetRaster (GtermWidget w) { return (w->gterm.raster); } /* ARGSUSED */ void -GtSetTextRes (w, optrows, optcols) - GtermWidget w; - int optrows, optcols; +GtSetTextRes (GtermWidget w, int optrows, int optcols) { w->gterm.optrows = optrows; w->gterm.optcols = optcols; @@ -187,16 +161,12 @@ GtSetTextRes (w, optrows, optcols) /* ARGSUSED */ void -GtSetCharSize (w, ival) - GtermWidget w; - int ival; +GtSetCharSize (GtermWidget w, int ival) { } void -GtSetDataLevel (w, ival) - GtermWidget w; - int ival; +GtSetDataLevel (GtermWidget w, int ival) { invalidate_draw_context (w); @@ -232,9 +202,7 @@ GtSetDataLevel (w, ival) void -GtSetLineWidth (w, ival) - GtermWidget w; - int ival; +GtSetLineWidth (GtermWidget w, int ival) { w->gterm.line_width = ival; GtSetLineStyle (w, w->gterm.line_style); @@ -246,9 +214,7 @@ GtSetLineWidth (w, ival) #define Dash3Dot "\024\003\001\003\001\003\001\003" void -GtSetLineStyle (w, ival) - GtermWidget w; - int ival; +GtSetLineStyle (GtermWidget w, int ival) { int line_width = w->gterm.line_width; int line_style = LineSolid; @@ -299,9 +265,7 @@ GtSetLineStyle (w, ival) } void -GtSetColorIndex (w, ival) - GtermWidget w; - int ival; +GtSetColorIndex (GtermWidget w, int ival) { int color = w->gterm.iomap[ival]; @@ -332,9 +296,7 @@ GtSetColorIndex (w, ival) } void -GtSetFillType (w, ival) - GtermWidget w; - int ival; +GtSetFillType (GtermWidget w, int ival) { switch (ival) { case GtSolid: @@ -345,8 +307,7 @@ GtSetFillType (w, ival) } void -GtClearScreen (w) -GtermWidget w; +GtClearScreen (GtermWidget w) { Mapping mp; @@ -392,10 +353,7 @@ GtermWidget w; } void -GtDrawPolyline (w, pv, npts) - GtermWidget w; - XPoint *pv; - int npts; +GtDrawPolyline (GtermWidget w, XPoint *pv, int npts) { XPoint *points, o_pv[MAX_POINTS]; DrawContext dx = get_draw_context (w); @@ -418,10 +376,7 @@ GtDrawPolyline (w, pv, npts) } void -GtDrawPolymarker (w, pv, npts) - GtermWidget w; - XPoint *pv; - int npts; +GtDrawPolymarker (GtermWidget w, XPoint *pv, int npts) { XPoint *points, o_pv[MAX_POINTS]; DrawContext dx = get_draw_context (w); @@ -444,10 +399,7 @@ GtDrawPolymarker (w, pv, npts) } void -GtDrawPolygon (w, pv, npts) - GtermWidget w; - XPoint *pv; - int npts; +GtDrawPolygon (GtermWidget w, XPoint *pv, int npts) { XPoint *points, o_pv[MAX_POINTS]; DrawContext dx = get_draw_context (w); @@ -501,17 +453,12 @@ GtDrawPolygon (w, pv, npts) } void -GtDrawMarker (w, x, y, xsize, ysize, type) - GtermWidget w; - int x, y; - int xsize, ysize; - int type; +GtDrawMarker (GtermWidget w, int x, int y, int xsize, int ysize, int type) { } void -GtBell (w) - GtermWidget w; +GtBell (GtermWidget w) { XBell (w->gterm.display, 0); } @@ -540,9 +487,7 @@ GtBell (w) * coordinate transformation, but there are no mappings to complicate things. */ void -GtSetCursorPos (w, x, y) - GtermWidget w; - int x, y; +GtSetCursorPos (GtermWidget w, int x, int y) { MappingContext mx; DrawContext dx; @@ -662,18 +607,14 @@ GtSetCursorPos (w, x, y) } void -GtGetCursorPos (w, x, y) - GtermWidget w; - int *x, *y; +GtGetCursorPos (GtermWidget w, int *x, int *y) { *x = w->gterm.last_x; *y = w->gterm.last_y; } void -GtSetCursorType (w, type) - GtermWidget w; - int type; +GtSetCursorType (GtermWidget w, int type) { static XtIntervalId id = (XtIntervalId) NULL; Display *display = w->gterm.display; @@ -839,9 +780,7 @@ GtSetCursorType (w, type) } static void -blink_cursor (w, id) - GtermWidget w; - XtIntervalId *id; +blink_cursor (GtermWidget w, XtIntervalId *id) { XtAppContext app_context; XColor bg, fg; @@ -866,10 +805,7 @@ blink_cursor (w, id) } void -GtPostInputProc (w, userfcn, client_data) - GtermWidget w; - GtCallbackProc userfcn; - XtPointer client_data; +GtPostInputProc (GtermWidget w, GtCallbackProc userfcn, XtPointer client_data) { GtCallback *cb, *new; @@ -887,10 +823,7 @@ GtPostInputProc (w, userfcn, client_data) } void -GtDeleteInputProc (w, userfcn, client_data) - GtermWidget w; - GtCallbackProc userfcn; - XtPointer client_data; +GtDeleteInputProc (GtermWidget w, GtCallbackProc userfcn, XtPointer client_data) { GtCallback *cb, *prev; @@ -907,10 +840,7 @@ GtDeleteInputProc (w, userfcn, client_data) } void -GtPostResetProc (w, userfcn, client_data) - GtermWidget w; - GtCallbackProc userfcn; - XtPointer client_data; +GtPostResetProc (GtermWidget w, GtCallbackProc userfcn, XtPointer client_data) { GtCallback *cb, *new; @@ -928,10 +858,7 @@ GtPostResetProc (w, userfcn, client_data) } void -GtDeleteResetProc (w, userfcn, client_data) - GtermWidget w; - GtCallbackProc userfcn; - XtPointer client_data; +GtDeleteResetProc (GtermWidget w, GtCallbackProc userfcn, XtPointer client_data) { GtCallback *cb, *prev; @@ -948,10 +875,7 @@ GtDeleteResetProc (w, userfcn, client_data) } void -GtPostResizeProc (w, userfcn, client_data) - GtermWidget w; - GtCallbackProc userfcn; - XtPointer client_data; +GtPostResizeProc (GtermWidget w, GtCallbackProc userfcn, XtPointer client_data) { GtCallback *cb, *new; @@ -969,10 +893,7 @@ GtPostResizeProc (w, userfcn, client_data) } void -GtDeleteResizeProc (w, userfcn, client_data) - GtermWidget w; - GtCallbackProc userfcn; - XtPointer client_data; +GtDeleteResizeProc (GtermWidget w, GtCallbackProc userfcn, XtPointer client_data) { GtCallback *cb, *prev; @@ -989,10 +910,7 @@ GtDeleteResizeProc (w, userfcn, client_data) } void -GtDrawAlphaText (w, x, y, text) - GtermWidget w; - int x, y; - char *text; +GtDrawAlphaText (GtermWidget w, int x, int y, char *text) { XPoint *points, pv[1], o_pv[1]; DrawContext dx = get_draw_context (w); @@ -1019,10 +937,7 @@ GtDrawAlphaText (w, x, y, text) } void -GtGetAlphaTextSize (w, string, width, height, base) - GtermWidget w; - char *string; - int *width, *height, *base; +GtGetAlphaTextSize (GtermWidget w, char *string, int *width, int *height, int *base) { XFontStruct *fp; @@ -1037,21 +952,17 @@ GtGetAlphaTextSize (w, string, width, height, base) } void -GtWriteAlphaCursor (w, x, y) - GtermWidget w; - int x, y; +GtWriteAlphaCursor (GtermWidget w, int x, int y) { } void -GtEraseAlphaCursor (w) - GtermWidget w; +GtEraseAlphaCursor (GtermWidget w) { } void -GtStartDialog (w) - GtermWidget w; +GtStartDialog (GtermWidget w) { if (DBG_TRACE) fprintf (stderr, "GtStartDialog: ENTER d_pixmap=0x%x d_saved=%d\n", @@ -1075,16 +986,14 @@ GtStartDialog (w) } void -GtEndDialog (w) - GtermWidget w; +GtEndDialog (GtermWidget w) { GtEraseDialog (w); w->gterm.d_saved = 0; } void -GtEraseDialog (w) - GtermWidget w; +GtEraseDialog (GtermWidget w) { if (DBG_TRACE) fprintf (stderr, "GtEraseDialog: ENTER d_pixmap=0x%x d_saved=%d\n", @@ -1107,10 +1016,7 @@ GtEraseDialog (w) } void -GtDrawDialogText (w, x, y, text) - GtermWidget w; - int x, y; - char *text; +GtDrawDialogText (GtermWidget w, int x, int y, char *text) { int xpos = w->gterm.d_xoff + x; int ypos = w->gterm.d_yoff + y; @@ -1123,10 +1029,7 @@ GtDrawDialogText (w, x, y, text) } void -GtGetDialogTextSize (w, string, width, height, base) - GtermWidget w; - char *string; - int *width, *height, *base; +GtGetDialogTextSize (GtermWidget w, char *string, int *width, int *height, int *base) { XFontStruct *fp; @@ -1147,8 +1050,7 @@ GtGetDialogTextSize (w, string, width, height, base) */ static void -set_default_color_index (w) - GtermWidget w; +set_default_color_index (GtermWidget w) { /* The default color index is 1, corresponding to the foreground * drawing color color1. Index zero is the background drawing color @@ -1167,9 +1069,7 @@ set_default_color_index (w) static void -draw_crosshair (w, x, y) - GtermWidget w; - int x, y; +draw_crosshair (GtermWidget w, int x, int y) { if (!w || !XtIsRealized ((Widget)w)) return; @@ -1206,8 +1106,7 @@ draw_crosshair (w, x, y) static void -erase_crosshair (w) - GtermWidget w; +erase_crosshair (GtermWidget w) { if (!w || !XtIsRealized ((Widget)w)) return; @@ -1242,9 +1141,7 @@ erase_crosshair (w) static void -update_transients (w, region) - GtermWidget w; - Region region; +update_transients (GtermWidget w, Region region) { /* If an explicit region is given redisplay any markers in it immediately, * otherwise set the redisplay flag to cause a full screen redisplay when @@ -1261,8 +1158,7 @@ update_transients (w, region) static void -update_cursor (w) - GtermWidget w; +update_cursor (GtermWidget w) { if (w->gterm.cursor_type == GtGinmodeCursor && w->gterm.full_crosshair) { int x = w->gterm.cur_x; @@ -1274,9 +1170,7 @@ update_cursor (w) } static Cursor -get_cursor (w, cursor_name) - GtermWidget w; - String cursor_name; +get_cursor (GtermWidget w, String cursor_name) { XrmValue from, to; Cursor cursor; @@ -1295,8 +1189,7 @@ get_cursor (w, cursor_name) static DrawContext -get_draw_context (w) - GtermWidget w; +get_draw_context (GtermWidget w) { DrawContext dx = &w->gterm.draw; @@ -1454,8 +1347,7 @@ get_draw_context (w) static void -invalidate_draw_context (w) - GtermWidget w; +invalidate_draw_context (GtermWidget w) { DrawContext dx = &w->gterm.draw; MappingContext mx; @@ -1472,11 +1364,7 @@ invalidate_draw_context (w) } static XPoint * -mapVector (mx, pv1, pv2, npts) - MappingContext mx; - XPoint *pv1; - XPoint *pv2; - int npts; +mapVector (MappingContext mx, XPoint *pv1, XPoint *pv2, int npts) { XPoint *ip = pv1; XPoint *op = pv2; diff --git a/obm/ObmW/GtermImaging.c b/obm/ObmW/GtermImaging.c index 4710cbf..840f06f 100644 --- a/obm/ObmW/GtermImaging.c +++ b/obm/ObmW/GtermImaging.c @@ -73,8 +73,7 @@ * --------------------------------------------------------------------------- */ void -GtRasterInit (w) - GtermWidget w; +GtRasterInit (GtermWidget w) { int i; Raster rp; @@ -160,8 +159,7 @@ initialize_shadow_pixmap (GtermWidget w, int dst) /* GtNextRaster -- Return the index of the next unused raster. */ int -GtNextRaster (w) - GtermWidget w; +GtNextRaster (GtermWidget w) { int i; @@ -177,8 +175,7 @@ GtNextRaster (w) /* GtNRasters -- Return the number of currently defined rasters. */ int -GtNRasters (w) - GtermWidget w; +GtNRasters (GtermWidget w) { return (w->gterm.nrasters); } @@ -190,11 +187,11 @@ GtNRasters (w) * this allows use of this code to access other windows, or shared pixmaps. */ int -GtAssignRaster (w, raster, drawable, type) - GtermWidget w; - int raster; /* one-indexed */ - XtPointer drawable; /* object containing pixel array */ - int type; /* type of drawable [not used] */ +GtAssignRaster ( + GtermWidget w, + int raster, /* one-indexed */ + XtPointer drawable, /* object containing pixel array */ + int type) /* type of drawable [not used] */ { Raster rp; XWindowAttributes wa; @@ -226,12 +223,7 @@ GtAssignRaster (w, raster, drawable, type) * current value of the cacheRasters resource. */ int -GtCreateRaster (w, raster, type, width, height, depth) - GtermWidget w; - int raster; /* one-indexed */ - int type; - int width, height; - int depth; +GtCreateRaster (GtermWidget w, int raster, int type, int width, int height, int depth) { uchar *op; int npix, pixel; @@ -432,9 +424,7 @@ GtCreateRaster (w, raster, type, width, height, depth) * raster are deactivated, and all storage associated with the raster is freed. */ void -GtDestroyRaster (w, raster) - GtermWidget w; - int raster; +GtDestroyRaster (GtermWidget w, int raster) { Raster rp; Mapping mp, next; @@ -471,12 +461,7 @@ GtDestroyRaster (w, raster) * size. */ int -GtQueryRaster (w, raster, type, width, height, depth) - GtermWidget w; - int raster; /* one-indexed */ - int *type; - int *width, *height; - int *depth; +GtQueryRaster (GtermWidget w, int raster, int *type, int *width, int *height, int *depth) { Raster rp; @@ -521,13 +506,8 @@ GtQueryRaster (w, raster, type, width, height, depth) * refreshed by the mapping. */ int -GtWritePixels (w, raster, pixels, nbits, x1, y1, nx, ny) - GtermWidget w; - int raster; - uchar *pixels; - int nbits; /* not used */ - int x1, y1; - int nx, ny; +GtWritePixels (GtermWidget w, int raster, uchar *pixels, int nbits, + int x1, int y1, int nx, int ny) { uchar *ip, *op; Pixel *cmap; @@ -713,13 +693,8 @@ GtWritePixels (w, raster, pixels, nbits, x1, y1, nx, ny) /* GtReadPixels -- Read a rectangular region of a raster. */ int -GtReadPixels (w, raster, pixels, nbits, x1, y1, nx, ny) - GtermWidget w; - int raster; - uchar *pixels; - int nbits; /* not used */ - int x1, y1; - int nx, ny; +GtReadPixels (GtermWidget w, int raster, uchar *pixels, int nbits, + int x1, int y1, int nx, int ny) { uchar *ip, *op; Pixel *cmap; @@ -832,14 +807,8 @@ GtReadPixels (w, raster, pixels, nbits, x1, y1, nx, ny) * If nx=ny=0 the entire raster will be written. */ int -GtSetPixels (w, raster, ct, x1, y1, nx, ny, color, rop) - GtermWidget w; - int raster; - int ct; - int x1, y1; - int nx, ny; - int color; - int rop; +GtSetPixels (GtermWidget w, int raster, int ct, int x1, int y1, + int nx, int ny, int color, int rop) { Raster rp; Mapping mp; @@ -940,12 +909,7 @@ GtSetPixels (w, raster, ct, x1, y1, nx, ny, color, rop) * write pixels call. */ void -GtRefreshPixels (w, raster, ct, x1, y1, nx, ny) - GtermWidget w; - int raster; - int ct; - int x1, y1; - int nx, ny; +GtRefreshPixels (GtermWidget w, int raster, int ct, int x1, int y1, int nx, int ny) { Raster rp = &w->gterm.rasters[raster]; Mapping mp; @@ -1012,12 +976,7 @@ GtRefreshPixels (w, raster, ct, x1, y1, nx, ny) * as a pixmap. The caller is responsible for later deleting this pixmap. */ Pixmap -GtExtractPixmap (w, src, ctype, x, y, width, height) - GtermWidget w; - int src; - int ctype; - int x, y; - int width, height; +GtExtractPixmap (GtermWidget w, int src, int ctype, int x, int y, int width, int height) { Raster rp; int x1, y1, nx, ny; @@ -1095,13 +1054,8 @@ GtExtractPixmap (w, src, ctype, x, y, width, height) * at the indicated coordinates. */ int -GtInsertPixmap (w, pixmap, dst, ctype, x, y, width, height) - GtermWidget w; - Pixmap pixmap; - int dst; - int ctype; - int x, y; - int width, height; +GtInsertPixmap (GtermWidget w, Pixmap pixmap, int dst, int ctype, + int x, int y, int width, int height) { Raster rp; XWindowAttributes wa; @@ -1188,12 +1142,8 @@ GtInsertPixmap (w, pixmap, dst, ctype, x, y, width, height) * seen use a one-to-one mapping to preserve the 8 bit pixel values. */ int -GtWriteColormap (w, map, first, nelem, r, g, b) - GtermWidget w; - int map; - int first; - int nelem; - ushort *r, *g, *b; +GtWriteColormap (GtermWidget w, int map, int first, int nelem, + ushort *r, ushort *g, ushort *b) { XWindowAttributes wa; XColor *cp; @@ -1524,12 +1474,8 @@ GtWriteColormap (w, map, first, nelem, r, g, b) * colormap. */ int -GtReadColormap (w, map, first, nelem, r, g, b) - GtermWidget w; - int map; - int first; - int nelem; - ushort *r, *g, *b; +GtReadColormap (GtermWidget w, int map, int first, int nelem, + ushort *r, ushort *g, ushort *b) { int i; @@ -1628,10 +1574,7 @@ GtReadColormap (w, map, first, nelem, r, g, b) * intensities - the input colormap is used as is, without resampling. */ int -GtLoadColormap (w, map, offset, slope) - GtermWidget w; - int map; - float offset, slope; +GtLoadColormap (GtermWidget w, int map, float offset, float slope) { int i; XColor *cp; @@ -1824,10 +1767,7 @@ GtSetColormapFocus (int box_size) /* GtQueryColormap -- Return information on the size and state of a colormap. */ int -GtQueryColormap (w, map, first, nelem, maxelem) - GtermWidget w; - int map; - int *first, *nelem, *maxelem; +GtQueryColormap (GtermWidget w, int map, int *first, int *nelem, int *maxelem) { struct colormap *cm; int nitems; @@ -1876,8 +1816,7 @@ GtQueryColormap (w, map, first, nelem, maxelem) /* GtNextColormap -- Return a unique colormap number. */ int -GtNextColormap (w) - GtermWidget w; +GtNextColormap (GtermWidget w) { struct colormap *cm; int mapno = 0; @@ -1894,9 +1833,7 @@ GtNextColormap (w) /* GtFreeColormap -- Free a colormap descriptor. */ void -GtFreeColormap (w, colormap) - GtermWidget w; - int colormap; +GtFreeColormap (GtermWidget w, int colormap) { struct colormap *p_cm, *cm; @@ -1934,10 +1871,7 @@ GtFreeColormap (w, colormap) * in i/o operations between the client and the Gterm widget. */ void -GtWriteIomap (w, iomap, first, nelem) - GtermWidget w; - ushort *iomap; - int first, nelem; +GtWriteIomap (GtermWidget w, ushort *iomap, int first, int nelem) { int c1, c2; @@ -1967,10 +1901,7 @@ GtWriteIomap (w, iomap, first, nelem) /* GtReadIomap -- Read back the contents of the iomap. */ void -GtReadIomap (w, iomap, first, nelem) - GtermWidget w; - uchar *iomap; - int first, nelem; +GtReadIomap (GtermWidget w, uchar *iomap, int first, int nelem) { int c1, c2; @@ -1985,10 +1916,7 @@ GtReadIomap (w, iomap, first, nelem) /* GtReadLUT -- Read back the contents of the global LUT. */ void -GtReadLUT (w, lut, first, nelem) - GtermWidget w; - unsigned long *lut; - int first, nelem; +GtReadLUT (GtermWidget w, unsigned long *lut, int first, int nelem) { int c1, c2; @@ -2003,8 +1931,7 @@ GtReadLUT (w, lut, first, nelem) /* init_iomap -- Initialize the iomap and the cmap cache. */ static void -init_iomap (w) - GtermWidget w; +init_iomap (GtermWidget w) { ushort *iomap = w->gterm.iomap; int i; @@ -2017,7 +1944,7 @@ init_iomap (w) /* init_global_map -- Initialize the global cmap; */ static void -init_global_cmap () +init_global_cmap (void) { int i; @@ -2028,8 +1955,7 @@ init_global_cmap () /* invalidate_cmap -- Invalidate the cmap cache. */ static void -invalidate_cmap (w) - GtermWidget w; +invalidate_cmap (GtermWidget w) { w->gterm.cmap_in_valid = w->gterm.cmap_out_valid = 0; } @@ -2039,8 +1965,7 @@ invalidate_cmap (w) * values received from the client to window system color indices. */ static Pixel * -get_cmap_in (w) - GtermWidget w; +get_cmap_in (GtermWidget w) { Pixel *cmap, *cmap_in = w->gterm.cmap_in; ushort *iomap; @@ -2082,8 +2007,7 @@ get_cmap_in (w) * not necessarily a uniquely defined invertible transformation. */ static Pixel * -get_cmap_out (w) - GtermWidget w; +get_cmap_out (GtermWidget w) { Pixel *cmap; ushort *iomap; @@ -2147,9 +2071,7 @@ get_cmap_out (w) /* get_pixel -- Convert a client color index into a display pixel. */ static Pixel -get_pixel (w, client_pixel) - GtermWidget w; - int client_pixel; +get_pixel (GtermWidget w, int client_pixel) { Pixel *cmap = get_cmap_in (w); @@ -2163,9 +2085,7 @@ get_pixel (w, client_pixel) /* GtGetClientPixel -- Convert a gterm pixel into a client pixel. */ int -GtGetClientPixel (w, pixel) - GtermWidget w; - int pixel; +GtGetClientPixel (GtermWidget w, int pixel) { int i; ushort *iomap; @@ -2187,8 +2107,7 @@ GtGetClientPixel (w, pixel) /* GtInitMappings -- Delete all mappings and initialize the mapping subsystem. */ void -GtInitMappings (w) - GtermWidget w; +GtInitMappings (GtermWidget w) { Mapping mp; int i; @@ -2224,8 +2143,7 @@ GtInitMappings (w) * This routine always returns a mapping index of 1 or higher. */ int -GtNextMapping (w) - GtermWidget w; +GtNextMapping (GtermWidget w) { Mapping mp; int i; @@ -2243,9 +2161,7 @@ GtNextMapping (w) /* GtFreeMapping -- Free a mapping descriptor. */ void -GtFreeMapping (w, mapping) - GtermWidget w; - int mapping; +GtFreeMapping (GtermWidget w, int mapping) { free_mapping (w, &w->gterm.mappings[mapping]); } @@ -2256,9 +2172,7 @@ GtFreeMapping (w, mapping) * the mapping is raised to the top of the stacking order. */ void -GtRaiseMapping (w, mapping, reference) - GtermWidget w; - int mapping, reference; +GtRaiseMapping (GtermWidget w, int mapping, int reference) { Mapping mp, ref_mp; @@ -2284,9 +2198,7 @@ GtRaiseMapping (w, mapping, reference) * mapping, causing the first mapping to be drawn below the second. */ void -GtLowerMapping (w, mapping, reference) - GtermWidget w; - int mapping, reference; +GtLowerMapping (GtermWidget w, int mapping, int reference) { Mapping mp, ref_mp; @@ -2323,9 +2235,7 @@ GtLowerMapping (w, mapping, reference) * mappings are the same, and a positive value is returned if m1 > m2. */ int -GtCompareMappings (w, map1, map2) - GtermWidget w; - int map1, map2; +GtCompareMappings (GtermWidget w, int map1, int map2) { Mapping mp, mp1, mp2; @@ -2368,14 +2278,14 @@ GtCompareMappings (w, map1, map2) * from 0.5 to 10.5 at the edges of the NDC space. */ int -GtSelectRaster (w, dras, dt, dx, dy, rt, rx, ry, rmap) - GtermWidget w; - int dras; /* display raster */ - int dt; /* coordinate type of input coords */ - int dx, dy; /* display raster coordinates */ - int rt; /* coordinate type for output */ - int *rx, *ry; /* raster coordinates (output) */ - int *rmap; /* mapping selected */ +GtSelectRaster ( + GtermWidget w, + int dras, /* display raster */ + int dt, /* coordinate type of input coords */ + int dx, int dy, /* display raster coordinates */ + int rt, /* coordinate type for output */ + int *rx, int *ry, /* raster coordinates (output) */ + int *rmap) /* mapping selected */ { Mapping mp; float x, y, x2, y2; @@ -2482,15 +2392,15 @@ GtSelectRaster (w, dras, dt, dx, dy, rt, rx, ry, rmap) * (many-to-one) mapping, select the antialiasing technique to be used. */ int -GtCopyRaster (w, rop, src,st,sx,sy,snx,sny, dst,dt,dx,dy,dnx,dny) - GtermWidget w; - int rop; /* rasterop */ - int src; /* 0=window, >0 = raster number */ - int st; /* coordinate type for source raster */ - int sx,sy,snx,sny; /* source raster */ - int dst; /* 0=window, >0 = raster number */ - int dt; /* coordinate type for destination raster */ - int dx,dy,dnx,dny; /* destination raster */ +GtCopyRaster ( + GtermWidget w, + int rop, /* rasterop */ + int src, /* 0=window, >0 = raster number */ + int st, /* coordinate type for source raster */ + int sx, int sy, int snx, int sny, /* source raster */ + int dst, /* 0=window, >0 = raster number */ + int dt, /* coordinate type for destination raster */ + int dx, int dy, int dnx, int dny) /* destination raster */ { struct mapping sv_mp, p_mp; /* MF007 */ int status; @@ -2535,16 +2445,16 @@ GtCopyRaster (w, rop, src,st,sx,sy,snx,sny, dst,dt,dx,dy,dnx,dny) * modifying the mapping are redrawn. */ int -GtSetMapping (w, mapping, rop, src,st,sx,sy,snx,sny, dst,dt,dx,dy,dnx,dny) - GtermWidget w; - int mapping; /* mapping number */ - int rop; /* rasterop */ - int src; /* 0=window, >0 = raster number */ - int st; /* coordinate type for source raster */ - int sx,sy,snx,sny; /* source raster */ - int dst; /* 0=window, >0 = raster number */ - int dt; /* coordinate type for source raster */ - int dx,dy,dnx,dny; /* destination raster */ +GtSetMapping ( + GtermWidget w, + int mapping, /* mapping number */ + int rop, /* rasterop */ + int src, /* 0=window, >0 = raster number */ + int st, /* coordinate type for source raster */ + int sx, int sy, int snx, int sny, /* source raster */ + int dst, /* 0=window, >0 = raster number */ + int dt, /* coordinate type for source raster */ + int dx, int dy, int dnx, int dny) /* destination raster */ { int i, j; Mapping mp, o_mp, n_mp; @@ -2774,16 +2684,16 @@ GtSetMapping (w, mapping, rop, src,st,sx,sy,snx,sny, dst,dt,dx,dy,dnx,dny) * is active. */ int -GtGetMapping (w, mapping, rop, src,st,sx,sy,snx,sny, dst,dt,dx,dy,dnx,dny) - GtermWidget w; - int mapping; /* mapping number */ - int *rop; /* rasterop */ - int *src; /* 0=window, >0 = raster number */ - int *st; /* coordinate type for source raster */ - int *sx,*sy,*snx,*sny; /* source raster */ - int *dst; /* 0=window, >0 = raster number */ - int *dt; /* coordinate type for source raster */ - int *dx,*dy,*dnx,*dny; /* destination raster */ +GtGetMapping ( + GtermWidget w, + int mapping, /* mapping number */ + int *rop, /* rasterop */ + int *src, /* 0=window, >0 = raster number */ + int *st, /* coordinate type for source raster */ + int *sx, int *sy, int *snx, int *sny, /* source raster */ + int *dst, /* 0=window, >0 = raster number */ + int *dt, /* coordinate type for source raster */ + int *dx, int *dy, int *dnx, int *dny) /* destination raster */ { Mapping mp; @@ -2805,9 +2715,7 @@ GtGetMapping (w, mapping, rop, src,st,sx,sy,snx,sny, dst,dt,dx,dy,dnx,dny) /* GtActiveMapping -- Query whether a mapping is active. */ int -GtActiveMapping (w, mapping) - GtermWidget w; - int mapping; /* mapping number */ +GtActiveMapping (GtermWidget w, int mapping) { Mapping mp; @@ -2826,10 +2734,7 @@ GtActiveMapping (w, mapping) * be mapped to the destination. */ int -GtEnableMapping (w, mapping, refresh) - GtermWidget w; - int mapping; /* mapping number */ - int refresh; /* refresh destination */ +GtEnableMapping (GtermWidget w, int mapping, int refresh) { Mapping mp; @@ -2862,9 +2767,7 @@ GtEnableMapping (w, mapping, refresh) ** */ void -GtSetDisplayRaster (gt, raster) - GtermWidget gt; - int raster; /* raster number */ +GtSetDisplayRaster (GtermWidget gt, int raster) { if (DBG_TRACE) fprintf (stderr, "GtSetDisplayRaster: raster=%d\n", raster); @@ -2879,10 +2782,7 @@ GtSetDisplayRaster (gt, raster) * with the mapping disabled. */ int -GtDisableMapping (w, mapping, erase) - GtermWidget w; - int mapping; /* mapping number */ - int erase; /* erase the destination */ +GtDisableMapping (GtermWidget w, int mapping, int erase) { int i; Mapping mp, dmp; @@ -2936,9 +2836,7 @@ GtDisableMapping (w, mapping, erase) /* GtRefreshMapping -- Refresh the destination region defined by a mapping. */ void -GtRefreshMapping (w, mapping) - GtermWidget w; - int mapping; /* mapping number */ +GtRefreshMapping (GtermWidget w, int mapping) { Mapping mp; struct mapping p_mp; @@ -2979,13 +2877,7 @@ GtRefreshMapping (w, mapping) * loss of precision. The input and output vectors may be the same vector. */ void -GtMapVector (w, mapping, dir, pv1, pv2, npts) - GtermWidget w; - int mapping; - int dir; /* GtMap, GtUnmap */ - DPoint *pv1; - DPoint *pv2; - int npts; +GtMapVector (GtermWidget w, int mapping, int dir, DPoint *pv1, DPoint *pv2, int npts) { DPoint *ip = pv1; DPoint *op = pv2; @@ -3045,12 +2937,7 @@ GtMapVector (w, mapping, dir, pv1, pv2, npts) * vectors may be the same vector. */ void -GtPixelToNDC (w, raster, pv1, pv2, npts) - GtermWidget w; - int raster; - DPoint *pv1; - DPoint *pv2; - int npts; +GtPixelToNDC (GtermWidget w, int raster, DPoint *pv1, DPoint *pv2, int npts) { Raster rp = &w->gterm.rasters[raster]; DPoint *ip = pv1; @@ -3069,12 +2956,7 @@ GtPixelToNDC (w, raster, pv1, pv2, npts) * vectors may be the same vector. */ void -GtNDCToPixel (w, raster, pv1, pv2, npts) - GtermWidget w; - int raster; - DPoint *pv1; - DPoint *pv2; - int npts; +GtNDCToPixel (GtermWidget w, int raster, DPoint *pv1, DPoint *pv2, int npts) { Raster rp = &w->gterm.rasters[raster]; DPoint *ip = pv1; @@ -3104,10 +2986,7 @@ GtNDCToPixel (w, raster, pv1, pv2, npts) * This routine is intended only for use during debugging. */ void -GtDebug (w, fp, what) - GtermWidget w; - FILE *fp; - int what; +GtDebug (GtermWidget w, FILE *fp, int what) { /* Default is to write everything to the stdout. */ what = what ? what : 0777; diff --git a/obm/ObmW/GtermP.h b/obm/ObmW/GtermP.h index 064f22f..4043089 100644 --- a/obm/ObmW/GtermP.h +++ b/obm/ObmW/GtermP.h @@ -49,8 +49,6 @@ typedef void (*GmVMethod)(); typedef int (*GmIMethod)(); -#define uchar unsigned char -#define ushort unsigned short /* Raster definitions. */ #define ImageRaster 1 @@ -296,7 +294,6 @@ typedef struct markerSelection *GmSelection; /* Gterm callbacks. */ -typedef void (*GtCallbackProc)(); struct gtCallback { GtCallbackProc proc; XtPointer client_data; diff --git a/obm/gterm.c b/obm/gterm.c index 05c43f2..537038d 100644 --- a/obm/gterm.c +++ b/obm/gterm.c @@ -281,7 +281,7 @@ static int dataLevelType(char *); static int lineStyle(char *); static int fillType(char *); static int colorToIndex(char *); -static void ndcToPixel(Widget, int, int, int, float *, float *); +static void ndcToPixel(GtermWidget, int, int, int, float *, float *); /* GtermClassInit -- Initialize the class record for the gterm widget class. */ @@ -542,13 +542,13 @@ GtermDestroy (ObmObject object) /* Delete the widget level callback. */ switch (cb->callback_type) { case CB_Input: - GtDeleteInputProc (w, gtermInputCallback, (XtPointer)cb); + GtDeleteInputProc ((GtermWidget)w, gtermInputCallback, (XtPointer)cb); break; case CB_Resize: - GtDeleteResizeProc (w, gtermResizeCallback, (XtPointer)cb); + GtDeleteResizeProc ((GtermWidget)w, gtermResizeCallback, (XtPointer)cb); break; case CB_Reset: - GtDeleteResetProc (w, gtermResetCallback, (XtPointer)cb); + GtDeleteResetProc ((GtermWidget)w, gtermResetCallback, (XtPointer)cb); break; } @@ -609,7 +609,7 @@ gtermActivate (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; GtActivate (w); return (TCL_OK); @@ -628,7 +628,7 @@ gtermDeactivate (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; GtDeactivate (w); return (TCL_OK); @@ -646,7 +646,7 @@ gtermReset (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; GtReset (w); return (TCL_OK); @@ -673,7 +673,7 @@ gtermFlush (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; GtFlush (w); return (TCL_OK); @@ -714,7 +714,7 @@ gtermAddCallback (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; GtermPrivate gp = &obj->gterm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; char *userproc, *callback_type; ObmCallback cb, new; int type; @@ -775,7 +775,7 @@ gtermDeleteCallback (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; GtermPrivate gp = &obj->gterm; ObmCallback cb, prev; - Widget w = obj->widget.w; + GtermWidget w = (GtermWidget) obj->widget.w; char *procedure; if (argc < 2) @@ -930,7 +930,7 @@ gtermResizeCallback (ObmCallback cb, Widget w) int rtype, width, height, depth, status; char s_width[SZ_NUMBER], s_height[SZ_NUMBER]; - GtQueryRaster (wp->w, 0, &rtype, &width, &height, &depth); + GtQueryRaster ((GtermWidget)w, 0, &rtype, &width, &height, &depth); sprintf (s_width, "%d", width); sprintf (s_height, "%d", height); @@ -1064,7 +1064,7 @@ gtermSetCursorType (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; char *cursor_type; int type; @@ -1097,7 +1097,7 @@ gtermBell (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; GtBell (w); return (TCL_OK); @@ -1115,7 +1115,7 @@ gtermSetRaster (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; int raster; if (argc < 2) @@ -1142,7 +1142,7 @@ gtermGetRaster (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; char buf[SZ_NUMBER], *raster_var; int raster; @@ -1173,7 +1173,7 @@ gtermSetLogRes (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; int width, height; if (argc < 3) @@ -1198,7 +1198,7 @@ gtermGetLogRes (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; char *s_width, *s_height; char buf[SZ_NUMBER]; int width, height; @@ -1234,7 +1234,7 @@ gtermSetPhysRes (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; int raster, width, height; if (argc < 3) @@ -1263,7 +1263,7 @@ gtermGetPhysRes (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; char *s_width, *s_height; int raster, width, height; char buf[SZ_NUMBER]; @@ -1303,7 +1303,7 @@ gtermSetTextRes (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; int rows, cols; if (argc < 3) @@ -1332,7 +1332,7 @@ gtermSetDataLevel (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; int level; if (argc < 2) @@ -1360,7 +1360,7 @@ gtermSetLineWidth (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; int width; if (argc < 2) @@ -1388,7 +1388,7 @@ gtermSetLineStyle (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; int style; if (argc < 2) @@ -1428,7 +1428,7 @@ gtermSetColorIndex (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; int color; if (argc < 2) @@ -1454,7 +1454,7 @@ gtermSetFillType (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; int filltype; if (argc < 2) @@ -1479,7 +1479,7 @@ gtermClearScreen (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; GtClearScreen (w); return (TCL_OK); @@ -1502,7 +1502,7 @@ gtermDrawPolyline (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; XPoint *pv; int npoints; @@ -1534,7 +1534,7 @@ gtermDrawPolymarker (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; XPoint *pv; int npoints; @@ -1566,7 +1566,7 @@ gtermDrawPolygon (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; XPoint *pv; int npoints; @@ -1595,7 +1595,7 @@ gtermDrawMarker (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; /* not yet implemented. */ return (TCL_ERROR); @@ -1622,7 +1622,7 @@ gtermDrawAlphaText (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; char *text; int x, y; @@ -1655,7 +1655,7 @@ gtermGetAlphaTextSize (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; XPoint *pv; char *s_width, *s_height, *s_base; @@ -1712,7 +1712,7 @@ gtermStartDialog (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; XPoint *pv; GtStartDialog (w); @@ -1733,7 +1733,7 @@ gtermEndDialog (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; XPoint *pv; GtEndDialog (w); @@ -1754,7 +1754,7 @@ gtermEraseDialog (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; XPoint *pv; GtEraseDialog (w); @@ -1782,7 +1782,7 @@ gtermDrawDialogText (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; XPoint *pv; char *text; int x, y; @@ -1816,7 +1816,7 @@ gtermGetDialogTextSize (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; XPoint *pv; char *s_width, *s_height, *s_base; @@ -1865,7 +1865,7 @@ gtermRasterInit (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; GtRasterInit (w); return (TCL_OK); @@ -1894,7 +1894,7 @@ gtermAssignRaster (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject gt_obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = >_obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; XtPointer drawable; ObmObject obj; int raster, type; @@ -1974,7 +1974,7 @@ gtermCreateRaster (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; int raster, width, height, type, depth; char *s_type; @@ -2013,7 +2013,7 @@ gtermDestroyRaster (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; int raster; if (argc < 2) @@ -2041,7 +2041,7 @@ gtermQueryRaster (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; char *s_width, *s_height, *s_type, *s_depth; int exists, raster, width, height, type, depth; @@ -2094,7 +2094,7 @@ gtermNextRaster (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; char buf[SZ_NUMBER]; int raster; @@ -2120,7 +2120,7 @@ gtermActiveRasters (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; char buf[SZ_NUMBER]; sprintf (buf, "%d", GtNRasters(w)); @@ -2150,7 +2150,7 @@ gtermSetPixel (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; int raster, x, y; uchar data[1]; @@ -2185,7 +2185,7 @@ gtermGetPixel (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; char buf[SZ_NUMBER]; int raster, x, y; uchar data[1]; @@ -2271,7 +2271,7 @@ gtermWritePixels (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; char *ip; uchar *op; @@ -2451,7 +2451,7 @@ gtermReadPixels (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; int v, i; uchar *ip, *op; @@ -2688,7 +2688,7 @@ gtermRefreshPixels (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; float x1, y1, nx, ny; int raster, ctype; @@ -2732,7 +2732,7 @@ gtermSetPixels (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; int color, rop, raster, ctype; float x1, y1, nx, ny; @@ -2786,7 +2786,7 @@ gtermExtractPixmap (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; float x1, y1, nx, ny; int raster, ctype; Pixmap pixmap; @@ -2836,7 +2836,7 @@ gtermInsertPixmap (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; float x1, y1, nx, ny; int raster, ctype; Pixmap pixmap; @@ -2885,7 +2885,7 @@ gtermNextColormap (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; char buf[SZ_NUMBER]; sprintf (buf, "%d", GtNextColormap (w)); @@ -2908,7 +2908,7 @@ gtermFreeColormap (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; int colormap; if (argc < 2) @@ -2945,7 +2945,7 @@ gtermWriteColormap (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; ObmContext obm = obj->widget.obm; GtermPrivate gp = &obj->gterm; - Widget w = obj->widget.w; + GtermWidget w = (GtermWidget) obj->widget.w; int ncolors; char *ip; @@ -3008,7 +3008,7 @@ gtermReadColormap (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; ObmContext obm = obj->widget.obm; GtermPrivate gp = &obj->gterm; - Widget w = obj->widget.w; + GtermWidget w = (GtermWidget) obj->widget.w; int i; char *op; @@ -3064,7 +3064,7 @@ gtermLoadColormap (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; ObmContext obm = obj->widget.obm; GtermPrivate gp = &obj->gterm; - Widget w = obj->widget.w; + GtermWidget w = (GtermWidget) obj->widget.w; float offset, scale; int colormap; @@ -3103,7 +3103,7 @@ gtermClientPixel (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; int pixel, client_pixel; char buf[SZ_NUMBER]; @@ -3141,7 +3141,7 @@ gtermGetBias (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; int first, nelem, maxelem; char buf[SZ_NUMBER]; @@ -3174,7 +3174,7 @@ gtermInitMappings (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; GtInitMappings (w); return (TCL_OK); @@ -3193,7 +3193,7 @@ gtermNextMapping (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; char buf[SZ_NUMBER]; int mapping; @@ -3218,7 +3218,7 @@ gtermFreeMapping (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; int mapping, erase; if (argc < 2) @@ -3248,7 +3248,7 @@ gtermLowerMapping (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; int mapping, reference; if (argc < 2) @@ -3278,7 +3278,7 @@ gtermRaiseMapping (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; int mapping, reference; if (argc < 2) @@ -3305,7 +3305,7 @@ gtermEnableMapping (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; int mapping, refresh; if (argc < 2) @@ -3334,7 +3334,7 @@ gtermDisableMapping (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; int mapping, erase; if (argc < 2) @@ -3362,7 +3362,7 @@ gtermActiveMapping (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; char buf[SZ_NUMBER]; int mapping, active; @@ -3390,7 +3390,7 @@ gtermRefreshMapping (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; int mapping; if (argc < 2) @@ -3429,7 +3429,7 @@ gtermCopyRaster (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; int rop, src, st, dst, dt, status; int sx, sy, snx, sny, dx, dy, dnx, dny; @@ -3515,7 +3515,7 @@ gtermSetMapping (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; int mapping, rop, src, st, dst, dt, status; int sx, sy, snx, sny, dx, dy, dnx, dny; @@ -3552,7 +3552,7 @@ gtermGetMapping (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; int mapping, rop, src, st, dst, dt, status; int sx, sy, snx, sny, dx, dy, dnx, dny; char buf[SZ_NUMBER]; @@ -3607,6 +3607,7 @@ gtermSelectRaster (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; + GtermWidget w = (GtermWidget) wp->w; int raster, dras, dt, dx, dy, rt, rx, ry, mp; char *xout, *yout, *mpout; float fx, fy; @@ -3631,7 +3632,7 @@ gtermSelectRaster (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) yout = argv[7]; mpout = (argc > 8) ? argv[8] : NULL; - raster = GtSelectRaster (wp->w, dras, dt, dx, dy, GtNDC, &rx, &ry, &mp); + raster = GtSelectRaster (w, dras, dt, dx, dy, GtNDC, &rx, &ry, &mp); if (rt == GtNDC) { /* Return coords scaled 0.0 - 1.0. */ @@ -3639,7 +3640,7 @@ gtermSelectRaster (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) fy = (float)ry / MAXNDC; } else { /* Return raster pixel coordinates. */ - ndcToPixel (wp->w, raster, rx, ry, &fx, &fy); + ndcToPixel (w, raster, rx, ry, &fx, &fy); } sprintf (buf, "%g", fx); @@ -3681,6 +3682,7 @@ gtermUnmapPixel (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; + GtermWidget w = (GtermWidget) wp->w; int dst, dx, dy, src, sx, sy, mapping; char *raster_out, *x_out, *y_out, *z_out; char buf[SZ_NUMBER]; @@ -3705,7 +3707,7 @@ gtermUnmapPixel (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) src = GtSelectRaster (wp->w, dst=src, GtPixel, dx, dy, GtNDC, &sx, &sy, &mapping); if (src != dst) { - ndcToPixel (wp->w, src, sx, sy, &fx, &fy); + ndcToPixel (w, src, sx, sy, &fx, &fy); dx = (int) fx; dy = (int) fy; } @@ -3720,7 +3722,7 @@ gtermUnmapPixel (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) if (z_out) { uchar data[1]; - GtReadPixels (wp->w, src, data, 8, dx, dy, 1, 1); + GtReadPixels (w, src, data, 8, dx, dy, 1, 1); sprintf (buf, "%d", data[0]); Tcl_SetVar (obm->tcl, z_out, buf, 0); } @@ -3742,7 +3744,7 @@ gtermFlip (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; ObmContext obm = wp->obm; - Widget w = wp->w; + GtermWidget w = (GtermWidget) wp->w; int mapping, rop, flipX, flipY, i; int src, st, sx, sy, snx, sny; int dst, dt, dx, dy, dnx, dny; @@ -4003,7 +4005,7 @@ colorToIndex (char *name) /* ncdToPixel -- Convert NDC (integer) to raster pixel (floating) coordinates. */ static void -ndcToPixel (Widget w, int raster, int nx, int ny, float *rx, float *ry) +ndcToPixel (GtermWidget w, int raster, int nx, int ny, float *rx, float *ry) { int rtype, width, height, depth; int x2, y2; diff --git a/obm/marker.c b/obm/marker.c index d115ee9..c12fd2e 100644 --- a/obm/marker.c +++ b/obm/marker.c @@ -155,7 +155,7 @@ static int markerGetRegion(MsgContext, Tcl_Interp *, int, char **); static int markerGetRect(MsgContext, Tcl_Interp *, int, char **); extern XtPointer GmCreate(GtermWidget, int, int); -static XtPointer GmCopy(Marker); +extern XtPointer GmCopy(Marker); /* MarkerClassInit -- Initialize the class record for the marker widget class. @@ -304,7 +304,7 @@ MarkerCreate ( gm = marker; else { gt = widgetGetPointer (gterm_obj); - if ((gm = GmCreate (gt, type, interactive)) == NULL) { + if ((gm = GmCreate ((GtermWidget) gt, type, interactive)) == NULL) { XtFree ((char *)obj); return (NULL); } diff --git a/obm/widget.c b/obm/widget.c index ee61b93..eb113f8 100644 --- a/obm/widget.c +++ b/obm/widget.c @@ -4399,7 +4399,8 @@ widgetAddEventHandler (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) wp->event_handler = new_cb; /* Post event handler. */ - XtAddEventHandler (wp->w, event_mask, nonmaskable, widgetEvent, new_cb); + XtAddEventHandler (wp->w, event_mask, nonmaskable, (XtEventHandler) widgetEvent, + new_cb); return (TCL_OK); } @@ -4431,7 +4432,7 @@ widgetRemoveEventHandler (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv if (cb) { XtRemoveEventHandler (wp->w, (int) cb->client_data, nonmaskable, - widgetEvent, cb); + (XtEventHandler) widgetEvent, cb); if (pcb) pcb->next = cb->next; else From 28fe7e62097891ec029572018b5fcf40369ee560 Mon Sep 17 00:00:00 2001 From: Ole Streicher Date: Sat, 3 Aug 2024 12:52:57 +0200 Subject: [PATCH 11/21] Protoize gterm/gtermio.c --- xgterm/gtermio.c | 138 ++++++++++++++++++----------------------------- 1 file changed, 53 insertions(+), 85 deletions(-) diff --git a/xgterm/gtermio.c b/xgterm/gtermio.c index 57748a2..44c3045 100644 --- a/xgterm/gtermio.c +++ b/xgterm/gtermio.c @@ -100,7 +100,7 @@ static XtAppContext app_con; static ObmContext obm; /* object manager */ -static Widget gw; /* graphics widget */ +static GtermWidget gw; /* graphics widget */ static int gio_graphicsenabled = 0; /* switch text/graphics output */ static int gio_enabled = 1; /* enable graphics window */ @@ -212,14 +212,16 @@ typedef Request *RequestPtr; static RequestPtr request_head = NULL; static RequestPtr request_tail = NULL; -static int gio_reset(), gio_setginmodeterm(), gio_output(); +static int gio_reset(int, GtermWidget, char *); +static int gio_setginmodeterm(); +static int gio_output(); static int gio_clear(); static int gio_retcursor(), gio_queue_output(), gio_queue_request(); static int gio_hardreset(), gio_activate(), gio_enable(), gio_tekmode(); static int gio_processdata(), gio_ptyinput(), gio_escape(), gio_status(); -static void gio_activate_cb(); -static void gio_connect_cb(); -static void gio_deactivate_cb(); +static int gio_activate_cb(); +static int gio_connect_cb(); +static int gio_deactivate_cb(); static void gio_keyinput(), gio_resize(); static void pl_decodepts(), gio_retenq(); @@ -262,11 +264,11 @@ static XtActionsRec actionsList[] = { * process startup to establish communications between the caller and gtermio. */ void -gio_setup (app_context, argc, argv, fd) -XtAppContext app_context; /* applications context of caller */ -int argc; /* argument count */ -char *argv[]; /* argument vector */ -int fd; /* fd of pty for terminal i/o */ +gio_setup ( + XtAppContext app_context, /* applications context of caller */ + int argc, /* argument count */ + char *argv[], /* argument vector */ + int fd) /* fd of pty for terminal i/o */ { app_con = app_context; pty_fd = fd; @@ -301,9 +303,7 @@ int fd; /* fd of pty for terminal i/o */ * be called when the display connection is opened or close. */ void -gio_postconnectcallback (connect, client_data) -void (*connect)(); -int client_data; +gio_postconnectcallback (int (*connect)(), int client_data) { if (obm) { ObmAddCallback (obm, OBMCB_connect|OBMCB_preserve, @@ -316,9 +316,7 @@ int client_data; * disabled, all i/o is directed to the text window. */ static int -gio_enable (dummy, onoff) -int dummy; -int onoff; +gio_enable (int dummy, int onoff) { switch (onoff) { case 0: @@ -338,9 +336,7 @@ int onoff; * forcibly activate or deactivate the graphics UI. */ static int -gio_activate (dummy, state) -int dummy; -int state; +gio_activate (int dummy, int state) { register RequestPtr rp; @@ -384,10 +380,7 @@ int state; * not a GUI has been loaded. */ static int -gio_status (dummy, app_name, app_class) -int dummy; -char *app_name; /* can be NULL */ -char *app_class; /* can be NULL */ +gio_status (int dummy, char *app_name, char *app_class) { return (ObmStatus (obm, app_name, app_class)); } @@ -396,16 +389,13 @@ char *app_class; /* can be NULL */ /* GIO_ACTIVATE_CB -- Activate callback, called by the gterm widget when the * user interface is activated. */ -static void -gio_activate_cb (dummy, w, state) -int dummy; -Widget w; -int state; +static int +gio_activate_cb (int dummy, Widget w, int state) { register RequestPtr rp; if (!state) - return; + return 0; /* Cancel any buffered command output. */ wait_cursor = 0; @@ -424,6 +414,7 @@ int state; wm_delete_window = XInternAtom (XtDisplay(w), "WM_DELETE_WINDOW", False); XSetWMProtocols (XtDisplay(w), XtWindow(w), &wm_delete_window, 1); + return 0; } @@ -432,24 +423,18 @@ int state; * to intercept a window close action in a GUI to keep from shutting down * completely. */ -static void -gio_deactivate_cb (dummy, w, state) -int dummy; -Widget w; -int state; +static int +gio_deactivate_cb (int dummy, Widget w, int state) { + return 0; } /* GIO_CONNECT_CB -- Connect callback, called by the gterm widget when a new * application GUI is initialized or when the display connection is closed. */ -static void -gio_connect_cb (dummy, display, toplevel, state) -int dummy; -Display *display; -Widget toplevel; -int state; +static int +gio_connect_cb (int dummy, Display *display, Widget toplevel, int state) { if (state) { extern Widget term; @@ -480,6 +465,7 @@ int state; XtParseTranslationTable (gio_shellTrans)); } else memset (gterms, 0, sizeof(gterms)); + return 0; } @@ -488,9 +474,7 @@ int state; * can be called to manually switch the input to a window. */ static int -gio_tekmode (dummy, onoff) -int dummy; -int onoff; +gio_tekmode (int dummy, int onoff) { switch (onoff) { case 0: @@ -509,8 +493,7 @@ int onoff; /* GIO_CLEAR -- Clear the graphics window. */ static int -gio_clear (dummy) -int dummy; +gio_clear (int dummy) { if (gw) { GtClearScreen (gw); @@ -528,8 +511,7 @@ int dummy; * that may be in progress. */ static int -gio_hardreset (dummy) -int dummy; +gio_hardreset (int dummy) { register RequestPtr rp; @@ -592,10 +574,7 @@ int dummy; * window is resized. */ static int -gio_reset (notused, w, args) -int notused; -register Widget w; -char *args; +gio_reset (int notused, GtermWidget w, char *args) { register int i; int new_widget; @@ -612,7 +591,7 @@ char *args; */ new_widget = 1; for (i=0; i < MAX_GTERM; i++) - if (gterms[i] == w) { + if (gterms[i] == (Widget) w) { new_widget = 0; break; } @@ -627,7 +606,7 @@ char *args; for (i=0; i < MAX_GTERM; i++) if (!gterms[i]) { - gterms[i] = w; + gterms[i] = (Widget) w; break; } } @@ -669,9 +648,7 @@ char *args; * expressed as octal constants in the input string argument. */ static int -gio_setginmodeterm (dummy, str) -int dummy; -char *str; +gio_setginmodeterm (int dummy, char *str) { register char *ip; register int n; @@ -708,14 +685,12 @@ char *str; * drawing window is resized. */ static void -gio_resize (notused, w) -XtPointer notused; -Widget w; +gio_resize (XtPointer notused, Widget w) { /* Ignore the resize callback if the widget being resized is not the * active widget. */ - if (w != gw) + if (w != (Widget) gw) return; /* Always update the window size variables. */ @@ -743,7 +718,7 @@ Widget w; */ if (!g_havedata) { if (gw) - gio_reset (0, gw, NULL); + gio_reset (0, (GtermWidget) gw, NULL); /* If the client posted a resize escape sequence, send this * value to the client as a cursor read to signal the resize @@ -768,12 +743,12 @@ Widget w; * read) pending, the request will be passed on immediately. */ static int -gio_queue_output (fd, tcl, objname, key, strval) -int fd; /* pty */ -XtPointer tcl; /* not used */ -char *objname; /* client object name (not used) */ -int key; /* cursor keystroke or NULL */ -char *strval; /* cursor strval or literal command */ +gio_queue_output ( + int fd, /* pty */ + XtPointer tcl, /* not used */ + char *objname, /* client object name (not used) */ + int key, /* cursor keystroke or NULL */ + char *strval) /* cursor strval or literal command */ { int mapping, raster; int sx, sy, rx, ry; @@ -803,11 +778,7 @@ char *strval; /* cursor strval or literal command */ /* GIO_QUEUE_REQUEST -- Queue a request. */ static int -gio_queue_request (sx, sy, raster, rx, ry, key, strval) -int sx, sy; -int raster, rx, ry; -int key; -char *strval; +gio_queue_request (int sx, int sy, int raster, int rx, int ry, int key, char *strval) { register RequestPtr rp; int buflen, nchars; @@ -855,7 +826,7 @@ char *strval; * contains a field giving the length of the data string which follows. */ static int -gio_output() +gio_output(void) { register RequestPtr rp; @@ -897,10 +868,10 @@ gio_output() * Sometime later the graphics drawing code will be called to process the data. */ static int -gio_ptyinput (notused, ttybuf, nchars) -int notused; -char *ttybuf; /* raw data on input, tty data on output */ -int nchars; /* nchars of raw data */ +gio_ptyinput ( + int notused, + char *ttybuf, /* raw data on input, tty data on output */ + int nchars) /* nchars of raw data */ { register char *itop = ttybuf + nchars; register char *op, *ip = ttybuf, ch; @@ -1045,7 +1016,7 @@ gstart: g_putc (GS); * on, solid line type, and so on. */ static int -gio_processdata() +gio_processdata(void) { register int quota, ch; unsigned char *save_ip, *ip_start; @@ -1055,7 +1026,7 @@ gio_processdata() * before processing any further graphics input data. */ if (gio_delay) { - gio_delay = gw ? !GtReady (gw) : 0; + gio_delay = gw ? !GtReady ((GtermWidget) gw) : 0; if (gio_delay) return (1); } @@ -1107,7 +1078,7 @@ gio_processdata() gio_activate (0, 1); } if (gw) - GtActivate (gw); + GtActivate ((GtermWidget) gw); workstation_open = 1; g_ungetc (ch); goto exit; @@ -1567,7 +1538,7 @@ flush_alpha: if (tx_len > 0) { * zero when the screen is cleared. */ static void -pl_decodepts() +pl_decodepts(void) { register char *ip, *itop; int hiy, loy, hix, lox, type, data, nb; @@ -1628,10 +1599,7 @@ pl_decodepts() * merely passed on. */ static void -gio_keyinput (notused, w, event) -XtPointer notused; -Widget w; -XEvent *event; +gio_keyinput (XtPointer notused, Widget w, XEvent *event) { XKeyEvent *xkey = &event->xkey; char strbuf[SZ_STRBUF]; From 9df25d40d0495d7c8d6bc61f1d5cdc9fa505afc4 Mon Sep 17 00:00:00 2001 From: Ole Streicher Date: Sat, 3 Aug 2024 12:53:39 +0200 Subject: [PATCH 12/21] Start protoizing ximtool --- ximtool/iis.c | 6 +- ximtool/raster.c | 325 +++++++++++++++++++------------------------- ximtool/ximclient.c | 22 +-- ximtool/ximtool.h | 7 +- 4 files changed, 160 insertions(+), 200 deletions(-) diff --git a/ximtool/iis.c b/ximtool/iis.c index 0571897..aa6ee99 100644 --- a/ximtool/iis.c +++ b/ximtool/iis.c @@ -674,7 +674,8 @@ XtInputId *id_addr; nx = min (xim->width-x, nbytes); ny = max (1, nbytes/xim->width); } - GtReadPixels (xim->gt, chan->rf_p->raster, iobuf, 8, x, y, + GtReadPixels ((GtermWidget) xim->gt, chan->rf_p->raster, + iobuf, 8, x, y, nx, ny); if (iis_debug) @@ -753,7 +754,8 @@ XtInputId *id_addr; nx = min (xim->width-x, nbytes); ny = max (1, nbytes/xim->width); } - GtWritePixels (xim->gt, chan->rf_p->raster, iobuf, 8, + GtWritePixels ((GtermWidget) xim->gt, chan->rf_p->raster, + iobuf, 8, x, y, nx, ny); if (iis_debug) diff --git a/ximtool/raster.c b/ximtool/raster.c index 429c6a8..76f8f1e 100644 --- a/ximtool/raster.c +++ b/ximtool/raster.c @@ -108,7 +108,7 @@ static void xim_frameRegion(); static void xim_colortables(); static int xim_onScreen(); static void xim_highlightFrame(); -static void hsv_to_rgb(); +static void hsv_to_rgb(float, float, float, float *, float *, float *); void xim_labelTiles(); void xim_getScreen(); @@ -120,15 +120,11 @@ void xim_getScreen(); * and create the frame buffers, mappings, and colormaps. */ void -xim_initialize (xim, config, nframes, hardreset) -register XimDataPtr xim; -int config; -int nframes; -int hardreset; +xim_initialize (XimDataPtr xim, int config, int nframes, int hardreset) { - register Widget gt = xim->gt; - register FrameBufPtr fb; - register int i; + GtermWidget gt = (GtermWidget) xim->gt; + FrameBufPtr fb; + int i; unsigned short m_red[MAX_COLORS]; unsigned short m_green[MAX_COLORS]; @@ -410,9 +406,7 @@ int hardreset; /* XIM_RESET -- Called when the active gterm widget is set or changed. */ void -xim_reset (xim, w) -XimDataPtr xim; -Widget w; +xim_reset (XimDataPtr xim, Widget w) { unsigned short iomap[MAX_COLORS]; int iomap_len; @@ -428,12 +422,12 @@ Widget w; if (xim->cb == NULL) { xim->cb = w; xim_iisiomap (w, iomap, &iomap_len); - GtPostResizeProc (w, set_colorbar, xim); + GtPostResizeProc ((GtermWidget) w, set_colorbar, xim); GtWriteIomap (w, iomap, 0, iomap_len); } else { xim->gt = w; xim_iisiomap (w, iomap, &iomap_len); - GtPostResizeProc (w, xim_resize, xim); + GtPostResizeProc ((GtermWidget) w, xim_resize, xim); GtWriteIomap (w, iomap, 0, iomap_len); } } @@ -444,9 +438,7 @@ Widget w; * reflect the new window size. */ void -xim_resize (xim, w) -XimDataPtr xim; -Widget w; +xim_resize (XimDataPtr xim, Widget w) { register FrameBufPtr fb; int junk, sx, sy, width, height, depth; @@ -501,8 +493,10 @@ Widget w; active = xim_onScreen (xim, frame); if (fb->zoomras) { - GtQueryRaster (w, fb->zoomras, &zoomtype, &junk, &junk, &junk); - GtCreateRaster (w, fb->zoomras, zoomtype, width, height, depth); + GtQueryRaster ((GtermWidget) w, fb->zoomras, &zoomtype, + &junk, &junk, &junk); + GtCreateRaster ((GtermWidget) w, fb->zoomras, zoomtype, + width, height, depth); xim_setMapping (xim, NULL, frame, fb->dispmap, fb->zoomras, 0, M_FILL); if (!active) { @@ -534,8 +528,10 @@ Widget w; if (xim_onScreen (xim, frame)) { int junk, width, height, depth; fb = &xim->frames[frame-1]; - GtQueryRaster (w, fb->raster, &junk, &width, &height, &depth); - GtRefreshPixels (w, fb->raster, GtPixel, 0, 0, width, height); + GtQueryRaster ((GtermWidget) w, fb->raster, &junk, + &width, &height, &depth); + GtRefreshPixels ((GtermWidget) w, fb->raster, GtPixel, + 0, 0, width, height); } } @@ -550,22 +546,22 @@ Widget w; /* XIM_REFRESH -- Refresh the current display frame. */ void -xim_refresh (xim) -XimDataPtr xim; +xim_refresh (XimDataPtr xim) { register FrameBufPtr fb = xim->df_p; int junk, width, height, depth; - GtQueryRaster (xim->gt, fb->raster, &junk, &width, &height, &depth); - GtRefreshPixels (xim->gt, fb->raster, GtPixel, 0, 0, width, height); + GtQueryRaster ((GtermWidget) xim->gt, fb->raster, &junk, + &width, &height, &depth); + GtRefreshPixels ((GtermWidget) xim->gt, fb->raster, GtPixel, + 0, 0, width, height); } /* XIM_CLOSE -- Free any raster specific resources. */ void -xim_close (xim) -register XimDataPtr xim; +xim_close (XimDataPtr xim) { } @@ -574,9 +570,7 @@ register XimDataPtr xim; * frame. */ void -xim_setFrame (xim, frame) -register XimDataPtr xim; -int frame; +xim_setFrame (XimDataPtr xim, int frame) { xim_setDisplayFrame (xim, frame); } @@ -585,9 +579,7 @@ int frame; /* XIM_SETREFERENCEFRAME -- Set the frame used for frame buffer i/o. */ void -xim_setReferenceFrame (chan, frame) -register IoChanPtr chan; -int frame; +xim_setReferenceFrame (IoChanPtr chan, int frame) { register XimDataPtr xim = (XimDataPtr) chan->xim; register FrameBufPtr fb; @@ -611,12 +603,10 @@ int frame; /* XIM_SETDISPLAYFRAME -- Set the frame which is displayed. */ void -xim_setDisplayFrame (xim, frame) -register XimDataPtr xim; -int frame; +xim_setDisplayFrame (XimDataPtr xim, int frame) { register FrameBufPtr fb; - register Widget gt = xim->gt; + GtermWidget gt = (GtermWidget) xim->gt; FrameBufPtr old_fb = xim->df_p; int frameno, old_frameno; char buf[256]; @@ -700,14 +690,11 @@ int frame; /* XIM_INITFRAME -- Initialize a frame buffer. */ void -xim_initFrame (xim, frame, nframes, config, memModel) -register XimDataPtr xim; -int frame, nframes; -FbConfigPtr config; -char *memModel; +xim_initFrame (XimDataPtr xim, int frame, int nframes, FbConfigPtr config, + char *memModel) { register FrameBufPtr fb = &xim->frames[frame-1]; - register Widget gt = xim->gt; + GtermWidget gt = (GtermWidget) xim->gt; int sx, sy, width, height, depth; if (frame < 1 || frame > MAX_FRAMES) @@ -834,12 +821,10 @@ small: fb->zoomras = 0; /* XIM_DELFRAME -- Delete a frame. */ void -xim_delFrame (xim, frame) -register XimDataPtr xim; -int frame; +xim_delFrame (XimDataPtr xim, int frame) { register FrameBufPtr fb = &xim->frames[frame-1]; - register Widget gt = xim->gt; + GtermWidget gt = (GtermWidget) xim->gt; if (frame < 1 || frame > MAX_FRAMES) return; @@ -863,12 +848,10 @@ int frame; /* XIM_ERASEFRAME -- Erase a frame. */ void -xim_eraseFrame (xim, frame) -register XimDataPtr xim; -int frame; +xim_eraseFrame (XimDataPtr xim, int frame) { FrameBufPtr fb = &xim->frames[frame-1]; - Widget gt = xim->gt; + GtermWidget gt = (GtermWidget) xim->gt; int Z = 0; GtSetPixels (gt, fb->raster, GtPixel, Z,Z,Z,Z, CMS_BACKGROUND, 0); @@ -879,10 +862,9 @@ int frame; * size as the frame buffer. */ void -xim_fitFrame (xim) -register XimDataPtr xim; +xim_fitFrame (XimDataPtr xim) { - register Widget gt = xim->gt; + GtermWidget gt = (GtermWidget) xim->gt; GtCreateRaster (gt, 0, GtServer, xim->width, xim->height, 8); } @@ -891,9 +873,7 @@ register XimDataPtr xim; /* XIM_TILEFRAMES -- Set or clear tile frame mode. */ void -xim_tileFrames (xim, frame_list) -register XimDataPtr xim; -int frame_list; +xim_tileFrames (XimDataPtr xim, int frame_list) { register int i; register Widget w = xim->gt; @@ -970,9 +950,7 @@ int frame_list; * by coloring the border of the frame. */ static void -xim_highlightFrame (xim, frame) -register XimDataPtr xim; -int frame; +xim_highlightFrame (XimDataPtr xim, int frame) { /* If we are tiling frames highlight the new display frame. */ if (xim->gm_border) { @@ -1013,8 +991,7 @@ int frame; /* XIM_LABELTILES -- Label the tile with the frame number. */ void -xim_labelTiles (xim) -register XimDataPtr xim; +xim_labelTiles (XimDataPtr xim) { FrameBufPtr fb; MappingPtr mp; @@ -1114,10 +1091,7 @@ register XimDataPtr xim; * that of the indicated frame. */ void -xim_matchFrames (xim, frames, reference_frame) -XimDataPtr xim; -int *frames; -int reference_frame; +xim_matchFrames (XimDataPtr xim, int *frames, int reference_frame) { register FrameBufPtr fr, fb = &xim->frames[reference_frame-1]; register int *ip, i; @@ -1153,11 +1127,8 @@ int reference_frame; * reference frame. */ void -xim_registerFrames (xim, frames, reference_frame, offsets) -XimDataPtr xim; -int *frames; -int reference_frame; -int offsets; +xim_registerFrames (XimDataPtr xim, int *frames, int reference_frame, + int offsets) { register int *ip, i; register FrameBufPtr fr, fb = &xim->frames[reference_frame-1]; @@ -1237,9 +1208,7 @@ int offsets; * cursor value when the cursor read finishes. */ void -xim_cursorMode (xim, state) -register XimDataPtr xim; -int state; +xim_cursorMode (XimDataPtr xim, int state) { /* The GUI is responsible for implementing cursor reads. */ xim_message (xim, "cursorMode", state ? "on" : "off"); @@ -1249,15 +1218,10 @@ int state; /* XIM_SETMAPPING -- Set up a mapping between two rasters. */ void -xim_setMapping (xim, fb, frame, mapping, src, dst, fill_mode) -register FrameBufPtr fb; -register XimDataPtr xim; -int frame; -int mapping; -int src, dst; -int fill_mode; +xim_setMapping (FrameBufPtr fb, XimDataPtr xim, int frame, int mapping, + int src, int dst, int fill_mode) { - register Widget gt = xim->gt; + GtermWidget gt = (GtermWidget) xim->gt; int src_type, src_width, src_height, src_depth; int dst_type, dst_width, dst_height, dst_depth, dst_x, dst_y; float xscale, yscale, scale; @@ -1358,18 +1322,22 @@ int fill_mode; * view center and zoom factors. */ void -xim_setZoom (xim, fb, frame, mapping, src, dst, xcen,ycen,xmag,ymag, xoff,yoff, absolute) -register XimDataPtr xim; -register FrameBufPtr fb; -int frame; -int mapping; -int src, dst; -float xcen, ycen; /* center of source raster region to be mapped */ -float xmag, ymag; /* magnification in each axis */ -float xoff, yoff; /* offset in each axis */ -Boolean absolute; /* ignore xscale/yscale */ +xim_setZoom ( + XimDataPtr xim, + FrameBufPtr fb, + int frame, + int mapping, + int src, + int dst, + float xcen, + float ycen, /* center of source raster region to be mapped */ + float xmag, + float ymag, /* magnification in each axis */ + float xoff, + float yoff, /* offset in each axis */ + Boolean absolute) /* ignore xscale/yscale */ { - register Widget gt = xim->gt; + GtermWidget gt = (GtermWidget) xim->gt; int src_type, src_width, src_height, src_depth; int dst_type, dst_width, dst_height, dst_depth, dst_x, dst_y; int sx1, sx2, sy1, sy2, snx, sny; @@ -1612,11 +1580,14 @@ Boolean absolute; /* ignore xscale/yscale */ * the given frame is mapped. */ void -xim_getScreen (xim, frame, sx, sy, width, height, depth) -register XimDataPtr xim; -int frame; -int *sx, *sy; -int *width, *height, *depth; +xim_getScreen ( + XimDataPtr xim, + int frame, + int *sx, + int *sy, + int *width, + int *height, + int *depth) { register int i; int border = xim->tileBorder; @@ -1625,7 +1596,7 @@ int *width, *height, *depth; int tilex, tiley; int nrows = xim->tileRows, ncols = xim->tileCols; - if (GtQueryRaster (xim->gt, 0, + if (GtQueryRaster ((GtermWidget) xim->gt, 0, &rtype, &scr_width, &scr_height, depth) == 0) return; @@ -1678,9 +1649,7 @@ int *width, *height, *depth; /* XIM_ONSCREEN -- Test whether the given frame is visible onscreen. */ static int -xim_onScreen (xim, frame) -register XimDataPtr xim; -int frame; +xim_onScreen (XimDataPtr xim, int frame) { if (xim->tileFrames) return ((xim->tileFramesList & (1 << (frame-1))) != 0); @@ -1692,10 +1661,7 @@ int frame; /* XIM_SETFLIP -- Modify a mapping to flip the frame in X and/or Y. */ void -xim_setFlip (xim, fb, flip_x, flip_y) -register XimDataPtr xim; -register FrameBufPtr fb; -int flip_x, flip_y; +xim_setFlip (XimDataPtr xim, FrameBufPtr fb, int flip_x, int flip_y) { register Widget gt = xim->gt; int src, st, sx, sy, snx, sny; @@ -1729,10 +1695,7 @@ int flip_x, flip_y; /* XIM_SETROP -- Modify the rasterop portion of a mapping. */ void -xim_setRop (xim, fb, rop) -register XimDataPtr xim; -register FrameBufPtr fb; -int rop; +xim_setRop (XimDataPtr xim, FrameBufPtr fb, int rop) { register Widget gt = xim->gt; int src, st, sx, sy, snx, sny; @@ -1750,9 +1713,7 @@ int rop; /* XIM_SETCURSORPOS -- Set the cursor position. */ void -xim_setCursorPos (xim, sx, sy) -register XimDataPtr xim; -float sx, sy; /* raster coordinates */ +xim_setCursorPos (XimDataPtr xim, float sx, float sy) { GtSetRaster (xim->gt, xim->df_p->frameno); GtSetCursorPos (xim->gt, (int)sx, (int)sy); @@ -1764,10 +1725,8 @@ float sx, sy; /* raster coordinates */ * pixel precision if the image is zoomed. */ void -xim_getCursorPos (xim, sx, sy, raster, frame) -register XimDataPtr xim; -float *sx, *sy; -int *raster, *frame; +xim_getCursorPos (XimDataPtr xim, float *sx, float *sy, + int *raster, int *frame) { register FrameBufPtr fb; DPoint pv1, pv2; @@ -1804,15 +1763,21 @@ int *raster, *frame; * 8 bit RGB colormap. */ unsigned char * -xim_readDisplay (xim, x0,y0,nx,ny, w,h, r,g,b, ncolors) -register XimDataPtr xim; -int x0,y0,nx,ny; /* region to extract (input) */ -int *w, *h; /* size of output region (output). */ -unsigned char *r, *g, *b; /* colortable (output) */ -int *ncolors; /* size of colortable (output) */ +xim_readDisplay ( + XimDataPtr xim, + int x0, + int y0, + int nx, + int ny, /* region to extract (input) */ + int *w, + int *h, /* size of output region (output). */ + unsigned char *r, + unsigned char *g, + unsigned char *b, /* colortable (output) */ + int *ncolors) /* size of colortable (output) */ { - register Widget gt = xim->gt; - register int i, j; + GtermWidget gt = (GtermWidget) xim->gt; + int i, j; int raster, x1, y1, nc; unsigned short *rs, *gs, *bs; @@ -1967,18 +1932,21 @@ int *ncolors; /* size of colortable (output) */ * be 8 bit pseudocolor. */ int -xim_writeDisplay (xim, frame, mapname, pixels, w,h, r,g,b, ncolors) -register XimDataPtr xim; -int frame; /* display frame to be written */ -char *mapname; /* colormap name to be written */ -unsigned char *pixels; -int w, h; -unsigned char *r, *g, *b; -int ncolors; +xim_writeDisplay ( + XimDataPtr xim, + int frame, /* display frame to be written */ + char *mapname, /* colormap name to be written */ + unsigned char *pixels, + int w, + int h, + unsigned char *r, + unsigned char *g, + unsigned char *b, + int ncolors) { - register int i, j; - register FrameBufPtr fb; - register Widget gt = xim->gt; + int i, j; + FrameBufPtr fb; + GtermWidget gt = (GtermWidget) xim->gt; unsigned short rs[MAX_COLORS], gs[MAX_COLORS], bs[MAX_COLORS]; unsigned short iomap[MAX_COLORS], sv_iomap[MAX_COLORS]; int nx, ny, sx0, sy0, dx0, dy0; @@ -2227,10 +2195,7 @@ char *message; /* XIM_MSGI -- Like xim_message, but the message is an integer value. */ void -xim_msgi (xim, object, value) -register XimDataPtr xim; -char *object; -int value; +xim_msgi (XimDataPtr xim, char *object, int value) { char msgbuf[SZ_LINE]; sprintf (msgbuf, "setValue {%d}", value); @@ -2246,11 +2211,11 @@ int value; * proceed. An alert with no actions is a warning. */ void -xim_alert (xim, text, ok_action, cancel_action) -register XimDataPtr xim; -char *text; /* message text */ -char *ok_action; /* command sent back to client for "ok" */ -char *cancel_action; /* command sent back to client for "cancel" */ +xim_alert ( + XimDataPtr xim, + char *text, /* message text */ + char *ok_action, /* command sent back to client for "ok" */ + char *cancel_action) /* command sent back to client for "cancel" */ { char msgbuf[SZ_LINE]; sprintf (msgbuf, "setValue {{%s} {%s} {%s}}", text, @@ -2268,9 +2233,7 @@ char *cancel_action; /* command sent back to client for "cancel" */ * needs to be updated. */ static void -xim_frameRegion (xim, fb) -register XimDataPtr xim; -register FrameBufPtr fb; +xim_frameRegion (XimDataPtr xim, FrameBufPtr fb) { int rop, src, dst; int st, sx, sy, snx, sny; @@ -2292,8 +2255,7 @@ register FrameBufPtr fb; * updated, i.e., when some change to the list of colormaps has occurred. */ static void -xim_colortables (xim) -XimDataPtr xim; +xim_colortables (XimDataPtr xim) { register char *ip, *op; char buf[MAX_COLORMAPS*40]; @@ -2316,9 +2278,7 @@ XimDataPtr xim; * be updated for a frame. */ void -xim_enhancement (xim, fb) -register XimDataPtr xim; -register FrameBufPtr fb; +xim_enhancement (XimDataPtr xim, FrameBufPtr fb) { char buf[SZ_LINE]; @@ -2344,8 +2304,7 @@ register FrameBufPtr fb; * 3 1 1024 1024 # comment */ static void -get_fbconfig (xim) -register XimDataPtr xim; +get_fbconfig (XimDataPtr xim) { register char *ip; register FILE *fp = NULL; @@ -2456,9 +2415,7 @@ register XimDataPtr xim; * into a Gterm rasterop code. */ int -xim_getAntialias (xim, s) -XimDataPtr xim; -char *s; +xim_getAntialias (XimDataPtr xim, char *s) { register char *ip, *op; char word[SZ_NAME]; @@ -2499,13 +2456,13 @@ char *s; * monochrome output of a frame buffer into the hardware colormap. */ int -xim_setColormap (function, dirs, m_red, m_green, m_blue, nelem) -char *function; /* type of colormap */ -String *dirs; -unsigned short *m_red; -unsigned short *m_green; -unsigned short *m_blue; -int nelem; +xim_setColormap ( + char *function, /* type of colormap */ + String *dirs, + unsigned short *m_red, + unsigned short *m_green, + unsigned short *m_blue, + int nelem) { register int i, j; register char *ip, *op; @@ -2835,9 +2792,7 @@ int nelem; } void -hsv_to_rgb (h, s, v, r, g, b) -float h, s, v; -float *r, *g, *b; +hsv_to_rgb (float h, float s, float v, float *r, float *g, float *b) { register int i; float f, p, q, t; @@ -2878,10 +2833,7 @@ float *r, *g, *b; /* GET_DIRFILE -- Get the next file name from an open directory file. */ static int -get_dirfile (dir, outstr, maxch) -DIR *dir; -char *outstr; -int maxch; +get_dirfile (DIR *dir, char *outstr, int maxch) { register int n; register struct dirent *dp; @@ -2905,17 +2857,14 @@ int maxch; /* LOAD_TESTPATTERN -- Load a test pattern into the given frame. */ static void -load_testpattern (xim, frame, type) -XimDataPtr xim; -int frame; -int type; /* not used */ +load_testpattern (XimDataPtr xim, int frame, int type) { register FrameBufPtr fb = &xim->frames[frame]; register int i, j, ncolors; int rtype, width, height, depth; unsigned char *data; - if (GtQueryRaster (xim->gt, fb->raster, + if (GtQueryRaster ((GtermWidget) xim->gt, fb->raster, &rtype, &width, &height, &depth) == 0) return; @@ -2927,7 +2876,8 @@ int type; /* not used */ for (j=0; j < height; j++) { for (i=0; i < width; i++) data[i] = (((i + j) * 10) % ncolors); - GtWritePixels (xim->gt, fb->raster, data, 8, 0, j, width, 1); + GtWritePixels ((GtermWidget) xim->gt, fb->raster, data, + 8, 0, j, width, 1); } XtFree ((char *)data); @@ -2937,9 +2887,7 @@ int type; /* not used */ /* SET_COLORBAR -- Write the colorbar pixels. */ static void -set_colorbar (xim, w) -XimDataPtr xim; -Widget w; +set_colorbar (XimDataPtr xim, Widget w) { register int i; static int initialized = 0; @@ -2957,7 +2905,8 @@ Widget w; fprintf (stderr, "SETTING COLORBAR PIXELS...... init = %d\n", initialized); - if (GtQueryRaster (w, 0, &rtype, &width, &height, &depth) == 0) + if (GtQueryRaster ((GtermWidget) w, 0, &rtype, + &width, &height, &depth) == 0) return; data = (unsigned char *) XtMalloc (width * height); @@ -2969,16 +2918,18 @@ Widget w; if (!initialized) { xim_iiscolormap (w, m_red,m_green,m_blue, &first, &ngray, &rgb_len); - GtWriteColormap (w, 0, first, rgb_len, m_red, m_green, m_blue); + GtWriteColormap ((GtermWidget) w, 0, first, rgb_len, + m_red, m_green, m_blue); xim_setColormap ("Grayscale", NULL, m_red, m_green, m_blue, ngray); - GtWriteColormap (w, 0, first, ngray, m_red, m_green, m_blue); + GtWriteColormap ((GtermWidget) w, 0, first, ngray, + m_red, m_green, m_blue); xim->ncolors = ngray; initialized++; } - GtWritePixels (w, 0, data, 8, 0, 0, width, height); + GtWritePixels ((GtermWidget) w, 0, data, 8, 0, 0, width, height); XtFree ((char *)data); if (DBG_RASTER) @@ -2989,9 +2940,7 @@ Widget w; /* SET_NFRAMES -- Called when the number of frame buffers changes. */ static void -set_nframes (xim, nframes) -XimDataPtr xim; -int nframes; +set_nframes (XimDataPtr xim, int nframes) { xim->nframes = nframes; xim_msgi (xim, "nframes", nframes); diff --git a/ximtool/ximclient.c b/ximtool/ximclient.c index 386e673..851bc6e 100644 --- a/ximtool/ximclient.c +++ b/ximtool/ximclient.c @@ -872,13 +872,14 @@ char **argv; if (strncmp (cm->name, "Random", 6) == 0) { xim_setColormap (cm->name, NULL, m_red, m_green, m_blue, xim->ncolors); - GtWriteColormap (xim->gt, cm->mapno, + GtWriteColormap ((GtermWidget) xim->gt, cm->mapno, first_color, xim->ncolors, m_red, m_green, m_blue); } fb->colormap = i; GtSetColormapFocus (-1); /* force full update */ - GtLoadColormap (xim->gt, cm->mapno, fb->offset, fb->scale); + GtLoadColormap ((GtermWidget) xim->gt, cm->mapno, + fb->offset, fb->scale); GtSetColormapFocus (xim->cm_focus); xim_enhancement (xim, fb); } @@ -907,7 +908,8 @@ char **argv; cm = &colormaps[fb->colormap-1]; fb->offset = atof(argv[1]); fb->scale = (argc > 2) ? (float)atof(argv[2]) : fb->scale; - GtLoadColormap (xim->gt, cm->mapno, fb->offset, fb->scale); + GtLoadColormap ((GtermWidget) xim->gt, cm->mapno, + fb->offset, fb->scale); xim_enhancement (xim, fb); } @@ -935,7 +937,8 @@ char **argv; fb->offset = atof(argv[1]); fb->scale = (argc > 2) ? (float)atof(argv[2]) : fb->scale; GtSetColormapFocus (-1); /* force full update */ - GtLoadColormap (xim->gt, cm->mapno, fb->offset, fb->scale); + GtLoadColormap ((GtermWidget) xim->gt, cm->mapno, + fb->offset, fb->scale); GtSetColormapFocus (xim->cm_focus); xim_enhancement (xim, fb); } @@ -1255,7 +1258,8 @@ char **argv; /* Read the display raster. */ pix = (unsigned char *) XtMalloc (npix); - if (GtReadPixels (xim->gt, raster, pix, 8, x0, y0, nx, ny) < 0) + if (GtReadPixels ((GtermWidget) xim->gt, raster, pix, 8, + x0, y0, nx, ny) < 0) return (TCL_ERROR); /* Scale the data to the WCS pixel values for display. We don't @@ -2406,7 +2410,8 @@ char **argv; /* Query and read the current colormap. */ GtQueryColormap (xim->gt, cm->mapno, &first, &nelem, &maxelem); - GtReadColormap (xim->gt, cm->mapno, first, nelem, r,g,b); + GtReadColormap ((GtermWidget) xim->gt, cm->mapno, first, nelem, + r,g,b); /* compute the scaled colormap, scaling only the color we're * interested in. @@ -2424,9 +2429,10 @@ char **argv; } /* Lastly, write it back to the widget. */ - GtWriteColormap (xim->gt, 0, first, nelem, r, g, b); + GtWriteColormap ((GtermWidget) xim->gt, 0, first, nelem, r, g, b); if (save) - GtWriteColormap (xim->gt, cm->mapno, first, nelem, r, g, b); + GtWriteColormap ((GtermWidget) xim->gt, cm->mapno, + first, nelem, r, g, b); } return (TCL_OK); diff --git a/ximtool/ximtool.h b/ximtool/ximtool.h index 18d8c4d..4c8d986 100644 --- a/ximtool/ximtool.h +++ b/ximtool/ximtool.h @@ -710,8 +710,11 @@ void xim_initialize(), xim_reset(), xim_resize(), xim_refresh(); int xim_shutdown (); void xim_close(), xim_initFrame(), xim_setFrame(), xim_setRop(); void xim_setReferenceFrame(), xim_setDisplayFrame(); -void xim_delFrame(), xim_setMapping(), xim_setZoom(); -void xim_setCursorPos(), xim_getCursorPos(), xim_setFlip(); +void xim_delFrame(), xim_setMapping(); +void xim_setZoom(XimDataPtr, FrameBufPtr, int, int, int, int, float, float, + float, float, float, float, Boolean); +void xim_setCursorPos(XimDataPtr, float, float); +void xim_getCursorPos(), xim_setFlip(); void xim_matchFrames(), xim_registerFrames(); void xim_readCursor(), xim_frameChanged(); void xim_message(), xim_msgi(), xim_alert(); From 3fad269b2da0ebc3eed7148d811a144bc79880d6 Mon Sep 17 00:00:00 2001 From: Ole Streicher Date: Sat, 3 Aug 2024 13:53:12 +0200 Subject: [PATCH 13/21] Remove all 'register' modifiers: obsolete today --- obm/ObmW/Gterm.h | 1 + obmsh/obmsh.c | 4 +- xgterm/button.c | 102 +++++++++--------- xgterm/charproc.c | 110 +++++++++---------- xgterm/cursor.c | 46 ++++---- xgterm/gtermio.c | 64 ++++++------ xgterm/input.c | 16 +-- xgterm/main.c | 44 ++++---- xgterm/menu.c | 36 +++---- xgterm/misc.c | 112 ++++++++++---------- xgterm/screen.c | 98 ++++++++--------- xgterm/scrollbar.c | 48 ++++----- xgterm/tabs.c | 6 +- xgterm/util.c | 154 +++++++++++++-------------- ximtool/eps.c | 32 +++--- ximtool/fitsio.c | 50 ++++----- ximtool/gifio.c | 34 +++--- ximtool/iis.c | 108 +++++++++---------- ximtool/irafio.c | 6 +- ximtool/ism.c | 44 ++++---- ximtool/ism_wcspix.c | 20 ++-- ximtool/load.c | 60 +++++------ ximtool/logo.c | 4 +- ximtool/print.c | 32 +++--- ximtool/quant.c | 28 ++--- ximtool/rasio.c | 10 +- ximtool/raster.c | 68 ++++++------ ximtool/save.c | 40 +++---- ximtool/util.c | 18 ++-- ximtool/ximclient.c | 244 +++++++++++++++++++++---------------------- ximtool/ximtool.c | 18 ++-- ximtool/zscale.c | 8 +- xtapemon/xtapemon.c | 6 +- 33 files changed, 836 insertions(+), 835 deletions(-) diff --git a/obm/ObmW/Gterm.h b/obm/ObmW/Gterm.h index 93c745b..efa7e36 100644 --- a/obm/ObmW/Gterm.h +++ b/obm/ObmW/Gterm.h @@ -300,6 +300,7 @@ typedef struct dPoint DPoint; typedef struct _GtermRec *GtermWidget; typedef struct _GtermClassRec *GtermWidgetClass; +typedef struct marker *Marker; extern WidgetClass gtermWidgetClass; diff --git a/obmsh/obmsh.c b/obmsh/obmsh.c index dab178f..28930cc 100644 --- a/obmsh/obmsh.c +++ b/obmsh/obmsh.c @@ -76,8 +76,8 @@ char *argv[]; exit (4); } } else { - register int ch; - register char *op; + int ch; + char *op; char *message = (char *) XtMalloc (1024000); for (op=message; (ch = getc(stdin)) != EOF; ) diff --git a/xgterm/button.c b/xgterm/button.c index e2bd4e0..4d44118 100644 --- a/xgterm/button.c +++ b/xgterm/button.c @@ -114,7 +114,7 @@ Boolean SendMousePosition(w, event) Widget w; XEvent* event; { - register TScreen *screen = &((XgtermWidget)w)->screen; + TScreen *screen = &((XgtermWidget)w)->screen; if (screen->send_mouse_pos == 0) return False; @@ -174,10 +174,10 @@ XEvent *event; /* must be XButtonEvent */ String *params; /* selections */ Cardinal *num_params; { /* ^XM-G */ - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; int pty = screen->respond; char Line[ 6 ]; - register unsigned line, col; + unsigned line, col; if (event->type != ButtonPress && event->type != ButtonRelease) return; @@ -201,10 +201,10 @@ XEvent *event; /* must be XButtonEvent */ String *params; /* selections */ Cardinal *num_params; { /* ^XM-G */ - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; int pty = screen->respond; char Line[ 6 ]; - register int line, col; + int line, col; if (event->type != ButtonPress && event->type != ButtonRelease) return; @@ -233,7 +233,7 @@ XEvent *event; /* must be XMotionEvent */ String *params; /* unused */ Cardinal *num_params; /* unused */ { - register TScreen *screen = &((XgtermWidget)w)->screen; + TScreen *screen = &((XgtermWidget)w)->screen; int row, col; screen->selection_time = event->xmotion.time; @@ -323,7 +323,7 @@ Cardinal num_params; default: cutbuffer = -1; } if (cutbuffer >= 0) { - register TScreen *screen = &((XgtermWidget)w)->screen; + TScreen *screen = &((XgtermWidget)w)->screen; int inbytes; unsigned long nbytes; int fmt8 = 8; @@ -361,7 +361,7 @@ unsigned long *length; int *format; { int pty = ((XgtermWidget)w)->screen.respond; /* file descriptor of pty */ - register char *lag, *cp, *end; + char *lag, *cp, *end; char *line = (char*)value; if (*type == 0 /*XT_CONVERT_FAIL*/ || *length == 0 || value == NULL) { @@ -442,7 +442,7 @@ XEvent *event; /* must be XButtonEvent* */ String *params; /* unused */ Cardinal *num_params; /* unused */ { - register TScreen *screen = &((XgtermWidget)w)->screen; + TScreen *screen = &((XgtermWidget)w)->screen; int startrow, startcol; firstValidRow = 0; @@ -460,7 +460,7 @@ XEvent *event; /* must be XButtonEvent* */ String *params; /* unused */ Cardinal *num_params; /* unused */ { - register TScreen *screen = &((XgtermWidget)w)->screen; + TScreen *screen = &((XgtermWidget)w)->screen; do_select_start (w, event, screen->cursor_row, screen->cursor_col); } @@ -468,7 +468,7 @@ Cardinal *num_params; /* unused */ static void TrackDown(event) - register XButtonEvent *event; + XButtonEvent *event; { int startrow, startcol; @@ -724,12 +724,12 @@ Cardinal *num_params; /* unused */ void ScrollSelection(screen, amount) -register TScreen* screen; -register int amount; +TScreen* screen; +int amount; { - register int minrow = -screen->savedlines - screen->topline; - register int maxrow = screen->max_row - screen->topline; - register int maxcol = screen->max_col; + int minrow = -screen->savedlines - screen->topline; + int maxrow = screen->max_row - screen->topline; + int maxcol = screen->max_col; #define scroll_update_one(row, col) \ row += amount; \ @@ -781,15 +781,15 @@ ResizeSelection (screen, rows, cols) static void PointToRowCol(y, x, r, c) - register int y, x; + int y, x; int *r, *c; /* Convert pixel coordinates to character coordinates. Rows are clipped between firstValidRow and lastValidRow. Columns are clipped between to be 0 or greater, but are not clipped to some maximum value. */ { - register TScreen *screen = &term->screen; - register int row, col; + TScreen *screen = &term->screen; + int row, col; row = (y - screen->border) / FontHeight(screen); if(row < firstValidRow) @@ -811,11 +811,11 @@ PointToRowCol(y, x, r, c) static int LastTextCol(row) - register int row; + int row; { - register TScreen *screen = &term->screen; - register int i; - register Char *ch; + TScreen *screen = &term->screen; + int i; + Char *ch; for ( i = screen->max_col, ch = screen->buf[4 * (row + screen->topline) + 1] + i ; @@ -902,8 +902,8 @@ static int charClass[256] = { 48, 48, 48, 48, 48, 48, 48, 48}; int SetCharacterClassRange (low, high, value) - register int low, high; /* in range of [0..255] */ - register int value; /* arbitrary */ + int low, high; /* in range of [0..255] */ + int value; /* arbitrary */ { if (low < 0 || high > 255 || high < low) return (-1); @@ -923,10 +923,10 @@ ComputeSelect(startRow, startCol, endRow, endCol, extend) int startRow, startCol, endRow, endCol; Bool extend; { - register TScreen *screen = &term->screen; - register Char *ptr; - register int length; - register int class; + TScreen *screen = &term->screen; + Char *ptr; + int length; + int class; int osc = startSCol; if (Coordinate(startRow, startCol) <= Coordinate(endRow, endCol)) { @@ -1010,11 +1010,11 @@ ComputeSelect(startRow, startCol, endRow, endCol, extend) } void TrackText(frow, fcol, trow, tcol) - register int frow, fcol, trow, tcol; + int frow, fcol, trow, tcol; /* Guaranteed (frow, fcol) <= (trow, tcol) */ { - register int from, to; - register TScreen *screen = &term->screen; + int from, to; + TScreen *screen = &term->screen; int old_startrow, old_startcol, old_endrow, old_endcol; old_startrow = screen->startHRow; @@ -1055,11 +1055,11 @@ TrackText(frow, fcol, trow, tcol) static void ReHiliteText(frow, fcol, trow, tcol) - register int frow, fcol, trow, tcol; + int frow, fcol, trow, tcol; /* Guaranteed that (frow, fcol) <= (trow, tcol) */ { - register TScreen *screen = &term->screen; - register int i; + TScreen *screen = &term->screen; + int i; if (frow < 0) frow = fcol = 0; @@ -1100,8 +1100,8 @@ SaltTextAway(crow, ccol, row, col, params, num_params) /* Guaranteed that (crow, ccol) <= (row, col), and that both points are valid (may have row = screen->max_row+1, col = 0) */ { - register TScreen *screen = &term->screen; - register int i, j = 0; + TScreen *screen = &term->screen; + int i, j = 0; int eol; char *line, *lp; @@ -1244,8 +1244,8 @@ static void LoseSelection(w, selection) Widget w; Atom *selection; { - register TScreen* screen = &((XgtermWidget)w)->screen; - register Atom* atomP; + TScreen* screen = &((XgtermWidget)w)->screen; + Atom* atomP; int i; for (i = 0, atomP = screen->selection_atoms; i < screen->selection_count; i++, atomP++) @@ -1291,7 +1291,7 @@ Atom *selection, *target; static void _OwnSelection(termw, selections, count) - register XgtermWidget termw; + XgtermWidget termw; String *selections; Cardinal count; { @@ -1345,7 +1345,7 @@ static void _OwnSelection(termw, selections, count) void DisownSelection(termw) - register XgtermWidget termw; + XgtermWidget termw; { Atom* atoms = termw->screen.selection_atoms; Cardinal count = termw->screen.selection_count; @@ -1378,10 +1378,10 @@ DisownSelection(termw) /* ARGSUSED */ static int Length(screen, row, scol, ecol) - register int row, scol, ecol; - register TScreen *screen; + int row, scol, ecol; + TScreen *screen; { - register int lastcol = LastTextCol(row); + int lastcol = LastTextCol(row); if (ecol > lastcol) ecol = lastcol; @@ -1394,13 +1394,13 @@ SaveText(screen, row, scol, ecol, lp, eol) int row; int scol, ecol; TScreen *screen; - register char *lp; /* pointer to where to put the text */ + char *lp; /* pointer to where to put the text */ int *eol; { - register int i = 0; - register Char *ch = screen->buf[4 * (row + screen->topline)]; + int i = 0; + Char *ch = screen->buf[4 * (row + screen->topline)]; Char attr; - register int c; + int c; *eol = 0; i = Length(screen, row, scol, ecol); @@ -1434,12 +1434,12 @@ SaveText(screen, row, scol, ecol, lp, eol) static void EditorButton(event) - register XButtonEvent *event; + XButtonEvent *event; { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; int pty = screen->respond; char line[6]; - register unsigned row, col; + unsigned row, col; int button; button = event->button - 1; diff --git a/xgterm/charproc.c b/xgterm/charproc.c index ae9bf4e..cad9329 100644 --- a/xgterm/charproc.c +++ b/xgterm/charproc.c @@ -682,11 +682,11 @@ WidgetClass xgtermWidgetClass = (WidgetClass)&xgtermClassRec; static void VTparse() { - register TScreen *screen = &term->screen; - register int *parsestate = groundtable; - register unsigned int c; - register unsigned char *cp; - register int row, col, top, bot, scstype; + TScreen *screen = &term->screen; + int *parsestate = groundtable; + unsigned int c; + unsigned char *cp; + int row, col, top, bot, scstype; extern int TrackMouse(); if(setjmp(vtjmpbuf)) @@ -1563,8 +1563,8 @@ v_write(f, d, len) static int in_put() { - register TScreen *screen = &term->screen; - register XtInputMask mask; + TScreen *screen = &term->screen; + XtInputMask mask; /* Enable pty input. */ if (!input_handler) @@ -1633,7 +1633,7 @@ do_read (w, fd, id) int *fd; XtInputId *id; { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; /* Don't read any more data until the input buffer is empty. */ if (bcnt > 0) @@ -1669,8 +1669,8 @@ do_read (w, fd, id) } if (!screen->output_eight_bits) { - register int bc = bcnt; - register Char *b = bptr; + int bc = bcnt; + Char *b = bptr; for (; bc > 0; bc--, b++) { *b &= (Char) 0x7f; @@ -1720,16 +1720,16 @@ init_ttyio (pty) */ static void dotext(screen, flags, charset, buf, ptr, fg, bg) - register TScreen *screen; + TScreen *screen; unsigned flags, fg, bg; char charset; char *buf; /* start of characters to process */ char *ptr; /* end */ { - register char *s; - register int len; - register int n; - register int next_col; + char *s; + int len; + int n; + int next_col; switch (charset) { case 'A': /* United Kingdom set */ @@ -1788,14 +1788,14 @@ dotext(screen, flags, charset, buf, ptr, fg, bg) */ static void WriteText(screen, str, len, flags, fg, bg) - register TScreen *screen; - register char *str; - register int len; + TScreen *screen; + char *str; + int len; unsigned flags, fg, bg; { - register int cx, cy; - register unsigned fgs = flags; - register Pixel fg_pix, bg_pix; + int cx, cy; + unsigned fgs = flags; + Pixel fg_pix, bg_pix; GC currentGC; fg_pix = (fgs & FG_COLOR) ? screen->colors[fg] : @@ -1874,7 +1874,7 @@ ansi_modes(termw, func) XgtermWidget termw; int (*func)(); { - register int i; + int i; for (i=0; iscreen; - register int i, j; + TScreen *screen = &termw->screen; + int i, j; for (i=0; iscreen; - register int i; + TScreen *screen = &termw->screen; + int i; for (i = 0; i < nparam; i++) { switch (param[i]) { @@ -2144,8 +2144,8 @@ savemodes(termw) restoremodes(termw) XgtermWidget termw; { - register TScreen *screen = &termw->screen; - register int i, j; + TScreen *screen = &termw->screen; + int i, j; for (i = 0; i < nparam; i++) { switch (param[i]) { @@ -2290,12 +2290,12 @@ static void bitclr(p, mask) } unparseseq(ap, fd) - register ANSI *ap; + ANSI *ap; int fd; { - register int c; - register int i; - register int inters; + int c; + int i; + int inters; c = ap->a_type; if (c>=0x80 && c<=0x9F) { @@ -2339,7 +2339,7 @@ char c; int fd; { char buf[2]; - register i = 1; + int i = 1; extern XgtermWidget term; if((buf[0] = c) == '\r' && (term->flags & LINEFEED)) { @@ -2350,7 +2350,7 @@ int fd; } unparsefputs (s, fd) - register char *s; + char *s; int fd; { if (s) { @@ -2362,7 +2362,7 @@ static void SwitchBufs(); static void ToAlternate(screen) -register TScreen *screen; +TScreen *screen; { extern ScrnBuf Allocate(); @@ -2378,7 +2378,7 @@ register TScreen *screen; static void FromAlternate(screen) -register TScreen *screen; +TScreen *screen; { if(!screen->alternate) return; @@ -2389,9 +2389,9 @@ register TScreen *screen; static void SwitchBufs(screen) - register TScreen *screen; + TScreen *screen; { - register int rows, top; + int rows, top; if(screen->cursor_state) HideCursor(); @@ -2432,9 +2432,9 @@ SwitchBufs(screen) /* swap buffer line pointers between alt and regular screens */ SwitchBufPtrs(screen) - register TScreen *screen; + TScreen *screen; { - register int rows = screen->max_row + 1; + int rows = screen->max_row + 1; char *save [4 * MAX_ROWS]; memmove( (char *)save, (char *)screen->buf, 4 * sizeof(char *) * rows); @@ -2445,8 +2445,8 @@ SwitchBufPtrs(screen) VTRun() { - register TScreen *screen = &term->screen; - register int i; + TScreen *screen = &term->screen; + int i; XtRealizeWidget (term->core.parent); if (!screen->TekEmu) @@ -2488,7 +2488,7 @@ static void VTExpose(w, event, region) XEvent *event; Region region; { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; #ifdef DEBUG if(debug) @@ -2501,7 +2501,7 @@ static void VTExpose(w, event, region) static void VTGraphicsOrNoExpose (event) XEvent *event; { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; if (screen->incopy <= 0) { screen->incopy = 1; if (screen->scrolls > 0) @@ -2555,7 +2555,7 @@ static String xgterm_trans = int VTInit () { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; Widget vtparent = term->core.parent; XtRealizeWidget (vtparent); @@ -2569,7 +2569,7 @@ int VTInit () static void VTallocbuf () { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; int nrows = screen->max_row + 1; extern ScrnBuf Allocate(); @@ -2718,7 +2718,7 @@ static void VTRealize (w, valuemask, values) XSetWindowAttributes *values; { unsigned int width, height; - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; int xpos, ypos, pr; XSizeHints sizehints; int scrollbar_width; @@ -3076,8 +3076,8 @@ static Boolean VTSetValues (cur, request, new, args, num_args) void ShowCursor() { - register TScreen *screen = &term->screen; - register int x, y, flags; + TScreen *screen = &term->screen; + int x, y, flags; Char c; GC currentGC; Boolean in_selection; @@ -3195,10 +3195,10 @@ ShowCursor() void HideCursor() { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; GC currentGC; - register int x, y, flags, fg, bg; - register Pixel fg_pix, bg_pix; + int x, y, flags, fg, bg; + Pixel fg_pix, bg_pix; char c; Boolean in_selection; @@ -3265,7 +3265,7 @@ HideCursor() VTReset(full) Boolean full; { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; /* reset scrolling region */ screen->top_marg = 0; @@ -3336,9 +3336,9 @@ VTReset(full) */ int set_character_class (s) - register char *s; + char *s; { - register int i; /* iterator, index into s */ + int i; /* iterator, index into s */ int len; /* length of s */ int acc; /* accumulator */ int low, high; /* bounds of range [0..127] */ diff --git a/xgterm/cursor.c b/xgterm/cursor.c index 3c07001..c6de77d 100644 --- a/xgterm/cursor.c +++ b/xgterm/cursor.c @@ -30,7 +30,7 @@ #include "ptyx.h" /* also gets Xlib.h */ static void _CheckSelection(screen) -register TScreen *screen; +TScreen *screen; { extern XgtermWidget term; /* %%% gross */ @@ -49,11 +49,11 @@ register TScreen *screen; * The origin is considered to be 0, 0 for this procedure. */ CursorSet(screen, row, col, flags) -register TScreen *screen; -register int row, col; +TScreen *screen; +int row, col; unsigned flags; { - register int maxr; + int maxr; col = (col < 0 ? 0 : col); screen->cur_col = (col <= screen->max_col ? col : screen->max_col); @@ -72,10 +72,10 @@ unsigned flags; * moves the cursor left n, no wrap around */ CursorBack(screen, n) -register TScreen *screen; +TScreen *screen; int n; { - register int i, j, k, rev; + int i, j, k, rev; extern XgtermWidget term; if((rev = (term->flags & (REVERSEWRAP | WRAPAROUND)) == @@ -101,7 +101,7 @@ int n; * moves the cursor forward n, no wraparound */ CursorForward(screen, n) -register TScreen *screen; +TScreen *screen; int n; { screen->cur_col += n; @@ -116,10 +116,10 @@ int n; * Won't pass bottom margin or bottom of screen. */ CursorDown(screen, n) -register TScreen *screen; +TScreen *screen; int n; { - register int max; + int max; max = (screen->cur_row > screen->bot_marg ? screen->max_row : screen->bot_marg); @@ -136,10 +136,10 @@ int n; * Won't pass top margin or top of screen. */ CursorUp(screen, n) -register TScreen *screen; +TScreen *screen; int n; { - register int min; + int min; min = (screen->cur_row < screen->top_marg ? 0 : screen->top_marg); @@ -157,10 +157,10 @@ int n; */ void Index(screen, amount) -register TScreen *screen; -register int amount; +TScreen *screen; +int amount; { - register int j; + int j; /* * indexing when below scrolling region is cursor down. @@ -182,8 +182,8 @@ register int amount; */ void RevIndex(screen, amount) -register TScreen *screen; -register int amount; +TScreen *screen; +int amount; { /* * reverse indexing when above scrolling region is cursor up. @@ -203,7 +203,7 @@ register int amount; * Moves Cursor To First Column In Line */ CarriageReturn(screen) -register TScreen *screen; +TScreen *screen; { screen->cur_col = 0; screen->do_wrap = 0; @@ -214,10 +214,10 @@ register TScreen *screen; * Save Cursor and Attributes */ CursorSave(term, sc) -register XgtermWidget term; -register SavedCursor *sc; +XgtermWidget term; +SavedCursor *sc; { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; sc->row = screen->cur_row; sc->col = screen->cur_col; @@ -231,10 +231,10 @@ register SavedCursor *sc; * Restore Cursor and Attributes */ CursorRestore(term, sc) -register XgtermWidget term; -register SavedCursor *sc; +XgtermWidget term; +SavedCursor *sc; { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; memmove( screen->gsets, sc->gsets, sizeof(screen->gsets)); screen->curgl = sc->curgl; diff --git a/xgterm/gtermio.c b/xgterm/gtermio.c index 44c3045..451e9e1 100644 --- a/xgterm/gtermio.c +++ b/xgterm/gtermio.c @@ -338,7 +338,7 @@ gio_enable (int dummy, int onoff) static int gio_activate (int dummy, int state) { - register RequestPtr rp; + RequestPtr rp; /* Cancel any buffered command output. */ wait_cursor = 0; @@ -392,7 +392,7 @@ gio_status (int dummy, char *app_name, char *app_class) static int gio_activate_cb (int dummy, Widget w, int state) { - register RequestPtr rp; + RequestPtr rp; if (!state) return 0; @@ -513,7 +513,7 @@ gio_clear (int dummy) static int gio_hardreset (int dummy) { - register RequestPtr rp; + RequestPtr rp; /* If a cusor read is currently in progress send the application EOF * to indicate that it should exit graphics mode. @@ -576,7 +576,7 @@ gio_hardreset (int dummy) static int gio_reset (int notused, GtermWidget w, char *args) { - register int i; + int i; int new_widget; /* Make this the active graphics widget. */ @@ -650,8 +650,8 @@ gio_reset (int notused, GtermWidget w, char *args) static int gio_setginmodeterm (int dummy, char *str) { - register char *ip; - register int n; + char *ip; + int n; trailer1 = trailer2 = -1; @@ -780,7 +780,7 @@ gio_queue_output ( static int gio_queue_request (int sx, int sy, int raster, int rx, int ry, int key, char *strval) { - register RequestPtr rp; + RequestPtr rp; int buflen, nchars; char *buf; @@ -828,7 +828,7 @@ gio_queue_request (int sx, int sy, int raster, int rx, int ry, int key, char *st static int gio_output(void) { - register RequestPtr rp; + RequestPtr rp; if (!(rp = request_head)) return (-1); @@ -873,8 +873,8 @@ gio_ptyinput ( char *ttybuf, /* raw data on input, tty data on output */ int nchars) /* nchars of raw data */ { - register char *itop = ttybuf + nchars; - register char *op, *ip = ttybuf, ch; + char *itop = ttybuf + nchars; + char *op, *ip = ttybuf, ch; if (!gio_enabled || nchars <= 0) return (nchars); @@ -1018,7 +1018,7 @@ gstart: g_putc (GS); static int gio_processdata(void) { - register int quota, ch; + int quota, ch; unsigned char *save_ip, *ip_start; int textwidth; @@ -1197,8 +1197,8 @@ gio_processdata(void) } msgbuf[msg_op++] = ch; } else { - register int i, j, v; - register char *ip = msgbuf; + int i, j, v; + char *ip = msgbuf; unsigned short r[MAX_COLORS], g[MAX_COLORS], b[MAX_COLORS]; int b1, b2; @@ -1242,8 +1242,8 @@ gio_processdata(void) } msgbuf[msg_op++] = ch; } else { - register int b1, b2, i; - register char *ip = msgbuf; + int b1, b2, i; + char *ip = msgbuf; unsigned short iomap[MAX_COLORS]; msgbuf[msg_op++] = 0; @@ -1540,7 +1540,7 @@ flush_alpha: if (tx_len > 0) { static void pl_decodepts(void) { - register char *ip, *itop; + char *ip, *itop; int hiy, loy, hix, lox, type, data, nb; char *ip_save; @@ -1644,7 +1644,7 @@ int raster; /* raster number */ int rx, ry; /* raster coords of event */ int datalen; /* nchars of data following cursor value */ { - register int n=0, mc_x, mc_y; + int n=0, mc_x, mc_y; char curval[20]; /* Ignore cursor events unless requested via program control. @@ -1703,7 +1703,7 @@ int datalen; /* nchars of data following cursor value */ static void gio_retenq() { - register int mc_x, mc_y; + int mc_x, mc_y; char curval[7]; int len; @@ -1777,8 +1777,8 @@ static struct _esc e_table[] = { static int gio_escape() { - register struct _esc *esc; - register int ch, i, j; + struct _esc *esc; + int ch, i, j; struct _esc **e_temp; int tag; @@ -2103,9 +2103,9 @@ gio_escape() case ESC_READPIXELS: { /* parameters: RN EC X1 Y1 NX NY BP (return NX*NY pixels) */ int raster, encoding, x1, y1, nx, ny, nbits, npix=0; - register unsigned char *data, *op; + unsigned char *data, *op; unsigned char obuf[128]; - register int i; + int i; if (startscan()) return (-1); @@ -2209,8 +2209,8 @@ gio_escape() int map, first, ncolors, buflen; unsigned short *buf, *r, *g, *b, v[3]; unsigned char obuf[128]; - register unsigned char *op; - register int i, j; + unsigned char *op; + int i, j; if (startscan() || getint(&map) || getint(&first) || getint(&ncolors) || endscan()) @@ -2304,8 +2304,8 @@ gio_escape() int first, ncolors, buflen; unsigned short *iomap, v; unsigned char obuf[128]; - register unsigned char *op; - register int i; + unsigned char *op; + int i; if (startscan() || getint(&first) || getint(&ncolors) || endscan()) @@ -2507,7 +2507,7 @@ gio_escape() static int startscan() { - register int ch; + int ch; /* Skip forward to the '[' preceeding the first argument. */ while (g_getc (ch) >= 0) @@ -2529,8 +2529,8 @@ static int getint (value) int *value; { - register int ch; - register int v; + int ch; + int v; int neg = 0; if (scanok) { @@ -2582,8 +2582,8 @@ static int getstr (value) char *value; { - register int ch; - register char *op = value; + int ch; + char *op = value; if (scanok) { /* Skip to the next string token. */ @@ -2617,7 +2617,7 @@ char *value; static int endscan() { - register int ch; + int ch; /* Skip to the ']' delimiter. */ for (;;) { diff --git a/xgterm/input.c b/xgterm/input.c index 568b6f7..34d2ad9 100644 --- a/xgterm/input.c +++ b/xgterm/input.c @@ -62,7 +62,7 @@ extern Boolean sunFunctionKeys; static void AdjustAfterInput (screen) -register TScreen *screen; +TScreen *screen; { if(screen->scrollkey && screen->topline != 0) WindowScroll(screen, 0); @@ -84,9 +84,9 @@ register TScreen *screen; void Input (keyboard, screen, event, eightbit) - register TKeyboard *keyboard; - register TScreen *screen; - register XKeyEvent *event; + TKeyboard *keyboard; + TScreen *screen; + XKeyEvent *event; Bool eightbit; { @@ -97,8 +97,8 @@ Input (keyboard, screen, event, eightbit) #endif char strbuf[STRBUFSIZE]; - register char *string; - register int key = FALSE; + char *string; + int key = FALSE; int pty = screen->respond; int nbytes; KeySym keysym = 0; @@ -187,8 +187,8 @@ Input (keyboard, screen, event, eightbit) } StringInput (screen, string, nbytes) - register TScreen *screen; - register char *string; + TScreen *screen; + char *string; int nbytes; { int pty = screen->respond; diff --git a/xgterm/main.c b/xgterm/main.c index 2ec1437..3043009 100644 --- a/xgterm/main.c +++ b/xgterm/main.c @@ -867,7 +867,7 @@ NULL}; static Boolean get_termcap(char *name, char *buffer, char *resized) { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; *buffer = 0; /* initialize, in case we're using terminfo's tgetent */ @@ -1017,8 +1017,8 @@ main (argc, argv) int argc; char **argv; { - register TScreen *screen; - register int pty; + TScreen *screen; + int pty; int Xsocket, mode; char *base_name(); int xerror(), xioerror(); @@ -1505,7 +1505,7 @@ char **argv; char *base_name(name) char *name; { - register char *cp; + char *cp; cp = strrchr(name, '/'); return(cp ? cp + 1 : name); @@ -1906,7 +1906,7 @@ get_terminal () * sets up X and initializes the terminal structure except for term.buf.fildes. */ { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; screen->arrow = make_colored_cursor (XC_left_ptr, screen->mousecolor, @@ -2015,7 +2015,7 @@ static int cp_pipe[2]; /* this pipe is used for child to parent transfer */ void first_map_occurred () { handshake_t handshake; - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; handshake.status = PTY_EXEC; handshake.rows = screen->max_row; @@ -2077,10 +2077,10 @@ set_owner(char *device, int uid, int gid, int mode) * to have to do a realloc(). */ void -xtermSetenv(register char *var, register char *value) +xtermSetenv(char *var, char *value) { - register int envindex = 0; - register size_t len = strlen(var); + int envindex = 0; + size_t len = strlen(var); while (environ[envindex] != NULL) { if (strncmp(environ[envindex], var, len) == 0) { @@ -2175,7 +2175,7 @@ spawn(void) * If slave, the pty named in passedPty is already open for use */ { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; #if OPT_PTY_HANDSHAKE handshake_t handshake; int done; @@ -3738,7 +3738,7 @@ spawn () */ { extern char *SysErrorMsg(); - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; int Xsocket = ConnectionNumber(screen->display); #ifdef USE_HANDSHAKE handshake_t handshake; @@ -4960,7 +4960,7 @@ SIGNAL_T Exit(n) int n; { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; int pty = term->screen.respond; /* file descriptor of pty */ #ifdef UTMP #ifdef USE_SYSV_UTMP @@ -5020,8 +5020,8 @@ Exit(n) (void) endutent(); } #else /* not USE_SYSV_UTMP */ - register int wfd; - register int i; + int wfd; + int i; struct utmp utmp; if (!resource.utmpInhibit && added_utmp_entry && @@ -5071,13 +5071,13 @@ void resize(screen, TermName, oldtc, newtc) TScreen *screen; char *TermName; -register char *oldtc, *newtc; +char *oldtc, *newtc; { #ifndef USE_SYSV_ENVVARS - register char *ptr1, *ptr2; - register int i; - register int li_first = 0; - register char *temp; + char *ptr1, *ptr2; + int i; + int li_first = 0; + char *temp; if ((ptr1 = strindex (oldtc, "co#")) == NULL){ strcat (oldtc, "co#80:"); @@ -5128,7 +5128,7 @@ nonblocking_wait() int pid = 0; #else /* defined(USE_SYSV_SIGNALS) && (defined(CRAY) || !defined(SIGTSTP)) */ /* union wait status; */ int status; - register int pid; + int pid; pid = wait3 (&status, WNOHANG, (struct rusage *)NULL); #endif /* defined(USE_SYSV_SIGNALS) && !defined(SIGTSTP) */ @@ -5169,11 +5169,11 @@ remove_termcap_entry (buf, str) char *buf; char *str; { - register char *strinbuf; + char *strinbuf; strinbuf = strindex (buf, str); if (strinbuf) { - register char *colonPtr = strchr(strinbuf+1, ':'); + char *colonPtr = strchr(strinbuf+1, ':'); if (colonPtr) { while (*colonPtr) { *strinbuf++ = *colonPtr++; /* copy down */ diff --git a/xgterm/menu.c b/xgterm/menu.c index 3c09afc..b08bbd7 100644 --- a/xgterm/menu.c +++ b/xgterm/menu.c @@ -371,8 +371,8 @@ static Widget create_menu (w, toplevelw, name, entries, nentries) init_menu (menu) char *menu; { - register TScreen *screen = &term->screen; - register int i; + TScreen *screen = &term->screen; + int i; switch (menu[0]) { case 'f': @@ -403,7 +403,7 @@ static void handle_send_signal (gw, sig) Widget gw; int sig; { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; if (screen->pid > 1) kill_process_group (screen->pid, sig); } @@ -424,7 +424,7 @@ static void do_securekbd (gw, closure, data) Widget gw; caddr_t closure, data; { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; Time time = CurrentTime; /* XXX - wrong */ if (screen->grabbedKbd) { @@ -449,7 +449,7 @@ static void do_allowsends (gw, closure, data) Widget gw; caddr_t closure, data; { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; /* screen->allowSendEvents = !screen->allowSendEvents; @@ -461,7 +461,7 @@ static void do_visualbell (gw, closure, data) Widget gw; caddr_t closure, data; { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; screen->visualbell = !screen->visualbell; update_visualbell(); @@ -472,7 +472,7 @@ static void do_logging (gw, closure, data) Widget gw; caddr_t closure, data; { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; if (screen->logging) { CloseLog (screen); @@ -566,7 +566,7 @@ static void do_scrollbar (gw, closure, data) Widget gw; caddr_t closure, data; { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; if (screen->scrollbar) { ScrollBarOff (screen); @@ -581,7 +581,7 @@ static void do_jumpscroll (gw, closure, data) Widget gw; caddr_t closure, data; { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; term->flags ^= SMOOTHSCROLL; if (term->flags & SMOOTHSCROLL) { @@ -663,7 +663,7 @@ static void do_scrollkey (gw, closure, data) Widget gw; caddr_t closure, data; { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; screen->scrollkey = !screen->scrollkey; update_scrollkey(); @@ -674,7 +674,7 @@ static void do_scrollttyoutput (gw, closure, data) Widget gw; caddr_t closure, data; { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; screen->scrollttyoutput = !screen->scrollttyoutput; update_scrollttyoutput(); @@ -685,7 +685,7 @@ static void do_allow132 (gw, closure, data) Widget gw; caddr_t closure, data; { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; screen->c132 = !screen->c132; update_allow132(); @@ -696,7 +696,7 @@ static void do_cursesemul (gw, closure, data) Widget gw; caddr_t closure, data; { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; screen->curses = !screen->curses; update_cursesemul(); @@ -707,7 +707,7 @@ static void do_marginbell (gw, closure, data) Widget gw; caddr_t closure, data; { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; if (!(screen->marginbell = !screen->marginbell)) screen->bellarmed = -1; update_marginbell(); @@ -743,7 +743,7 @@ static void do_clearsavedlines (gw, closure, data) Widget gw; caddr_t closure, data; { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; screen->savedlines = 0; ScrollBarDrawThumb(screen->scrollWidget); @@ -771,7 +771,7 @@ static void handle_tekshow (gw, allowswitch) Widget gw; Bool allowswitch; { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; if (!gt_activated()) { /* not showing, turn on */ set_tek_visibility (TRUE); @@ -868,7 +868,7 @@ static void handle_vtshow (gw, allowswitch) Widget gw; Bool allowswitch; { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; if (!screen->Vshow) { /* not showing, turn on */ set_vt_visibility (TRUE); @@ -897,7 +897,7 @@ static void do_vtmode (gw, closure, data) Widget gw; caddr_t closure, data; { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; switch_modes (gt_activated()); /* switch to vt, or from */ } diff --git a/xgterm/misc.c b/xgterm/misc.c index 14c97fa..60ac55d 100644 --- a/xgterm/misc.c +++ b/xgterm/misc.c @@ -71,7 +71,7 @@ xevents() { XEvent event; XtInputMask input_mask; - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; if(screen->scroll_amt) FlushScroll(screen); @@ -120,9 +120,9 @@ Cursor make_colored_cursor (cursorindex, fg, bg) int cursorindex; /* index into font */ unsigned long fg, bg; /* pixel value */ { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; Cursor c; - register Display *dpy = screen->display; + Display *dpy = screen->display; c = XCreateFontCursor (dpy, cursorindex); if (c == (Cursor) 0) return (c); @@ -138,7 +138,7 @@ void HandleKeyPressed(w, event, params, nparams) String *params; Cardinal *nparams; { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; #ifdef ACTIVEWINDOWINPUTONLY if (w == (Widget)term) @@ -152,7 +152,7 @@ void HandleEightBitKeyPressed(w, event, params, nparams) String *params; Cardinal *nparams; { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; #ifdef ACTIVEWINDOWINPUTONLY if (w == (Widget)term) @@ -167,7 +167,7 @@ void HandleStringEvent(w, event, params, nparams) String *params; Cardinal *nparams; { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; #ifdef ACTIVEWINDOWINPUTONLY if (w != (Widget)term) @@ -197,9 +197,9 @@ void HandleStringEvent(w, event, params, nparams) } static void DoSpecialEnterNotify (ev) - register XEnterWindowEvent *ev; + XEnterWindowEvent *ev; { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; #ifdef ACTIVEWINDOWINPUTONLY if (ev->window == (Widget)term) @@ -213,7 +213,7 @@ static void DoSpecialEnterNotify (ev) /*ARGSUSED*/ void HandleEnterWindow(w, eventdata, event) Widget w; -register XEnterWindowEvent *event; +XEnterWindowEvent *event; caddr_t eventdata; { /* This code is necessary as xevent does not see all events anymore. */ @@ -225,9 +225,9 @@ caddr_t eventdata; static void DoSpecialLeaveNotify (ev) - register XEnterWindowEvent *ev; + XEnterWindowEvent *ev; { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; #ifdef ACTIVEWINDOWINPUTONLY if (ev->window == (Widget)term) @@ -242,7 +242,7 @@ static void DoSpecialLeaveNotify (ev) /*ARGSUSED*/ void HandleLeaveWindow(w, eventdata, event) Widget w; -register XEnterWindowEvent *event; +XEnterWindowEvent *event; caddr_t eventdata; { /* This code is necessary as xevent does not see all events anymore. */ @@ -256,10 +256,10 @@ caddr_t eventdata; /*ARGSUSED*/ void HandleFocusChange(w, eventdata, event) Widget w; -register XFocusChangeEvent *event; +XFocusChangeEvent *event; caddr_t eventdata; { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; if(event->type == FocusIn) selectwindow(screen, @@ -281,8 +281,8 @@ caddr_t eventdata; void selectwindow(screen, flag) -register TScreen *screen; -register int flag; +TScreen *screen; +int flag; { #ifdef I18N if (screen->xic) @@ -300,8 +300,8 @@ register int flag; void unselectwindow(screen, flag) -register TScreen *screen; -register int flag; +TScreen *screen; +int flag; { if (screen->always_highlight) return; @@ -324,7 +324,7 @@ void Bell() { extern XgtermWidget term; - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; struct timeval curtime; long now_msecs; @@ -373,8 +373,8 @@ void VisualBell() { extern XgtermWidget term; - register TScreen *screen = &term->screen; - register Pixel xorPixel = screen->foreground ^ term->core.background_pixel; + TScreen *screen = &term->screen; + Pixel xorPixel = screen->foreground ^ term->core.background_pixel; XGCValues gcval; GC visualGC; @@ -405,7 +405,7 @@ void HandleBellPropertyChange(w, data, ev, more) XEvent *ev; Boolean *more; { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; if (ev->xproperty.atom == XA_NOTICE) { screen->bellInProgress = FALSE; @@ -416,7 +416,7 @@ void Redraw() { extern XgtermWidget term; - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; XExposeEvent event; event.type = Expose; @@ -507,10 +507,10 @@ creat_as(uid, gid, pathname, mode) */ void StartLog(screen) -register TScreen *screen; +TScreen *screen; { - register char *cp; - register int i; + char *cp; + int i; static char *log_default; #ifdef ALLOWLOGFILEEXEC void logpipe(); @@ -563,7 +563,7 @@ register TScreen *screen; close(ConnectionNumber(screen->display)); close(screen->respond); if(!shell) { - register struct passwd *pw; + struct passwd *pw; struct passwd *getpwuid(); if(((cp = getenv("SHELL")) == NULL || *cp == 0) @@ -614,7 +614,7 @@ register TScreen *screen; void CloseLog(screen) -register TScreen *screen; +TScreen *screen; { if(!screen->logging || (screen->inhibit & I_LOG)) return; @@ -626,10 +626,10 @@ register TScreen *screen; void FlushLog(screen) -register TScreen *screen; +TScreen *screen; { - register Char *cp; - register int i; + Char *cp; + int i; /* * With xgterm pty input is read only in one place, hence logging is done @@ -645,7 +645,7 @@ register TScreen *screen; #ifdef ALLOWLOGFILEEXEC void logpipe() { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; #ifdef SYSV (void) signal(SIGPIPE, SIG_IGN); @@ -660,8 +660,8 @@ void logpipe() do_osc(func) int (*func)(); { - register int mode, c; - register char *cp; + int mode, c; + char *cp; char buf[512]; char *bufend = &buf[(sizeof buf) - 1]; /* leave room for null */ Bool okay = True; @@ -747,13 +747,13 @@ static ChangeGroup(attribute, value) } Changename(name) -register char *name; +char *name; { ChangeGroup( XtNiconName, (XtArgVal)name ); } Changetitle(name) -register char *name; +char *name; { ChangeGroup( XtNtitle, (XtArgVal)name ); } @@ -815,7 +815,7 @@ int i; void ReverseOldColors() { -register ScrnColors *pOld= pOldColors; +ScrnColors *pOld= pOldColors; Pixel tmpPix; char *tmpName; @@ -871,7 +871,7 @@ int ndx; char *name; { XColor def; -register TScreen *screen= &pTerm->screen; +TScreen *screen= &pTerm->screen; Colormap cmap= pTerm->core.colormap; char *newName; @@ -892,7 +892,7 @@ Boolean ChangeColorsRequest(pTerm,start,names) XgtermWidget pTerm; int start; -register char *names; +char *names; { char *thisName; ScrnColors newColors; @@ -995,7 +995,7 @@ Cleanup (code) int code; { extern XgtermWidget term; - register TScreen *screen; + TScreen *screen; screen = &term->screen; if (screen->pid > 1) { @@ -1013,11 +1013,11 @@ int code; */ void Setenv (var, value) -register char *var, *value; +char *var, *value; { extern char **environ; - register int envindex = 0; - register int len = strlen(var); + int envindex = 0; + int len = strlen(var); while (environ [envindex] != NULL) { if (strncmp (environ [envindex], var, len) == 0) { @@ -1045,9 +1045,9 @@ register char *var, *value; * or NULL if there are none. */ char *strindex (s1, s2) -register char *s1, *s2; +char *s1, *s2; { - register char *s3; + char *s3; int s2len = strlen (s2); while ((s3=strchr(s1, *s2)) != NULL) { @@ -1066,7 +1066,7 @@ register char *s1, *s2; /*ARGSUSED*/ xerror (display, event) Display *display; -register XErrorEvent *event; +XErrorEvent *event; { static char *envvar = "XGXERROR"; static char *env_maxerrs = "XGMAXERROR"; @@ -1176,7 +1176,7 @@ static void withdraw_window (dpy, w, scr) void set_vt_visibility (on) Boolean on; { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; if (on) { if (!screen->Vshow && term) { @@ -1206,7 +1206,7 @@ extern Atom wm_delete_window; /* for ICCCM delete window */ void set_tek_visibility (on) Boolean on; { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; if (on) { if (!gt_activated()) gt_activate(); @@ -1225,7 +1225,7 @@ Boolean on; void end_tek_mode () { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; if (gt_tekmode (2)) { #ifdef ALLOWLOGGING @@ -1241,7 +1241,7 @@ void end_tek_mode () void end_vt_mode () { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; if (!gt_tekmode (2)) { #ifdef ALLOWLOGGING @@ -1277,7 +1277,7 @@ void switch_modes (tovt) void hide_vt_window () { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; set_vt_visibility (FALSE); switch_modes (False); @@ -1285,7 +1285,7 @@ void hide_vt_window () void hide_tek_window () { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; set_tek_visibility (FALSE); switch_modes (True); @@ -1328,7 +1328,7 @@ int state; /* 1=open, 0=close */ static void set_workstation_state (state) { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; screen->Tshow = state; set_tekhide_sensitivity(); @@ -1366,8 +1366,8 @@ gtermio_register (functions, nfunc) struct GT_function *functions; int nfunc; { - register struct GT_function *fp; - register int i; + struct GT_function *fp; + int i; for (i=0; i < nfunc; i++) { fp = &functions[i]; @@ -1531,7 +1531,7 @@ int gt_tekmode (state) int state; { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; int tekEmu; if (gtermio_tekmode) { diff --git a/xgterm/screen.c b/xgterm/screen.c index 7c854d6..c77de84 100644 --- a/xgterm/screen.c +++ b/xgterm/screen.c @@ -61,12 +61,12 @@ ScrnBuf Allocate (nrow, ncol, addr) > character array, the second one is the attributes, the third is the > foreground color, and the fourth is the background color. */ -register int nrow, ncol; +int nrow, ncol; Char **addr; { - register ScrnBuf base; - register Char *tmp; - register int i; + ScrnBuf base; + Char *tmp; + int i; if ((base = (ScrnBuf) calloc ((unsigned)(nrow *= 4), sizeof (char *))) == 0) SysError (ERROR_SCALLOC); @@ -92,9 +92,9 @@ Reallocate(sbuf, sbufaddr, nrow, ncol, oldrow, oldcol) Char **sbufaddr; int nrow, ncol, oldrow, oldcol; { - register ScrnBuf base; - register Char *tmp; - register int i, minrows, mincols; + ScrnBuf base; + Char *tmp; + int i, minrows, mincols; Char *oldbuf; int move_down = 0, move_up = 0; @@ -170,14 +170,14 @@ ScreenWrite (screen, str, flags, cur_fg, cur_bg, length) */ TScreen *screen; char *str; -register unsigned flags; -register unsigned cur_fg, cur_bg; -register int length; /* length of string */ +unsigned flags; +unsigned cur_fg, cur_bg; +int length; /* length of string */ { - register Char *attrs, *attrs0, *fgs, *bgs; - register int avail = screen->max_col - screen->cur_col + 1; - register Char *col; - register int wrappedbit; + Char *attrs, *attrs0, *fgs, *bgs; + int avail = screen->max_col - screen->cur_col + 1; + Char *col; + int wrappedbit; if (length > avail) length = avail; @@ -210,11 +210,11 @@ ScrnInsertLine (sb, last, where, n, size) Requires: 0 <= where < where + n <= last n <= MAX_ROWS */ -register ScrnBuf sb; +ScrnBuf sb; int last; -register int where, n, size; +int where, n, size; { - register int i; + int i; char *save [4 * MAX_ROWS]; @@ -250,11 +250,11 @@ ScrnDeleteLine (sb, last, where, n, size) Requires 0 <= where < where + n < = last n <= MAX_ROWS */ -register ScrnBuf sb; -register int n, last, size; +ScrnBuf sb; +int n, last, size; int where; { - register int i; + int i; char *save [4 * MAX_ROWS]; /* save n lines at where */ @@ -280,11 +280,11 @@ ScrnInsertChar (sb, row, col, n, size) */ ScrnBuf sb; int row, size; - register int col, n; + int col, n; { - register int i, j; - register Char *ptr = sb [4 * row]; - register Char *attrs = sb [4 * row + 1]; + int i, j; + Char *ptr = sb [4 * row]; + Char *attrs = sb [4 * row + 1]; int wrappedbit = attrs[0]&LINEWRAPPED; attrs[0] &= ~LINEWRAPPED; /* make sure the bit isn't moved */ @@ -308,12 +308,12 @@ ScrnDeleteChar (sb, row, col, n, size) Deletes n characters in sb at row, col. Size is the size of each row. */ ScrnBuf sb; - register int row, size; - register int n, col; + int row, size; + int n, col; { - register Char *ptr = sb[4 * row]; - register Char *attrs = sb[4 * row + 1]; - register nbytes = (size - n - col); + Char *ptr = sb[4 * row]; + Char *attrs = sb[4 * row + 1]; + int nbytes = (size - n - col); int wrappedbit = attrs[0]&LINEWRAPPED; memmove( ptr + col, ptr + col + n, nbytes); @@ -332,14 +332,14 @@ ScrnRefresh (screen, toprow, leftcol, nrows, ncols, force) coordinates of characters in screen; nrows and ncols positive. */ -register TScreen *screen; +TScreen *screen; int toprow, leftcol, nrows, ncols; Boolean force; /* ... leading/trailing spaces */ { int y = toprow * FontHeight(screen) + screen->border + screen->fnt_norm->ascent; - register int row; - register int topline = screen->topline; + int row; + int topline = screen->topline; int maxrow = toprow + nrows - 1; int scrollamt = screen->scroll_amt; int max = screen->max_row; @@ -349,10 +349,10 @@ Boolean force; /* ... leading/trailing spaces */ screen->cursor_row <= maxrow + topline) screen->cursor_state = OFF; for (row = toprow; row <= maxrow; y += FontHeight(screen), row++) { - register Char *chars; - register Char *attrs; - register Char *fgs, *bgs; - register int col = leftcol; + Char *chars; + Char *attrs; + Char *fgs, *bgs; + int col = leftcol; int maxcol = leftcol + ncols - 1; int lastind; int flags; @@ -530,8 +530,8 @@ ClearBufRows (screen, first, last) Sets the rows first though last of the buffer of screen to spaces. Requires first <= last; first, last are rows of screen->buf. */ -register TScreen *screen; -register int first, last; +TScreen *screen; +int first, last; { first *= 4; last = 4 * last + 3; @@ -556,7 +556,7 @@ register int first, last; 8. Returns 0 */ ScreenResize (screen, width, height, flags) - register TScreen *screen; + TScreen *screen; int width, height; unsigned *flags; { @@ -596,7 +596,7 @@ ScreenResize (screen, width, height, flags) /* update buffers if the screen has changed size */ if (screen->max_row != rows - 1 || screen->max_col != cols - 1) { - register int savelines = screen->scrollWidget ? + int savelines = screen->scrollWidget ? screen->savelines : 0; int delta_rows = rows - (screen->max_row + 1); @@ -711,10 +711,10 @@ ScrnSetAttributes(screen, row, col, mask, value, length) TScreen *screen; int row, col; unsigned mask, value; -register int length; /* length of string */ +int length; /* length of string */ { - register Char *attrs; - register int avail = screen->max_col - col + 1; + Char *attrs; + int avail = screen->max_col - col + 1; if (length > avail) length = avail; @@ -740,10 +740,10 @@ ScrnGetAttributes(screen, row, col, str, length) TScreen *screen; int row, col; Char *str; -register int length; /* length of string */ +int length; /* length of string */ { - register Char *attrs; - register int avail = screen->max_col - col + 1; + Char *attrs; + int avail = screen->max_col - col + 1; int ret; if (length > avail) @@ -760,10 +760,10 @@ register int length; /* length of string */ Bool non_blank_line(sb, row, col, len) ScrnBuf sb; -register int row, col, len; +int row, col, len; { - register int i; - register Char *ptr = sb [4 * row]; + int i; + Char *ptr = sb [4 * row]; for (i = col; i < len; i++) { if (ptr[i]) diff --git a/xgterm/scrollbar.c b/xgterm/scrollbar.c index d60d5ed..ffe3900 100644 --- a/xgterm/scrollbar.c +++ b/xgterm/scrollbar.c @@ -54,10 +54,10 @@ void ScrollBarOn(), ScrollBarOff(), WindowScroll(); */ static void ResizeScreen(xw, min_width, min_height ) - register XgtermWidget xw; + XgtermWidget xw; int min_width, min_height; { - register TScreen *screen = &xw->screen; + TScreen *screen = &xw->screen; #ifndef nothack XSizeHints sizehints; long supp; @@ -162,7 +162,7 @@ static void ResizeScreen(xw, min_width, min_height ) } void DoResizeScreen (xw) - register XgtermWidget xw; + XgtermWidget xw; { int border = 2 * xw->screen.border; ResizeScreen (xw, border + xw->screen.scrollbar, border); @@ -205,7 +205,7 @@ static void RealizeScrollBar (sbw, screen) ScrollBarReverseVideo(scrollWidget) - register Widget scrollWidget; + Widget scrollWidget; { Arg args[4]; int nargs = XtNumber(args); @@ -231,10 +231,10 @@ ScrollBarReverseVideo(scrollWidget) ScrollBarDrawThumb(scrollWidget) - register Widget scrollWidget; + Widget scrollWidget; { - register TScreen *screen = &term->screen; - register int thumbTop, thumbHeight, totalHeight; + TScreen *screen = &term->screen; + int thumbTop, thumbHeight, totalHeight; thumbTop = screen->topline + screen->savedlines; thumbHeight = screen->max_row + 1; @@ -247,7 +247,7 @@ ScrollBarDrawThumb(scrollWidget) } ResizeScrollBar(scrollWidget, x, y, height) - register Widget scrollWidget; + Widget scrollWidget; int x, y; unsigned height; { @@ -260,12 +260,12 @@ ResizeScrollBar(scrollWidget, x, y, height) void WindowScroll(screen, top) - register TScreen *screen; + TScreen *screen; int top; { - register int i, lines; - register int scrolltop, scrollheight, refreshtop; - register int x = 0; + int i, lines; + int scrolltop, scrollheight, refreshtop; + int x = 0; if (top < -screen->savedlines) top = -screen->savedlines; @@ -313,9 +313,9 @@ ScrollBarOn (xw, init, doalloc) XgtermWidget xw; int init, doalloc; { - register TScreen *screen = &xw->screen; - register int border = 2 * screen->border; - register int i; + TScreen *screen = &xw->screen; + int border = 2 * screen->border; + int i; if(screen->scrollbar) return; @@ -385,7 +385,7 @@ ScrollBarOn (xw, init, doalloc) void ScrollBarOff(screen) - register TScreen *screen; + TScreen *screen; { if(!screen->scrollbar) return; @@ -406,7 +406,7 @@ static void ScrollTextTo(scrollbarWidget, client_data, call_data) XtPointer call_data; { float *topPercent = (float *) call_data; - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; int thumbTop; /* relative to first saved line */ int newTopLine; @@ -429,8 +429,8 @@ static void ScrollTextUpDownBy(scrollbarWidget, client_data, call_data) { int pixels = (int) call_data; - register TScreen *screen = &term->screen; - register int rowOnScreen, newTopLine; + TScreen *screen = &term->screen; + int rowOnScreen, newTopLine; rowOnScreen = pixels / FontHeight(screen); if (rowOnScreen == 0) { @@ -450,7 +450,7 @@ static void ScrollTextUpDownBy(scrollbarWidget, client_data, call_data) static int specialcmplowerwiths (a, b) char *a, *b; { - register char ca, cb; + char ca, cb; if (!a || !b) return 0; @@ -478,8 +478,8 @@ static int params_to_pixels (screen, params, n) String *params; int n; { - register mult = 1; - register char *s; + int mult = 1; + char *s; switch (n > 2 ? 2 : n) { case 2: @@ -513,7 +513,7 @@ void HandleScrollForward (gw, event, params, nparams) Cardinal *nparams; { XgtermWidget w = (XgtermWidget) gw; - register TScreen *screen = &w->screen; + TScreen *screen = &w->screen; ScrollTextUpDownBy (gw, (XtPointer) NULL, (XtPointer)params_to_pixels (screen, params, (int) *nparams)); @@ -529,7 +529,7 @@ void HandleScrollBack (gw, event, params, nparams) Cardinal *nparams; { XgtermWidget w = (XgtermWidget) gw; - register TScreen *screen = &w->screen; + TScreen *screen = &w->screen; ScrollTextUpDownBy (gw, (XtPointer) NULL, (XtPointer)-params_to_pixels (screen, params, (int) *nparams)); diff --git a/xgterm/tabs.c b/xgterm/tabs.c index c415235..bdb39c5 100644 --- a/xgterm/tabs.c +++ b/xgterm/tabs.c @@ -40,7 +40,7 @@ TabReset(tabs) Tabs tabs; { - register int i; + int i; for (i=0; iscreen; + TScreen *screen = &term->screen; if(screen->curses && screen->do_wrap && (term->flags & WRAPAROUND)) { Index(screen, 1); @@ -99,7 +99,7 @@ TabNext (tabs, col) TabZonk (tabs) Tabs tabs; { - register int i; + int i; for (i=0; itopline; - register int bot = screen->max_row - shift; - register int refreshtop; - register int refreshheight; - register int scrolltop; - register int scrollheight; + int i; + int shift = -screen->topline; + int bot = screen->max_row - shift; + int refreshtop; + int refreshheight; + int scrolltop; + int scrollheight; if(screen->cursor_state) HideCursor(); @@ -131,15 +131,15 @@ register TScreen *screen; int AddToRefresh(screen) -register TScreen *screen; +TScreen *screen; { - register int amount = screen->refresh_amt; - register int row = screen->cur_row; + int amount = screen->refresh_amt; + int row = screen->cur_row; if(amount == 0) return(0); if(amount > 0) { - register int bottom; + int bottom; if(row == (bottom = screen->bot_marg) - amount) { screen->refresh_amt++; @@ -147,7 +147,7 @@ register TScreen *screen; } return(row >= bottom - amount + 1 && row <= bottom); } else { - register int top; + int top; amount = -amount; if(row == (top = screen->top_marg) + amount) { @@ -166,16 +166,16 @@ register TScreen *screen; */ void Scroll(screen, amount) -register TScreen *screen; -register int amount; +TScreen *screen; +int amount; { - register int i = screen->bot_marg - screen->top_marg + 1; - register int shift; - register int bot; - register int refreshtop = 0; - register int refreshheight; - register int scrolltop; - register int scrollheight; + int i = screen->bot_marg - screen->top_marg + 1; + int shift; + int bot; + int refreshtop = 0; + int refreshheight; + int scrolltop; + int scrollheight; if(screen->cursor_state) HideCursor(); @@ -272,16 +272,16 @@ register int amount; */ void RevScroll(screen, amount) -register TScreen *screen; -register int amount; +TScreen *screen; +int amount; { - register int i = screen->bot_marg - screen->top_marg + 1; - register int shift; - register int bot; - register int refreshtop; - register int refreshheight; - register int scrolltop; - register int scrollheight; + int i = screen->bot_marg - screen->top_marg + 1; + int shift; + int bot; + int refreshtop; + int refreshheight; + int scrolltop; + int scrollheight; if(screen->cursor_state) HideCursor(); @@ -343,16 +343,16 @@ register int amount; */ void InsertLine (screen, n) -register TScreen *screen; -register int n; +TScreen *screen; +int n; { - register int i; - register int shift; - register int bot; - register int refreshtop; - register int refreshheight; - register int scrolltop; - register int scrollheight; + int i; + int shift; + int bot; + int refreshtop; + int refreshheight; + int scrolltop; + int scrollheight; if (screen->cur_row < screen->top_marg || screen->cur_row > screen->bot_marg) @@ -407,16 +407,16 @@ register int n; */ void DeleteLine(screen, n) -register TScreen *screen; -register int n; +TScreen *screen; +int n; { - register int i; - register int shift; - register int bot; - register int refreshtop; - register int refreshheight; - register int scrolltop; - register int scrollheight; + int i; + int shift; + int bot; + int refreshtop; + int refreshheight; + int scrolltop; + int scrollheight; if (screen->cur_row < screen->top_marg || screen->cur_row > screen->bot_marg) @@ -490,10 +490,10 @@ register int n; */ void InsertChar (screen, n) - register TScreen *screen; - register int n; + TScreen *screen; + int n; { - register int cx, cy; + int cx, cy; if(screen->cursor_state) HideCursor(); @@ -534,10 +534,10 @@ InsertChar (screen, n) */ void DeleteChar (screen, n) - register TScreen *screen; - register int n; + TScreen *screen; + int n; { - register int width; + int width; if(screen->cursor_state) HideCursor(); @@ -576,9 +576,9 @@ DeleteChar (screen, n) */ void ClearAbove (screen) -register TScreen *screen; +TScreen *screen; { - register int top, height; + int top, height; if(screen->cursor_state) HideCursor(); @@ -606,9 +606,9 @@ register TScreen *screen; */ void ClearBelow (screen) -register TScreen *screen; +TScreen *screen; { - register int top; + int top; ClearRight(screen); if((top = screen->cur_row - screen->topline) <= screen->max_row) { @@ -631,7 +631,7 @@ register TScreen *screen; */ void ClearRight (screen) -register TScreen *screen; +TScreen *screen; { if(screen->cursor_state) HideCursor(); @@ -665,7 +665,7 @@ register TScreen *screen; */ void ClearLeft (screen) - register TScreen *screen; + TScreen *screen; { int i; Char *cp; @@ -705,7 +705,7 @@ ClearLeft (screen) */ void ClearLine(screen) -register TScreen *screen; +TScreen *screen; { if(screen->cursor_state) HideCursor(); @@ -731,9 +731,9 @@ register TScreen *screen; void ClearScreen(screen) -register TScreen *screen; +TScreen *screen; { - register int top; + int top; if(screen->cursor_state) HideCursor(); @@ -757,7 +757,7 @@ register TScreen *screen; void CopyWait(screen) -register TScreen *screen; +TScreen *screen; { XEvent reply; XEvent *rep = &reply; @@ -888,10 +888,10 @@ scrolling_copy_area(screen, firstline, nlines, amount) */ int HandleExposure (screen, event) - register TScreen *screen; - register XEvent *event; + TScreen *screen; + XEvent *event; { - register XExposeEvent *reply = (XExposeEvent *)event; + XExposeEvent *reply = (XExposeEvent *)event; /* if not doing CopyArea or if this is a GraphicsExpose, don't translate */ if(!screen->incopy || event->type != Expose) @@ -934,11 +934,11 @@ HandleExposure (screen, event) */ int handle_translated_exposure (screen, rect_x, rect_y, rect_width, rect_height) - register TScreen *screen; - register int rect_x, rect_y; - register unsigned int rect_width, rect_height; + TScreen *screen; + int rect_x, rect_y; + unsigned int rect_width, rect_height; { - register int toprow, leftcol, nrows, ncols; + int toprow, leftcol, nrows, ncols; extern Bool waiting_for_initial_map; toprow = (rect_y - screen->border) / FontHeight(screen); @@ -991,7 +991,7 @@ void ReverseVideo (termw) XgtermWidget termw; { - register TScreen *screen = &termw->screen; + TScreen *screen = &termw->screen; GC tmpGC; unsigned long tmp; @@ -1038,8 +1038,8 @@ recolor_cursor (cursor, fg, bg) Cursor cursor; /* X cursor ID to set */ unsigned long fg, bg; /* pixel indexes to look up */ { - register TScreen *screen = &term->screen; - register Display *dpy = screen->display; + TScreen *screen = &term->screen; + Display *dpy = screen->display; XColor colordefs[2]; /* 0 is foreground, 1 is background */ colordefs[0].pixel = fg; @@ -1057,7 +1057,7 @@ GetColors(term,pColors) XgtermWidget term; ScrnColors *pColors; { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; GC tmpGC; unsigned long tmp; @@ -1076,7 +1076,7 @@ ChangeColors(term,pNew) XgtermWidget term; ScrnColors *pNew; { - register TScreen *screen = &term->screen; + TScreen *screen = &term->screen; GC tmpGC; unsigned long tmp; Bool newCursor= TRUE; diff --git a/ximtool/eps.c b/ximtool/eps.c index 333645a..8dd1c63 100644 --- a/ximtool/eps.c +++ b/ximtool/eps.c @@ -128,8 +128,8 @@ static int debug = 0; PSImage * eps_init() { - register int i; - register PSImage *ps; + int i; + PSImage *ps; /* Allocate the structure. */ @@ -340,7 +340,7 @@ PSImage *psim; /* EPS image structure */ uchar *r, *g, *b; /* color components */ int ncolors; /* number of colors in colormap */ { - register int i = 0; + int i = 0; /* Load the colormap. */ psim->cmap.ncolors = ncolors; @@ -402,10 +402,10 @@ int color_class; /* output color class */ */ void eps_setLabel (psim, label) -register PSImage *psim; /* EPS image structure */ +PSImage *psim; /* EPS image structure */ char *label; /* Label string */ { - register int maxlen = MAX_LENLABEL; + int maxlen = MAX_LENLABEL; if (!psim->label) psim->label = (char *) malloc (maxlen); @@ -666,7 +666,7 @@ int npix; int xdim; int pad; { - register int i, min, max; + int i, min, max; min = *pix; @@ -709,8 +709,8 @@ int npix; int xdim; int pad; { - register int i, min, max; - register uchar pval; + int i, min, max; + uchar pval; min = *pix; max = *pix; @@ -755,8 +755,8 @@ int xdim; int depth; int pad; { - register int i; - register uchar pval; + int i; + uchar pval; while (npix > 0) { @@ -804,8 +804,8 @@ int xdim; int depth; int pad; { - register int i, min, max; - register uchar val; + int i, min, max; + uchar val; min = *pix; @@ -864,7 +864,7 @@ eps_writeCmap (cmap, fp) PSCmap *cmap; FILE *fp; { - register int i, j; + int i, j; /* Dump number of colors and colormap used. */ fprintf (fp, "256\n"); @@ -921,7 +921,7 @@ eps_simpleHeader (psim, fp) PSImagePtr psim; FILE *fp; { - register char **line; + char **line; int icols=0, irows=0, scols=0, srows=0, turnflag=0; float llx = 0.0, lly = 0.0; time_t timer; @@ -1360,7 +1360,7 @@ int scols, srows; float llx, lly; int turnflag; { - register int i, j, cbar_size; + int i, j, cbar_size; int ncolors, nlabels, pos, step, cmel, cmstep, val; @@ -1738,7 +1738,7 @@ eps_colorHeader (psim, fp) PSImagePtr psim; FILE *fp; { - register char **line; + char **line; int icols=0, irows=0, scols=0, srows=0, turnflag=0; float llx = 0.0, lly = 0.0; time_t timer; diff --git a/ximtool/fitsio.c b/ximtool/fitsio.c index ceab6ff..8e134a2 100644 --- a/ximtool/fitsio.c +++ b/ximtool/fitsio.c @@ -161,8 +161,8 @@ int w, h; byte *rmap, *gmap, *bmap; int numcols; { - register int i, j, np, nend; - register byte *ptr; + int i, j, np, nend; + byte *ptr; char *error; byte rgb[256]; @@ -200,7 +200,7 @@ int isFITS (fname) char *fname; /* input filename */ { - register FILE *fp; + FILE *fp; int value = 0; char keyw[8], val; @@ -659,8 +659,8 @@ FITS *fs; void *buffer; int nelem; { - register int i, n = nelem; - register uchar *ptr = buffer; + int i, n = nelem; + uchar *ptr = buffer; /* conversions. Although the data may be signed, reverse using unsigned * variables. Convert from big-endian two-byte signed integer to @@ -680,7 +680,7 @@ int nelem; /* convert from IEE 754 single precision to native form */ else if (fs->bitpix == -32) { - register int j, k, expo; + int j, k, expo; static float *exps = NULL; if (exps == NULL) { @@ -709,8 +709,8 @@ int nelem; /* convert from IEE 754 double precision to native form */ } else if (fs->bitpix == -64) { - register int expo, k, l; - register unsigned int j; + int expo, k, l; + unsigned int j; static double *exps = NULL; if (exps == NULL) { @@ -764,7 +764,7 @@ float *z1, *z2; int nsample; { char * voidbuff; - register int i, n = nelem; + int i, n = nelem; char *error; int pmin = 0, pmax = 255; int npts, stdline; @@ -801,7 +801,7 @@ int nsample; npts = fs->axes[0] * fs->axes[1]; stdline = (int)((float)fs->axes[1] / sqrt((float)npts/(float)nsample)); if (fs->bscale != 1.0 || fs->bzero != 0.0) { - register float *buf; + float *buf; buf = (float *)voidbuff; @@ -809,26 +809,26 @@ int nsample; for (i=(nelem-1); i >= 0; i--) buf[i] = (float) voidbuff[i] * fs->bscale + fs->bzero; } else if (fs->bitpix == 16) { - register short *old; + short *old; for (i=(nelem-1); i >= 0; i--) { old = (short *) &voidbuff[i * 2]; buf[i] = (float) *old * fs->bscale + fs->bzero; } } else if (fs->bitpix == 32) { - register int *old; + int *old; for (i=(nelem-1); i >= 0; i--) { old = (int *) &voidbuff[i * 4]; buf[i] = (float) *old * fs->bscale + fs->bzero; } } else if (fs->bitpix == -32) { - register float *old; + float *old; for (i=(nelem-1); i >= 0; i--) { old = (float *) &voidbuff[i * 4]; buf[i] = (float) *old * fs->bscale + fs->bzero; } } else if (fs->bitpix == -64) { - register double *old, *dbuf; - register float *fpix; + double *old, *dbuf; + float *fpix; dbuf = (double *) malloc (nelem * sizeof(double)); for (i=(nelem-1); i >= 0; i--) { @@ -862,9 +862,9 @@ int nsample; /* convert short int to uchar */ if (fs->bitpix == 16) { - register short int *buffer = (short *)voidbuff; - register int max, min; - register float scale; + short int *buffer = (short *)voidbuff; + int max, min; + float scale; min = (int) *z1; max = (int) *z2; @@ -877,9 +877,9 @@ int nsample; /* convert long int to uchar */ } else if (fs->bitpix == 32) { - register int *buffer = (int *)voidbuff; - register int max, min; - register float scale; + int *buffer = (int *)voidbuff; + int max, min; + float scale; min = (int) *z1; max = (int) *z2; @@ -892,8 +892,8 @@ int nsample; /* convert float to uchar */ } else if (fs->bitpix == -32) { - register float *buffer = (float *)voidbuff; - register float max, min, scale; + float *buffer = (float *)voidbuff; + float max, min, scale; min = *z1; max = *z2; @@ -906,8 +906,8 @@ int nsample; /* convert double to uchar */ } else if (fs->bitpix == -64) { - register double *buffer = (double *)voidbuff; - register double max, min, scale; + double *buffer = (double *)voidbuff; + double max, min, scale; min = (double) *z1; max = (double) *z2; diff --git a/ximtool/gifio.c b/ximtool/gifio.c index bb3cc96..769aa73 100644 --- a/ximtool/gifio.c +++ b/ximtool/gifio.c @@ -139,8 +139,8 @@ uchar *r, *g, *b; /* colormap */ int *ncolors; /* number of colors */ int gray; /* read as a grayscale? */ { - register FILE *fd; - register int i, imageNumber = 1; + FILE *fd; + int i, imageNumber = 1; if ((fd = fopen(fname, "rb")) == NULL) return "Unable to open FITS file"; @@ -172,7 +172,7 @@ byte *rmap, *gmap, *bmap; /* colormap */ int numcols; /* number of colors */ int gray; /* save as grayscale? */ { - register int i, bpp, npix; + int i, bpp, npix; int r[MAXCOLORS], g[MAXCOLORS], b[MAXCOLORS]; /* Change type of the colormap. */ @@ -209,7 +209,7 @@ int isGIF (fname) char *fname; /* input filename */ { - register FILE *fp; + FILE *fp; int value = 0; char tag[5]; @@ -545,7 +545,7 @@ int input_code_size; static int clear_code, end_code; static int table[2][(1<< GIFBITS)]; static int stack[(1<<(GIFBITS))*2], *sp; - register int i; + int i; if (flag) { set_code_size = input_code_size; @@ -1048,13 +1048,13 @@ compress (init_bits, outfile) int init_bits; FILE*outfile; { - register long fcode; - register code_int i /* = 0 */; - register int c; - register code_int ent; - register code_int disp; - register code_int hsize_reg; - register int hshift; + long fcode; + code_int i /* = 0 */; + int c; + code_int ent; + code_int disp; + code_int hsize_reg; + int hshift; /* * Set up the globals: g_init_bits - initial number of bits @@ -1227,13 +1227,13 @@ cl_block () /* table clear for block compress */ static void cl_hash(hsize) /* reset code table */ -register count_int hsize; +count_int hsize; { - register count_int *htab_p = htab + hsize; + count_int *htab_p = htab + hsize; - register long i; - register long m1 = -1; + long i; + long m1 = -1; i = hsize - 16; do { /* might use Sys V memset(3) here */ @@ -1279,7 +1279,7 @@ writeerr() static void char_init() { - register int i; + int i; a_count = 0; for (i=0; i<256; i++) diff --git a/ximtool/iis.c b/ximtool/iis.c index aa6ee99..2ee5cc2 100644 --- a/ximtool/iis.c +++ b/ximtool/iis.c @@ -95,7 +95,7 @@ static MappingPtr xim_getMapping(); */ int xim_iisOpen (xim) -register XimDataPtr xim; +XimDataPtr xim; { int port, last_port = (xim->port + xim->nports - 1); int nopen = 0; @@ -119,10 +119,10 @@ register XimDataPtr xim; */ void xim_iisClose (xim) -register XimDataPtr xim; +XimDataPtr xim; { - register IoChanPtr chan; - register int i; + IoChanPtr chan; + int i; for (i=0, chan=NULL; i < XtNumber(xim->chan); i++) { chan = &xim->chan[i]; @@ -163,9 +163,9 @@ register XimDataPtr xim; */ static IoChanPtr open_fifo (xim) -register XimDataPtr xim; +XimDataPtr xim; { - register IoChanPtr chan; + IoChanPtr chan; int datain, dataout; int keepalive; @@ -251,11 +251,11 @@ register XimDataPtr xim; */ static IoChanPtr open_inet (xim, portnum) -register XimDataPtr xim; +XimDataPtr xim; int portnum; { - register int s = 0; - register IoChanPtr chan; + int s = 0; + IoChanPtr chan; struct sockaddr_in sockaddr; int reuse = 1; @@ -320,10 +320,10 @@ int portnum; */ static IoChanPtr open_unix (xim) -register XimDataPtr xim; +XimDataPtr xim; { - register int s = 0; - register IoChanPtr chan; + int s = 0; + IoChanPtr chan; struct sockaddr_un sockaddr; int addrlen; char path[256]; @@ -395,9 +395,9 @@ IoChanPtr chan_port; int *source; XtPointer id; { - register XimDataPtr xim = (XimDataPtr) chan_port->xim; - register IoChanPtr chan; - register int s; + XimDataPtr xim = (XimDataPtr) chan_port->xim; + IoChanPtr chan; + int s; /* Accept connection. */ if ((s = accept ((int)*source, (struct sockaddr *)0, (int *)0)) < 0) @@ -429,7 +429,7 @@ XtPointer id; */ static void xim_disconnectClient (chan) -register IoChanPtr chan; +IoChanPtr chan; { switch (chan->type) { case IO_INET: @@ -451,9 +451,9 @@ register IoChanPtr chan; */ static IoChanPtr get_iochan (xim) -register XimDataPtr xim; +XimDataPtr xim; { - register int i; + int i; for (i=0; i < XtNumber(xim->chan); i++) if (!xim->chan[i].type) @@ -472,11 +472,11 @@ IoChanPtr chan; int *fd_addr; XtInputId *id_addr; { - register XimDataPtr xim = (XimDataPtr) chan->xim; - register MappingPtr mp = (MappingPtr) NULL; - register FrameBufPtr fb; - register int sum, i; - register short *p; + XimDataPtr xim = (XimDataPtr) chan->xim; + MappingPtr mp = (MappingPtr) NULL; + FrameBufPtr fb; + int sum, i; + short *p; int datain = *fd_addr; int dataout = chan->dataout; int ndatabytes, nbytes, n, newframe, ntrys=0; @@ -802,7 +802,7 @@ XtInputId *id_addr; CtranPtr ct = (CtranPtr) NULL; FrameBufPtr fr = (FrameBufPtr) NULL; int wcsnum = (iis.t & 017777); - register int i, j; + int i, j; /* Decode the requested wcs number. */ @@ -871,7 +871,7 @@ map_found: if (ct) { } else { /* Set the WCS for the referenced frame. */ - register CtranPtr ct; + CtranPtr ct; int fb_config, frame, new_wcs = 0; frame = decode_frameno (iis.z & 0177777); @@ -965,7 +965,7 @@ map_found: if (ct) { } else { /* Write (set) the logical image cursor position. */ - register CtranPtr ct; + CtranPtr ct; int sx = iis.x, sy = iis.y; float wx = sx, wy = sy; int wcs = iis.z; @@ -1055,11 +1055,11 @@ map_found: if (ct) { */ void xim_iisiomap (w, iomap, iomap_len) -register XtPointer w; +XtPointer w; unsigned short *iomap; int *iomap_len; { - register int i; + int i; int first, nelem, maxelem; int delta; @@ -1087,11 +1087,11 @@ int *iomap_len; */ void xim_iiscolormap (w, r, g, b, first, ngray, rgb_len) -register XtPointer w; +XtPointer w; unsigned short *r, *g, *b; int *first, *ngray, *rgb_len; { - register int i, j; + int i, j; int nelem, maxelem; int delta; @@ -1135,9 +1135,9 @@ IoChanPtr chan; int config; int frame; { - register XimDataPtr xim = (XimDataPtr) chan->xim; - register FrameBufPtr fb = &xim->frames[frame-1]; - register int i; + XimDataPtr xim = (XimDataPtr) chan->xim; + FrameBufPtr fb = &xim->frames[frame-1]; + int i; if (config != xim->fb_configno) { /* Change the frame buffer configuration. */ @@ -1183,9 +1183,9 @@ int frame; */ static int decode_frameno (z) -register int z; +int z; { - register int n; + int n; /* Get the frame number, encoded with a bit for each frame, 01 is * frame 1, 02 is frame 2, 04 is frame 3, and so on. @@ -1203,15 +1203,15 @@ register int z; */ void xim_retCursorVal (xim, sx, sy, frame, wcs, key, strval) -register XimDataPtr xim; +XimDataPtr xim; float sx, sy; /* cursor screen coordinates */ int frame; /* frame number */ int wcs; /* nonzero if WCS coords desired */ int key; /* keystroke used as trigger */ char *strval; /* optional string value */ { - register CtranPtr ct; - register MappingPtr mp = (MappingPtr) NULL; + CtranPtr ct; + MappingPtr mp = (MappingPtr) NULL; int dataout, wcscode; char curval[SZ_IMCURVAL]; char keystr[20]; @@ -1285,15 +1285,15 @@ char *strval; /* optional string value */ */ void xim_encodewcs (xim, sx, sy, sz, obuf) -register XimDataPtr xim; +XimDataPtr xim; float sx, sy; /* screen (raster) pixel coordinates */ int sz; /* screen pixel value */ char *obuf; /* receives encoded string */ { - register CtranPtr ct; + CtranPtr ct; MappingPtr mp = (MappingPtr) NULL; float wx, wy, wz; - register int i=0, ch, map_found = 0; + int i=0, ch, map_found = 0; char buf[SZ_LINE]; @@ -1302,7 +1302,7 @@ char *obuf; /* receives encoded string */ * or real-image values. */ if (wcspix_enabled == NULL) { - register IsmModule ism; + IsmModule ism; extern ismModule ism_modules[]; extern int ism_nmodules; @@ -1397,15 +1397,15 @@ printf ("wx: %f wy: %f\n", wx, wy); */ static MappingPtr xim_getMapping (xim, sx, sy, frame) -register XimDataPtr xim; +XimDataPtr xim; float sx, sy; /* screen (raster) pixel coordinates */ int frame; { FrameBufPtr fb = (FrameBufPtr) NULL; MappingPtr mp = (MappingPtr) NULL; - register int j=0, i=0; + int j=0, i=0; float y = xim->height - sy; - register int map_debug = 0; + int map_debug = 0; /* Loop through the frame buffers until we find the current one. @@ -1447,9 +1447,9 @@ int frame; */ char * xim_frameLabel (xim) -register XimDataPtr xim; +XimDataPtr xim; { - register FrameBufPtr df_p = xim->df_p; + FrameBufPtr df_p = xim->df_p; sprintf (df_p->label, "[%d] %s", df_p->frameno, df_p->ctran.imtitle); return (df_p->label); @@ -1470,10 +1470,10 @@ register XimDataPtr xim; */ static CtranPtr wcs_update (xim, fr) -register XimDataPtr xim; +XimDataPtr xim; FrameBufPtr fr; { - register CtranPtr ct = &fr->ctran; + CtranPtr ct = &fr->ctran; char buf[1024], *format; @@ -1542,14 +1542,14 @@ FrameBufPtr fr; static void add_mapping (xim, ctran, wcsbuf, fr) -register XimDataPtr xim; +XimDataPtr xim; CtranPtr ctran; char *wcsbuf; FrameBufPtr fr; { - register MappingPtr mp = &fr->mapping[fr->nmaps]; - register CtranPtr ct = &mp->ctran; - register int i, j, frame = fr->frameno; + MappingPtr mp = &fr->mapping[fr->nmaps]; + CtranPtr ct = &mp->ctran; + int i, j, frame = fr->frameno; char buf[SZ_WCSBUF]; /* Attempt to read the WCS and set up a unitary transformation @@ -1636,7 +1636,7 @@ print_mappings (fr) FrameBufPtr fr; { MappingPtr mp; - register int i; + int i; if (fr->nmaps == 0) printf ("No mappings for frame %d\n", fr->frameno); for (i=0; i < fr->nmaps; i++) { diff --git a/ximtool/irafio.c b/ximtool/irafio.c index 8f98bbf..c79b1a3 100644 --- a/ximtool/irafio.c +++ b/ximtool/irafio.c @@ -216,7 +216,7 @@ int isIRAF (fname) char *fname; /* input filename */ { - register FILE *fp; + FILE *fp; int value = 0; char magic[24]; @@ -401,8 +401,8 @@ float *z1, *z2; int nsample; { FILE *fd; - register int i, j, npix, stdline; - register float scale; + int i, j, npix, stdline; + float scale; unsigned short *uspix, *usline; short *spix, *sline; int *ipix, *iline; diff --git a/ximtool/ism.c b/ximtool/ism.c index 2a72329..3097ed9 100644 --- a/ximtool/ism.c +++ b/ximtool/ism.c @@ -85,10 +85,10 @@ ismModule ism_modules[] = { */ void xim_ismOpen (xim) -register XimDataPtr xim; +XimDataPtr xim; { - register int s = 0; - register IsmIoChanPtr chan = &(xim->ism_chan); + int s = 0; + IsmIoChanPtr chan = &(xim->ism_chan); char path[SZ_FNAME], *ism_path; @@ -149,10 +149,10 @@ register XimDataPtr xim; */ void xim_ismClose (xim) -register XimDataPtr xim; +XimDataPtr xim; { - register IsmIoChanPtr chan = &(xim->ism_chan); - register int i; + IsmIoChanPtr chan = &(xim->ism_chan); + int i; /* Send a 'quit' message to all connected clients. */ for (i=0, chan=NULL; i < XtNumber(xim->ism_client); i++) { @@ -187,7 +187,7 @@ ismNameToPtr (name) char *name; { IsmModule ism; - register int i; + int i; for (i=0; i < ism_nmodules; i++) { ism = &ism_modules[i]; @@ -213,8 +213,8 @@ IsmIoChanPtr chan; int *source; XtPointer id; { - register XimDataPtr xim = (XimDataPtr) chan->xim; - register int s; + XimDataPtr xim = (XimDataPtr) chan->xim; + int s; /* Accept connection. */ if ((s = accept ((int)*source, (struct sockaddr *)0, (int *)0)) < 0) @@ -239,7 +239,7 @@ XtPointer id; */ static void ism_disconnectClient (chan) -register IsmIoChanPtr chan; +IsmIoChanPtr chan; { close (chan->datain); if (chan->id) { @@ -259,8 +259,8 @@ IsmIoChanPtr chan; int *fd_addr; XtInputId *id_addr; { - register XimDataPtr xim = (XimDataPtr) chan->xim; - register IsmModule ism; + XimDataPtr xim = (XimDataPtr) chan->xim; + IsmModule ism; IsmIoChanPtr new_chan; int datain = *fd_addr; int dataout = chan->dataout; @@ -435,7 +435,7 @@ int *ip; int *incomplete; int maxch; { - register int j, i = *ip; + int j, i = *ip; char text[SZ_ISMBUF+1]; if (msg[*ip] == '\0') { @@ -477,7 +477,7 @@ static int ism_type (message) char *message; { - register char *ip; + char *ip; for (ip=message; isspace(*ip); ip++) ; /* skip whitespace */ @@ -502,7 +502,7 @@ char *msg; char *object; char *text; { - register int i=0, ip=4, count=0; + int i=0, ip=4, count=0; /* skip leading whitespace */ for ( ; isspace(msg[ip]) && msg[ip]; ip++) ; @@ -537,13 +537,13 @@ char *text; */ void ism_evaluate (xim, object, command) -register XimDataPtr xim; +XimDataPtr xim; char *object; char *command; { - register IsmIoChanPtr chan; - register int i=0; - register int len = strlen(command) + 1; + IsmIoChanPtr chan; + int i=0; + int len = strlen(command) + 1; char *buf = XtCalloc (len+1, sizeof(char)); for (i=0; i < XtNumber (xim->ism_client); i++) { @@ -565,7 +565,7 @@ char *command; */ int ism_message (xim, object, command) -register XimDataPtr xim; +XimDataPtr xim; char *object, *command; { ism_evaluate (xim, object, command); @@ -614,9 +614,9 @@ err: fprintf (stderr, "ximtool: can't open ISM socket on %s, errno=%d\n", */ static IsmIoChanPtr ism_getChannel (xim) -register XimDataPtr xim; +XimDataPtr xim; { - register int i; + int i; for (i=0; i < XtNumber(xim->ism_client); i++) { if (!xim->ism_client[i].connected) { diff --git a/ximtool/ism_wcspix.c b/ximtool/ism_wcspix.c index 5be1f6a..d12a35e 100644 --- a/ximtool/ism_wcspix.c +++ b/ximtool/ism_wcspix.c @@ -31,13 +31,13 @@ void wcspix_connect(), wcspix_disconnect(), wcspix_command(), wcspix_message(); */ void wcspix_connect (xim, ism) -register XimDataPtr xim; -register IsmModule ism; +XimDataPtr xim; +IsmModule ism; { MappingPtr mp; FrameBufPtr fr; - register int i, j; + int i, j; char buf[SZ_LINE]; if (wcspix_debug) printf ("ConnectCB for '%s' ....\n", ism->name); @@ -69,12 +69,12 @@ register IsmModule ism; */ void wcspix_disconnect (xim, ism) -register XimDataPtr xim; -register IsmModule ism; +XimDataPtr xim; +IsmModule ism; { MappingPtr mp; FrameBufPtr fr; - register int i, j; + int i, j; char buf[SZ_LINE]; if (wcspix_debug) printf ("DisconnectCB for '%s' ....\n", ism->name); @@ -109,12 +109,12 @@ register IsmModule ism; */ void wcspix_command (xim, ism, argc, argv) -register XimDataPtr xim; -register IsmModule ism; +XimDataPtr xim; +IsmModule ism; int argc; char **argv; { - register int i; + int i; if (wcspix_debug) printf ("CommandCB....\n"); @@ -129,7 +129,7 @@ char **argv; */ void wcspix_message (xim, message) -register XimDataPtr xim; +XimDataPtr xim; char *message; { char msgbuf[SZ_MSGBUF]; diff --git a/ximtool/load.c b/ximtool/load.c index 69cccc3..5aa71d3 100644 --- a/ximtool/load.c +++ b/ximtool/load.c @@ -48,9 +48,9 @@ static int debug = False; */ void xim_initLoad (xim) -register XimDataPtr xim; +XimDataPtr xim; { - register fileLoadPtr flp; + fileLoadPtr flp; char buf[SZ_LINE]; xim->flp = flp = (fileLoadPtr) calloc (1, sizeof (fileLoad)); @@ -94,8 +94,8 @@ void xim_loadClose (xim) XimDataPtr xim; { - register fileLoadPtr flp = xim->flp; - register int i; + fileLoadPtr flp = xim->flp; + int i; if (flp->FileList) for (i=0; i < flp->nfiles; i++) @@ -110,16 +110,16 @@ XimDataPtr xim; */ int xim_loadFile (xim, fname, frame) -register XimDataPtr xim; +XimDataPtr xim; char *fname; int frame; { - register int i, new_config=-1; - register char *ip; - register fileLoadPtr flp = xim->flp; - register FrameBufPtr fr; - register MappingPtr mp; - register FbConfigPtr cf; + int i, new_config=-1; + char *ip; + fileLoadPtr flp = xim->flp; + FrameBufPtr fr; + MappingPtr mp; + FbConfigPtr cf; float z1=0.0, z2=0.0; int status = 0, has_private_cmap = 0, pixtype, w, h, ncolors; @@ -245,7 +245,7 @@ int frame; */ if (w > xim->width || h > xim->height) { - register int width, height, tmin = 100000, edges; + int width, height, tmin = 100000, edges; loadstat (xim, "Initializing frame buffer..."); @@ -413,11 +413,11 @@ int frame; */ void xim_dirRescan (xim) -register XimDataPtr xim; +XimDataPtr xim; { - register fileLoadPtr flp = xim->flp; - register char *ip, *op, *flist; - register int i; + fileLoadPtr flp = xim->flp; + char *ip, *op, *flist; + int i; if (flp->FileList) { for (i=0; i < flp->nfiles; i++) @@ -451,12 +451,12 @@ register XimDataPtr xim; */ void xim_scanHeaders (xim) -register XimDataPtr xim; +XimDataPtr xim; { - register fileLoadPtr flp = xim->flp; - register char *ip, *op; - register char *entry = (char *)NULL, *flist = (char *)NULL; - register int i; + fileLoadPtr flp = xim->flp; + char *ip, *op; + char *entry = (char *)NULL, *flist = (char *)NULL; + int i; extern char *getFITSHdr(), *getIRAFHdr(); extern char *getSunRasHdr(), *getGIFHdr(); @@ -559,7 +559,7 @@ int files_only; /* list only files, not dirs */ struct dirent *entry; struct stat file_info; unsigned int max_entries; - register int i=0, npatterns = 0; + int i=0, npatterns = 0; int status, pattern_matches; /* Open directory. */ @@ -659,7 +659,7 @@ static int fileCompare (x, y) void *x, *y; { - register char *p, *q; + char *p, *q; p = (char *) * ((char **) x); q = (char *) * ((char **) y); @@ -679,8 +679,8 @@ globExpression (expression, pattern) char *expression; /* file name */ char *pattern; /* matching pattern */ { - register int done, match, status; - register char c, *p; + int done, match, status; + char c, *p; if (pattern == (char *) NULL) @@ -836,8 +836,8 @@ amapc (a, b, npix, a1, a2, b1, b2) char *a, *b; int npix, a1, a2, b1, b2; { - register int i, minout, maxout, aoff, boff, pixval; - register double scalar; + int i, minout, maxout, aoff, boff, pixval; + double scalar; scalar = ((double) b2 - (double) b1) / ((double) a2 - (double) a1); @@ -862,8 +862,8 @@ unsigned char *a, *b; unsigned char *red, *green, *blue; int npix, ncols; { - register int i, pmin=0, pmax=255; - register float scale; + int i, pmin=0, pmax=255; + float scale; /* Reset the pixels so they are the final grayscale values. */ scale = 255.0 / (float) (ncols - 1); @@ -894,7 +894,7 @@ unsigned char *i, *j; */ static void loadstat (xim, message) -register XimDataPtr xim; +XimDataPtr xim; char *message; { char text[SZ_LINE]; diff --git a/ximtool/logo.c b/ximtool/logo.c index 0cc3401..7dc0256 100644 --- a/ximtool/logo.c +++ b/ximtool/logo.c @@ -14,9 +14,9 @@ void xim_displayLogo (xim) -register XimDataPtr xim; +XimDataPtr xim; { - register int i; + int i; unsigned char r[256], g[256], b[256]; diff --git a/ximtool/print.c b/ximtool/print.c index 4a871b1..df811ea 100644 --- a/ximtool/print.c +++ b/ximtool/print.c @@ -39,13 +39,13 @@ static void xim_initPrinterList(); */ int xim_print (xim, x0,y0, nx,ny) -register XimDataPtr xim; +XimDataPtr xim; int x0,y0, nx,ny; /* region of source raster */ { - register PSImagePtr psim = xim->psim; - register PrintCfgPtr pcp = xim->pcp; - register FrameBufPtr fb = xim->df_p; - register ColorMapPtr cm = &colormaps[fb->colormap-1]; + PSImagePtr psim = xim->psim; + PrintCfgPtr pcp = xim->pcp; + FrameBufPtr fb = xim->df_p; + ColorMapPtr cm = &colormaps[fb->colormap-1]; unsigned char r[256], g[256], b[256]; unsigned char *pixels = NULL; static char tmpfile[SZ_FNAME]; @@ -189,7 +189,7 @@ int x0,y0, nx,ny; /* region of source raster */ void ximp_rename (xim, old, new) -register XimDataPtr xim; +XimDataPtr xim; char *old, *new; { char text[SZ_LINE]; @@ -209,7 +209,7 @@ char *old, *new; void ximp_cancel (xim, fname) -register XimDataPtr xim; +XimDataPtr xim; char *fname; { printstat (xim, "Print cancelled."); @@ -221,9 +221,9 @@ char *fname; */ void xim_initPrinterOps (xim) -register XimDataPtr xim; +XimDataPtr xim; { - register PrintCfgPtr pcp; + PrintCfgPtr pcp; char buf[SZ_LINE]; PSImagePtr eps_init(); @@ -269,10 +269,10 @@ register XimDataPtr xim; static void xim_initPrinterList (xim) -register XimDataPtr xim; +XimDataPtr xim; { - register int i; - register FILE *fp; + int i; + FILE *fp; char buf[SZ_LINE], plist[MAX_PRINTERS*20]; char *ip, *pn, *pc, *pl; @@ -352,11 +352,11 @@ register XimDataPtr xim; int xim_getPrinterInfo (xim, printer) -register XimDataPtr xim; +XimDataPtr xim; char *printer; { - register int i; - register PrintCfgPtr pcp = xim->pcp; + int i; + PrintCfgPtr pcp = xim->pcp; /* Scan down the printer list until we find the requested device. */ for (i=0; strcmp(printer_list[i].printerName, printer) != 0; i++) @@ -372,7 +372,7 @@ char *printer; static void printstat (xim, message) -register XimDataPtr xim; +XimDataPtr xim; char *message; { char text[SZ_LINE]; diff --git a/ximtool/quant.c b/ximtool/quant.c index 770635e..7a9a35f 100644 --- a/ximtool/quant.c +++ b/ximtool/quant.c @@ -121,9 +121,9 @@ int nx, ny; /* image dimensions */ int ncolors; /* current number of colors */ int newcolors; /* requested number of colors */ { - register pixel *pP; - register long sr, sg, sb, err; - register int i, col, limitcol, index = 0; + pixel *pP; + long sr, sg, sb, err; + int i, col, limitcol, index = 0; byte *pix = image; pixel **pixels; pixval maxval = 255, newmaxval; @@ -240,8 +240,8 @@ int newcolors; /* requested number of colors */ */ index = lookupColor (cht, pP) ; if (index == -1) { /* No; search colormap for closest match. */ - register int i, r1, g1, b1, r2, g2, b2; - register long dist, newdist; + int i, r1, g1, b1, r2, g2, b2; + long dist, newdist; r1 = PPM_GETR (*pP) ; g1 = PPM_GETG (*pP) ; b1 = PPM_GETB (*pP) ; @@ -364,7 +364,7 @@ pixval maxval; { colorhist_vector colormap; box_vector bv; - register int bi, i; + int bi, i; int boxes; bv = (box_vector) malloc (sizeof(struct box) * newcolors) ; @@ -387,9 +387,9 @@ pixval maxval; ** Main loop: split boxes until we have enough. */ while (boxes < newcolors) { - register int indx, clrs; + int indx, clrs; int sm; - register int minr, maxr, ming, maxg, minb, maxb, v; + int minr, maxr, ming, maxg, minb, maxb, v; int halfsum, lowersum; /* @@ -501,9 +501,9 @@ pixval maxval; for (bi = 0; bi < boxes; ++bi) { /* REP_AVERAGE_PIXELS version */ - register int indx = bv[bi].ind; - register int clrs = bv[bi].colors; - register long r = 0, g = 0, b = 0, sum = 0; + int indx = bv[bi].ind; + int clrs = bv[bi].colors; + long r = 0, g = 0, b = 0, sum = 0; for (i = 0; i < clrs; ++i) { r += PPM_GETR (chv[indx + i].color) * chv[indx + i].value; @@ -620,7 +620,7 @@ int cols, rows, maxcolors; int*colorsP; { colorhash_table cht; - register pixel*pP; + pixel*pP; colorhist_list chl; int col, row, hash; @@ -680,8 +680,8 @@ colorhash_table cht; pixel*colorP; int value; { - register int hash; - register colorhist_list chl; + int hash; + colorhist_list chl; chl = (colorhist_list) malloc (sizeof(struct colorhist_list_item) ) ; if (chl == 0) diff --git a/ximtool/rasio.c b/ximtool/rasio.c index af2f0fe..c4d4b2e 100644 --- a/ximtool/rasio.c +++ b/ximtool/rasio.c @@ -96,8 +96,8 @@ unsigned char *r, *g, *b; /* colormap */ int *ncolors; /* number of colors */ int colorstyle; /* return color (0) or grayscale (1) */ { - register FILE *fp; - register int i, j; + FILE *fp; + int i, j; int linesize, lsize, csize, isize, w, h, d, nc, ct; unsigned char *image, *line, p; struct rasterfile sunhdr; @@ -432,7 +432,7 @@ int isSunRas (fname) char *fname; /* input filename */ { - register FILE *fp; + FILE *fp; struct rasterfile sunhdr; int value = 0; @@ -494,7 +494,7 @@ char *fname; static int rle_read (ptr, size, nitems, fp, init) -register unsigned char *ptr; +unsigned char *ptr; int size, nitems, init; FILE *fp; { @@ -551,7 +551,7 @@ SunRas1to8 (dest, src, len) unsigned char *dest, *src; int len; { - register int i, b; + int i, b; int c = 0; for (i = 0, b = -1; i < len; i++) { diff --git a/ximtool/raster.c b/ximtool/raster.c index 76f8f1e..e1fd8d8 100644 --- a/ximtool/raster.c +++ b/ximtool/raster.c @@ -440,7 +440,7 @@ xim_reset (XimDataPtr xim, Widget w) void xim_resize (XimDataPtr xim, Widget w) { - register FrameBufPtr fb; + FrameBufPtr fb; int junk, sx, sy, width, height, depth; int i, active, frame, mapping, zoomtype; float xscale, yscale, scale; @@ -548,7 +548,7 @@ xim_resize (XimDataPtr xim, Widget w) void xim_refresh (XimDataPtr xim) { - register FrameBufPtr fb = xim->df_p; + FrameBufPtr fb = xim->df_p; int junk, width, height, depth; GtQueryRaster ((GtermWidget) xim->gt, fb->raster, &junk, @@ -581,8 +581,8 @@ xim_setFrame (XimDataPtr xim, int frame) void xim_setReferenceFrame (IoChanPtr chan, int frame) { - register XimDataPtr xim = (XimDataPtr) chan->xim; - register FrameBufPtr fb; + XimDataPtr xim = (XimDataPtr) chan->xim; + FrameBufPtr fb; int frameno; /* Ignore request if channel not active. */ @@ -605,7 +605,7 @@ xim_setReferenceFrame (IoChanPtr chan, int frame) void xim_setDisplayFrame (XimDataPtr xim, int frame) { - register FrameBufPtr fb; + FrameBufPtr fb; GtermWidget gt = (GtermWidget) xim->gt; FrameBufPtr old_fb = xim->df_p; int frameno, old_frameno; @@ -693,7 +693,7 @@ void xim_initFrame (XimDataPtr xim, int frame, int nframes, FbConfigPtr config, char *memModel) { - register FrameBufPtr fb = &xim->frames[frame-1]; + FrameBufPtr fb = &xim->frames[frame-1]; GtermWidget gt = (GtermWidget) xim->gt; int sx, sy, width, height, depth; @@ -823,7 +823,7 @@ small: fb->zoomras = 0; void xim_delFrame (XimDataPtr xim, int frame) { - register FrameBufPtr fb = &xim->frames[frame-1]; + FrameBufPtr fb = &xim->frames[frame-1]; GtermWidget gt = (GtermWidget) xim->gt; if (frame < 1 || frame > MAX_FRAMES) @@ -875,9 +875,9 @@ xim_fitFrame (XimDataPtr xim) void xim_tileFrames (XimDataPtr xim, int frame_list) { - register int i; - register Widget w = xim->gt; - register FrameBufPtr fb; + int i; + Widget w = xim->gt; + FrameBufPtr fb; char buf[SZ_LINE]; int mapping; @@ -998,7 +998,7 @@ xim_labelTiles (XimDataPtr xim) XtPointer gm; Arg args[10]; char text[256], tw[16]; - register int i, j, len; + int i, j, len; int sx, sy, width, height, depth, nargs=0; static XtPointer labels[MAX_FRAMES]; @@ -1093,8 +1093,8 @@ xim_labelTiles (XimDataPtr xim) void xim_matchFrames (XimDataPtr xim, int *frames, int reference_frame) { - register FrameBufPtr fr, fb = &xim->frames[reference_frame-1]; - register int *ip, i; + FrameBufPtr fr, fb = &xim->frames[reference_frame-1]; + int *ip, i; int bits; /* If frames is NULL match all frames. Set one bit in BITS for @@ -1130,8 +1130,8 @@ void xim_registerFrames (XimDataPtr xim, int *frames, int reference_frame, int offsets) { - register int *ip, i; - register FrameBufPtr fr, fb = &xim->frames[reference_frame-1]; + int *ip, i; + FrameBufPtr fr, fb = &xim->frames[reference_frame-1]; int src, st, sx, sy, snx, sny; int dst, dt, dx, dy, dnx, dny; Widget gt = xim->gt; @@ -1589,7 +1589,7 @@ xim_getScreen ( int *height, int *depth) { - register int i; + int i; int border = xim->tileBorder; int rtype, scr_width, scr_height; int twidth, theight, tileno, frameno; @@ -1663,7 +1663,7 @@ xim_onScreen (XimDataPtr xim, int frame) void xim_setFlip (XimDataPtr xim, FrameBufPtr fb, int flip_x, int flip_y) { - register Widget gt = xim->gt; + Widget gt = xim->gt; int src, st, sx, sy, snx, sny; int dst, dt, dx, dy, dnx, dny; int rop; @@ -1697,7 +1697,7 @@ xim_setFlip (XimDataPtr xim, FrameBufPtr fb, int flip_x, int flip_y) void xim_setRop (XimDataPtr xim, FrameBufPtr fb, int rop) { - register Widget gt = xim->gt; + Widget gt = xim->gt; int src, st, sx, sy, snx, sny; int dst, dt, dx, dy, dnx, dny; int oldrop; @@ -1728,7 +1728,7 @@ void xim_getCursorPos (XimDataPtr xim, float *sx, float *sy, int *raster, int *frame) { - register FrameBufPtr fb; + FrameBufPtr fb; DPoint pv1, pv2; int rx, ry, rmap; int src, x, y, i; @@ -1850,7 +1850,7 @@ xim_readDisplay ( GtReadIomap (gt, iomap, 0, MAX_COLORS); if (debug) { - register short pmin = MAX_COLORS, pmax = 0, i, j; + short pmin = MAX_COLORS, pmax = 0, i, j; fprintf (stderr, "iomap\n"); for (i=0; i < MAX_COLORS; ) { for (j=0; j < 8 && i < MAX_COLORS; j++) { @@ -2181,7 +2181,7 @@ xim_writeDisplay ( */ void xim_message (xim, object, message) -register XimDataPtr xim; +XimDataPtr xim; char *object; char *message; { @@ -2257,7 +2257,7 @@ xim_frameRegion (XimDataPtr xim, FrameBufPtr fb) static void xim_colortables (XimDataPtr xim) { - register char *ip, *op; + char *ip, *op; char buf[MAX_COLORMAPS*40]; int i; @@ -2306,8 +2306,8 @@ xim_enhancement (XimDataPtr xim, FrameBufPtr fb) static void get_fbconfig (XimDataPtr xim) { - register char *ip; - register FILE *fp = NULL; + char *ip; + FILE *fp = NULL; int config, nframes, width, height, i; char lbuf[SZ_LINE+1], *fname; static char *fb_paths[] = { @@ -2417,7 +2417,7 @@ get_fbconfig (XimDataPtr xim) int xim_getAntialias (XimDataPtr xim, char *s) { - register char *ip, *op; + char *ip, *op; char word[SZ_NAME]; int rop = 0; @@ -2464,8 +2464,8 @@ xim_setColormap ( unsigned short *m_blue, int nelem) { - register int i, j; - register char *ip, *op; + int i, j; + char *ip, *op; static int seed = 0; int v, vsat, step; int knot[7]; @@ -2794,7 +2794,7 @@ xim_setColormap ( void hsv_to_rgb (float h, float s, float v, float *r, float *g, float *b) { - register int i; + int i; float f, p, q, t; while (h >= 360.0) @@ -2835,9 +2835,9 @@ hsv_to_rgb (float h, float s, float v, float *r, float *g, float *b) static int get_dirfile (DIR *dir, char *outstr, int maxch) { - register int n; - register struct dirent *dp; - register char *ip, *op; + int n; + struct dirent *dp; + char *ip, *op; int status; for (dp = readdir(dir); dp != NULL; dp = readdir(dir)) @@ -2859,8 +2859,8 @@ get_dirfile (DIR *dir, char *outstr, int maxch) static void load_testpattern (XimDataPtr xim, int frame, int type) { - register FrameBufPtr fb = &xim->frames[frame]; - register int i, j, ncolors; + FrameBufPtr fb = &xim->frames[frame]; + int i, j, ncolors; int rtype, width, height, depth; unsigned char *data; @@ -2889,7 +2889,7 @@ load_testpattern (XimDataPtr xim, int frame, int type) static void set_colorbar (XimDataPtr xim, Widget w) { - register int i; + int i; static int initialized = 0; int first, ngray, rgb_len, rtype, width, height, depth; unsigned short m_red[MAX_COLORS]; diff --git a/ximtool/save.c b/ximtool/save.c index 93c1ae8..4dc931e 100644 --- a/ximtool/save.c +++ b/ximtool/save.c @@ -32,9 +32,9 @@ static void savestat(), savetext(); */ void xim_initSave (xim) -register XimDataPtr xim; +XimDataPtr xim; { - register fileSavePtr fsp; + fileSavePtr fsp; extern char *getcwd(), *getenv(); char buf[SZ_LINE]; @@ -60,9 +60,9 @@ register XimDataPtr xim; */ void xim_saveClose (xim) -register XimDataPtr xim; +XimDataPtr xim; { - register fileSavePtr fsp = xim->fsp; + fileSavePtr fsp = xim->fsp; if (fsp) free ((char *) fsp); @@ -74,13 +74,13 @@ register XimDataPtr xim; */ int xim_saveFile (xim, template, fileformat, x0,y0, nx,ny) -register XimDataPtr xim; +XimDataPtr xim; char *template; /* file name or printf format */ int fileformat; /* output raster file format/type */ int x0, y0, nx, ny; /* region of display to be saved */ { - register int i, j; - register fileSavePtr fsp = xim->fsp; + int i, j; + fileSavePtr fsp = xim->fsp; int w, h, ncols; char text[SZ_LINE], fname[SZ_FNAME]; unsigned char r[256], g[256], b[256]; @@ -102,7 +102,7 @@ int x0, y0, nx, ny; /* region of display to be saved */ goto done; if (debug) { - register int cpix, val; + int cpix, val; fprintf (stderr, "saveFile: %s -> %dx%d at %d colors\n", fname, w, h, ncols); cpix = (w/2+(h/2)*w); @@ -189,7 +189,7 @@ int x0, y0, nx, ny; /* region of display to be saved */ */ static int xims_write (xim, fp, fileformat, pixels, w,h,d, r,g,b, ncolors) -register XimDataPtr xim; +XimDataPtr xim; FILE *fp; int fileformat; unsigned char *pixels; @@ -197,11 +197,11 @@ int w, h, d; unsigned char *r, *g, *b; int ncolors; { - register PSImagePtr psim = xim->psim; - register FrameBufPtr fb = xim->df_p; - register ColorMapPtr cm = &colormaps[fb->colormap-1]; - register int sv_annotate = psim->annotate; - register int sv_colorClass = psim->colorClass; + PSImagePtr psim = xim->psim; + FrameBufPtr fb = xim->df_p; + ColorMapPtr cm = &colormaps[fb->colormap-1]; + int sv_annotate = psim->annotate; + int sv_colorClass = psim->colorClass; int gray=0, status=0; extern int writeSunRas(); extern int writeFITS(); @@ -283,10 +283,10 @@ int ncolors; */ void xims_rename (xim, old, new) -register XimDataPtr xim; +XimDataPtr xim; char *old, *new; { - register fileSavePtr fsp = xim->fsp; + fileSavePtr fsp = xim->fsp; char text[SZ_LINE]; struct stat fs; @@ -305,7 +305,7 @@ char *old, *new; void xims_cancel (xim, fname) -register XimDataPtr xim; +XimDataPtr xim; char *fname; { savestat (xim, "Save cancelled."); @@ -317,7 +317,7 @@ char *fname; */ static void savestat (xim, message) -register XimDataPtr xim; +XimDataPtr xim; char *message; { char text[SZ_LINE]; @@ -330,14 +330,14 @@ char *message; */ static void savetext (xim, seqno, fullname, fileformat, filesize, w,h,d) -register XimDataPtr xim; +XimDataPtr xim; int seqno; char *fullname; int fileformat; int filesize; int w, h, d; { - register char *ip; + char *ip; char *fmt, *fname, text[SZ_LINE]; for (ip=fname=fullname; *ip; ip++) diff --git a/ximtool/util.c b/ximtool/util.c index 7401ce0..a6390dd 100644 --- a/ximtool/util.c +++ b/ximtool/util.c @@ -36,8 +36,8 @@ bswap2 (a, b, nbytes) char *a, *b; /* input array */ int nbytes; /* number of bytes to swap */ { - register char *ip=a, *op=b, *otop; - register unsigned temp; + char *ip=a, *op=b, *otop; + unsigned temp; /* Swap successive pairs of bytes. */ @@ -66,8 +66,8 @@ char *b; /* output array */ int boff; /* first byte in output array */ int nbytes; /* number of bytes to swap */ { - register char *ip, *op, *tp; - register int n; + char *ip, *op, *tp; + int n; static char temp[4]; tp = temp; @@ -108,8 +108,8 @@ char *b; /* output array */ int boff; /* first byte in output array */ int nbytes; /* number of bytes to swap */ { - register char *ip, *op, *tp; - register int n; + char *ip, *op, *tp; + int n; static char temp[8]; tp = temp; @@ -170,7 +170,7 @@ int npts; int bitpix; float *min, *max; { - register int i; + int i; *min = 32768.0, *max = -32768.0; @@ -240,8 +240,8 @@ uchar *buffer; int nx, ny; { int i; - register int j, v; - register uchar *buff1, *buff2; + int j, v; + uchar *buff1, *buff2; for (i = 0; i < ny / 2; i++) { buff1 = &buffer[i*nx]; diff --git a/ximtool/ximclient.c b/ximtool/ximclient.c index 851bc6e..68cd61f 100644 --- a/ximtool/ximclient.c +++ b/ximtool/ximclient.c @@ -103,8 +103,8 @@ void xim_clientOpen (xim) XimDataPtr xim; { - register XimClientPtr xc; - register Tcl_Interp *tcl; + XimClientPtr xc; + Tcl_Interp *tcl; xc = (XimClientPtr) XtCalloc (1, sizeof(XimClient)); xim->clientPrivate = (int *)xc; @@ -206,7 +206,7 @@ void xim_clientClose (xim) XimDataPtr xim; { - register XimClientPtr xc = (XimClientPtr) xim->clientPrivate; + XimClientPtr xc = (XimClientPtr) xim->clientPrivate; Tcl_Eval(xc->tcl, "exit"); if (!Tcl_InterpDeleted(xc->tcl)) Tcl_DeleteInterp (xc->tcl); @@ -219,13 +219,13 @@ XimDataPtr xim; */ int xim_clientExecute (xc, tcl, objname, key, command) -register XimClientPtr xc; +XimClientPtr xc; Tcl_Interp *tcl; /* caller's Tcl */ char *objname; /* object name */ int key; /* notused */ char *command; { - register XimDataPtr xim = xc->xim; + XimDataPtr xim = xc->xim; xc->server = tcl; if (strcmp (objname, "client") == 0) @@ -248,12 +248,12 @@ char *command; */ static int Quit (xc, tcl, argc, argv) -register XimClientPtr xc; +XimClientPtr xc; Tcl_Interp *tcl; int argc; char **argv; { - register XimDataPtr xim = xc->xim; + XimDataPtr xim = xc->xim; return xim_shutdown (xim); } @@ -266,12 +266,12 @@ char **argv; */ static int Reset (xc, tcl, argc, argv) -register XimClientPtr xc; +XimClientPtr xc; Tcl_Interp *tcl; int argc; char **argv; { - register XimDataPtr xim = xc->xim; + XimDataPtr xim = xc->xim; xim_initialize (xim, xim->fb_configno, xim->nframes, 1); return 0; } @@ -286,12 +286,12 @@ char **argv; */ static int initialize (xc, tcl, argc, argv) -register XimClientPtr xc; +XimClientPtr xc; Tcl_Interp *tcl; int argc; char **argv; { - register XimDataPtr xim = xc->xim; + XimDataPtr xim = xc->xim; xim_initialize (xim, xim->fb_configno, xim->nframes, 0); return 0; } @@ -303,7 +303,7 @@ char **argv; */ static int setFrame (xc, tcl, argc, argv) -register XimClientPtr xc; +XimClientPtr xc; Tcl_Interp *tcl; int argc; char **argv; @@ -329,10 +329,10 @@ Tcl_Interp *tcl; int argc; char **argv; { - register XimDataPtr xim = xc->xim; - register FrameBufPtr fb; + XimDataPtr xim = xc->xim; + FrameBufPtr fb; char frameno[SZ_NAME]; - register int i; + int i; int raster; if (argc == 1) @@ -370,10 +370,10 @@ Tcl_Interp *tcl; int argc; char **argv; { - register XimDataPtr xim = xc->xim; - register FrameBufPtr fb; + XimDataPtr xim = xc->xim; + FrameBufPtr fb; char buf[SZ_NAME]; - register int i; + int i; int frameno; if (argc == 1) @@ -411,8 +411,8 @@ Tcl_Interp *tcl; int argc; char **argv; { - register XimDataPtr xim = xc->xim; - register FrameBufPtr fb = xim->df_p; + XimDataPtr xim = xc->xim; + FrameBufPtr fb = xim->df_p; int src, st, sx, sy, snx, sny; int dst, dt, dx, dy, dnx, dny; char buf[SZ_NAME]; @@ -449,12 +449,12 @@ char **argv; */ static int nextFrame (xc, tcl, argc, argv) -register XimClientPtr xc; +XimClientPtr xc; Tcl_Interp *tcl; int argc; char **argv; { - register XimDataPtr xim = xc->xim; + XimDataPtr xim = xc->xim; int frame; if (xim->display_frame < xim->nframes) @@ -473,12 +473,12 @@ char **argv; */ static int prevFrame (xc, tcl, argc, argv) -register XimClientPtr xc; +XimClientPtr xc; Tcl_Interp *tcl; int argc; char **argv; { - register XimDataPtr xim = xc->xim; + XimDataPtr xim = xc->xim; int frame; if (xim->display_frame > 1) @@ -500,12 +500,12 @@ char **argv; */ static int matchFrames (xc, tcl, argc, argv) -register XimClientPtr xc; +XimClientPtr xc; Tcl_Interp *tcl; int argc; char **argv; { - register XimDataPtr xim = xc->xim; + XimDataPtr xim = xc->xim; int *frames, frame_list[32], reference_frame; int nitems, i; const char **items; @@ -542,12 +542,12 @@ nolist: frames = NULL; */ static int registerFrames (xc, tcl, argc, argv) -register XimClientPtr xc; +XimClientPtr xc; Tcl_Interp *tcl; int argc; char **argv; { - register XimDataPtr xim = xc->xim; + XimDataPtr xim = xc->xim; int *frames, frame_list[32], reference_frame; int nitems, i, offsets; const char **items; @@ -581,13 +581,13 @@ nolist: frames = NULL; */ static int setOffset (xc, tcl, argc, argv) -register XimClientPtr xc; +XimClientPtr xc; Tcl_Interp *tcl; int argc; char **argv; { - register XimDataPtr xim = xc->xim; - register FrameBufPtr fb = xim->df_p; + XimDataPtr xim = xc->xim; + FrameBufPtr fb = xim->df_p; float xcen, ycen; float xmag, ymag; float xoff, yoff; @@ -629,12 +629,12 @@ char **argv; */ static int clearFrame (xc, tcl, argc, argv) -register XimClientPtr xc; +XimClientPtr xc; Tcl_Interp *tcl; int argc; char **argv; { - register XimDataPtr xim = xc->xim; + XimDataPtr xim = xc->xim; int frame; if (argc > 1) @@ -654,7 +654,7 @@ char **argv; */ static int fitFrame (xc, tcl, argc, argv) -register XimClientPtr xc; +XimClientPtr xc; Tcl_Interp *tcl; int argc; char **argv; @@ -686,13 +686,13 @@ char *v_orient[] = { static int setOption (xc, tcl, argc, argv) -register XimClientPtr xc; +XimClientPtr xc; Tcl_Interp *tcl; int argc; char **argv; { - register XimDataPtr xim = xc->xim; - register FrameBufPtr fb = xim->df_p; + XimDataPtr xim = xc->xim; + FrameBufPtr fb = xim->df_p; char *option, *strval; const char **items; char buf[SZ_LINE]; @@ -844,13 +844,13 @@ vorient: if (nitems >= 13) */ static int setColormap (xc, tcl, argc, argv) -register XimClientPtr xc; +XimClientPtr xc; Tcl_Interp *tcl; int argc; char **argv; { - register XimDataPtr xim = xc->xim; - register FrameBufPtr fb = xim->df_p; + XimDataPtr xim = xc->xim; + FrameBufPtr fb = xim->df_p; unsigned short m_red[MAX_COLORS]; unsigned short m_green[MAX_COLORS]; unsigned short m_blue[MAX_COLORS]; @@ -895,14 +895,14 @@ char **argv; */ static int windowColormap (xc, tcl, argc, argv) -register XimClientPtr xc; +XimClientPtr xc; Tcl_Interp *tcl; int argc; char **argv; { - register XimDataPtr xim = xc->xim; - register FrameBufPtr fb = xim->df_p; - register ColorMapPtr cm; + XimDataPtr xim = xc->xim; + FrameBufPtr fb = xim->df_p; + ColorMapPtr cm; if (argc > 1) { cm = &colormaps[fb->colormap-1]; @@ -923,14 +923,14 @@ char **argv; */ static int updateColormap (xc, tcl, argc, argv) -register XimClientPtr xc; +XimClientPtr xc; Tcl_Interp *tcl; int argc; char **argv; { - register XimDataPtr xim = xc->xim; - register FrameBufPtr fb = xim->df_p; - register ColorMapPtr cm; + XimDataPtr xim = xc->xim; + FrameBufPtr fb = xim->df_p; + ColorMapPtr cm; if (argc > 1) { cm = &colormaps[fb->colormap-1]; @@ -962,13 +962,13 @@ char **argv; */ static int zoom (xc, tcl, argc, argv) -register XimClientPtr xc; +XimClientPtr xc; Tcl_Interp *tcl; int argc; char **argv; { - register XimDataPtr xim = xc->xim; - register FrameBufPtr fb = xim->df_p; + XimDataPtr xim = xc->xim; + FrameBufPtr fb = xim->df_p; float xmag, ymag; float xcen, ycen; float xoff, yoff; @@ -1014,13 +1014,13 @@ char **argv; */ static int pan (xc, tcl, argc, argv) -register XimClientPtr xc; +XimClientPtr xc; Tcl_Interp *tcl; int argc; char **argv; { - register XimDataPtr xim = xc->xim; - register FrameBufPtr fb = xim->df_p; + XimDataPtr xim = xc->xim; + FrameBufPtr fb = xim->df_p; Boolean absolute = False; float xmag, ymag; float xcen, ycen; @@ -1052,14 +1052,14 @@ char **argv; */ static int centroid (xc, tcl, argc, argv) -register XimClientPtr xc; +XimClientPtr xc; Tcl_Interp *tcl; int argc; char **argv; { - register XimDataPtr xim = xc->xim; - register FrameBufPtr fb = xim->df_p; - register CtranPtr ct = (CtranPtr) &fb->ctran; + XimDataPtr xim = xc->xim; + FrameBufPtr fb = xim->df_p; + CtranPtr ct = (CtranPtr) &fb->ctran; unsigned char junk[MAX_COLORS]; unsigned char *pix = NULL; float *data=NULL, *xm=NULL, *ym=NULL; @@ -1215,15 +1215,15 @@ char **argv; static int getPixels (xc, tcl, argc, argv) -register XimClientPtr xc; +XimClientPtr xc; Tcl_Interp *tcl; int argc; char **argv; { - register XimDataPtr xim = xc->xim; - register FrameBufPtr fb = xim->df_p; - register CtranPtr ct = (CtranPtr) &fb->ctran; - register int i; + XimDataPtr xim = xc->xim; + FrameBufPtr fb = xim->df_p; + CtranPtr ct = (CtranPtr) &fb->ctran; + int i; unsigned char *pix = NULL; char *buf = NULL, ch, val[32]; float *data = NULL; @@ -1331,13 +1331,13 @@ char **argv; */ static int flip (xc, tcl, argc, argv) -register XimClientPtr xc; +XimClientPtr xc; Tcl_Interp *tcl; int argc; char **argv; { - register XimDataPtr xim = xc->xim; - register FrameBufPtr fb = xim->df_p; + XimDataPtr xim = xc->xim; + FrameBufPtr fb = xim->df_p; int flip_x = 0, flip_y = 0; int ch, i; @@ -1361,12 +1361,12 @@ char **argv; */ static int retCursorVal (xc, tcl, argc, argv) -register XimClientPtr xc; +XimClientPtr xc; Tcl_Interp *tcl; int argc; char **argv; { - register XimDataPtr xim = xc->xim; + XimDataPtr xim = xc->xim; int frame, wcs, key; float sx, sy; char *s, *strval; @@ -1405,7 +1405,7 @@ char **argv; */ static int encodewcs (xc, tcl, argc, argv) -register XimClientPtr xc; +XimClientPtr xc; Tcl_Interp *tcl; int argc; char **argv; @@ -1459,16 +1459,16 @@ char **argv; */ static int setPrintOption (xc, tcl, argc, argv) -register XimClientPtr xc; +XimClientPtr xc; Tcl_Interp *tcl; int argc; char **argv; { - register XimDataPtr xim = xc->xim; - register FrameBufPtr fb = xim->df_p; - register PSImagePtr psim = xim->psim; - register PrintCfgPtr pcp = xim->pcp; - register int i; + XimDataPtr xim = xc->xim; + FrameBufPtr fb = xim->df_p; + PSImagePtr psim = xim->psim; + PrintCfgPtr pcp = xim->pcp; + int i; int llx, lly, urx, ury; char *option, strval[SZ_LINE]; char buf[SZ_LINE]; @@ -1674,14 +1674,14 @@ char **argv; */ static int setSaveOption (xc, tcl, argc, argv) -register XimClientPtr xc; +XimClientPtr xc; Tcl_Interp *tcl; int argc; char **argv; { - register XimDataPtr xim = xc->xim; - register fileSavePtr fsp = xim->fsp; - register int i; + XimDataPtr xim = xc->xim; + fileSavePtr fsp = xim->fsp; + int i; char *option, strval[SZ_LINE]; char buf[SZ_LINE]; int ch; @@ -1779,14 +1779,14 @@ char **argv; */ static int setLoadOption (xc, tcl, argc, argv) -register XimClientPtr xc; +XimClientPtr xc; Tcl_Interp *tcl; int argc; char **argv; { - register int i; - register XimDataPtr xim = xc->xim; - register fileLoadPtr flp = xim->flp; + int i; + XimDataPtr xim = xc->xim; + fileLoadPtr flp = xim->flp; char *option, *strval; char buf[SZ_LINE]; @@ -1884,12 +1884,12 @@ char **argv; */ static int print (xc, tcl, argc, argv) -register XimClientPtr xc; +XimClientPtr xc; Tcl_Interp *tcl; int argc; char **argv; { - register XimDataPtr xim = xc->xim; + XimDataPtr xim = xc->xim; int x0, y0, nx, ny; /* Handle the special cases first. */ @@ -1931,13 +1931,13 @@ char **argv; */ static int save (xc, tcl, argc, argv) -register XimClientPtr xc; +XimClientPtr xc; Tcl_Interp *tcl; int argc; char **argv; { - register XimDataPtr xim = xc->xim; - register fileSavePtr fsp = xim->fsp; + XimDataPtr xim = xc->xim; + fileSavePtr fsp = xim->fsp; int x0, y0, nx, ny; /* Handle the special cases first. */ @@ -1973,13 +1973,13 @@ char **argv; */ static int load (xc, tcl, argc, argv) -register XimClientPtr xc; +XimClientPtr xc; Tcl_Interp *tcl; int argc; char **argv; { - register XimDataPtr xim = xc->xim; - register fileLoadPtr flp = xim->flp; + XimDataPtr xim = xc->xim; + fileLoadPtr flp = xim->flp; char *fname; char buf[SZ_LINE]; struct stat file_info; @@ -2046,14 +2046,14 @@ static char *help_text[] = { static int help (xc, tcl, argc, argv) -register XimClientPtr xc; +XimClientPtr xc; Tcl_Interp *tcl; int argc; char **argv; { - register XimDataPtr xim = xc->xim; - register char *ip, *op, *helptxt; - register int i; + XimDataPtr xim = xc->xim; + char *ip, *op, *helptxt; + int i; helptxt = (char *) XtMalloc (1024000); for (i=0, op=helptxt; (ip = help_text[i]); i++) { @@ -2079,12 +2079,12 @@ char **argv; */ int info (xc, tcl, argc, argv) -register XimClientPtr xc; +XimClientPtr xc; Tcl_Interp *tcl; int argc; char **argv; { - register XimDataPtr xim = xc->xim; + XimDataPtr xim = xc->xim; char *option, *message; if (argc < 2) @@ -2125,7 +2125,7 @@ char **argv; */ static void info_server (xim, argc, argv, text) -register XimDataPtr xim; +XimDataPtr xim; int argc; char **argv; char *text; @@ -2176,11 +2176,11 @@ char *text; */ void info_clients (xim, text) -register XimDataPtr xim; +XimDataPtr xim; char *text; { - register IsmModule ism; - register int i; + IsmModule ism; + int i; char line[SZ_LINE], path[80]; extern ismModule ism_modules[]; extern int ism_nmodules; @@ -2237,12 +2237,12 @@ char *text; */ void info_wcs (xim, text) -register XimDataPtr xim; +XimDataPtr xim; char *text; { - register FrameBufPtr fr = xim->df_p; - register CtranPtr ct = &fr->ctran; - register int i; + FrameBufPtr fr = xim->df_p; + CtranPtr ct = &fr->ctran; + int i; MappingPtr mp = (MappingPtr) NULL; char line[SZ_LINE]; @@ -2329,11 +2329,11 @@ char *text; */ void info_imtoolrc (xim, text) -register XimDataPtr xim; +XimDataPtr xim; char *text; { - register int last_fb_used = MAX_FBCONFIG; - register int i, w, h, nf, fb_config = xim->fb_configno; + int last_fb_used = MAX_FBCONFIG; + int i, w, h, nf, fb_config = xim->fb_configno; char line[SZ_LINE]; strcpy (text, " Frame Buffer Configuration Table\n"); @@ -2387,14 +2387,14 @@ char *text; static int windowRGB (xc, tcl, argc, argv) -register XimClientPtr xc; +XimClientPtr xc; Tcl_Interp *tcl; int argc; char **argv; { - register XimDataPtr xim = xc->xim; - register FrameBufPtr fb = xim->df_p; - register ColorMapPtr cm; + XimDataPtr xim = xc->xim; + FrameBufPtr fb = xim->df_p; + ColorMapPtr cm; int color, first, nelem, maxelem, save = 0; unsigned short r[MAX_COLORS]; unsigned short g[MAX_COLORS]; @@ -2448,8 +2448,8 @@ unsigned short map[MAX_COLORS]; int ncells, first; float offset, slope; { - register int i, c1, c2; - register float x, y, z, frac; + int i, c1, c2; + float x, y, z, frac; unsigned short val, out[MAX_COLORS]; for (i=0; i < ncells; i++) { @@ -2484,12 +2484,12 @@ float offset, slope; */ static int ism_start (xc, tcl, argc, argv) -register XimClientPtr xc; +XimClientPtr xc; Tcl_Interp *tcl; int argc; char **argv; { - register IsmModule ism; + IsmModule ism; if (argc < 2) return (TCL_ERROR); @@ -2515,13 +2515,13 @@ char **argv; */ static int ism_stop (xc, tcl, argc, argv) -register XimClientPtr xc; +XimClientPtr xc; Tcl_Interp *tcl; int argc; char **argv; { - register XimDataPtr xim = xc->xim; - register IsmModule ism; + XimDataPtr xim = xc->xim; + IsmModule ism; if (argc < 2) return (TCL_ERROR); @@ -2546,13 +2546,13 @@ char **argv; */ static int ism_cmd (xc, tcl, argc, argv) -register XimClientPtr xc; +XimClientPtr xc; Tcl_Interp *tcl; int argc; char **argv; { - register XimDataPtr xim = xc->xim; - register IsmModule ism; + XimDataPtr xim = xc->xim; + IsmModule ism; char **cmd_argv; int cmd_argc; diff --git a/ximtool/ximtool.c b/ximtool/ximtool.c index 85667de..2aca957 100644 --- a/ximtool/ximtool.c +++ b/ximtool/ximtool.c @@ -46,9 +46,9 @@ main (argc, argv) int argc; char *argv[]; { - register XimDataPtr xim = &ximtool_data; - register int i; - register IsmModule ism; + XimDataPtr xim = &ximtool_data; + int i; + IsmModule ism; Widget toplevel; XtPointer obm; @@ -74,7 +74,7 @@ char *argv[]; exit (1); } else if (strcmp (argv[1], "-defgui") == 0) { - register int i; + int i; for (i=0; defgui_text[i]; i++) printf ("%s\n", defgui_text[i]); exit (0); @@ -321,7 +321,7 @@ char *argv[]; if (strcmp (xim->gui, "default") == 0 || (ObmDeliverMsgFromFile (obm, server, xim->gui) != 0)) { - register char *ip, *op; + char *ip, *op; char *message; int i; @@ -387,7 +387,7 @@ char *argv[]; */ int xim_shutdown (xim) -register XimDataPtr xim; +XimDataPtr xim; { eps_close (xim->psim); xim_loadClose (xim); @@ -407,7 +407,7 @@ register XimDataPtr xim; */ XtInputId xim_addInput (xim, input, proc, client_data) -register XimDataPtr xim; +XimDataPtr xim; int input; void (*proc)(); XtPointer client_data; @@ -421,7 +421,7 @@ XtPointer client_data; */ void xim_removeInput (xim, id) -register XimDataPtr xim; +XimDataPtr xim; XtPointer id; { XtRemoveInput ((XtInputId)id); @@ -543,7 +543,7 @@ int class; int xerror (display, event) Display *display; -register XErrorEvent *event; +XErrorEvent *event; { static char *envvar = "XGXERROR"; static int nerrs = 0; diff --git a/ximtool/zscale.c b/ximtool/zscale.c index 47ef7bb..4862ff3 100644 --- a/ximtool/zscale.c +++ b/ximtool/zscale.c @@ -66,7 +66,7 @@ float contrast; /* adj. to slope of transfer function */ int opt_size; /* desired number of pixels in sample */ int len_stdline; /* optimal number of pixels per line */ { - register int npix, minpix, ngoodpix, center_pixel, ngrow; + int npix, minpix, ngoodpix, center_pixel, ngrow; float zmin, zmax, median; float zstart, zslope; float *sample, *left; @@ -139,7 +139,7 @@ int nx, ny; /* image dimensions */ int optimal_size; /* desired number of pixels in sample */ int len_stdline; /* optimal number of pixels per line */ { - register int i; + int i; int ncols, nlines, col_step, line_step, maxpix, line; int opt_npix_per_line, npix_per_line, npix = 0; int opt_nlines_in_sample, min_nlines_in_sample, max_nlines_in_sample; @@ -238,7 +238,7 @@ float *a; float *b; int npix, step; { - register int ip, i; + int ip, i; if (step <= 1) memmove (b, a, npix); @@ -399,7 +399,7 @@ float *x; /* x value of each pixel */ int npix; /* number of pixels */ double z0, dz; /* z-intercept, dz/dx of fitted line */ { - register int i; + int i; for (i=0; i < npix; i++) flat[i] = data[i] - (x[i] * dz + z0); diff --git a/xtapemon/xtapemon.c b/xtapemon/xtapemon.c index 2bd3c94..b90d094 100644 --- a/xtapemon/xtapemon.c +++ b/xtapemon/xtapemon.c @@ -351,8 +351,8 @@ XtPointer client_data; int *source; XtInputId *id; { - register int fd = *source; - register char *ip, *op; + int fd = *source; + char *ip, *op; static char msg[SZ_MSGBUF]; static int nleft, tapesize, blksize; char word[SZ_LINE], value[SZ_LINE]; @@ -511,7 +511,7 @@ static void appendText (text) char *text; { - register char *ip, *op; + char *ip, *op; static XawTextPosition pos = 0; static int newline = 0; XawTextBlock tx; From fe481560e079b0f979d648d8d4051ba1209fd936 Mon Sep 17 00:00:00 2001 From: Ole Streicher Date: Fri, 9 Aug 2024 16:44:40 +0200 Subject: [PATCH 14/21] Protoize ObmW and listres --- obm/Obm.c | 2 +- obm/ObmP.h | 42 +-- obm/ObmW/Arrow.c | 21 +- obm/ObmW/Board.c | 27 +- obm/ObmW/Button.c | 5 +- obm/ObmW/Common.c | 69 +++-- obm/ObmW/Container.c | 56 ++-- obm/ObmW/DrawIString.c | 10 +- obm/ObmW/DrawString.c | 10 +- obm/ObmW/DrawingArea.c | 46 +-- obm/ObmW/Frame.c | 43 ++- obm/ObmW/Group.c | 25 +- obm/ObmW/Gterm.c | 263 ++++++++-------- obm/ObmW/Gterm.h | 155 +++++----- obm/ObmW/GtermCmap.c | 33 +- obm/ObmW/GtermCnv.c | 11 +- obm/ObmW/GtermGraphics.c | 4 +- obm/ObmW/GtermMapping.c | 308 +++++++++---------- obm/ObmW/GtermMarker.c | 639 ++++++++++++--------------------------- obm/ObmW/GtermP.h | 1 - obm/ObmW/GtermUtil.c | 15 +- obm/ObmW/HTML-PSformat.c | 2 +- obm/ObmW/HTML.c | 214 +++++-------- obm/ObmW/HTMLformat.c | 216 ++++--------- obm/ObmW/HTMLimages.c | 57 +--- obm/ObmW/HTMLjot.c | 47 +-- obm/ObmW/HTMLlists.c | 57 +--- obm/ObmW/HTMLparse.c | 55 +--- obm/ObmW/HTMLwidgets.c | 161 +++------- obm/ObmW/Icon.c | 15 +- obm/ObmW/Label.c | 17 +- obm/ObmW/ListTree.c | 171 +++-------- obm/ObmW/MenuBar.c | 13 +- obm/ObmW/MultiList.c | 119 ++------ obm/ObmW/RadioGrp.c | 17 +- obm/ObmW/RowCol.c | 20 +- obm/ObmW/Scrollbar.c | 25 +- obm/ObmW/Separator.c | 52 ++-- obm/ObmW/Slider2.c | 41 ++- obm/ObmW/Table.c | 404 +++++++++---------------- obm/ObmW/Table3d.c | 23 +- obm/ObmW/TableUtil.c | 29 +- obm/ObmW/Tablist2Tabs.c | 3 +- obm/ObmW/TextWidth.c | 6 +- obm/ObmW/Toggle.c | 19 +- obm/ObmW/color.c | 45 +-- obm/ObmW/cvtLong.c | 8 +- obm/ObmW/iconutil.c | 26 +- obm/ObmW/scroll.c | 6 +- obm/ObmW/scroll.h | 4 +- obm/ObmW/strnchr.c | 5 +- obm/listres/listres.c | 34 +-- obm/server.c | 2 +- 53 files changed, 1332 insertions(+), 2366 deletions(-) diff --git a/obm/Obm.c b/obm/Obm.c index bc88832..e8d07c3 100644 --- a/obm/Obm.c +++ b/obm/Obm.c @@ -91,7 +91,7 @@ */ #define MAXOBJ 512 -static void obm_call_activate_callbacks(); +static void obm_call_activate_callbacks(struct obmContext *obm, int state); #if (TCL_MAJOR_VERSION < 8) diff --git a/obm/ObmP.h b/obm/ObmP.h index 7dab5a0..5051f16 100644 --- a/obm/ObmP.h +++ b/obm/ObmP.h @@ -518,27 +518,29 @@ typedef unsigned char uchar; #define TRUESTR "1" #define FALSESTR "0" -int obmClientCommand (); -extern int obmClass(); -extern ObmObject obmFindObject(); -extern ObjClassRec obmGetClassrec(); -extern Widget widgetGetPointer(); -extern ObmCallback obmAddCallback(); -extern void widget_setTTName(); -extern char *widget_getTTName(); -extern void obmRemoveCallback(); +typedef struct widgetObject *WidgetObject; + +int obmClientCommand (Tcl_Interp *tcl, char *commmand); +extern int obmClass(struct objClassRec *classrec, long unsigned int flag1, long unsigned int flag2); +extern ObmObject obmFindObject(struct obmContext *obm, const char *object); +extern ObjClassRec obmGetClassrec(char *classname); +extern Widget widgetGetPointer(struct obmObject *object); +extern ObmCallback obmAddCallback(struct _obmCallback **callback_list); +extern void widget_setTTName(WidgetObject obj, char *name); +extern char *widget_getTTName(WidgetObject obj); +extern void obmRemoveCallback(struct _obmCallback **callback_list, struct _obmCallback *callback); extern void obmFreeObject(); -extern void obmDestroyObject(); -extern void obmGenericClassDestroy(); -extern void obmDisplay(), obmUndisplay(); -extern int obm_nameToObjectList (); -extern void freeMenu(); -extern void freeIcon(); -extern Pixmap findBitmap(); -extern Pixmap findPixmap(); -extern Cursor findCursor(); -extern Icon *findIcon(); -extern char *get_geometry(); +extern void obmDestroyObject(struct obmContext *obm, struct obmObject *object); +extern void obmGenericClassDestroy(struct obmContext *obm, struct objClassRec *classrec); +extern void obmDisplay(struct obmContext *obm, struct obmObject *obj), obmUndisplay(struct obmContext *obm, struct obmObject *obj); +extern int obm_nameToObjectList (struct obmContext *obm, char *object, struct obmObject **pobjs, int *nobjs, struct obmObject **objs); +extern void freeMenu(MenuPtr mp); +extern void freeIcon(struct obmContext *obm, Icon *icon); +extern Pixmap findBitmap(struct obmContext *obm, const char *name); +extern Pixmap findPixmap(struct obmContext *obm, const char *name); +extern Cursor findCursor(struct obmContext *obm, char *name); +extern Icon *findIcon(struct obmContext *obm, char *name); +extern char *get_geometry(Display *display, Screen *screen, Window window, int origin); /* Public functions. */ #define Obm_Private diff --git a/obm/ObmW/Arrow.c b/obm/ObmW/Arrow.c index a26b279..54b6cc7 100644 --- a/obm/ObmW/Arrow.c +++ b/obm/ObmW/Arrow.c @@ -28,7 +28,7 @@ static void create_arrowgc(Widget); static void create_arrowlightgc(Widget); static void create_arrowdarkgc(Widget); -/*ARGSUSED*/static void timer_callback(client_data,timer)XtPointer client_data;XtIntervalId * timer; +/*ARGSUSED*/static void timer_callback(XtPointer client_data, XtIntervalId *timer) { Widget self = (Widget) client_data; @@ -36,7 +36,7 @@ static void create_arrowdarkgc(Widget); ((XfwfArrowWidget)self)->xfwfArrow.timer = XtAppAddTimeOut(XtWidgetToApplicationContext(self), ((XfwfArrowWidget)self)->xfwfArrow.repeatDelay, timer_callback, self); } -/*ARGSUSED*/static void create_arrowgc(self)Widget self; +/*ARGSUSED*/static void create_arrowgc(Widget self) { XtGCMask mask; XGCValues values; @@ -46,7 +46,7 @@ static void create_arrowdarkgc(Widget); values.foreground = ((XfwfArrowWidget)self)->xfwfArrow.foreground; ((XfwfArrowWidget)self)->xfwfArrow.arrowgc = XtGetGC(self, mask, &values); } -/*ARGSUSED*/static void create_arrowlightgc(self)Widget self; +/*ARGSUSED*/static void create_arrowlightgc(Widget self) { XtGCMask mask; XGCValues values; @@ -82,7 +82,7 @@ static void create_arrowdarkgc(Widget); } ((XfwfArrowWidget)self)->xfwfArrow.arrowlightgc = XtGetGC(self, mask, &values); } -/*ARGSUSED*/static void create_arrowdarkgc(self)Widget self; +/*ARGSUSED*/static void create_arrowdarkgc(Widget self) { XtGCMask mask; XGCValues values; @@ -193,7 +193,7 @@ XtInherit_set_abs_location, }; WidgetClass xfwfArrowWidgetClass = (WidgetClass) &xfwfArrowClassRec; /*ARGSUSED*/ -static void activate_and_start_timer(self,event,params,num_params)Widget self;XEvent*event;String*params;Cardinal*num_params; +static void activate_and_start_timer(Widget self, XEvent *event, String *params, Cardinal *num_params) { if (event->type != ButtonPress) { XtWarning("The Arrow activate action isn't bound to a BtnDown event"); @@ -205,13 +205,12 @@ static void activate_and_start_timer(self,event,params,num_params)Widget self;XE } /*ARGSUSED*/ -static void stop_timer(self,event,params,num_params)Widget self;XEvent*event;String*params;Cardinal*num_params; +static void stop_timer(Widget self, XEvent *event, String *params, Cardinal *num_params) { XtRemoveTimeOut(((XfwfArrowWidget)self)->xfwfArrow.timer); } -static void _resolve_inheritance(class) -WidgetClass class; +static void _resolve_inheritance(WidgetClass class) { XfwfArrowWidgetClass c = (XfwfArrowWidgetClass) class; XfwfArrowWidgetClass super; @@ -226,7 +225,7 @@ WidgetClass class; if (class == xfwfArrowWidgetClass) return; super = (XfwfArrowWidgetClass)class->core_class.superclass; } -/*ARGSUSED*/static void initialize(request,self,args,num_args)Widget request;Widget self;ArgList args;Cardinal * num_args; +/*ARGSUSED*/static void initialize(Widget request, Widget self, ArgList args, Cardinal *num_args) { if (((XfwfArrowWidget)self)->xfwfArrow.direction != XfwfTop && ((XfwfArrowWidget)self)->xfwfArrow.direction != XfwfLeft && ((XfwfArrowWidget)self)->xfwfArrow.direction != XfwfRight && ((XfwfArrowWidget)self)->xfwfArrow.direction != XfwfBottom) { @@ -237,7 +236,7 @@ WidgetClass class; ((XfwfArrowWidget)self)->xfwfArrow.arrowlightgc = NULL; create_arrowlightgc(self); ((XfwfArrowWidget)self)->xfwfArrow.arrowdarkgc = NULL; create_arrowdarkgc(self); } -/*ARGSUSED*/static Boolean set_values(old,request,self,args,num_args)Widget old;Widget request;Widget self;ArgList args;Cardinal * num_args; +/*ARGSUSED*/static Boolean set_values(Widget old, Widget request, Widget self, ArgList args, Cardinal *num_args) { Boolean need_redisplay = False; @@ -279,7 +278,7 @@ WidgetClass class; } return need_redisplay; } -/*ARGSUSED*/static void expose(self,event,region)Widget self;XEvent * event;Region region; +/*ARGSUSED*/static void expose(Widget self, XEvent *event, Region region) { XPoint p1[3], p2[4], p3[4], p4[4]; Position x, y; diff --git a/obm/ObmW/Board.c b/obm/ObmW/Board.c index 28394c3..9c29a3b 100644 --- a/obm/ObmW/Board.c +++ b/obm/ObmW/Board.c @@ -28,7 +28,7 @@ static void set_location(Widget,unsigned int ); static char * scan(char *,Position *,float *); static void interpret_location(Widget); -/*ARGSUSED*/static void generate_location(self)Widget self; +/*ARGSUSED*/static void generate_location(Widget self) { char tmp[100]; @@ -38,7 +38,7 @@ static void interpret_location(Widget); XtFree(((XfwfBoardWidget)self)->xfwfBoard.location); ((XfwfBoardWidget)self)->xfwfBoard.location = XtNewString(tmp); } -/*ARGSUSED*/static void get_core_geometry(self,x,y,width,height)Widget self;Position * x;Position * y;Dimension * width;Dimension * height; +/*ARGSUSED*/static void get_core_geometry(Widget self, Position *x, Position *y, Dimension *width, Dimension *height) { Widget parent; Position px, py; @@ -62,7 +62,7 @@ static void interpret_location(Widget); h = ceil(((XfwfBoardWidget)self)->xfwfBoard.rel_height * ph + ((XfwfBoardWidget)self)->xfwfBoard.abs_height * ((XfwfBoardWidget)self)->xfwfBoard.vunit); *height = h < 1.0 ? 1 : h; } -/*ARGSUSED*/static void set_location(self,flags)Widget self;unsigned int flags; +/*ARGSUSED*/static void set_location(Widget self, unsigned int flags) { Widget parent; Position px, py; @@ -94,7 +94,7 @@ static void interpret_location(Widget); ((XfwfBoardWidget)self)->xfwfBoard.abs_height = ceil(((XfwfBoardWidget)self)->core.height/((XfwfBoardWidget)self)->xfwfBoard.vunit); } } -/*ARGSUSED*/static char * scan(s,absval,relval)char * s;Position * absval;float * relval; +/*ARGSUSED*/static char * scan(char *s, Position *absval, float *relval) { Position n; char *t; @@ -124,7 +124,7 @@ static void interpret_location(Widget); return t; } } -/*ARGSUSED*/static void interpret_location(self)Widget self; +/*ARGSUSED*/static void interpret_location(Widget self) { char *s, *t; @@ -214,8 +214,7 @@ set_abs_location, }, }; WidgetClass xfwfBoardWidgetClass = (WidgetClass) &xfwfBoardClassRec; -static void _resolve_inheritance(class) -WidgetClass class; +static void _resolve_inheritance(WidgetClass class) { XfwfBoardWidgetClass c = (XfwfBoardWidgetClass) class; XfwfBoardWidgetClass super; @@ -232,7 +231,7 @@ WidgetClass class; if (c->xfwfBoard_class.set_abs_location == XtInherit_set_abs_location) c->xfwfBoard_class.set_abs_location = super->xfwfBoard_class.set_abs_location; } -/*ARGSUSED*/static Boolean set_values(old,request,self,args,num_args)Widget old;Widget request;Widget self;ArgList args;Cardinal * num_args; +/*ARGSUSED*/static Boolean set_values(Widget old, Widget request, Widget self, ArgList args, Cardinal *num_args) { XtWidgetGeometry reply; int i; @@ -270,7 +269,7 @@ WidgetClass class; } return False; } -/*ARGSUSED*/static void initialize(request,self,args,num_args)Widget request;Widget self;ArgList args;Cardinal * num_args; +/*ARGSUSED*/static void initialize(Widget request, Widget self, ArgList args, Cardinal *num_args) { if (((XfwfBoardWidget)self)->xfwfBoard.location != NULL) { ((XfwfBoardWidget)self)->xfwfBoard.location = XtNewString(((XfwfBoardWidget)self)->xfwfBoard.location); @@ -285,7 +284,7 @@ WidgetClass class; get_core_geometry(self, &((XfwfBoardWidget)self)->core.x, &((XfwfBoardWidget)self)->core.y, &((XfwfBoardWidget)self)->core.width, &((XfwfBoardWidget)self)->core.height); } } -/*ARGSUSED*/static void set_abs_location(self,flags,x,y,w,h)Widget self;unsigned int flags;int x;int y;int w;int h; +/*ARGSUSED*/static void set_abs_location(Widget self, unsigned int flags, int x, int y, int w, int h) { if (flags & ((CWX | CWY | CWWidth | CWHeight) == 0)) return; if (flags & CWX) ((XfwfBoardWidget)self)->core.x = x; @@ -295,7 +294,7 @@ WidgetClass class; set_location(self, flags); generate_location(self); } -/*ARGSUSED*/static void resize(self)Widget self; +/*ARGSUSED*/static void resize(Widget self) { int i; XtWidgetGeometry reply; @@ -308,14 +307,14 @@ WidgetClass class; reply.height, reply.border_width); } } -/*ARGSUSED*/static XtGeometryResult query_geometry(self,request,reply)Widget self;XtWidgetGeometry * request;XtWidgetGeometry * reply; +/*ARGSUSED*/static XtGeometryResult query_geometry(Widget self, XtWidgetGeometry *request, XtWidgetGeometry *reply) { reply->request_mode = CWX | CWY | CWWidth | CWHeight; get_core_geometry(self, &reply->x, &reply->y, &reply->width, &reply->height); return XtGeometryAlmost; } -/*ARGSUSED*/static XtGeometryResult geometry_manager(child,request,reply)Widget child;XtWidgetGeometry * request;XtWidgetGeometry * reply; +/*ARGSUSED*/static XtGeometryResult geometry_manager(Widget child, XtWidgetGeometry *request, XtWidgetGeometry *reply) { Widget self = XtParent(child); { Widget self = XtParent(child); Dimension wd, ht, bw; @@ -333,7 +332,7 @@ WidgetClass class; return XtGeometryDone; } } -/*ARGSUSED*/static void change_managed(self)Widget self; +/*ARGSUSED*/static void change_managed(Widget self) { Widget top = self, w; diff --git a/obm/ObmW/Button.c b/obm/ObmW/Button.c index 2bafbb9..f576b50 100644 --- a/obm/ObmW/Button.c +++ b/obm/ObmW/Button.c @@ -92,13 +92,12 @@ XtInherit_set_label, }; WidgetClass xfwfButtonWidgetClass = (WidgetClass) &xfwfButtonClassRec; /*ARGSUSED*/ -static void activate(self,event,params,num_params)Widget self;XEvent*event;String*params;Cardinal*num_params; +static void activate(Widget self, XEvent *event, String *params, Cardinal *num_params) { XtCallCallbackList(self, ((XfwfButtonWidget)self)->xfwfButton.activate, event); } -static void _resolve_inheritance(class) -WidgetClass class; +static void _resolve_inheritance(WidgetClass class) { XfwfButtonWidgetClass c = (XfwfButtonWidgetClass) class; XfwfButtonWidgetClass super; diff --git a/obm/ObmW/Common.c b/obm/ObmW/Common.c index 6ab5335..d0f8dec 100644 --- a/obm/ObmW/Common.c +++ b/obm/ObmW/Common.c @@ -90,7 +90,7 @@ static void traverse_to_next(Widget,Widget ,Time *); static void traverse_to_prev(Widget,Widget ,Time *); static void traverse_to_next_top(Widget,Widget ,Time *); -/*ARGSUSED*/static Boolean cvtStringToAlignment(display,args,num_args,from,to,converter_data)Display * display;XrmValuePtr args;Cardinal * num_args;XrmValuePtr from;XrmValuePtr to;XtPointer * converter_data; +/*ARGSUSED*/static Boolean cvtStringToAlignment(Display *display, XrmValuePtr args, Cardinal *num_args, XrmValuePtr from, XrmValuePtr to, XtPointer *converter_data) { Alignment a = 0; char c, *t, *s = (char*) from->addr; @@ -122,7 +122,7 @@ static void traverse_to_next_top(Widget,Widget ,Time *); } done(Alignment, a); } -/*ARGSUSED*/static Boolean cvtAlignmentToString(display,args,num_args,from,to,converter_data)Display * display;XrmValuePtr args;Cardinal * num_args;XrmValuePtr from;XrmValuePtr to;XtPointer * converter_data; +/*ARGSUSED*/static Boolean cvtAlignmentToString(Display *display, XrmValuePtr args, Cardinal *num_args, XrmValuePtr from, XrmValuePtr to, XtPointer *converter_data) { Alignment *a = (Alignment*) from->addr; @@ -145,7 +145,7 @@ static void traverse_to_next_top(Widget,Widget ,Time *); default: done(String, "unknown"); } } -/*ARGSUSED*/static void create_bordergc(self)Widget self; +/*ARGSUSED*/static void create_bordergc(Widget self) { XtGCMask mask; XGCValues values; @@ -162,7 +162,7 @@ static void traverse_to_next_top(Widget,Widget ,Time *); } ((XfwfCommonWidget)self)->xfwfCommon.bordergc = XtGetGC(self, mask, &values); } -/*ARGSUSED*/static Boolean traverse_to_direction(self,dir,x,y,found,distance)Widget self;TraversalDirection dir;int x;int y;Widget * found;int * distance; +/*ARGSUSED*/static Boolean traverse_to_direction(Widget self, TraversalDirection dir, int x, int y, Widget *found, int *distance) { int i; Widget child, w; @@ -204,7 +204,7 @@ static void traverse_to_next_top(Widget,Widget ,Time *); *found = self; return True; } -/*ARGSUSED*/static void traverse_to_next(self,current,time)Widget self;Widget current;Time * time; +/*ARGSUSED*/static void traverse_to_next(Widget self, Widget current, Time *time) { int i = 0; Widget parent = XtParent(self); @@ -215,7 +215,7 @@ static void traverse_to_next_top(Widget,Widget ,Time *); if (XtIsSubclass(parent, xfwfCommonWidgetClass)) ((XfwfCommonWidgetClass)parent->core.widget_class)->xfwfCommon_class.traverse(parent, TraverseNext, self, time); } -/*ARGSUSED*/static void traverse_to_prev(self,current,time)Widget self;Widget current;Time * time; +/*ARGSUSED*/static void traverse_to_prev(Widget self, Widget current, Time *time) { int i = 0; Widget parent = XtParent(self); @@ -226,7 +226,7 @@ static void traverse_to_next_top(Widget,Widget ,Time *); if (XtIsSubclass(parent, xfwfCommonWidgetClass)) ((XfwfCommonWidgetClass)parent->core.widget_class)->xfwfCommon_class.traverse(parent, TraversePrev, self, time); } -/*ARGSUSED*/static void traverse_to_next_top(self,current,time)Widget self;Widget current;Time * time; +/*ARGSUSED*/static void traverse_to_next_top(Widget self, Widget current, Time *time) { Widget parent = XtParent(self); @@ -301,7 +301,7 @@ NULL , }; WidgetClass xfwfCommonWidgetClass = (WidgetClass) &xfwfCommonClassRec; /*ARGSUSED*/ -static void focusIn(self,event,params,num_params)Widget self;XEvent*event;String*params;Cardinal*num_params; +static void focusIn(Widget self, XEvent *event, String *params, Cardinal *num_params) { Time time = CurrentTime; @@ -320,7 +320,7 @@ static void focusIn(self,event,params,num_params)Widget self;XEvent*event;String } /*ARGSUSED*/ -static void focusOut(self,event,params,num_params)Widget self;XEvent*event;String*params;Cardinal*num_params; +static void focusOut(Widget self, XEvent *event, String *params, Cardinal *num_params) { if (event->type != FocusOut) XtError("focusOut action may only be bound to FocusOut events"); @@ -331,63 +331,62 @@ static void focusOut(self,event,params,num_params)Widget self;XEvent*event;Strin } /*ARGSUSED*/ -static void traverseDown(self,event,params,num_params)Widget self;XEvent*event;String*params;Cardinal*num_params; +static void traverseDown(Widget self, XEvent *event, String *params, Cardinal *num_params) { ((XfwfCommonWidgetClass)self->core.widget_class)->xfwfCommon_class.traverse(self, TraverseDown, self, &event->xkey.time); } /*ARGSUSED*/ -static void traverseUp(self,event,params,num_params)Widget self;XEvent*event;String*params;Cardinal*num_params; +static void traverseUp(Widget self, XEvent *event, String *params, Cardinal *num_params) { ((XfwfCommonWidgetClass)self->core.widget_class)->xfwfCommon_class.traverse(self, TraverseUp, self, &event->xkey.time); } /*ARGSUSED*/ -static void traverseLeft(self,event,params,num_params)Widget self;XEvent*event;String*params;Cardinal*num_params; +static void traverseLeft(Widget self, XEvent *event, String *params, Cardinal *num_params) { ((XfwfCommonWidgetClass)self->core.widget_class)->xfwfCommon_class.traverse(self, TraverseLeft, self, &event->xkey.time); } /*ARGSUSED*/ -static void traverseRight(self,event,params,num_params)Widget self;XEvent*event;String*params;Cardinal*num_params; +static void traverseRight(Widget self, XEvent *event, String *params, Cardinal *num_params) { ((XfwfCommonWidgetClass)self->core.widget_class)->xfwfCommon_class.traverse(self, TraverseRight, self, &event->xkey.time); } /*ARGSUSED*/ -static void traverseNext(self,event,params,num_params)Widget self;XEvent*event;String*params;Cardinal*num_params; +static void traverseNext(Widget self, XEvent *event, String *params, Cardinal *num_params) { ((XfwfCommonWidgetClass)self->core.widget_class)->xfwfCommon_class.traverse(self, TraverseNext, self, &event->xkey.time); } /*ARGSUSED*/ -static void traversePrev(self,event,params,num_params)Widget self;XEvent*event;String*params;Cardinal*num_params; +static void traversePrev(Widget self, XEvent *event, String *params, Cardinal *num_params) { ((XfwfCommonWidgetClass)self->core.widget_class)->xfwfCommon_class.traverse(self, TraversePrev, self, &event->xkey.time); } /*ARGSUSED*/ -static void traverseNextTop(self,event,params,num_params)Widget self;XEvent*event;String*params;Cardinal*num_params; +static void traverseNextTop(Widget self, XEvent *event, String *params, Cardinal *num_params) { ((XfwfCommonWidgetClass)self->core.widget_class)->xfwfCommon_class.traverse(self, TraverseNextTop, self, &event->xkey.time); } /*ARGSUSED*/ -static void traverseHome(self,event,params,num_params)Widget self;XEvent*event;String*params;Cardinal*num_params; +static void traverseHome(Widget self, XEvent *event, String *params, Cardinal *num_params) { ((XfwfCommonWidgetClass)self->core.widget_class)->xfwfCommon_class.traverse(self, TraverseHome, self, &event->xkey.time); } /*ARGSUSED*/ -static void traverseCurrent(self,event,params,num_params)Widget self;XEvent*event;String*params;Cardinal*num_params; +static void traverseCurrent(Widget self, XEvent *event, String *params, Cardinal *num_params) { Time time = CurrentTime; if (((XfwfCommonWidget)self)->xfwfCommon.traversalOn) (void) ((XfwfCommonWidgetClass)self->core.widget_class)->core_class.accept_focus(self, &time); } -static void _resolve_inheritance(class) -WidgetClass class; +static void _resolve_inheritance(WidgetClass class) { XfwfCommonWidgetClass c = (XfwfCommonWidgetClass) class; XfwfCommonWidgetClass super; @@ -418,7 +417,7 @@ WidgetClass class; if (c->xfwfCommon_class.darker_color == XtInherit_darker_color) c->xfwfCommon_class.darker_color = super->xfwfCommon_class.darker_color; } -/*ARGSUSED*/static void class_initialize() +/*ARGSUSED*/static void class_initialize(void) { static XtConvertArgRec args[] = { { XtWidgetBaseOffset, 0, sizeof(Widget) } }; @@ -431,7 +430,7 @@ WidgetClass class; XtSetTypeConverter(XtRString, "Icon", cvtStringToIcon, args, XtNumber(args), XtCacheNone, NULL); } -/*ARGSUSED*/static void initialize(request,self,args,num_args)Widget request;Widget self;ArgList args;Cardinal * num_args; +/*ARGSUSED*/static void initialize(Widget request, Widget self, ArgList args, Cardinal *num_args) { if (((XfwfCommonWidgetClass)self->core.widget_class)->xfwfCommon_class.traversal_trans == NULL) ((XfwfCommonWidgetClass)self->core.widget_class)->xfwfCommon_class.traversal_trans = XtParseTranslationTable(extraTranslations); @@ -443,7 +442,7 @@ WidgetClass class; ((XfwfCommonWidget)self)->xfwfCommon.bordergc = NULL; create_bordergc(self); } -/*ARGSUSED*/static Boolean set_values(old,request,self,args,num_args)Widget old;Widget request;Widget self;ArgList args;Cardinal * num_args; +/*ARGSUSED*/static Boolean set_values(Widget old, Widget request, Widget self, ArgList args, Cardinal *num_args) { Boolean need_redraw = False; Widget parent = XtParent(self); @@ -472,7 +471,7 @@ WidgetClass class; } return need_redraw; } -/*ARGSUSED*/static void compute_inside(self,x,y,w,h)Widget self;Position * x;Position * y;Dimension * w;Dimension * h; +/*ARGSUSED*/static void compute_inside(Widget self, Position *x, Position *y, Dimension *w, Dimension *h) { *x = ((XfwfCommonWidget)self)->xfwfCommon.highlightThickness; *y = ((XfwfCommonWidget)self)->xfwfCommon.highlightThickness; @@ -482,14 +481,14 @@ WidgetClass class; *h = max(0,((XfwfCommonWidget)self)->core.height - 2 * ((XfwfCommonWidget)self)->xfwfCommon.highlightThickness); } -/*ARGSUSED*/static void expose(self,event,region)Widget self;XEvent * event;Region region; +/*ARGSUSED*/static void expose(Widget self, XEvent *event, Region region) { if (! XtIsRealized(self)) return; if (region != NULL) XSetRegion(XtDisplay(self), ((XfwfCommonWidget)self)->xfwfCommon.bordergc, region); if (((XfwfCommonWidget)self)->xfwfCommon.traversal_focus) ((XfwfCommonWidgetClass)self->core.widget_class)->xfwfCommon_class.highlight_border(self); if (region != NULL) XSetClipMask(XtDisplay(self), ((XfwfCommonWidget)self)->xfwfCommon.bordergc, None); } -/*ARGSUSED*/static void destroy(self)Widget self; +/*ARGSUSED*/static void destroy(Widget self) { Widget parent = XtParent(self); Time time = CurrentTime; @@ -500,7 +499,7 @@ WidgetClass class; ((XfwfCommonWidgetClass)parent->core.widget_class)->xfwfCommon_class.traverse(parent, TraverseHome, self, &time); } } -/*ARGSUSED*/static void highlight_border(self)Widget self; +/*ARGSUSED*/static void highlight_border(Widget self) { XRectangle rect[4]; @@ -528,7 +527,7 @@ WidgetClass class; XFillRectangles(XtDisplay(self), XtWindow(self), ((XfwfCommonWidget)self)->xfwfCommon.bordergc, &rect[0], 4); } -/*ARGSUSED*/static void unhighlight_border(self)Widget self; +/*ARGSUSED*/static void unhighlight_border(Widget self) { if (((XfwfCommonWidget)self)->xfwfCommon.highlightThickness == 0) return; @@ -543,7 +542,7 @@ WidgetClass class; 0, ((XfwfCommonWidget)self)->core.height - ((XfwfCommonWidget)self)->xfwfCommon.highlightThickness, ((XfwfCommonWidget)self)->core.width, ((XfwfCommonWidget)self)->xfwfCommon.highlightThickness, False); } -/*ARGSUSED*/static Boolean accept_focus(self,time)Widget self;Time * time; +/*ARGSUSED*/static Boolean accept_focus(Widget self, Time *time) { int i; @@ -559,7 +558,7 @@ WidgetClass class; } return True; } -/*ARGSUSED*/static Boolean would_accept_focus(self)Widget self; +/*ARGSUSED*/static Boolean would_accept_focus(Widget self) { int i; Widget child; @@ -576,7 +575,7 @@ WidgetClass class; return True; } } -/*ARGSUSED*/static void traverse(self,dir,current,time)Widget self;TraversalDirection dir;Widget current;Time * time; +/*ARGSUSED*/static void traverse(Widget self, TraversalDirection dir, Widget current, Time *time) { Widget w, parent = XtParent(self); Position x, y; @@ -603,7 +602,7 @@ WidgetClass class; XtCallAcceptFocus(w, time); } } -/*ARGSUSED*/static Boolean choose_color(self,factor,base,result)Widget self;double factor;Pixel base;Pixel * result; +/*ARGSUSED*/static Boolean choose_color(Widget self, double factor, Pixel base, Pixel *result) { XColor color1, color2, dummy; @@ -624,17 +623,17 @@ WidgetClass class; *result = color2.pixel; return True; } -/*ARGSUSED*/static Boolean lighter_color(self,base,result)Widget self;Pixel base;Pixel * result; +/*ARGSUSED*/static Boolean lighter_color(Widget self, Pixel base, Pixel *result) { /* return choose_color(self, 1.5, base, result); */ return choose_color(self, 1.25, base, result); } -/*ARGSUSED*/static Boolean darker_color(self,base,result)Widget self;Pixel base;Pixel * result; +/*ARGSUSED*/static Boolean darker_color(Widget self, Pixel base, Pixel *result) { /* return choose_color(self, 0.667, base, result); */ return choose_color(self, 0.500, base, result); } -/*ARGSUSED*/void XfwfCallComputeInside(self,x,y,w,h)Widget self;Position * x;Position * y;Dimension * w;Dimension * h; +/*ARGSUSED*/void XfwfCallComputeInside(Widget self, Position *x, Position *y, Dimension *w, Dimension *h) { if (XtIsSubclass(self, xfwfCommonWidgetClass) && ((XfwfCommonWidgetClass)self->core.widget_class)->xfwfCommon_class.compute_inside) ((XfwfCommonWidgetClass)self->core.widget_class)->xfwfCommon_class.compute_inside(self, x, y, w, h); diff --git a/obm/ObmW/Container.c b/obm/ObmW/Container.c index 00f6396..3135169 100644 --- a/obm/ObmW/Container.c +++ b/obm/ObmW/Container.c @@ -12,7 +12,7 @@ #define UnspecifiedPixmap (Pixmap)2 #define UndefinedGC (GC)2 -static void InsPixel(); +static void InsPixel(Widget w, int off, XrmValue *value); static XtResource resources[] = { #define offset(field) XtOffsetOf(ContainerRec, container.field) @@ -58,10 +58,7 @@ static XtResource resources[] = { } }; -static void InsPixel(w, off, value) - Widget w; - int off; - XrmValue *value; +static void InsPixel(Widget w, int off, XrmValue *value) { ContainerWidget p = (ContainerWidget) w; static Pixel pixel; @@ -80,14 +77,14 @@ static void InsPixel(w, off, value) #undef offset -static void ClassInitialize(); -static void ClassPartInitialize(); -static void initialize(); -static void realize(); -static void destroy(); -static void Redisplay(); +static void ClassInitialize(void); +static void ClassPartInitialize(WidgetClass widget_class); +static void initialize(Widget request, Widget new, ArgList args, Cardinal *num_args); +static void realize(Widget w, Mask *valueMask, XSetWindowAttributes *attributes); +static void destroy(Widget w); +static void Redisplay(Widget gw, XEvent *event, Region region); -static Boolean SetValues(); +static Boolean SetValues(Widget current, Widget request, Widget new, ArgList args, Cardinal *num_args); /*static XtGeometryResult query_geometry();*/ /*static XtGeometryResult geometry_manager();*/ @@ -156,21 +153,17 @@ ContainerClassRec containerClassRec = { WidgetClass containerWidgetClass = (WidgetClass)&containerClassRec; static void -ClassInitialize() +ClassInitialize(void) { } static void -ClassPartInitialize(widget_class) - WidgetClass widget_class; +ClassPartInitialize(WidgetClass widget_class) { } /* ARGSUSED */ -static void initialize(request, new, args, num_args) - Widget request, new; - ArgList args; - Cardinal *num_args; +static void initialize(Widget request, Widget new, ArgList args, Cardinal *num_args) { ContainerWidget sw = (ContainerWidget)new; ContainerPart* cp = (ContainerPart*)&(sw->container); @@ -202,8 +195,7 @@ static void initialize(request, new, args, num_args) cp->background_GC = AllocGCFromPixel (new, new->core.background_pixel); } -static void destroy(w) - Widget w; +static void destroy(Widget w) { ContainerWidget c = (ContainerWidget)w; @@ -213,19 +205,13 @@ static void destroy(w) } -static void realize(w, valueMask, attributes) - Widget w; - Mask *valueMask; - XSetWindowAttributes *attributes; +static void realize(Widget w, Mask *valueMask, XSetWindowAttributes *attributes) { (*coreClassRec.core_class.realize) (w, valueMask, attributes); } /* ARGSUSED */ -static Boolean SetValues(current, request, new, args, num_args) - Widget current, request, new; - ArgList args; - Cardinal *num_args; +static Boolean SetValues(Widget current, Widget request, Widget new, ArgList args, Cardinal *num_args) { ContainerWidget s_old = (ContainerWidget) current; ContainerWidget s_new = (ContainerWidget) new; @@ -275,10 +261,10 @@ static Boolean SetValues(current, request, new, args, num_args) /* ARGSUSED */ -static void Redisplay(gw, event, region) - Widget gw; - XEvent *event; /* unused */ - Region region; /* unused */ +static void Redisplay(Widget gw, XEvent *event, Region region) + + /* unused */ + /* unused */ { ContainerWidget c = (ContainerWidget) gw; @@ -296,9 +282,7 @@ static void Redisplay(gw, event, region) } -void _XawQueryGeometry (widget, reply_return) - Widget widget; - XtWidgetGeometry *reply_return; +void _XawQueryGeometry (Widget widget, XtWidgetGeometry *reply_return) { XtGeometryResult result; String subs[1]; diff --git a/obm/ObmW/DrawIString.c b/obm/ObmW/DrawIString.c index 0032799..481322d 100644 --- a/obm/ObmW/DrawIString.c +++ b/obm/ObmW/DrawIString.c @@ -10,15 +10,7 @@ * counterpart. */ void -XfwfDrawImageString(display, drawable, gc, x, y, string, length, tabs) - Display *display; - Drawable drawable; - GC gc; - int x; - int y; - String string; - int length; - int *tabs; +XfwfDrawImageString(Display *display, Drawable drawable, GC gc, int x, int y, String string, int length, int *tabs) { char *p, *ep; int tx, tab; diff --git a/obm/ObmW/DrawString.c b/obm/ObmW/DrawString.c index 2a58e68..af2100f 100644 --- a/obm/ObmW/DrawString.c +++ b/obm/ObmW/DrawString.c @@ -10,15 +10,7 @@ * counterpart. */ void -XfwfDrawString(display, drawable, gc, x, y, string, length, tabs) - Display *display; - Drawable drawable; - GC gc; - int x; - int y; - String string; - int length; - int *tabs; +XfwfDrawString(Display *display, Drawable drawable, GC gc, int x, int y, String string, int length, int *tabs) { char *p, *ep; int tx, tab; diff --git a/obm/ObmW/DrawingArea.c b/obm/ObmW/DrawingArea.c index 268d429..1a0e724 100644 --- a/obm/ObmW/DrawingArea.c +++ b/obm/ObmW/DrawingArea.c @@ -19,11 +19,11 @@ /* Private Definitions */ -static void ClassInitialize(), ClassPartInitialize(), Initialize(), Resize(); +static void ClassInitialize(void), ClassPartInitialize(WidgetClass class), Initialize(Widget request, Widget new, ArgList args, Cardinal *num_args), Resize(Widget w); static void ConstraintInitialize(); -static Boolean SetValues(), ConstraintSetValues(); -static XtGeometryResult GeometryManager(), PreferredGeometry(); -static void ChangeManaged(); +static Boolean SetValues(Widget current, Widget request, Widget new, ArgList args, Cardinal *num_args), ConstraintSetValues(Widget current, Widget request, Widget new, ArgList args, Cardinal *num_args); +static XtGeometryResult GeometryManager(Widget w, XtWidgetGeometry *request, XtWidgetGeometry *reply), PreferredGeometry(Widget widget, XtWidgetGeometry *request, XtWidgetGeometry *reply); +static void ChangeManaged(Widget w); DrawingAreaClassRec drawingAreaClassRec = { { /* core_class fields */ @@ -89,28 +89,23 @@ WidgetClass drawingAreaWidgetClass = (WidgetClass)&drawingAreaClassRec; * ****************************************************************/ -static void ClassInitialize() +static void ClassInitialize(void) { } -static void ClassPartInitialize(class) - WidgetClass class; +static void ClassPartInitialize(WidgetClass class) { } /* ARGSUSED */ -static void Initialize(request, new, args, num_args) - Widget request, new; - ArgList args; - Cardinal *num_args; +static void Initialize(Widget request, Widget new, ArgList args, Cardinal *num_args) { /* DrawingAreaWidget daw = (DrawingAreaWidget)new; */ } -static void Resize(w) - Widget w; +static void Resize(Widget w) { /* DrawingAreaWidget daw = (DrawingAreaWidget)w; @@ -124,10 +119,10 @@ static void Resize(w) /* ARGSUSED */ -static XtGeometryResult GeometryManager(w, request, reply) - Widget w; - XtWidgetGeometry *request; - XtWidgetGeometry *reply; /* RETURN */ +static XtGeometryResult GeometryManager(Widget w, XtWidgetGeometry *request, XtWidgetGeometry *reply) + + + /* RETURN */ { /* Dimension old_width, old_height; @@ -141,20 +136,14 @@ static XtGeometryResult GeometryManager(w, request, reply) /* ARGSUSED */ -static Boolean SetValues(current, request, new, args, num_args) - Widget current, request, new; - ArgList args; - Cardinal *num_args; +static Boolean SetValues(Widget current, Widget request, Widget new, ArgList args, Cardinal *num_args) { return( FALSE ); } /*ARGSUSED*/ -static Boolean ConstraintSetValues(current, request, new, args, num_args) - Widget current, request, new; - ArgList args; - Cardinal *num_args; +static Boolean ConstraintSetValues(Widget current, Widget request, Widget new, ArgList args, Cardinal *num_args) { /* DrawingAreaConstraints cfc = @@ -165,8 +154,7 @@ static Boolean ConstraintSetValues(current, request, new, args, num_args) return( FALSE ); } -static void ChangeManaged(w) - Widget w; +static void ChangeManaged(Widget w) { /* DrawingAreaWidget daw = (DrawingAreaWidget)w; @@ -178,9 +166,7 @@ static void ChangeManaged(w) } -static XtGeometryResult PreferredGeometry( widget, request, reply ) - Widget widget; - XtWidgetGeometry *request, *reply; +static XtGeometryResult PreferredGeometry(Widget widget, XtWidgetGeometry *request, XtWidgetGeometry *reply) { /* DrawingAreaWidget w = (DrawingAreaWidget)widget; diff --git a/obm/ObmW/Frame.c b/obm/ObmW/Frame.c index 341c1cc..dde2d79 100644 --- a/obm/ObmW/Frame.c +++ b/obm/ObmW/Frame.c @@ -49,7 +49,7 @@ static void compute_topcolor(Widget,int ,XrmValue *); static void compute_bottomcolor(Widget,int ,XrmValue * ); -/*ARGSUSED*/static void create_darkgc(self)Widget self; +/*ARGSUSED*/static void create_darkgc(Widget self) { XtGCMask mask; XGCValues values; @@ -82,7 +82,7 @@ static void compute_bottomcolor(Widget,int ,XrmValue * } ((XfwfFrameWidget)self)->xfwfFrame.darkgc = XtGetGC(self, mask, &values); } -/*ARGSUSED*/static void create_lightgc(self)Widget self; +/*ARGSUSED*/static void create_lightgc(Widget self) { XtGCMask mask; XGCValues values; @@ -115,13 +115,13 @@ static void compute_bottomcolor(Widget,int ,XrmValue * } ((XfwfFrameWidget)self)->xfwfFrame.lightgc = XtGetGC(self, mask, &values); } -/*ARGSUSED*/static void compute_topcolor(self,offset,value)Widget self;int offset;XrmValue * value; +/*ARGSUSED*/static void compute_topcolor(Widget self, int offset, XrmValue *value) { static Pixel color; ((XfwfFrameWidgetClass)self->core.widget_class)->xfwfCommon_class.lighter_color(self, ((XfwfFrameWidget)self)->core.background_pixel, &color); value->addr = (XtPointer) &color; } -/*ARGSUSED*/static void compute_bottomcolor(self,offset,value)Widget self;int offset;XrmValue * value; +/*ARGSUSED*/static void compute_bottomcolor(Widget self, int offset, XrmValue *value) { static Pixel color; ((XfwfFrameWidgetClass)self->core.widget_class)->xfwfCommon_class.darker_color(self, ((XfwfFrameWidget)self)->core.background_pixel, &color); @@ -201,7 +201,7 @@ NULL , }; WidgetClass xfwfFrameWidgetClass = (WidgetClass) &xfwfFrameClassRec; /*ARGSUSED*/ -static void set_shadow(self,event,params,num_params)Widget self;XEvent*event;String*params;Cardinal*num_params; +static void set_shadow(Widget self, XEvent *event, String *params, Cardinal *num_params) { Position x, y; Dimension w, h; @@ -223,8 +223,7 @@ static void set_shadow(self,event,params,num_params)Widget self;XEvent*event;Str } } -static void _resolve_inheritance(class) -WidgetClass class; +static void _resolve_inheritance(WidgetClass class) { XfwfFrameWidgetClass c = (XfwfFrameWidgetClass) class; XfwfFrameWidgetClass super; @@ -239,7 +238,7 @@ WidgetClass class; if (class == xfwfFrameWidgetClass) return; super = (XfwfFrameWidgetClass)class->core_class.superclass; } -/*ARGSUSED*/static void class_initialize() +/*ARGSUSED*/static void class_initialize(void) { static XtConvertArgRec screenArg[] = { {XtBaseOffset, (XtPointer)XtOffset(Widget, core.screen), sizeof(Screen*)}}; @@ -257,13 +256,13 @@ WidgetClass class; XtSetTypeConverter(XtRShadowScheme, XtRString, cvtShadowSchemeToString, NULL, 0, XtCacheNone, NULL); } -/*ARGSUSED*/static void initialize(request,self,args,num_args)Widget request;Widget self;ArgList args;Cardinal * num_args; +/*ARGSUSED*/static void initialize(Widget request, Widget self, ArgList args, Cardinal *num_args) { ((XfwfFrameWidget)self)->xfwfFrame.lightgc = NULL; ((XfwfFrameWidget)self)->xfwfFrame.darkgc = NULL; ((XfwfFrameWidget)self)->xfwfFrame.old_frame_type = ((XfwfFrameWidget)self)->xfwfFrame.frameType; } -/*ARGSUSED*/static void realize(self,mask,attributes)Widget self;XtValueMask * mask;XSetWindowAttributes * attributes; +/*ARGSUSED*/static void realize(Widget self, XtValueMask *mask, XSetWindowAttributes *attributes) { #ifdef USE_CWCURSOR *mask |= CWCursor; @@ -280,7 +279,7 @@ WidgetClass class; create_lightgc(self); create_darkgc(self); } -/*ARGSUSED*/static Boolean set_values(old,request,self,args,num_args)Widget old;Widget request;Widget self;ArgList args;Cardinal * num_args; +/*ARGSUSED*/static Boolean set_values(Widget old, Widget request, Widget self, ArgList args, Cardinal *num_args) { Boolean need_redisplay = False; @@ -332,7 +331,7 @@ WidgetClass class; return need_redisplay; } -/*ARGSUSED*/static void expose(self,event,region)Widget self;XEvent * event;Region region; +/*ARGSUSED*/static void expose(Widget self, XEvent *event, Region region) { Position x, y; Dimension w, h; @@ -351,7 +350,7 @@ WidgetClass class; } xfwfCommonClassRec.core_class.expose(self, event, region); } -/*ARGSUSED*/static void compute_inside(self,x,y,w,h)Widget self;Position * x;Position * y;Dimension * w;Dimension * h; +/*ARGSUSED*/static void compute_inside(Widget self, Position *x, Position *y, Dimension *w, Dimension *h) { int ww, hh; /* DCT */ @@ -378,7 +377,7 @@ WidgetClass class; *h -= 2 * (((XfwfFrameWidget)self)->xfwfFrame.outerOffset + ((XfwfFrameWidget)self)->xfwfFrame.frameWidth + ((XfwfFrameWidget)self)->xfwfFrame.innerOffset); } -/*ARGSUSED*/static XtGeometryResult query_geometry(self,request,reply)Widget self;XtWidgetGeometry * request;XtWidgetGeometry * reply; +/*ARGSUSED*/static XtGeometryResult query_geometry(Widget self, XtWidgetGeometry *request, XtWidgetGeometry *reply) { XtWidgetGeometry request2, reply2; XtGeometryResult result; @@ -420,7 +419,7 @@ WidgetClass class; reply->stack_mode = reply2.stack_mode; return XtGeometryAlmost; } -/*ARGSUSED*/static XtGeometryResult geometry_manager(child,request,reply)Widget child;XtWidgetGeometry * request;XtWidgetGeometry * reply; +/*ARGSUSED*/static XtGeometryResult geometry_manager(Widget child, XtWidgetGeometry *request, XtWidgetGeometry *reply) { Widget self = XtParent(child); { XtWidgetGeometry request2, reply2; XtGeometryResult result; @@ -443,7 +442,7 @@ WidgetClass class; return XtGeometryAlmost; } } -/*ARGSUSED*/static void resize(self)Widget self; +/*ARGSUSED*/static void resize(Widget self) { Position x, y; Dimension w, h; @@ -456,7 +455,7 @@ WidgetClass class; h -= 2 * ((XfwfFrameWidget)child)->core.border_width; XtConfigureWidget(child, x, y, w, h, ((XfwfFrameWidget)child)->core.border_width); } -/*ARGSUSED*/static void change_managed(self)Widget self; +/*ARGSUSED*/static void change_managed(Widget self) { XtWidgetGeometry request2, reply2; XtGeometryResult result; @@ -476,7 +475,7 @@ WidgetClass class; h -= 2 * ((XfwfFrameWidget)child)->core.border_width; XtConfigureWidget(child, x, y, w, h, ((XfwfFrameWidget)child)->core.border_width); } -/*ARGSUSED*/void XfwfDrawFrame(self,x,y,w,h,tp,t,lightgc,darkgc)Widget self;int x;int y;int w;int h;FrameType tp;int t;GC lightgc;GC darkgc; +/*ARGSUSED*/void XfwfDrawFrame(Widget self, int x, int y, int w, int h, FrameType tp, int t, GC lightgc, GC darkgc) { XPoint tlPoints[7], brPoints[7]; @@ -523,7 +522,7 @@ WidgetClass class; } } -/*ARGSUSED*/Boolean cvtStringToFrameType(display,args,num_args,from,to,converter_data)Display * display;XrmValuePtr args;Cardinal * num_args;XrmValuePtr from;XrmValuePtr to;XtPointer * converter_data; +/*ARGSUSED*/Boolean cvtStringToFrameType(Display *display, XrmValuePtr args, Cardinal *num_args, XrmValuePtr from, XrmValuePtr to, XtPointer *converter_data) { String s = (String) from->addr; @@ -541,7 +540,7 @@ WidgetClass class; XtDisplayStringConversionWarning(display, s, XtRFrameType); done(FrameType, XfwfRaised); } -/*ARGSUSED*/Boolean cvtFrameTypeToString(display,args,num_args,from,to,converter_data)Display * display;XrmValuePtr args;Cardinal * num_args;XrmValuePtr from;XrmValuePtr to;XtPointer * converter_data; +/*ARGSUSED*/Boolean cvtFrameTypeToString(Display *display, XrmValuePtr args, Cardinal *num_args, XrmValuePtr from, XrmValuePtr to, XtPointer *converter_data) { if (*num_args != 0) XtAppErrorMsg(XtDisplayToApplicationContext(display), @@ -557,7 +556,7 @@ WidgetClass class; default: XtError("Illegal FrameType"); } } -/*ARGSUSED*/Boolean cvtStringToShadowScheme(display,args,num_args,from,to,converter_data)Display * display;XrmValuePtr args;Cardinal * num_args;XrmValuePtr from;XrmValuePtr to;XtPointer * converter_data; +/*ARGSUSED*/Boolean cvtStringToShadowScheme(Display *display, XrmValuePtr args, Cardinal *num_args, XrmValuePtr from, XrmValuePtr to, XtPointer *converter_data) { String s = (String) from->addr; @@ -574,7 +573,7 @@ WidgetClass class; XtDisplayStringConversionWarning(display, s, XtRShadowScheme); done(ShadowScheme, XfwfAuto); } -/*ARGSUSED*/Boolean cvtShadowSchemeToString(display,args,num_args,from,to,converter_data)Display * display;XrmValuePtr args;Cardinal * num_args;XrmValuePtr from;XrmValuePtr to;XtPointer * converter_data; +/*ARGSUSED*/Boolean cvtShadowSchemeToString(Display *display, XrmValuePtr args, Cardinal *num_args, XrmValuePtr from, XrmValuePtr to, XtPointer *converter_data) { if (*num_args != 0) XtAppErrorMsg(XtDisplayToApplicationContext(display), diff --git a/obm/ObmW/Group.c b/obm/ObmW/Group.c index 21ccd5b..02f9718 100644 --- a/obm/ObmW/Group.c +++ b/obm/ObmW/Group.c @@ -39,7 +39,7 @@ static void set_toggles(Widget); static Boolean cvtStringToSelectionType(Display *,XrmValuePtr ,Cardinal *,XrmValuePtr ,XrmValuePtr ,XtPointer *); static Boolean cvtSelectionTypeToString(Display *,XrmValuePtr ,Cardinal *,XrmValuePtr ,XrmValuePtr ,XtPointer *); -/*ARGSUSED*/static void make_textgc(self)Widget self; +/*ARGSUSED*/static void make_textgc(Widget self) { XtGCMask mask; XGCValues values; @@ -51,7 +51,7 @@ static Boolean cvtSelectionTypeToString(Display *,XrmValuePtr ,Cardinal *,XrmVa mask = GCFont | GCBackground | GCForeground; ((XfwfGroupWidget)self)->xfwfGroup.textgc = XtGetGC(self, mask, &values); } -/*ARGSUSED*/static void on_cb(toggle,client_data,call_data)Widget toggle;XtPointer client_data;XtPointer call_data; +/*ARGSUSED*/static void on_cb(Widget toggle, XtPointer client_data, XtPointer call_data) { Widget self = XtParent(toggle); Cardinal toggle_ord = (Cardinal) client_data; @@ -78,7 +78,7 @@ static Boolean cvtSelectionTypeToString(Display *,XrmValuePtr ,Cardinal *,XrmVa } XtCallCallbackList(self, ((XfwfGroupWidget)self)->xfwfGroup.activate, (XtPointer) ((XfwfGroupWidget)self)->xfwfGroup.selection); } -/*ARGSUSED*/static void off_cb(toggle,client_data,call_data)Widget toggle;XtPointer client_data;XtPointer call_data; +/*ARGSUSED*/static void off_cb(Widget toggle, XtPointer client_data, XtPointer call_data) { Widget self = XtParent(toggle); Cardinal toggle_ord = (Cardinal) client_data; @@ -98,7 +98,7 @@ static Boolean cvtSelectionTypeToString(Display *,XrmValuePtr ,Cardinal *,XrmVa } XtCallCallbackList(self, ((XfwfGroupWidget)self)->xfwfGroup.activate, (XtPointer) ((XfwfGroupWidget)self)->xfwfGroup.selection); } -/*ARGSUSED*/static void set_toggles(self)Widget self; +/*ARGSUSED*/static void set_toggles(Widget self) { Cardinal i, t; @@ -119,7 +119,7 @@ static Boolean cvtSelectionTypeToString(Display *,XrmValuePtr ,Cardinal *,XrmVa t++; } } -/*ARGSUSED*/static Boolean cvtStringToSelectionType(display,args,num_args,from,to,converter_data)Display * display;XrmValuePtr args;Cardinal * num_args;XrmValuePtr from;XrmValuePtr to;XtPointer * converter_data; +/*ARGSUSED*/static Boolean cvtStringToSelectionType(Display *display, XrmValuePtr args, Cardinal *num_args, XrmValuePtr from, XrmValuePtr to, XtPointer *converter_data) { String s = (String) from->addr; @@ -146,7 +146,7 @@ static Boolean cvtSelectionTypeToString(Display *,XrmValuePtr ,Cardinal *,XrmVa XtDisplayStringConversionWarning(display, s, XtRSelectionType); done(SelectionType, XfwfSingleSelection); } -/*ARGSUSED*/static Boolean cvtSelectionTypeToString(display,args,num_args,from,to,converter_data)Display * display;XrmValuePtr args;Cardinal * num_args;XrmValuePtr from;XrmValuePtr to;XtPointer * converter_data; +/*ARGSUSED*/static Boolean cvtSelectionTypeToString(Display *display, XrmValuePtr args, Cardinal *num_args, XrmValuePtr from, XrmValuePtr to, XtPointer *converter_data) { char s[30]; @@ -244,8 +244,7 @@ XtInherit_layout, }, }; WidgetClass xfwfGroupWidgetClass = (WidgetClass) &xfwfGroupClassRec; -static void _resolve_inheritance(class) -WidgetClass class; +static void _resolve_inheritance(WidgetClass class) { XfwfGroupWidgetClass c = (XfwfGroupWidgetClass) class; XfwfGroupWidgetClass super; @@ -260,7 +259,7 @@ WidgetClass class; if (class == xfwfGroupWidgetClass) return; super = (XfwfGroupWidgetClass)class->core_class.superclass; } -/*ARGSUSED*/static void class_initialize() +/*ARGSUSED*/static void class_initialize(void) { XtAddConverter(XtRString, XtRLong, XmuCvtStringToLong, NULL, 0); XtSetTypeConverter(XtRLong, XtRString, XfwfCvtLongToString, @@ -270,7 +269,7 @@ WidgetClass class; XtSetTypeConverter(XtRSelectionType, XtRString, cvtSelectionTypeToString, NULL, 0, XtCacheNone, NULL); } -/*ARGSUSED*/static void initialize(request,self,args,num_args)Widget request;Widget self;ArgList args;Cardinal * num_args; +/*ARGSUSED*/static void initialize(Widget request, Widget self, ArgList args, Cardinal *num_args) { ((XfwfGroupWidget)self)->xfwfGroup.toggle_ord = 0; ((XfwfGroupWidget)self)->xfwfGroup.textgc = NULL; @@ -281,7 +280,7 @@ WidgetClass class; ((XfwfGroupWidget)self)->xfwfGroup.selection = 0; } } -/*ARGSUSED*/static Boolean set_values(old,request,self,args,num_args)Widget old;Widget request;Widget self;ArgList args;Cardinal * num_args; +/*ARGSUSED*/static Boolean set_values(Widget old, Widget request, Widget self, ArgList args, Cardinal *num_args) { Boolean need_redraw = False; @@ -302,7 +301,7 @@ WidgetClass class; } return need_redraw; } -/*ARGSUSED*/static void expose(self,event,region)Widget self;XEvent * event;Region region; +/*ARGSUSED*/static void expose(Widget self, XEvent *event, Region region) { Dimension w, h; Position x, y; @@ -313,7 +312,7 @@ WidgetClass class; XDrawImageString(XtDisplay(self), XtWindow(self), ((XfwfGroupWidget)self)->xfwfGroup.textgc, x + 3, y - ((XfwfGroupWidget)self)->xfwfFrame.innerOffset, ((XfwfGroupWidget)self)->xfwfGroup.label, strlen(((XfwfGroupWidget)self)->xfwfGroup.label)); } -/*ARGSUSED*/static void insert_child(child)Widget child; +/*ARGSUSED*/static void insert_child(Widget child) { Widget self = XtParent(child); { xfwfRowColClassRec.composite_class.insert_child(child); if (((XfwfGroupWidget)self)->xfwfGroup.selectionStyle != XfwfNoSelection diff --git a/obm/ObmW/Gterm.c b/obm/ObmW/Gterm.c index 7b135dd..3f7756a 100644 --- a/obm/ObmW/Gterm.c +++ b/obm/ObmW/Gterm.c @@ -507,55 +507,93 @@ static int num_static_colors = 27; static int colormap_focus = 512; -/* extern void HandlePopupMenu(); */ -static Boolean SetValues(); -static void Initialize(), Realize(), Destroy(), Redisplay(), Resize(); -static void HandleIgnore(), HandleGraphicsInput(), HandleDisplayCrosshair(); -static void HandleSoftReset(), HandleGraphicsContext(); -static void HandleEnterWindow(), HandleLeaveWindow(); -static void color_crosshair(), color_ginmodeCursor(); -static void HandleTrackCursor(); -static void savepos(), blink_cursor(); -static void mp_linkafter(), mp_unlink(); - -Marker GmSelect(); -void GmRedisplay(), GmRaise(), GmLower(), GmSetVertices(); -void GtReadIomap(), GtClearScreen(), GtSetCursorPos(), GtSetCursorType(); -void GtRasterInit(), GtDestroyRaster(); -static void draw_crosshair(); -void initialize_shadow_pixmap(); -static void M_create(), GtMarkerFree(); -static void gm_focusin(), gm_focusout(), gm_refocus(); -static void gm_request_translations(), gm_load_translations(); -static int gm_curpos(); - -static void set_default_color_index(); -static void inherit_default_colormap(); -static void update_default_colormap(); -static void update_transients(), update_cursor(); -static void request_colormap_focus(), restore_colormap_focus(); -static int refresh_source(), refresh_destination(); -static int get_regions(); -static int get_rects(); -static void scale_zoom(), scale_intzoom(), scale_boxcar(); -static void lw_convolve(); -static void bx_boxcar(), bx_extract(), bx_interp(); -static void mf_getpixel(), mf_getinten(); -static void scale_lowpass(), scale_nearest(), scale_bilinear(); -static void save_mapping(), load_mapping(), get_pixel_mapping(); -static void update_mapping(), free_mapping(); -static int valid_mapping(), rect_intersect(); -static void initialize_mapping(), draw_crosshair(), erase_crosshair(); -static DrawContext get_draw_context(); -static void invalidate_draw_context(); -static XPoint *mapVector(); -static Colormap get_colormap(); -static Cursor get_cursor(); -static void init_iomap(), init_global_cmap(), invalidate_cmap(); -static void initColorResources (); -static void gm_rotate_indicator(); /* MF020 */ -static Pixel get_pixel(), *get_cmap_in(), *get_cmap_out(); -static Pixel ColorNameToPixel (); +static Boolean SetValues(Widget current, Widget request, Widget set); +static void Initialize(Widget request, Widget new); +static void Realize(Widget gw, XtValueMask *valueMask, XSetWindowAttributes *attrs); +static void Destroy(Widget gw); +static void Redisplay(Widget gw, XEvent *event, Region region); +static void Resize(Widget gw); +static void HandleIgnore(Widget widget, XEvent *event, String *params, Cardinal *param_count); +static void HandleGraphicsInput(Widget widget, XEvent *event, String *params, Cardinal *param_count); +static void HandleDisplayCrosshair(Widget widget, XEvent *event, String *params, Cardinal *nparams); +static void HandleSoftReset(Widget widget, XEvent *event, String *params, Cardinal *param_count); +static void HandleEnterWindow(Widget widget, XEvent *event, String *params, Cardinal *param_count); +static void HandleLeaveWindow(Widget widget, XEvent *event, String *params, Cardinal *param_count); +static void color_crosshair(GtermWidget w); +static void color_ginmodeCursor(GtermWidget w); +static void HandleTrackCursor(Widget widget, XEvent *event, String *params, Cardinal *param_count); +static void savepos(GtermWidget w, XEvent *event); +static void blink_cursor(GtermWidget w, XtIntervalId *id); +static void mp_linkafter(GtermWidget w, Mapping mp, Mapping ref_mp); +static void mp_unlink(GtermWidget w, Mapping mp); + +Marker GmSelect(GtermWidget w, int x, int y, GmSelection what); +void GmRedisplay(GtermWidget w, Region region); +void GmRaise(struct marker *gm, struct marker *ref_gm); +void GmLower(struct marker *gm, struct marker *ref_gm); +void GmSetVertices(struct marker *gm, DPoint *points, int first, int npts); +void GtReadIomap(GtermWidget w, ushort *iomap, int first, int nelem); +void GtClearScreen(GtermWidget w); +void GtSetCursorPos(GtermWidget w, int x, int y); +void GtSetCursorType(GtermWidget w, int type); +void GtRasterInit(GtermWidget w); +void GtDestroyRaster(GtermWidget w, int raster); +void initialize_shadow_pixmap(GtermWidget w, int dst); +static void M_create(Widget widget, XEvent *event, String *params, Cardinal *nparams); +static void GtMarkerFree(GtermWidget w); +static void gm_focusin(GtermWidget w, struct marker *gm, GmSelection what); +static void gm_focusout(GtermWidget w, int enableSetTrans); +static void gm_refocus(GtermWidget w); +static void gm_request_translations(GtermWidget w, struct marker *gm); +static void gm_load_translations(GtermWidget w, XtIntervalId id); + +static void set_default_color_index(GtermWidget w); +static void inherit_default_colormap(GtermWidget w); +static void update_default_colormap(GtermWidget w); +static void update_transients(GtermWidget w, Region region); +static void update_cursor(GtermWidget w); +static void request_colormap_focus(GtermWidget w); +static void restore_colormap_focus(GtermWidget w); +static int refresh_source(GtermWidget w, Mapping mp, int x1, int y1, int nx, int ny); +static int refresh_destination(GtermWidget w, Mapping mp, int x1, int y1, int nx, int ny); +static int get_regions(int *xs, int *xe, int *xv, int max_regions, int dx, int dnx, int *xmap, int alt_dx, int alt_dnx, int *alt_xmap); +static int get_rects(XRectangle *o_rl, int max_rects, int *xs, int *xe, int *xv, int nx, int *ys, int *ye, int *yv, int ny, int xcond, int ycond); +static void scale_zoom(uchar *idata, int ibpl, uchar *odata, int obpl, int *xmap, int *ymap, int dx, int dy, int dnx, int dny, Region clip_region); +static void scale_intzoom(uchar *idata, int ibpl, uchar *odata, int obpl, int sx, int sy, int dx, int dy, int dnx, int dny, int xflip, int yflip, int nx, int ny); +static void scale_boxcar(uchar *idata, int inx, int iny, int ibpl, uchar *odata, int onx, int ony, int obpl, float *x_src, float *y_src, int sx, int sy, int snx, int sny, int dx, int dy, int dnx, int dny, float xscale, float yscale, int interp, Region clip_region); +static void lw_convolve(uchar *idata, int inx, int iny, int ix, int iy, int ibpl, uchar *odata, int onx, int ony, int ox, int oy, int obpl, int nx, int ny, float xscale, float yscale); +static void bx_boxcar(uchar *idata, int inx, int iny, int ibpl, int x1, int y1, int x2, int y2, uchar *obuf, int xblock, int yblock); +static void bx_extract(uchar *idata, int inx, int iny, int ibpl, uchar *odata, int onx, int ony, int obpl, float *x_src, float *y_src, int dx, int dy, int dnx, int dny, int xoff, int yoff, float xstep, float ystep, Region clip_region); +static void bx_interp(uchar *idata, int inx, int iny, int ibpl, uchar *odata, int onx, int ony, int obpl, float *x_src, float *y_src, int xoff, int yoff, float xstep, float ystep, int dx, int dy, int dnx, int dny, Region clip_region); +static void mf_getpixel(GtermWidget w, uchar *idata, int inx, int iny, int ibpl, int sx, int sy, uchar *odata, int onx, int ony, int obpl, int dx, int dy, int nx, int ny); +static void mf_getinten(GtermWidget w, uchar *idata, int inx, int iny, int ibpl, int sx, int sy, uchar *odata, int onx, int ony, int obpl, int dx, int dy, int nx, int ny); +static void scale_lowpass(uchar *idata, int inx, int iny, int ibpl, uchar *odata, int onx, int ony, int obpl, float *x_src, float *y_src, int sx, int sy, int snx, int sny, int dx, int dy, int dnx, int dny, float xscale, float yscale, Region clip_region); +static void scale_nearest(uchar *idata, int inx, int iny, int ibpl, uchar *odata, int onx, int ony, int obpl, float *x_src, float *y_src, int dx, int dy, int dnx, int dny, Region clip_region); +static void scale_bilinear(uchar *idata, int inx, int iny, int ibpl, uchar *odata, int onx, int ony, int obpl, float *x_src, float *y_src, int dx, int dy, int dnx, int dny, Region clip_region); +static void save_mapping(Mapping mp, int mapping, int rop, int src, int st, int sx, int sy, int sw, int sh, int dst, int dt, int dx, int dy, int dw, int dh); +static void load_mapping(Mapping mp, int *mapping, int *rop, int *src, int *st, int *sx, int *sy, int *sw, int *sh, int *dst, int *dt, int *dx, int *dy, int *dw, int *dh); +static void get_pixel_mapping(GtermWidget w, Mapping mp1, Mapping mp2, int update); +static void update_mapping(GtermWidget w, Mapping mp); +static void free_mapping(GtermWidget w, Mapping mp); +static int valid_mapping(GtermWidget w, Mapping mp); +static int rect_intersect(XRectangle *in, XRectangle *r1, XRectangle *r2); +static void initialize_mapping(Mapping mp); +static void draw_crosshair(GtermWidget w, int x, int y); +static void erase_crosshair(GtermWidget w); +static DrawContext get_draw_context(GtermWidget w); +static void invalidate_draw_context(GtermWidget w); +static XPoint *mapVector(MappingContext mx, XPoint *pv1, XPoint *pv2, int npts); +static Colormap get_colormap(GtermWidget w); +static Cursor get_cursor(GtermWidget w, String cursor_name); +static void init_iomap(GtermWidget w); +static void init_global_cmap(void); +static void invalidate_cmap(GtermWidget w); +static void initColorResources (GtermWidget w); +static void gm_rotate_indicator(struct marker *gm, int function); /* MF020 */ +static Pixel get_pixel(GtermWidget w, int client_pixel); +static Pixel *get_cmap_in(GtermWidget w); +static Pixel *get_cmap_out(GtermWidget w); +static Pixel ColorNameToPixel (GtermWidget w, String str); /* Global Colormap declarations. @@ -572,23 +610,23 @@ static int global_noverlay = SZ_OVERLAY_CMAP; static int global_mincolors = 0; static int valid_lut = 0; -static int SetGlobalCmap(); -static int ParseGlobalCmap(); -static int GetMaxCmapColors(); -static int GetGlobalColors(); -static void SetGlobalColors(); +static int SetGlobalCmap(GtermWidget w); +static int ParseGlobalCmap(GtermWidget w); +static int GetMaxCmapColors(GtermWidget w); +static int GetGlobalColors(void); +static void SetGlobalColors(int n); -static void NewCachedXImage(); /* MF004 */ -static void DestroyCachedXImage(); /* MF004 */ -static XImage *GetCachedXImage(); /* MF004 */ +static void NewCachedXImage(GtermWidget w, XImage *xin, Pixmap pixmap, int width, int height); +static void DestroyCachedXImage(void); +static XImage *GetCachedXImage(GtermWidget w, Pixmap pixmap, int width, int height); -static char *dbg_wSize(); /* debug utils */ -static char *dbg_visStr(); -static void dbg_printCmaps(); -static void dbg_printMappings(); -static void dbg_printRasters(); +static char *dbg_wSize(GtermWidget w); /* debug utils */ +static char *dbg_visStr(int class); +static void dbg_printCmaps(GtermWidget w); +static void dbg_printMappings(GtermWidget w); +static void dbg_printRasters(GtermWidget w); @@ -656,8 +694,7 @@ WidgetClass gtermWidgetClass = (WidgetClass) >ermClassRec; /* ARGSUSED */ static void -Initialize (request, new) - Widget request, new; +Initialize (Widget request, Widget new) { GtermWidget w = (GtermWidget)new; GC gc; @@ -1162,8 +1199,7 @@ Initialize (request, new) static void -initColorResources (w) - GtermWidget w; +initColorResources (GtermWidget w) { w->gterm.color0 = ColorNameToPixel (w, w->gterm.color0Str); w->gterm.color1 = ColorNameToPixel (w, w->gterm.color1Str); @@ -1252,10 +1288,7 @@ initColorResources (w) static void -Realize (gw, valueMask, attrs) - Widget gw; - XtValueMask *valueMask; - XSetWindowAttributes *attrs; +Realize (Widget gw, XtValueMask *valueMask, XSetWindowAttributes *attrs) { GtermWidget w = (GtermWidget) gw; GC gc; @@ -1365,8 +1398,7 @@ Realize (gw, valueMask, attrs) } static void -Destroy (gw) - Widget gw; +Destroy (Widget gw) { GtermWidget w = (GtermWidget) gw; GtCallback *cb, *cb_next; @@ -1444,8 +1476,7 @@ Destroy (gw) } static void -Resize (gw) - Widget gw; +Resize (Widget gw) { GtermWidget w = (GtermWidget) gw; GtCallback *cb; @@ -1599,10 +1630,7 @@ Resize (gw) /* ARGSUSED */ static void -Redisplay (gw, event, region) - Widget gw; - XEvent *event; - Region region; +Redisplay (Widget gw, XEvent *event, Region region) { GtermWidget w = (GtermWidget) gw; XExposeEvent *ev = (XExposeEvent *)event; @@ -1656,8 +1684,7 @@ Redisplay (gw, event, region) /* ARGSUSED */ static Boolean -SetValues (current, request, set) - Widget current, request, set; +SetValues (Widget current, Widget request, Widget set) { GtermWidget old = (GtermWidget) current; GtermWidget req = (GtermWidget) request; @@ -1712,8 +1739,7 @@ SetValues (current, request, set) } static void -color_crosshair (w) - GtermWidget w; +color_crosshair (GtermWidget w) { Display *display = w->gterm.display; XColor fg_color, bg_color; @@ -1738,8 +1764,7 @@ color_crosshair (w) } static void -color_ginmodeCursor (w) - GtermWidget w; +color_ginmodeCursor (GtermWidget w) { Display *display = w->gterm.display; XColor fg_color, bg_color; @@ -1762,21 +1787,21 @@ color_ginmodeCursor (w) */ /* ARGSUSED */ -static void HandleIgnore (widget, event, params, param_count) - Widget widget; - XEvent *event; /* unused */ - String *params; /* unused */ - Cardinal *param_count; /* unused */ +static void HandleIgnore (Widget widget, XEvent *event, String *params, Cardinal *param_count) + + /* unused */ + /* unused */ + /* unused */ { /* ignore an event */ } /* ARGSUSED */ -static void HandleGraphicsInput (widget, event, params, param_count) - Widget widget; - XEvent *event; /* unused */ - String *params; /* unused */ - Cardinal *param_count; /* unused */ +static void HandleGraphicsInput (Widget widget, XEvent *event, String *params, Cardinal *param_count) + + /* unused */ + /* unused */ + /* unused */ { GtermWidget w = (GtermWidget)widget; XKeyEvent *ev = (XKeyEvent *) event; @@ -1794,11 +1819,11 @@ static void HandleGraphicsInput (widget, event, params, param_count) } /* ARGSUSED */ -static void HandleDisplayCrosshair (widget, event, params, nparams) - Widget widget; - XEvent *event; /* unused */ - String *params; /* unused */ - Cardinal *nparams; /* unused */ +static void HandleDisplayCrosshair (Widget widget, XEvent *event, String *params, Cardinal *nparams) + + /* unused */ + /* unused */ + /* unused */ { GtermWidget w = (GtermWidget)widget; XButtonEvent *ev = &event->xbutton; @@ -1819,11 +1844,11 @@ static void HandleDisplayCrosshair (widget, event, params, nparams) } /* ARGSUSED */ -static void HandleTrackCursor (widget, event, params, param_count) - Widget widget; - XEvent *event; /* unused */ - String *params; /* unused */ - Cardinal *param_count; /* unused */ +static void HandleTrackCursor (Widget widget, XEvent *event, String *params, Cardinal *param_count) + + /* unused */ + /* unused */ + /* unused */ { GtermWidget w = (GtermWidget)widget; XMotionEvent *ev = &event->xmotion; @@ -1856,11 +1881,11 @@ static void HandleTrackCursor (widget, event, params, param_count) } /* ARGSUSED */ -static void HandleEnterWindow (widget, event, params, param_count) - Widget widget; - XEvent *event; /* unused */ - String *params; /* unused */ - Cardinal *param_count; /* unused */ +static void HandleEnterWindow (Widget widget, XEvent *event, String *params, Cardinal *param_count) + + /* unused */ + /* unused */ + /* unused */ { GtermWidget w = (GtermWidget)widget; XEnterWindowEvent *ev = (XEnterWindowEvent *) event; @@ -1888,11 +1913,11 @@ static void HandleEnterWindow (widget, event, params, param_count) } /* ARGSUSED */ -static void HandleLeaveWindow (widget, event, params, param_count) - Widget widget; - XEvent *event; /* unused */ - String *params; /* unused */ - Cardinal *param_count; /* unused */ +static void HandleLeaveWindow (Widget widget, XEvent *event, String *params, Cardinal *param_count) + + /* unused */ + /* unused */ + /* unused */ { GtermWidget w = (GtermWidget)widget; XLeaveWindowEvent *ev = (XLeaveWindowEvent *) event; @@ -1919,11 +1944,11 @@ static void HandleLeaveWindow (widget, event, params, param_count) } /* ARGSUSED */ -static void HandleSoftReset (widget, event, params, param_count) - Widget widget; - XEvent *event; /* unused */ - String *params; /* unused */ - Cardinal *param_count; /* unused */ +static void HandleSoftReset (Widget widget, XEvent *event, String *params, Cardinal *param_count) + + /* unused */ + /* unused */ + /* unused */ { GtermWidget w = (GtermWidget)widget; GtCallback *cb; diff --git a/obm/ObmW/Gterm.h b/obm/ObmW/Gterm.h index efa7e36..cfe074e 100644 --- a/obm/ObmW/Gterm.h +++ b/obm/ObmW/Gterm.h @@ -309,6 +309,7 @@ extern WidgetClass gtermWidgetClass; */ typedef unsigned char uchar; typedef void (*GtCallbackProc)(); +typedef int (*GmIMethod)(); extern void GtActivate(GtermWidget w); extern void GtDeactivate(GtermWidget w); @@ -325,33 +326,33 @@ extern void GtPostResetProc(GtermWidget w, GtCallbackProc userfcn, XtPointer cli extern void GtPostResizeProc(GtermWidget w, GtCallbackProc userfcn, XtPointer client_data); extern int GtQueryRaster(GtermWidget w, int raster, int *type, int *width, int *height, int *depth); -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 GtSetRaster(GtermWidget w, int raster); +extern int GtGetRaster(GtermWidget w); +extern void GtSetCursorPos(GtermWidget w, int x, int y); +extern void GtGetCursorPos(GtermWidget w, int *x, int *y); +extern void GtSetCursorType(GtermWidget w, int type); +extern void GtBell(GtermWidget w); +extern void GtSetLogRes(GtermWidget w, int width, int height); +extern void GtGetLogRes(GtermWidget w, int *width, int *height); +extern void GtGetPhysRes(GtermWidget w, int raster, int *width, int *height); +extern void GtSetPhysRes(GtermWidget w, int raster, int width, int height); +extern void GtSetLineWidth(GtermWidget w, int ival); +extern void GtSetLineStyle(GtermWidget w, int ival); +extern void GtSetColorIndex(GtermWidget w, int ival); +extern void GtSetFillType(GtermWidget w, int ival); +extern void GtClearScreen(GtermWidget w); +extern void GtDrawPolyline(GtermWidget w, XPoint *pv, int npts); +extern void GtDrawPolymarker(GtermWidget w, XPoint *pv, int npts); +extern void GtDrawPolygon(GtermWidget w, XPoint *pv, int npts); +extern void GtDrawAlphaText(GtermWidget w, int x, int y, char *text); +extern void GtGetAlphaTextSize(GtermWidget w, char *string, int *width, int *height, int *base); +extern void GtStartDialog(GtermWidget w); +extern void GtEndDialog(GtermWidget w); +extern void GtEraseDialog(GtermWidget w); +extern void GtDrawDialogText(GtermWidget w, int x, int y, char *text); +extern void GtGetDialogTextSize(GtermWidget w, char *string, int *width, int *height, int *base); extern void GtRasterInit(GtermWidget w); -extern void initialize_shadow_pixmap (); +extern void initialize_shadow_pixmap (GtermWidget w, int dst); extern int GtAssignRaster(GtermWidget w, int raster, XtPointer drawable, int type); extern int GtCreateRaster(GtermWidget w, int raster, int type, int width, int height, int depth); @@ -364,67 +365,67 @@ extern int GtReadPixels(GtermWidget w, int raster, uchar *pixels, int nbits, int x1, int y1, int nx, int ny); extern void GtRefreshPixels(GtermWidget w, int raster, int ct, int x1, int y1, int nx, int ny); -extern int GtGetClientPixel(); +extern int GtGetClientPixel(GtermWidget w, int pixel); extern int GtSetPixels(GtermWidget w, int raster, int ct, int x1, int y1, int nx, int ny, int color, int rop); extern Pixmap GtExtractPixmap(GtermWidget w, int src, int ctype, int x, int y, int width, int height); extern int GtInsertPixmap(GtermWidget w, Pixmap pixmap, int dst, int ctype, int x, int y, int width, int height); -extern int GtNextColormap(); -extern void GtFreeColormap(); +extern int GtNextColormap(GtermWidget w); +extern void GtFreeColormap(GtermWidget w, int colormap); extern int GtWriteColormap(GtermWidget w, int map, int first, int nelem, ushort *r, ushort *g, ushort *b); extern int GtReadColormap(GtermWidget w, int map, int first, int nelem, ushort *r, ushort *g, ushort *b); extern int GtLoadColormap(GtermWidget w, int map, float offset, float slope); -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 XtPointer GmCreate(); -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(); +extern int GtQueryColormap(GtermWidget w, int map, int *first, int *nelem, int *maxelem); +extern void GtSetColormapFocus(int box_size); +extern void GtInitMappings(GtermWidget w); +extern int GtNextMapping(GtermWidget w); +extern void GtFreeMapping(GtermWidget w, int mapping); +extern int GtDisableMapping(GtermWidget w, int mapping, int erase); +extern void GtLowerMapping(GtermWidget w, int mapping, int reference); +extern void GtRaiseMapping(GtermWidget w, int mapping, int reference); +extern int GtActiveMapping(GtermWidget w, int mapping); +extern int GtEnableMapping(GtermWidget w, int mapping, int refresh); +extern void GtRefreshMapping(GtermWidget w, int mapping); +extern int GtSetMapping(GtermWidget w, int mapping, int rop, int src, int st, int sx, int sy, int snx, int sny, int dst, int dt, int dx, int dy, int dnx, int dny); +extern int GtGetMapping(GtermWidget w, int mapping, int *rop, int *src, int *st, int *sx, int *sy, int *snx, int *sny, int *dst, int *dt, int *dx, int *dy, int *dnx, int *dny); +extern int GtCompareMappings(GtermWidget w, int map1, int map2); +extern int GtCopyRaster(GtermWidget w, int rop, int src, int st, int sx, int sy, int snx, int sny, int dst, int dt, int dx, int dy, int dnx, int dny); +extern int GtSelectRaster(GtermWidget w, int dras, int dt, int dx, int dy, int rt, int *rx, int *ry, int *rmap); +extern void GtSetDisplayRaster(GtermWidget gt, int raster); +extern void GtMarkerInit(GtermWidget w); +extern void GtMapVector(GtermWidget w, int mapping, int dir, DPoint *pv1, DPoint *pv2, int npts); +extern void GtPixelToNDC(GtermWidget w, int raster, DPoint *pv1, DPoint *pv2, int npts); +extern void GtNDCToPixel(GtermWidget w, int raster, DPoint *pv1, DPoint *pv2, int npts); +extern void GtOverrideTranslations(GtermWidget w, char *translations); +extern void GtWriteAlphaCursor(GtermWidget w, int x, int y); +extern void GtEraseAlphaCursor(GtermWidget w); +extern void GtSetTextRes(GtermWidget w, int optrows, int optcols); +extern void GtReadIomap(GtermWidget w, uchar *iomap, int first, int nelem); +extern void GtWriteIomap(GtermWidget w, ushort *iomap, int first, int nelem); +extern void GtReadLUT(GtermWidget w, long unsigned int *lut, int first, int nelem); + +extern void GmAddCallback(struct marker *gm, int events, GmIMethod func, XtPointer client_data); +extern void GmDeleteCallback(struct marker *gm, GmIMethod func, XtPointer client_data); +extern XtPointer GmCreate(GtermWidget w, int type, int interactive); +extern int GmDestroy(struct marker *gm); +extern int GmGetAttribute(struct marker *gm, char *attribute, XtArgVal value, char *type); +extern void GmGetAttributes(struct marker *gm, ArgList args, int nargs, char *argtype); +extern void GmGetBoundingBox(struct marker *gm, int *x, int *y, int *width, int *height); +extern int GmGetVertices(struct marker *gm, DPoint *points, int first, int maxpts); +extern int GmStrToType(char *marker_type); +extern int GmStrToEvent(char *event_type); +extern int GmStrToFunction(char *function); +extern void GmLower(struct marker *gm, struct marker *ref_gm); +extern int GmSetAttributes(struct marker *gm, ArgList args, int nargs, char *argtype); +extern int GmSetAttribute(struct marker *gm, char *attribute, XtArgVal value, char *type); +extern void GmMarkpos(struct marker *gm); +extern void GmRedraw(struct marker *gm, int func, int erase); +extern void GmNotify(struct marker *gm, int events, XEvent *event, String *params, Cardinal nparams); +extern void GmRaise(struct marker *gm, struct marker *ref_gm); +extern void GmSetVertices(struct marker *gm, DPoint *points, int first, int npts); #endif /* _Gterm_h */ diff --git a/obm/ObmW/GtermCmap.c b/obm/ObmW/GtermCmap.c index abad673..3083996 100644 --- a/obm/ObmW/GtermCmap.c +++ b/obm/ObmW/GtermCmap.c @@ -27,8 +27,7 @@ * when the custom colormap is installed. */ static Colormap -get_colormap (w) - GtermWidget w; +get_colormap (GtermWidget w) { int i, j; Display *display = w->gterm.display; @@ -271,8 +270,7 @@ get_colormap (w) * level window. */ static void -request_colormap_focus (w) - GtermWidget w; +request_colormap_focus (GtermWidget w) { Widget p; @@ -323,8 +321,7 @@ request_colormap_focus (w) * should follow a prior call to request_colormap_focus. */ static void -restore_colormap_focus (w) - GtermWidget w; +restore_colormap_focus (GtermWidget w) { int nw, n_nw, i; Window *wl, n_wl[MAX_WMWIN+1], old; @@ -357,8 +354,7 @@ restore_colormap_focus (w) * the colormap (which is usually where X allocates its colors). */ static void -inherit_default_colormap (w) - GtermWidget w; +inherit_default_colormap (GtermWidget w) { XColor *cp, *ap; int ncolors, i; @@ -441,8 +437,7 @@ inherit_default_colormap (w) * colormap focus changes. */ static void -update_default_colormap (w) - GtermWidget w; +update_default_colormap (GtermWidget w) { XColor *ip, *op; int j, n; @@ -535,8 +530,7 @@ update_default_colormap (w) /* Global Colormap routines. */ -static int SetGlobalCmap(w) - GtermWidget w; +static int SetGlobalCmap(GtermWidget w) { static int init=0; @@ -561,8 +555,7 @@ static int SetGlobalCmap(w) } -static int ParseGlobalCmap(w) - GtermWidget w; +static int ParseGlobalCmap(GtermWidget w) { char *s; char *t; @@ -626,8 +619,7 @@ static int ParseGlobalCmap(w) * the actually-allocated colormap -- very ugly ... * */ -static int GetMaxCmapColors(w) - GtermWidget w; +static int GetMaxCmapColors(GtermWidget w) { int n; unsigned long plane_masks[1]; @@ -682,15 +674,14 @@ static int GetMaxCmapColors(w) static int -GetGlobalColors() +GetGlobalColors(void) { return (global_ncolors); } static void -SetGlobalColors(n) - int n; +SetGlobalColors(int n) { global_ncolors = n; } @@ -703,9 +694,7 @@ SetGlobalColors(n) */ static Pixel -ColorNameToPixel (w, str) -GtermWidget w; -String str; +ColorNameToPixel (GtermWidget w, String str) { int i; XColor color; diff --git a/obm/ObmW/GtermCnv.c b/obm/ObmW/GtermCnv.c index 6007fce..7b2096f 100644 --- a/obm/ObmW/GtermCnv.c +++ b/obm/ObmW/GtermCnv.c @@ -99,7 +99,7 @@ Pixmap rasPM_to_gtermPM (Raster src, GtermWidget w) XImage *ximage_to_rasPM (GtermWidget w, XImage *xin, Raster dest, int sx, int sy, int dnx, int dny) { - uchar *renderPixels (); + uchar *renderPixels (GtermWidget w, uchar *in, int width, int height, int depth, int sx, int sy, int dnx, int dny, int bpl, int bpp, int border); XImage *cnvImg = (XImage *) NULL; @@ -145,7 +145,7 @@ XImage *ximage_to_rasPM (GtermWidget w, XImage *xin, Raster dest, XImage *ximage_to_gtermPM (GtermWidget w, XImage *xin, int sx, int sy, int dnx, int dny) { - uchar *renderPixels (); + uchar *renderPixels (GtermWidget w, uchar *in, int width, int height, int depth, int sx, int sy, int dnx, int dny, int bpl, int bpp, int border); XImage *cnvImg = (XImage *) NULL; @@ -191,12 +191,7 @@ XImage *ximage_to_gtermPM (GtermWidget w, XImage *xin, ** the pointer to the output pixels and assume the caller will free it. */ uchar * -renderPixels (w, in, width, height, depth, sx, sy, dnx, dny, bpl, bpp, border) -GtermWidget w; -uchar *in; -int width, height, depth; -int sx, sy, dnx, dny; -int bpl, bpp, border; +renderPixels (GtermWidget w, uchar *in, int width, int height, int depth, int sx, int sy, int dnx, int dny, int bpl, int bpp, int border) { int i, j, npix = (width * height); uint32_t *lp, xcol, lval; diff --git a/obm/ObmW/GtermGraphics.c b/obm/ObmW/GtermGraphics.c index da0469f..e1ced03 100644 --- a/obm/ObmW/GtermGraphics.c +++ b/obm/ObmW/GtermGraphics.c @@ -1380,9 +1380,7 @@ mapVector (MappingContext mx, XPoint *pv1, XPoint *pv2, int npts) static void -savepos (w, event) - GtermWidget w; - XEvent *event; +savepos (GtermWidget w, XEvent *event) { if (event == NULL) return; diff --git a/obm/ObmW/GtermMapping.c b/obm/ObmW/GtermMapping.c index 59d5496..719cc19 100644 --- a/obm/ObmW/GtermMapping.c +++ b/obm/ObmW/GtermMapping.c @@ -6,10 +6,10 @@ * this is a no-op. */ static int -refresh_source (w, mp, x1, y1, nx, ny) - GtermWidget w; - Mapping mp; /* mapping defining refresh operation */ - int x1, y1, nx, ny; /* region of source to be refreshed */ +refresh_source (GtermWidget w, Mapping mp, int x1, int y1, int nx, int ny) + + /* mapping defining refresh operation */ + /* region of source to be refreshed */ { int sx1, sx2, sy1, sy2, snx, sny; int dx1, dx2, dy1, dy2, dnx, dny; @@ -89,10 +89,10 @@ refresh_source (w, mp, x1, y1, nx, ny) * coordinates (no NDC). */ static int -refresh_destination (w, mp, x1, y1, nx, ny) - GtermWidget w; - Mapping mp; /* mapping defining refresh operation */ - int x1, y1, nx, ny; /* region of destination to be refreshed */ +refresh_destination (GtermWidget w, Mapping mp, int x1, int y1, int nx, int ny) + + /* mapping defining refresh operation */ + /* region of destination to be refreshed */ { Raster sr, dr, pr; Display *display = w->gterm.display; @@ -844,14 +844,14 @@ refresh_destination (w, mp, x1, y1, nx, ny) * using pixel replication and the given x and y dst->scr pixels maps. */ static void -scale_zoom (idata,ibpl, odata,obpl, xmap,ymap, dx,dy,dnx,dny, clip_region) - - uchar *idata, *odata; /* input, output data */ - int ibpl, obpl; /* bytes per line */ - int *xmap; /* src coords of each dst pixel */ - int *ymap; /* src coords of each dst pixel */ - int dx, dy, dnx, dny; /* destination rect */ - Region clip_region; /* clip Region or null */ +scale_zoom (uchar *idata, int ibpl, uchar *odata, int obpl, int *xmap, int *ymap, int dx, int dy, int dnx, int dny, Region clip_region) + + /* input, output data */ + /* bytes per line */ + /* src coords of each dst pixel */ + /* src coords of each dst pixel */ + /* destination rect */ + /* clip Region or null */ { int i, j; uchar *ip, *op; @@ -887,14 +887,14 @@ scale_zoom (idata,ibpl, odata,obpl, xmap,ymap, dx,dy,dnx,dny, clip_region) * case of integer scaling. */ static void -scale_intzoom (idata,ibpl,odata,obpl, sx,sy,dx,dy,dnx,dny, xflip,yflip, nx,ny) - - uchar *idata, *odata; /* input, output data */ - int ibpl, obpl; /* bytes per line */ - int sx, sy; /* start coords of src rect */ - int dx, dy, dnx, dny; /* destination rect */ - int xflip, yflip; /* set if x or y is flipped */ - int nx, ny; /* replication factors */ +scale_intzoom (uchar *idata, int ibpl, uchar *odata, int obpl, int sx, int sy, int dx, int dy, int dnx, int dny, int xflip, int yflip, int nx, int ny) + + /* input, output data */ + /* bytes per line */ + /* start coords of src rect */ + /* destination rect */ + /* set if x or y is flipped */ + /* replication factors */ { int n; int pix; @@ -1076,15 +1076,15 @@ scale_intzoom (idata,ibpl,odata,obpl, sx,sy,dx,dy,dnx,dny, xflip,yflip, nx,ny) * using the nearest neighbor technique. */ static void -scale_nearest (idata,inx,iny,ibpl, odata,onx,ony,obpl, - x_src,y_src, dx,dy,dnx,dny, clip_region) - - uchar *idata, *odata; /* input, output data */ - int inx, iny, ibpl; /* dimensions of input array */ - int onx, ony, obpl; /* dimensions of output array */ - float *x_src, *y_src; /* src coords of each dst pixel */ - int dx, dy, dnx, dny; /* destination rect */ - Region clip_region; /* clip Region or null */ +scale_nearest ( + + uchar *idata, /* input data */ + int inx, int iny, int ibpl, /* dimensions of input array */ + uchar *odata, /* output data */ + int onx, int ony, int obpl, /* dimensions of output array */ + float *x_src, float *y_src, /* src coords of each dst pixel */ + int dx, int dy, int dnx, int dny, /* destination rect */ + Region clip_region) /* clip Region or null */ { int m, n, i, j; uchar *op; @@ -1113,15 +1113,15 @@ scale_nearest (idata,inx,iny,ibpl, odata,onx,ony,obpl, * using bilinear interpolation. */ static void -scale_bilinear (idata,inx,iny,ibpl, odata,onx,ony,obpl, - x_src,y_src, dx,dy,dnx,dny, clip_region) - - uchar *idata, *odata; /* input, output data */ - int inx, iny, ibpl; /* dimensions of input array */ - int onx, ony, obpl; /* dimensions of output array */ - float *x_src, *y_src; /* src coords of each dst pixel */ - int dx, dy, dnx, dny; /* destination rect */ - Region clip_region; /* clip Region or null */ +scale_bilinear ( + + uchar *idata, /* input data */ + int inx, int iny, int ibpl, /* dimensions of input array */ + uchar *odata, /* output data */ + int onx, int ony, int obpl, /* dimensions of output array */ + float *x_src, float *y_src, /* src coords of each dst pixel */ + int dx, int dy, int dnx, int dny, /* destination rect */ + Region clip_region) /* clip Region or null */ { int i; uchar *op; @@ -1191,17 +1191,17 @@ scale_bilinear (idata,inx,iny,ibpl, odata,onx,ony,obpl, * xscale, yscale. */ static void -scale_lowpass (idata,inx,iny,ibpl, odata,onx,ony,obpl, x_src,y_src, - sx,sy,snx,sny, dx,dy,dnx,dny, xscale,yscale, clip_region) - - uchar *idata, *odata; /* input, output data */ - int inx, iny, ibpl; /* full input array */ - int onx, ony, obpl; /* full input array */ - float *x_src, *y_src; /* src coords of each dst pixel */ - int sx, sy, snx, sny; /* source rect */ - int dx, dy, dnx, dny; /* destination rect */ - float xscale, yscale; /* scale factors */ - Region clip_region; /* clip Region or null */ +scale_lowpass ( + + uchar *idata, /* input data */ + int inx, int iny, int ibpl, /* full input array */ + uchar *odata, /* output data */ + int onx, int ony, int obpl, /* full input array */ + float *x_src, float *y_src, /* src coords of each dst pixel */ + int sx, int sy, int snx, int sny, /* source rect */ + int dx, int dy, int dnx, int dny, /* destination rect */ + float xscale, float yscale, /* scale factors */ + Region clip_region) /* clip Region or null */ { uchar *data; @@ -1223,15 +1223,15 @@ scale_lowpass (idata,inx,iny,ibpl, odata,onx,ony,obpl, x_src,y_src, /* lw_convolve -- Convolution primitive for scale_lowpass. */ static void -lw_convolve (idata,inx,iny,ibpl,ix,iy, odata,onx,ony,obpl,ox,oy, - nx, ny, xscale, yscale) - - uchar *idata, *odata; /* input, output data */ - int inx, iny, ix, iy; /* size of input array, start pos */ - int onx, ony, ox, oy; /* size of output array, start pos */ - int ibpl, obpl; /* bytes per line */ - int nx, ny; /* size of output region */ - float xscale, yscale; /* determines amount of smoothing */ +lw_convolve ( + uchar *idata, /* input data */ + int inx, int iny, int ix, int iy, /* size of input array, start pos */ + int ibpl, /* bytes per line */ + uchar *odata, /* output data */ + int onx, int ony, int ox, int oy, /* size of output array, start pos */ + int obpl, /* bytes per line */ + int nx, int ny, /* size of output region */ + float xscale, float yscale) /* determines amount of smoothing */ { uchar *ip; int l, m, x, hx, pixval; @@ -1309,18 +1309,19 @@ lw_convolve (idata,inx,iny,ibpl,ix,iy, odata,onx,ony,obpl,ox,oy, * image. */ static void -scale_boxcar (idata,inx,iny,ibpl, odata,onx,ony,obpl, x_src,y_src, - sx,sy,snx,sny, dx,dy,dnx,dny, xscale,yscale, interp, clip_region) - - uchar *idata, *odata; /* input, output data */ - int inx, iny, ibpl; /* full input array */ - int onx, ony, obpl; /* full input array */ - float *x_src, *y_src; /* src coords of each dst pixel */ - int sx, sy, snx, sny; /* source rect */ - int dx, dy, dnx, dny; /* destination rect */ - float xscale, yscale; /* scale factors */ - int interp; /* set if interpolation is desired */ - Region clip_region; /* clip Region or null */ +scale_boxcar ( + uchar *idata, /* input data */ + int inx, int iny, int ibpl, /* full input array */ + uchar *odata, /* output data */ + int onx, int ony, int obpl, /* full input array */ + float *x_src, float *y_src, /* src coords of each dst pixel */ + int sx, int sy, + int snx, int sny, /* source rect */ + int dx, int dy, + int dnx, int dny, /* destination rect */ + float xscale, float yscale, /* scale factors */ + int interp, /* set if interpolation is desired */ + Region clip_region) /* clip Region or null */ { int xblock, yblock; int x1, x2, y1, y2, nx, ny; @@ -1383,12 +1384,12 @@ scale_boxcar (idata,inx,iny,ibpl, odata,onx,ony,obpl, x_src,y_src, /* bx_boxcar -- Block average primitive for scale_boxcar. */ static void -bx_boxcar (idata,inx,iny,ibpl, x1,y1,x2,y2, obuf, xblock, yblock) - uchar *idata; /* input data array */ - int inx, iny, ibpl; /* array dimensions */ - int x1,y1,x2,y2; /* region to be block averaged */ - uchar *obuf; /* output array */ - int xblock, yblock; /* blocking factors */ +bx_boxcar (uchar *idata, int inx, int iny, int ibpl, int x1, int y1, int x2, int y2, uchar *obuf, int xblock, int yblock) + /* input data array */ + /* array dimensions */ + /* region to be block averaged */ + /* output array */ + /* blocking factors */ { uchar *ip, *op; int count, i, *sp; @@ -1427,17 +1428,17 @@ bx_boxcar (idata,inx,iny,ibpl, x1,y1,x2,y2, obuf, xblock, yblock) /* bx_extract -- Block extract primitive for scale_boxcar. */ static void -bx_extract (idata,inx,iny,ibpl, odata,onx,ony,obpl, - x_src,y_src, xoff,yoff,xstep,ystep, dx,dy,dnx,dny, clip_region) - - uchar *idata, *odata; /* input, output data */ - int inx, iny, ibpl; /* full input array */ - int onx, ony, obpl; /* full input array */ - float *x_src, *y_src; /* src coords of each dst pixel */ - int dx, dy, dnx, dny; /* destination rect */ - int xoff, yoff; /* offset of input region */ - float xstep, ystep; /* scale of input region */ - Region clip_region; /* clip Region or null */ +bx_extract ( + + uchar *idata, /* input, output data */ + int inx, int iny, int ibpl, /* full input array */ + uchar *odata, /* input, output data */ + int onx, int ony, int obpl, /* full input array */ + float *x_src, float *y_src, /* src coords of each dst pixel */ + int dx, int dy, int dnx, int dny, /* destination rect */ + int xoff, int yoff, /* offset of input region */ + float xstep, float ystep, /* scale of input region */ + Region clip_region) /* clip Region or null */ { int m, n, i; uchar *op; @@ -1466,17 +1467,17 @@ bx_extract (idata,inx,iny,ibpl, odata,onx,ony,obpl, /* bx_interp -- Bilinear interpolation primitive for scale_boxcar. */ static void -bx_interp (idata,inx,iny,ibpl, odata,onx,ony,obpl, - x_src,y_src, xoff,yoff,xstep,ystep, dx,dy,dnx,dny, clip_region) - - uchar *idata, *odata; /* input, output data */ - int inx, iny, ibpl; /* dimensions of input array */ - int onx, ony, obpl; /* dimensions of output array */ - float *x_src, *y_src; /* src coords of each dst pixel */ - int xoff, yoff; /* offset of input region */ - float xstep, ystep; /* scale of input region */ - int dx, dy, dnx, dny; /* destination rect */ - Region clip_region; /* clip Region or null */ +bx_interp ( + + uchar *idata, /* input, output data */ + int inx, int iny, int ibpl, /* dimensions of input array */ + uchar *odata, /* input, output data */ + int onx, int ony, int obpl, /* dimensions of output array */ + float *x_src, float *y_src, /* src coords of each dst pixel */ + int xoff, int yoff, /* offset of input region */ + float xstep, float ystep, /* scale of input region */ + int dx, int dy, int dnx, int dny, /* destination rect */ + Region clip_region) /* clip Region or null */ { int i; uchar *op; @@ -1543,15 +1544,15 @@ bx_interp (idata,inx,iny,ibpl, odata,onx,ony,obpl, * pixel numbers to pixel intensities. */ static void -mf_getinten (w, idata,inx,iny,ibpl, sx,sy, odata,onx,ony,obpl, dx,dy, nx,ny) - - GtermWidget w; - uchar *idata, *odata; /* input, output data */ - int inx, iny, ibpl; /* dimensions of input array */ - int onx, ony, obpl; /* dimensions of output array */ - int sx, sy; /* source offset */ - int dx, dy; /* destination offset */ - int nx, ny; /* size of region */ +mf_getinten (GtermWidget w, uchar *idata, int inx, int iny, int ibpl, int sx, int sy, uchar *odata, int onx, int ony, int obpl, int dx, int dy, int nx, int ny) + + + /* input, output data */ + /* dimensions of input array */ + /* dimensions of output array */ + /* source offset */ + /* destination offset */ + /* size of region */ { Pixel *cmap; uchar *ip, *op; @@ -1572,15 +1573,15 @@ mf_getinten (w, idata,inx,iny,ibpl, sx,sy, odata,onx,ony,obpl, dx,dy, nx,ny) * pixel intensities to pixel numbers. */ static void -mf_getpixel (w, idata,inx,iny,ibpl, sx,sy, odata,onx,ony,obpl, dx,dy, nx,ny) - - GtermWidget w; - uchar *idata, *odata; /* input, output data */ - int inx, iny, ibpl; /* dimensions of input array */ - int onx, ony, obpl; /* dimensions of output array */ - int sx, sy; /* source offset */ - int dx, dy; /* destination offset */ - int nx, ny; /* size of region */ +mf_getpixel (GtermWidget w, uchar *idata, int inx, int iny, int ibpl, int sx, int sy, uchar *odata, int onx, int ony, int obpl, int dx, int dy, int nx, int ny) + + + /* input, output data */ + /* dimensions of input array */ + /* dimensions of output array */ + /* source offset */ + /* destination offset */ + /* size of region */ { Pixel *cmap; uchar *ip, *op; @@ -1604,10 +1605,7 @@ mf_getpixel (w, idata,inx,iny,ibpl, sx,sy, odata,onx,ony,obpl, dx,dy, nx,ny) * regions. The number of regions output is returned as the function value. */ static int -get_regions (xs,xe,xv, max_regions, dx, dnx, xmap, alt_dx, alt_dnx, alt_xmap) - int *xs, *xe, *xv, max_regions; - int dx, dnx, *xmap; - int alt_dx, alt_dnx, *alt_xmap; +get_regions (int *xs, int *xe, int *xv, int max_regions, int dx, int dnx, int *xmap, int alt_dx, int alt_dnx, int *alt_xmap) { int state, current; int nx, i; @@ -1653,12 +1651,12 @@ get_regions (xs,xe,xv, max_regions, dx, dnx, xmap, alt_dx, alt_dnx, alt_xmap) * X or Y are selected. Adjacent rects are combined. */ static int -get_rects (o_rl, max_rects, xs,xe,xv,nx, ys,ye,yv,ny, xcond,ycond) - XRectangle *o_rl; /* receives list of rectangles */ - int max_rects; /* max rectangles out */ - int *xs, *xe, *xv, nx; /* X list of regions */ - int *ys, *ye, *yv, ny; /* Y list of regions */ - int xcond, ycond; /* X,Y condition bitflags */ +get_rects (XRectangle *o_rl, int max_rects, int *xs, int *xe, int *xv, int nx, int *ys, int *ye, int *yv, int ny, int xcond, int ycond) + /* receives list of rectangles */ + /* max rectangles out */ + /* X list of regions */ + /* Y list of regions */ + /* X,Y condition bitflags */ { int i, j; XRectangle rl[MAX_REGIONS]; @@ -1735,9 +1733,7 @@ get_rects (o_rl, max_rects, xs,xe,xv,nx, ys,ye,yv,ny, xcond,ycond) * returned if the rects do not intersect. */ static int -rect_intersect (in, r1, r2) - XRectangle *in; - XRectangle *r1, *r2; +rect_intersect (XRectangle *in, XRectangle *r1, XRectangle *r2) { int x1, y1, x2, y2; @@ -1758,11 +1754,7 @@ rect_intersect (in, r1, r2) /* save_mapping -- Store a mapping in a mapping descriptor. */ static void -save_mapping (mp, mapping, rop, src, st, sx,sy,sw,sh, dst, dt, dx,dy,dw,dh) - Mapping mp; - int mapping, rop; - int src, st, sx,sy,sw,sh; - int dst, dt, dx,dy,dw,dh; +save_mapping (Mapping mp, int mapping, int rop, int src, int st, int sx, int sy, int sw, int sh, int dst, int dt, int dx, int dy, int dw, int dh) { mp->src = src; mp->st = st; mp->sx = sx; mp->sy = sy; mp->snx = sw; mp->sny = sh; @@ -1776,11 +1768,7 @@ save_mapping (mp, mapping, rop, src, st, sx,sy,sw,sh, dst, dt, dx,dy,dw,dh) /* load_mapping -- Load a mapping from a mapping descriptor. */ static void -load_mapping (mp, mapping, rop, src, st, sx,sy,sw,sh, dst, dt, dx,dy,dw,dh) - Mapping mp; - int *mapping, *rop; - int *src, *st, *sx,*sy,*sw,*sh; - int *dst, *dt, *dx,*dy,*dw,*dh; +load_mapping (Mapping mp, int *mapping, int *rop, int *src, int *st, int *sx, int *sy, int *sw, int *sh, int *dst, int *dt, int *dx, int *dy, int *dw, int *dh) { *src = mp->src; *st = mp->st; *sx = mp->sx; *sy = mp->sy; *sw = mp->snx; *sh = mp->sny; @@ -1795,11 +1783,11 @@ load_mapping (mp, mapping, rop, src, st, sx,sy,sw,sh, dst, dt, dx,dy,dw,dh) * the process if the mapping is not already in pixel coordinates. */ static void -get_pixel_mapping (w, mp1, mp2, update) - GtermWidget w; - Mapping mp1; /* input mapping */ - Mapping mp2; /* output mapping */ - int update; /* update mapping */ +get_pixel_mapping (GtermWidget w, Mapping mp1, Mapping mp2, int update) + + /* input mapping */ + /* output mapping */ + /* update mapping */ { float maxndc = (float)MAXNDC; @@ -1876,9 +1864,7 @@ get_pixel_mapping (w, mp1, mp2, update) * it contains something meaningful. */ static int -valid_mapping (w, mp) - GtermWidget w; - Mapping mp; +valid_mapping (GtermWidget w, Mapping mp) { int x, y; int snx, sny, dnx, dny; @@ -1946,8 +1932,7 @@ valid_mapping (w, mp) /* initialize_mapping -- Initialize the contents of a mapping descriptor. */ static void -initialize_mapping (mp) - Mapping mp; +initialize_mapping (Mapping mp) { memset ((char *)mp, 0, sizeof(struct mapping)); } @@ -1959,9 +1944,7 @@ initialize_mapping (mp) * maps back to a source pixel and vice versa. */ static void -update_mapping (w, mp) - GtermWidget w; - Mapping mp; +update_mapping (GtermWidget w, Mapping mp) { uchar *op; int i, j, k; @@ -2119,9 +2102,7 @@ update_mapping (w, mp) * and deactivate the mapping. */ static void -free_mapping (w, mp) - GtermWidget w; - Mapping mp; +free_mapping (GtermWidget w, Mapping mp) { mp_unlink (w, mp); mp->defined = mp->enabled = mp->updated = 0; @@ -2137,10 +2118,7 @@ free_mapping (w, mp) } static void -mp_linkafter (w, mp, ref_mp) - GtermWidget w; - Mapping mp; - Mapping ref_mp; +mp_linkafter (GtermWidget w, Mapping mp, Mapping ref_mp) { Mapping map; @@ -2169,9 +2147,7 @@ mp_linkafter (w, mp, ref_mp) static void -mp_unlink (w, mp) - GtermWidget w; - Mapping mp; +mp_unlink (GtermWidget w, Mapping mp) { if (mp->prev) mp->prev->next = mp->next; diff --git a/obm/ObmW/GtermMarker.c b/obm/ObmW/GtermMarker.c index 1ab0143..7ebf505 100644 --- a/obm/ObmW/GtermMarker.c +++ b/obm/ObmW/GtermMarker.c @@ -60,20 +60,20 @@ * itself directly calling the above procedures). */ -static void gm_text_init(), gm_line_init(), gm_plin_init(), gm_rect_init(); -static void gm_boxx_init(), gm_circ_init(), gm_elip_init(), gm_pgon_init(); -static int gm_putint(), gm_putfloat(), gm_do_callbacks(); -static void gm_constraint(); -static int gm_getint(), gm_getattribute(), gm_gettype(); -static double gm_getfloat(); -static char *gm_getstring(); - -static void gm_markpos(), gm_erase(), gm_redraw(), gm_setCurRect(); -static void gm_linkafter(), gm_unlink(); -static double gm_niceAngle(); -static Pixel gm_getpixel(); -static int gm_select(); -static int gm_getfillstyle(); +static void gm_text_init(struct marker *gm, int interactive), gm_line_init(struct marker *gm, int interactive), gm_plin_init(struct marker *gm, int interactive), gm_rect_init(struct marker *gm, int interactive); +static void gm_boxx_init(struct marker *gm, int interactive), gm_circ_init(struct marker *gm, int interactive), gm_elip_init(struct marker *gm, int interactive), gm_pgon_init(struct marker *gm, int interactive); +static int gm_putint(int ival, XtArgVal value, char *type), gm_putfloat(double fval, XtArgVal value, char *type), gm_do_callbacks(struct marker *gm, int events, XEvent *event, String *params, Cardinal nparams); +static void gm_constraint(struct marker *gm, struct marker *new_gm, int what); +static int gm_getint(XtArgVal value, char *type), gm_getattribute(char *attribute), gm_gettype(char *type); +static double gm_getfloat(XtArgVal value, char *type); +static char *gm_getstring(XtArgVal value, char *type); + +static void gm_markpos(struct marker *gm), gm_erase(struct marker *gm), gm_redraw(struct marker *gm, int function), gm_setCurRect(struct marker *gm); +static void gm_linkafter(struct marker *gm, struct marker *prev), gm_unlink(struct marker *gm); +static double gm_niceAngle(double alpha); +static Pixel gm_getpixel(GtermWidget w, XtArgVal value, char *type); +static int gm_select(struct marker *gm, int x, int y, GmSelection what); +static int gm_getfillstyle(GtermWidget w, XtArgVal value, char *type); static GmVMethod gm_classinit[] = { gm_text_init, gm_line_init, gm_plin_init, gm_rect_init, @@ -88,13 +88,13 @@ static XRectangle null_rect = { 0, 0, 0, 0 }; #define PI_4 0.78539816339744830962 #define BORDER 5 -static void M_create(), M_destroy(), M_destroyNull(), M_set(), M_raise(); -static void M_lower(), M_notify(), M_markpos(), M_markposAdd(), M_redraw(); -static void M_addPt(), M_deletePt(), M_movePt(), M_deleteDestroy(); -static void M_move(), M_resize(), M_moveResize(), M_rotate(); -static void M_rotateResize(), M_input(); -static void gm_focusin(), gm_focusout(); -static int point_in_poly (); +static void M_create(Widget widget, XEvent *event, String *params, Cardinal *nparams), M_destroy(Widget widget, XEvent *event, String *params, Cardinal *nparams), M_destroyNull(Widget widget, XEvent *event, String *params, Cardinal *nparams), M_set(Widget widget, XEvent *event, String *params, Cardinal *nparams), M_raise(Widget widget, XEvent *event, String *params, Cardinal *nparams); +static void M_lower(Widget widget, XEvent *event, String *params, Cardinal *nparams), M_notify(Widget widget, XEvent *event, String *params, Cardinal *nparams), M_markpos(Widget widget, XEvent *event, String *params, Cardinal *nparams), M_markposAdd(Widget widget, XEvent *event, String *params, Cardinal *nparams), M_redraw(Widget widget, XEvent *event, String *params, Cardinal *nparams); +static void M_addPt(Widget widget, XEvent *event, String *params, Cardinal *nparams), M_deletePt(Widget widget, XEvent *event, String *params, Cardinal *nparams), M_movePt(Widget widget, XEvent *event, String *params, Cardinal *nparams), M_deleteDestroy(Widget widget, XEvent *event, String *params, Cardinal *nparams); +static void M_move(Widget widget, XEvent *event, String *params, Cardinal *nparams), M_resize(Widget widget, XEvent *event, String *params, Cardinal *nparams), M_moveResize(Widget widget, XEvent *event, String *params, Cardinal *nparams), M_rotate(Widget widget, XEvent *event, String *params, Cardinal *nparams); +static void M_rotateResize(Widget widget, XEvent *event, String *params, Cardinal *nparams), M_input(Widget widget, XEvent *event, String *params, Cardinal *nparams); +static void gm_focusin(GtermWidget w, struct marker *gm, GmSelection what), gm_focusout(GtermWidget w, int enableSetTrans); +static int point_in_poly (int npol, float *xp, float *yp, float x, float y); static XtActionsRec markerActionsList[] = { { "m_create", M_create }, @@ -123,8 +123,7 @@ static XtActionsRec markerActionsList[] = { /* GtMarkerInit -- Initialize the marker subsystem. */ void -GtMarkerInit (w) - GtermWidget w; +GtMarkerInit (GtermWidget w) { Marker gm, prev; XColor fg_color, bg_color; @@ -250,8 +249,7 @@ GtMarkerInit (w) /* GtMarkerFree -- Free any marker subsystem resources. */ static void -GtMarkerFree (w) - GtermWidget w; +GtMarkerFree (GtermWidget w) { Display *display = w->gterm.display; Marker gm; @@ -289,10 +287,7 @@ GtMarkerFree (w) /* gm_focusin -- Called when gterm window input is directed to a marker. */ static void -gm_focusin (w, gm, what) - GtermWidget w; - Marker gm; - GmSelection what; +gm_focusin (GtermWidget w, struct marker *gm, GmSelection what) { Cursor cursor; int erase; @@ -344,9 +339,9 @@ gm_focusin (w, gm, what) * pointer moves off a marker. */ static void -gm_focusout (w, enableSetTrans) - GtermWidget w; - int enableSetTrans; /* replace translations */ +gm_focusout (GtermWidget w, int enableSetTrans) + + /* replace translations */ { Display *display = w->gterm.display; Marker gm = w->gterm.gm_active; @@ -376,8 +371,7 @@ gm_focusout (w, enableSetTrans) * in some way. */ static void -gm_refocus (w) - GtermWidget w; +gm_refocus (GtermWidget w) { XMotionEvent event; int nparams = 0; @@ -407,9 +401,7 @@ gm_refocus (w) * is already active then the most recent request supercedes any previous one. */ static void -gm_request_translations (w, gm) - GtermWidget w; - Marker gm; +gm_request_translations (GtermWidget w, struct marker *gm) { w->gterm.gm_reqTranslations = gm; @@ -427,9 +419,7 @@ gm_request_translations (w, gm) * a no-op if the requested translation table is already loaded. */ static void -gm_load_translations (w, id) - GtermWidget w; - XtIntervalId id; +gm_load_translations (GtermWidget w, XtIntervalId id) { Marker am, gm; int i; @@ -472,10 +462,10 @@ gm_load_translations (w, id) /* GmCreate -- Create a new marker. */ XtPointer -GmCreate (w, type, interactive) - GtermWidget w; - int type; /* marker type */ - int interactive; /* use pointer to set position */ +GmCreate (GtermWidget w, int type, int interactive) + + /* marker type */ + /* use pointer to set position */ { Marker gm; @@ -511,8 +501,7 @@ GmCreate (w, type, interactive) /* GmDestroy -- Destroy a marker. */ int -GmDestroy (gm) - Marker gm; +GmDestroy (struct marker *gm) { GtermWidget w = gm->w; Region old_region, cur_region; @@ -574,8 +563,7 @@ GmDestroy (gm) /* GmCopy -- Copy a marker. */ Marker -GmCopy (gm) - Marker gm; +GmCopy (struct marker *gm) { GtermWidget w = gm->w; Marker nm; @@ -644,11 +632,11 @@ GmCopy (gm) /* GmAddCallback -- Add a callback to a marker. */ void -GmAddCallback (gm, events, func, client_data) - Marker gm; - int events; /* events callback is to receive */ - GmIMethod func; /* function to be called */ - XtPointer client_data; /* client data for above */ +GmAddCallback (struct marker *gm, int events, GmIMethod func, XtPointer client_data) + + /* events callback is to receive */ + /* function to be called */ + /* client data for above */ { struct markerCallback *cb; int i; @@ -676,10 +664,10 @@ GmAddCallback (gm, events, func, client_data) * function pointer and client data passed when the callback was registered. */ void -GmDeleteCallback (gm, func, client_data) - Marker gm; - GmIMethod func; /* callback function */ - XtPointer client_data; /* client data for above */ +GmDeleteCallback (struct marker *gm, GmIMethod func, XtPointer client_data) + + /* callback function */ + /* client data for above */ { struct markerCallback *cb; int i, n; @@ -707,10 +695,7 @@ GmDeleteCallback (gm, func, client_data) * of the marker was selected. */ Marker -GmSelect (w, x, y, what) - GtermWidget w; - int x, y; - GmSelection what; +GmSelect (GtermWidget w, int x, int y, GmSelection what) { int flags = (Gm_Activated|Gm_Visible|Gm_Sensitive); XRectangle *r; @@ -736,8 +721,7 @@ GmSelect (w, x, y, what) * marker is later redrawn. */ void -GmMarkpos (gm) - Marker gm; +GmMarkpos (struct marker *gm) { gm->markpos (gm); } @@ -750,10 +734,7 @@ GmMarkpos (gm) * redrawn, and finally the current marker is redrawn at the new location. */ void -GmRedraw (gm, func, erase) - Marker gm; - int func; - int erase; +GmRedraw (struct marker *gm, int func, int erase) { Marker mm; XRectangle *o, *n, *r; @@ -867,9 +848,7 @@ GmRedraw (gm, func, erase) * the entire window if the region is given as (char *)NULL. */ void -GmRedisplay (w, region) - GtermWidget w; - Region region; +GmRedisplay (GtermWidget w, Region region) { int flags = (Gm_Activated|Gm_Visible); XRectangle *r; @@ -907,8 +886,7 @@ GmRedisplay (w, region) * marker, causing the first marker to be drawn above the second. */ void -GmRaise (gm, ref_gm) - Marker gm, ref_gm; +GmRaise (struct marker *gm, struct marker *ref_gm) { GtermWidget w = gm->w; int erase; @@ -931,8 +909,7 @@ GmRaise (gm, ref_gm) * marker, causing the first marker to be drawn below the second. */ void -GmLower (gm, ref_gm) - Marker gm, ref_gm; +GmLower (struct marker *gm, struct marker *ref_gm) { GtermWidget w = gm->w; int erase; @@ -964,12 +941,7 @@ GmLower (gm, ref_gm) * given marker events have occurred. */ void -GmNotify (gm, events, event, params, nparams) - Marker gm; - int events; - XEvent *event; - String *params; - Cardinal nparams; +GmNotify (struct marker *gm, int events, XEvent *event, String *params, Cardinal nparams) { gm_do_callbacks (gm, events, event, params, nparams); } @@ -978,9 +950,7 @@ GmNotify (gm, events, event, params, nparams) /* GmAddPt -- Add a point to a marker. */ void -GmAddPt (gm, x, y) - Marker gm; - int x, y; +GmAddPt (struct marker *gm, int x, int y) { int erase; if (gm->addPt) { @@ -995,9 +965,7 @@ GmAddPt (gm, x, y) /* GmDeletePt -- Delete a point from a marker. */ void -GmDeletePt (gm, x, y) - Marker gm; - int x, y; +GmDeletePt (struct marker *gm, int x, int y) { int erase; if (gm->deletePt) { @@ -1012,9 +980,7 @@ GmDeletePt (gm, x, y) /* GmMovePt -- Move a point within a marker. */ void -GmMovePt (gm, x, y) - Marker gm; - int x, y; +GmMovePt (struct marker *gm, int x, int y) { int erase; if (gm->movePt) { @@ -1028,9 +994,7 @@ GmMovePt (gm, x, y) /* GmMove -- Move a marker. */ void -GmMove (gm, x, y) - Marker gm; - int x, y; +GmMove (struct marker *gm, int x, int y) { int erase; if (gm->move) { @@ -1044,9 +1008,7 @@ GmMove (gm, x, y) /* GmResize -- Resize a marker. */ void -GmResize (gm, x, y) - Marker gm; - int x, y; +GmResize (struct marker *gm, int x, int y) { int erase; if (gm->resize) { @@ -1060,9 +1022,7 @@ GmResize (gm, x, y) /* GmRotate -- Rotate a marker. */ void -GmRotate (gm, x, y) - Marker gm; - int x, y; +GmRotate (struct marker *gm, int x, int y) { int erase; if (gm->rotate) { @@ -1078,11 +1038,7 @@ GmRotate (gm, x, y) * until all attributes have been changed. */ int -GmSetAttributes (gm, args, nargs, argtype) - Marker gm; - ArgList args; - int nargs; - char *argtype; +GmSetAttributes (struct marker *gm, ArgList args, int nargs, char *argtype) { int i; int autoredraw, erase; @@ -1111,11 +1067,7 @@ GmSetAttributes (gm, args, nargs, argtype) /* GmSetAttribute -- Set the value of a marker attribute. */ int -GmSetAttribute (gm, attribute, value, type) - Marker gm; - char *attribute; - XtArgVal value; - char *type; +GmSetAttribute (struct marker *gm, char *attribute, XtArgVal value, char *type) { GtermWidget w = gm->w; int marker_type, atType; @@ -1360,11 +1312,7 @@ GmSetAttribute (gm, attribute, value, type) * values be specified in the same type. */ void -GmGetAttributes (gm, args, nargs, argtype) - Marker gm; - ArgList args; - int nargs; - char *argtype; +GmGetAttributes (struct marker *gm, ArgList args, int nargs, char *argtype) { int i; @@ -1376,11 +1324,7 @@ GmGetAttributes (gm, args, nargs, argtype) /* GmGetAttribute -- Get the value of a marker attribute. */ int -GmGetAttribute (gm, attribute, value, type) - Marker gm; - char *attribute; - XtArgVal value; - char *type; +GmGetAttribute (struct marker *gm, char *attribute, XtArgVal value, char *type) { GtermWidget w = gm->w; int i; @@ -1601,11 +1545,11 @@ GmGetAttribute (gm, attribute, value, type) /* GmSetVertices -- Set the vertices of a "poly" type object. */ void -GmSetVertices (gm, points, first, npts) - Marker gm; - DPoint *points; /* input array of points */ - int first; /* first point to be set */ - int npts; /* number of points to set */ +GmSetVertices (struct marker *gm, DPoint *points, int first, int npts) + + /* input array of points */ + /* first point to be set */ + /* number of points to set */ { DPoint *ip, *pp; XPoint *op; @@ -1678,11 +1622,11 @@ GmSetVertices (gm, points, first, npts) * number of points output is returned as the function value. */ int -GmGetVertices (gm, points, first, maxpts) - Marker gm; - DPoint *points; /* output array of points */ - int first; /* first point to be returned */ - int maxpts; /* max number of points to return */ +GmGetVertices (struct marker *gm, DPoint *points, int first, int maxpts) + + /* output array of points */ + /* first point to be returned */ + /* max number of points to return */ { XPoint *ip; DPoint *op; @@ -1716,10 +1660,7 @@ GmGetVertices (gm, points, first, maxpts) * marker, regardless of its type or orientation. */ void -GmGetBoundingBox (gm, x, y, width, height) - Marker gm; - int *x, *y; - int *width, *height; +GmGetBoundingBox (struct marker *gm, int *x, int *y, int *width, int *height) { XRectangle *r = &gm->cur_rect; @@ -1733,8 +1674,7 @@ GmGetBoundingBox (gm, x, y, width, height) /* GmStrToType -- Convert a marker type string to a marker type code. */ int -GmStrToType (marker_type) -char *marker_type; +GmStrToType (char *marker_type) { int type; @@ -1764,8 +1704,7 @@ char *marker_type; /* GmStrToEvent -- Convert a marker event type string to a marker event code. */ int -GmStrToEvent (event_type) -char *event_type; +GmStrToEvent (char *event_type) { int type; @@ -1798,8 +1737,7 @@ char *event_type; * XLIB function code. */ int -GmStrToFunction (function) -char *function; +GmStrToFunction (char *function) { int code; @@ -1847,9 +1785,7 @@ char *function; */ static int -gm_getint (value, type) - XtArgVal value; - char *type; +gm_getint (XtArgVal value, char *type) { int ch; @@ -1874,10 +1810,7 @@ gm_getint (value, type) static Pixel -gm_getpixel (w, value, type) - GtermWidget w; - XtArgVal value; - char *type; +gm_getpixel (GtermWidget w, XtArgVal value, char *type) { XrmValue from, to; Pixel pixel; @@ -1949,10 +1882,7 @@ gm_getpixel (w, value, type) static int -gm_getfillstyle (w, value, type) - GtermWidget w; - XtArgVal value; - char *type; +gm_getfillstyle (GtermWidget w, XtArgVal value, char *type) { switch (gm_gettype (type)) { case Gt_String: @@ -1974,9 +1904,7 @@ gm_getfillstyle (w, value, type) static double -gm_getfloat (value, type) - XtArgVal value; - char *type; +gm_getfloat (XtArgVal value, char *type) { switch (gm_gettype (type)) { case Gt_Bool: @@ -1993,9 +1921,7 @@ gm_getfloat (value, type) static char * -gm_getstring (value, type) - XtArgVal value; - char *type; +gm_getstring (XtArgVal value, char *type) { if (strcmp (type, XtRString) == 0) return ((char *)value); @@ -2005,10 +1931,7 @@ gm_getstring (value, type) static int -gm_putint (ival, value, type) - int ival; - XtArgVal value; - char *type; +gm_putint (int ival, XtArgVal value, char *type) { switch (gm_gettype (type)) { case Gt_Bool: @@ -2029,10 +1952,7 @@ gm_putint (ival, value, type) static int -gm_putfloat (fval, value, type) - double fval; - XtArgVal value; - char *type; +gm_putfloat (double fval, XtArgVal value, char *type) { switch (gm_gettype (type)) { case Gt_Bool: @@ -2053,8 +1973,7 @@ gm_putfloat (fval, value, type) static int -gm_gettype (type) - char *type; +gm_gettype (char *type) { if (strcmp (type, XtRBool) == 0) return (Gt_Int); @@ -2072,8 +1991,7 @@ gm_gettype (type) static int -gm_getattribute (attribute) - char *attribute; +gm_getattribute (char *attribute) { if (strcmp (attribute, GmType) == 0) return (Ga_Type); @@ -2138,9 +2056,7 @@ gm_getattribute (attribute) } static void -gm_linkafter (gm, prev) - Marker gm; - Marker prev; +gm_linkafter (struct marker *gm, struct marker *prev) { GtermWidget w = gm->w; @@ -2159,8 +2075,7 @@ gm_linkafter (gm, prev) static void -gm_unlink (gm) - Marker gm; +gm_unlink (struct marker *gm) { GtermWidget w = gm->w; @@ -2183,12 +2098,7 @@ gm_unlink (gm) * event type. */ static int -gm_do_callbacks (gm, events, event, params, nparams) - Marker gm; - int events; - XEvent *event; - String *params; - Cardinal nparams; +gm_do_callbacks (struct marker *gm, int events, XEvent *event, String *params, Cardinal nparams) { int n; struct markerCallback *cb; @@ -2221,9 +2131,7 @@ gm_do_callbacks (gm, events, event, params, nparams) * certain area or range of sizes, to forbid rotation, and so on. */ static void -gm_constraint (gm, new_gm, what) - Marker gm, new_gm; - int what; +gm_constraint (struct marker *gm, struct marker *new_gm, int what) { char *ip, *op; char argbuf[2048]; @@ -2298,8 +2206,7 @@ gm_constraint (gm, new_gm, what) static void -gm_erase (gm) - Marker gm; +gm_erase (struct marker *gm) { GtermWidget w = gm->w; XRectangle *r = &gm->old_rect; @@ -2322,11 +2229,7 @@ gm_erase (gm) /* M_create -- Create a marker. */ static void -M_create (widget, event, params, nparams) - Widget widget; - XEvent *event; - String *params; - Cardinal *nparams; +M_create (Widget widget, XEvent *event, String *params, Cardinal *nparams) { GtermWidget w = (GtermWidget)widget; XButtonEvent *ev = (XButtonEvent *) event; @@ -2363,11 +2266,7 @@ M_create (widget, event, params, nparams) /* M_destroy -- Destroy a marker. */ static void -M_destroy (widget, event, params, nparams) - Widget widget; - XEvent *event; - String *params; - Cardinal *nparams; +M_destroy (Widget widget, XEvent *event, String *params, Cardinal *nparams) { GtermWidget w = (GtermWidget)widget; XButtonEvent *ev = (XButtonEvent *) event; @@ -2387,11 +2286,7 @@ M_destroy (widget, event, params, nparams) /* M_destroyNull -- Destroy a marker if it is null sized. */ static void -M_destroyNull (widget, event, params, nparams) - Widget widget; - XEvent *event; - String *params; - Cardinal *nparams; +M_destroyNull (Widget widget, XEvent *event, String *params, Cardinal *nparams) { GtermWidget w = (GtermWidget)widget; XButtonEvent *ev = (XButtonEvent *) event; @@ -2412,11 +2307,7 @@ M_destroyNull (widget, event, params, nparams) /* M_set -- Set a marker attribute. */ static void -M_set (widget, event, params, nparams) - Widget widget; - XEvent *event; - String *params; - Cardinal *nparams; +M_set (Widget widget, XEvent *event, String *params, Cardinal *nparams) { GtermWidget w = (GtermWidget)widget; XButtonEvent *ev = (XButtonEvent *) event; @@ -2438,11 +2329,7 @@ M_set (widget, event, params, nparams) /* M_raise -- Raise a marker to the top of the display list. */ static void -M_raise (widget, event, params, nparams) - Widget widget; - XEvent *event; - String *params; - Cardinal *nparams; +M_raise (Widget widget, XEvent *event, String *params, Cardinal *nparams) { GtermWidget w = (GtermWidget)widget; XButtonEvent *ev = (XButtonEvent *) event; @@ -2462,11 +2349,7 @@ M_raise (widget, event, params, nparams) /* M_lower -- Lower a marker to the bottom of the display list. */ static void -M_lower (widget, event, params, nparams) - Widget widget; - XEvent *event; - String *params; - Cardinal *nparams; +M_lower (Widget widget, XEvent *event, String *params, Cardinal *nparams) { GtermWidget w = (GtermWidget)widget; XButtonEvent *ev = (XButtonEvent *) event; @@ -2487,11 +2370,7 @@ M_lower (widget, event, params, nparams) * specified type of events. */ static void -M_notify (widget, event, params, nparams) - Widget widget; - XEvent *event; - String *params; - Cardinal *nparams; +M_notify (Widget widget, XEvent *event, String *params, Cardinal *nparams) { GtermWidget w = (GtermWidget)widget; XButtonEvent *ev = (XButtonEvent *) event; @@ -2530,11 +2409,7 @@ M_notify (widget, event, params, nparams) * that a input event has occurred. */ static void -M_input (widget, event, params, nparams) - Widget widget; - XEvent *event; - String *params; - Cardinal *nparams; +M_input (Widget widget, XEvent *event, String *params, Cardinal *nparams) { GtermWidget w = (GtermWidget)widget; XKeyEvent *ev = (XKeyEvent *) event; @@ -2554,11 +2429,7 @@ M_input (widget, event, params, nparams) * can later be erased. */ static void -M_markpos (widget, event, params, nparams) - Widget widget; - XEvent *event; - String *params; - Cardinal *nparams; +M_markpos (Widget widget, XEvent *event, String *params, Cardinal *nparams) { GtermWidget w = (GtermWidget)widget; XButtonEvent *ev = (XButtonEvent *) event; @@ -2581,11 +2452,7 @@ M_markpos (widget, event, params, nparams) * markpos action is executed. */ static void -M_markposAdd (widget, event, params, nparams) - Widget widget; - XEvent *event; - String *params; - Cardinal *nparams; +M_markposAdd (Widget widget, XEvent *event, String *params, Cardinal *nparams) { GtermWidget w = (GtermWidget)widget; XButtonEvent *ev = (XButtonEvent *) event; @@ -2612,11 +2479,7 @@ M_markposAdd (widget, event, params, nparams) /* M_redraw -- Redraw a marker. */ static void -M_redraw (widget, event, params, nparams) - Widget widget; - XEvent *event; - String *params; - Cardinal *nparams; +M_redraw (Widget widget, XEvent *event, String *params, Cardinal *nparams) { GtermWidget w = (GtermWidget)widget; XButtonEvent *ev = (XButtonEvent *) event; @@ -2641,11 +2504,7 @@ M_redraw (widget, event, params, nparams) /* M_addPt -- Add a point. */ static void -M_addPt (widget, event, params, nparams) - Widget widget; - XEvent *event; - String *params; - Cardinal *nparams; +M_addPt (Widget widget, XEvent *event, String *params, Cardinal *nparams) { GtermWidget w = (GtermWidget)widget; XButtonEvent *ev = (XButtonEvent *) event; @@ -2669,11 +2528,7 @@ M_addPt (widget, event, params, nparams) /* M_deletePt -- Delete a point. */ static void -M_deletePt (widget, event, params, nparams) - Widget widget; - XEvent *event; - String *params; - Cardinal *nparams; +M_deletePt (Widget widget, XEvent *event, String *params, Cardinal *nparams) { GtermWidget w = (GtermWidget)widget; XButtonEvent *ev = (XButtonEvent *) event; @@ -2695,11 +2550,7 @@ M_deletePt (widget, event, params, nparams) /* M_movePt -- Move a point. */ static void -M_movePt (widget, event, params, nparams) - Widget widget; - XEvent *event; - String *params; - Cardinal *nparams; +M_movePt (Widget widget, XEvent *event, String *params, Cardinal *nparams) { GtermWidget w = (GtermWidget)widget; XButtonEvent *ev = (XButtonEvent *) event; @@ -2724,11 +2575,7 @@ M_movePt (widget, event, params, nparams) * pointer position. */ static void -M_deleteDestroy (widget, event, params, nparams) - Widget widget; - XEvent *event; - String *params; - Cardinal *nparams; +M_deleteDestroy (Widget widget, XEvent *event, String *params, Cardinal *nparams) { GtermWidget w = (GtermWidget)widget; XButtonEvent *ev = (XButtonEvent *) event; @@ -2756,11 +2603,7 @@ M_deleteDestroy (widget, event, params, nparams) /* M_move -- Move a marker. */ static void -M_move (widget, event, params, nparams) - Widget widget; - XEvent *event; - String *params; - Cardinal *nparams; +M_move (Widget widget, XEvent *event, String *params, Cardinal *nparams) { GtermWidget w = (GtermWidget)widget; XButtonEvent *ev = (XButtonEvent *) event; @@ -2784,11 +2627,7 @@ M_move (widget, event, params, nparams) /* M_resize -- Resize a marker. */ static void -M_resize (widget, event, params, nparams) - Widget widget; - XEvent *event; - String *params; - Cardinal *nparams; +M_resize (Widget widget, XEvent *event, String *params, Cardinal *nparams) { GtermWidget w = (GtermWidget)widget; XButtonEvent *ev = (XButtonEvent *) event; @@ -2813,11 +2652,7 @@ M_resize (widget, event, params, nparams) * upon the pointer position. */ static void -M_moveResize (widget, event, params, nparams) - Widget widget; - XEvent *event; - String *params; - Cardinal *nparams; +M_moveResize (Widget widget, XEvent *event, String *params, Cardinal *nparams) { GtermWidget w = (GtermWidget)widget; XButtonEvent *ev = (XButtonEvent *) event; @@ -2855,11 +2690,7 @@ resize: GmResize (gm, ev->x, ev->y); /* M_rotate -- Rotate a marker. */ static void -M_rotate (widget, event, params, nparams) - Widget widget; - XEvent *event; - String *params; - Cardinal *nparams; +M_rotate (Widget widget, XEvent *event, String *params, Cardinal *nparams) { GtermWidget w = (GtermWidget)widget; XButtonEvent *ev = (XButtonEvent *) event; @@ -2883,11 +2714,7 @@ M_rotate (widget, event, params, nparams) /* M_rotateResize -- Rotate or resize a marker. */ static void -M_rotateResize (widget, event, params, nparams) - Widget widget; - XEvent *event; - String *params; - Cardinal *nparams; +M_rotateResize (Widget widget, XEvent *event, String *params, Cardinal *nparams) { GtermWidget w = (GtermWidget)widget; XButtonEvent *ev = (XButtonEvent *) event; @@ -2949,15 +2776,13 @@ M_rotateResize (widget, event, params, nparams) /* Marker class TEXT. */ -static int gm_text_select(); -static void gm_text_move(), gm_text_resize(); -static void gm_text_markpos(), gm_text_redraw(); -static void gm_text_update(), gm_text_updatePolygon(); +static int gm_text_select(struct marker *gm, int x, int y, GmSelection what); +static void gm_text_move(struct marker *gm, int x, int y), gm_text_resize(struct marker *gm, int x, int y); +static void gm_text_markpos(struct marker *gm), gm_text_redraw(struct marker *gm, int function); +static void gm_text_update(struct marker *gm), gm_text_updatePolygon(struct marker *gm); static void -gm_text_init (gm, interactive) - Marker gm; - int interactive; +gm_text_init (struct marker *gm, int interactive) { GtermWidget w = gm->w; @@ -3005,10 +2830,7 @@ gm_text_init (gm, interactive) } static int -gm_text_select (gm, x, y, what) - Marker gm; - int x, y; - GmSelection what; +gm_text_select (struct marker *gm, int x, int y, GmSelection what) { if (gm_select (gm, x, y, what)) { if (what && what->type == Ge_Edge) @@ -3020,17 +2842,14 @@ gm_text_select (gm, x, y, what) static void -gm_text_markpos (gm) - Marker gm; +gm_text_markpos (struct marker *gm) { gm_markpos (gm); } static void -gm_text_redraw (gm, function) - Marker gm; - int function; +gm_text_redraw (struct marker *gm, int function) { GtermWidget w = gm->w; int flags = (Gm_Activated|Gm_Visible); @@ -3145,8 +2964,7 @@ gm_text_redraw (gm, function) static void -gm_text_update (gm) - Marker gm; +gm_text_update (struct marker *gm) { GtermWidget w = gm->w; int flags = (Gm_Activated|Gm_Visible); @@ -3164,9 +2982,7 @@ gm_text_update (gm) } static void -gm_text_move (gm, x, y) - Marker gm; - int x, y; +gm_text_move (struct marker *gm, int x, int y) { struct marker new_gm; new_gm.x = max (0, x - gm->width / 2); @@ -3180,9 +2996,7 @@ gm_text_move (gm, x, y) } static void -gm_text_resize (gm, x, y) - Marker gm; - int x, y; +gm_text_resize (struct marker *gm, int x, int y) { struct marker new_gm; new_gm.width = abs (x - gm->x); @@ -3196,8 +3010,7 @@ gm_text_resize (gm, x, y) } static void -gm_text_updatePolygon (gm) - Marker gm; +gm_text_updatePolygon (struct marker *gm) { XPoint *p = gm->points; int xsize = gm->width; @@ -3214,9 +3027,7 @@ gm_text_updatePolygon (gm) /* Marker class LINE. */ static void -gm_line_init (gm, interactive) - Marker gm; - int interactive; +gm_line_init (struct marker *gm, int interactive) { gm->type = Gm_Line; /* stub out for now */ @@ -3226,9 +3037,7 @@ gm_line_init (gm, interactive) /* Marker class POLYLINE. */ static void -gm_plin_init (gm, interactive) - Marker gm; - int interactive; +gm_plin_init (struct marker *gm, int interactive) { gm->type = Gm_Polyline; /* stub out for now */ @@ -3237,14 +3046,12 @@ gm_plin_init (gm, interactive) /* Marker class RECTANGLE. */ -static int gm_rect_select(); -static void gm_rect_move(), gm_rect_resize(), gm_rect_rotate(); -static void gm_rect_update(), gm_rect_updatePolygon(); +static int gm_rect_select(struct marker *gm, int x, int y, GmSelection what); +static void gm_rect_move(struct marker *gm, int x, int y), gm_rect_resize(struct marker *gm, int x, int y), gm_rect_rotate(struct marker *gm, int x, int y); +static void gm_rect_update(struct marker *gm), gm_rect_updatePolygon(struct marker *gm); static void -gm_rect_init (gm, interactive) - Marker gm; - int interactive; +gm_rect_init (struct marker *gm, int interactive) { GtermWidget w = gm->w; @@ -3280,8 +3087,7 @@ gm_rect_init (gm, interactive) } static void -gm_rect_update (gm) - Marker gm; +gm_rect_update (struct marker *gm) { if (gm->flags & Gm_Modified) { gm_rect_updatePolygon (gm); @@ -3291,10 +3097,7 @@ gm_rect_update (gm) } static int -gm_rect_select (gm, x, y, what) - Marker gm; - int x, y; - GmSelection what; +gm_rect_select (struct marker *gm, int x, int y, GmSelection what) { if (gm_select (gm, x, y, what)) { if (what && what->type == Ge_Edge) @@ -3305,9 +3108,7 @@ gm_rect_select (gm, x, y, what) } static void -gm_rect_move (gm, x, y) - Marker gm; - int x, y; +gm_rect_move (struct marker *gm, int x, int y) { struct marker new_gm; new_gm.x = x; new_gm.y = y; @@ -3319,9 +3120,7 @@ gm_rect_move (gm, x, y) } static void -gm_rect_resize (gm, x, y) - Marker gm; - int x, y; +gm_rect_resize (struct marker *gm, int x, int y) { /* double cos_rotangle = cos (-(gm->rotangle)); double sin_rotangle = sin (-(gm->rotangle)); */ @@ -3364,9 +3163,7 @@ gm_rect_resize (gm, x, y) } static void -gm_rect_rotate (gm, x, y) - Marker gm; - int x, y; +gm_rect_rotate (struct marker *gm, int x, int y) { double alpha, theta; struct marker new_gm; @@ -3396,8 +3193,7 @@ gm_rect_rotate (gm, x, y) } static void -gm_rect_updatePolygon (gm) - Marker gm; +gm_rect_updatePolygon (struct marker *gm) { int x, y; XPoint *p = gm->points; @@ -3433,14 +3229,12 @@ gm_rect_updatePolygon (gm) * described and resized by the center and radius (width/height), like * the other "centered" marker types (circle, ellipse, etc.). */ -static int gm_boxx_select(); -static void gm_boxx_move(), gm_boxx_resize(), gm_boxx_rotate(); -static void gm_boxx_update(), gm_boxx_updatePolygon(); +static int gm_boxx_select(struct marker *gm, int x, int y, GmSelection what); +static void gm_boxx_move(struct marker *gm, int x, int y), gm_boxx_resize(struct marker *gm, int x, int y), gm_boxx_rotate(struct marker *gm, int x, int y); +static void gm_boxx_update(struct marker *gm), gm_boxx_updatePolygon(struct marker *gm); static void -gm_boxx_init (gm, interactive) - Marker gm; - int interactive; +gm_boxx_init (struct marker *gm, int interactive) { GtermWidget w = gm->w; @@ -3476,8 +3270,7 @@ gm_boxx_init (gm, interactive) } static void -gm_boxx_update (gm) - Marker gm; +gm_boxx_update (struct marker *gm) { if (gm->flags & Gm_Modified) { gm_boxx_updatePolygon (gm); @@ -3487,10 +3280,7 @@ gm_boxx_update (gm) } static int -gm_boxx_select (gm, x, y, what) - Marker gm; - int x, y; - GmSelection what; +gm_boxx_select (struct marker *gm, int x, int y, GmSelection what) { if (gm_select (gm, x, y, what)) { if (what && what->type == Ge_Edge) @@ -3501,9 +3291,7 @@ gm_boxx_select (gm, x, y, what) } static void -gm_boxx_move (gm, x, y) - Marker gm; - int x, y; +gm_boxx_move (struct marker *gm, int x, int y) { struct marker new_gm; new_gm.x = x; new_gm.y = y; @@ -3515,9 +3303,7 @@ gm_boxx_move (gm, x, y) } static void -gm_boxx_resize (gm, x, y) - Marker gm; - int x, y; +gm_boxx_resize (struct marker *gm, int x, int y) { /* double cos_rotangle = cos (-(gm->rotangle)); double sin_rotangle = sin (-(gm->rotangle)); */ @@ -3546,9 +3332,7 @@ gm_boxx_resize (gm, x, y) } static void -gm_boxx_rotate (gm, x, y) - Marker gm; - int x, y; +gm_boxx_rotate (struct marker *gm, int x, int y) { double alpha, theta; struct marker new_gm; @@ -3573,8 +3357,7 @@ gm_boxx_rotate (gm, x, y) } static void -gm_boxx_updatePolygon (gm) - Marker gm; +gm_boxx_updatePolygon (struct marker *gm) { int x, y; XPoint *p = gm->points; @@ -3610,14 +3393,12 @@ gm_boxx_updatePolygon (gm) /* Marker class CIRCLE. */ -static int gm_circ_select(); -static void gm_circ_move(), gm_circ_resize(), gm_circ_rotate(); -static void gm_circ_update(), gm_circ_updatePolygon(); +static int gm_circ_select(struct marker *gm, int x, int y, GmSelection what); +static void gm_circ_move(struct marker *gm, int x, int y), gm_circ_resize(struct marker *gm, int x, int y), gm_circ_rotate(); +static void gm_circ_update(struct marker *gm), gm_circ_updatePolygon(struct marker *gm); static void -gm_circ_init (gm, interactive) - Marker gm; - int interactive; +gm_circ_init (struct marker *gm, int interactive) { GtermWidget w = gm->w; @@ -3656,8 +3437,7 @@ gm_circ_init (gm, interactive) } static void -gm_circ_update (gm) - Marker gm; +gm_circ_update (struct marker *gm) { if (gm->flags & Gm_Modified) { gm_circ_updatePolygon (gm); @@ -3667,10 +3447,7 @@ gm_circ_update (gm) } static int -gm_circ_select (gm, x, y, what) - Marker gm; - int x, y; - GmSelection what; +gm_circ_select (struct marker *gm, int x, int y, GmSelection what) { if (gm_select (gm, x, y, what)) { if (what && what->type == Ge_Point) @@ -3681,9 +3458,7 @@ gm_circ_select (gm, x, y, what) } static void -gm_circ_move (gm, x, y) - Marker gm; - int x, y; +gm_circ_move (struct marker *gm, int x, int y) { struct marker new_gm; new_gm.x = x; new_gm.y = y; @@ -3695,9 +3470,7 @@ gm_circ_move (gm, x, y) } static void -gm_circ_resize (gm, x, y) - Marker gm; - int x, y; +gm_circ_resize (struct marker *gm, int x, int y) { struct marker new_gm; new_gm.width = new_gm.height = @@ -3710,8 +3483,7 @@ gm_circ_resize (gm, x, y) } static void -gm_circ_updatePolygon (gm) - Marker gm; +gm_circ_updatePolygon (struct marker *gm) { XPoint *p = gm->points; int npts, i, j; @@ -3748,14 +3520,12 @@ gm_circ_updatePolygon (gm) /* Marker class ELLIPSE. */ -static int gm_elip_select(); -static void gm_elip_move(), gm_elip_resize(), gm_elip_rotate(); -static void gm_elip_update(), gm_elip_updatePolygon(); +static int gm_elip_select(struct marker *gm, int x, int y, GmSelection what); +static void gm_elip_move(struct marker *gm, int x, int y), gm_elip_resize(struct marker *gm, int x, int y), gm_elip_rotate(struct marker *gm, int x, int y); +static void gm_elip_update(struct marker *gm), gm_elip_updatePolygon(struct marker *gm); static void -gm_elip_init (gm, interactive) - Marker gm; - int interactive; +gm_elip_init (struct marker *gm, int interactive) { GtermWidget w = gm->w; @@ -3793,8 +3563,7 @@ gm_elip_init (gm, interactive) } static void -gm_elip_update (gm) - Marker gm; +gm_elip_update (struct marker *gm) { if (gm->flags & Gm_Modified) { gm_elip_updatePolygon (gm); @@ -3804,10 +3573,7 @@ gm_elip_update (gm) } static int -gm_elip_select (gm, x, y, what) - Marker gm; - int x, y; - GmSelection what; +gm_elip_select (struct marker *gm, int x, int y, GmSelection what) { if (gm_select (gm, x, y, what)) { if (what && what->type == Ge_Point) @@ -3818,9 +3584,7 @@ gm_elip_select (gm, x, y, what) } static void -gm_elip_move (gm, x, y) - Marker gm; - int x, y; +gm_elip_move (struct marker *gm, int x, int y) { struct marker new_gm; new_gm.x = x; new_gm.y = y; @@ -3832,9 +3596,7 @@ gm_elip_move (gm, x, y) } static void -gm_elip_resize (gm, x, y) - Marker gm; - int x, y; +gm_elip_resize (struct marker *gm, int x, int y) { struct marker new_gm; /* double theta = -(gm->rotangle);*/ @@ -3862,9 +3624,7 @@ gm_elip_resize (gm, x, y) } static void -gm_elip_rotate (gm, x, y) - Marker gm; - int x, y; +gm_elip_rotate (struct marker *gm, int x, int y) { struct marker new_gm; double theta; @@ -3885,8 +3645,7 @@ gm_elip_rotate (gm, x, y) } static void -gm_elip_updatePolygon (gm) - Marker gm; +gm_elip_updatePolygon (struct marker *gm) { XPoint *p = gm->points; int npts, i, j; @@ -3928,14 +3687,12 @@ gm_elip_updatePolygon (gm) /* Marker class POLYGON. */ static int gm_pgon_select(); -static void gm_pgon_addPt(), gm_pgon_deletePt(), gm_pgon_movePt(); -static void gm_pgon_move(), gm_pgon_resize(), gm_pgon_rotate(); -static void gm_pgon_redraw(), gm_pgon_update(), gm_pgon_updatePolygon(); +static void gm_pgon_addPt(struct marker *gm, int x, int y), gm_pgon_deletePt(struct marker *gm, int x, int y), gm_pgon_movePt(struct marker *gm, int x, int y); +static void gm_pgon_move(struct marker *gm, int x, int y), gm_pgon_resize(struct marker *gm, int x, int y), gm_pgon_rotate(struct marker *gm, int x, int y); +static void gm_pgon_redraw(struct marker *gm, int function), gm_pgon_update(struct marker *gm), gm_pgon_updatePolygon(struct marker *gm); static void -gm_pgon_init (gm, interactive) - Marker gm; - int interactive; +gm_pgon_init (struct marker *gm, int interactive) { GtermWidget w = gm->w; DPoint *p; @@ -4018,9 +3775,7 @@ gm_pgon_init (gm, interactive) } static void -gm_pgon_redraw (gm, function) - Marker gm; - int function; +gm_pgon_redraw (struct marker *gm, int function) { /* The PgonInit flag is set when a polygon marker is interactively created * to cause any pointer motion event to resize the marker. The first @@ -4033,8 +3788,7 @@ gm_pgon_redraw (gm, function) } static void -gm_pgon_update (gm) - Marker gm; +gm_pgon_update (struct marker *gm) { if (gm->flags & Gm_Modified) { gm_pgon_updatePolygon (gm); @@ -4044,9 +3798,7 @@ gm_pgon_update (gm) } static void -gm_pgon_addPt (gm, x, y) - Marker gm; - int x, y; +gm_pgon_addPt (struct marker *gm, int x, int y) { DPoint *pv; GtermWidget w = gm->w; @@ -4100,9 +3852,7 @@ gm_pgon_addPt (gm, x, y) } static void -gm_pgon_deletePt (gm, x, y) - Marker gm; - int x, y; +gm_pgon_deletePt (struct marker *gm, int x, int y) { DPoint *pv; GtermWidget w = gm->w; @@ -4141,9 +3891,7 @@ gm_pgon_deletePt (gm, x, y) } static void -gm_pgon_movePt (gm, x, y) - Marker gm; - int x, y; +gm_pgon_movePt (struct marker *gm, int x, int y) { DPoint *p; GtermWidget w = gm->w; @@ -4182,9 +3930,7 @@ gm_pgon_movePt (gm, x, y) } static void -gm_pgon_move (gm, x, y) - Marker gm; - int x, y; +gm_pgon_move (struct marker *gm, int x, int y) { struct marker new_gm; @@ -4201,9 +3947,7 @@ gm_pgon_move (gm, x, y) } static void -gm_pgon_resize (gm, x, y) - Marker gm; - int x, y; +gm_pgon_resize (struct marker *gm, int x, int y) { DPoint *p, *q; GtermWidget w = gm->w; @@ -4261,9 +4005,7 @@ gm_pgon_resize (gm, x, y) } static void -gm_pgon_rotate (gm, x, y) - Marker gm; - int x, y; +gm_pgon_rotate (struct marker *gm, int x, int y) { DPoint *p; GtermWidget w = gm->w; @@ -4314,8 +4056,7 @@ gm_pgon_rotate (gm, x, y) } static void -gm_pgon_updatePolygon (gm) - Marker gm; +gm_pgon_updatePolygon (struct marker *gm) { int npts, i; DPoint *ip = gm->pgon; @@ -4364,10 +4105,7 @@ gm_pgon_updatePolygon (gm) * determine whether the point selects a vertex, edge, or the entire marker. */ static int -gm_select (gm, x, y, what) - Marker gm; - int x, y; - GmSelection what; +gm_select (struct marker *gm, int x, int y, GmSelection what) { XPoint *p, *ptop; GtermWidget w = gm->w; @@ -4486,9 +4224,7 @@ gm_select (gm, x, y, what) } static int -point_in_poly (npol, xp, yp, x, y) -int npol; -float *xp, *yp, x, y; +point_in_poly (int npol, float *xp, float *yp, float x, float y) { int i, j, c = 0; @@ -4508,8 +4244,7 @@ float *xp, *yp, x, y; /* gm_markpos -- Mark the current position of a marker. */ static void -gm_markpos (gm) - Marker gm; +gm_markpos (struct marker *gm) { gm->old_rect = gm->cur_rect; XUnionRegion (gm->cur_region, null_region, gm->old_region); @@ -4519,9 +4254,7 @@ gm_markpos (gm) /* gm_redraw -- Redraw a marker expressed as a list of vertices. */ static void -gm_redraw (gm, function) - Marker gm; - int function; +gm_redraw (struct marker *gm, int function) { GtermWidget w = gm->w; Display *display = w->gterm.display; @@ -4614,9 +4347,9 @@ gm_redraw (gm, function) /* gm_rotate_indicator -- Draw a line indicating the rotation angle. */ static void -gm_rotate_indicator (gm, function) /* MF020 */ -Marker gm; -int function; +gm_rotate_indicator (struct marker *gm, int function) /* MF020 */ + + { GtermWidget w = gm->w; Display *display = w->gterm.display; @@ -4655,8 +4388,7 @@ int function; * a marker (assumes that the marker is expressed as list of points). */ static void -gm_setCurRect (gm) -Marker gm; +gm_setCurRect (struct marker *gm) { int border; @@ -4678,8 +4410,7 @@ Marker gm; /* gm_niceAngle -- Round a rotation angle to a "nice" value. */ static double -gm_niceAngle (alpha) - double alpha; +gm_niceAngle (double alpha) { double tol = 0.003; double beta; diff --git a/obm/ObmW/GtermP.h b/obm/ObmW/GtermP.h index 4043089..a844761 100644 --- a/obm/ObmW/GtermP.h +++ b/obm/ObmW/GtermP.h @@ -48,7 +48,6 @@ #define NColors 8 typedef void (*GmVMethod)(); -typedef int (*GmIMethod)(); /* Raster definitions. */ #define ImageRaster 1 diff --git a/obm/ObmW/GtermUtil.c b/obm/ObmW/GtermUtil.c index 6bc0e72..7b70203 100644 --- a/obm/ObmW/GtermUtil.c +++ b/obm/ObmW/GtermUtil.c @@ -4,11 +4,7 @@ static XImage *cached_ximage = NULL; /* MF004 BEGIN */ /* GetCachedXImage -- */ static XImage * -GetCachedXImage (w, pixmap, width, height) - GtermWidget w; - Pixmap pixmap; - int width; - int height; +GetCachedXImage (GtermWidget w, Pixmap pixmap, int width, int height) { if ((cached_ximage != NULL)) { if ((pixmap == w->gterm.pixmap) && @@ -24,7 +20,7 @@ GetCachedXImage (w, pixmap, width, height) /* DestroyCachedXImage -- */ static void -DestroyCachedXImage () +DestroyCachedXImage (void) { if (cached_ximage != NULL) { XDestroyImage (cached_ximage); @@ -36,12 +32,7 @@ DestroyCachedXImage () /* NewCachedXImage -- */ static void -NewCachedXImage (w, xin, pixmap, width, height) - GtermWidget w; - XImage *xin; - Pixmap pixmap; - int width; - int height; +NewCachedXImage (GtermWidget w, XImage *xin, Pixmap pixmap, int width, int height) { if ((pixmap == w->gterm.pixmap) && (width == w->core.width) && diff --git a/obm/ObmW/HTML-PSformat.c b/obm/ObmW/HTML-PSformat.c index 677f646..8b120fc 100644 --- a/obm/ObmW/HTML-PSformat.c +++ b/obm/ObmW/HTML-PSformat.c @@ -66,7 +66,7 @@ #define CR '\015' #define LF '\012' -extern int SwapElements(); +extern int SwapElements(struct ele_rec *start, struct ele_rec *end, int start_pos, int end_pos); /* the next page sizes are a compromise between letter sized paper * (215.9 x 279.4 mm) and european standard A4 sized paper (210.0 x 297.0 mm). diff --git a/obm/ObmW/HTML.c b/obm/ObmW/HTML.c index 899451f..c3e5b4f 100644 --- a/obm/ObmW/HTML.c +++ b/obm/ObmW/HTML.c @@ -84,47 +84,47 @@ #define W_OPTIONMENU 5 -extern int FormatAll(); -extern int DocumentWidth(); -extern void PlaceLine(); -extern void TextRefresh(); -extern void ImageRefresh(); -extern void LinefeedRefresh(); -extern void RefreshTextRange(); -extern void FreeColors(); -extern void FreeImages(); -extern void HideWidgets(); -extern void MapWidgets(); -extern int SwapElements(); -extern int ElementLessThan(); -extern int IsDelayedHRef(); -extern int IsIsMapForm(); -extern void BulletRefresh(); -extern int AnchoredHeight(); -extern char *ParseMarkTag(); -extern char *ParseTextToString(); -extern char *ParseTextToPrettyString(); -extern char *ParseTextToPSString(); -extern struct mark_up *HTMLParse(); -extern struct ele_rec *LocateElement(); -extern struct ele_rec **MakeLineList(); -extern void FreeHRefs(); -extern struct ref_rec *AddHRef(); -extern void FreeDelayedImages(); -extern struct delay_rec *AddDelayedImage(); -extern ImageInfo *NoImageData(); -extern void ImageSubmitForm(); - - -static void SelectStart(); -static void ExtendStart(); -static void ExtendAdjust(); -static void ExtendEnd(); -static void TrackMotion(); -static Boolean ConvertSelection(); -static void LoseSelection(); -static void SelectionDone(); -static void Scroll(); +extern int FormatAll(HTMLWidget hw, int *Fwidth); +extern int DocumentWidth(HTMLWidget hw, struct mark_up *list); +extern void PlaceLine(HTMLWidget hw, int line); +extern void TextRefresh(HTMLWidget hw, struct ele_rec *eptr, int start_pos, int end_pos); +extern void ImageRefresh(HTMLWidget hw, struct ele_rec *eptr); +extern void LinefeedRefresh(HTMLWidget hw, struct ele_rec *eptr); +extern void RefreshTextRange(HTMLWidget hw, struct ele_rec *start, struct ele_rec *end); +extern void FreeColors(Display *dsp, Colormap colormap); +extern void FreeImages(HTMLWidget hw); +extern void HideWidgets(HTMLWidget hw); +extern void MapWidgets(HTMLWidget hw); +extern int SwapElements(struct ele_rec *start, struct ele_rec *end, int start_pos, int end_pos); +extern int ElementLessThan(struct ele_rec *start, struct ele_rec *end, int start_pos, int end_pos); +extern int IsDelayedHRef(HTMLWidget hw, char *href); +extern int IsIsMapForm(HTMLWidget hw, char *href); +extern void BulletRefresh(HTMLWidget hw, struct ele_rec *eptr); +extern int AnchoredHeight(HTMLWidget hw); +extern char *ParseMarkTag(char *text, char *mtext, char *mtag); +extern char *ParseTextToString(struct ele_rec *elist, struct ele_rec *startp, struct ele_rec *endp, int start_pos, int end_pos, int space_width, int lmargin); +extern char *ParseTextToPrettyString(HTMLWidget hw, struct ele_rec *elist, struct ele_rec *startp, struct ele_rec *endp, int start_pos, int end_pos, int space_width, int lmargin); +extern char *ParseTextToPSString(HTMLWidget hw, struct ele_rec *elist, struct ele_rec *startp, struct ele_rec *endp, int start_pos, int end_pos, int space_width, int lmargin, int fontfamily); +extern struct mark_up *HTMLParse(struct mark_up *old_list, char *str); +extern struct ele_rec *LocateElement(HTMLWidget hw, int x, int y, int *pos); +extern struct ele_rec **MakeLineList(struct ele_rec *elist, int max_line); +extern void FreeHRefs(struct ref_rec *list); +extern struct ref_rec *AddHRef(struct ref_rec *list, char *href); +extern void FreeDelayedImages(struct delay_rec *list); +extern struct delay_rec *AddDelayedImage(struct delay_rec *list, char *src); +extern ImageInfo *NoImageData(HTMLWidget hw); +extern void ImageSubmitForm(FormInfo *fptr, XEvent *event, char *name, int x, int y); + + +static void SelectStart(Widget w, XEvent *event, String *params, Cardinal *num_params); +static void ExtendStart(Widget w, XEvent *event, String *params, Cardinal *num_params); +static void ExtendAdjust(Widget w, XEvent *event, String *params, Cardinal *num_params); +static void ExtendEnd(Widget w, XEvent *event, String *params, Cardinal *num_params); +static void TrackMotion(Widget w, XEvent *event, String *params, Cardinal *num_params); +static Boolean ConvertSelection(Widget w, Atom *selection, Atom *target, Atom *type, caddr_t *value, long unsigned int *length, int *format); +static void LoseSelection(Widget w, Atom *selection); +static void SelectionDone(Widget w, Atom *selection, Atom *target); +static void Scroll(Widget w, XEvent *event, String *params, Cardinal *num_params); static void _HTMLInput(Widget w, XEvent *event, @@ -683,10 +683,7 @@ Cursor in_anchor_cursor = (Cursor)NULL; * Can be a regular expose event, or perhaps a GraphicsExpose Event. */ static void -DrawExpose(w, data, event) - Widget w; - caddr_t data; - XEvent *event; +DrawExpose(Widget w, caddr_t data, XEvent *event) { XExposeEvent *ExEvent = (XExposeEvent *)event; HTMLWidget hw = (HTMLWidget)data; @@ -739,8 +736,7 @@ DebugHook(x, y, width, height); void -ScrollWidgets(hw) - HTMLWidget hw; +ScrollWidgets(HTMLWidget hw) { WidgetInfo *wptr; int xval, yval; @@ -770,10 +766,10 @@ ScrollWidgets(hw) * Set the Athena Scrollbar's thumb position properly. */ static void -setScrollBar(sb, topPosition, totalLength, currentLength) - Widget sb; - int topPosition; /* MF026 */ - int totalLength, currentLength; /* MF026 */ +setScrollBar(Widget sb, int topPosition, int totalLength, int currentLength) + + /* MF026 */ + /* MF026 */ { float top = (float)topPosition /(float)(totalLength); float shown = (float)currentLength/(float)(totalLength); @@ -787,10 +783,7 @@ setScrollBar(sb, topPosition, totalLength, currentLength) * Either the vertical or hortizontal scrollbar has been moved */ void -ScrollToPos(w, hw, value) - Widget w; - HTMLWidget hw; - int value; +ScrollToPos(Widget w, HTMLWidget hw, int value) { /* * Special code incase the scrollbar is "moved" before we have a window @@ -1013,10 +1006,7 @@ ScrollToPos(w, hw, value) * Either the vertical or hortizontal scrollbar has been moved */ void -ScrollMove(w, client_data, call_data) - Widget w; - caddr_t client_data; - caddr_t call_data; +ScrollMove(Widget w, caddr_t client_data, caddr_t call_data) { #ifdef MOTIF XmScrollBarCallbackStruct *sc = (XmScrollBarCallbackStruct *)call_data; @@ -1052,10 +1042,7 @@ ScrollMove(w, client_data, call_data) #ifndef MOTIF void -JumpMove(w, client_data, call_data) - Widget w; - caddr_t client_data; - caddr_t call_data; +JumpMove(Widget w, caddr_t client_data, caddr_t call_data) { HTMLWidget hw = (HTMLWidget)client_data; int value = (int)(*(float *)call_data * @@ -2165,9 +2152,7 @@ fprintf (stderr, "leaving; slider size %d\n", ss); * and set it into the selection. */ static void -FindSelectAnchor(hw, aptr) - HTMLWidget hw; - struct ele_rec *aptr; +FindSelectAnchor(HTMLWidget hw, struct ele_rec *aptr) { struct ele_rec *eptr; @@ -2198,8 +2183,7 @@ FindSelectAnchor(hw, aptr) * in the widget's start ptr. */ static void -SetAnchor(hw) - HTMLWidget hw; +SetAnchor(HTMLWidget hw) { struct ele_rec *eptr; struct ele_rec *start; @@ -2306,11 +2290,7 @@ SetAnchor(hw) * from start to end. */ static void -DrawSelection(hw, start, end, start_pos, end_pos) - HTMLWidget hw; - struct ele_rec *start; - struct ele_rec *end; - int start_pos, end_pos; +DrawSelection(HTMLWidget hw, struct ele_rec *start, struct ele_rec *end, int start_pos, int end_pos) { struct ele_rec *eptr; int epos; @@ -2422,8 +2402,7 @@ DrawSelection(hw, start, end, start_pos, end_pos) * start to end list. */ static void -SetSelection(hw) - HTMLWidget hw; +SetSelection(HTMLWidget hw) { struct ele_rec *start; struct ele_rec *end; @@ -2441,11 +2420,7 @@ SetSelection(hw) * Erase the selection from start to end */ static void -EraseSelection(hw, start, end, start_pos, end_pos) - HTMLWidget hw; - struct ele_rec *start; - struct ele_rec *end; - int start_pos, end_pos; +EraseSelection(HTMLWidget hw, struct ele_rec *start, struct ele_rec *end, int start_pos, int end_pos) { struct ele_rec *eptr; int epos; @@ -2552,8 +2527,7 @@ EraseSelection(hw, start, end, start_pos, end_pos) * Clear the current selection (if there is one) */ static void -ClearSelection(hw) - HTMLWidget hw; +ClearSelection(HTMLWidget hw) { struct ele_rec *start; struct ele_rec *end; @@ -2589,8 +2563,7 @@ ClearSelection(hw) * selection. */ static void -UnsetAnchor(hw) - HTMLWidget hw; +UnsetAnchor(HTMLWidget hw) { struct ele_rec *eptr; @@ -2624,11 +2597,7 @@ UnsetAnchor(hw) * flashing. */ static void -ChangeSelection(hw, start, end, start_pos, end_pos) - HTMLWidget hw; - struct ele_rec *start; - struct ele_rec *end; - int start_pos, end_pos; +ChangeSelection(HTMLWidget hw, struct ele_rec *start, struct ele_rec *end, int start_pos, int end_pos) { struct ele_rec *old_start; struct ele_rec *old_end; @@ -2840,11 +2809,11 @@ ChangeSelection(hw, start, end, start_pos, end_pos) static void -SelectStart(w, event, params, num_params) - Widget w; - XEvent *event; - String *params; /* unused */ - Cardinal *num_params; /* unused */ +SelectStart(Widget w, XEvent *event, String *params, Cardinal *num_params) + + + /* unused */ + /* unused */ { HTMLWidget hw = (HTMLWidget)XtParent(w); XButtonPressedEvent *BuEvent = (XButtonPressedEvent *)event; @@ -2960,11 +2929,11 @@ SelectStart(w, event, params, num_params) static void -ExtendStart(w, event, params, num_params) - Widget w; - XEvent *event; - String *params; /* unused */ - Cardinal *num_params; /* unused */ +ExtendStart(Widget w, XEvent *event, String *params, Cardinal *num_params) + + + /* unused */ + /* unused */ { HTMLWidget hw = (HTMLWidget)XtParent(w); XButtonPressedEvent *BuEvent = (XButtonPressedEvent *)event; @@ -3094,11 +3063,11 @@ ExtendStart(w, event, params, num_params) static void -ExtendAdjust(w, event, params, num_params) - Widget w; - XEvent *event; - String *params; /* unused */ - Cardinal *num_params; /* unused */ +ExtendAdjust(Widget w, XEvent *event, String *params, Cardinal *num_params) + + + /* unused */ + /* unused */ { HTMLWidget hw = (HTMLWidget)XtParent(w); XPointerMovedEvent *MoEvent = (XPointerMovedEvent *)event; @@ -3198,11 +3167,7 @@ ExtendAdjust(w, event, params, num_params) static void -ExtendEnd(w, event, params, num_params) - Widget w; - XEvent *event; - String *params; - Cardinal *num_params; +ExtendEnd(Widget w, XEvent *event, String *params, Cardinal *num_params) { HTMLWidget hw = (HTMLWidget)XtParent(w); XButtonReleasedEvent *BuEvent = (XButtonReleasedEvent *)event; @@ -3390,11 +3355,11 @@ ExtendEnd(w, event, params, num_params) /* KNOWN PROBLEM: We never get LeaveNotify or FocusOut events, despite the fact we've requested them. Bummer. */ static void -TrackMotion(w, event, params, num_params) - Widget w; - XEvent *event; - String *params; /* unused */ - Cardinal *num_params; /* unused */ +TrackMotion(Widget w, XEvent *event, String *params, Cardinal *num_params) + + + /* unused */ + /* unused */ { HTMLWidget hw = (HTMLWidget)XtParent(w); struct ele_rec *eptr; @@ -3457,11 +3422,7 @@ TrackMotion(w, event, params, num_params) * Scroll display vertically. */ static void -Scroll (w, event, params, num_params) - Widget w; - XEvent *event; - String *params; - Cardinal *num_params; +Scroll (Widget w, XEvent *event, String *params, Cardinal *num_params) { HTMLWidget hw = (HTMLWidget)XtParent(w); #ifdef MOTIF @@ -4183,12 +4144,7 @@ RecolorInternalHRefs(HTMLWidget hw, char *href) static Boolean -ConvertSelection(w, selection, target, type, value, length, format) - Widget w; - Atom *selection, *target, *type; - caddr_t *value; - unsigned long *length; - int *format; +ConvertSelection(Widget w, Atom *selection, Atom *target, Atom *type, caddr_t *value, long unsigned int *length, int *format) { Display *d = XtDisplay(w); HTMLWidget hw = (HTMLWidget)w; @@ -4324,9 +4280,7 @@ ConvertSelection(w, selection, target, type, value, length, format) static void -LoseSelection(w, selection) - Widget w; - Atom *selection; +LoseSelection(Widget w, Atom *selection) { HTMLWidget hw = (HTMLWidget)w; @@ -4335,9 +4289,7 @@ LoseSelection(w, selection) static void -SelectionDone(w, selection, target) - Widget w; - Atom *selection, *target; +SelectionDone(Widget w, Atom *selection, Atom *target) { /* empty proc so Intrinsics know we want to keep storage */ } diff --git a/obm/ObmW/HTMLformat.c b/obm/ObmW/HTMLformat.c index a1a20e8..a9a23c8 100644 --- a/obm/ObmW/HTMLformat.c +++ b/obm/ObmW/HTMLformat.c @@ -84,35 +84,35 @@ struct timezone Tz; #define ALIGN_TOP 2 -extern struct ele_rec *AddEle(); -extern void FreeLineList(); -extern void FreeObjList(); -extern int SwapElements(); -extern struct ele_rec **MakeLineList(); -extern char *ParseMarkTag(); -extern char *MaxTextWidth(); -extern char *IsMapForm(); -extern char *DelayedHRef(); -extern int IsDelayedHRef(); -extern int AnchoredHeight(); -extern struct mark_up *HTMLParse(); -extern struct ref_rec *FindHRef(); -extern struct delay_rec *FindDelayedImage(); -extern ImageInfo *NoImageData(); -extern ImageInfo *DelayedImageData(); -extern Pixmap NoImage(); -extern Pixmap DelayedImage(); -extern Pixmap InfoToImage(); -extern int caseless_equal(); -extern void clean_white_space(); -extern void WidgetRefresh(); -extern WidgetInfo *MakeWidget(); -extern XFontStruct *GetWidgetFont(); -extern void AddNewForm(); -extern void PrepareFormEnd(); -extern char *ComposeCommaList(); -extern void FreeCommaList(); -extern int IsIsMapForm(); +extern struct ele_rec *AddEle(struct ele_rec **elistp, struct ele_rec *current, struct ele_rec *eptr); +extern void FreeLineList(struct ele_rec *list); +extern void FreeObjList(struct mark_up *List); +extern int SwapElements(struct ele_rec *start, struct ele_rec *end, int start_pos, int end_pos); +extern struct ele_rec **MakeLineList(struct ele_rec *elist, int max_line); +extern char *ParseMarkTag(char *text, char *mtext, char *mtag); +extern char *MaxTextWidth(char *txt, int *cnt); +extern char *IsMapForm(HTMLWidget hw); +extern char *DelayedHRef(HTMLWidget hw); +extern int IsDelayedHRef(HTMLWidget hw, char *href); +extern int AnchoredHeight(HTMLWidget hw); +extern struct mark_up *HTMLParse(struct mark_up *old_list, char *str); +extern struct ref_rec *FindHRef(struct ref_rec *list, char *href); +extern struct delay_rec *FindDelayedImage(struct delay_rec *list, char *src); +extern ImageInfo *NoImageData(HTMLWidget hw); +extern ImageInfo *DelayedImageData(HTMLWidget hw, Boolean anchored); +extern Pixmap NoImage(HTMLWidget hw); +extern Pixmap DelayedImage(HTMLWidget hw, Boolean anchored); +extern Pixmap InfoToImage(HTMLWidget hw, ImageInfo *img_info); +extern int caseless_equal(char *str1, char *str2); +extern void clean_white_space(char *txt); +extern void WidgetRefresh(HTMLWidget hw, struct ele_rec *eptr); +extern WidgetInfo *MakeWidget(HTMLWidget hw, char *text, int x, int y, int id, FormInfo *fptr); +extern XFontStruct *GetWidgetFont(HTMLWidget hw, WidgetInfo *wptr); +extern void AddNewForm(HTMLWidget hw, FormInfo *fptr); +extern void PrepareFormEnd(HTMLWidget hw, Widget w, FormInfo *fptr); +extern char *ComposeCommaList(char **list, int cnt); +extern void FreeCommaList(char **list, int cnt); +extern int IsIsMapForm(HTMLWidget hw, char *href); /* @@ -188,12 +188,7 @@ static int CompWordLen = 0; * Create a formatted element */ struct ele_rec * -CreateElement(hw, type, fp, x, y, edata) - HTMLWidget hw; - int type; - XFontStruct *fp; - int x, y; - char *edata; +CreateElement(HTMLWidget hw, int type, XFontStruct *fp, int x, int y, char *edata) { struct ele_rec *eptr; int baseline; @@ -699,12 +694,7 @@ CreateElement(hw, type, fp, x, y, edata) * list position if possible, otherwise allocate a new list position. */ void -SetElement(hw, type, fp, x, y, edata) - HTMLWidget hw; - int type; - XFontStruct *fp; - int x, y; - char *edata; +SetElement(HTMLWidget hw, int type, XFontStruct *fp, int x, int y, char *edata) { struct ele_rec *eptr; int len; @@ -1333,8 +1323,7 @@ SetElement(hw, type, fp, x, y, edata) * Change our drawing font */ void -NewFont(fp) - XFontStruct *fp; +NewFont(XFontStruct *fp) { /* * Deal with bad Lucidia descents. @@ -1355,9 +1344,7 @@ NewFont(fp) * Create and add the element record for it. */ void -LinefeedPlace(hw, x, y) - HTMLWidget hw; - int *x, *y; +LinefeedPlace(HTMLWidget hw, int *x, int *y) { /* * At the end of every line check if we have a new MaxWidth @@ -1376,9 +1363,7 @@ LinefeedPlace(hw, x, y) * and move down some space. */ void -LineFeed(hw, x, y) - HTMLWidget hw; - int *x, *y; +LineFeed(HTMLWidget hw, int *x, int *y) { /* * Manipulate linefeed state for special pre-formatted linefeed @@ -1461,10 +1446,7 @@ LineFeed(hw, x, y) * But if we are already there, don't put in a new line. */ void -ConditionalLineFeed(hw, x, y, state) - HTMLWidget hw; - int *x, *y; - int state; +ConditionalLineFeed(HTMLWidget hw, int *x, int *y, int state) { if (PF_LF_State < state) { @@ -1496,9 +1478,7 @@ ConditionalLineFeed(hw, x, y, state) * looking linefeeds. */ void -HardLineFeed(hw, x, y) - HTMLWidget hw; - int *x, *y; +HardLineFeed(HTMLWidget hw, int *x, int *y) { /* * Manipulate linefeed state for special pre-formatted linefeed @@ -1557,7 +1537,7 @@ HardLineFeed(hw, x, y) static void -AdjustBaseLine() +AdjustBaseLine(void) { int baseline; @@ -1645,9 +1625,7 @@ AdjustBaseLine() * list item. Create and add the element record for it. */ void -BulletPlace(hw, x, y) - HTMLWidget hw; - int *x, *y; +BulletPlace(HTMLWidget hw, int *x, int *y) { int width, l_height; @@ -1685,10 +1663,7 @@ BulletPlace(hw, x, y) * Create and add the element record for it. */ void -HRulePlace(hw, x, y, width) - HTMLWidget hw; - int *x, *y; - unsigned int width; +HRulePlace(HTMLWidget hw, int *x, int *y, unsigned int width) { NeedSpace = 0; *x = hw->html.margin_width; @@ -1704,10 +1679,7 @@ HRulePlace(hw, x, y, width) * list item. Create and add the element record for it. */ void -ListNumberPlace(hw, x, y, val) - HTMLWidget hw; - int *x, *y; - int val; +ListNumberPlace(HTMLWidget hw, int *x, int *y, int val) { int width, my_x; int dir, ascent, descent; @@ -1746,11 +1718,7 @@ ListNumberPlace(hw, x, y, val) * Place a piece of pre-formatted text. Add an element record for it. */ void -PreformatPlace(hw, mptr, x, y, width) - HTMLWidget hw; - struct mark_up *mptr; - int *x, *y; - unsigned int width; +PreformatPlace(HTMLWidget hw, struct mark_up *mptr, int *x, int *y, unsigned int width) { char *text; char *start; @@ -1987,11 +1955,7 @@ PreformatPlace(hw, mptr, x, y, width) * Format and place a piece of text. Add an element record for it. */ void -FormatPlace(hw, mptr, x, y, width) - HTMLWidget hw; - struct mark_up *mptr; - int *x, *y; - unsigned int width; +FormatPlace(HTMLWidget hw, struct mark_up *mptr, int *x, int *y, unsigned int width) { char *text; char *start; @@ -2396,11 +2360,7 @@ FormatPlace(hw, mptr, x, y, width) * Place an image. Add an element record for it. */ void -ImagePlace(hw, mptr, x, y, width) - HTMLWidget hw; - struct mark_up *mptr; - int *x, *y; - unsigned int width; +ImagePlace(HTMLWidget hw, struct mark_up *mptr, int *x, int *y, unsigned int width) { char *tptr; @@ -2683,11 +2643,7 @@ ImagePlace(hw, mptr, x, y, width) * Place an Widget. Add an element record for it. */ void -WidgetPlace(hw, mptr, x, y, width) - HTMLWidget hw; - struct mark_up *mptr; - int *x, *y; - unsigned int width; +WidgetPlace(HTMLWidget hw, struct mark_up *mptr, int *x, int *y, unsigned int width) { SetElement(hw, E_WIDGET, currentFont, *x, *y, mptr->start); @@ -2864,8 +2820,7 @@ WidgetPlace(hw, mptr, x, y, width) static void -PushFont(font) - XFontStruct *font; +PushFont(XFontStruct *font) { FontRec *fptr; @@ -2883,7 +2838,7 @@ PushFont(font) static XFontStruct * -PopFont() +PopFont(void) { XFontStruct *font; FontRec *fptr; @@ -2914,8 +2869,7 @@ PopFont() * value if is_value is set. */ static void -ProcessOption(sptr) - SelectInfo *sptr; +ProcessOption(SelectInfo *sptr) { int i, cnt; char **tarray; @@ -2975,9 +2929,7 @@ ProcessOption(sptr) * This lets us safely put the resultant value between double quotes. */ char * -TextAreaAddValue(value, text) - char *value; - char *text; +TextAreaAddValue(char *value, char *text) { int extra; char *buf; @@ -3043,10 +2995,7 @@ TextAreaAddValue(value, text) * Some calls create elements that are added to the formatted element list. */ void -TriggerMarkChanges(hw, mptr, x, y) - HTMLWidget hw; - struct mark_up *mptr; - int *x, *y; +TriggerMarkChanges(HTMLWidget hw, struct mark_up *mptr, int *x, int *y) { struct mark_up *mark; XFontStruct *font; @@ -4306,9 +4255,7 @@ TriggerMarkChanges(hw, mptr, x, y) * before this function was called. */ void -FormatChunk(hw, x, y) - HTMLWidget hw; - int *x, *y; +FormatChunk(HTMLWidget hw, int *x, int *y) { struct mark_up *mptr; @@ -4339,9 +4286,7 @@ FormatChunk(hw, x, y) * Title objects are ignored, and not formatted. */ int -FormatAll(hw, Fwidth) - HTMLWidget hw; - int *Fwidth; +FormatAll(HTMLWidget hw, int *Fwidth) { int x, y; int width; @@ -4565,9 +4510,7 @@ fprintf(stderr, "FormatAll exit (%d.%d)\n", Tv.tv_sec, Tv.tv_usec); * Basically a filled rectangle at the end of a line. */ void -LinefeedRefresh(hw, eptr) - HTMLWidget hw; - struct ele_rec *eptr; +LinefeedRefresh(HTMLWidget hw, struct ele_rec *eptr) { int x1, y1; unsigned int width, height; @@ -4646,11 +4589,7 @@ LinefeedRefresh(hw, eptr) * Redraw part of a formatted text element, in the passed fg and bg */ void -PartialRefresh(hw, eptr, start_pos, end_pos, fg, bg) - HTMLWidget hw; - struct ele_rec *eptr; - int start_pos, end_pos; - unsigned long fg, bg; +PartialRefresh(HTMLWidget hw, struct ele_rec *eptr, int start_pos, int end_pos, long unsigned int fg, long unsigned int bg) { int ascent; char *tdata; @@ -4865,10 +4804,7 @@ PartialRefresh(hw, eptr, start_pos, end_pos, fg, bg) * Redraw a formatted text element */ void -TextRefresh(hw, eptr, start_pos, end_pos) - HTMLWidget hw; - struct ele_rec *eptr; - int start_pos, end_pos; +TextRefresh(HTMLWidget hw, struct ele_rec *eptr, int start_pos, int end_pos) { if (eptr->selected == False) { @@ -4904,9 +4840,7 @@ TextRefresh(hw, eptr, start_pos, end_pos) * Redraw a formatted bullet element */ void -BulletRefresh(hw, eptr) - HTMLWidget hw; - struct ele_rec *eptr; +BulletRefresh(HTMLWidget hw, struct ele_rec *eptr) { int width, line_height; int x1, y1; @@ -4968,9 +4902,7 @@ BulletRefresh(hw, eptr) * Redraw a formatted horizontal rule element */ void -HRuleRefresh(hw, eptr) - HTMLWidget hw; - struct ele_rec *eptr; +HRuleRefresh(HTMLWidget hw, struct ele_rec *eptr) { int width, height; int x1, y1; @@ -5024,9 +4956,7 @@ HRuleRefresh(hw, eptr) * now. */ void -ImageRefresh(hw, eptr) - HTMLWidget hw; - struct ele_rec *eptr; +ImageRefresh(HTMLWidget hw, struct ele_rec *eptr) { if (eptr->pic_data != NULL) { @@ -5183,10 +5113,7 @@ ImageRefresh(hw, eptr) void -RefreshTextRange(hw, start, end) - HTMLWidget hw; - struct ele_rec *start; - struct ele_rec *end; +RefreshTextRange(HTMLWidget hw, struct ele_rec *start, struct ele_rec *end) { struct ele_rec *eptr; @@ -5215,9 +5142,7 @@ RefreshTextRange(hw, start, end) * Refresh all elements on a single line into the widget's window */ void -PlaceLine(hw, line) - HTMLWidget hw; - int line; +PlaceLine(HTMLWidget hw, int line) { struct ele_rec *eptr; @@ -5262,10 +5187,7 @@ PlaceLine(hw, line) * you are at in the pos pointer passed. */ struct ele_rec * -LocateElement(hw, x, y, pos) - HTMLWidget hw; - int x, y; - int *pos; +LocateElement(HTMLWidget hw, int x, int y, int *pos) { struct ele_rec *eptr; struct ele_rec *rptr; @@ -5558,11 +5480,7 @@ LocateElement(hw, x, y, pos) * both the current string length, and the total buffer length. */ void -strcpy_or_grow(str, slen, blen, add) - char **str; - int *slen; - int *blen; - char *add; +strcpy_or_grow(char **str, int *slen, int *blen, char *add) { int newlen; int addlen; @@ -5619,13 +5537,7 @@ strcpy_or_grow(str, slen, blen, add) * to indent lines. */ char * -ParseTextToString(elist, startp, endp, start_pos, end_pos, space_width, lmargin) - struct ele_rec *elist; - struct ele_rec *startp; - struct ele_rec *endp; - int start_pos, end_pos; - int space_width; - int lmargin; +ParseTextToString(struct ele_rec *elist, struct ele_rec *startp, struct ele_rec *endp, int start_pos, int end_pos, int space_width, int lmargin) { int newline; int epos; @@ -6174,9 +6086,7 @@ ParseTextToPrettyString(hw, elist, startp, endp, start_pos, end_pos, * (width of that text's font) */ int -DocumentWidth(hw, list) - HTMLWidget hw; - struct mark_up *list; +DocumentWidth(HTMLWidget hw, struct mark_up *list) { struct mark_up *mptr; int plain_text; diff --git a/obm/ObmW/HTMLimages.c b/obm/ObmW/HTMLimages.c index 1039a66..2f0b08d 100644 --- a/obm/ObmW/HTMLimages.c +++ b/obm/ObmW/HTMLimages.c @@ -75,9 +75,7 @@ static int allocation_index[256]; * Free all the colors in the default colormap that we have allocated so far. */ void -FreeColors(dsp, colormap) - Display *dsp; - Colormap colormap; +FreeColors(Display *dsp, Colormap colormap) { int i, j; unsigned long pix; @@ -105,8 +103,7 @@ FreeColors(dsp, colormap) * Free up all the pixmaps allocated for this document. */ void -FreeImages(hw) - HTMLWidget hw; +FreeImages(HTMLWidget hw) { struct ele_rec *eptr; @@ -149,10 +146,7 @@ FreeImages(hw) * color */ void -FindColor(dsp, colormap, colr) - Display *dsp; - Colormap colormap; - XColor *colr; +FindColor(Display *dsp, Colormap colormap, XColor *colr) { int i, match; #ifdef MORE_ACCURATE @@ -250,8 +244,7 @@ static int have_colors = 0; static int -highbit(ul) -unsigned long ul; +highbit(long unsigned int ul) { /* * returns position of highest set bit in 'ul' as an integer (0-31), @@ -268,12 +261,7 @@ unsigned long ul; * Make am image of appropriate depth for display from image data. */ XImage * -MakeImage(dsp, data, width, height, depth, img_info) - Display *dsp; - unsigned char *data; - int width, height; - int depth; - ImageInfo *img_info; +MakeImage(Display *dsp, unsigned char *data, int width, int height, int depth, ImageInfo *img_info) { int linepad, shiftnum; int shiftstart, shiftstop, shiftinc; @@ -438,16 +426,14 @@ MakeImage(dsp, data, width, height, depth, img_info) int -AnchoredHeight(hw) - HTMLWidget hw; +AnchoredHeight(HTMLWidget hw) { return((int)(AnchoredImage_height + IMAGE_BORDER)); } char * -IsMapForm(hw) - HTMLWidget hw; +IsMapForm(HTMLWidget hw) { char *str; @@ -461,9 +447,7 @@ IsMapForm(hw) int -IsIsMapForm(hw, href) - HTMLWidget hw; - char *href; +IsIsMapForm(HTMLWidget hw, char *href) { if ((href != NULL)&&(strcmp(href, "ISMAP Form") == 0)) { @@ -477,8 +461,7 @@ IsIsMapForm(hw, href) char * -DelayedHRef(hw) - HTMLWidget hw; +DelayedHRef(HTMLWidget hw) { char *str; @@ -492,9 +475,7 @@ DelayedHRef(hw) int -IsDelayedHRef(hw, href) - HTMLWidget hw; - char *href; +IsDelayedHRef(HTMLWidget hw, char *href) { if ((href != NULL)&&(strcmp(href, "Delayed Image") == 0)) { @@ -508,9 +489,7 @@ IsDelayedHRef(hw, href) Pixmap -DelayedImage(hw, anchored) - HTMLWidget hw; - Boolean anchored; +DelayedImage(HTMLWidget hw, Boolean anchored) { if (delayed_image.image == (Pixmap)NULL) { @@ -583,9 +562,7 @@ DelayedImage(hw, anchored) ImageInfo * -DelayedImageData(hw, anchored) - HTMLWidget hw; - Boolean anchored; +DelayedImageData(HTMLWidget hw, Boolean anchored) { delayed_image.delayed = 1; delayed_image.internal = 0; @@ -622,8 +599,7 @@ DelayedImageData(hw, anchored) Pixmap -NoImage(hw) - HTMLWidget hw; +NoImage(HTMLWidget hw) { if (no_image.image == (Pixmap)NULL) { @@ -648,8 +624,7 @@ NoImage(hw) ImageInfo * -NoImageData(hw) - HTMLWidget hw; +NoImageData(HTMLWidget hw) { no_image.delayed = 0; no_image.internal = 0; @@ -668,9 +643,7 @@ NoImageData(hw) Pixmap -InfoToImage(hw, img_info) - HTMLWidget hw; - ImageInfo *img_info; +InfoToImage(HTMLWidget hw, ImageInfo *img_info) { int i, size; int delta, not_right_col, not_last_row; diff --git a/obm/ObmW/HTMLjot.c b/obm/ObmW/HTMLjot.c index 4680b0a..0374b30 100644 --- a/obm/ObmW/HTMLjot.c +++ b/obm/ObmW/HTMLjot.c @@ -88,9 +88,7 @@ static JotInfo *JotCurrent = NULL; void -NewJot(w, width, height) - Widget w; - int width, height; +NewJot(Widget w, int width, int height) { if (JotCurrent == NULL) { @@ -132,8 +130,7 @@ NewJot(w, width, height) JotInfo * -GetJot(w) - Widget w; +GetJot(Widget w) { JotInfo *jptr; @@ -151,8 +148,7 @@ GetJot(w) void -FreeStrokes(sptr) - Stroke *sptr; +FreeStrokes(Stroke *sptr) { Stroke *tptr; @@ -167,10 +163,7 @@ FreeStrokes(sptr) void -ClearJot(hw, w, width, height) - HTMLWidget hw; - Widget w; - int width, height; +ClearJot(HTMLWidget hw, Widget w, int width, int height) { JotInfo *jptr; @@ -205,10 +198,7 @@ ClearJot(hw, w, width, height) void -AddStroke(jptr, sptr, drawing) - JotInfo *jptr; - Stroke *sptr; - Boolean drawing; +AddStroke(JotInfo *jptr, Stroke *sptr, Boolean drawing) { if (jptr->strokes == NULL) { @@ -246,10 +236,7 @@ AddStroke(jptr, sptr, drawing) void -EVJotExpose(w, data, event) - Widget w; - XtPointer data; - XEvent *event; +EVJotExpose(Widget w, XtPointer data, XEvent *event) { XExposeEvent *ExEvent = (XExposeEvent *)event; HTMLWidget hw = (HTMLWidget)data; @@ -286,10 +273,7 @@ EVJotExpose(w, data, event) void -EVJotPress(w, data, event) - Widget w; - XtPointer data; - XEvent *event; +EVJotPress(Widget w, XtPointer data, XEvent *event) { XButtonPressedEvent *BuEvent = (XButtonPressedEvent *)event; HTMLWidget hw = (HTMLWidget)data; @@ -335,10 +319,7 @@ EVJotPress(w, data, event) void -EVJotMove(w, data, event) - Widget w; - XtPointer data; - XEvent *event; +EVJotMove(Widget w, XtPointer data, XEvent *event) { XPointerMovedEvent *MoEvent = (XPointerMovedEvent *)event; HTMLWidget hw = (HTMLWidget)data; @@ -389,10 +370,7 @@ EVJotMove(w, data, event) void -EVJotRelease(w, data, event) - Widget w; - XtPointer data; - XEvent *event; +EVJotRelease(Widget w, XtPointer data, XEvent *event) { XButtonReleasedEvent *BuEvent = (XButtonReleasedEvent *)event; HTMLWidget hw = (HTMLWidget)data; @@ -443,8 +421,7 @@ EVJotRelease(w, data, event) char * -EJB_JOTfromJot(w) - Widget w; +EJB_JOTfromJot(Widget w) { int i, cnt; int dlen, total; @@ -553,9 +530,7 @@ typedef struct my_INK_POINT { unsigned char * -JOTfromJot(w, buffer_len) - Widget w; - int *buffer_len; +JOTfromJot(Widget w, int *buffer_len) { int i, cnt; int dlen, total; diff --git a/obm/ObmW/HTMLlists.c b/obm/ObmW/HTMLlists.c index 9745e77..5a6b7f1 100644 --- a/obm/ObmW/HTMLlists.c +++ b/obm/ObmW/HTMLlists.c @@ -69,8 +69,7 @@ * all memory associates with each element. */ void -FreeObjList(List) - struct mark_up *List; +FreeObjList(struct mark_up *List) { struct mark_up *current; struct mark_up *mptr; @@ -106,11 +105,7 @@ FreeObjList(List) * white space. */ struct mark_up * -AddObj(listp, current, mark, keep_wsp) - struct mark_up **listp; - struct mark_up *current; - struct mark_up *mark; - int keep_wsp; +AddObj(struct mark_up **listp, struct mark_up *current, struct mark_up *mark, int keep_wsp) { if (mark == NULL) { @@ -363,9 +358,7 @@ PrintList(list) * finding line widths, a newline resets the width count. */ char * -MaxTextWidth(txt, cnt) - char *txt; - int *cnt; +MaxTextWidth(char *txt, int *cnt) { char *start; char *end; @@ -418,8 +411,7 @@ MaxTextWidth(txt, cnt) * all memory associates with each element. */ void -FreeLineList(list) - struct ele_rec *list; +FreeLineList(struct ele_rec *list) { struct ele_rec *current; struct ele_rec *eptr; @@ -452,10 +444,7 @@ FreeLineList(list) * return a pointer to the current (end) position in the list. */ struct ele_rec * -AddEle(elistp, current, eptr) - struct ele_rec **elistp; - struct ele_rec *current; - struct ele_rec *eptr; +AddEle(struct ele_rec **elistp, struct ele_rec *current, struct ele_rec *eptr) { if (eptr == NULL) { @@ -491,9 +480,7 @@ AddEle(elistp, current, eptr) * into the element list. */ struct ele_rec ** -MakeLineList(elist, max_line) - struct ele_rec *elist; - int max_line; +MakeLineList(struct ele_rec *elist, int max_line) { int i; struct ele_rec *eptr; @@ -545,10 +532,7 @@ MakeLineList(elist, max_line) * Otherwise return 0. */ int -ElementLessThan(start, end, start_pos, end_pos) - struct ele_rec *start; - struct ele_rec *end; - int start_pos, end_pos; +ElementLessThan(struct ele_rec *start, struct ele_rec *end, int start_pos, int end_pos) { struct ele_rec *current; @@ -629,10 +613,7 @@ ElementLessThan(start, end, start_pos, end_pos) * Otherwise return 0. */ int -SwapElements(start, end, start_pos, end_pos) - struct ele_rec *start; - struct ele_rec *end; - int start_pos, end_pos; +SwapElements(struct ele_rec *start, struct ele_rec *end, int start_pos, int end_pos) { struct ele_rec *current; @@ -710,8 +691,7 @@ SwapElements(start, end, start_pos, end_pos) * Free up the allocated list of internal hrefs. */ void -FreeHRefs(list) - struct ref_rec *list; +FreeHRefs(struct ref_rec *list) { struct ref_rec *hptr; struct ref_rec *tptr; @@ -735,9 +715,7 @@ FreeHRefs(list) * return a pointer to the element, or NULL if not found. */ struct ref_rec * -FindHRef(list, href) - struct ref_rec *list; - char *href; +FindHRef(struct ref_rec *list, char *href) { struct ref_rec *hptr; @@ -765,9 +743,7 @@ FindHRef(list, href) * return a pointer to the head of the new list. */ struct ref_rec * -AddHRef(list, href) - struct ref_rec *list; - char *href; +AddHRef(struct ref_rec *list, char *href) { struct ref_rec *hptr; @@ -806,8 +782,7 @@ AddHRef(list, href) * Free up the allocated list of visited delayed images */ void -FreeDelayedImages(list) - struct delay_rec *list; +FreeDelayedImages(struct delay_rec *list) { struct delay_rec *iptr; struct delay_rec *tptr; @@ -831,9 +806,7 @@ FreeDelayedImages(list) * return a pointer to the element, or NULL if not found. */ struct delay_rec * -FindDelayedImage(list, src) - struct delay_rec *list; - char *src; +FindDelayedImage(struct delay_rec *list, char *src) { struct delay_rec *iptr; @@ -860,9 +833,7 @@ FindDelayedImage(list, src) * return a pointer to the head of the new list. */ struct delay_rec * -AddDelayedImage(list, src) - struct delay_rec *list; - char *src; +AddDelayedImage(struct delay_rec *list, char *src) { struct delay_rec *iptr; diff --git a/obm/ObmW/HTMLparse.c b/obm/ObmW/HTMLparse.c index 1b52458..bfd51e1 100644 --- a/obm/ObmW/HTMLparse.c +++ b/obm/ObmW/HTMLparse.c @@ -68,9 +68,9 @@ struct timezone Tz; #include "HTMLamp.h" -extern void FreeObjList(); -extern struct mark_up *AddObj(); -extern int ParseMarkType(); +extern void FreeObjList(struct mark_up *List); +extern struct mark_up *AddObj(struct mark_up **listp, struct mark_up *current, struct mark_up *mark, int keep_wsp); +extern int ParseMarkType(char *str); #ifdef NOT_ASCII #define TOLOWER(x) (tolower(x)) @@ -106,9 +106,7 @@ unsigned char map_table[256]={ * return 1 if equal, 0 otherwise. */ int -caseless_equal(str1, str2) - char *str1; - char *str2; +caseless_equal(char *str1, char *str2) { if ((str1 == NULL)||(str2 == NULL)) { @@ -142,10 +140,7 @@ caseless_equal(str1, str2) * return 1 if equal, 0 otherwise. */ int -caseless_equal_prefix(str1, str2, cnt) - char *str1; - char *str2; - int cnt; +caseless_equal_prefix(char *str1, char *str2, int cnt) { int i; @@ -182,8 +177,7 @@ caseless_equal_prefix(str1, str2, cnt) * it can never get longer. */ void -clean_white_space(txt) - char *txt; +clean_white_space(char *txt) { char *ptr; char *start; @@ -271,10 +265,7 @@ clean_white_space(txt) * 2: terminated with whitespace */ char -ExpandEscapes(esc, endp, termination) - char *esc; - char **endp; - int termination; +ExpandEscapes(char *esc, char **endp, int termination) { int cnt; char val; @@ -348,8 +339,7 @@ ExpandEscapes(esc, endp, termination) * if any escapes are replaced, the string becomes shorter. */ void -clean_text(txt) - char *txt; +clean_text(char *txt) { int unterminated; int space_terminated; @@ -499,9 +489,7 @@ clean_text(txt) * The returned text has already expanded '&' escapes. */ char * -get_text(start, endp) - char *start; - char **endp; +get_text(char *start, char **endp) { char *ptr; char *text; @@ -572,9 +560,7 @@ get_text(start, endp) * endp pointing to the ttrailing '>' in the original string. */ struct mark_up * -get_mark(start, endp) - char *start; - char **endp; +get_mark(char *start, char **endp) { char *ptr; char *text; @@ -673,9 +659,7 @@ get_mark(start, endp) * end of the plain text mark, or the end of the file. */ char * -get_plain_text(start, endp) - char *start; - char **endp; +get_plain_text(char *start, char **endp) { char *ptr; char *text; @@ -771,9 +755,7 @@ get_plain_text(start, endp) * may want to add code to append to the old list. */ struct mark_up * -HTMLParse(old_list, str) - struct mark_up *old_list; - char *str; +HTMLParse(struct mark_up *old_list, char *str) { int preformat; char *start, *end; @@ -965,8 +947,7 @@ fprintf(stderr, "HTMLParse exit (%d.%d)\n", Tv.tv_sec, Tv.tv_usec); * Determine mark type from the identifying string passed */ int -ParseMarkType(str) - char *str; +ParseMarkType(char *str) { int type; char *tptr; @@ -1188,10 +1169,7 @@ ParseMarkType(str) * Finally the function returns the tag value in a malloced buffer. */ char * -AnchorTag(ptrp, startp, endp) - char **ptrp; - char **startp; - char **endp; +AnchorTag(char **ptrp, char **startp, char **endp) { char *tag_val; char *ptr; @@ -1324,10 +1302,7 @@ AnchorTag(ptrp, startp, endp) * If the passed tag is found but has no value, return "". */ char * -ParseMarkTag(text, mtext, mtag) - char *text; - char *mtext; - char *mtag; +ParseMarkTag(char *text, char *mtext, char *mtag) { char *ptr; char *start; diff --git a/obm/ObmW/HTMLwidgets.c b/obm/ObmW/HTMLwidgets.c index 0927ac9..2c05fa9 100644 --- a/obm/ObmW/HTMLwidgets.c +++ b/obm/ObmW/HTMLwidgets.c @@ -102,14 +102,14 @@ #define W_HIDDEN 9 -extern void NewJot(); -extern void ClearJot(); -extern void EVJotExpose(); -extern void EVJotPress(); -extern void EVJotMove(); -extern void EVJotRelease(); -extern char *EJB_JOTfromJot(); -extern char *ParseMarkTag(); +extern void NewJot(Widget w, int width, int height); +extern void ClearJot(HTMLWidget hw, Widget w, int width, int height); +extern void EVJotExpose(Widget w, XtPointer data, XEvent *event); +extern void EVJotPress(Widget w, XtPointer data, XEvent *event); +extern void EVJotMove(Widget w, XtPointer data, XEvent *event); +extern void EVJotRelease(Widget w, XtPointer data, XEvent *event); +extern char *EJB_JOTfromJot(Widget w); +extern char *ParseMarkTag(char *text, char *mtext, char *mtag); #ifdef MOTIF @@ -117,19 +117,16 @@ static Boolean ModifyIgnore = False; #endif /* MOTIF */ -char **ParseCommaList(); -void FreeCommaList(); -char *MapOptionReturn(); +char **ParseCommaList(char *str, int *count); +void FreeCommaList(char **list, int cnt); +char *MapOptionReturn(char *val, char **mapping); #ifndef MOTIF #define FONTHEIGHT(font) (font->max_bounds.ascent + font->max_bounds.descent) void -setTextSize(w, columns, lines) - Widget w; - int columns; - int lines; +setTextSize(Widget w, int columns, int lines) { XFontStruct *font; Position lm, rm, tm, bm; @@ -150,10 +147,7 @@ setTextSize(w, columns, lines) } void -CBListDestroy(w, client_data, call_data) - Widget w; - caddr_t client_data; - caddr_t call_data; +CBListDestroy(Widget w, caddr_t client_data, caddr_t call_data) { char **string_list, **p; int item_count; @@ -174,10 +168,7 @@ CBListDestroy(w, client_data, call_data) void -CBTextDestroy(w, client_data, call_data) - Widget w; - caddr_t client_data; - caddr_t call_data; +CBTextDestroy(Widget w, caddr_t client_data, caddr_t call_data) { char *txt = (char *)client_data; free(txt); @@ -185,10 +176,7 @@ CBTextDestroy(w, client_data, call_data) void -CBoption(w, client_data, call_data) - Widget w; - caddr_t client_data; - caddr_t call_data; +CBoption(Widget w, caddr_t client_data, caddr_t call_data) { Widget menuButton = (Widget)client_data; char *label; @@ -201,9 +189,7 @@ CBoption(w, client_data, call_data) void -AddNewForm(hw, fptr) - HTMLWidget hw; - FormInfo *fptr; +AddNewForm(HTMLWidget hw, FormInfo *fptr) { FormInfo *ptr; @@ -226,10 +212,7 @@ AddNewForm(hw, fptr) int -CollectSubmitInfo(fptr, name_list, value_list) - FormInfo *fptr; - char ***name_list; - char ***value_list; +CollectSubmitInfo(FormInfo *fptr, char ***name_list, char ***value_list) { HTMLWidget hw = (HTMLWidget)(fptr->hw); WbFormCallbackData cbdata; @@ -529,11 +512,7 @@ CollectSubmitInfo(fptr, name_list, value_list) void -ImageSubmitForm(fptr, event, name, x, y) - FormInfo *fptr; - XEvent *event; - char *name; - int x, y; +ImageSubmitForm(FormInfo *fptr, XEvent *event, char *name, int x, int y) { HTMLWidget hw = (HTMLWidget)(fptr->hw); WbFormCallbackData cbdata; @@ -612,10 +591,7 @@ ImageSubmitForm(fptr, event, name, x, y) void -CBSubmitForm(w, client_data, call_data) - Widget w; - caddr_t client_data; - caddr_t call_data; +CBSubmitForm(Widget w, caddr_t client_data, caddr_t call_data) { FormInfo *fptr = (FormInfo *)client_data; HTMLWidget hw = (HTMLWidget)(fptr->hw); @@ -649,10 +625,7 @@ CBSubmitForm(w, client_data, call_data) * If there are other radios of the same name, turn them off. */ void -CBChangeRadio(w, client_data, call_data) - Widget w; - caddr_t client_data; - caddr_t call_data; +CBChangeRadio(Widget w, caddr_t client_data, caddr_t call_data) { FormInfo *fptr = (FormInfo *)client_data; HTMLWidget hw = (HTMLWidget)(fptr->hw); @@ -987,10 +960,7 @@ CBPasswordModify(w, client_data, call_data) * If this is the only textfield in this form, submit the form. */ void -CBActivateField(w, client_data, call_data) - Widget w; - caddr_t client_data; - caddr_t call_data; +CBActivateField(Widget w, caddr_t client_data, caddr_t call_data) { FormInfo *fptr = (FormInfo *)client_data; HTMLWidget hw = (HTMLWidget)(fptr->hw); @@ -1064,10 +1034,7 @@ CBActivateField(w, client_data, call_data) void -CBResetForm(w, client_data, call_data) - Widget w; - caddr_t client_data; - caddr_t call_data; +CBResetForm(Widget w, caddr_t client_data, caddr_t call_data) { FormInfo *fptr = (FormInfo *)client_data; HTMLWidget hw = (HTMLWidget)(fptr->hw); @@ -1419,10 +1386,7 @@ CBResetForm(w, client_data, call_data) void -PrepareFormEnd(hw, w, fptr) - HTMLWidget hw; - Widget w; - FormInfo *fptr; +PrepareFormEnd(HTMLWidget hw, Widget w, FormInfo *fptr) { #ifdef MOTIF XtAddCallback(w, XmNactivateCallback, @@ -1435,10 +1399,7 @@ PrepareFormEnd(hw, w, fptr) void -PrepareFormReset(hw, w, fptr) - HTMLWidget hw; - Widget w; - FormInfo *fptr; +PrepareFormReset(HTMLWidget hw, Widget w, FormInfo *fptr) { #ifdef MOTIF XtAddCallback(w, XmNactivateCallback, @@ -1451,8 +1412,7 @@ PrepareFormReset(hw, w, fptr) void -HideWidgets(hw) - HTMLWidget hw; +HideWidgets(HTMLWidget hw) { WidgetInfo *wptr; XEvent event; @@ -1491,8 +1451,7 @@ HideWidgets(hw) void -MapWidgets(hw) - HTMLWidget hw; +MapWidgets(HTMLWidget hw) { WidgetInfo *wptr; @@ -1510,10 +1469,7 @@ MapWidgets(hw) Boolean -AlreadyChecked(hw, fptr, name) - HTMLWidget hw; - FormInfo *fptr; - char *name; +AlreadyChecked(HTMLWidget hw, FormInfo *fptr, char *name) { WidgetInfo *wptr; Boolean radio_checked; @@ -1539,18 +1495,7 @@ AlreadyChecked(hw, fptr, name) WidgetInfo * -AddNewWidget(hw, fptr, w, type, id, x, y, width, height, name, value, mapping, checked) - HTMLWidget hw; - FormInfo *fptr; - Widget w; - int type; - int id; - int x, y; - int width, height; - char *name; - char *value; - char **mapping; - Boolean checked; +AddNewWidget(HTMLWidget hw, FormInfo *fptr, Widget w, int type, int id, int x, int y, int width, int height, char *name, char *value, char **mapping, Boolean checked) { WidgetInfo *wptr; @@ -1613,9 +1558,7 @@ AddNewWidget(hw, fptr, w, type, id, x, y, width, height, name, value, mapping, c * we can use the font's baseline to place them. */ XFontStruct * -GetWidgetFont(hw, wptr) - HTMLWidget hw; - WidgetInfo *wptr; +GetWidgetFont(HTMLWidget hw, WidgetInfo *wptr) { Widget child; XFontStruct *font; @@ -1716,8 +1659,7 @@ GetWidgetFont(hw, wptr) * characters */ char * -NextComma(string) - char *string; +NextComma(char *string) { char *tptr; @@ -1749,9 +1691,7 @@ NextComma(string) char ** -ParseCommaList(str, count) - char *str; - int *count; +ParseCommaList(char *str, int *count) { char *str_copy; char **list; @@ -1854,9 +1794,7 @@ ParseCommaList(str, count) * turn '"' into ''', and turn ''' into '\'' */ char * -ComposeCommaList(list, cnt) - char **list; - int cnt; +ComposeCommaList(char **list, int cnt) { int i; char *fail; @@ -1952,9 +1890,7 @@ ComposeCommaList(list, cnt) void -FreeCommaList(list, cnt) - char **list; - int cnt; +FreeCommaList(char **list, int cnt) { int i; @@ -1978,8 +1914,7 @@ FreeCommaList(list, cnt) * lone ' back to " */ void -UnMuckTextAreaValue(value) - char *value; +UnMuckTextAreaValue(char *value) { char *tptr; @@ -2011,9 +1946,7 @@ UnMuckTextAreaValue(value) char * -MapOptionReturn(val, mapping) - char *val; - char **mapping; +MapOptionReturn(char *val, char **mapping) { int cnt; @@ -2036,10 +1969,7 @@ MapOptionReturn(val, mapping) char ** -MakeOptionMappings(list1, list2, list_cnt) - char **list1; - char **list2; - int list_cnt; +MakeOptionMappings(char **list1, char **list2, int list_cnt) { int i, cnt; char **list; @@ -3079,12 +3009,7 @@ MakeWidget(hw, text, x, y, id, fptr) * WidgetInfo structure and return it. */ WidgetInfo * -MakeWidget(hw, text, x, y, id, fptr) - HTMLWidget hw; - char *text; - int x, y; - int id; - FormInfo *fptr; +MakeWidget(HTMLWidget hw, char *text, int x, int y, int id, FormInfo *fptr) { Arg arg[30]; Cardinal argcnt; @@ -3375,7 +3300,7 @@ MakeWidget(hw, text, x, y, id, fptr) XtManageChild(button); XtAddCallback(button, XtNcallback, - CBoption, (XtPointer)w); + (XtCallbackProc)CBoption, (XtPointer)w); if (i==0) { @@ -3484,7 +3409,7 @@ MakeWidget(hw, text, x, y, id, fptr) XtManageChild(w); XtAddCallback(w, XtNdestroyCallback, - CBListDestroy, NULL); + (XtCallbackProc)CBListDestroy, NULL); XawListChange(w, (const char **) string_list, list_cnt, 0, True); @@ -3836,7 +3761,7 @@ MakeWidget(hw, text, x, y, id, fptr) if (maxlength > 0) { XtAddCallback(w, XtNdestroyCallback, - CBTextDestroy, (caddr_t)txt); + (XtCallbackProc)CBTextDestroy, (caddr_t)txt); } XtOverrideTranslations(w, @@ -3897,7 +3822,7 @@ MakeWidget(hw, text, x, y, id, fptr) } wptr = AddNewWidget(hw, fptr, w, type, id, x, y, width, height, - name, value, checked); + name, value, NULL, checked); } else /* @@ -3931,9 +3856,7 @@ MakeWidget(hw, text, x, y, id, fptr) void -WidgetRefresh(hw, eptr) - HTMLWidget hw; - struct ele_rec *eptr; +WidgetRefresh(HTMLWidget hw, struct ele_rec *eptr) { if ((eptr->widget_data != NULL)&&(eptr->widget_data->mapped == False)&& (eptr->widget_data->w != NULL)) diff --git a/obm/ObmW/Icon.c b/obm/ObmW/Icon.c index e73307a..dcb13c5 100644 --- a/obm/ObmW/Icon.c +++ b/obm/ObmW/Icon.c @@ -23,7 +23,7 @@ static Boolean set_values(Widget ,Widget ,Widget,ArgList ,Cardinal *); static void realize(Widget,XtValueMask *,XSetWindowAttributes *); static void create_image_gc(Widget); -/*ARGSUSED*/static void create_image_gc(self)Widget self; +/*ARGSUSED*/static void create_image_gc(Widget self) { Dimension wd, ht; Position x, y; @@ -113,13 +113,12 @@ XtInherit_set_abs_location, }; WidgetClass xfwfIconWidgetClass = (WidgetClass) &xfwfIconClassRec; /*ARGSUSED*/ -static void activate(self,event,params,num_params)Widget self;XEvent*event;String*params;Cardinal*num_params; +static void activate(Widget self, XEvent *event, String *params, Cardinal *num_params) { XtCallCallbackList(self, ((XfwfIconWidget)self)->xfwfIcon.activate, event); } -static void _resolve_inheritance(class) -WidgetClass class; +static void _resolve_inheritance(WidgetClass class) { XfwfIconWidgetClass c = (XfwfIconWidgetClass) class; XfwfIconWidgetClass super; @@ -134,7 +133,7 @@ WidgetClass class; if (class == xfwfIconWidgetClass) return; super = (XfwfIconWidgetClass)class->core_class.superclass; } -/*ARGSUSED*/static void initialize(request,self,args,num_args)Widget request;Widget self;ArgList args;Cardinal * num_args; +/*ARGSUSED*/static void initialize(Widget request, Widget self, ArgList args, Cardinal *num_args) { Dimension dummy1, dummy2; Position x, y; @@ -147,7 +146,7 @@ WidgetClass class; XtNheight, ((XfwfIconWidget)self)->xfwfIcon.image->attributes.height + 2*y, NULL); } } -/*ARGSUSED*/static void expose(self,event,region)Widget self;XEvent * event;Region region; +/*ARGSUSED*/static void expose(Widget self, XEvent *event, Region region) { Dimension wd, ht; Position x, y; @@ -159,7 +158,7 @@ WidgetClass class; } xfwfBoardClassRec.core_class.expose(self, event, region); } -/*ARGSUSED*/static Boolean set_values(old,request,self,args,num_args)Widget old;Widget request;Widget self;ArgList args;Cardinal * num_args; +/*ARGSUSED*/static Boolean set_values(Widget old, Widget request, Widget self, ArgList args, Cardinal *num_args) { Dimension dummy1, dummy2; Position x, y; @@ -184,7 +183,7 @@ WidgetClass class; } return need_redraw; } -/*ARGSUSED*/static void realize(self,mask,attributes)Widget self;XtValueMask * mask;XSetWindowAttributes * attributes; +/*ARGSUSED*/static void realize(Widget self, XtValueMask *mask, XSetWindowAttributes *attributes) { Dimension wd, ht; Position x, y; diff --git a/obm/ObmW/Label.c b/obm/ObmW/Label.c index ad072a3..3bd09c3 100644 --- a/obm/ObmW/Label.c +++ b/obm/ObmW/Label.c @@ -16,7 +16,7 @@ static void make_gc(Widget); static void make_graygc(Widget); static void count_lines(Widget); -/*ARGSUSED*/static void make_gc(self)Widget self; +/*ARGSUSED*/static void make_gc(Widget self) { XtGCMask mask; XGCValues values; @@ -35,7 +35,7 @@ static void count_lines(Widget); mask = GCFont | GCBackground | GCForeground; ((XfwfLabelWidget)self)->xfwfLabel.rv_gc = XtGetGC(self, mask, &values); } -/*ARGSUSED*/static void make_graygc(self)Widget self; +/*ARGSUSED*/static void make_graygc(Widget self) { XtGCMask mask; XGCValues values; @@ -50,7 +50,7 @@ static void count_lines(Widget); mask = GCForeground | GCStipple | GCFillStyle; ((XfwfLabelWidget)self)->xfwfLabel.graygc = XtGetGC(self, mask, &values); } -/*ARGSUSED*/static void count_lines(self)Widget self; +/*ARGSUSED*/static void count_lines(Widget self) { String p, s; int w; @@ -154,8 +154,7 @@ set_label, }, }; WidgetClass xfwfLabelWidgetClass = (WidgetClass) &xfwfLabelClassRec; -static void _resolve_inheritance(class) -WidgetClass class; +static void _resolve_inheritance(WidgetClass class) { XfwfLabelWidgetClass c = (XfwfLabelWidgetClass) class; XfwfLabelWidgetClass super; @@ -172,7 +171,7 @@ WidgetClass class; if (c->xfwfLabel_class.set_label == XtInherit_set_label) c->xfwfLabel_class.set_label = super->xfwfLabel_class.set_label; } -/*ARGSUSED*/static void set_label(self,newlabel)Widget self;String newlabel; +/*ARGSUSED*/static void set_label(Widget self, String newlabel) { Position x, y; Dimension w, h; @@ -186,7 +185,7 @@ WidgetClass class; /* $expose($, NULL, NULL); */ } } -/*ARGSUSED*/static Boolean set_values(old,request,self,args,num_args)Widget old;Widget request;Widget self;ArgList args;Cardinal * num_args; +/*ARGSUSED*/static Boolean set_values(Widget old, Widget request, Widget self, ArgList args, Cardinal *num_args) { Boolean need_redisplay = False, need_count = False; Position x, y; @@ -242,7 +241,7 @@ WidgetClass class; } return need_redisplay; } -/*ARGSUSED*/static void initialize(request,self,args,num_args)Widget request;Widget self;ArgList args;Cardinal * num_args; +/*ARGSUSED*/static void initialize(Widget request, Widget self, ArgList args, Cardinal *num_args) { char *s; Position x, y; @@ -263,7 +262,7 @@ WidgetClass class; ((XfwfLabelWidgetClass)self->core.widget_class)->xfwfBoard_class.set_abs_location(self, CWWidth | CWHeight, 0, 0, wd, ht); } } -/*ARGSUSED*/static void expose(self,event,region)Widget self;XEvent * event;Region region; +/*ARGSUSED*/static void expose(Widget self, XEvent *event, Region region) { Region reg; XRectangle rect; diff --git a/obm/ObmW/ListTree.c b/obm/ObmW/ListTree.c index e9cde74..9455ccc 100644 --- a/obm/ObmW/ListTree.c +++ b/obm/ObmW/ListTree.c @@ -125,20 +125,20 @@ static XtResource resources[] = #undef offset -static void Initialize(); -static void Destroy(); -static void Redisplay(); -static void Resize(); -static void ChangeSize(); -static XtGeometryResult QueryGeometry(); -static Boolean SetValues(); -static void Draw(); -static void DrawAll(); -static void DrawItemHighlight(), DrawItemHighlightClear(); -static ListTreeItem *GetItem(); -static void Select(), Notify(), Unset(), Extend(); -static void DeleteChildren(); -static Boolean Layout(); +static void Initialize(Widget treq, Widget tnew, ArgList args, Cardinal *num); +static void Destroy(ListTreeWidget w); +static void Redisplay(Widget w, XExposeEvent *event, Region region); +static void Resize(Widget w); +static void ChangeSize(ListTreeWidget w); +static XtGeometryResult QueryGeometry(ListTreeWidget lw, XtWidgetGeometry *parent_idea, XtWidgetGeometry *our_idea); +static Boolean SetValues(Widget current, Widget request, Widget new, ArgList args, Cardinal *nargs); +static void Draw(ListTreeWidget w, Boolean draw, int yevent, int hevent); +static void DrawAll(ListTreeWidget w); +static void DrawItemHighlight(ListTreeWidget w, ListTreeItem *item), DrawItemHighlightClear(ListTreeWidget w, ListTreeItem *item); +static ListTreeItem *GetItem(ListTreeWidget w, int findy); +static void Select(Widget aw, XEvent *event, String *params, Cardinal *num_params), Notify(Widget aw, XEvent *event, String *params, Cardinal *num_params), Unset(Widget aw, XEvent *event, String *params, Cardinal *num_params), Extend(Widget aw, XEvent *event, String *params, Cardinal *num_params); +static void DeleteChildren(ListTreeWidget w, ListTreeItem *item); +static Boolean Layout(Widget w, Boolean xfree, Boolean yfree, Dimension *width, Dimension *height); #ifdef USE_RDD static void StartDrag(), EndDrag(), Drop(); @@ -219,9 +219,7 @@ ListTreeClassRec listtreeClassRec = WidgetClass listtreeWidgetClass = (WidgetClass) & listtreeClassRec; static void -MakePixmap(w, pix) -ListTreeWidget w; -Pixinfo *pix; +MakePixmap(ListTreeWidget w, Pixinfo *pix) { Window root; int x, y; @@ -249,9 +247,7 @@ Pixinfo *pix; } static void -FreePixmap(w, pix) -ListTreeWidget w; -Pixinfo *pix; +FreePixmap(ListTreeWidget w, Pixinfo *pix) { if (pix->pix) XFreePixmap(XtDisplay((Widget) w), pix->pix); @@ -259,10 +255,7 @@ Pixinfo *pix; static void -Initialize(treq, tnew, args, num) -Widget treq, tnew; -ArgList args; -Cardinal *num; +Initialize(Widget treq, Widget tnew, ArgList args, Cardinal *num) { ListTreeWidget new; XGCValues values; @@ -342,8 +335,7 @@ Cardinal *num; } static void -Destroy(w) -ListTreeWidget w; +Destroy(ListTreeWidget w) { ListTreeItem *item, *sibling; @@ -366,10 +358,7 @@ ListTreeWidget w; } static void -Redisplay(w, event, region) -Widget w; -XExposeEvent *event; -Region region; +Redisplay(Widget w, XExposeEvent *event, Region region) { ListTreeWidget lw = (ListTreeWidget) w; @@ -385,10 +374,7 @@ Region region; } static Boolean -SetValues(current, request, new, args, nargs) -Widget current, request, new; -ArgList args; -Cardinal *nargs; +SetValues(Widget current, Widget request, Widget new, ArgList args, Cardinal *nargs) { if (!XtIsRealized(current)) return False; @@ -398,8 +384,7 @@ Cardinal *nargs; static void -Resize(w) -Widget w; +Resize(Widget w) { ListTreeWidget lw = (ListTreeWidget) w; Dimension width, height; @@ -425,9 +410,7 @@ Widget w; #define FontTextWidth(f,c) (int)XTextWidth(f, c, strlen(c)) static void -PreferredSize(lw, w, h) -ListTreeWidget lw; -Dimension *w, *h; +PreferredSize(ListTreeWidget lw, Dimension *w, Dimension *h) { *w = (Dimension) lw->list.preferredWidth; *h = (Dimension) lw->list.preferredHeight; @@ -435,8 +418,7 @@ Dimension *w, *h; /* #define DEBUG_GEOM */ static void -ChangeSize(w) -ListTreeWidget w; +ChangeSize(ListTreeWidget w) { XtWidgetGeometry request, reply; @@ -533,10 +515,7 @@ XtWidgetGeometry *intended, *reply; #endif static Boolean -Layout(w, xfree, yfree, width, height) -Widget w; -Boolean xfree, yfree; -Dimension *width, *height; +Layout(Widget w, Boolean xfree, Boolean yfree, Dimension *width, Dimension *height) { ListTreeWidget lw = (ListTreeWidget) w; Boolean change = FALSE; @@ -582,9 +561,7 @@ Dimension *width, *height; } static XtGeometryResult -QueryGeometry(lw, parent_idea, our_idea) -ListTreeWidget lw; -XtWidgetGeometry *parent_idea, *our_idea; +QueryGeometry(ListTreeWidget lw, XtWidgetGeometry *parent_idea, XtWidgetGeometry *our_idea) { Dimension nw, nh; Boolean parent_wants_w, parent_wants_h, we_changed_size; @@ -829,9 +806,7 @@ HighlightDoCallback(ListTreeWidget w) static ListTreeReturnStruct * -MakeV1CallbackStruct(w, item) -ListTreeWidget w; -ListTreeItem *item; +MakeV1CallbackStruct(ListTreeWidget w, ListTreeItem *item) { ListTreeItem *parent; ListTreeReturnStruct *ret; @@ -974,11 +949,7 @@ SelectSingle(XtPointer client_data, XtIntervalId * idp) /* ARGSUSED */ static void -Select(aw, event, params, num_params) -Widget aw; -XEvent *event; -String *params; -Cardinal *num_params; +Select(Widget aw, XEvent *event, String *params, Cardinal *num_params) { ListTreeWidget w = (ListTreeWidget) aw; @@ -1011,11 +982,7 @@ Cardinal *num_params; /* ARGSUSED */ static void -Extend(aw, event, params, num_params) -Widget aw; -XEvent *event; -String *params; -Cardinal *num_params; +Extend(Widget aw, XEvent *event, String *params, Cardinal *num_params) { ListTreeItem *item; ListTreeWidget w = (ListTreeWidget) aw; @@ -1056,11 +1023,7 @@ Cardinal *num_params; /* ARGSUSED */ static void -Unset(aw, event, params, num_params) -Widget aw; -XEvent *event; -String *params; -Cardinal *num_params; +Unset(Widget aw, XEvent *event, String *params, Cardinal *num_params) { ListTreeItem *item; ListTreeWidget w = (ListTreeWidget) aw; @@ -1076,11 +1039,7 @@ Cardinal *num_params; /* ARGSUSED */ static void -Notify(aw, event, params, num_params) -Widget aw; -XEvent *event; -String *params; -Cardinal *num_params; +Notify(Widget aw, XEvent *event, String *params, Cardinal *num_params) { ListTreeWidget w = (ListTreeWidget) aw; ListTreeItem *item; @@ -1105,9 +1064,7 @@ Cardinal *num_params; /* ListTree private drawing functions */ static void -DrawItemHighlight(w, item) -ListTreeWidget w; -ListTreeItem *item; +DrawItemHighlight(ListTreeWidget w, ListTreeItem *item) { int width; @@ -1129,9 +1086,7 @@ ListTreeItem *item; } static void -DrawItemHighlightClear(w, item) -ListTreeWidget w; -ListTreeItem *item; +DrawItemHighlightClear(ListTreeWidget w, ListTreeItem *item) { int width; @@ -1157,12 +1112,7 @@ ListTreeItem *item; } static void -DrawItem(w, draw, item, x, y, xroot, yroot, retwidth, retheight) -ListTreeWidget w; -Boolean draw; -ListTreeItem *item; -int x, y; -int *xroot, *yroot, *retwidth, *retheight; +DrawItem(ListTreeWidget w, Boolean draw, ListTreeItem *item, int x, int y, int *xroot, int *yroot, int *retwidth, int *retheight) { int height, xpix, ypix, xbranch, ybranch, xtext, ytext, yline; Pixinfo *pix; @@ -1253,11 +1203,7 @@ int *xroot, *yroot, *retwidth, *retheight; } static int -DrawChildren(w, draw, item, x, y, xroot, yroot) -ListTreeWidget w; -Boolean draw; -ListTreeItem *item; -int x, y, xroot, yroot; +DrawChildren(ListTreeWidget w, Boolean draw, ListTreeItem *item, int x, int y, int xroot, int yroot) { int width, height; int xbranch, ybranch; @@ -1284,10 +1230,7 @@ int x, y, xroot, yroot; } static void -Draw(w, draw, yevent, hevent) -ListTreeWidget w; -Boolean draw; -int yevent, hevent; +Draw(ListTreeWidget w, Boolean draw, int yevent, int hevent) { int x, y, height, width; int xbranch, ybranch; @@ -1333,8 +1276,7 @@ int yevent, hevent; static void -DrawAll(w) -ListTreeWidget w; +DrawAll(ListTreeWidget w) { XClearWindow(XtDisplay((Widget) w), XtWindow((Widget) w)); Draw(w, (Boolean) True, 0, (int) w->core.height); @@ -1347,9 +1289,7 @@ ListTreeWidget w; /* This function removes the specified item from the linked list. It does */ /* not do anything with the data contained in the item, though. */ static void -RemoveReference(w, item) -ListTreeWidget w; -ListTreeItem *item; +RemoveReference(ListTreeWidget w, ListTreeItem *item) { /* If there exists a previous sibling, just skip over item to be dereferenced */ @@ -1370,9 +1310,7 @@ ListTreeItem *item; } static void -DeleteChildren(w, item) -ListTreeWidget w; -ListTreeItem *item; +DeleteChildren(ListTreeWidget w, ListTreeItem *item) { ListTreeItem *sibling; @@ -1389,10 +1327,7 @@ ListTreeItem *item; } static void -InsertChild(w, parent, item) -ListTreeWidget w; -ListTreeItem *parent; -ListTreeItem *item; +InsertChild(ListTreeWidget w, ListTreeItem *parent, ListTreeItem *item) { ListTreeItem *i; @@ -1429,10 +1364,7 @@ ListTreeItem *item; /* Insert a list of ALREADY LINKED children into another list */ static void -InsertChildren(w, parent, item) -ListTreeWidget w; -ListTreeItem *parent; -ListTreeItem *item; +InsertChildren(ListTreeWidget w, ListTreeItem *parent, ListTreeItem *item) { ListTreeItem *next, *newnext; @@ -1472,11 +1404,7 @@ ListTreeItem *item; } static int -SearchChildren(w, item, y, findy, finditem) -ListTreeWidget w; -ListTreeItem *item; -ListTreeItem **finditem; -int y, findy; +SearchChildren(ListTreeWidget w, ListTreeItem *item, int y, int findy, ListTreeItem **finditem) { int height; Pixinfo *pix; @@ -1518,9 +1446,7 @@ int y, findy; } static ListTreeItem * -GetItem(w, findy) -ListTreeWidget w; -int findy; +GetItem(ListTreeWidget w, int findy) { int y, height; ListTreeItem *item, *finditem; @@ -1565,11 +1491,7 @@ int findy; } static int -SearchPosition(w, item, y, finditem, found) -ListTreeWidget w; -ListTreeItem *item, *finditem; -int y; -Boolean *found; +SearchPosition(ListTreeWidget w, ListTreeItem *item, int y, ListTreeItem *finditem, Boolean *found) { int height; Pixinfo *pix; @@ -1612,9 +1534,7 @@ Boolean *found; } static Position -GetPosition(w, finditem) -ListTreeWidget w; -ListTreeItem *finditem; +GetPosition(ListTreeWidget w, ListTreeItem *finditem) { int y, height; ListTreeItem *item; @@ -2223,8 +2143,7 @@ ListTreeSetHighlighted(ListTreeWidget w,ListTreeItem **items,int count,Boolean c } ListTreeItem * -ListTreeFirstItem(w) -ListTreeWidget w; +ListTreeFirstItem(ListTreeWidget w) { ListTreeItem *first; diff --git a/obm/ObmW/MenuBar.c b/obm/ObmW/MenuBar.c index 0bfe407..226feaa 100644 --- a/obm/ObmW/MenuBar.c +++ b/obm/ObmW/MenuBar.c @@ -21,7 +21,7 @@ static void initialize(Widget ,Widget,ArgList ,Cardinal *); static void process_menu(Widget,Widget ,Cursor ); static void popdown_cb(Widget ,XtPointer ,XtPointer ); -/*ARGSUSED*/static void popdown_cb(menu,client_data,call_data)Widget menu;XtPointer client_data;XtPointer call_data; +/*ARGSUSED*/static void popdown_cb(Widget menu, XtPointer client_data, XtPointer call_data) { Widget self = (Widget) client_data; @@ -107,7 +107,7 @@ process_menu, }; WidgetClass xfwfMenuBarWidgetClass = (WidgetClass) &xfwfMenuBarClassRec; /*ARGSUSED*/ -static void menu_popdown(self,event,params,num_params)Widget self;XEvent*event;String*params;Cardinal*num_params; +static void menu_popdown(Widget self, XEvent *event, String *params, Cardinal *num_params) { if (((XfwfMenuBarWidget)self)->xfwfMenuBar.current_menu != NULL) { XtPopdown(((XfwfMenuBarWidget)self)->xfwfMenuBar.current_menu); @@ -115,8 +115,7 @@ static void menu_popdown(self,event,params,num_params)Widget self;XEvent*event;S } } -static void _resolve_inheritance(class) -WidgetClass class; +static void _resolve_inheritance(WidgetClass class) { XfwfMenuBarWidgetClass c = (XfwfMenuBarWidgetClass) class; XfwfMenuBarWidgetClass super; @@ -133,11 +132,11 @@ WidgetClass class; if (c->xfwfMenuBar_class.process_menu == XtInherit_process_menu) c->xfwfMenuBar_class.process_menu = super->xfwfMenuBar_class.process_menu; } -/*ARGSUSED*/static void initialize(request,self,args,num_args)Widget request;Widget self;ArgList args;Cardinal * num_args; +/*ARGSUSED*/static void initialize(Widget request, Widget self, ArgList args, Cardinal *num_args) { ((XfwfMenuBarWidget)self)->xfwfMenuBar.current_menu = NULL; } -/*ARGSUSED*/static void process_menu(self,menu,cursor)Widget self;Widget menu;Cursor cursor; +/*ARGSUSED*/static void process_menu(Widget self, Widget menu, Cursor cursor) { if (menu == ((XfwfMenuBarWidget)self)->xfwfMenuBar.current_menu) return; if (((XfwfMenuBarWidget)self)->xfwfMenuBar.current_menu) XtPopdown(((XfwfMenuBarWidget)self)->xfwfMenuBar.current_menu); @@ -154,7 +153,7 @@ WidgetClass class; ((XfwfMenuBarWidget)self)->xfwfMenuBar.current_menu = menu; XtPopup(menu, XtGrabNonexclusive); } -/*ARGSUSED*/Boolean XfwfCallProcessMenu(self,menu,cursor)Widget self;Widget menu;Cursor cursor; +/*ARGSUSED*/Boolean XfwfCallProcessMenu(Widget self, Widget menu, Cursor cursor) { if (XtIsSubclass(self, xfwfMenuBarWidgetClass) && ((XfwfMenuBarWidgetClass)self->core.widget_class)->xfwfMenuBar_class.process_menu) { ((XfwfMenuBarWidgetClass)self->core.widget_class)->xfwfMenuBar_class.process_menu(self, menu, cursor); diff --git a/obm/ObmW/MultiList.c b/obm/ObmW/MultiList.c index 8c497a6..9482c9f 100644 --- a/obm/ObmW/MultiList.c +++ b/obm/ObmW/MultiList.c @@ -67,8 +67,8 @@ *===========================================================================*/ -Pixmap XmuCreateStippledPixmap(); -extern void XawInitializeWidgetSet(); +Pixmap XmuCreateStippledPixmap(Screen *, Pixel, Pixel, unsigned int); +extern void XawInitializeWidgetSet(void); #define SUPERCLASS &(simpleClassRec) @@ -300,8 +300,7 @@ WidgetClass xfwfMultiListWidgetClass = (WidgetClass)&xfwfMultiListClassRec; *---------------------------------------------------------------------------*/ /* ARGSUSED */ -static void Initialize(request,new) -Widget request,new; +static void Initialize(Widget request, Widget new) { XfwfMultiListWidget mlw; @@ -324,10 +323,7 @@ Widget request,new; *---------------------------------------------------------------------------*/ /* ARGSUSED */ -static void Redisplay(mlw,event,rectangle_union) -XfwfMultiListWidget mlw; -XEvent *event; -Region rectangle_union; +static void Redisplay(XfwfMultiListWidget mlw, XEvent *event, Region rectangle_union) { GC shade_gc; int i,x1,y1,w,h,x2,y2,row,col,ul_row,ul_col,lr_row,lr_col; @@ -378,9 +374,7 @@ Region rectangle_union; *---------------------------------------------------------------------------*/ -static XtGeometryResult PreferredGeometry(mlw,parent_idea,our_idea) -XfwfMultiListWidget mlw; -XtWidgetGeometry *parent_idea,*our_idea; +static XtGeometryResult PreferredGeometry(XfwfMultiListWidget mlw, XtWidgetGeometry *parent_idea, XtWidgetGeometry *our_idea) { Dimension nw,nh; Boolean parent_wants_w,parent_wants_h,we_changed_size; @@ -422,8 +416,7 @@ XtWidgetGeometry *parent_idea,*our_idea; *---------------------------------------------------------------------------*/ -static void Resize(mlw) -XfwfMultiListWidget mlw; +static void Resize(XfwfMultiListWidget mlw) { Dimension width,height; @@ -446,8 +439,7 @@ XfwfMultiListWidget mlw; *---------------------------------------------------------------------------*/ /*ARGSUSED*/ -static Boolean SetValues(cpl,rpl,npl) -XfwfMultiListWidget cpl,rpl,npl; +static Boolean SetValues(XfwfMultiListWidget cpl, XfwfMultiListWidget rpl, XfwfMultiListWidget npl) { Boolean redraw,recalc; @@ -561,8 +553,7 @@ XfwfMultiListWidget cpl,rpl,npl; *---------------------------------------------------------------------------*/ -static void DestroyOldData(mlw) -XfwfMultiListWidget mlw; +static void DestroyOldData(XfwfMultiListWidget mlw) { int i; @@ -601,8 +592,7 @@ XfwfMultiListWidget mlw; *---------------------------------------------------------------------------*/ -static void InitializeNewData(mlw) -XfwfMultiListWidget mlw; +static void InitializeNewData(XfwfMultiListWidget mlw) { int i; XfwfMultiListItem *item; @@ -675,8 +665,7 @@ XfwfMultiListWidget mlw; *---------------------------------------------------------------------------*/ -static void CreateNewGCs(mlw) -XfwfMultiListWidget mlw; +static void CreateNewGCs(XfwfMultiListWidget mlw) { XGCValues values; unsigned int attribs; @@ -962,8 +951,7 @@ Layout(XfwfMultiListWidget mlw, Boolean w_changeable, Boolean h_changeable, *---------------------------------------------------------------------------*/ -static void RedrawAll(mlw) -XfwfMultiListWidget mlw; +static void RedrawAll(XfwfMultiListWidget mlw) { Redisplay(mlw,NULL,NULL); } /* End RedrawAll */ @@ -978,9 +966,7 @@ XfwfMultiListWidget mlw; *---------------------------------------------------------------------------*/ -static void RedrawItem(mlw,item_index) -XfwfMultiListWidget mlw; -int item_index; +static void RedrawItem(XfwfMultiListWidget mlw, int item_index) { int row,column; @@ -1002,9 +988,7 @@ int item_index; *---------------------------------------------------------------------------*/ -static void RedrawRowColumn(mlw,row,column) -XfwfMultiListWidget mlw; -int row,column; +static void RedrawRowColumn(XfwfMultiListWidget mlw, int row, int column) { GC bg_gc,fg_gc; XfwfMultiListItem *item; @@ -1089,9 +1073,7 @@ int row,column; *---------------------------------------------------------------------------*/ -static void PixelToRowColumn(mlw,x,y,row_ptr,column_ptr) -XfwfMultiListWidget mlw; -int x,y,*row_ptr,*column_ptr; +static void PixelToRowColumn(XfwfMultiListWidget mlw, int x, int y, int *row_ptr, int *column_ptr) { *row_ptr = y / (int)MultiListRowHeight(mlw); *column_ptr = x / (int)MultiListColWidth(mlw); @@ -1106,9 +1088,7 @@ int x,y,*row_ptr,*column_ptr; *---------------------------------------------------------------------------*/ -static void RowColumnToPixels(mlw,row,col,x_ptr,y_ptr,w_ptr,h_ptr) -XfwfMultiListWidget mlw; -int row,col,*x_ptr,*y_ptr,*w_ptr,*h_ptr; +static void RowColumnToPixels(XfwfMultiListWidget mlw, int row, int col, int *x_ptr, int *y_ptr, int *w_ptr, int *h_ptr) { *x_ptr = col * MultiListColWidth(mlw); *y_ptr = row * MultiListRowHeight(mlw); @@ -1128,9 +1108,7 @@ int row,col,*x_ptr,*y_ptr,*w_ptr,*h_ptr; *---------------------------------------------------------------------------*/ -static Boolean RowColumnToItem(mlw,row,column,item_ptr) -XfwfMultiListWidget mlw; -int row,column,*item_ptr; +static Boolean RowColumnToItem(XfwfMultiListWidget mlw, int row, int column, int *item_ptr) { int x_stride,y_stride; @@ -1169,9 +1147,7 @@ int row,column,*item_ptr; *---------------------------------------------------------------------------*/ -static Boolean ItemToRowColumn(mlw,item_index,row_ptr,column_ptr) -XfwfMultiListWidget mlw; -int item_index,*row_ptr,*column_ptr; +static Boolean ItemToRowColumn(XfwfMultiListWidget mlw, int item_index, int *row_ptr, int *column_ptr) { if (item_index < 0 || item_index >= MultiListNumItems(mlw)) { @@ -1213,11 +1189,7 @@ int item_index,*row_ptr,*column_ptr; *---------------------------------------------------------------------------*/ /* ARGSUSED */ -static void Select(mlw,event,params,num_params) -XfwfMultiListWidget mlw; -XEvent *event; -String *params; -Cardinal *num_params; +static void Select(XfwfMultiListWidget mlw, XEvent *event, String *params, Cardinal *num_params) { int click_x,click_y; int status,item_index,row,column; @@ -1256,11 +1228,7 @@ Cardinal *num_params; *---------------------------------------------------------------------------*/ /* ARGSUSED */ -static void Unselect(mlw,event,params,num_params) -XfwfMultiListWidget mlw; -XEvent *event; -String *params; -Cardinal *num_params; +static void Unselect(XfwfMultiListWidget mlw, XEvent *event, String *params, Cardinal *num_params) { int click_x,click_y; int status,item_index,row,column; @@ -1302,11 +1270,7 @@ Cardinal *num_params; *---------------------------------------------------------------------------*/ /* ARGSUSED */ -static void Toggle(mlw,event,params,num_params) -XfwfMultiListWidget mlw; -XEvent *event; -String *params; -Cardinal *num_params; +static void Toggle(XfwfMultiListWidget mlw, XEvent *event, String *params, Cardinal *num_params) { int click_x,click_y; int status,item_index,row,column; @@ -1344,11 +1308,7 @@ Cardinal *num_params; *---------------------------------------------------------------------------*/ /* ARGSUSED */ -static void Extend(mlw,event,params,num_params) -XfwfMultiListWidget mlw; -XEvent *event; -String *params; -Cardinal *num_params; +static void Extend(XfwfMultiListWidget mlw, XEvent *event, String *params, Cardinal *num_params) { int click_x,click_y; int status,item_index,row,column; @@ -1385,11 +1345,7 @@ Cardinal *num_params; *---------------------------------------------------------------------------*/ /* ARGSUSED */ -static void Notify(mlw,event,params,num_params) -XfwfMultiListWidget mlw; -XEvent *event; -String *params; -Cardinal *num_params; +static void Notify(XfwfMultiListWidget mlw, XEvent *event, String *params, Cardinal *num_params) { char *buffer; String string; @@ -1453,9 +1409,7 @@ Cardinal *num_params; *---------------------------------------------------------------------------*/ -Boolean XfwfMultiListHighlightItem(mlw,item_index) -XfwfMultiListWidget mlw; -int item_index; +Boolean XfwfMultiListHighlightItem(XfwfMultiListWidget mlw, int item_index) { XfwfMultiListItem *item; @@ -1491,8 +1445,7 @@ int item_index; *---------------------------------------------------------------------------*/ -void XfwfMultiListHighlightAll(mlw) -XfwfMultiListWidget mlw; +void XfwfMultiListHighlightAll(XfwfMultiListWidget mlw) { int i; XfwfMultiListItem *item; @@ -1528,9 +1481,7 @@ XfwfMultiListWidget mlw; *---------------------------------------------------------------------------*/ -void XfwfMultiListUnhighlightItem(mlw,item_index) -XfwfMultiListWidget mlw; -int item_index; +void XfwfMultiListUnhighlightItem(XfwfMultiListWidget mlw, int item_index) { int i; XfwfMultiListItem *item; @@ -1559,8 +1510,7 @@ int item_index; *---------------------------------------------------------------------------*/ -void XfwfMultiListUnhighlightAll(mlw) -XfwfMultiListWidget mlw; +void XfwfMultiListUnhighlightAll(XfwfMultiListWidget mlw) { int i; XfwfMultiListItem *item; @@ -1586,9 +1536,7 @@ XfwfMultiListWidget mlw; *---------------------------------------------------------------------------*/ -int XfwfMultiListToggleItem(mlw,item_index) -XfwfMultiListWidget mlw; -int item_index; +int XfwfMultiListToggleItem(XfwfMultiListWidget mlw, int item_index) { XfwfMultiListItem *item; @@ -1624,8 +1572,7 @@ int item_index; *---------------------------------------------------------------------------*/ -XfwfMultiListReturnStruct *XfwfMultiListGetHighlighted(mlw) -XfwfMultiListWidget mlw; +XfwfMultiListReturnStruct *XfwfMultiListGetHighlighted(XfwfMultiListWidget mlw) { XfwfMultiListItem *item; static XfwfMultiListReturnStruct ret_value; @@ -1659,9 +1606,7 @@ XfwfMultiListWidget mlw; *---------------------------------------------------------------------------*/ -Boolean XfwfMultiListIsHighlighted(mlw,item_index) -XfwfMultiListWidget mlw; -int item_index; +Boolean XfwfMultiListIsHighlighted(XfwfMultiListWidget mlw, int item_index) { XfwfMultiListItem *item; @@ -1683,11 +1628,7 @@ int item_index; *---------------------------------------------------------------------------*/ -Boolean XfwfMultiListGetItemInfo(mlw,item_index,str_ptr,h_ptr,s_ptr) -XfwfMultiListWidget mlw; -int item_index; -String *str_ptr; -Boolean *h_ptr,*s_ptr; +Boolean XfwfMultiListGetItemInfo(XfwfMultiListWidget mlw, int item_index, String *str_ptr, Boolean *h_ptr, Boolean *s_ptr) { XfwfMultiListItem *item; diff --git a/obm/ObmW/RadioGrp.c b/obm/ObmW/RadioGrp.c index 666b601..6eabed9 100644 --- a/obm/ObmW/RadioGrp.c +++ b/obm/ObmW/RadioGrp.c @@ -31,7 +31,7 @@ static Boolean cvtStringToStringArray(Display *,XrmValuePtr ,Cardinal *,XrmValu static StringArray newStringArray(StringArray ); static void freeStringArray(StringArray ); -/*ARGSUSED*/static void create_toggles(self)Widget self; +/*ARGSUSED*/static void create_toggles(Widget self) { Cardinal i; StringArray s; @@ -47,7 +47,7 @@ static void freeStringArray(StringArray ); True, XtNborderWidth, 0, XtNframeWidth, 0, NULL); } } -/*ARGSUSED*/static Boolean cvtStringToStringArray(display,args,num_args,from,to,converter_data)Display * display;XrmValuePtr args;Cardinal * num_args;XrmValuePtr from;XrmValuePtr to;XtPointer * converter_data; +/*ARGSUSED*/static Boolean cvtStringToStringArray(Display *display, XrmValuePtr args, Cardinal *num_args, XrmValuePtr from, XrmValuePtr to, XtPointer *converter_data) { String t, s; StringArray a = NULL; @@ -76,7 +76,7 @@ static void freeStringArray(StringArray ); a[i] = NULL; done(StringArray, a); } -/*ARGSUSED*/static StringArray newStringArray(a)StringArray a; +/*ARGSUSED*/static StringArray newStringArray(StringArray a) { Cardinal n, i; StringArray s; @@ -88,7 +88,7 @@ static void freeStringArray(StringArray ); s[n] = NULL; return s; } -/*ARGSUSED*/static void freeStringArray(a)StringArray a; +/*ARGSUSED*/static void freeStringArray(StringArray a) { Cardinal i; @@ -171,8 +171,7 @@ XtInherit_layout, }, }; WidgetClass xfwfRadioGroupWidgetClass = (WidgetClass) &xfwfRadioGroupClassRec; -static void _resolve_inheritance(class) -WidgetClass class; +static void _resolve_inheritance(WidgetClass class) { XfwfRadioGroupWidgetClass c = (XfwfRadioGroupWidgetClass) class; XfwfRadioGroupWidgetClass super; @@ -187,17 +186,17 @@ WidgetClass class; if (class == xfwfRadioGroupWidgetClass) return; super = (XfwfRadioGroupWidgetClass)class->core_class.superclass; } -/*ARGSUSED*/static void class_initialize() +/*ARGSUSED*/static void class_initialize(void) { XtSetTypeConverter(XtRString, "StringArray", cvtStringToStringArray, NULL, 0, XtCacheNone, NULL); } -/*ARGSUSED*/static void initialize(request,self,args,num_args)Widget request;Widget self;ArgList args;Cardinal * num_args; +/*ARGSUSED*/static void initialize(Widget request, Widget self, ArgList args, Cardinal *num_args) { ((XfwfRadioGroupWidget)self)->xfwfRadioGroup.labels = newStringArray(((XfwfRadioGroupWidget)self)->xfwfRadioGroup.labels); create_toggles(self); } -/*ARGSUSED*/static Boolean set_values(old,request,self,args,num_args)Widget old;Widget request;Widget self;ArgList args;Cardinal * num_args; +/*ARGSUSED*/static Boolean set_values(Widget old, Widget request, Widget self, ArgList args, Cardinal *num_args) { if (((XfwfRadioGroupWidget)old)->xfwfRadioGroup.labels != ((XfwfRadioGroupWidget)self)->xfwfRadioGroup.labels) { freeStringArray(((XfwfRadioGroupWidget)old)->xfwfRadioGroup.labels); diff --git a/obm/ObmW/RowCol.c b/obm/ObmW/RowCol.c index 138e4e7..9350d33 100644 --- a/obm/ObmW/RowCol.c +++ b/obm/ObmW/RowCol.c @@ -14,7 +14,7 @@ static Boolean set_values(Widget ,Widget ,Widget,ArgList ,Cardinal *); static char rcsid[] = "$Header: RowCol.w,v 1.1 92/10/14 18:36:36 bert Exp $"; static void align_child(Widget,int ,int ,int ,int ,Alignment ); -/*ARGSUSED*/static void align_child(self,cx,cy,width,height,alignment)Widget self;int cx;int cy;int width;int height;Alignment alignment; +/*ARGSUSED*/static void align_child(Widget self, int cx, int cy, int width, int height, Alignment alignment) { Position x, y; @@ -101,8 +101,7 @@ layout, }, }; WidgetClass xfwfRowColWidgetClass = (WidgetClass) &xfwfRowColClassRec; -static void _resolve_inheritance(class) -WidgetClass class; +static void _resolve_inheritance(WidgetClass class) { XfwfRowColWidgetClass c = (XfwfRowColWidgetClass) class; XfwfRowColWidgetClass super; @@ -119,11 +118,11 @@ WidgetClass class; if (c->xfwfRowCol_class.layout == XtInherit_layout) c->xfwfRowCol_class.layout = super->xfwfRowCol_class.layout; } -/*ARGSUSED*/static void change_managed(self)Widget self; +/*ARGSUSED*/static void change_managed(Widget self) { ((XfwfRowColWidgetClass)self->core.widget_class)->xfwfRowCol_class.layout(self, ((XfwfRowColWidget)self)->xfwfRowCol.shrinkToFit); } -/*ARGSUSED*/static void layout(self,shrink)Widget self;int shrink; +/*ARGSUSED*/static void layout(Widget self, int shrink) { int nrows, ncols, i, nchild, n; Position left, top, x, y; @@ -235,10 +234,7 @@ WidgetClass class; /*ARGSUSED*/static XtGeometryResult -geometry_manager (child,request,reply) -Widget child; -XtWidgetGeometry * request; -XtWidgetGeometry * reply; +geometry_manager (Widget child, XtWidgetGeometry *request, XtWidgetGeometry *reply) { Widget self = XtParent(child); Dimension newwd, newht, newbd; @@ -289,15 +285,15 @@ XtWidgetGeometry * reply; } } -/*ARGSUSED*/static void resize(self)Widget self; +/*ARGSUSED*/static void resize(Widget self) { if (((XfwfRowColWidget)self)->xfwfRowCol.rows == 0 && ((XfwfRowColWidget)self)->xfwfRowCol.columns == 0) ((XfwfRowColWidgetClass)self->core.widget_class)->xfwfRowCol_class.layout(self, False); } -/*ARGSUSED*/static void initialize(request,self,args,num_args)Widget request;Widget self;ArgList args;Cardinal * num_args; +/*ARGSUSED*/static void initialize(Widget request, Widget self, ArgList args, Cardinal *num_args) { ((XfwfRowColWidget)self)->xfwfRowCol.max_width = ((XfwfRowColWidget)self)->xfwfRowCol.max_height = 0; } -/*ARGSUSED*/static Boolean set_values(old,request,self,args,num_args)Widget old;Widget request;Widget self;ArgList args;Cardinal * num_args; +/*ARGSUSED*/static Boolean set_values(Widget old, Widget request, Widget self, ArgList args, Cardinal *num_args) { Boolean need_layout = False; Boolean need_redisplay = False; diff --git a/obm/ObmW/Scrollbar.c b/obm/ObmW/Scrollbar.c index e6521cf..b33182a 100644 --- a/obm/ObmW/Scrollbar.c +++ b/obm/ObmW/Scrollbar.c @@ -24,7 +24,7 @@ static void down(Widget ,XtPointer ,XtPointer ); static void thumbscroll(Widget ,XtPointer ,XtPointer ); static void copy_background(Widget,int ,XrmValue *); -/*ARGSUSED*/static void up(arrow,client_data,call_data)Widget arrow;XtPointer client_data;XtPointer call_data; +/*ARGSUSED*/static void up(Widget arrow, XtPointer client_data, XtPointer call_data) { Widget self = (Widget) client_data; XfwfScrollInfo info; @@ -41,7 +41,7 @@ static void copy_background(Widget,int ,XrmValue *); } XtCallCallbackList(self, ((XfwfScrollbarWidget)self)->xfwfScrollbar.scrollCallback, &info); } -/*ARGSUSED*/static void down(arrow,client_data,call_data)Widget arrow;XtPointer client_data;XtPointer call_data; +/*ARGSUSED*/static void down(Widget arrow, XtPointer client_data, XtPointer call_data) { Widget self = (Widget) client_data; XfwfScrollInfo info; @@ -58,7 +58,7 @@ static void copy_background(Widget,int ,XrmValue *); } XtCallCallbackList(self, ((XfwfScrollbarWidget)self)->xfwfScrollbar.scrollCallback, &info); } -/*ARGSUSED*/static void thumbscroll(w,client_data,call_data)Widget w;XtPointer client_data;XtPointer call_data; +/*ARGSUSED*/static void thumbscroll(Widget w, XtPointer client_data, XtPointer call_data) { Widget self = (Widget) client_data; XfwfScrollInfo *info = (XfwfScrollInfo*) call_data; @@ -69,7 +69,7 @@ static void copy_background(Widget,int ,XrmValue *); info->flags &= XFWF_HPOS; XtCallCallbackList(self, ((XfwfScrollbarWidget)self)->xfwfScrollbar.scrollCallback, info); } -/*ARGSUSED*/static void copy_background(self,offset,value)Widget self;int offset;XrmValue * value; +/*ARGSUSED*/static void copy_background(Widget self, int offset, XrmValue *value) { value->addr = (XtPointer) &((XfwfScrollbarWidget)self)->core.background_pixel; } @@ -153,7 +153,7 @@ scroll_response, }; WidgetClass xfwfScrollbarWidgetClass = (WidgetClass) &xfwfScrollbarClassRec; /*ARGSUSED*/ -static void Scroll(self,event,params,num_params)Widget self;XEvent*event;String*params;Cardinal*num_params; +static void Scroll(Widget self, XEvent *event, String *params, Cardinal *num_params) { XfwfScrollInfo info; @@ -213,8 +213,7 @@ static void Scroll(self,event,params,num_params)Widget self;XEvent*event;String* XtCallCallbackList(self, ((XfwfScrollbarWidget)self)->xfwfScrollbar.scrollCallback, &info); } -static void _resolve_inheritance(class) -WidgetClass class; +static void _resolve_inheritance(WidgetClass class) { XfwfScrollbarWidgetClass c = (XfwfScrollbarWidgetClass) class; XfwfScrollbarWidgetClass super; @@ -231,7 +230,7 @@ WidgetClass class; if (c->xfwfScrollbar_class.scroll_response == XtInherit_scroll_response) c->xfwfScrollbar_class.scroll_response = super->xfwfScrollbar_class.scroll_response; } -/*ARGSUSED*/static void initialize(request,self,args,num_args)Widget request;Widget self;ArgList args;Cardinal * num_args; +/*ARGSUSED*/static void initialize(Widget request, Widget self, ArgList args, Cardinal *num_args) { Position x, y, xa2, xslider, ya2, yslider; Dimension w, h, wa, ha, wslider, hslider; @@ -304,7 +303,7 @@ WidgetClass class; XtVaGetValues(((XfwfScrollbarWidget)self)->xfwfScrollbar.slider, XtNscrollResponse, &((XfwfScrollbarWidget)self)->xfwfScrollbar.slider_scroll, NULL); ((XfwfScrollbarWidget)self)->xfwfScrollbar.initializing = False; } -/*ARGSUSED*/static void resize(self)Widget self; +/*ARGSUSED*/static void resize(Widget self) { Position x, y, xa2, xslider, ya2, yslider; Dimension w, h, wa, ha, wslider, hslider; @@ -329,7 +328,7 @@ WidgetClass class; XtConfigureWidget(((XfwfScrollbarWidget)self)->xfwfScrollbar.arrow2, xa2, ya2, wa, ha, 0); XtConfigureWidget(((XfwfScrollbarWidget)self)->xfwfScrollbar.slider, xslider, yslider, wslider, hslider, 0); } -/*ARGSUSED*/static void insert_child(child)Widget child; +/*ARGSUSED*/static void insert_child(Widget child) { Widget self = XtParent(child); { if (((XfwfScrollbarWidget)self)->xfwfScrollbar.initializing) xfwfBoardClassRec.composite_class.insert_child(child); @@ -341,7 +340,7 @@ WidgetClass class; } } } -/*ARGSUSED*/static Boolean set_values(old,request,self,args,num_args)Widget old;Widget request;Widget self;ArgList args;Cardinal * num_args; +/*ARGSUSED*/static Boolean set_values(Widget old, Widget request, Widget self, ArgList args, Cardinal *num_args) { if (((XfwfScrollbarWidget)old)->xfwfScrollbar.vertical != ((XfwfScrollbarWidget)self)->xfwfScrollbar.vertical) { XtWarning("Cannot change the \"vertical\" resource of a scrollbar\n"); @@ -362,13 +361,13 @@ WidgetClass class; } return False; } -/*ARGSUSED*/static void scroll_response(wdg,client_data,call_data)Widget wdg;XtPointer client_data;XtPointer call_data; +/*ARGSUSED*/static void scroll_response(Widget wdg, XtPointer client_data, XtPointer call_data) { Widget self = (Widget) client_data; ((XfwfScrollbarWidget)self)->xfwfScrollbar.slider_scroll(wdg, ((XfwfScrollbarWidget)self)->xfwfScrollbar.slider, call_data); } -/*ARGSUSED*/void XfwfSetScrollbar(self,pos,size)Widget self;double pos;double size; +/*ARGSUSED*/void XfwfSetScrollbar(Widget self, double pos, double size) { if (! XtIsSubclass(self, xfwfScrollbarWidgetClass)) XtError("XfwfSetScrollbar called with incorrect widget type"); diff --git a/obm/ObmW/Separator.c b/obm/ObmW/Separator.c index 3a51c72..c56d2a4 100644 --- a/obm/ObmW/Separator.c +++ b/obm/ObmW/Separator.c @@ -49,12 +49,12 @@ static XtResource resources[] = { }; #undef offset -static void Initialize(); -static void Resize(); -static void Redisplay(); -static Boolean SetValues(); -static void ClassInitialize(); -static void Destroy(); +static void Initialize(Widget request, Widget new, ArgList args, Cardinal *num_args); +static void Resize(Widget w); +static void Redisplay(Widget gw, XEvent *event, Region region); +static Boolean SetValues(Widget current, Widget request, Widget new, ArgList args, Cardinal *num_args); +static void ClassInitialize(void); +static void Destroy(Widget w); SeparatorClassRec separatorClassRec = { { @@ -137,13 +137,13 @@ static XrmQuark QSingle, QDouble, QShadowIn, QShadowOut; /* ARGSUSED */ static Boolean -CvtStringToSeparatorType(dpy, args, num_args, fromVal, toVal, convData) - Display *dpy; - XrmValuePtr args; /* unused */ - Cardinal *num_args; /* unused */ - XrmValuePtr fromVal; - XrmValuePtr toVal; - XtPointer *convData; /* unused */ +CvtStringToSeparatorType(Display *dpy, XrmValuePtr args, Cardinal *num_args, XrmValuePtr fromVal, XrmValuePtr toVal, XtPointer *convData) + + /* unused */ + /* unused */ + + + /* unused */ { static XawSeparatorType separatorType; XrmQuark q; @@ -166,7 +166,7 @@ CvtStringToSeparatorType(dpy, args, num_args, fromVal, toVal, convData) } #undef done -static void ClassInitialize() +static void ClassInitialize(void) { XawInitializeWidgetSet(); XtSetTypeConverter( XtRString, XtRSeparatorType, CvtStringToSeparatorType, @@ -179,8 +179,7 @@ static void ClassInitialize() QShadowOut = XrmStringToQuark(XawShadow_Etched_Out); } -static void GetGC(sw) - SeparatorWidget sw; +static void GetGC(SeparatorWidget sw) { XGCValues values; unsigned long mask; @@ -193,10 +192,7 @@ static void GetGC(sw) } /* ARGSUSED */ -static void Initialize(request, new, args, num_args) - Widget request, new; - ArgList args; - Cardinal *num_args; +static void Initialize(Widget request, Widget new, ArgList args, Cardinal *num_args) { SeparatorWidget newsw = (SeparatorWidget) new; @@ -210,8 +206,7 @@ static void Initialize(request, new, args, num_args) } -static void Resize(w) - Widget w; +static void Resize(Widget w) { /* If widget is realized, clear and redisplay it */ @@ -222,10 +217,7 @@ static void Resize(w) } /* ARGSUSED */ -static Boolean SetValues(current, request, new, args, num_args) - Widget current, request, new; - ArgList args; - Cardinal *num_args; +static Boolean SetValues(Widget current, Widget request, Widget new, ArgList args, Cardinal *num_args) { SeparatorWidget cursw = (SeparatorWidget) current; SeparatorWidget newsw = (SeparatorWidget) new; @@ -252,16 +244,12 @@ static Boolean SetValues(current, request, new, args, num_args) return redisplay; } -static void Destroy(w) - Widget w; +static void Destroy(Widget w) { XtReleaseGC( w, ((SeparatorWidget)w)->separator.gc ); } -static void Redisplay(gw, event, region) - Widget gw; - XEvent *event; - Region region; +static void Redisplay(Widget gw, XEvent *event, Region region) { SeparatorWidget sw = (SeparatorWidget) gw; int x1, y1, x2, y2; diff --git a/obm/ObmW/Slider2.c b/obm/ObmW/Slider2.c index 6721327..3b2ed24 100644 --- a/obm/ObmW/Slider2.c +++ b/obm/ObmW/Slider2.c @@ -36,7 +36,7 @@ static void create_thumbgc(Widget); static void create_thumblightgc(Widget); static void create_thumbdarkgc(Widget); -/*ARGSUSED*/static void create_gc(self)Widget self; +/*ARGSUSED*/static void create_gc(Widget self) { XtGCMask mask; XGCValues values; @@ -55,7 +55,7 @@ static void create_thumbdarkgc(Widget); mask = GCFont | GCBackground | GCForeground; ((XfwfSlider2Widget)self)->xfwfLabel.rv_gc = XtGetGC(self, mask, &values); } -/*ARGSUSED*/static void create_graygc(self)Widget self; +/*ARGSUSED*/static void create_graygc(Widget self) { XtGCMask mask; XGCValues values; @@ -70,7 +70,7 @@ static void create_thumbdarkgc(Widget); mask = GCForeground | GCStipple | GCFillStyle; ((XfwfSlider2Widget)self)->xfwfLabel.graygc = XtGetGC(self, mask, &values); } -/*ARGSUSED*/static void create_thumbgc(self)Widget self; +/*ARGSUSED*/static void create_thumbgc(Widget self) { XtGCMask mask; XGCValues values; @@ -86,7 +86,7 @@ static void create_thumbdarkgc(Widget); } ((XfwfSlider2Widget)self)->xfwfSlider2.thumbgc = XtGetGC(self, mask, &values); } -/*ARGSUSED*/static void create_thumblightgc(self)Widget self; +/*ARGSUSED*/static void create_thumblightgc(Widget self) { XtGCMask mask; XGCValues values; @@ -122,7 +122,7 @@ static void create_thumbdarkgc(Widget); } ((XfwfSlider2Widget)self)->xfwfSlider2.thumblightgc = XtGetGC(self, mask, &values); } -/*ARGSUSED*/static void create_thumbdarkgc(self)Widget self; +/*ARGSUSED*/static void create_thumbdarkgc(Widget self) { XtGCMask mask; XGCValues values; @@ -242,7 +242,7 @@ scroll_response, }; WidgetClass xfwfSlider2WidgetClass = (WidgetClass) &xfwfSlider2ClassRec; /*ARGSUSED*/ -static void start(self,event,params,num_params)Widget self;XEvent*event;String*params;Cardinal*num_params; +static void start(Widget self, XEvent *event, String *params, Cardinal *num_params) { Dimension w, h; Position x, y; @@ -289,7 +289,7 @@ static void start(self,event,params,num_params)Widget self;XEvent*event;String*p } /*ARGSUSED*/ -static void finish(self,event,params,num_params)Widget self;XEvent*event;String*params;Cardinal*num_params; +static void finish(Widget self, XEvent *event, String *params, Cardinal *num_params) { XfwfScrollInfo info; @@ -304,7 +304,7 @@ static void finish(self,event,params,num_params)Widget self;XEvent*event;String* } /*ARGSUSED*/ -static void drag(self,event,params,num_params)Widget self;XEvent*event;String*params;Cardinal*num_params; +static void drag(Widget self, XEvent *event, String *params, Cardinal *num_params) { XfwfScrollInfo info; Dimension wd, ht, fwd, fht; @@ -327,8 +327,7 @@ static void drag(self,event,params,num_params)Widget self;XEvent*event;String*pa XtCallCallbackList(self, ((XfwfSlider2Widget)self)->xfwfSlider2.scrollCallback, &info); } -static void _resolve_inheritance(class) -WidgetClass class; +static void _resolve_inheritance(WidgetClass class) { XfwfSlider2WidgetClass c = (XfwfSlider2WidgetClass) class; XfwfSlider2WidgetClass super; @@ -351,7 +350,7 @@ WidgetClass class; if (c->xfwfSlider2_class.scroll_response == XtInherit_scroll_response) c->xfwfSlider2_class.scroll_response = super->xfwfSlider2_class.scroll_response; } -/*ARGSUSED*/static void compute_thumb(self,x,y,width,height)Widget self;Position * x;Position * y;Dimension * width;Dimension * height; +/*ARGSUSED*/static void compute_thumb(Widget self, Position *x, Position *y, Dimension *width, Dimension *height) { Position fx, fy; Dimension fw, fh; @@ -364,7 +363,7 @@ WidgetClass class; *x = fx + ((XfwfSlider2Widget)self)->xfwfSlider2.thumb_x * (fw - *width) + 0.5; *y = fy + ((XfwfSlider2Widget)self)->xfwfSlider2.thumb_y * (fh - *height) + 0.5; } -/*ARGSUSED*/static void compute_inside(self,x,y,w,h)Widget self;Position * x;Position * y;Dimension * w;Dimension * h; +/*ARGSUSED*/static void compute_inside(Widget self, Position *x, Position *y, Dimension *w, Dimension *h) { int tmp; @@ -374,7 +373,7 @@ WidgetClass class; tmp = *w - 2 * ((XfwfSlider2Widget)self)->xfwfSlider2.thumbFrameWidth; *w = (tmp < 0) ? 0 : tmp; tmp = *h - 2 * ((XfwfSlider2Widget)self)->xfwfSlider2.thumbFrameWidth; *h = (tmp < 0) ? 0 : tmp; } -/*ARGSUSED*/static void expose(self,event,region)Widget self;XEvent * event;Region region; +/*ARGSUSED*/static void expose(Widget self, XEvent *event, Region region) { Position x, y; Dimension wd, ht; @@ -396,7 +395,7 @@ WidgetClass class; } xfwfLabelClassRec.core_class.expose(self, event, region); } -/*ARGSUSED*/static void initialize(request,self,args,num_args)Widget request;Widget self;ArgList args;Cardinal * num_args; +/*ARGSUSED*/static void initialize(Widget request, Widget self, ArgList args, Cardinal *num_args) { ((XfwfSlider2Widget)self)->xfwfSlider2.thumb_x = ((XfwfSlider2Widget)self)->xfwfSlider2.thumb_y = 0.0; ((XfwfSlider2Widget)self)->xfwfSlider2.thumb_wd = ((XfwfSlider2Widget)self)->xfwfSlider2.thumb_ht = 1.0; @@ -407,7 +406,7 @@ WidgetClass class; ((XfwfSlider2Widget)self)->xfwfSlider2.thumblightgc = NULL; create_thumblightgc(self); ((XfwfSlider2Widget)self)->xfwfSlider2.thumbdarkgc = NULL; create_thumbdarkgc(self); } -/*ARGSUSED*/static void move_thumb(self,oldx,oldy,wd,ht,newx,newy)Widget self;int oldx;int oldy;int wd;int ht;int newx;int newy; +/*ARGSUSED*/static void move_thumb(Widget self, int oldx, int oldy, int wd, int ht, int newx, int newy) { int h; @@ -433,7 +432,7 @@ WidgetClass class; newx - oldx, ht - abs(h), False); } } -/*ARGSUSED*/static void compute_info(self,x,y,w,h,thumb_x,thumb_y,thumb_wd,thumb_ht)Widget self;Position * x;Position * y;Dimension * w;Dimension * h;float * thumb_x;float * thumb_y;float * thumb_wd;float * thumb_ht; +/*ARGSUSED*/static void compute_info(Widget self, Position *x, Position *y, Dimension *w, Dimension *h, float *thumb_x, float *thumb_y, float *thumb_wd, float *thumb_ht) { Dimension fw, fh; Position fx, fy; @@ -448,7 +447,7 @@ WidgetClass class; *thumb_x = (*w == fw) ? 0.0 : ((float) (*x - fx))/(fw - *w); *thumb_y = (*h == fh) ? 0.0 : ((float) (*y - fy))/(fh - *h); } -/*ARGSUSED*/static Boolean set_values(old,request,self,args,num_args)Widget old;Widget request;Widget self;ArgList args;Cardinal * num_args; +/*ARGSUSED*/static Boolean set_values(Widget old, Widget request, Widget self, ArgList args, Cardinal *num_args) { Boolean need_redisplay = False; Position x, y; @@ -476,7 +475,7 @@ WidgetClass class; } return need_redisplay; } -/*ARGSUSED*/static void scroll_response(wdg,client_data,call_data)Widget wdg;XtPointer client_data;XtPointer call_data; +/*ARGSUSED*/static void scroll_response(Widget wdg, XtPointer client_data, XtPointer call_data) { Widget self = (Widget) client_data; XfwfScrollInfo *inf = (XfwfScrollInfo *)call_data; @@ -530,7 +529,7 @@ WidgetClass class; XtCallCallbackList(self, ((XfwfSlider2Widget)self)->xfwfSlider2.scrollCallback, &new_info); } } -/*ARGSUSED*/void XfwfGetThumb(self,info)Widget self;XfwfScrollInfo * info; +/*ARGSUSED*/void XfwfGetThumb(Widget self, XfwfScrollInfo *info) { if (! XtIsSubclass(self, xfwfSlider2WidgetClass)) XtError("XfwfGetThumb called with incorrect widget type"); @@ -541,7 +540,7 @@ WidgetClass class; info->hpos = ((XfwfSlider2Widget)self)->xfwfSlider2.thumb_x; info->hsize = ((XfwfSlider2Widget)self)->xfwfSlider2.thumb_wd; } -/*ARGSUSED*/void XfwfMoveThumb(self,x,y)Widget self;double x;double y; +/*ARGSUSED*/void XfwfMoveThumb(Widget self, double x, double y) { XfwfScrollInfo info; @@ -556,7 +555,7 @@ WidgetClass class; info.hpos = x; ((XfwfSlider2WidgetClass)self->core.widget_class)->xfwfSlider2_class.scroll_response(NULL, self, &info); } -/*ARGSUSED*/void XfwfResizeThumb(self,wd,ht)Widget self;double wd;double ht; +/*ARGSUSED*/void XfwfResizeThumb(Widget self, double wd, double ht) { XfwfScrollInfo info; diff --git a/obm/ObmW/Table.c b/obm/ObmW/Table.c index 53e59b0..6261d03 100644 --- a/obm/ObmW/Table.c +++ b/obm/ObmW/Table.c @@ -188,11 +188,11 @@ typedef struct _XawTableColumnRec { /* Private Data */ -static void Def_pixel(); -static void Def_scroll(); -static void Def_column_default_width(); -static void Def_literal_width(); -static void Def_shadow_thickness(); +static void Def_pixel(Widget w, int offset, XrmValue *value); +static void Def_scroll(Widget w, int offset, XrmValue *value); +static void Def_column_default_width(Widget w, int offset, XrmValue *value); +static void Def_literal_width(Widget w, int offset, XrmValue *value); +static void Def_shadow_thickness(Widget w, int offset, XrmValue *value); #define Offset(field) XtOffsetOf(TableRec, field) @@ -373,10 +373,7 @@ static XtResource resources[] = { #define PRINTF_BOOL(a) ((a) ? "TRUE":"FALSE") #define PRINTF_NULL(a) ((a)==NULL ? "NULL":"not NULL") -static void Def_pixel(w, offset, value) - Widget w; - int offset; - XrmValue *value; +static void Def_pixel(Widget w, int offset, XrmValue *value) { XawTableWidget tw = (XawTableWidget)w; static Pixel pix = 0; @@ -396,10 +393,7 @@ static void Def_pixel(w, offset, value) } /* ARGSUSED */ -static void Def_scroll(w, offset, value) - Widget w; - int offset; - XrmValue *value; +static void Def_scroll(Widget w, int offset, XrmValue *value) { static Widget view; @@ -429,10 +423,7 @@ static void Def_scroll(w, offset, value) } /* ARGSUSED */ -static void Def_column_default_width(w, offset, value) - Widget w; - int offset; - XrmValue *value; +static void Def_column_default_width(Widget w, int offset, XrmValue *value) { XawTableWidget tw = (XawTableWidget) w; static int column_default_width; @@ -452,10 +443,7 @@ static void Def_column_default_width(w, offset, value) #endif /* ARGSUSED */ -static void Def_literal_width(w, offset, value) - Widget w; - int offset; - XrmValue *value; +static void Def_literal_width(Widget w, int offset, XrmValue *value) { XawTableWidget tw = (XawTableWidget) w; static int literal_width; @@ -471,10 +459,7 @@ static void Def_literal_width(w, offset, value) } /* ARGSUSED */ -static void Def_shadow_thickness(w, offset, value) - Widget w; - int offset; - XrmValue *value; +static void Def_shadow_thickness(Widget w, int offset, XrmValue *value) { Widget parent = XtParent (w); static Dimension shadow_thickness; @@ -494,33 +479,33 @@ static void Def_shadow_thickness(w, offset, value) #undef offset -static void MultipleChangeGC(); -static void Initialize(); -static void Realize(); -static void Resize(); -static void Redisplay(); -static void Destroy(); +static void MultipleChangeGC(Widget w, Pixel *fore, Pixel *back, Font *font, GC *normal, GC *reverse); +static void Initialize(Widget request, Widget new, ArgList args, Cardinal *num_args); +static void Realize(Widget w, XtValueMask *valueMask, XSetWindowAttributes *attributes); +static void Resize(Widget w); +static void Redisplay(Widget w, XEvent *event, Region region); +static void Destroy(Widget w); -static Boolean SetValues(); +static Boolean SetValues(Widget current, Widget request, Widget new, ArgList args, Cardinal *num_args); -static void WalkForCells(); -static void LoseSelection(); +static void WalkForCells(Widget w, XawTableProc proc, int b_r, int e_r, int b_c, int e_c); +static void LoseSelection(Widget w, Atom *selection); -static void CallEdit(); -static void InsertSelection(); -static void StoreBuffer(); -static void WhatCell(); -static void KeyReturn(); -static void HighlightCell(); -static void UnhighlightCell(); -static void DoingNothing(); +static void CallEdit(Widget w, XEvent *event, String *params, Cardinal *num_params); +static void InsertSelection(Widget w, XEvent *event, String *params, Cardinal *num_params); +static void StoreBuffer(Widget w, XEvent *event, String *params, Cardinal *num_params); +static void WhatCell(Widget w, XEvent *event, String *params, Cardinal *num_params); +static void KeyReturn(Widget w, XEvent *event, String *params, Cardinal *num_params); +static void HighlightCell(Widget w, XEvent *event, String *params, Cardinal *num_params); +static void UnhighlightCell(Widget w, XEvent *event, String *params, Cardinal *num_params); +static void DoingNothing(Widget w, XEvent *event, String *params, Cardinal *num_params); -static char* DummyString(); +static char* DummyString(void); -static Boolean InitCell(); +static Boolean InitCell(XtPointer p, int i, int j, XtPointer call_data, XtPointer client_data); -static XtGeometryResult QueryGeometry(); -static XtGeometryResult GeometryManager(); +static XtGeometryResult QueryGeometry(Widget w, XtWidgetGeometry *intended, XtWidgetGeometry *preferred); +static XtGeometryResult GeometryManager(Widget w, XtWidgetGeometry *desired, XtWidgetGeometry *allowed); static XtActionsRec actions[] = { {"call-edit", (XtActionProc)CallEdit }, @@ -636,11 +621,7 @@ static int MaskStaticArray[] = { 0x1FF, 0x3FF, 0x7FF, 0xFFF }; -static NormalReverseGC* GetNormalGC(w, fore, back, font) - Widget w; - Pixel fore; - Pixel back; - Font font; +static NormalReverseGC* GetNormalGC(Widget w, Pixel fore, Pixel back, Font font) { XawTableWidget tw = (XawTableWidget)w; int i = NORMAL_INDEX(fore, back); @@ -684,10 +665,7 @@ static NormalReverseGC* GetNormalGC(w, fore, back, font) return (NormalReverseGC*)NULL; } -static void GetGCByForeground(w, gc, fore) - Widget w; - GC *gc; - Pixel fore; +static void GetGCByForeground(Widget w, GC *gc, Pixel fore) { XGCValues values; @@ -696,9 +674,7 @@ static void GetGCByForeground(w, gc, fore) } -static ShadowGC* GetShadowGC(w, back) - Widget w; - Pixel back; +static ShadowGC* GetShadowGC(Widget w, Pixel back) { XawTableWidget tw = (XawTableWidget)w; int i = SHADOW_INDEX(back); @@ -736,10 +712,7 @@ static ShadowGC* GetShadowGC(w, back) return (ShadowGC*)NULL; } -static void ReleaseNormalGC(w, fore, back) - Widget w; - Pixel fore; - Pixel back; +static void ReleaseNormalGC(Widget w, Pixel fore, Pixel back) { XawTableWidget tw = (XawTableWidget)w; int i = NORMAL_INDEX(fore, back); @@ -759,9 +732,7 @@ static void ReleaseNormalGC(w, fore, back) } } -static void ReleaseShadowGC(w, back) - Widget w; - Pixel back; +static void ReleaseShadowGC(Widget w, Pixel back) { XawTableWidget tw = (XawTableWidget)w; int i = SHADOW_INDEX(back); @@ -781,13 +752,7 @@ static void ReleaseShadowGC(w, back) } } -static void MultipleChangeGC(w, fore, back, font, normal, reverse) - Widget w; - Pixel *fore; - Pixel *back; - Font *font; - GC *normal; - GC *reverse; +static void MultipleChangeGC(Widget w, Pixel *fore, Pixel *back, Font *font, GC *normal, GC *reverse) { XtGCMask mask; XGCValues values; @@ -844,10 +809,7 @@ static int buf2blen = 0; #endif /* WORD64 */ -static void CalculatePreferredSize(w, width, height) - Widget w; - Dimension *width; - Dimension *height; +static void CalculatePreferredSize(Widget w, Dimension *width, Dimension *height) { XawTableWidget tw = (XawTableWidget)w; int wid; @@ -882,9 +844,7 @@ static void CalculatePreferredSize(w, width, height) } -static Position GetX(tw,j) - XawTableWidget tw; - int j; +static Position GetX(XawTableWidget tw, int j) { TablePart* table = (TablePart*)&tw->table; Position x; @@ -900,9 +860,7 @@ static Position GetX(tw,j) return x; } -static Position GetY(tw,i) - XawTableWidget tw; - int i; +static Position GetY(XawTableWidget tw, int i) { return(i * (tw->table.row_margin + tw->table.row_height + 2 * tw->table.label_shadow_thickness) + @@ -914,8 +872,7 @@ static Position GetY(tw,i) * Calculate width and height of displayed text in pixels */ -static void SetLabelHeight(tw) - XawTableWidget tw; +static void SetLabelHeight(XawTableWidget tw) { XFontStruct *fs = tw->table.font; int row_height = tw->table.row_height; @@ -939,8 +896,7 @@ static void SetLabelHeight(tw) } } -static void SetLiteralWidth(tw) - XawTableWidget tw; +static void SetLiteralWidth(XawTableWidget tw) { if (tw->table.encoding) tw->table.literal_width = XTextWidth16(tw->table.font, (TXT16*)"mmm", 3); @@ -951,9 +907,7 @@ static void SetLiteralWidth(tw) } -static void SetLabelWidth(tw,i,j) - XawTableWidget tw; - int i,j; +static void SetLabelWidth(XawTableWidget tw, int i, int j) { XFontStruct *fs = tw->table.font; XawTableCell cell; @@ -975,8 +929,7 @@ static void SetLabelWidth(tw,i,j) } -static void CreateTableCellGC(w) - Widget w; +static void CreateTableCellGC(Widget w) { Display *dpy = XtDisplay(w); Drawable d = XtWindow(w); @@ -994,9 +947,7 @@ static void CreateTableCellGC(w) } -static void DrawColumns(tw, b_column, e_column) - XawTableWidget tw; - int b_column, e_column; +static void DrawColumns(XawTableWidget tw, int b_column, int e_column) { int j,y; @@ -1014,9 +965,7 @@ static void DrawColumns(tw, b_column, e_column) } } -static void DrawRows(tw, b_row, e_row) - XawTableWidget tw; - int b_row, e_row; +static void DrawRows(XawTableWidget tw, int b_row, int e_row) { int i,x; @@ -1034,9 +983,7 @@ static void DrawRows(tw, b_row, e_row) } } -static void DrawCage(tw, b_row, e_row, b_column, e_column) - XawTableWidget tw; - int b_row, e_row, b_column, e_column; +static void DrawCage(XawTableWidget tw, int b_row, int e_row, int b_column, int e_column) { int i,j; Display* dpy = XtDisplay((Widget)tw); @@ -1093,10 +1040,7 @@ static void DrawCage(tw, b_row, e_row, b_column, e_column) } } -static void Reposition(tw, cell, i, j) - XawTableWidget tw; - XawTableCell cell; - int i,j; +static void Reposition(XawTableWidget tw, XawTableCell cell, int i, int j) { Position newPos; XtJustify justify; @@ -1126,12 +1070,12 @@ static void Reposition(tw, cell, i, j) } /* ARGSUSED */ -static Boolean DeleteCell(p, i, j, call_data, client_data) - XtPointer p; - int i; /* unused */ - int j; /* unused */ - XtPointer call_data; - XtPointer client_data; /* unused */ +static Boolean DeleteCell(XtPointer p, int i, int j, XtPointer call_data, XtPointer client_data) + + /* unused */ + /* unused */ + + /* unused */ { Widget w = (Widget) p; XawTableCell cell = (XawTableCell)call_data; @@ -1149,8 +1093,7 @@ static Boolean DeleteCell(p, i, j, call_data, client_data) } -static void UpdateTable(tw) - XawTableWidget tw; +static void UpdateTable(XawTableWidget tw) { Dimension width; Dimension height; @@ -1172,10 +1115,7 @@ static void UpdateTable(tw) } -static int SetTableSize(w, rows, columns) - Widget w; - int rows; - int columns; +static int SetTableSize(Widget w, int rows, int columns) { XawTableWidget tw = (XawTableWidget)w; XawTableCallbackStruct callback_str; @@ -1268,11 +1208,7 @@ static int SetTableSize(w, rows, columns) /* ARGSUSED */ -static void Initialize(request, new, args, num_args) - Widget request; - Widget new; - ArgList args; - Cardinal *num_args; +static void Initialize(Widget request, Widget new, ArgList args, Cardinal *num_args) { XawTableWidget tw = (XawTableWidget) new; Dimension width; @@ -1361,10 +1297,7 @@ static void Initialize(request, new, args, num_args) } -static void Realize(w, valueMask, attributes) - Widget w; - XtValueMask *valueMask; - XSetWindowAttributes *attributes; +static void Realize(Widget w, XtValueMask *valueMask, XSetWindowAttributes *attributes) { XawTableWidget tw = (XawTableWidget) w; ShadowGC *shadow; @@ -1385,12 +1318,12 @@ static void Realize(w, valueMask, attributes) } /* ARGSUSED */ -static Boolean MatchLabel(w, i, j, call_data, client_data) - Widget w; /* unused */ - int i; /* unused */ - int j; /* unused */ - XtPointer call_data; - XtPointer client_data; +static Boolean MatchLabel(Widget w, int i, int j, XtPointer call_data, XtPointer client_data) + /* unused */ + /* unused */ + /* unused */ + + { XawTableCell cell = (XawTableCell)call_data; XrmQuark* templ = (XrmQuark*)client_data; @@ -1399,12 +1332,12 @@ static Boolean MatchLabel(w, i, j, call_data, client_data) } /* ARGSUSED */ -static Boolean InitCell(p, i, j, call_data, client_data) - XtPointer p; /* unused */ - int i; /* unused */ - int j; /* unused */ - XtPointer call_data; - XtPointer client_data; /* unused */ +static Boolean InitCell(XtPointer p, int i, int j, XtPointer call_data, XtPointer client_data) + /* unused */ + /* unused */ + /* unused */ + + /* unused */ { XawTableCell cell = (XawTableCell)call_data; @@ -1426,13 +1359,7 @@ static Boolean InitCell(p, i, j, call_data, client_data) * Shadow drawing around cell * */ -static void PaintShadow(w, i, j, x, y, cell) - Widget w; - int i; - int j; - Position x; - Position y; - XawTableCell cell; +static void PaintShadow(Widget w, int i, int j, Position x, Position y, XawTableCell cell) { XawTableWidget tw = (XawTableWidget) w; @@ -1469,12 +1396,7 @@ static void PaintShadow(w, i, j, x, y, cell) } /* ARGSUSED */ -static void PaintLabel(w, i, j, x, y, cell) - Widget w; - int i; - int j; - Position x,y; - XawTableCell cell; +static void PaintLabel(Widget w, int i, int j, Position x, Position y, XawTableCell cell) { XawTableWidget tw = (XawTableWidget) w; XRectangle rectangle[1]; @@ -1544,12 +1466,12 @@ static void PaintLabel(w, i, j, x, y, cell) } /* ARGSUSED */ -static Boolean PaintCell(p, i, j, call_data, client_data) - XtPointer p; - int i; - int j; - XtPointer call_data; - XtPointer client_data; /* unused */ +static Boolean PaintCell(XtPointer p, int i, int j, XtPointer call_data, XtPointer client_data) + + + + + /* unused */ { Widget w = (Widget) p; XawTableWidget tw = (XawTableWidget) w; @@ -1567,10 +1489,7 @@ static Boolean PaintCell(p, i, j, call_data, client_data) return False; } -static void WhatCellsToBeDraw(tw, rect, b_row, e_row, b_column , e_column) - XawTableWidget tw; - XRectangle rect; - int *b_row, *e_row, *b_column , *e_column; +static void WhatCellsToBeDraw(XawTableWidget tw, XRectangle rect, int *b_row, int *e_row, int *b_column, int *e_column) { Position x1 = (Position)rect.x, y1 = (Position)rect.y, @@ -1612,10 +1531,7 @@ static void WhatCellsToBeDraw(tw, rect, b_row, e_row, b_column , e_column) } -static void Redisplay(w, event, region) - Widget w; - XEvent *event; - Region region; +static void Redisplay(Widget w, XEvent *event, Region region) { XawTableWidget tw = (XawTableWidget) w; XRectangle rect; @@ -1702,12 +1618,12 @@ static void Redisplay(w, event, region) } /* ARGSUSED */ -static Boolean SetValues(current, request, new, args, num_args) - Widget current; - Widget request; /* unused */ - Widget new; - ArgList args; /* unused */ - Cardinal *num_args; /* unused */ +static Boolean SetValues(Widget current, Widget request, Widget new, ArgList args, Cardinal *num_args) + + /* unused */ + + /* unused */ + /* unused */ { XawTableWidget curtw = (XawTableWidget) current; XawTableWidget newtw = (XawTableWidget) new; @@ -1837,8 +1753,7 @@ static Boolean SetValues(current, request, new, args, num_args) } -static void Destroy(w) - Widget w; +static void Destroy(Widget w) { XawTableWidget tw = (XawTableWidget)w; XawTableCallbackStruct callback_str; @@ -1890,8 +1805,7 @@ static void Destroy(w) } -static void Resize(w) - Widget w; +static void Resize(Widget w) { XawTableWidget tw = (XawTableWidget)w; @@ -1906,9 +1820,7 @@ static void Resize(w) } -static XtGeometryResult QueryGeometry(w, intended, preferred) - Widget w; - XtWidgetGeometry *intended, *preferred; +static XtGeometryResult QueryGeometry(Widget w, XtWidgetGeometry *intended, XtWidgetGeometry *preferred) { preferred->request_mode = CWWidth | CWHeight; @@ -1932,20 +1844,17 @@ static XtGeometryResult QueryGeometry(w, intended, preferred) } /* ARGSUSED */ -static XtGeometryResult GeometryManager(w, desired, allowed) - Widget w; - XtWidgetGeometry *desired; - XtWidgetGeometry *allowed; +static XtGeometryResult GeometryManager(Widget w, XtWidgetGeometry *desired, XtWidgetGeometry *allowed) { return XtGeometryYes; } -static void ExtractPosition(event, x, y , t) - XEvent *event; - Position *x, *y; /* RETURN */ - Time *t; /* RETURN */ +static void ExtractPosition(XEvent *event, Position *x, Position *y, Time *t) + + /* RETURN */ + /* RETURN */ { if (event == NULL) return; @@ -1982,10 +1891,10 @@ static void ExtractPosition(event, x, y , t) } /* ARGSUSED */ -static Boolean ExtractCell(tw, px, py, row, column) - XawTableWidget tw; - Position px,py; - int *row, *column; /* RETURN */ +static Boolean ExtractCell(XawTableWidget tw, Position px, Position py, int *row, int *column) + + + /* RETURN */ { Position x; Position y; @@ -2005,10 +1914,7 @@ static Boolean ExtractCell(tw, px, py, row, column) /* ARGSUSED */ -static void WalkForCells(w, proc, b_r, e_r, b_c, e_c) - Widget w; - XawTableProc proc; - int b_r, e_r, b_c, e_c; +static void WalkForCells(Widget w, XawTableProc proc, int b_r, int e_r, int b_c, int e_c) { XawTableWidget tw = (XawTableWidget)w; int i,j; @@ -2019,13 +1925,12 @@ static void WalkForCells(w, proc, b_r, e_r, b_c, e_c) &i, &j, (XtPointer)NULL); } -static char* DummyString() +static char* DummyString(void) { return XtNewString(""); } -static char* CopyOnlyPrintable(raw) - char* raw; +static char* CopyOnlyPrintable(char *raw) { char* clear; char *s,*h; @@ -2089,10 +1994,7 @@ static void CheckAllLabels(tw) } #endif -static void MoveEditCell (tw, row, column) - XawTableWidget tw; - int row; - int column; +static void MoveEditCell (XawTableWidget tw, int row, int column) { Position x,y; @@ -2120,12 +2022,12 @@ static void MoveEditCell (tw, row, column) } /* ARGSUSED */ -static Boolean CompareCells(p, i, j, call_data, client_data) - XtPointer p; - int i; /* unused */ - int j; /* unused */ - XtPointer call_data; - XtPointer client_data; /* unused */ +static Boolean CompareCells(XtPointer p, int i, int j, XtPointer call_data, XtPointer client_data) + + /* unused */ + /* unused */ + + /* unused */ { XawTableCell cell = (XawTableCell)call_data; XawTableCell test_cell = (XawTableCell)client_data; @@ -3905,11 +3807,7 @@ XawTableSetEdit (Widget w, int row, int column) * ******************************************************************/ -static void HighlightCell(w,event,params,num_params) - Widget w; - XEvent *event; - String *params; - Cardinal *num_params; +static void HighlightCell(Widget w, XEvent *event, String *params, Cardinal *num_params) { XawTableWidget tw = (XawTableWidget)w; XawTableCell cell; @@ -3951,11 +3849,11 @@ static void HighlightCell(w,event,params,num_params) } /* ARGSUSED */ -static void UnhighlightCell(w,event,params,num_params) - Widget w; - XEvent *event; - String *params; /* unused */ - Cardinal *num_params; +static void UnhighlightCell(Widget w, XEvent *event, String *params, Cardinal *num_params) + + + /* unused */ + { XawTableWidget tw = (XawTableWidget)w; XawTableCell cell; @@ -4008,11 +3906,11 @@ static void UnhighlightCell(w,event,params,num_params) } /* ARGSUSED */ -static void WhatCell(w,event,params,num_params) - Widget w; - XEvent *event; - String *params; /* unused */ - Cardinal *num_params; +static void WhatCell(Widget w, XEvent *event, String *params, Cardinal *num_params) + + + /* unused */ + { XawTableWidget tw = (XawTableWidget)w; Position x,y; @@ -4043,11 +3941,11 @@ static void WhatCell(w,event,params,num_params) } /* ARGSUSED */ -static void KeyReturn(w, event, params, num_params) - Widget w; - XEvent *event; - String *params; /* unused */ - Cardinal *num_params; /* unused */ +static void KeyReturn(Widget w, XEvent *event, String *params, Cardinal *num_params) + + + /* unused */ + /* unused */ { Widget tw; KeySym ksSymbol; @@ -4062,9 +3960,7 @@ static void KeyReturn(w, event, params, num_params) } -static Atom FetchAtom(w, name) - Widget w; - String name; +static Atom FetchAtom(Widget w, String name) { Atom a; XrmValue source, dest; @@ -4115,9 +4011,7 @@ static Boolean DeliverSelection(w, selection, target, } /* ARGSUSED */ -static void LoseSelection(w, selection) - Widget w; - Atom *selection; +static void LoseSelection(Widget w, Atom *selection) { XawTableWidget tw = (XawTableWidget) w; XawTableCell cell; @@ -4146,13 +4040,13 @@ static void LoseSelection(w, selection) XFlush(XtDisplay(w)); } -static int GetCutBufferNumber(); +static int GetCutBufferNumber(Atom atom); -static void StoreBuffer(w, event, params, num_params) - Widget w; - XEvent *event; - String *params; /* selections in precedence order */ - Cardinal *num_params; +static void StoreBuffer(Widget w, XEvent *event, String *params, Cardinal *num_params) + + + /* selections in precedence order */ + { XawTableWidget tw = (XawTableWidget)w; Position x, y; @@ -4217,11 +4111,11 @@ static void StoreBuffer(w, event, params, num_params) /* ARGSUSED */ -static void CallEdit(w,event,params,num_params) - Widget w; - XEvent *event; - String *params; /* unused */ - Cardinal *num_params; +static void CallEdit(Widget w, XEvent *event, String *params, Cardinal *num_params) + + + /* unused */ + { XawTableWidget tw = (XawTableWidget)w; Position x,y; @@ -4251,10 +4145,9 @@ typedef struct { int num; }RowColumn; -static void GetProc(); +static void GetProc(Widget w, XtPointer client_data, Atom *selection, Atom *type, XtPointer value, long unsigned int *length, int *format); -static void GetSelection (rc) - RowColumn *rc; +static void GetSelection (RowColumn *rc) { Atom selection; int buffer; @@ -4303,11 +4196,11 @@ static void GetProc(w, client_data, selection, } -static void InsertSelection(w, event, params, num_params) - Widget w; - XEvent *event; - String *params; /* selections in precedence order */ - Cardinal *num_params; +static void InsertSelection(Widget w, XEvent *event, String *params, Cardinal *num_params) + + + /* selections in precedence order */ + { XawTableWidget tw = (XawTableWidget)w; Position x,y; @@ -4349,8 +4242,7 @@ static void InsertSelection(w, event, params, num_params) } -static int GetCutBufferNumber(atom) - Atom atom; +static int GetCutBufferNumber(Atom atom) { if (atom == XA_CUT_BUFFER0) return(0); if (atom == XA_CUT_BUFFER1) return(1); @@ -4365,11 +4257,7 @@ static int GetCutBufferNumber(atom) /* ARGSUSED */ -static void DoingNothing(w, event, params, num_params) - Widget w; - XEvent *event; - String *params; - Cardinal *num_params; +static void DoingNothing(Widget w, XEvent *event, String *params, Cardinal *num_params) { /* doing nothing */ } diff --git a/obm/ObmW/Table3d.c b/obm/ObmW/Table3d.c index 760c64d..3644b07 100644 --- a/obm/ObmW/Table3d.c +++ b/obm/ObmW/Table3d.c @@ -37,12 +37,10 @@ typedef struct _ColorCashRec { }ColorCashRec, *ColorCash; static ColorCashRec* color_cash = NULL; -static void GetTopShadow(); +static void GetTopShadow(XColor *trom, XColor *to); -static void GetTopShadow(trom ,to) - XColor* trom; - XColor* to; +static void GetTopShadow(XColor *trom, XColor *to) { ColorCashRec* cash; float save; @@ -106,9 +104,7 @@ static void GetTopShadow(trom ,to) color_cash = cash; } -static void GetBotShadow(trom ,to) - XColor* trom; - XColor* to; +static void GetBotShadow(XColor *trom, XColor *to) { ColorCashRec* cash; float save; @@ -170,9 +166,7 @@ static void GetBotShadow(trom ,to) color_cash = cash; } -static void GetArmShadow(trom ,to) - XColor* trom; - XColor* to; +static void GetArmShadow(XColor *trom, XColor *to) { ColorCashRec* cash; float save; @@ -270,9 +264,7 @@ AllocGCFromPixel (Widget w, Pixel fore) return XtGetGC(w, GCForeground, &values); } -static Pixmap Depth_1_ShadowPixmap (w, top_or_bottom) - Widget w; - int top_or_bottom; +static Pixmap Depth_1_ShadowPixmap (Widget w, int top_or_bottom) { Screen *scn = XtScreen (w); @@ -289,10 +281,7 @@ static Pixmap Depth_1_ShadowPixmap (w, top_or_bottom) return None; } -static Pixmap Depth_NOT_1_ShadowPixmap (w, colour, top_or_bottom) - Widget w; - Pixel colour; - int top_or_bottom; +static Pixmap Depth_NOT_1_ShadowPixmap (Widget w, Pixel colour, int top_or_bottom) { Display *dpy = XtDisplay (w); Screen *scn = XtScreen (w); diff --git a/obm/ObmW/TableUtil.c b/obm/ObmW/TableUtil.c index 91dc58a..afab962 100644 --- a/obm/ObmW/TableUtil.c +++ b/obm/ObmW/TableUtil.c @@ -29,28 +29,27 @@ Commercial usage is also possible with participation of the author. #define null (XawTableNode)NULL #define FREE(t) if((t) != null)XtFree((char*)(t)) -static void vert_tab_node_insert(f,s,p) - XawTableNode f; /* insert after */ - XawTableNode s; /* insert before */ - XawTableNode p; /* to be inserted */ +static void vert_tab_node_insert(XawTableNode f, XawTableNode s, XawTableNode p) + /* insert after */ + /* insert before */ + /* to be inserted */ { if (f != null) f->b = p; if (s != null) s->t = p; if (p != null) {p->t = f; p->b = s;} } -static void horiz_tab_node_insert(f,s,p) - XawTableNode f; /* insert after */ - XawTableNode s; /* insert before */ - XawTableNode p; /* to be inserted */ +static void horiz_tab_node_insert(XawTableNode f, XawTableNode s, XawTableNode p) + /* insert after */ + /* insert before */ + /* to be inserted */ { if (f != null) f->r = p; if (s != null) s->l = p; if (p != null) {p->l = f; p->r = s;} } -static void vert_tab_node_reject(p) - XawTableNode p; +static void vert_tab_node_reject(XawTableNode p) { if (p == null) return; @@ -58,8 +57,7 @@ static void vert_tab_node_reject(p) if (p->b != null) p->b->t = p->t; } -static void horiz_tab_node_reject(p) - XawTableNode p; +static void horiz_tab_node_reject(XawTableNode p) { if (p == null) return; @@ -68,12 +66,7 @@ static void horiz_tab_node_reject(p) } /* ARGSUSED */ -static XawTableProc del_cell (w, i, j, call_data, client_data) - XtPointer w; - int i; - int j; - XtPointer call_data; - XtPointer client_data; +static XawTableProc del_cell (XtPointer w, int i, int j, XtPointer call_data, XtPointer client_data) { XtFree((char*)call_data); return False; diff --git a/obm/ObmW/Tablist2Tabs.c b/obm/ObmW/Tablist2Tabs.c index a18fab8..f2994b2 100644 --- a/obm/ObmW/Tablist2Tabs.c +++ b/obm/ObmW/Tablist2Tabs.c @@ -7,8 +7,7 @@ * Converts a string list of tabs to an array of tabs */ int * -XfwfTablist2Tabs(tablist) -char *tablist; +XfwfTablist2Tabs(char *tablist) { int *tabs; int ntabs = 0; diff --git a/obm/ObmW/TextWidth.c b/obm/ObmW/TextWidth.c index 92d8435..f80d6be 100644 --- a/obm/ObmW/TextWidth.c +++ b/obm/ObmW/TextWidth.c @@ -10,11 +10,7 @@ * counterpart. */ int -XfwfTextWidth(font, str, length, tabs) - XFontStruct *font; - String str; - int length; - int *tabs; +XfwfTextWidth(XFontStruct *font, String str, int length, int *tabs) { char *p, *ep; int tx, tab, rc; diff --git a/obm/ObmW/Toggle.c b/obm/ObmW/Toggle.c index 28fd619..8649561 100644 --- a/obm/ObmW/Toggle.c +++ b/obm/ObmW/Toggle.c @@ -27,7 +27,7 @@ static void expose(Widget,XEvent *,Region ); static void create_on_gc(Widget); static void create_off_gc(Widget); -/*ARGSUSED*/static void create_on_gc(self)Widget self; +/*ARGSUSED*/static void create_on_gc(Widget self) { XtGCMask mask = GCFillStyle; XGCValues values; @@ -44,7 +44,7 @@ static void create_off_gc(Widget); values.fill_style = FillTiled; ((XfwfToggleWidget)self)->xfwfToggle.on_gc = XtGetGC(self, mask, &values); } -/*ARGSUSED*/static void create_off_gc(self)Widget self; +/*ARGSUSED*/static void create_off_gc(Widget self) { XtGCMask mask = GCFillStyle; XGCValues values; @@ -141,14 +141,14 @@ XtInherit_set_label, }; WidgetClass xfwfToggleWidgetClass = (WidgetClass) &xfwfToggleClassRec; /*ARGSUSED*/ -static void toggle(self,event,params,num_params)Widget self;XEvent*event;String*params;Cardinal*num_params; +static void toggle(Widget self, XEvent *event, String *params, Cardinal *num_params) { XtVaSetValues(self, "on", !((XfwfToggleWidget)self)->xfwfToggle.on, NULL); XtCallCallbackList(self, ((XfwfToggleWidget)self)->xfwfToggle.on ? ((XfwfToggleWidget)self)->xfwfToggle.onCallback : ((XfwfToggleWidget)self)->xfwfToggle.offCallback, event); } /*ARGSUSED*/ -static void switch_on(self,event,params,num_params)Widget self;XEvent*event;String*params;Cardinal*num_params; +static void switch_on(Widget self, XEvent *event, String *params, Cardinal *num_params) { if (! ((XfwfToggleWidget)self)->xfwfToggle.on) { XtVaSetValues(self, "on", True, NULL); @@ -157,7 +157,7 @@ static void switch_on(self,event,params,num_params)Widget self;XEvent*event;Stri } /*ARGSUSED*/ -static void switch_off(self,event,params,num_params)Widget self;XEvent*event;String*params;Cardinal*num_params; +static void switch_off(Widget self, XEvent *event, String *params, Cardinal *num_params) { if (((XfwfToggleWidget)self)->xfwfToggle.on) { XtVaSetValues(self, "on", False, NULL); @@ -165,8 +165,7 @@ static void switch_off(self,event,params,num_params)Widget self;XEvent*event;Str } } -static void _resolve_inheritance(class) -WidgetClass class; +static void _resolve_inheritance(WidgetClass class) { XfwfToggleWidgetClass c = (XfwfToggleWidgetClass) class; XfwfToggleWidgetClass super; @@ -181,7 +180,7 @@ WidgetClass class; if (class == xfwfToggleWidgetClass) return; super = (XfwfToggleWidgetClass)class->core_class.superclass; } -/*ARGSUSED*/static void initialize(request,self,args,num_args)Widget request;Widget self;ArgList args;Cardinal * num_args; +/*ARGSUSED*/static void initialize(Widget request, Widget self, ArgList args, Cardinal *num_args) { int status; Dimension w1, w2, w; @@ -196,7 +195,7 @@ WidgetClass class; w = max(w1, w2); if (w != 0) XtVaSetValues(self, XtNleftMargin, ((XfwfToggleWidget)self)->xfwfLabel.leftMargin + w, NULL); } -/*ARGSUSED*/static Boolean set_values(old,request,self,args,num_args)Widget old;Widget request;Widget self;ArgList args;Cardinal * num_args; +/*ARGSUSED*/static Boolean set_values(Widget old, Widget request, Widget self, ArgList args, Cardinal *num_args) { Boolean redraw = False, compute_margin = False; Dimension w1, w2, w; @@ -229,7 +228,7 @@ WidgetClass class; } return redraw; } -/*ARGSUSED*/static void expose(self,event,region)Widget self;XEvent * event;Region region; +/*ARGSUSED*/static void expose(Widget self, XEvent *event, Region region) { Position x, y; Dimension w, h; diff --git a/obm/ObmW/color.c b/obm/ObmW/color.c index ee6e0da..f8009bb 100644 --- a/obm/ObmW/color.c +++ b/obm/ObmW/color.c @@ -78,9 +78,7 @@ static RGB RGBBlack = { 0, 0, 0 }; * Intensity percentages to RGB. */ -static void PctToRGB(rgb, rr, gg, bb) - RGB *rgb; - float rr, gg, bb; +static void PctToRGB(RGB *rgb, float rr, float gg, float bb) { if (rr > 1.0) rr = 1.0; @@ -98,9 +96,7 @@ static void PctToRGB(rgb, rr, gg, bb) * Intensity percentages to HSV. */ -static void PctToHSV(hsv, hh, ss, vv) - HSV *hsv; - float hh, ss, vv; +static void PctToHSV(HSV *hsv, float hh, float ss, float vv) { if (hh > 1.0) hh = 1.0; @@ -118,8 +114,7 @@ static void PctToHSV(hsv, hh, ss, vv) * The Manhattan distance between two colors, between 0.0 and 3.0. */ -static float RGBDist(r, s) - RGB *r, *s; +static float RGBDist(RGB *r, RGB *s) { return ( ABS((float)(r->r - s->r)) + @@ -131,9 +126,7 @@ static float RGBDist(r, s) * Load an XColor with an RGB. */ -static void RGBToXColor(r, x) - RGB *r; - XColor *x; +static void RGBToXColor(RGB *r, XColor *x) { x->red = r->r; x->green = r->g; @@ -145,9 +138,7 @@ static void RGBToXColor(r, x) * Convert a CMY to RGB. */ -static void CMYToRGB(rgb, cmy) - RGB *rgb; - CMY *cmy; +static void CMYToRGB(RGB *rgb, CMY *cmy) { rgb->r = MAX_INTENSITY - cmy->c; rgb->g = MAX_INTENSITY - cmy->m; @@ -158,9 +149,7 @@ static void CMYToRGB(rgb, cmy) * Convert an RGB to CMY. */ -static void RGBToCMY(rgb, cmy) - RGB *rgb; - CMY *cmy; +static void RGBToCMY(RGB *rgb, CMY *cmy) { cmy->c = MAX_INTENSITY - rgb->r; cmy->m = MAX_INTENSITY - rgb->g; @@ -171,12 +160,7 @@ static void RGBToCMY(rgb, cmy) * Mix two RGBs, with scale factors alpha and beta, in RGB space. */ -static void MixRGB(r, alpha, s, beta, t) - RGB *r; - float alpha; - RGB *s; - float beta; - RGB *t; +static void MixRGB(RGB *r, float alpha, RGB *s, float beta, RGB *t) { t->r = MAX(0, MIN(MAX_INTENSITY, (int)(alpha*(r->r) + beta*(s->r)))); t->g = MAX(0, MIN(MAX_INTENSITY, (int)(alpha*(r->g) + beta*(s->g)))); @@ -187,12 +171,7 @@ static void MixRGB(r, alpha, s, beta, t) * Mix two RGBs with scale factors alpha and beta, in HSV space. */ -static void MixHSV(r, alpha, s, beta, t) - RGB *r; - float alpha; - RGB *s; - float beta; - RGB *t; +static void MixHSV(RGB *r, float alpha, RGB *s, float beta, RGB *t) { HSV rr, ss, tt; @@ -214,9 +193,7 @@ static void MixHSV(r, alpha, s, beta, t) */ void -HSVToRGB(hsv, rgb) - HSV *hsv; - RGB *rgb; +HSVToRGB(HSV *hsv, RGB *rgb) { float p, q, t, f; float h = hsv->h; @@ -261,9 +238,7 @@ HSVToRGB(hsv, rgb) */ void -RGBToHSV(rgb, hsv) - RGB *rgb; - HSV *hsv; +RGBToHSV(RGB *rgb, HSV *hsv) { float rr, gg, bb; float min, max; diff --git a/obm/ObmW/cvtLong.c b/obm/ObmW/cvtLong.c index a5fd286..f458159 100644 --- a/obm/ObmW/cvtLong.c +++ b/obm/ObmW/cvtLong.c @@ -13,13 +13,7 @@ #include "done.h" -Boolean XfwfCvtLongToString(display, args, num_args, from, to, converter_data) - Display *display; - XrmValuePtr args; - Cardinal *num_args; - XrmValuePtr from; - XrmValuePtr to; - XtPointer *converter_data; +Boolean XfwfCvtLongToString(Display *display, XrmValuePtr args, Cardinal *num_args, XrmValuePtr from, XrmValuePtr to, XtPointer *converter_data) { char s[30]; diff --git a/obm/ObmW/iconutil.c b/obm/ObmW/iconutil.c index 550a70b..c506e5e 100644 --- a/obm/ObmW/iconutil.c +++ b/obm/ObmW/iconutil.c @@ -83,7 +83,7 @@ static Boolean initialized = False; /* This function initializes the quarks. */ -static void init_icon_quarks() +static void init_icon_quarks(void) { filleddiamondq = XrmPermStringToQuark("filleddiamond"); emptydiamondq = XrmPermStringToQuark("emptydiamond"); @@ -115,10 +115,7 @@ static void init_icon_quarks() * |cvtStringToIcon|. It reads a file in XPM format into an XPM image and * prints error messages in case of failure. */ -static void file_to_xpmimage (dpy, file, image) - Display *dpy; - String file; - XpmImage *image; +static void file_to_xpmimage (Display *dpy, String file, XpmImage *image) { Cardinal one = 1; int status; @@ -152,10 +149,7 @@ static void file_to_xpmimage (dpy, file, image) * |cvtStringToIcon|. It converts data in XPM format into an XPM image and * prints error messages in case of failure. */ -static void data_to_xpmimage (dpy, data, image) - Display *dpy; - String *data; - XpmImage *image; +static void data_to_xpmimage (Display *dpy, String *data, XpmImage *image) { int status; @@ -194,11 +188,7 @@ first converted to an unsigned long, tehn the offset is added to it and the result is converted back to a pointer, in this case a pointer to a |Pixel|. */ -static void build_colortable(self, table, size, n) - Widget self; - XpmColorSymbol *table; - Cardinal size; - Cardinal *n; +static void build_colortable(Widget self, XpmColorSymbol *table, Cardinal size, Cardinal *n) { Cardinal nres, i; XtResourceList res; @@ -219,13 +209,7 @@ static void build_colortable(self, table, size, n) -Boolean cvtStringToIcon(dpy, args, num_args, from, to, converter_data) - Display *dpy; - XrmValue *args; - Cardinal *num_args; - XrmValue *from; - XrmValue *to; - XtPointer *converter_data; +Boolean cvtStringToIcon(Display *dpy, XrmValue *args, Cardinal *num_args, XrmValue *from, XrmValue *to, XtPointer *converter_data) { static XpmColorSymbol table[MAXCOLORSYM]; String *data = NULL, s = (String) from->addr; diff --git a/obm/ObmW/scroll.c b/obm/ObmW/scroll.c index 5a618d4..ce4b8f2 100644 --- a/obm/ObmW/scroll.c +++ b/obm/ObmW/scroll.c @@ -3,8 +3,7 @@ #include #include "scroll.h" -void XfwfConnectScrollingWidgets(w1, w2) - Widget w1, w2; +void XfwfConnectScrollingWidgets(Widget w1, Widget w2) { XtCallbackProc response_cb_1 = NULL, response_cb_2 = NULL; @@ -17,8 +16,7 @@ void XfwfConnectScrollingWidgets(w1, w2) XtAddCallback(w2, "scrollCallback", response_cb_1, (XtPointer)w1); } -XfwfSReason XfwfCvtStringToScrollReason(s) - String s; +XfwfSReason XfwfCvtStringToScrollReason(String s) { if (XmuCompareISOLatin1(s, "Notify") == 0) return XfwfSNotify; if (XmuCompareISOLatin1(s, "Move") == 0) return XfwfSMove; diff --git a/obm/ObmW/scroll.h b/obm/ObmW/scroll.h index 1ecbe1e..2cfe46e 100644 --- a/obm/ObmW/scroll.h +++ b/obm/ObmW/scroll.h @@ -78,7 +78,7 @@ ant */ * resources. */ -extern void XfwfConnectScrollingWidgets( /* Widget w1, Widget w2 */); +extern void XfwfConnectScrollingWidgets(Widget w1, Widget w2); /* @@ -91,6 +91,6 @@ extern void XfwfConnectScrollingWidgets( /* Widget w1, Widget w2 */); * and the XfwfS prefix may be present but is not necessary. */ -extern XfwfSReason XfwfCvtStringToScrollReason(/* char * */); +extern XfwfSReason XfwfCvtStringToScrollReason(String s); #endif /* _XFWF_SCROLL_H */ diff --git a/obm/ObmW/strnchr.c b/obm/ObmW/strnchr.c index 2dc2e1c..deaffd3 100644 --- a/obm/ObmW/strnchr.c +++ b/obm/ObmW/strnchr.c @@ -6,10 +6,7 @@ * Like strchr, except has a length limit. */ char * -strnchr(s, c, n) - char *s; - int c; - int n; +strnchr(char *s, int c, int n) { while (n--) if (*s == c) return s; else ++s; diff --git a/obm/listres/listres.c b/obm/listres/listres.c index a5efc52..dbd7176 100644 --- a/obm/listres/listres.c +++ b/obm/listres/listres.c @@ -83,7 +83,7 @@ static XtResource Resources[] = { char *ProgramName; -usage () +usage (void) { fprintf(stderr, "usage: %s [-options...]\n", ProgramName); fprintf(stderr, "\nwhere options include:\n"); @@ -103,9 +103,7 @@ usage () exit (1); } -static void print_tree_level (wn, level) - XmuWidgetNode *wn; - int level; +static void print_tree_level (XmuWidgetNode *wn, int level) { int i; @@ -119,7 +117,7 @@ static void print_tree_level (wn, level) print_tree_level (wn->siblings, level); } -static void tree_known_widgets () +static void tree_known_widgets (void) { int i; XmuWidgetNode *wn; @@ -136,10 +134,7 @@ static void tree_known_widgets () * print_classname - print out the superclass-to-subclass hierchy of names * in the form super\sub\sub.... */ -static int print_classname (node, topnode, level, showvar) - XmuWidgetNode *node, *topnode; - int level; - Bool showvar; +static int print_classname (XmuWidgetNode *node, XmuWidgetNode *topnode, int level, int showvar) { int retval; @@ -156,7 +151,7 @@ static int print_classname (node, topnode, level, showvar) return retval; } -static void list_known_widgets () +static void list_known_widgets (void) { int i; XmuWidgetNode *wn; @@ -176,12 +171,7 @@ static void list_known_widgets () } /* ARGSUSED */ -static void print_resources (node, format, topnode, showsuper, showvar) - XmuWidgetNode *node; - char *format; - XmuWidgetNode *topnode; - Bool showsuper; - Bool showvar; +static void print_resources (XmuWidgetNode *node, char *format, XmuWidgetNode *topnode, int showsuper, int showvar) { int i; XtResourceList res = node->resources; @@ -213,13 +203,7 @@ static void print_resources (node, format, topnode, showsuper, showvar) * list_resources - display resources of a widget, identifying class from * which they come */ -static list_resources (node, format, topnode, toplevel, showsuper, showvar) - XmuWidgetNode *node; - char *format; - XmuWidgetNode *topnode; - Widget toplevel; - Bool showsuper; - Bool showvar; +static list_resources (XmuWidgetNode *node, char *format, XmuWidgetNode *topnode, Widget toplevel, int showsuper, int showvar) { static Bool first = True; @@ -241,9 +225,7 @@ static list_resources (node, format, topnode, toplevel, showsuper, showvar) } -main (argc, argv) - int argc; - char **argv; +main (int argc, char **argv) { int i; XtAppContext appcon; diff --git a/obm/server.c b/obm/server.c index 2c9eec4..bc66ff1 100644 --- a/obm/server.c +++ b/obm/server.c @@ -1566,7 +1566,7 @@ createXPixmap (ObmContext obm, char *name, char *widget, char *description) /* Get reference widget if any. */ w = NULL; - if ((obj = obmFindObject (obm, widget, obm->toplevel))) + if ((obj = obmFindObject (obm, widget))) w = widgetGetPointer (obj); /* Create the pixmap (actually icon). From 0771c1bda1c4abe821a1238f29a3875e33b43bb1 Mon Sep 17 00:00:00 2001 From: Ole Streicher Date: Fri, 9 Aug 2024 17:10:29 +0200 Subject: [PATCH 15/21] Protoize ximtool --- ximtool/eps.c | 209 +++++++++++------------------- ximtool/eps.h | 10 +- ximtool/fitsio.c | 89 +++++-------- ximtool/gifio.c | 107 ++++++--------- ximtool/iis.c | 124 +++++++----------- ximtool/irafio.c | 53 ++++---- ximtool/ism.c | 79 ++++-------- ximtool/ism_wcspix.c | 21 +-- ximtool/load.c | 91 ++++++------- ximtool/logo.c | 3 +- ximtool/print.c | 36 ++---- ximtool/quant.c | 84 ++++-------- ximtool/rasio.c | 58 +++------ ximtool/raster.c | 29 ++--- ximtool/save.c | 61 +++------ ximtool/tiffio.c | 30 ++--- ximtool/util.c | 46 +++---- ximtool/ximclient.c | 301 ++++++++++--------------------------------- ximtool/ximtool.c | 61 ++++----- ximtool/ximtool.h | 102 +++++++-------- ximtool/zscale.c | 88 ++++++------- 21 files changed, 600 insertions(+), 1082 deletions(-) diff --git a/ximtool/eps.c b/ximtool/eps.c index 8dd1c63..548ae3d 100644 --- a/ximtool/eps.c +++ b/ximtool/eps.c @@ -108,16 +108,16 @@ static PSPageInfo PageInfo[] = { /* assumes 300 dpi */ /* Private procedures. */ -static void eps_simpleHeader(), eps_colorHeader(); -static void eps_pageParams(), eps_simpleTrailer(); -static void eps_writeCmap(), eps_writeTrailer(); -static void eps_writeMono(), eps_writePix(); -static void eps_writeMonoRGB(), eps_writeRGB(); -static void eps_flushPix(); -static void eps_annotate(), eps_portLabels(), eps_landLabels(); -static void eps_doColorbar(); -static float ticstep(); -static char *make_label(); +static void eps_simpleHeader(PSImagePtr psim, FILE *fp), eps_colorHeader(PSImagePtr psim, FILE *fp); +static void eps_pageParams(PSImagePtr psim, float *llx, float *lly, int *icols, int *irows, int *scols, int *srows, int *turnflag), eps_simpleTrailer(FILE *fp); +static void eps_writeCmap(PSCmap *cmap, FILE *fp), eps_writeTrailer(FILE *fp); +static void eps_writeMono(FILE *fp, uchar *pix, PSCmap *cmap, int npix, int xdim, int pad), eps_writePix(FILE *fp, uchar *pix, PSCmap *cmap, int npix, int xdim, int pad); +static void eps_writeMonoRGB(FILE *fp, uchar *pix, int npix, int xdim, int depth, int pad), eps_writeRGB(FILE *fp, uchar *pix, PSCmap *cmap, int npix, int xdim, int depth, int pad); +static void eps_flushPix(FILE *fp); +static void eps_annotate(PSImagePtr psim, FILE *fp), eps_portLabels(FILE *fp, PSImagePtr psim, int scols, int srows, int icols, int irows, float llx, float lly), eps_landLabels(FILE *fp, PSImagePtr psim, int scols, int srows, int icols, int irows, float llx, float lly); +static void eps_doColorbar(FILE *fp, PSImagePtr psim, int scols, int srows, float llx, float lly, int turnflag); +static float ticstep(float range, int nsteps); +static char *make_label(void); static int debug = 0; @@ -126,7 +126,7 @@ static int debug = 0; ** containing the default output setup. */ PSImage * -eps_init() +eps_init(void) { int i; PSImage *ps; @@ -170,13 +170,13 @@ eps_init() ** 32-bit RGBA pixels. */ void -eps_print (psim, fp, data, xdim, ydim, depth, pad) -PSImage *psim; /* EPS image structure */ -FILE *fp; /* output file descriptor */ -uchar *data; /* array of image pixels */ -int xdim, ydim; /* image dimensions */ -int depth; /* bits / pixel, must be 8,24, or 32 */ -int pad; /* bytes per line of padding */ +eps_print (PSImage *psim, FILE *fp, uchar *data, int xdim, int ydim, int depth, int pad) + /* EPS image structure */ + /* output file descriptor */ + /* array of image pixels */ + /* image dimensions */ + /* bits / pixel, must be 8,24, or 32 */ + /* bytes per line of padding */ { int npix = xdim * ydim; uchar *pix = data; @@ -276,8 +276,8 @@ int pad; /* bytes per line of padding */ /* EPS_CLOSE -- Close down the EPS output structure. */ void -eps_close (psim) -PSImage *psim; /* EPS image structure */ +eps_close (PSImage *psim) + /* EPS image structure */ { if (psim->label) (void) free ((char *) psim->label); @@ -290,12 +290,12 @@ PSImage *psim; /* EPS image structure */ ** or scale options. */ void -eps_setPage (psim, orientation, paper_size, scale, flags) -PSImage *psim; /* EPS image structure */ -int orientation; /* page orientation flag */ -int paper_size; /* paper size flag */ -int scale; /* image scale percentage */ -int flags; /* option flags */ +eps_setPage (PSImage *psim, int orientation, int paper_size, int scale, int flags) + /* EPS image structure */ + /* page orientation flag */ + /* paper size flag */ + /* image scale percentage */ + /* option flags */ { int NPageTypes = sizeof (PageInfo) / sizeof (PSPageInfo); @@ -335,10 +335,10 @@ int flags; /* option flags */ /* EPS_SETCMAP -- Define a given colormap to be used on output. */ void -eps_setCmap (psim, r, g, b, ncolors) -PSImage *psim; /* EPS image structure */ -uchar *r, *g, *b; /* color components */ -int ncolors; /* number of colors in colormap */ +eps_setCmap (PSImage *psim, uchar *r, uchar *g, uchar *b, int ncolors) + /* EPS image structure */ + /* color components */ + /* number of colors in colormap */ { int i = 0; @@ -358,9 +358,9 @@ int ncolors; /* number of colors in colormap */ /* EPS_SETCOMPRESS -- Define the type of output compression to use. */ void -eps_setCompress (psim, compress) -PSImage *psim; /* EPS image structure */ -int compress; /* compression type flag */ +eps_setCompress (PSImage *psim, int compress) + /* EPS image structure */ + /* compression type flag */ { /* Set the compression type to use. */ switch (compress) { @@ -381,9 +381,9 @@ int compress; /* compression type flag */ ** a grayscale on output. */ void -eps_setColorType (psim, color_class) -PSImage *psim; /* EPS image structure */ -int color_class; /* output color class */ +eps_setColorType (PSImage *psim, int color_class) + /* EPS image structure */ + /* output color class */ { /* Set the compression type to use. */ switch (color_class) { @@ -401,9 +401,9 @@ int color_class; /* output color class */ /* EPS_SETLABEL -- Set the output label to be used in annotation. */ void -eps_setLabel (psim, label) -PSImage *psim; /* EPS image structure */ -char *label; /* Label string */ +eps_setLabel (PSImage *psim, char *label) + /* EPS image structure */ + /* Label string */ { int maxlen = MAX_LENLABEL; @@ -424,12 +424,12 @@ char *label; /* Label string */ ** the colorbar. */ void -eps_setTransform (psim, z1, z2, ztype, offset, scale, cmap_name) -PSImage *psim; /* EPS image structure */ -float z1, z2; /* zscale values */ -int ztype; /* Transformation type */ -float offset, scale; /* brightness/contrast values */ -char *cmap_name; /* colormap name */ +eps_setTransform (PSImage *psim, float z1, float z2, int ztype, float offset, float scale, char *cmap_name) + /* EPS image structure */ + /* zscale values */ + /* Transformation type */ + /* brightness/contrast values */ + /* colormap name */ { psim->z1 = z1; psim->z2 = z2; @@ -453,9 +453,9 @@ char *cmap_name; /* colormap name */ /* EPS_SETCORNERS -- Set the image corner values. */ void -eps_setCorners (psim, llx, lly, urx, ury) -PSImage *psim; /* EPS image structure */ -int llx, lly, urx, ury; /* image corners */ +eps_setCorners (PSImage *psim, int llx, int lly, int urx, int ury) + /* EPS image structure */ + /* image corners */ { psim->llx = llx; psim->lly = lly; @@ -468,10 +468,10 @@ int llx, lly, urx, ury; /* image corners */ ** compute the size of the image (in inches) on the page. */ void -eps_getImageSize (psim, xdim, ydim, width, height) -PSImagePtr psim; /* EPS image struct */ -int xdim, ydim; /* image dimensions */ -float *width, *height; /* width x height of image on page */ +eps_getImageSize (PSImagePtr psim, int xdim, int ydim, float *width, float *height) + /* EPS image struct */ + /* image dimensions */ + /* width x height of image on page */ { int icols, irows, scols, srows, turnflag; float llx, lly; @@ -490,10 +490,10 @@ float *width, *height; /* width x height of image on page */ ** compute the position of the image (in pixels) on the page. */ void -eps_getImagePos (psim, xdim, ydim, llx, lly) -PSImagePtr psim; /* EPS image struct */ -int xdim, ydim; /* image dimensions */ -int *llx, *lly; /* LL coords for centered image */ +eps_getImagePos (PSImagePtr psim, int xdim, int ydim, int *llx, int *lly) + /* EPS image struct */ + /* image dimensions */ + /* LL coords for centered image */ { int icols, irows, scols, srows, turnflag; float lx, ly; @@ -516,12 +516,12 @@ int *llx, *lly; /* LL coords for centered image */ /* EPS_PAGEPARAMS -- Compute the EPS page parameters. */ static void -eps_pageParams (psim, llx, lly, icols, irows, scols, srows, turnflag) -PSImagePtr psim; /* EPS image struct */ -float *llx, *lly; /* LL coords for centered image */ -int *icols, *irows; /* final image rows/cols */ -int *scols, *srows; /* scaled rows/cols */ -int *turnflag; /* turn the image? */ +eps_pageParams (PSImagePtr psim, float *llx, float *lly, int *icols, int *irows, int *scols, int *srows, int *turnflag) + /* EPS image struct */ + /* LL coords for centered image */ + /* final image rows/cols */ + /* scaled rows/cols */ + /* turn the image? */ { int devpix, pwidth, pheight, cols=0, rows=0; float pixfac, scale = Scale(psim), margin; @@ -658,13 +658,7 @@ int *turnflag; /* turn the image? */ /* EPS_WRITEPIX -- Write the pixels or color indices directly. */ static void -eps_writePix (fp, pix, cmap, npix, xdim, pad) -FILE *fp; -uchar *pix; -PSCmap *cmap; -int npix; -int xdim; -int pad; +eps_writePix (FILE *fp, uchar *pix, PSCmap *cmap, int npix, int xdim, int pad) { int i, min, max; @@ -701,13 +695,7 @@ int pad; /* EPS_WRITEMONO -- Write a pseudocolor image and convert to grayscale. */ static void -eps_writeMono (fp, pix, cmap, npix, xdim, pad) -FILE *fp; -uchar *pix; -PSCmap *cmap; -int npix; -int xdim; -int pad; +eps_writeMono (FILE *fp, uchar *pix, PSCmap *cmap, int npix, int xdim, int pad) { int i, min, max; uchar pval; @@ -747,13 +735,7 @@ int pad; /* EPS_WRITEMONORGB -- Write RGB data converted to grayscale. */ static void -eps_writeMonoRGB (fp, pix, npix, xdim, depth, pad) -FILE *fp; -uchar *pix; -int npix; -int xdim; -int depth; -int pad; +eps_writeMonoRGB (FILE *fp, uchar *pix, int npix, int xdim, int depth, int pad) { int i; uchar pval; @@ -795,14 +777,7 @@ int pad; ** channel. */ static void -eps_writeRGB (fp, pix, cmap, npix, xdim, depth, pad) -FILE *fp; -uchar *pix; -PSCmap *cmap; -int npix; -int xdim; -int depth; -int pad; +eps_writeRGB (FILE *fp, uchar *pix, PSCmap *cmap, int npix, int xdim, int depth, int pad) { int i, min, max; uchar val; @@ -860,9 +835,7 @@ int pad; /* EPS_WRITECMAP -- Output Postscript colormap. */ static void -eps_writeCmap (cmap, fp) -PSCmap *cmap; -FILE *fp; +eps_writeCmap (PSCmap *cmap, FILE *fp) { int i, j; @@ -917,9 +890,7 @@ static char *EPSSimpleRLEProlog[]= { }; static void -eps_simpleHeader (psim, fp) -PSImagePtr psim; -FILE *fp; +eps_simpleHeader (PSImagePtr psim, FILE *fp) { char **line; int icols=0, irows=0, scols=0, srows=0, turnflag=0; @@ -999,9 +970,7 @@ FILE *fp; */ static void -eps_annotate (psim, fp) -PSImagePtr psim; -FILE *fp; +eps_annotate (PSImagePtr psim, FILE *fp) { int icols=0, irows=0, scols=0, srows=0, turnflag=0; int cbar_size; @@ -1161,12 +1130,7 @@ FILE *fp; */ static void -eps_portLabels (fp, psim, scols, srows, icols, irows, llx, lly) -FILE *fp; -PSImagePtr psim; -int scols, srows; -int icols, irows; -float llx, lly; +eps_portLabels (FILE *fp, PSImagePtr psim, int scols, int srows, int icols, int irows, float llx, float lly) { int start, end, range; float xpos, xstep, ypos, ystep; @@ -1258,12 +1222,7 @@ float llx, lly; ** mode image. */ static void -eps_landLabels (fp, psim, scols, srows, icols, irows, llx, lly) -FILE *fp; -PSImagePtr psim; -int scols, srows; -int icols, irows; -float llx, lly; +eps_landLabels (FILE *fp, PSImagePtr psim, int scols, int srows, int icols, int irows, float llx, float lly) { float xpos, xstep, ypos, ystep; int start, end, range; @@ -1353,12 +1312,7 @@ float llx, lly; */ static void -eps_doColorbar (fp, psim, scols, srows, llx, lly, turnflag) -FILE *fp; -PSImagePtr psim; -int scols, srows; -float llx, lly; -int turnflag; +eps_doColorbar (FILE *fp, PSImagePtr psim, int scols, int srows, float llx, float lly, int turnflag) { int i, j, cbar_size; int ncolors, nlabels, pos, step, cmel, cmstep, val; @@ -1734,9 +1688,7 @@ static char *EPSColorProlog[]= static void -eps_colorHeader (psim, fp) -PSImagePtr psim; -FILE *fp; +eps_colorHeader (PSImagePtr psim, FILE *fp) { char **line; int icols=0, irows=0, scols=0, srows=0, turnflag=0; @@ -1802,8 +1754,7 @@ FILE *fp; /* EPS_WRITETRAILER -- Output Postscript trailer blurb. */ static void -eps_writeTrailer (fp) -FILE *fp; +eps_writeTrailer (FILE *fp) { fprintf (fp, "\n"); fprintf (fp, "showpage\n"); @@ -1818,16 +1769,14 @@ FILE *fp; /* EPS_SIMPLETRAILER -- Output Postscript trailer blurb. */ static void -eps_simpleTrailer (fp) -FILE *fp; +eps_simpleTrailer (FILE *fp) { fprintf (fp, "showpage\n"); } static void -eps_flushPix (fp) -FILE *fp; +eps_flushPix (FILE *fp) { pixbuf[pixnum] = '\0'; fprintf (fp, "%s", pixbuf); @@ -1842,9 +1791,7 @@ FILE *fp; /* TICSTEP -- calculate nice intervals for the ticmarks. */ static float -ticstep (range,nsteps) -float range; -int nsteps; +ticstep (float range, int nsteps) { double df, t2, t5, p1, p2, p3; float ticstep; @@ -1886,7 +1833,7 @@ int nsteps; /* MAKE_LABEL -- Generate the label for the output printer page. */ static char * -make_label() +make_label(void) { static char buf[128]; char hostname[32]; diff --git a/ximtool/eps.h b/ximtool/eps.h index 40aeefa..0a985b7 100644 --- a/ximtool/eps.h +++ b/ximtool/eps.h @@ -86,6 +86,8 @@ typedef struct { PSCmap cmap; /* Colormap struct */ } PSImage, *PSImagePtr; +typedef unsigned char uchar; +typedef unsigned char byte; /* Page sizes and resolution information. */ #define EPS_LETTER 0 @@ -115,7 +117,7 @@ typedef struct { #define MINOR_TICK_WIDTH 0.5 /* Width of major tic mark */ #define NTICMARKS 5 /* Number of major tick marks */ -void eps_close(); -void eps_setPage(), eps_setTransform(), eps_setCorners(); -void eps_setCmap(), eps_print(); -void eps_setLabel(); +void eps_close(PSImage *psim); +void eps_setPage(PSImage *psim, int orientation, int paper_size, int scale, int flags), eps_setTransform(PSImage *psim, float z1, float z2, int ztype, float offset, float scale, char *cmap_name), eps_setCorners(PSImage *psim, int llx, int lly, int urx, int ury); +void eps_setCmap(PSImage *psim, uchar *r, uchar *g, uchar *b, int ncolors), eps_print(PSImage *psim, FILE *fp, uchar *data, int xdim, int ydim, int depth, int pad); +void eps_setLabel(PSImage *psim, char *label); diff --git a/ximtool/fitsio.c b/ximtool/fitsio.c index 8e134a2..c0a5e74 100644 --- a/ximtool/fitsio.c +++ b/ximtool/fitsio.c @@ -96,22 +96,22 @@ static char *ftfixdata (); /* loadFits - Load a simple FITS file. */ char * -loadFITS (fname, pix, nx, ny, r,g,b, ncolors, zsc, zr, z1, z2, nsample) -char *fname; /* input filename */ -uchar **pix; /* output pixels */ -int *nx, *ny; /* dimensions */ -uchar *r, *g, *b; /* colormap */ -int *ncolors; /* number of colors */ -int zsc, zr; /* z-scaling flags */ -float *z1, *z2; /* zscale values */ -int nsample; /* number of sample pts */ +loadFITS (char *fname, uchar **pix, int *nx, int *ny, uchar *r, uchar *g, uchar *b, int *ncolors, int zsc, int zr, float *z1, float *z2, int nsample) + /* input filename */ + /* output pixels */ + /* dimensions */ + /* colormap */ + /* number of colors */ + /* z-scaling flags */ + /* zscale values */ + /* number of sample pts */ { FITS fs; int i, w = 0, h = 0, bitpix, np; byte *image; char *error; - extern void flip(); + extern void flip(uchar *buffer, int nx, int ny); error = ftopen2d (&fs, fname, &w, &h, &bitpix); if (error) @@ -154,12 +154,7 @@ int nsample; /* number of sample pts */ */ char * -writeFITS (fp, image, w, h, rmap, gmap, bmap, numcols) -FILE *fp; -byte *image; -int w, h; -byte *rmap, *gmap, *bmap; -int numcols; +writeFITS (FILE *fp, byte *image, int w, int h, byte *rmap, byte *gmap, byte *bmap, int numcols) { int i, j, np, nend; byte *ptr; @@ -197,8 +192,8 @@ int numcols; /* IsFITS -- Test a file to see if it is a FITS file. */ int -isFITS (fname) -char *fname; /* input filename */ +isFITS (char *fname) + /* input filename */ { FILE *fp; int value = 0; @@ -218,8 +213,7 @@ char *fname; /* input filename */ */ char * -getFITSHdr (fname) -char *fname; +getFITSHdr (char *fname) { FITS fs; char *error, *line; @@ -255,9 +249,7 @@ char *fname; /* Writes a minimalist FITS file header */ static char -*wrheader (fp, nx, ny) -FILE *fp; -int nx, ny; +*wrheader (FILE *fp, int nx, int ny) { char *block; int i; @@ -289,10 +281,7 @@ int nx, ny; * array. */ static char -*ftopen2d(fs, file, nx, ny, bitpix) -FITS *fs; -char *file; -int *nx, *ny, *bitpix; +*ftopen2d(FITS *fs, char *file, int *nx, int *ny, int *bitpix) { FILE *fp; int i; @@ -330,8 +319,7 @@ int *nx, *ny, *bitpix; /* closes a fits file */ static void -ftclose (fs) -FITS *fs; +ftclose (FITS *fs) { if (fs == NULL) return; @@ -344,8 +332,7 @@ FITS *fs; * Returns NULL on success, or an error message otherwise. */ static char * -rdheader (fs) -FITS *fs; +rdheader (FITS *fs) { int i, j, res; char name[9]; @@ -494,10 +481,10 @@ FITS *fs; * an integer is written, right justified in columns 11-30 */ static void -wrcard (card, name, dtype, kvalue) -char *card, *name; -enum datatype dtype; /* type of value */ -int kvalue; +wrcard (char *card, char *name, enum datatype dtype, int kvalue) + + /* type of value */ + { int l; memset(card, ' ', 80); @@ -534,11 +521,11 @@ int kvalue; * It returns NULL on success, or an error message otherwise. */ static char * -rdcard (card, name, dtype, kvalue, rvalue) -char *card, *name; -enum datatype dtype; /* type of value */ -long int *kvalue; -float *rvalue; +rdcard (char *card, char *name, enum datatype dtype, long int *kvalue, float *rvalue) + + /* type of value */ + + { int i, ptr; char namestr[9]; @@ -608,10 +595,7 @@ float *rvalue; * may be truncated, and should be padded out with zeros. */ static char * -ftgdata (fs, buffer, nelem) -FITS *fs; -void *buffer; -int nelem; +ftgdata (FITS *fs, void *buffer, int nelem) { int res; @@ -654,10 +638,7 @@ int nelem; * int = 4 byte integer */ static char * -ftfixdata (fs, buffer, nelem) -FITS *fs; -void *buffer; -int nelem; +ftfixdata (FITS *fs, void *buffer, int nelem) { int i, n = nelem; uchar *ptr = buffer; @@ -755,21 +736,15 @@ int nelem; * the maximum is stored as 255 */ static char * -ftgbyte(fs, cbuff, nelem, zsc, zr, z1, z2, nsample) -FITS *fs; -uchar *cbuff; -int nelem; -int zsc, zr; -float *z1, *z2; -int nsample; +ftgbyte(FITS *fs, uchar *cbuff, int nelem, int zsc, int zr, float *z1, float *z2, int nsample) { char * voidbuff; int i, n = nelem; char *error; int pmin = 0, pmax = 255; int npts, stdline; - extern void zscale(); - extern void min_max(); + extern void zscale(char *im, int nx, int ny, int bitpix, float *z1, float *z2, float contrast, int opt_size, int len_stdline); + extern void min_max(char *a, int npts, int bitpix, float *min, float *max); /* if the data is uchar, then read it directly */ if (fs->bitpix == 8 && (fs->bscale == 1.0 && fs->bzero == 0.0)) { diff --git a/ximtool/gifio.c b/ximtool/gifio.c index 769aa73..c7a1840 100644 --- a/ximtool/gifio.c +++ b/ximtool/gifio.c @@ -83,7 +83,7 @@ static struct { static int colorstobpp (int colors); static void BumpPixel (void); -static int GIFNextPixel (); +static int GIFNextPixel (void); static void GIFEncode (FILE* fp, int GWidth, int GHeight, int GInterlace, int Background, int BitsPerPixel, int Red[], int Green[], int Blue[]); static void Putword (int w, FILE* fp); @@ -131,13 +131,13 @@ static char *errstr = NULL; */ char * -loadGIF (fname, pix, nx, ny, r,g,b, ncolors, gray) -char *fname; /* input filename */ -uchar **pix; /* output pixels */ -int *nx, *ny; /* dimensions */ -uchar *r, *g, *b; /* colormap */ -int *ncolors; /* number of colors */ -int gray; /* read as a grayscale? */ +loadGIF (char *fname, uchar **pix, int *nx, int *ny, uchar *r, uchar *g, uchar *b, int *ncolors, int gray) + /* input filename */ + /* output pixels */ + /* dimensions */ + /* colormap */ + /* number of colors */ + /* read as a grayscale? */ { FILE *fd; int i, imageNumber = 1; @@ -164,13 +164,13 @@ int gray; /* read as a grayscale? */ */ int -writeGIF (fp, image, w, h, rmap, gmap, bmap, numcols, gray) -FILE *fp; /* output file descriptor */ -byte *image; /* image pixels */ -int w, h; /* image dimensions */ -byte *rmap, *gmap, *bmap; /* colormap */ -int numcols; /* number of colors */ -int gray; /* save as grayscale? */ +writeGIF (FILE *fp, byte *image, int w, int h, byte *rmap, byte *gmap, byte *bmap, int numcols, int gray) + /* output file descriptor */ + /* image pixels */ + /* image dimensions */ + /* colormap */ + /* number of colors */ + /* save as grayscale? */ { int i, bpp, npix; int r[MAXCOLORS], g[MAXCOLORS], b[MAXCOLORS]; @@ -206,8 +206,8 @@ int gray; /* save as grayscale? */ /* IsGIF -- Test a file to see if it is a GIF file. */ int -isGIF (fname) -char *fname; /* input filename */ +isGIF (char *fname) + /* input filename */ { FILE *fp; int value = 0; @@ -227,8 +227,7 @@ char *fname; /* input filename */ */ char * -getGIFHdr (fname) -char *fname; +getGIFHdr (char *fname) { FILE *fp; char *line; @@ -275,8 +274,7 @@ char *fname; * bits-per-pixel value. */ static int -colorstobpp (colors) -int colors; +colorstobpp (int colors) { int bpp; @@ -322,13 +320,7 @@ int colors; static char * -ReadGIF(fd, imageNumber, pix, nx, ny, r, g, b, ncolors) -FILE *fd; -int imageNumber; -uchar **pix; -int *nx, *ny; -uchar *r, *g, *b; -int *ncolors; +ReadGIF(FILE *fd, int imageNumber, uchar **pix, int *nx, int *ny, uchar *r, uchar *g, uchar *b, int *ncolors) { uchar buf[16]; uchar c; @@ -410,10 +402,7 @@ int *ncolors; static int -ReadColorMap(fd, number, r, g, b) -FILE *fd; -int number; -uchar *r, *g, *b; +ReadColorMap(FILE *fd, int number, uchar *r, uchar *g, uchar *b) { int i; uchar rgb[3]; @@ -431,9 +420,7 @@ uchar *r, *g, *b; static int -DoExtension(fd, label) -FILE *fd; -int label; +DoExtension(FILE *fd, int label) { static char buf[256]; @@ -471,9 +458,7 @@ int label; static int ZeroDataBlock = FALSE; static int -GetDataBlock(fd, buf) -FILE *fd; -uchar *buf; +GetDataBlock(FILE *fd, uchar *buf) { uchar count; @@ -490,10 +475,7 @@ uchar *buf; static int -GetCode(fd, code_size, flag) -FILE *fd; -int code_size; -int flag; +GetCode(FILE *fd, int code_size, int flag) { static uchar buf[280]; static int curbit, lastbit, done, last_byte; @@ -532,10 +514,7 @@ int flag; static int -LWZReadByte(fd, flag, input_code_size) -FILE *fd; -int flag; -int input_code_size; +LWZReadByte(FILE *fd, int flag, int input_code_size) { static int fresh = FALSE; int code, incode; @@ -644,11 +623,7 @@ int input_code_size; static char * -ReadImage(fd, len, height, interlace, ignore, image) -FILE *fd; -int len, height; -int interlace, ignore; -uchar **image; +ReadImage(FILE *fd, int len, int height, int interlace, int ignore, uchar **image) { uchar c; int v; @@ -853,7 +828,7 @@ int Red[], Green[], Blue[]; /* Bump the 'curx' and 'cury' to point to the next pixel */ static void -BumpPixel() +BumpPixel(void) { /* Bump the current X position */ ++curx; @@ -902,7 +877,7 @@ BumpPixel() /* Return the next pixel from the image */ static int -GIFNextPixel () +GIFNextPixel (void) { int r; @@ -919,9 +894,7 @@ GIFNextPixel () /* Write out a word to the GIF file */ static void -Putword (w, fp) -int w; -FILE*fp; +Putword (int w, FILE *fp) { fputc (w & 0xff, fp); fputc ((w / 256) & 0xff, fp); @@ -1044,9 +1017,7 @@ static int a_count; /* Number of characters so far in this 'packet' */ static char accum[ 256 ]; /* Define the storage for the packet accumulator */ static void -compress (init_bits, outfile) -int init_bits; -FILE*outfile; +compress (int init_bits, FILE *outfile) { long fcode; code_int i /* = 0 */; @@ -1160,8 +1131,7 @@ FILE*outfile; static void -output (code) -code_int code; +output (code_int code) { cur_accum &= masks[ cur_bits ]; @@ -1215,7 +1185,7 @@ code_int code; * Clear out the hash table */ static void -cl_block () /* table clear for block compress */ +cl_block (void) /* table clear for block compress */ { cl_hash ((count_int) hsize); @@ -1226,8 +1196,8 @@ cl_block () /* table clear for block compress */ } static void -cl_hash(hsize) /* reset code table */ -count_int hsize; +cl_hash(count_int hsize) /* reset code table */ + { count_int *htab_p = htab + hsize; @@ -1261,7 +1231,7 @@ count_int hsize; } static void -writeerr() +writeerr(void) { perror ("error writing output file"); } @@ -1277,7 +1247,7 @@ writeerr() /* Set up the 'byte output' routine */ static void -char_init() +char_init(void) { int i; @@ -1292,8 +1262,7 @@ char_init() * characters, flush the packet to disk. */ static void -char_out (c) -int c; +char_out (int c) { accum[ a_count++ ] = c; if (a_count >= 254) @@ -1304,7 +1273,7 @@ int c; * Flush the packet to disk, and reset the accumulator */ static void -flush_char() +flush_char(void) { if (a_count > 0) { fputc (a_count, g_outfile); diff --git a/ximtool/iis.c b/ximtool/iis.c index 2ee5cc2..eb08226 100644 --- a/ximtool/iis.c +++ b/ximtool/iis.c @@ -77,14 +77,14 @@ static int *wcspix_enabled = NULL; static int iis_debug = -1; /* protocol debug */ -static void set_fbconfig(), add_mapping(); -static void xim_connectClient(), xim_disconnectClient(); -static int chan_read(), chan_write(), decode_frameno(); +static void set_fbconfig(IoChanPtr chan, int config, int frame), add_mapping(XimDataPtr xim, CtranPtr ctran, char *wcsbuf, FrameBufPtr fr); +static void xim_connectClient(IoChanPtr chan_port, int *source, XtPointer id), xim_disconnectClient(IoChanPtr chan); +static int chan_read(int fd, void *vptr, int nbytes), chan_write(int fd, void *vptr, int nbytes), decode_frameno(int z); -static CtranPtr wcs_update(); -static IoChanPtr open_fifo(), open_inet(), open_unix(); -static IoChanPtr get_iochan(); -static MappingPtr xim_getMapping(); +static CtranPtr wcs_update(XimDataPtr xim, FrameBufPtr fr); +static IoChanPtr open_fifo(XimDataPtr xim), open_inet(XimDataPtr xim, int portnum), open_unix(XimDataPtr xim); +static IoChanPtr get_iochan(XimDataPtr xim); +static MappingPtr xim_getMapping(XimDataPtr xim, float sx, float sy, int frame); /* XIM_IISOPEN -- Initialize the IIS protocol module and ready the module to @@ -94,8 +94,7 @@ static MappingPtr xim_getMapping(); * simultaneously ready to receive client connections. */ int -xim_iisOpen (xim) -XimDataPtr xim; +xim_iisOpen (XimDataPtr xim) { int port, last_port = (xim->port + xim->nports - 1); int nopen = 0; @@ -118,8 +117,7 @@ XimDataPtr xim; /* XIM_IISCLOSE -- Close down the IIS protocol module. */ void -xim_iisClose (xim) -XimDataPtr xim; +xim_iisClose (XimDataPtr xim) { IoChanPtr chan; int i; @@ -162,8 +160,7 @@ XimDataPtr xim; * yet at this stage. */ static IoChanPtr -open_fifo (xim) -XimDataPtr xim; +open_fifo (XimDataPtr xim) { IoChanPtr chan; int datain, dataout; @@ -250,9 +247,7 @@ XimDataPtr xim; * using internet domain sockets. */ static IoChanPtr -open_inet (xim, portnum) -XimDataPtr xim; -int portnum; +open_inet (XimDataPtr xim, int portnum) { int s = 0; IoChanPtr chan; @@ -319,8 +314,7 @@ int portnum; * using unix domain sockets. */ static IoChanPtr -open_unix (xim) -XimDataPtr xim; +open_unix (XimDataPtr xim) { int s = 0; IoChanPtr chan; @@ -390,10 +384,7 @@ XimDataPtr xim; * communicate with the new client. */ static void -xim_connectClient (chan_port, source, id) -IoChanPtr chan_port; -int *source; -XtPointer id; +xim_connectClient (IoChanPtr chan_port, int *source, XtPointer id) { XimDataPtr xim = (XimDataPtr) chan_port->xim; IoChanPtr chan; @@ -428,8 +419,7 @@ XtPointer id; * descriptor. */ static void -xim_disconnectClient (chan) -IoChanPtr chan; +xim_disconnectClient (IoChanPtr chan) { switch (chan->type) { case IO_INET: @@ -450,8 +440,7 @@ IoChanPtr chan; /* GET_IOCHAN --- Get an i/o channel descriptor. */ static IoChanPtr -get_iochan (xim) -XimDataPtr xim; +get_iochan (XimDataPtr xim) { int i; @@ -467,10 +456,7 @@ XimDataPtr xim; * pending on the data stream to the ximtool client. */ void -xim_iisio (chan, fd_addr, id_addr) -IoChanPtr chan; -int *fd_addr; -XtInputId *id_addr; +xim_iisio (IoChanPtr chan, int *fd_addr, XtInputId *id_addr) { XimDataPtr xim = (XimDataPtr) chan->xim; MappingPtr mp = (MappingPtr) NULL; @@ -483,7 +469,7 @@ XtInputId *id_addr; struct iism70 iis; char buf[SZ_FIFOBUF]; static int errmsg=0, bswap=0; - extern void bswap2(); + extern void bswap2(char *a, char *b, int nbytes); /* Initialize the debug output. */ if (iis_debug == -1) @@ -1054,10 +1040,7 @@ map_found: if (ct) { * variables iomap_len and rgb_len. */ void -xim_iisiomap (w, iomap, iomap_len) -XtPointer w; -unsigned short *iomap; -int *iomap_len; +xim_iisiomap (XtPointer w, short unsigned int *iomap, int *iomap_len) { int i; int first, nelem, maxelem; @@ -1086,10 +1069,7 @@ int *iomap_len; * first = gterm color 10. */ void -xim_iiscolormap (w, r, g, b, first, ngray, rgb_len) -XtPointer w; -unsigned short *r, *g, *b; -int *first, *ngray, *rgb_len; +xim_iiscolormap (XtPointer w, short unsigned int *r, short unsigned int *g, short unsigned int *b, int *first, int *ngray, int *rgb_len) { int i, j; int nelem, maxelem; @@ -1130,10 +1110,7 @@ int *first, *ngray, *rgb_len; * frames to the current configuration. */ static void -set_fbconfig (chan, config, frame) -IoChanPtr chan; -int config; -int frame; +set_fbconfig (IoChanPtr chan, int config, int frame) { XimDataPtr xim = (XimDataPtr) chan->xim; FrameBufPtr fb = &xim->frames[frame-1]; @@ -1182,8 +1159,7 @@ int frame; /* DECODE_FRAMENO -- Decode encoded IIS register frame number. */ static int -decode_frameno (z) -int z; +decode_frameno (int z) { int n; @@ -1202,13 +1178,13 @@ int z; * the client which requested the cursor read. */ void -xim_retCursorVal (xim, sx, sy, frame, wcs, key, strval) -XimDataPtr xim; -float sx, sy; /* cursor screen coordinates */ -int frame; /* frame number */ -int wcs; /* nonzero if WCS coords desired */ -int key; /* keystroke used as trigger */ -char *strval; /* optional string value */ +xim_retCursorVal (XimDataPtr xim, float sx, float sy, int frame, int wcs, int key, char *strval) + + /* cursor screen coordinates */ + /* frame number */ + /* nonzero if WCS coords desired */ + /* keystroke used as trigger */ + /* optional string value */ { CtranPtr ct; MappingPtr mp = (MappingPtr) NULL; @@ -1284,11 +1260,11 @@ char *strval; /* optional string value */ * world units. */ void -xim_encodewcs (xim, sx, sy, sz, obuf) -XimDataPtr xim; -float sx, sy; /* screen (raster) pixel coordinates */ -int sz; /* screen pixel value */ -char *obuf; /* receives encoded string */ +xim_encodewcs (XimDataPtr xim, float sx, float sy, int sz, char *obuf) + + /* screen (raster) pixel coordinates */ + /* screen pixel value */ + /* receives encoded string */ { CtranPtr ct; MappingPtr mp = (MappingPtr) NULL; @@ -1396,10 +1372,10 @@ printf ("wx: %f wy: %f\n", wx, wy); /* XIM_GETMAPPING -- Return the mapping struct for the given screen coords. */ static MappingPtr -xim_getMapping (xim, sx, sy, frame) -XimDataPtr xim; -float sx, sy; /* screen (raster) pixel coordinates */ -int frame; +xim_getMapping (XimDataPtr xim, float sx, float sy, int frame) + + /* screen (raster) pixel coordinates */ + { FrameBufPtr fb = (FrameBufPtr) NULL; MappingPtr mp = (MappingPtr) NULL; @@ -1446,8 +1422,7 @@ int frame; * frame. */ char * -xim_frameLabel (xim) -XimDataPtr xim; +xim_frameLabel (XimDataPtr xim) { FrameBufPtr df_p = xim->df_p; @@ -1469,9 +1444,7 @@ XimDataPtr xim; * elsewhere if needed, our only purpose here is to extract the frame WCS. */ static CtranPtr -wcs_update (xim, fr) -XimDataPtr xim; -FrameBufPtr fr; +wcs_update (XimDataPtr xim, FrameBufPtr fr) { CtranPtr ct = &fr->ctran; char buf[1024], *format; @@ -1541,11 +1514,7 @@ FrameBufPtr fr; */ static void -add_mapping (xim, ctran, wcsbuf, fr) -XimDataPtr xim; -CtranPtr ctran; -char *wcsbuf; -FrameBufPtr fr; +add_mapping (XimDataPtr xim, CtranPtr ctran, char *wcsbuf, FrameBufPtr fr) { MappingPtr mp = &fr->mapping[fr->nmaps]; CtranPtr ct = &mp->ctran; @@ -1632,8 +1601,7 @@ FrameBufPtr fr; /* PRINT_MAPPINGS -- Debug routine to print all mappings on a frame. */ void -print_mappings (fr) -FrameBufPtr fr; +print_mappings (FrameBufPtr fr) { MappingPtr mp; int i; @@ -1654,10 +1622,7 @@ FrameBufPtr fr; */ static int -chan_read (fd, vptr, nbytes) -int fd; -void *vptr; -int nbytes; +chan_read (int fd, void *vptr, int nbytes) { char *ptr = vptr; int nread = 0, nleft = nbytes, nb = 0; @@ -1682,10 +1647,7 @@ int nbytes; */ static int -chan_write (fd, vptr, nbytes) -int fd; -void *vptr; -int nbytes; +chan_write (int fd, void *vptr, int nbytes) { char *ptr = vptr; int nwritten = 0, nleft = nbytes, nb = 0; diff --git a/ximtool/irafio.c b/ximtool/irafio.c index c79b1a3..d1da42b 100644 --- a/ximtool/irafio.c +++ b/ximtool/irafio.c @@ -76,18 +76,18 @@ typedef unsigned char uchar; #include #include -extern int is_swapped(); -extern void bswap2(), bswap4(), bswap8(); -extern void strpak(); -extern void min_max(); -extern void flip(); -extern void zscale(); +extern int is_swapped(void); +extern void bswap2(char *a, char *b, int nbytes), bswap4(char *a, int aoff, char *b, int boff, int nbytes), bswap8(char *a, int aoff, char *b, int boff, int nbytes); +extern void strpak(char *in, char *out, int len); +extern void min_max(char *a, int npts, int bitpix, float *min, float *max); +extern void flip(uchar *buffer, int nx, int ny); +extern void zscale(char *im, int nx, int ny, int bitpix, float *z1, float *z2, float contrast, int opt_size, int len_stdline); -char *index(); -char *getIRAFHdr(); -int isIRAF(); -static char *irafReadPixels(); -static void irafGetPixfile (); +char *index(const char *, int); +char *getIRAFHdr(char *fname); +int isIRAF(char *fname); +static char *irafReadPixels(char *pixfile, int swap, int pix_offset, int pixtype, uchar **image, int nx, int ny, int px, int py, int zsc, int zr, float *z1, float *z2, int nsample); +static void irafGetPixfile (char *fname, char *pfile); /* +------------------+ @@ -99,15 +99,15 @@ static void irafGetPixfile (); /* loadIRAF - Load a IRAF file. */ char * -loadIRAF (fname, image, nx, ny, r,g,b, ncolors, zsc, zr, z1, z2, nsample) -char *fname; /* input filename */ -uchar **image; /* output pixels */ -int *nx, *ny; /* dimensions */ -uchar *r, *g, *b; /* colormap */ -int *ncolors; /* number of colors */ -int zsc, zr; /* z-scaling flags */ -float *z1, *z2; /* zscale values */ -int nsample; /* nu,ber of sample pts */ +loadIRAF (char *fname, uchar **image, int *nx, int *ny, uchar *r, uchar *g, uchar *b, int *ncolors, int zsc, int zr, float *z1, float *z2, int nsample) + /* input filename */ + /* output pixels */ + /* dimensions */ + /* colormap */ + /* number of colors */ + /* z-scaling flags */ + /* zscale values */ + /* nu,ber of sample pts */ { FILE *hdr; int i, px, py, version, swapped; @@ -213,8 +213,8 @@ int nsample; /* nu,ber of sample pts */ /* IsIRAF -- Test a file to see if it is a IRAF file. */ int -isIRAF (fname) -char *fname; /* input filename */ +isIRAF (char *fname) + /* input filename */ { FILE *fp; int value = 0; @@ -243,8 +243,7 @@ char *fname; /* input filename */ */ char * -getIRAFHdr (fname) -char *fname; +getIRAFHdr (char *fname) { FILE *hdr; char *title, *line; @@ -349,13 +348,11 @@ char *fname; */ static void -irafGetPixfile (fname, pfile) -char *fname; -char *pfile; +irafGetPixfile (char *fname, char *pfile) { char temp[SZ_V1PIXFILE], *ip; int len; - char *index(); + char *index(const char *, int); if (strncmp (pfile, "HDR$", 4) == 0) { /* Handle the special case of a HDR$ pixfile path, prepend the diff --git a/ximtool/ism.c b/ximtool/ism.c index 3097ed9..6e43e28 100644 --- a/ximtool/ism.c +++ b/ximtool/ism.c @@ -46,14 +46,14 @@ #define MAXCONN 5 #define MAX_TRY 5 -IsmModule ismNameToPtr(); +IsmModule ismNameToPtr(char *name); -static void ism_connectClient(), ism_disconnectClient(), ism_io(); -static int ism_read(), ism_write(), ism_type(), ism_parseSend(); -static int ism_openSocket(); -static IsmIoChanPtr ism_getChannel(); -static char *ism_parse(); -static int ismObjects(); +static void ism_connectClient(IsmIoChanPtr chan, int *source, XtPointer id), ism_disconnectClient(IsmIoChanPtr chan), ism_io(IsmIoChanPtr chan, int *fd_addr, XtInputId *id_addr); +static int ism_read(int fd, void *vptr, int nbytes), ism_write(int fd, void *vptr, int nbytes), ism_type(char *message), ism_parseSend(char *msg, char *object, char *text); +static int ism_openSocket(char *path); +static IsmIoChanPtr ism_getChannel(XimDataPtr xim); +static char *ism_parse(char *msg, int *ip, int *incomplete, int maxch); +static int ismObjects(char *name); static int ism_debug = 0; extern int errno; @@ -84,8 +84,7 @@ ismModule ism_modules[] = { * local processes and we want to use the uid for a unique address. */ void -xim_ismOpen (xim) -XimDataPtr xim; +xim_ismOpen (XimDataPtr xim) { int s = 0; IsmIoChanPtr chan = &(xim->ism_chan); @@ -148,8 +147,7 @@ XimDataPtr xim; * clients and close the port. */ void -xim_ismClose (xim) -XimDataPtr xim; +xim_ismClose (XimDataPtr xim) { IsmIoChanPtr chan = &(xim->ism_chan); int i; @@ -183,8 +181,7 @@ XimDataPtr xim; * the ISM name. */ IsmModule -ismNameToPtr (name) -char *name; +ismNameToPtr (char *name) { IsmModule ism; int i; @@ -208,10 +205,7 @@ char *name; * communicate with the new client. */ static void -ism_connectClient (chan, source, id) -IsmIoChanPtr chan; -int *source; -XtPointer id; +ism_connectClient (IsmIoChanPtr chan, int *source, XtPointer id) { XimDataPtr xim = (XimDataPtr) chan->xim; int s; @@ -238,8 +232,7 @@ XtPointer id; * descriptor. */ static void -ism_disconnectClient (chan) -IsmIoChanPtr chan; +ism_disconnectClient (IsmIoChanPtr chan) { close (chan->datain); if (chan->id) { @@ -254,10 +247,7 @@ IsmIoChanPtr chan; * pending on the data stream to the ximtool client. */ static void -ism_io (chan, fd_addr, id_addr) -IsmIoChanPtr chan; -int *fd_addr; -XtInputId *id_addr; +ism_io (IsmIoChanPtr chan, int *fd_addr, XtInputId *id_addr) { XimDataPtr xim = (XimDataPtr) chan->xim; IsmModule ism; @@ -429,11 +419,7 @@ XtInputId *id_addr; * value. */ static char * -ism_parse (msg, ip, incomplete, maxch) -char *msg; -int *ip; -int *incomplete; -int maxch; +ism_parse (char *msg, int *ip, int *incomplete, int maxch) { int j, i = *ip; char text[SZ_ISMBUF+1]; @@ -474,8 +460,7 @@ int maxch; /* ISM_TYPE -- Determine the message type. */ static int -ism_type (message) -char *message; +ism_type (char *message) { char *ip; @@ -497,10 +482,7 @@ char *message; /* ISM_PARSESEND -- Parse the client SEND message. */ static int -ism_parseSend (msg, object, text) -char *msg; -char *object; -char *text; +ism_parseSend (char *msg, char *object, char *text) { int i=0, ip=4, count=0; @@ -536,10 +518,7 @@ char *text; * connected. */ void -ism_evaluate (xim, object, command) -XimDataPtr xim; -char *object; -char *command; +ism_evaluate (XimDataPtr xim, char *object, char *command) { IsmIoChanPtr chan; int i=0; @@ -564,9 +543,7 @@ char *command; /* ISM_MESSAGE -- Convenience wrapper for the evaluate procedure. */ int -ism_message (xim, object, command) -XimDataPtr xim; -char *object, *command; +ism_message (XimDataPtr xim, char *object, char *command) { ism_evaluate (xim, object, command); } @@ -575,8 +552,8 @@ char *object, *command; /* ISM_OPENSOCKET -- Open a unix socket on the named path. */ static int -ism_openSocket (path) -char *path; /* path to the socket */ +ism_openSocket (char *path) + /* path to the socket */ { int addrlen, s = 0, on = 1; struct sockaddr_un sockaddr; @@ -613,8 +590,7 @@ err: fprintf (stderr, "ximtool: can't open ISM socket on %s, errno=%d\n", /* ISM_GETCHANNEL --- Get an ISM i/o channel descriptor. */ static IsmIoChanPtr -ism_getChannel (xim) -XimDataPtr xim; +ism_getChannel (XimDataPtr xim) { int i; @@ -634,8 +610,7 @@ XimDataPtr xim; * creating the same object in the OBM each time a client connects. */ static int -ismObjects (name) -char *name; +ismObjects (char *name) { static char objects[SZ_LINE] = ""; @@ -652,10 +627,7 @@ char *name; */ static int -ism_read (fd, vptr, nbytes) -int fd; -void *vptr; -int nbytes; +ism_read (int fd, void *vptr, int nbytes) { char *ptr = vptr; int nread = 0, nleft = nbytes, nb = 0; @@ -681,10 +653,7 @@ int nbytes; */ static int -ism_write (fd, vptr, nbytes) -int fd; -void *vptr; -int nbytes; +ism_write (int fd, void *vptr, int nbytes) { char *ptr = vptr; int nwritten = 0, nleft = nbytes, nb = 0; diff --git a/ximtool/ism_wcspix.c b/ximtool/ism_wcspix.c index d12a35e..56a87c3 100644 --- a/ximtool/ism_wcspix.c +++ b/ximtool/ism_wcspix.c @@ -21,7 +21,7 @@ extern int errno; /* WCS/Pixel ISM client callbacks. */ -void wcspix_connect(), wcspix_disconnect(), wcspix_command(), wcspix_message(); +void wcspix_connect(XimDataPtr xim, IsmModule ism), wcspix_disconnect(XimDataPtr xim, IsmModule ism), wcspix_command(XimDataPtr xim, IsmModule ism, int argc, char **argv), wcspix_message(XimDataPtr xim, char *message); @@ -30,10 +30,7 @@ void wcspix_connect(), wcspix_disconnect(), wcspix_command(), wcspix_message(); * the GUI that we are alive. */ void -wcspix_connect (xim, ism) -XimDataPtr xim; -IsmModule ism; - +wcspix_connect (XimDataPtr xim, IsmModule ism) { MappingPtr mp; FrameBufPtr fr; @@ -68,9 +65,7 @@ IsmModule ism; * command to the module and notify the GUI. */ void -wcspix_disconnect (xim, ism) -XimDataPtr xim; -IsmModule ism; +wcspix_disconnect (XimDataPtr xim, IsmModule ism) { MappingPtr mp; FrameBufPtr fr; @@ -108,11 +103,7 @@ IsmModule ism; * */ void -wcspix_command (xim, ism, argc, argv) -XimDataPtr xim; -IsmModule ism; -int argc; -char **argv; +wcspix_command (XimDataPtr xim, IsmModule ism, int argc, char **argv) { int i; @@ -128,9 +119,7 @@ char **argv; * but format it so it's delivered to the WCSPIX callback procedures. */ void -wcspix_message (xim, message) -XimDataPtr xim; -char *message; +wcspix_message (XimDataPtr xim, char *message) { char msgbuf[SZ_MSGBUF]; diff --git a/ximtool/load.c b/ximtool/load.c index 5aa71d3..18762e4 100644 --- a/ximtool/load.c +++ b/ximtool/load.c @@ -35,11 +35,11 @@ #undef min #define min(a,b) ((a) < (b) ? (a) : (b)) -static char **listFiles(); -static int fileCompare(), globExpression(), fileType(), ucharCompare(); -static void amapc(), sortGraymap(), loadstat(), strsort(); +static char **listFiles(char *directory, char *pattern, int *number_entries, int files_only); +static int fileCompare(void *x, void *y), globExpression(char *expression, char *pattern), fileType(char *fname), ucharCompare(unsigned char *i, unsigned char *j); +static void amapc(char *a, char *b, int npix, int a1, int a2, int b1, int b2), sortGraymap(unsigned char *a, unsigned char *b, int npix, unsigned char *red, unsigned char *green, unsigned char *blue, int ncols), loadstat(XimDataPtr xim, char *message), strsort(char **array, int array_size); -extern char *getcwd(), *getenv(); +extern char *getcwd(char *, size_t), *getenv(const char *); static int debug = False; @@ -47,8 +47,7 @@ static int debug = False; /* XIM_INITLOAD -- Initialize the file load structure. */ void -xim_initLoad (xim) -XimDataPtr xim; +xim_initLoad (XimDataPtr xim) { fileLoadPtr flp; char buf[SZ_LINE]; @@ -91,8 +90,7 @@ XimDataPtr xim; /* XIM_LOADCLOSE -- Close the load struct. */ void -xim_loadClose (xim) -XimDataPtr xim; +xim_loadClose (XimDataPtr xim) { fileLoadPtr flp = xim->flp; int i; @@ -109,10 +107,7 @@ XimDataPtr xim; * colormap. */ int -xim_loadFile (xim, fname, frame) -XimDataPtr xim; -char *fname; -int frame; +xim_loadFile (XimDataPtr xim, char *fname, int frame) { int i, new_config=-1; char *ip; @@ -127,11 +122,11 @@ int frame; unsigned char *pix=NULL, r[256], g[256], b[256]; char *mapname, *err, buf[SZ_LINE]; - extern char *loadSunRas(); - extern char *loadFITS(); - extern char *loadGIF(); - extern char *loadIRAF(); - extern void ppmquant(); + extern char *loadSunRas(char *fname, unsigned char **pixels, int *pixtype, int *o_w, int *o_h, unsigned char *r, unsigned char *g, unsigned char *b, int *ncolors, int colorstyle); + extern char *loadFITS(char *fname, uchar **pix, int *nx, int *ny, uchar *r, uchar *g, uchar *b, int *ncolors, int zsc, int zr, float *z1, float *z2, int nsample); + extern char *loadGIF(char *fname, uchar **pix, int *nx, int *ny, uchar *r, uchar *g, uchar *b, int *ncolors, int gray); + extern char *loadIRAF(char *fname, uchar **image, int *nx, int *ny, uchar *r, uchar *g, uchar *b, int *ncolors, int zsc, int zr, float *z1, float *z2, int nsample); + extern void ppmquant(byte *image, byte *r, byte *g, byte *b, int nx, int ny, int ncolors, int newcolors); extern int objid[]; /* Make sure the file exists. */ @@ -412,8 +407,7 @@ int frame; * list to the GUI. */ void -xim_dirRescan (xim) -XimDataPtr xim; +xim_dirRescan (XimDataPtr xim) { fileLoadPtr flp = xim->flp; char *ip, *op, *flist; @@ -450,15 +444,16 @@ XimDataPtr xim; /* XIM_SCANHEADERS -- */ void -xim_scanHeaders (xim) -XimDataPtr xim; +xim_scanHeaders (XimDataPtr xim) { fileLoadPtr flp = xim->flp; char *ip, *op; char *entry = (char *)NULL, *flist = (char *)NULL; int i; - extern char *getFITSHdr(), *getIRAFHdr(); - extern char *getSunRasHdr(), *getGIFHdr(); + extern char *getFITSHdr(char *fname); + extern char *getIRAFHdr(char *fname); + extern char *getSunRasHdr(char *fname); + extern char *getGIFHdr(char *fname); if (flp->FileList) { for (i=0; i < flp->nfiles; i++) @@ -512,14 +507,13 @@ XimDataPtr xim; /* fileType -- Given a filename return what type of file it is. */ static int -fileType (fname) -char *fname; +fileType (char *fname) { int format; - extern int isSunRas(); - extern int isFITS(); - extern int isGIF(); - extern int isIRAF(); + extern int isSunRas(char *fname); + extern int isFITS(char *fname); + extern int isGIF(char *fname); + extern int isIRAF(char *fname); if (isFITS (fname)) format = XIM_FITS; @@ -547,11 +541,11 @@ char *fname; * Adapted from the ImageMagick package originally developed by John Christy. */ static char ** -listFiles (directory, pattern, number_entries, files_only) -char *directory; /* directory to be listed */ -char *pattern; /* pattern to be matched */ -int *number_entries; /* number of filenames in the list */ -int files_only; /* list only files, not dirs */ +listFiles (char *directory, char *pattern, int *number_entries, int files_only) + /* directory to be listed */ + /* pattern to be matched */ + /* number of filenames in the list */ + /* list only files, not dirs */ { char **filelist, *ip; char patterns[64][20]; @@ -656,8 +650,7 @@ int files_only; /* list only files, not dirs */ * Adapted from the ImageMagick package originally developed by John Christy. */ static int -fileCompare (x, y) -void *x, *y; +fileCompare (void *x, void *y) { char *p, *q; @@ -675,9 +668,9 @@ void *x, *y; * Adapted from the ImageMagick package originally developed by John Christy. */ static int -globExpression (expression, pattern) -char *expression; /* file name */ -char *pattern; /* matching pattern */ +globExpression (char *expression, char *pattern) + /* file name */ + /* matching pattern */ { int done, match, status; char c, *p; @@ -832,9 +825,7 @@ char *pattern; /* matching pattern */ */ static void -amapc (a, b, npix, a1, a2, b1, b2) -char *a, *b; -int npix, a1, a2, b1, b2; +amapc (char *a, char *b, int npix, int a1, int a2, int b1, int b2) { int i, minout, maxout, aoff, boff, pixval; double scalar; @@ -857,10 +848,7 @@ int npix, a1, a2, b1, b2; */ static void -sortGraymap (a, b, npix, red, green, blue, ncols) -unsigned char *a, *b; -unsigned char *red, *green, *blue; -int npix, ncols; +sortGraymap (unsigned char *a, unsigned char *b, int npix, unsigned char *red, unsigned char *green, unsigned char *blue, int ncols) { int i, pmin=0, pmax=255; float scale; @@ -883,8 +871,7 @@ int npix, ncols; } static int -ucharCompare (i, j) -unsigned char *i, *j; +ucharCompare (unsigned char *i, unsigned char *j) { return (*i - *j); } @@ -893,9 +880,7 @@ unsigned char *i, *j; /* LOADSTAT -- Internal routine for load status messages. */ static void -loadstat (xim, message) -XimDataPtr xim; -char *message; +loadstat (XimDataPtr xim, char *message) { char text[SZ_LINE]; sprintf (text, "status {%s}", message); @@ -906,9 +891,7 @@ char *message; /* STRSORT -- Shell sort an array of string pointers via strcmp() */ static void -strsort (array, array_size) -char **array; -int array_size; +strsort (char **array, int array_size) { int gap, i, j; char **a, **b, *tmp; diff --git a/ximtool/logo.c b/ximtool/logo.c index 7dc0256..6b1bc60 100644 --- a/ximtool/logo.c +++ b/ximtool/logo.c @@ -13,8 +13,7 @@ void -xim_displayLogo (xim) -XimDataPtr xim; +xim_displayLogo (XimDataPtr xim) { int i; unsigned char r[256], g[256], b[256]; diff --git a/ximtool/print.c b/ximtool/print.c index df811ea..26a3d0e 100644 --- a/ximtool/print.c +++ b/ximtool/print.c @@ -30,17 +30,17 @@ */ -static void printstat(); -static void xim_initPrinterList(); +static void printstat(XimDataPtr xim, char *message); +static void xim_initPrinterList(XimDataPtr xim); /* XIM_PRINT -- Print the indicated region of the current display frame to ** the printer device or to a file. */ int -xim_print (xim, x0,y0, nx,ny) -XimDataPtr xim; -int x0,y0, nx,ny; /* region of source raster */ +xim_print (XimDataPtr xim, int x0, int y0, int nx, int ny) + + /* region of source raster */ { PSImagePtr psim = xim->psim; PrintCfgPtr pcp = xim->pcp; @@ -53,7 +53,7 @@ int x0,y0, nx,ny; /* region of source raster */ static char text[SZ_LINE]; int w, h, ncolors; FILE *fp; - char *mktemp(); + char *mktemp(char *); bzero (text, SZ_LINE); @@ -188,9 +188,7 @@ int x0,y0, nx,ny; /* region of source raster */ */ void -ximp_rename (xim, old, new) -XimDataPtr xim; -char *old, *new; +ximp_rename (XimDataPtr xim, char *old, char *new) { char text[SZ_LINE]; struct stat fs; @@ -208,9 +206,7 @@ char *old, *new; } void -ximp_cancel (xim, fname) -XimDataPtr xim; -char *fname; +ximp_cancel (XimDataPtr xim, char *fname) { printstat (xim, "Print cancelled."); unlink (fname); @@ -220,12 +216,11 @@ char *fname; /* XIM_INITPRINTEROPS -- Initialize the printer operations. */ void -xim_initPrinterOps (xim) -XimDataPtr xim; +xim_initPrinterOps (XimDataPtr xim) { PrintCfgPtr pcp; char buf[SZ_LINE]; - PSImagePtr eps_init(); + PSImagePtr eps_init(void); /* Open a pointer to the EPS structure. */ @@ -268,8 +263,7 @@ XimDataPtr xim; */ static void -xim_initPrinterList (xim) -XimDataPtr xim; +xim_initPrinterList (XimDataPtr xim) { int i; FILE *fp; @@ -351,9 +345,7 @@ XimDataPtr xim; */ int -xim_getPrinterInfo (xim, printer) -XimDataPtr xim; -char *printer; +xim_getPrinterInfo (XimDataPtr xim, char *printer) { int i; PrintCfgPtr pcp = xim->pcp; @@ -371,9 +363,7 @@ char *printer; */ static void -printstat (xim, message) -XimDataPtr xim; -char *message; +printstat (XimDataPtr xim, char *message) { char text[SZ_LINE]; diff --git a/ximtool/quant.c b/ximtool/quant.c index 7a9a35f..d1fd6ff 100644 --- a/ximtool/quant.c +++ b/ximtool/quant.c @@ -97,13 +97,13 @@ struct box { int sum; }; -static colorhist_vector medianCut (), colorHashToColorHist (); -static colorhist_vector computeColorHist (); -static colorhash_table computeColorHash (), colorHistToColorHash (); -static colorhash_table allocColorHash (); -static int redCompare(), greenCompare(), blueCompare(); -static int lookupColor (), addToColorHash (), sumCompare(); -static void freeColorHash (), addToColorHist(),freeColorHist(); +static colorhist_vector medianCut (colorhist_vector chv, int colors, int sum, pixval maxval, int newcolors), colorHashToColorHist (colorhash_table cht, int maxcolors); +static colorhist_vector computeColorHist (pixel **pixels, int cols, int rows, int maxcolors, int *colorsP); +static colorhash_table computeColorHash (pixel **pixels, int cols, int rows, int maxcolors, int *colorsP), colorHistToColorHash (colorhist_vector chv, int colors); +static colorhash_table allocColorHash (void); +static int redCompare(colorhist_vector ch1, colorhist_vector ch2), greenCompare(colorhist_vector ch1, colorhist_vector ch2), blueCompare(colorhist_vector ch1, colorhist_vector ch2); +static int lookupColor (colorhash_table cht, pixel *colorP), addToColorHash (colorhash_table cht, pixel *colorP, int value), sumCompare(box_vector b1, box_vector b2); +static void freeColorHash (colorhash_table cht), addToColorHist(colorhist_vector chv, int *colorsP, int maxcolors, pixel *colorP, int value, int position),freeColorHist(colorhist_vector chv); @@ -114,12 +114,12 @@ static void freeColorHash (), addToColorHist(),freeColorHist(); */ int -ppmquant (image, r, g, b, nx, ny, ncolors, newcolors) -byte *image; /* image pixels (i.e. cmap indices) */ -byte *r, *g, *b; /* colormap */ -int nx, ny; /* image dimensions */ -int ncolors; /* current number of colors */ -int newcolors; /* requested number of colors */ +ppmquant (byte *image, byte *r, byte *g, byte *b, int nx, int ny, int ncolors, int newcolors) + /* image pixels (i.e. cmap indices) */ + /* colormap */ + /* image dimensions */ + /* current number of colors */ + /* requested number of colors */ { pixel *pP; long sr, sg, sb, err; @@ -357,10 +357,7 @@ int newcolors; /* requested number of colors */ */ static colorhist_vector -medianCut (chv, colors, sum, maxval, newcolors) -colorhist_vector chv; -int colors, sum, newcolors; -pixval maxval; +medianCut (colorhist_vector chv, int colors, int sum, pixval maxval, int newcolors) { colorhist_vector colormap; box_vector bv; @@ -529,42 +526,35 @@ pixval maxval; static int -redCompare (ch1, ch2) -colorhist_vector ch1, ch2; +redCompare (colorhist_vector ch1, colorhist_vector ch2) { return (int) PPM_GETR (ch1->color) - (int) PPM_GETR (ch2->color) ; } static int -greenCompare (ch1, ch2) -colorhist_vector ch1, ch2; +greenCompare (colorhist_vector ch1, colorhist_vector ch2) { return (int) PPM_GETG (ch1->color) - (int) PPM_GETG (ch2->color) ; } static int -blueCompare (ch1, ch2) -colorhist_vector ch1, ch2; +blueCompare (colorhist_vector ch1, colorhist_vector ch2) { return (int) PPM_GETB (ch1->color) - (int) PPM_GETB (ch2->color) ; } static int -sumCompare (b1, b2) -box_vector b1, b2; +sumCompare (box_vector b1, box_vector b2) { return b2->sum - b1->sum; } static colorhist_vector -computeColorHist (pixels, cols, rows, maxcolors, colorsP) -pixel**pixels; -int cols, rows, maxcolors; -int*colorsP; +computeColorHist (pixel **pixels, int cols, int rows, int maxcolors, int *colorsP) { colorhash_table cht; colorhist_vector chv; @@ -579,11 +569,7 @@ int*colorsP; static void -addToColorHist (chv, colorsP, maxcolors, colorP, value, position) -colorhist_vector chv; -pixel*colorP; -int*colorsP; -int maxcolors, value, position; +addToColorHist (colorhist_vector chv, int *colorsP, int maxcolors, pixel *colorP, int value, int position) { int i, j; @@ -614,10 +600,7 @@ int maxcolors, value, position; static colorhash_table -computeColorHash (pixels, cols, rows, maxcolors, colorsP) -pixel**pixels; -int cols, rows, maxcolors; -int*colorsP; +computeColorHash (pixel **pixels, int cols, int rows, int maxcolors, int *colorsP) { colorhash_table cht; pixel*pP; @@ -658,7 +641,7 @@ int*colorsP; static colorhash_table -allocColorHash () +allocColorHash (void) { colorhash_table cht; int i; @@ -675,10 +658,7 @@ allocColorHash () static int -addToColorHash (cht, colorP, value) -colorhash_table cht; -pixel*colorP; -int value; +addToColorHash (colorhash_table cht, pixel *colorP, int value) { int hash; colorhist_list chl; @@ -696,9 +676,7 @@ int value; static colorhist_vector -colorHashToColorHist (cht, maxcolors) -colorhash_table cht; -int maxcolors; +colorHashToColorHist (colorhash_table cht, int maxcolors) { colorhist_vector chv; colorhist_list chl; @@ -725,9 +703,7 @@ int maxcolors; static colorhash_table -colorHistToColorHash (chv, colors) -colorhist_vector chv; -int colors; +colorHistToColorHash (colorhist_vector chv, int colors) { colorhash_table cht; int i, hash; @@ -760,9 +736,7 @@ int colors; static int -lookupColor (cht, colorP) -colorhash_table cht; -pixel*colorP; +lookupColor (colorhash_table cht, pixel *colorP) { int hash; colorhist_list chl; @@ -777,16 +751,14 @@ pixel*colorP; static void -freeColorHist (chv) -colorhist_vector chv; +freeColorHist (colorhist_vector chv) { free ((char *) chv) ; } static void -freeColorHash (cht) -colorhash_table cht; +freeColorHash (colorhash_table cht) { int i; colorhist_list chl, chlnext; diff --git a/ximtool/rasio.c b/ximtool/rasio.c index c4d4b2e..28ccb86 100644 --- a/ximtool/rasio.c +++ b/ximtool/rasio.c @@ -87,14 +87,14 @@ static void fixBGR(); * contain space for at least 256 elements. */ char * -loadSunRas (fname, pixels, pixtype, o_w,o_h, r,g,b, ncolors, colorstyle) -char *fname; /* input filename */ -unsigned char **pixels; /* output pixels */ -int *pixtype; /* 8-bit or 24-bit */ -int *o_w, *o_h; /* dimensions */ -unsigned char *r, *g, *b; /* colormap */ -int *ncolors; /* number of colors */ -int colorstyle; /* return color (0) or grayscale (1) */ +loadSunRas (char *fname, unsigned char **pixels, int *pixtype, int *o_w, int *o_h, unsigned char *r, unsigned char *g, unsigned char *b, int *ncolors, int colorstyle) + /* input filename */ + /* output pixels */ + /* 8-bit or 24-bit */ + /* dimensions */ + /* colormap */ + /* number of colors */ + /* return color (0) or grayscale (1) */ { FILE *fp; int i, j; @@ -292,12 +292,7 @@ int colorstyle; /* return color (0) or grayscale (1) */ * F_GREYSCALE, writes an 8-bit grayscale image. */ int -writeSunRas (fp, pixels, pixtype, w,h, r,g,b, ncolors, colorstyle) -FILE *fp; -unsigned char *pixels; -int pixtype, w, h; -unsigned char *r, *g, *b; -int ncolors, colorstyle; +writeSunRas (FILE *fp, unsigned char *pixels, int pixtype, int w, int h, unsigned char *r, unsigned char *g, unsigned char *b, int ncolors, int colorstyle) { unsigned char *line, *graypic, graymap[256], *sp, *dp; int linesize, i, color, d, y, flipbw; @@ -429,8 +424,8 @@ int ncolors, colorstyle; /* IsSunRas -- Test a file to see if it is a Sun rasterfile. */ int -isSunRas (fname) -char *fname; /* input filename */ +isSunRas (char *fname) + /* input filename */ { FILE *fp; struct rasterfile sunhdr; @@ -450,8 +445,7 @@ char *fname; /* input filename */ */ char * -getSunRasHdr (fname) -char *fname; +getSunRasHdr (char *fname) { FILE *fp; char *line; @@ -493,10 +487,7 @@ char *fname; */ static int -rle_read (ptr, size, nitems, fp, init) -unsigned char *ptr; -int size, nitems, init; -FILE *fp; +rle_read (unsigned char *ptr, int size, int nitems, FILE *fp, int init) { static int count, ch; int readbytes, c, read; @@ -538,8 +529,7 @@ FILE *fp; static char * -sunRasError (fname, st) -char *fname, *st; +sunRasError (char *fname, char *st) { sprintf (errstr, "%s: %s\n", fname, st); return (errstr); @@ -547,9 +537,7 @@ char *fname, *st; static void -SunRas1to8 (dest, src, len) -unsigned char *dest, *src; -int len; +SunRas1to8 (unsigned char *dest, unsigned char *src, int len) { int i, b; int c = 0; @@ -565,9 +553,7 @@ int len; static void -SunRas8to1 (dest, src, len, flip) -unsigned char *dest, *src; -int len, flip; +SunRas8to1 (unsigned char *dest, unsigned char *src, int len, int flip) { int i, b; int c; @@ -594,9 +580,7 @@ int len, flip; * Returns 0 for success, EOF for failure. */ static int -read_sun_long (l, fp) -long *l; -FILE *fp; +read_sun_long (long int *l, FILE *fp) { int c0, c1, c2, c3; @@ -621,9 +605,7 @@ FILE *fp; * Returns 0 for success, EOF for failure. */ static int -write_sun_long (l, fp) -long l; -FILE *fp; +write_sun_long (long int l, FILE *fp) { char c; @@ -646,9 +628,7 @@ FILE *fp; /* kr3 - fix up BGR order SUN 24-bit rasters to be RGB order */ static void -fixBGR (img, w, h) -unsigned char *img; -int w, h; +fixBGR (unsigned char *img, int w, int h) { int i, npixels; unsigned char tmp; diff --git a/ximtool/raster.c b/ximtool/raster.c index e1fd8d8..1ab8a19 100644 --- a/ximtool/raster.c +++ b/ximtool/raster.c @@ -99,19 +99,19 @@ static Lut standard = { #include "data/standard.lut" }; -static void get_fbconfig(); -static void set_colorbar(); -static int get_dirfile(); -static void load_testpattern(); -static void set_nframes(); -static void xim_frameRegion(); -static void xim_colortables(); -static int xim_onScreen(); -static void xim_highlightFrame(); +static void get_fbconfig(XimDataPtr xim); +static void set_colorbar(XimDataPtr xim, Widget w); +static int get_dirfile(DIR *dir, char *outstr, int maxch); +static void load_testpattern(XimDataPtr xim, int frame, int type); +static void set_nframes(XimDataPtr xim, int nframes); +static void xim_frameRegion(XimDataPtr xim, FrameBufPtr fb); +static void xim_colortables(XimDataPtr xim); +static int xim_onScreen(XimDataPtr xim, int frame); +static void xim_highlightFrame(XimDataPtr xim, int frame); static void hsv_to_rgb(float, float, float, float *, float *, float *); -void xim_labelTiles(); -void xim_getScreen(); +void xim_labelTiles(XimDataPtr xim); +void xim_getScreen(XimDataPtr xim, int frame, int *sx, int *sy, int *width, int *height, int *depth); #define TOL 0.0001 @@ -2180,10 +2180,7 @@ xim_writeDisplay ( /* XIM_MESSAGE -- Send a message to the user interface. */ void -xim_message (xim, object, message) -XimDataPtr xim; -char *object; -char *message; +xim_message (XimDataPtr xim, char *object, char *message) { char msgbuf[SZ_MSGBUF]; @@ -2591,7 +2588,7 @@ xim_setColormap ( */ for (i=0; i < nelem; i++) { float h, s, v, r, g, b; - double pow(), sin(); + double pow(double, double), sin(double); frac = 1.0 - ((float)i / (float)(nelem - 1)); h = frac * 360.0 + 270.0; diff --git a/ximtool/save.c b/ximtool/save.c index 4dc931e..395e6e5 100644 --- a/ximtool/save.c +++ b/ximtool/save.c @@ -24,18 +24,17 @@ * otherwise the indicated region is saved. */ -static int xims_write(); -static void savestat(), savetext(); +static int xims_write(XimDataPtr xim, FILE *fp, int fileformat, unsigned char *pixels, int w, int h, int d, unsigned char *r, unsigned char *g, unsigned char *b, int ncolors); +static void savestat(XimDataPtr xim, char *message), savetext(XimDataPtr xim, int seqno, char *fullname, int fileformat, int filesize, int w, int h, int d); /* XIM_INITSAVE -- Initialize the file save structure. */ void -xim_initSave (xim) -XimDataPtr xim; +xim_initSave (XimDataPtr xim) { fileSavePtr fsp; - extern char *getcwd(), *getenv(); + extern char *getcwd(char *, size_t), *getenv(const char *); char buf[SZ_LINE]; if (!(xim->fsp = fsp = (fileSavePtr) calloc (1, sizeof (fileSave)))) @@ -59,8 +58,7 @@ XimDataPtr xim; /* XIM_SAVECLOSE -- Close the save structure. */ void -xim_saveClose (xim) -XimDataPtr xim; +xim_saveClose (XimDataPtr xim) { fileSavePtr fsp = xim->fsp; @@ -73,11 +71,11 @@ XimDataPtr xim; * ny is zero the entire frame is saved, otherwise the given region is saved. */ int -xim_saveFile (xim, template, fileformat, x0,y0, nx,ny) -XimDataPtr xim; -char *template; /* file name or printf format */ -int fileformat; /* output raster file format/type */ -int x0, y0, nx, ny; /* region of display to be saved */ +xim_saveFile (XimDataPtr xim, char *template, int fileformat, int x0, int y0, int nx, int ny) + + /* file name or printf format */ + /* output raster file format/type */ + /* region of display to be saved */ { int i, j; fileSavePtr fsp = xim->fsp; @@ -89,7 +87,7 @@ int x0, y0, nx, ny; /* region of display to be saved */ static int debug=0; extern int errno; FILE *fp; - char *mktemp(); + char *mktemp(char *); /* Generate output file name. */ sprintf (fname, template, fsp->seqno++); @@ -188,14 +186,7 @@ int x0, y0, nx, ny; /* region of display to be saved */ /* XIMS_WRITE -- Write a file in the indicated format. */ static int -xims_write (xim, fp, fileformat, pixels, w,h,d, r,g,b, ncolors) -XimDataPtr xim; -FILE *fp; -int fileformat; -unsigned char *pixels; -int w, h, d; -unsigned char *r, *g, *b; -int ncolors; +xims_write (XimDataPtr xim, FILE *fp, int fileformat, unsigned char *pixels, int w, int h, int d, unsigned char *r, unsigned char *g, unsigned char *b, int ncolors) { PSImagePtr psim = xim->psim; FrameBufPtr fb = xim->df_p; @@ -203,10 +194,10 @@ int ncolors; int sv_annotate = psim->annotate; int sv_colorClass = psim->colorClass; int gray=0, status=0; - extern int writeSunRas(); - extern int writeFITS(); - extern int writeGIF(); - extern int writeTIFF(); + extern int writeSunRas(FILE *fp, unsigned char *pixels, int pixtype, int w, int h, unsigned char *r, unsigned char *g, unsigned char *b, int ncolors, int colorstyle); + extern int writeFITS(FILE *fp, byte *image, int w, int h, byte *rmap, byte *gmap, byte *bmap, int numcols); + extern int writeGIF(FILE *fp, byte *image, int w, int h, byte *rmap, byte *gmap, byte *bmap, int numcols, int gray); + extern int writeTIFF(FILE *fa, unsigned char *data, int w, int h, int ncolors, int gray, unsigned char *r, unsigned char *g, unsigned char *b); switch (fileformat) { case XIM_RAS: @@ -282,9 +273,7 @@ int ncolors; * xim_save above. */ void -xims_rename (xim, old, new) -XimDataPtr xim; -char *old, *new; +xims_rename (XimDataPtr xim, char *old, char *new) { fileSavePtr fsp = xim->fsp; char text[SZ_LINE]; @@ -304,9 +293,7 @@ char *old, *new; } void -xims_cancel (xim, fname) -XimDataPtr xim; -char *fname; +xims_cancel (XimDataPtr xim, char *fname) { savestat (xim, "Save cancelled."); unlink (fname); @@ -316,9 +303,7 @@ char *fname; /* SAVESTAT -- Internal routine for save status messages. */ static void -savestat (xim, message) -XimDataPtr xim; -char *message; +savestat (XimDataPtr xim, char *message) { char text[SZ_LINE]; sprintf (text, "status {%s}", message); @@ -329,13 +314,7 @@ char *message; /* SAVETEXT -- Write something useful the text box in the save panel. */ static void -savetext (xim, seqno, fullname, fileformat, filesize, w,h,d) -XimDataPtr xim; -int seqno; -char *fullname; -int fileformat; -int filesize; -int w, h, d; +savetext (XimDataPtr xim, int seqno, char *fullname, int fileformat, int filesize, int w, int h, int d) { char *ip; char *fmt, *fname, text[SZ_LINE]; diff --git a/ximtool/tiffio.c b/ximtool/tiffio.c index 0a1921f..947cc5c 100644 --- a/ximtool/tiffio.c +++ b/ximtool/tiffio.c @@ -51,19 +51,19 @@ static char *l_order = "II*\0"; /* MONO returns total intensity of r,g,b components */ #define MONO(rd,gn,bl) (((rd)*11 + (gn)*16 + (bl)*5) >> 5) /*.33R+ .5G+ .17B*/ -extern int is_swapped(); -void create_TIFFtag(); +extern int is_swapped(void); +void create_TIFFtag(TiffTag *tag, short int desig, short int type, int count, int offset); /* writeTIFF -- Write a TIFF 6.0 image. */ void -writeTIFF (fa, data, w, h, ncolors, gray, r, g, b) -FILE *fa; /* output file descriptor */ -unsigned char *data; /* pixel data */ -int w, h; /* image dimensions */ -int ncolors; /* number of colors */ -int gray; /* grayscale? */ -unsigned char *r, *g, *b; /* colormap */ +writeTIFF (FILE *fa, unsigned char *data, int w, int h, int ncolors, int gray, unsigned char *r, unsigned char *g, unsigned char *b) + /* output file descriptor */ + /* pixel data */ + /* image dimensions */ + /* number of colors */ + /* grayscale? */ + /* colormap */ { int i,size,offset; short dirs = 12; @@ -186,12 +186,12 @@ unsigned char *r, *g, *b; /* colormap */ /* create_TIFFtag - Create a TIFF IFD (Image File Directory). */ void -create_TIFFtag (tag, desig, type, count, offset) -TiffTag *tag; /* tag to create */ -short desig; /* tag definition */ -short type; /* scalar type of data items */ -int count; /* no. of items in tag data */ -int offset; /* byte offset to data items */ +create_TIFFtag (TiffTag *tag, short int desig, short int type, int count, int offset) + /* tag to create */ + /* tag definition */ + /* scalar type of data items */ + /* no. of items in tag data */ + /* byte offset to data items */ { tag->tag = desig; tag->type = type; diff --git a/ximtool/util.c b/ximtool/util.c index a6390dd..f02c6b3 100644 --- a/ximtool/util.c +++ b/ximtool/util.c @@ -32,9 +32,9 @@ typedef unsigned char uchar; * and overlapping. */ void -bswap2 (a, b, nbytes) -char *a, *b; /* input array */ -int nbytes; /* number of bytes to swap */ +bswap2 (char *a, char *b, int nbytes) + /* input array */ + /* number of bytes to swap */ { char *ip=a, *op=b, *otop; unsigned temp; @@ -59,12 +59,12 @@ int nbytes; /* number of bytes to swap */ * The input and output arrays may be the same but may not partially overlap. */ void -bswap4 (a, aoff, b, boff, nbytes) -char *a; /* input array */ -int aoff; /* first byte in input array */ -char *b; /* output array */ -int boff; /* first byte in output array */ -int nbytes; /* number of bytes to swap */ +bswap4 (char *a, int aoff, char *b, int boff, int nbytes) + /* input array */ + /* first byte in input array */ + /* output array */ + /* first byte in output array */ + /* number of bytes to swap */ { char *ip, *op, *tp; int n; @@ -101,12 +101,12 @@ int nbytes; /* number of bytes to swap */ * The input and output arrays may be the same but may not partially overlap. */ void -bswap8 (a, aoff, b, boff, nbytes) -char *a; /* input array */ -int aoff; /* first byte in input array */ -char *b; /* output array */ -int boff; /* first byte in output array */ -int nbytes; /* number of bytes to swap */ +bswap8 (char *a, int aoff, char *b, int boff, int nbytes) + /* input array */ + /* first byte in input array */ + /* output array */ + /* first byte in output array */ + /* number of bytes to swap */ { char *ip, *op, *tp; int n; @@ -149,7 +149,7 @@ int nbytes; /* number of bytes to swap */ /* IS_SWAPPED -- See if this is a byte-swapped (relative to Sun) machine. */ int -is_swapped () +is_swapped (void) { union { char ch[4]; @@ -164,11 +164,7 @@ is_swapped () /* MIN_MAX -- Get the min and max values of an array. */ void -min_max (a, npts, bitpix, min, max) -char *a; -int npts; -int bitpix; -float *min, *max; +min_max (char *a, int npts, int bitpix, float *min, float *max) { int i; @@ -211,9 +207,7 @@ float *min, *max; /* STRPAK -- Convert ASCII string from SPP char per short to C char per byte */ void -strpak (in, out, len) -char *in, *out; -int len; +strpak (char *in, char *out, int len) { int i, j; @@ -235,9 +229,7 @@ int len; * for DISPLAY, even though the pixels are stored "flipped" in the pixfile. */ void -flip (buffer, nx, ny) -uchar *buffer; -int nx, ny; +flip (uchar *buffer, int nx, int ny) { int i; int j, v; diff --git a/ximtool/ximclient.c b/ximtool/ximclient.c index 68cd61f..1dd881c 100644 --- a/ximtool/ximclient.c +++ b/ximtool/ximclient.c @@ -80,28 +80,27 @@ typedef struct { -static int initialize(), Reset(), Quit(); -static int setColormap(), updateColormap(), windowColormap(); -static int zoom(), pan(), getSource(); -static int setFrame(), getFrame(), getRaster(), nextFrame(), prevFrame(); -static int fitFrame(), matchFrames(), registerFrames(), retCursorVal(); -static int encodewcs(), flip(), clearFrame(), setOption(), setOffset(); -static int setPrintOption(), setSaveOption(), setLoadOption(); -static int print(), save(), load(), help(), windowRGB(); -static int centroid(), getPixels(); -static int ism_start(), ism_stop(), ism_cmd(); -static void info_server(), info_imtoolrc(), info_clients(), cmapScale(); - -extern int ism_evaluate(), info(); -extern IsmModule ismNameToPtr(); - -void info_wcs(); +static int initialize(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv), Reset(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv), Quit(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv); +static int setColormap(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv), updateColormap(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv), windowColormap(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv); +static int zoom(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv), pan(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv), getSource(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv); +static int setFrame(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv), getFrame(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv), getRaster(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv), nextFrame(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv), prevFrame(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv); +static int fitFrame(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv), matchFrames(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv), registerFrames(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv), retCursorVal(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv); +static int encodewcs(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv), flip(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv), clearFrame(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv), setOption(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv), setOffset(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv); +static int setPrintOption(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv), setSaveOption(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv), setLoadOption(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv); +static int print(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv), save(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv), load(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv), help(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv), windowRGB(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv); +static int centroid(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv), getPixels(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv); +static int ism_start(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv), ism_stop(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv), ism_cmd(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv); +static void info_server(XimDataPtr xim, int argc, char **argv, char *text), info_imtoolrc(XimDataPtr xim, char *text), info_clients(XimDataPtr xim, char *text), cmapScale(short unsigned int *map, int ncells, int first, float offset, float slope); + +extern int ism_evaluate(XimDataPtr xim, char *object, char *command), info(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv); +extern IsmModule ismNameToPtr(char *name); + +void info_wcs(XimDataPtr xim, char *text); /* xim_clientOpen -- Initialize the ximtool client code. */ void -xim_clientOpen (xim) -XimDataPtr xim; +xim_clientOpen (XimDataPtr xim) { XimClientPtr xc; Tcl_Interp *tcl; @@ -203,8 +202,7 @@ XimDataPtr xim; /* xim_clientClose -- Shutdown the ximtool client code. */ void -xim_clientClose (xim) -XimDataPtr xim; +xim_clientClose (XimDataPtr xim) { XimClientPtr xc = (XimClientPtr) xim->clientPrivate; Tcl_Eval(xc->tcl, "exit"); @@ -218,12 +216,12 @@ XimDataPtr xim; * "client", which from the object manager's point of view is ximtool itself. */ int -xim_clientExecute (xc, tcl, objname, key, command) -XimClientPtr xc; -Tcl_Interp *tcl; /* caller's Tcl */ -char *objname; /* object name */ -int key; /* notused */ -char *command; +xim_clientExecute (XimClientPtr xc, Tcl_Interp *tcl, char *objname, int key, char *command) + + /* caller's Tcl */ + /* object name */ + /* notused */ + { XimDataPtr xim = xc->xim; @@ -247,11 +245,7 @@ char *command; * Usage: Quit */ static int -Quit (xc, tcl, argc, argv) -XimClientPtr xc; -Tcl_Interp *tcl; -int argc; -char **argv; +Quit (XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv) { XimDataPtr xim = xc->xim; return xim_shutdown (xim); @@ -265,11 +259,7 @@ char **argv; * Reset does a full power-on reset of ximtool. */ static int -Reset (xc, tcl, argc, argv) -XimClientPtr xc; -Tcl_Interp *tcl; -int argc; -char **argv; +Reset (XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv) { XimDataPtr xim = xc->xim; xim_initialize (xim, xim->fb_configno, xim->nframes, 1); @@ -285,11 +275,7 @@ char **argv; * current frame buffers and view. */ static int -initialize (xc, tcl, argc, argv) -XimClientPtr xc; -Tcl_Interp *tcl; -int argc; -char **argv; +initialize (XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv) { XimDataPtr xim = xc->xim; xim_initialize (xim, xim->fb_configno, xim->nframes, 0); @@ -302,11 +288,7 @@ char **argv; * Usage: setFrame */ static int -setFrame (xc, tcl, argc, argv) -XimClientPtr xc; -Tcl_Interp *tcl; -int argc; -char **argv; +setFrame (XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv) { if (argc == 2) xim_setFrame (xc->xim, atoi(argv[1])); @@ -323,11 +305,7 @@ char **argv; * returns the frame number with which the raster is associated. */ static int -getFrame (xc, tcl, argc, argv) -XimClientPtr xc; -Tcl_Interp *tcl; -int argc; -char **argv; +getFrame (XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv) { XimDataPtr xim = xc->xim; FrameBufPtr fb; @@ -364,11 +342,7 @@ char **argv; * number getRaster returns the raster number of the given frame. */ static int -getRaster (xc, tcl, argc, argv) -XimClientPtr xc; -Tcl_Interp *tcl; -int argc; -char **argv; +getRaster (XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv) { XimDataPtr xim = xc->xim; FrameBufPtr fb; @@ -405,11 +379,7 @@ char **argv; * raster are returned as function arguments. */ static int -getSource (xc, tcl, argc, argv) -XimClientPtr xc; -Tcl_Interp *tcl; -int argc; -char **argv; +getSource (XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv) { XimDataPtr xim = xc->xim; FrameBufPtr fb = xim->df_p; @@ -448,11 +418,7 @@ char **argv; * Usage: nextFrame */ static int -nextFrame (xc, tcl, argc, argv) -XimClientPtr xc; -Tcl_Interp *tcl; -int argc; -char **argv; +nextFrame (XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv) { XimDataPtr xim = xc->xim; int frame; @@ -472,11 +438,7 @@ char **argv; * Usage: prevFrame */ static int -prevFrame (xc, tcl, argc, argv) -XimClientPtr xc; -Tcl_Interp *tcl; -int argc; -char **argv; +prevFrame (XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv) { XimDataPtr xim = xc->xim; int frame; @@ -499,11 +461,7 @@ char **argv; * Usage: matchFrames [frames [reference_frame]] */ static int -matchFrames (xc, tcl, argc, argv) -XimClientPtr xc; -Tcl_Interp *tcl; -int argc; -char **argv; +matchFrames (XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv) { XimDataPtr xim = xc->xim; int *frames, frame_list[32], reference_frame; @@ -541,11 +499,7 @@ nolist: frames = NULL; * offsetRegister [frames [reference_frame]] */ static int -registerFrames (xc, tcl, argc, argv) -XimClientPtr xc; -Tcl_Interp *tcl; -int argc; -char **argv; +registerFrames (XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv) { XimDataPtr xim = xc->xim; int *frames, frame_list[32], reference_frame; @@ -580,11 +534,7 @@ nolist: frames = NULL; * Usage: setOffset xoff yoff */ static int -setOffset (xc, tcl, argc, argv) -XimClientPtr xc; -Tcl_Interp *tcl; -int argc; -char **argv; +setOffset (XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv) { XimDataPtr xim = xc->xim; FrameBufPtr fb = xim->df_p; @@ -628,11 +578,7 @@ char **argv; * Usage: clearFrame [frame] */ static int -clearFrame (xc, tcl, argc, argv) -XimClientPtr xc; -Tcl_Interp *tcl; -int argc; -char **argv; +clearFrame (XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv) { XimDataPtr xim = xc->xim; int frame; @@ -653,11 +599,7 @@ char **argv; * Usage: fitFrame */ static int -fitFrame (xc, tcl, argc, argv) -XimClientPtr xc; -Tcl_Interp *tcl; -int argc; -char **argv; +fitFrame (XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv) { xim_fitFrame (xc->xim); return (TCL_OK); @@ -685,11 +627,7 @@ char *v_orient[] = { }; static int -setOption (xc, tcl, argc, argv) -XimClientPtr xc; -Tcl_Interp *tcl; -int argc; -char **argv; +setOption (XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv) { XimDataPtr xim = xc->xim; FrameBufPtr fb = xim->df_p; @@ -843,11 +781,7 @@ vorient: if (nitems >= 13) * The colormap may be specified either by number or by name. */ static int -setColormap (xc, tcl, argc, argv) -XimClientPtr xc; -Tcl_Interp *tcl; -int argc; -char **argv; +setColormap (XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv) { XimDataPtr xim = xc->xim; FrameBufPtr fb = xim->df_p; @@ -894,11 +828,7 @@ char **argv; * Usage: windowColormap */ static int -windowColormap (xc, tcl, argc, argv) -XimClientPtr xc; -Tcl_Interp *tcl; -int argc; -char **argv; +windowColormap (XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv) { XimDataPtr xim = xc->xim; FrameBufPtr fb = xim->df_p; @@ -922,11 +852,7 @@ char **argv; * Usage: updateColormap */ static int -updateColormap (xc, tcl, argc, argv) -XimClientPtr xc; -Tcl_Interp *tcl; -int argc; -char **argv; +updateColormap (XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv) { XimDataPtr xim = xc->xim; FrameBufPtr fb = xim->df_p; @@ -961,11 +887,7 @@ char **argv; * used to map raster pixels to display pixels. */ static int -zoom (xc, tcl, argc, argv) -XimClientPtr xc; -Tcl_Interp *tcl; -int argc; -char **argv; +zoom (XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv) { XimDataPtr xim = xc->xim; FrameBufPtr fb = xim->df_p; @@ -1013,11 +935,7 @@ char **argv; * Usage: pan */ static int -pan (xc, tcl, argc, argv) -XimClientPtr xc; -Tcl_Interp *tcl; -int argc; -char **argv; +pan (XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv) { XimDataPtr xim = xc->xim; FrameBufPtr fb = xim->df_p; @@ -1025,7 +943,7 @@ char **argv; float xmag, ymag; float xcen, ycen; float xoff, yoff; - double atof(); + double atof(const char *); xmag = fb->xmag; ymag = fb->ymag; @@ -1051,11 +969,7 @@ char **argv; * Usage: centroid [ ] */ static int -centroid (xc, tcl, argc, argv) -XimClientPtr xc; -Tcl_Interp *tcl; -int argc; -char **argv; +centroid (XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv) { XimDataPtr xim = xc->xim; FrameBufPtr fb = xim->df_p; @@ -1070,7 +984,7 @@ char **argv; int dist=0, mind=99999, maxd=99999, imin=0, imax=0; int x0, y0, nx, npix, min_max=-1; char buf[SZ_LINE]; - double atof(); + double atof(const char *); if (argc < 4) @@ -1214,11 +1128,7 @@ char **argv; #define PF_VCUT 3 /* format for vertical cut-plot */ static int -getPixels (xc, tcl, argc, argv) -XimClientPtr xc; -Tcl_Interp *tcl; -int argc; -char **argv; +getPixels (XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv) { XimDataPtr xim = xc->xim; FrameBufPtr fb = xim->df_p; @@ -1230,7 +1140,7 @@ char **argv; float z1 = ct->z1, z2 = ct->z2; float scale=1.0, yscale = 128.0 / (z2 - z1); int x0, y0, nx, ny, format=0, npix, sample=1, raster=0; - double atof(); + double atof(const char *); if (argc < 5) @@ -1330,11 +1240,7 @@ char **argv; * Usage: flip [axis [axis ...]] */ static int -flip (xc, tcl, argc, argv) -XimClientPtr xc; -Tcl_Interp *tcl; -int argc; -char **argv; +flip (XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv) { XimDataPtr xim = xc->xim; FrameBufPtr fb = xim->df_p; @@ -1360,11 +1266,7 @@ char **argv; * Usage: retCursorVal sx sy [frame [wcs [key [strval]]]] */ static int -retCursorVal (xc, tcl, argc, argv) -XimClientPtr xc; -Tcl_Interp *tcl; -int argc; -char **argv; +retCursorVal (XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv) { XimDataPtr xim = xc->xim; int frame, wcs, key; @@ -1404,11 +1306,7 @@ char **argv; * Usage: string = encodewcs sx sy sz */ static int -encodewcs (xc, tcl, argc, argv) -XimClientPtr xc; -Tcl_Interp *tcl; -int argc; -char **argv; +encodewcs (XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv) { char buf[SZ_LINE]; float sx, sy; @@ -1458,11 +1356,7 @@ char **argv; * corners llx lly urx ury */ static int -setPrintOption (xc, tcl, argc, argv) -XimClientPtr xc; -Tcl_Interp *tcl; -int argc; -char **argv; +setPrintOption (XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv) { XimDataPtr xim = xc->xim; FrameBufPtr fb = xim->df_p; @@ -1673,11 +1567,7 @@ char **argv; * fname strval */ static int -setSaveOption (xc, tcl, argc, argv) -XimClientPtr xc; -Tcl_Interp *tcl; -int argc; -char **argv; +setSaveOption (XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv) { XimDataPtr xim = xc->xim; fileSavePtr fsp = xim->fsp; @@ -1778,11 +1668,7 @@ char **argv; * */ static int -setLoadOption (xc, tcl, argc, argv) -XimClientPtr xc; -Tcl_Interp *tcl; -int argc; -char **argv; +setLoadOption (XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv) { int i; XimDataPtr xim = xc->xim; @@ -1883,11 +1769,7 @@ char **argv; * The forms "print rename" and "print cancel" are actions for print alerts. */ static int -print (xc, tcl, argc, argv) -XimClientPtr xc; -Tcl_Interp *tcl; -int argc; -char **argv; +print (XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv) { XimDataPtr xim = xc->xim; int x0, y0, nx, ny; @@ -1930,11 +1812,7 @@ char **argv; * The forms "save rename" and "save cancel" are actions for save alerts. */ static int -save (xc, tcl, argc, argv) -XimClientPtr xc; -Tcl_Interp *tcl; -int argc; -char **argv; +save (XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv) { XimDataPtr xim = xc->xim; fileSavePtr fsp = xim->fsp; @@ -1972,11 +1850,7 @@ char **argv; * Options: frame display frame to be loaded */ static int -load (xc, tcl, argc, argv) -XimClientPtr xc; -Tcl_Interp *tcl; -int argc; -char **argv; +load (XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv) { XimDataPtr xim = xc->xim; fileLoadPtr flp = xim->flp; @@ -2045,11 +1919,7 @@ static char *help_text[] = { }; static int -help (xc, tcl, argc, argv) -XimClientPtr xc; -Tcl_Interp *tcl; -int argc; -char **argv; +help (XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv) { XimDataPtr xim = xc->xim; char *ip, *op, *helptxt; @@ -2078,11 +1948,7 @@ char **argv; * Usage: info option [ args ... ] */ int -info (xc, tcl, argc, argv) -XimClientPtr xc; -Tcl_Interp *tcl; -int argc; -char **argv; +info (XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv) { XimDataPtr xim = xc->xim; char *option, *message; @@ -2124,11 +1990,7 @@ char **argv; /* INFO_SERVER -- Helper routine to report server state information. */ static void -info_server (xim, argc, argv, text) -XimDataPtr xim; -int argc; -char **argv; -char *text; +info_server (XimDataPtr xim, int argc, char **argv, char *text) { extern int ncolormaps, first_color; char cmapname[80], line[SZ_LINE]; @@ -2175,9 +2037,7 @@ char *text; /* INFO_CLIENTS -- Helper routine to report client (display or ISM) state. */ void -info_clients (xim, text) -XimDataPtr xim; -char *text; +info_clients (XimDataPtr xim, char *text) { IsmModule ism; int i; @@ -2236,9 +2096,7 @@ char *text; * each frame in the display. */ void -info_wcs (xim, text) -XimDataPtr xim; -char *text; +info_wcs (XimDataPtr xim, char *text) { FrameBufPtr fr = xim->df_p; CtranPtr ct = &fr->ctran; @@ -2328,9 +2186,7 @@ char *text; * table. */ void -info_imtoolrc (xim, text) -XimDataPtr xim; -char *text; +info_imtoolrc (XimDataPtr xim, char *text) { int last_fb_used = MAX_FBCONFIG; int i, w, h, nf, fb_config = xim->fb_configno; @@ -2386,11 +2242,7 @@ char *text; */ static int -windowRGB (xc, tcl, argc, argv) -XimClientPtr xc; -Tcl_Interp *tcl; -int argc; -char **argv; +windowRGB (XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv) { XimDataPtr xim = xc->xim; FrameBufPtr fb = xim->df_p; @@ -2443,10 +2295,7 @@ char **argv; * slope, the scaling is done in place. */ void -cmapScale (map, ncells, first, offset, slope) -unsigned short map[MAX_COLORS]; -int ncells, first; -float offset, slope; +cmapScale (short unsigned int *map, int ncells, int first, float offset, float slope) { int i, c1, c2; float x, y, z, frac; @@ -2483,11 +2332,7 @@ float offset, slope; * Usage: ism_start task */ static int -ism_start (xc, tcl, argc, argv) -XimClientPtr xc; -Tcl_Interp *tcl; -int argc; -char **argv; +ism_start (XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv) { IsmModule ism; @@ -2514,11 +2359,7 @@ char **argv; * Usage: ism_stop task */ static int -ism_stop (xc, tcl, argc, argv) -XimClientPtr xc; -Tcl_Interp *tcl; -int argc; -char **argv; +ism_stop (XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv) { XimDataPtr xim = xc->xim; IsmModule ism; @@ -2545,11 +2386,7 @@ char **argv; * Usage: ism_cmd task */ static int -ism_cmd (xc, tcl, argc, argv) -XimClientPtr xc; -Tcl_Interp *tcl; -int argc; -char **argv; +ism_cmd (XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv) { XimDataPtr xim = xc->xim; IsmModule ism; diff --git a/ximtool/ximtool.c b/ximtool/ximtool.c index 2aca957..86bfd41 100644 --- a/ximtool/ximtool.c +++ b/ximtool/ximtool.c @@ -33,18 +33,16 @@ char *defgui_text[] = { NULL }; -void xim_onsig(); -void Usage(); -void printoption(); +void xim_onsig(int sig, int *code, int *scp); +void Usage(void); +void printoption(char *st); /* MAIN -- XImtool main program. This is the only ximtool routine containing * window system specific code. */ int -main (argc, argv) -int argc; -char *argv[]; +main (int argc, char **argv) { XimDataPtr xim = &ximtool_data; int i; @@ -56,8 +54,8 @@ char *argv[]; int sv_argc, ncolors, base; int tile = 0; - extern IsmModule ismNameToPtr(); - int xerror(), xioerror(); + extern IsmModule ismNameToPtr(char *name); + int xerror(Display *display, XErrorEvent *event), xioerror(Display *dpy); /* Process the command line arguments. Scan the arglist first to see @@ -386,8 +384,7 @@ char *argv[]; /* XIM_SHUTDOWN -- Terminate ximtool. */ int -xim_shutdown (xim) -XimDataPtr xim; +xim_shutdown (XimDataPtr xim) { eps_close (xim->psim); xim_loadClose (xim); @@ -406,11 +403,7 @@ XimDataPtr xim; * talk to X directly so we need to provide this interface routine. */ XtInputId -xim_addInput (xim, input, proc, client_data) -XimDataPtr xim; -int input; -void (*proc)(); -XtPointer client_data; +xim_addInput (XimDataPtr xim, int input, void (*proc) (/* ??? */), XtPointer client_data) { return XtAppAddInput (app_context, input, (XtPointer)XtInputReadMask, *proc, client_data); @@ -420,9 +413,7 @@ XtPointer client_data; /* XIM_REMOVEINPUT -- Remove a callback previously posted with xim_addInput. */ void -xim_removeInput (xim, id) -XimDataPtr xim; -XtPointer id; +xim_removeInput (XimDataPtr xim, XtPointer id) { XtRemoveInput ((XtInputId)id); } @@ -431,7 +422,7 @@ XtPointer id; /* USAGE -- Print a list of command-line options. */ void -Usage () +Usage (void) { fprintf (stderr, "Usage:\n\n"); printoption (" ximtool"); @@ -472,8 +463,7 @@ Usage () */ static int cpos = 0; void -printoption(st) -char *st; +printoption(char *st) { if (strlen(st) + cpos > 78) { fprintf (stderr,"\n\t"); @@ -489,9 +479,7 @@ char *st; * more informative message so the user can correct the visual. */ int -xim_badVisual (depth, class) -int depth; -int class; +xim_badVisual (int depth, int class) { fprintf (stderr, "\nERROR: Detected incorrect X visual: depth=%d class=", depth); @@ -541,13 +529,11 @@ int class; */ /*ARGSUSED*/ int -xerror (display, event) -Display *display; -XErrorEvent *event; +xerror (Display *display, XErrorEvent *event) { static char *envvar = "XGXERROR"; static int nerrs = 0; - extern char *getenv(); + extern char *getenv(const char *); char fname[128]; char *action; int pid; @@ -585,10 +571,9 @@ XErrorEvent *event; /*ARGSUSED*/ int -xioerror(dpy) -Display *dpy; +xioerror(Display *dpy) { - char *SysErrorMsg(); + char *SysErrorMsg(int n); (void) fprintf (stderr, "ximtool: fatal IO error %d (%s) or KillClient on X server \"%s\"\r\n", @@ -598,16 +583,14 @@ Display *dpy; exit (ERROR_XIOERROR); } -void xt_error(message) - String message; +void xt_error(String message) { (void) fprintf (stderr, "ximtool Xt error: %s\n", message); exit (1); } -char *SysErrorMsg (n) - int n; +char *SysErrorMsg (int n) { return((n >= 0) ? (char *)strerror(n) : "unknown error"); } @@ -616,10 +599,10 @@ char *SysErrorMsg (n) /* XIM_ONSIG -- Catch interrupt and shutdown gracefully. */ void -xim_onsig (sig, code, scp) -int sig; /* signal which was trapped */ -int *code; /* not used */ -int *scp; /* not used */ +xim_onsig (int sig, int *code, int *scp) + /* signal which was trapped */ + /* not used */ + /* not used */ { xim_shutdown (&ximtool_data); } diff --git a/ximtool/ximtool.h b/ximtool/ximtool.h index 4c8d986..b5d22f4 100644 --- a/ximtool/ximtool.h +++ b/ximtool/ximtool.h @@ -706,58 +706,58 @@ extern Printer printer_list[]; #define nint(a) ((a)<(0)?((int)(a-0.5)):((int)(a+0.5))) #endif -void xim_initialize(), xim_reset(), xim_resize(), xim_refresh(); -int xim_shutdown (); -void xim_close(), xim_initFrame(), xim_setFrame(), xim_setRop(); -void xim_setReferenceFrame(), xim_setDisplayFrame(); -void xim_delFrame(), xim_setMapping(); +void xim_initialize(XimDataPtr xim, int config, int nframes, int hardreset), xim_reset(XimDataPtr xim, Widget w), xim_resize(XimDataPtr xim, Widget w), xim_refresh(XimDataPtr xim); +int xim_shutdown (XimDataPtr xim); +void xim_close(XimDataPtr xim), xim_initFrame(XimDataPtr xim, int frame, int nframes, FbConfigPtr config, char *memModel), xim_setFrame(XimDataPtr xim, int frame), xim_setRop(XimDataPtr xim, FrameBufPtr fb, int rop); +void xim_setReferenceFrame(IoChanPtr chan, int frame), xim_setDisplayFrame(XimDataPtr xim, int frame); +void xim_delFrame(XimDataPtr xim, int frame), xim_setMapping(FrameBufPtr fb, XimDataPtr xim, int frame, int mapping, int src, int dst, int fill_mode); void xim_setZoom(XimDataPtr, FrameBufPtr, int, int, int, int, float, float, float, float, float, float, Boolean); void xim_setCursorPos(XimDataPtr, float, float); -void xim_getCursorPos(), xim_setFlip(); -void xim_matchFrames(), xim_registerFrames(); +void xim_getCursorPos(XimDataPtr xim, float *sx, float *sy, int *raster, int *frame), xim_setFlip(XimDataPtr xim, FrameBufPtr fb, int flip_x, int flip_y); +void xim_matchFrames(XimDataPtr xim, int *frames, int reference_frame), xim_registerFrames(XimDataPtr xim, int *frames, int reference_frame, int offsets); void xim_readCursor(), xim_frameChanged(); -void xim_message(), xim_msgi(), xim_alert(); -int xim_setColormap(); -int xim_getAntialias(); -char *xim_frameLabel(); -void xim_displayLogo (); -void xim_initPrinterOps(); -int xim_getPrinterInfo(); -int xim_print(); -void print_mappings(); -void xim_initLoad(); -void xim_scanHeaders(); -void xim_dirRescan(); -int xim_loadFile(); -void xim_loadClose(); - -int xim_writeDisplay(); -unsigned char *xim_readDisplay(); -void xim_initSave(), xim_closeSave(); -void ximp_rename(), ximp_cancel(); -void xims_rename(), xims_cancel(); -int xim_saveFile(); -void xim_saveClose(); - -int xim_iisOpen(); -void xim_iisClose(), xim_iisio(); -XtInputId xim_addInput(); -void xim_iisiomap(); -void xim_iiscolormap(); - -void xim_removeInput(); -void xim_encodewcs(); -void xim_retCursorVal(); - -void xim_clientOpen(), xim_clientClose(); -int xim_clientExecute(); -void xim_ismOpen(), xim_ismClose(); -void xim_enhancement(); -void xim_eraseFrame(); -void xim_tileFrames(); -void xim_fitFrame(); -void xim_cursorMode(); - -int ism_message(); -void wcspix_message(); +void xim_message(XimDataPtr xim, char *object, char *message), xim_msgi(XimDataPtr xim, char *object, int value), xim_alert(XimDataPtr xim, char *text, char *ok_action, char *cancel_action); +int xim_setColormap(char *function, String *dirs, short unsigned int *m_red, short unsigned int *m_green, short unsigned int *m_blue, int nelem); +int xim_getAntialias(XimDataPtr xim, char *s); +char *xim_frameLabel(XimDataPtr xim); +void xim_displayLogo (XimDataPtr xim); +void xim_initPrinterOps(XimDataPtr xim); +int xim_getPrinterInfo(XimDataPtr xim, char *printer); +int xim_print(XimDataPtr xim, int x0, int y0, int nx, int ny); +void print_mappings(FrameBufPtr fr); +void xim_initLoad(XimDataPtr xim); +void xim_scanHeaders(XimDataPtr xim); +void xim_dirRescan(XimDataPtr xim); +int xim_loadFile(XimDataPtr xim, char *fname, int frame); +void xim_loadClose(XimDataPtr xim); + +int xim_writeDisplay(XimDataPtr xim, int frame, char *mapname, unsigned char *pixels, int w, int h, unsigned char *r, unsigned char *g, unsigned char *b, int ncolors); +unsigned char *xim_readDisplay(XimDataPtr xim, int x0, int y0, int nx, int ny, int *w, int *h, unsigned char *r, unsigned char *g, unsigned char *b, int *ncolors); +void xim_initSave(XimDataPtr xim), xim_closeSave(); +void ximp_rename(XimDataPtr xim, char *old, char *new), ximp_cancel(XimDataPtr xim, char *fname); +void xims_rename(XimDataPtr xim, char *old, char *new), xims_cancel(XimDataPtr xim, char *fname); +int xim_saveFile(XimDataPtr xim, char *template, int fileformat, int x0, int y0, int nx, int ny); +void xim_saveClose(XimDataPtr xim); + +int xim_iisOpen(XimDataPtr xim); +void xim_iisClose(XimDataPtr xim), xim_iisio(IoChanPtr chan, int *fd_addr, XtInputId *id_addr); +XtInputId xim_addInput(XimDataPtr xim, int input, void (*proc) (/* ??? */), XtPointer client_data); +void xim_iisiomap(XtPointer w, short unsigned int *iomap, int *iomap_len); +void xim_iiscolormap(XtPointer w, short unsigned int *r, short unsigned int *g, short unsigned int *b, int *first, int *ngray, int *rgb_len); + +void xim_removeInput(XimDataPtr xim, XtPointer id); +void xim_encodewcs(XimDataPtr xim, float sx, float sy, int sz, char *obuf); +void xim_retCursorVal(XimDataPtr xim, float sx, float sy, int frame, int wcs, int key, char *strval); + +void xim_clientOpen(XimDataPtr xim), xim_clientClose(XimDataPtr xim); +int xim_clientExecute(XimClientPtr xc, Tcl_Interp *tcl, char *objname, int key, char *command); +void xim_ismOpen(XimDataPtr xim), xim_ismClose(XimDataPtr xim); +void xim_enhancement(XimDataPtr xim, FrameBufPtr fb); +void xim_eraseFrame(XimDataPtr xim, int frame); +void xim_tileFrames(XimDataPtr xim, int frame_list); +void xim_fitFrame(XimDataPtr xim); +void xim_cursorMode(XimDataPtr xim, int state); + +int ism_message(XimDataPtr xim, char *object, char *command); +void wcspix_message(XimDataPtr xim, char *message); diff --git a/ximtool/zscale.c b/ximtool/zscale.c index 4862ff3..c7bfa18 100644 --- a/ximtool/zscale.c +++ b/ximtool/zscale.c @@ -46,9 +46,9 @@ #define abs(a) ((a) >= 0 ? (a) : -(a)) -static void flattenData(), subSample(); -static int sampleImage(), fitLine(), floatCompare(); -static int rejectPixels(), computeSigma(); +static void flattenData(float *data, float *flat, float *x, int npix, double z0, double dz), subSample(float *a, float *b, int npix, int step); +static int sampleImage(char *im, int bitpix, float **sample, int nx, int ny, int optimal_size, int len_stdline), fitLine(float *data, int npix, float *zstart, float *zslope, float krej, int ngrow, int maxiter), floatCompare(float *i, float *j); +static int rejectPixels(float *data, float *flat, float *normx, char *badpix, int npix, double *sumxsqr, double *sumxz, double *sumx, double *sumz, double threshold, int ngrow), computeSigma(float *a, char *badpix, int npix, double *mean, double *sigma); @@ -56,15 +56,15 @@ static int rejectPixels(), computeSigma(); */ void -zscale (im, nx, ny, bitpix, z1, z2, contrast, opt_size, len_stdline) - -char *im; /* image data to be sampled */ -int nx, ny; /* image dimensions */ -int bitpix; /* bits per pixel */ -float *z1, *z2; /* output min and max greyscale values */ -float contrast; /* adj. to slope of transfer function */ -int opt_size; /* desired number of pixels in sample */ -int len_stdline; /* optimal number of pixels per line */ +zscale (char *im, int nx, int ny, int bitpix, float *z1, float *z2, float contrast, int opt_size, int len_stdline) + + /* image data to be sampled */ + /* image dimensions */ + /* bits per pixel */ + /* output min and max greyscale values */ + /* adj. to slope of transfer function */ + /* desired number of pixels in sample */ + /* optimal number of pixels per line */ { int npix, minpix, ngoodpix, center_pixel, ngrow; float zmin, zmax, median; @@ -130,14 +130,14 @@ int len_stdline; /* optimal number of pixels per line */ */ static int -sampleImage (im, bitpix, sample, nx, ny, optimal_size, len_stdline) - -char *im; /* image to be sampled */ -int bitpix; /* bits per pixel in image */ -float **sample; /* output vector containing the sample */ -int nx, ny; /* image dimensions */ -int optimal_size; /* desired number of pixels in sample */ -int len_stdline; /* optimal number of pixels per line */ +sampleImage (char *im, int bitpix, float **sample, int nx, int ny, int optimal_size, int len_stdline) + + /* image to be sampled */ + /* bits per pixel in image */ + /* output vector containing the sample */ + /* image dimensions */ + /* desired number of pixels in sample */ + /* optimal number of pixels per line */ { int i; int ncols, nlines, col_step, line_step, maxpix, line; @@ -233,10 +233,7 @@ int len_stdline; /* optimal number of pixels per line */ */ static void -subSample (a, b, npix, step) -float *a; -float *b; -int npix, step; +subSample (float *a, float *b, int npix, int step) { int ip, i; @@ -261,15 +258,15 @@ int npix, step; */ static int -fitLine (data, npix, zstart, zslope, krej, ngrow, maxiter) - -float *data; /* data to be fitted */ -int npix; /* number of pixels before rejection */ -float *zstart; /* Z-value of pixel data[1] (output) */ -float *zslope; /* dz/pixel (output) */ -float krej; /* k-sigma pixel rejection factor */ -int ngrow; /* number of pixels of growing */ -int maxiter; /* max iterations */ +fitLine (float *data, int npix, float *zstart, float *zslope, float krej, int ngrow, int maxiter) + + /* data to be fitted */ + /* number of pixels before rejection */ + /* Z-value of pixel data[1] (output) */ + /* dz/pixel (output) */ + /* k-sigma pixel rejection factor */ + /* number of pixels of growing */ + /* max iterations */ { int i, ngoodpix, last_ngoodpix, minpix, niter; double xscale, z0, dz, o_dz, x, z, mean, sigma, threshold; @@ -392,12 +389,12 @@ int maxiter; /* max iterations */ */ static void -flattenData (data, flat, x, npix, z0, dz) -float *data; /* raw data array */ -float *flat; /* flattened data (output) */ -float *x; /* x value of each pixel */ -int npix; /* number of pixels */ -double z0, dz; /* z-intercept, dz/dx of fitted line */ +flattenData (float *data, float *flat, float *x, int npix, double z0, double dz) + /* raw data array */ + /* flattened data (output) */ + /* x value of each pixel */ + /* number of pixels */ + /* z-intercept, dz/dx of fitted line */ { int i; @@ -411,12 +408,12 @@ double z0, dz; /* z-intercept, dz/dx of fitted line */ */ static int -computeSigma (a, badpix, npix, mean, sigma) +computeSigma (float *a, char *badpix, int npix, double *mean, double *sigma) -float *a; /* flattened data array */ -char *badpix; /* bad pixel flags (!= 0 if bad pixel) */ -int npix; -double *mean, *sigma; /* (output) */ + /* flattened data array */ + /* bad pixel flags (!= 0 if bad pixel) */ + + /* (output) */ { float pixval; int i, ngoodpix = 0; @@ -526,8 +523,7 @@ int ngrow; /* number of pixels of growing */ static int -floatCompare (i,j) -float *i, *j; +floatCompare (float *i, float *j) { /* return ((int) (*i - *j + 0.5)); */ return ((*i <= *j) ? -1 : 1); From b4a58402ddab02e89065597b7c83f1c0e84f25bf Mon Sep 17 00:00:00 2001 From: Ole Streicher Date: Fri, 9 Aug 2024 17:17:37 +0200 Subject: [PATCH 16/21] protoize xgterm --- xgterm/button.c | 308 ++++++++++++++------------------ xgterm/charproc.c | 324 +++++++++++++-------------------- xgterm/cursor.c | 43 ++--- xgterm/gtermio.c | 60 +++---- xgterm/gtermio.h | 18 +- xgterm/input.c | 24 +-- xgterm/main.c | 101 ++++------- xgterm/menu.c | 435 ++++++++++++--------------------------------- xgterm/menu.h | 58 +++--- xgterm/misc.c | 235 ++++++++---------------- xgterm/ptyx.h | 8 +- xgterm/screen.c | 98 +++++----- xgterm/scrollbar.c | 73 ++------ xgterm/tabs.c | 18 +- xgterm/util.c | 125 +++++-------- 15 files changed, 687 insertions(+), 1241 deletions(-) diff --git a/xgterm/button.c b/xgterm/button.c index 4d44118..0876c01 100644 --- a/xgterm/button.c +++ b/xgterm/button.c @@ -42,7 +42,7 @@ button.c Handles button events in the terminal emulator. #include "menu.h" -extern void DoSecureKeyboard(); +extern void DoSecureKeyboard(Time time); #define KeyState(x) (((x) & (ShiftMask|ControlMask)) + (((x) & Mod1Mask) ? 2 : 0)) /* adds together the bits: @@ -60,19 +60,19 @@ extern void DoSecureKeyboard(); extern char *xgterm_name; -static void PointToRowCol(); -static void SelectionReceived(); -static void TrackDown(); -static void ComputeSelect(); -static void EditorButton(); -static void ExtendExtend(); -static void ReHiliteText(); -static void SelectSet(); -static void StartSelect(); -static int Length(); -static char *SaveText(); -void DisownSelection(); -void TrackText(); +static void PointToRowCol(int y, int x, int *r, int *c); +static void SelectionReceived(Widget w, XtPointer client_data, Atom *selection, Atom *type, XtPointer value, long unsigned int *length, int *format); +static void TrackDown(XButtonEvent *event); +static void ComputeSelect(int startRow, int startCol, int endRow, int endCol, int extend); +static void EditorButton(XButtonEvent *event); +static void ExtendExtend(int row, int col); +static void ReHiliteText(int frow, int fcol, int trow, int tcol); +static void SelectSet(Widget w, XEvent *event, String *params, Cardinal num_params); +static void StartSelect(int startrow, int startcol); +static int Length(TScreen *screen, int row, int scol, int ecol); +static char *SaveText(TScreen *screen, int row, int scol, int ecol, char *lp, int *eol); +void DisownSelection(XgtermWidget termw); +void TrackText(int frow, int fcol, int trow, int tcol); extern XgtermWidget term; @@ -110,9 +110,7 @@ static SelectUnit selectUnit; static int replyToEmacs; -Boolean SendMousePosition(w, event) -Widget w; -XEvent* event; +Boolean SendMousePosition(Widget w, XEvent *event) { TScreen *screen = &((XgtermWidget)w)->screen; @@ -168,11 +166,11 @@ XEvent* event; void -DiredButton(w, event, params, num_params) -Widget w; -XEvent *event; /* must be XButtonEvent */ -String *params; /* selections */ -Cardinal *num_params; +DiredButton(Widget w, XEvent *event, String *params, Cardinal *num_params) + + /* must be XButtonEvent */ + /* selections */ + { /* ^XM-G */ TScreen *screen = &term->screen; int pty = screen->respond; @@ -195,11 +193,11 @@ Cardinal *num_params; } void -ViButton(w, event, params, num_params) -Widget w; -XEvent *event; /* must be XButtonEvent */ -String *params; /* selections */ -Cardinal *num_params; +ViButton(Widget w, XEvent *event, String *params, Cardinal *num_params) + + /* must be XButtonEvent */ + /* selections */ + { /* ^XM-G */ TScreen *screen = &term->screen; int pty = screen->respond; @@ -227,11 +225,11 @@ Cardinal *num_params; } /*ARGSUSED*/ -void HandleSelectExtend(w, event, params, num_params) -Widget w; -XEvent *event; /* must be XMotionEvent */ -String *params; /* unused */ -Cardinal *num_params; /* unused */ +void HandleSelectExtend(Widget w, XEvent *event, String *params, Cardinal *num_params) + + /* must be XMotionEvent */ + /* unused */ + /* unused */ { TScreen *screen = &((XgtermWidget)w)->screen; int row, col; @@ -250,14 +248,14 @@ Cardinal *num_params; /* unused */ } } -static void EndExtend(); +static void EndExtend(Widget w, XEvent *event, String *params, Cardinal num_params, int use_cursor_loc); -static void do_select_end (w, event, params, num_params, use_cursor_loc) -Widget w; -XEvent *event; /* must be XButtonEvent */ -String *params; /* selections */ -Cardinal *num_params; -Bool use_cursor_loc; +static void do_select_end (Widget w, XEvent *event, String *params, Cardinal *num_params, int use_cursor_loc) + + /* must be XButtonEvent */ + /* selections */ + + { ((XgtermWidget)w)->screen.selection_time = event->xbutton.time; switch (eventMode) { @@ -272,21 +270,21 @@ Bool use_cursor_loc; } -void HandleSelectEnd(w, event, params, num_params) -Widget w; -XEvent *event; /* must be XButtonEvent */ -String *params; /* selections */ -Cardinal *num_params; +void HandleSelectEnd(Widget w, XEvent *event, String *params, Cardinal *num_params) + + /* must be XButtonEvent */ + /* selections */ + { do_select_end (w, event, params, num_params, False); } -void HandleKeyboardSelectEnd(w, event, params, num_params) -Widget w; -XEvent *event; /* must be XButtonEvent */ -String *params; /* selections */ -Cardinal *num_params; +void HandleKeyboardSelectEnd(Widget w, XEvent *event, String *params, Cardinal *num_params) + + /* must be XButtonEvent */ + /* selections */ + { do_select_end (w, event, params, num_params, True); } @@ -301,11 +299,11 @@ struct _SelectionList { }; -static void _GetSelection(w, time, params, num_params) -Widget w; -Time time; -String *params; /* selections in precedence order */ -Cardinal num_params; +static void _GetSelection(Widget w, Time time, String *params, Cardinal num_params) + + + /* selections in precedence order */ + { Atom selection; int cutbuffer; @@ -396,11 +394,11 @@ int *format; void -HandleInsertSelection(w, event, params, num_params) -Widget w; -XEvent *event; /* assumed to be XButtonEvent* */ -String *params; /* selections in precedence order */ -Cardinal *num_params; +HandleInsertSelection(Widget w, XEvent *event, String *params, Cardinal *num_params) + + /* assumed to be XButtonEvent* */ + /* selections in precedence order */ + { if (SendMousePosition(w, event)) return; _GetSelection(w, event->xbutton.time, params, *num_params); @@ -408,9 +406,7 @@ Cardinal *num_params; static void -SetSelectUnit(buttonDownTime, defaultUnit) - Time buttonDownTime; - SelectUnit defaultUnit; +SetSelectUnit(Time buttonDownTime, SelectUnit defaultUnit) { /* Do arithmetic as integers, but compare as unsigned solves clock wraparound */ if ((long unsigned)((long int)buttonDownTime - lastButtonUpTime) @@ -423,10 +419,10 @@ SetSelectUnit(buttonDownTime, defaultUnit) } } -static void do_select_start (w, event, startrow, startcol) -Widget w; -XEvent *event; /* must be XButtonEvent* */ -int startrow, startcol; +static void do_select_start (Widget w, XEvent *event, int startrow, int startcol) + + /* must be XButtonEvent* */ + { if (SendMousePosition(w, event)) return; SetSelectUnit(event->xbutton.time, SELECTCHAR); @@ -436,11 +432,11 @@ int startrow, startcol; /* ARGSUSED */ void -HandleSelectStart(w, event, params, num_params) -Widget w; -XEvent *event; /* must be XButtonEvent* */ -String *params; /* unused */ -Cardinal *num_params; /* unused */ +HandleSelectStart(Widget w, XEvent *event, String *params, Cardinal *num_params) + + /* must be XButtonEvent* */ + /* unused */ + /* unused */ { TScreen *screen = &((XgtermWidget)w)->screen; int startrow, startcol; @@ -454,11 +450,11 @@ Cardinal *num_params; /* unused */ /* ARGSUSED */ void -HandleKeyboardSelectStart(w, event, params, num_params) -Widget w; -XEvent *event; /* must be XButtonEvent* */ -String *params; /* unused */ -Cardinal *num_params; /* unused */ +HandleKeyboardSelectStart(Widget w, XEvent *event, String *params, Cardinal *num_params) + + /* must be XButtonEvent* */ + /* unused */ + /* unused */ { TScreen *screen = &((XgtermWidget)w)->screen; @@ -467,8 +463,7 @@ Cardinal *num_params; /* unused */ static void -TrackDown(event) - XButtonEvent *event; +TrackDown(XButtonEvent *event) { int startrow, startcol; @@ -490,8 +485,7 @@ TrackDown(event) x = screen->max_row; void -TrackMouse(func, startrow, startcol, firstrow, lastrow) - int func, startrow, startcol, firstrow, lastrow; +TrackMouse(int func, int startrow, int startcol, int firstrow, int lastrow) { TScreen *screen = &term->screen; @@ -510,8 +504,7 @@ TrackMouse(func, startrow, startcol, firstrow, lastrow) } static void -StartSelect(startrow, startcol) - int startrow, startcol; +StartSelect(int startrow, int startcol) { TScreen *screen = &term->screen; @@ -542,12 +535,12 @@ StartSelect(startrow, startcol) } static void -EndExtend(w, event, params, num_params, use_cursor_loc) - Widget w; - XEvent *event; /* must be XButtonEvent */ - String *params; /* selections */ - Cardinal num_params; - Bool use_cursor_loc; +EndExtend(Widget w, XEvent *event, String *params, Cardinal num_params, int use_cursor_loc) + + /* must be XButtonEvent */ + /* selections */ + + { int row, col; TScreen *screen = &term->screen; @@ -589,24 +582,16 @@ EndExtend(w, event, params, num_params, use_cursor_loc) } void -HandleSelectSet(w, event, params, num_params) - Widget w; - XEvent *event; - String *params; - Cardinal *num_params; +HandleSelectSet(Widget w, XEvent *event, String *params, Cardinal *num_params) { SelectSet (w, event, params, *num_params); } -static void SaltTextAway(); +static void SaltTextAway(int crow, int ccol, int row, int col, String *params, Cardinal num_params); /* ARGSUSED */ static void -SelectSet (w, event, params, num_params) - Widget w; - XEvent *event; - String *params; - Cardinal num_params; +SelectSet (Widget w, XEvent *event, String *params, Cardinal num_params) { /* Only do select stuff if non-null select */ if (startSRow != endSRow || startSCol != endSCol) { @@ -619,12 +604,12 @@ SelectSet (w, event, params, num_params) #define Abs(x) ((x) < 0 ? -(x) : (x)) /* ARGSUSED */ -static void do_start_extend (w, event, params, num_params, use_cursor_loc) -Widget w; -XEvent *event; /* must be XButtonEvent* */ -String *params; /* unused */ -Cardinal *num_params; /* unused */ -Bool use_cursor_loc; +static void do_start_extend (Widget w, XEvent *event, String *params, Cardinal *num_params, int use_cursor_loc) + + /* must be XButtonEvent* */ + /* unused */ + /* unused */ + { TScreen *screen = &((XgtermWidget)w)->screen; int row, col, coord; @@ -675,8 +660,7 @@ Bool use_cursor_loc; } static void -ExtendExtend (row, col) - int row, col; +ExtendExtend (int row, int col) { int coord = Coordinate(row, col); @@ -704,28 +688,26 @@ ExtendExtend (row, col) } -void HandleStartExtend(w, event, params, num_params) -Widget w; -XEvent *event; /* must be XButtonEvent* */ -String *params; /* unused */ -Cardinal *num_params; /* unused */ +void HandleStartExtend(Widget w, XEvent *event, String *params, Cardinal *num_params) + + /* must be XButtonEvent* */ + /* unused */ + /* unused */ { do_start_extend (w, event, params, num_params, False); } -void HandleKeyboardStartExtend(w, event, params, num_params) -Widget w; -XEvent *event; /* must be XButtonEvent* */ -String *params; /* unused */ -Cardinal *num_params; /* unused */ +void HandleKeyboardStartExtend(Widget w, XEvent *event, String *params, Cardinal *num_params) + + /* must be XButtonEvent* */ + /* unused */ + /* unused */ { do_start_extend (w, event, params, num_params, True); } void -ScrollSelection(screen, amount) -TScreen* screen; -int amount; +ScrollSelection(TScreen *screen, int amount) { int minrow = -screen->savedlines - screen->topline; int maxrow = screen->max_row - screen->topline; @@ -759,9 +741,7 @@ int amount; /*ARGSUSED*/ void -ResizeSelection (screen, rows, cols) - TScreen *screen; - int rows, cols; +ResizeSelection (TScreen *screen, int rows, int cols) { rows--; /* decr to get 0-max */ cols--; @@ -780,9 +760,9 @@ ResizeSelection (screen, rows, cols) } static void -PointToRowCol(y, x, r, c) - int y, x; - int *r, *c; +PointToRowCol(int y, int x, int *r, int *c) + + /* Convert pixel coordinates to character coordinates. Rows are clipped between firstValidRow and lastValidRow. Columns are clipped between to be 0 or greater, but are not clipped to some @@ -810,8 +790,7 @@ PointToRowCol(y, x, r, c) } static int -LastTextCol(row) - int row; +LastTextCol(int row) { TScreen *screen = &term->screen; int i; @@ -901,9 +880,9 @@ static int charClass[256] = { /* o/ u` u' u^ u: y' P y: */ 48, 48, 48, 48, 48, 48, 48, 48}; -int SetCharacterClassRange (low, high, value) - int low, high; /* in range of [0..255] */ - int value; /* arbitrary */ +int SetCharacterClassRange (int low, int high, int value) + /* in range of [0..255] */ + /* arbitrary */ { if (low < 0 || high > 255 || high < low) return (-1); @@ -919,9 +898,7 @@ int SetCharacterClassRange (low, high, value) */ static void -ComputeSelect(startRow, startCol, endRow, endCol, extend) - int startRow, startCol, endRow, endCol; - Bool extend; +ComputeSelect(int startRow, int startCol, int endRow, int endCol, int extend) { TScreen *screen = &term->screen; Char *ptr; @@ -1009,8 +986,8 @@ ComputeSelect(startRow, startCol, endRow, endCol, extend) return; } void -TrackText(frow, fcol, trow, tcol) - int frow, fcol, trow, tcol; +TrackText(int frow, int fcol, int trow, int tcol) + /* Guaranteed (frow, fcol) <= (trow, tcol) */ { int from, to; @@ -1054,8 +1031,8 @@ TrackText(frow, fcol, trow, tcol) } static void -ReHiliteText(frow, fcol, trow, tcol) - int frow, fcol, trow, tcol; +ReHiliteText(int frow, int fcol, int trow, int tcol) + /* Guaranteed that (frow, fcol) <= (trow, tcol) */ { TScreen *screen = &term->screen; @@ -1090,13 +1067,13 @@ ReHiliteText(frow, fcol, trow, tcol) } } -static void _OwnSelection(); +static void _OwnSelection(XgtermWidget termw, String *selections, Cardinal count); static void -SaltTextAway(crow, ccol, row, col, params, num_params) - /*register*/ int crow, ccol, row, col; - String *params; /* selections */ - Cardinal num_params; +SaltTextAway(int crow, int ccol, int row, int col, String *params, Cardinal num_params) + /*register*/ + /* selections */ + /* Guaranteed that (crow, ccol) <= (row, col), and that both points are valid (may have row = screen->max_row+1, col = 0) */ { @@ -1240,9 +1217,7 @@ int *format; } -static void LoseSelection(w, selection) - Widget w; - Atom *selection; +static void LoseSelection(Widget w, Atom *selection) { TScreen* screen = &((XgtermWidget)w)->screen; Atom* atomP; @@ -1282,18 +1257,13 @@ static void LoseSelection(w, selection) /* ARGSUSED */ -static void SelectionDone(w, selection, target) -Widget w; -Atom *selection, *target; +static void SelectionDone(Widget w, Atom *selection, Atom *target) { /* empty proc so Intrinsics know we want to keep storage */ } -static void _OwnSelection(termw, selections, count) - XgtermWidget termw; - String *selections; - Cardinal count; +static void _OwnSelection(XgtermWidget termw, String *selections, Cardinal count) { Atom* atoms = termw->screen.selection_atoms; int i; @@ -1344,8 +1314,7 @@ static void _OwnSelection(termw, selections, count) } void -DisownSelection(termw) - XgtermWidget termw; +DisownSelection(XgtermWidget termw) { Atom* atoms = termw->screen.selection_atoms; Cardinal count = termw->screen.selection_count; @@ -1377,9 +1346,7 @@ DisownSelection(termw) /* returns number of chars in line from scol to ecol out */ /* ARGSUSED */ static int -Length(screen, row, scol, ecol) - int row, scol, ecol; - TScreen *screen; +Length(TScreen *screen, int row, int scol, int ecol) { int lastcol = LastTextCol(row); @@ -1390,12 +1357,12 @@ Length(screen, row, scol, ecol) /* copies text into line, preallocated */ static char * -SaveText(screen, row, scol, ecol, lp, eol) - int row; - int scol, ecol; - TScreen *screen; - char *lp; /* pointer to where to put the text */ - int *eol; +SaveText(TScreen *screen, int row, int scol, int ecol, char *lp, int *eol) + + + + /* pointer to where to put the text */ + { int i = 0; Char *ch = screen->buf[4 * (row + screen->topline)]; @@ -1433,8 +1400,7 @@ SaveText(screen, row, scol, ecol, lp, eol) } static void -EditorButton(event) - XButtonEvent *event; +EditorButton(XButtonEvent *event) { TScreen *screen = &term->screen; int pty = screen->respond; @@ -1464,11 +1430,11 @@ EditorButton(event) /* ARGSUSED */ -void HandleSecure(w, event, params, param_count) - Widget w; - XEvent *event; /* unused */ - String *params; /* [0] = volume */ - Cardinal *param_count; /* 0 or 1 */ +void HandleSecure(Widget w, XEvent *event, String *params, Cardinal *param_count) + + /* unused */ + /* [0] = volume */ + /* 0 or 1 */ { Time time = CurrentTime; diff --git a/xgterm/charproc.c b/xgterm/charproc.c index cad9329..75f519b 100644 --- a/xgterm/charproc.c +++ b/xgterm/charproc.c @@ -94,7 +94,7 @@ extern jmp_buf VTend; extern XtAppContext app_con; extern Widget toplevel; -extern void exit(); +extern void exit(int); #ifndef X_NOT_STDC_ENV #include #else @@ -103,18 +103,18 @@ extern char *realloc(); #endif -static void VTallocbuf(); -static int finput(); -static void dotext(); -static void WriteText(); -static int in_put(); -static void do_read(), do_write(); -static void ToAlternate(); -static void FromAlternate(); -static void update_font_info(); +static void VTallocbuf(void); +static int finput(void); +static void dotext(TScreen *screen, unsigned int flags, char charset, char *buf, char *ptr, unsigned int fg, unsigned int bg); +static void WriteText(TScreen *screen, char *str, int len, unsigned int flags, unsigned int fg, unsigned int bg); +static int in_put(void); +static void do_read(XtPointer w, int *fd, XtInputId *id), do_write(XtPointer w, int *fd, XtInputId *id); +static void ToAlternate(TScreen *screen); +static void FromAlternate(TScreen *screen); +static void update_font_info(TScreen *screen, int doresize); -static void bitset(), bitclr(); -void ShowCursor(), HideCursor(); +static void bitset(unsigned int *p, int mask), bitclr(unsigned int *p, int mask); +void ShowCursor(void), HideCursor(void); #define DEFAULT -1 #define TEXT_BUF_SIZE 1024 @@ -255,31 +255,31 @@ extern int scstable[]; /* event handlers */ -extern void HandleKeyPressed(), HandleEightBitKeyPressed(); -extern void HandleStringEvent(); -extern void HandleEnterWindow(); -extern void HandleLeaveWindow(); -extern void HandleBellPropertyChange(); -extern void HandleFocusChange(); -static void HandleKeymapChange(); -extern void HandleInsertSelection(); -extern void HandleSelectStart(), HandleKeyboardSelectStart(); -extern void HandleSelectExtend(), HandleSelectSet(); -extern void HandleSelectEnd(), HandleKeyboardSelectEnd(); -extern void HandleStartExtend(), HandleKeyboardStartExtend(); -static void HandleBell(); -static void HandleVisualBell(); -static void HandleIgnore(); -extern void HandleSecure(); -extern void HandleScrollForward(); -extern void HandleScrollBack(); -extern void HandleCreateMenu(), HandlePopupMenu(); -extern void HandleSetFont(); -extern void SetVTFont(); - -extern void ViButton(), DiredButton(); -extern Boolean SendMousePosition(); -extern void ScrnSetAttributes(); +extern void HandleKeyPressed(Widget w, XEvent *event, String *params, Cardinal *nparams), HandleEightBitKeyPressed(Widget w, XEvent *event, String *params, Cardinal *nparams); +extern void HandleStringEvent(Widget w, XEvent *event, String *params, Cardinal *nparams); +extern void HandleEnterWindow(Widget w, caddr_t eventdata, XEnterWindowEvent *event); +extern void HandleLeaveWindow(Widget w, caddr_t eventdata, XEnterWindowEvent *event); +extern void HandleBellPropertyChange(Widget w, XtPointer data, XEvent *ev, Boolean *more); +extern void HandleFocusChange(Widget w, caddr_t eventdata, XFocusChangeEvent *event); +static void HandleKeymapChange(Widget w, XEvent *event, String *params, Cardinal *param_count); +extern void HandleInsertSelection(Widget w, XEvent *event, String *params, Cardinal *num_params); +extern void HandleSelectStart(Widget w, XEvent *event, String *params, Cardinal *num_params), HandleKeyboardSelectStart(Widget w, XEvent *event, String *params, Cardinal *num_params); +extern void HandleSelectExtend(Widget w, XEvent *event, String *params, Cardinal *num_params), HandleSelectSet(Widget w, XEvent *event, String *params, Cardinal *num_params); +extern void HandleSelectEnd(Widget w, XEvent *event, String *params, Cardinal *num_params), HandleKeyboardSelectEnd(Widget w, XEvent *event, String *params, Cardinal *num_params); +extern void HandleStartExtend(Widget w, XEvent *event, String *params, Cardinal *num_params), HandleKeyboardStartExtend(Widget w, XEvent *event, String *params, Cardinal *num_params); +static void HandleBell(Widget w, XEvent *event, String *params, Cardinal *param_count); +static void HandleVisualBell(Widget w, XEvent *event, String *params, Cardinal *param_count); +static void HandleIgnore(Widget w, XEvent *event, String *params, Cardinal *param_count); +extern void HandleSecure(Widget w, XEvent *event, String *params, Cardinal *param_count); +extern void HandleScrollForward(Widget gw, XEvent *event, String *params, Cardinal *nparams); +extern void HandleScrollBack(Widget gw, XEvent *event, String *params, Cardinal *nparams); +extern void HandleCreateMenu(Widget w, XEvent *event, String *params, Cardinal *param_count), HandlePopupMenu(Widget w, XEvent *event, String *params, Cardinal *param_count); +extern void HandleSetFont(Widget w, XEvent *event, String *params, Cardinal *param_count); +extern void SetVTFont(int i, int doresize, char *name1, char *name2); + +extern void ViButton(Widget w, XEvent *event, String *params, Cardinal *num_params), DiredButton(Widget w, XEvent *event, String *params, Cardinal *num_params); +extern Boolean SendMousePosition(Widget w, XEvent *event); +extern void ScrnSetAttributes(TScreen *screen, int row, int col, unsigned int mask, unsigned int value, int length); /* * NOTE: VTInitialize zeros out the entire ".screen" component of the @@ -629,13 +629,13 @@ static XtResource resources[] = { XtRBoolean, (XtPointer) &defaultFALSE}, }; -static void VTClassInit(); -static void VTInitialize(); -static void VTRealize(); -static void VTExpose(); -static void VTResize(); -static void VTDestroy(); -static Boolean VTSetValues(); +static void VTClassInit(void); +static void VTInitialize(Widget wrequest, Widget wnew, ArgList args, Cardinal *num_args); +static void VTRealize(Widget w, XtValueMask *valuemask, XSetWindowAttributes *values); +static void VTExpose(Widget w, XEvent *event, Region region); +static void VTResize(Widget w); +static void VTDestroy(Widget w); +static Boolean VTSetValues(Widget cur, Widget request, Widget new, ArgList args, Cardinal *num_args); #ifdef I18N static void VTInitI18N(); #endif @@ -680,14 +680,14 @@ static WidgetClassRec xgtermClassRec = { WidgetClass xgtermWidgetClass = (WidgetClass)&xgtermClassRec; -static void VTparse() +static void VTparse(void) { TScreen *screen = &term->screen; int *parsestate = groundtable; unsigned int c; unsigned char *cp; int row, col, top, bot, scstype; - extern int TrackMouse(); + extern int TrackMouse(int func, int startrow, int startcol, int firstrow, int lastrow); if(setjmp(vtjmpbuf)) parsestate = groundtable; @@ -1378,7 +1378,7 @@ static void VTparse() } } -static finput() +static finput(void) { return(doinput()); } @@ -1398,10 +1398,7 @@ static int pty_read_bytes = 0; /* Write data to the pty as typed by the user, pasted with the mouse, or generated by us in response to a query ESC sequence. */ -v_write(f, d, len) - int f; - char *d; - int len; +v_write(int f, char *d, int len) { int riten; int c = len; @@ -1561,7 +1558,7 @@ v_write(f, d, len) * been received from the client. */ static int -in_put() +in_put(void) { TScreen *screen = &term->screen; XtInputMask mask; @@ -1628,10 +1625,7 @@ in_put() * processed out of the buffer elsewhere. */ static void -do_read (w, fd, id) - XtPointer w; - int *fd; - XtInputId *id; +do_read (XtPointer w, int *fd, XtInputId *id) { TScreen *screen = &term->screen; @@ -1690,10 +1684,7 @@ do_read (w, fd, id) * queued and the output file is ready for writing. */ static void -do_write (w, fd, id) - XtPointer w; - int *fd; - XtInputId *id; +do_write (XtPointer w, int *fd, XtInputId *id) { v_write (*fd, 0, 0); } @@ -1701,8 +1692,7 @@ do_write (w, fd, id) /* init_ttyio -- Initialize tty i/o. Called by the main when the terminal * file descriptor has been obtained. */ -init_ttyio (pty) - int pty; +init_ttyio (int pty) { if (pty < 0) { Panic ("init_ttyio: invalid pty=%d\n", pty); @@ -1719,12 +1709,12 @@ init_ttyio (pty) * by charset. worry about end of line conditions (wraparound if selected). */ static void -dotext(screen, flags, charset, buf, ptr, fg, bg) - TScreen *screen; - unsigned flags, fg, bg; - char charset; - char *buf; /* start of characters to process */ - char *ptr; /* end */ +dotext(TScreen *screen, unsigned int flags, char charset, char *buf, char *ptr, unsigned int fg, unsigned int bg) + + + + /* start of characters to process */ + /* end */ { char *s; int len; @@ -1787,11 +1777,7 @@ dotext(screen, flags, charset, buf, ptr, fg, bg) * the current cursor position. update cursor position. */ static void -WriteText(screen, str, len, flags, fg, bg) - TScreen *screen; - char *str; - int len; - unsigned flags, fg, bg; +WriteText(TScreen *screen, char *str, int len, unsigned int flags, unsigned int fg, unsigned int bg) { int cx, cy; unsigned fgs = flags; @@ -1870,9 +1856,7 @@ WriteText(screen, str, len, flags, fg, bg) /* * process ANSI modes set, reset */ -ansi_modes(termw, func) - XgtermWidget termw; - int (*func)(); +ansi_modes(XgtermWidget termw, int (*func) (/* ??? */)) { int i; @@ -1893,9 +1877,7 @@ ansi_modes(termw, func) /* * process DEC private modes set, reset */ -dpmodes(termw, func) - XgtermWidget termw; - void (*func)(); +dpmodes(XgtermWidget termw, void (*func) (/* ??? */)) { TScreen *screen = &termw->screen; int i, j; @@ -2075,8 +2057,7 @@ dpmodes(termw, func) /* * process xgterm private modes save */ -savemodes(termw) - XgtermWidget termw; +savemodes(XgtermWidget termw) { TScreen *screen = &termw->screen; int i; @@ -2141,8 +2122,7 @@ savemodes(termw) /* * process xgterm private modes restore */ -restoremodes(termw) - XgtermWidget termw; +restoremodes(XgtermWidget termw) { TScreen *screen = &termw->screen; int i, j; @@ -2272,9 +2252,7 @@ restoremodes(termw) /* * set a bit in a word given a pointer to the word and a mask. */ -static void bitset(p, mask) - unsigned *p; - int mask; +static void bitset(unsigned int *p, int mask) { *p |= mask; } @@ -2282,16 +2260,12 @@ static void bitset(p, mask) /* * clear a bit in a word given a pointer to the word and a mask. */ -static void bitclr(p, mask) - unsigned *p; - int mask; +static void bitclr(unsigned int *p, int mask) { *p &= ~mask; } -unparseseq(ap, fd) - ANSI *ap; - int fd; +unparseseq(ANSI *ap, int fd) { int c; int i; @@ -2322,9 +2296,7 @@ unparseseq(ap, fd) } } -unparseputn(n, fd) -unsigned int n; -int fd; +unparseputn(unsigned int n, int fd) { unsigned int q; @@ -2334,9 +2306,7 @@ int fd; unparseputc((char) ('0' + (n%10)), fd); } -unparseputc(c, fd) -char c; -int fd; +unparseputc(char c, int fd) { char buf[2]; int i = 1; @@ -2349,22 +2319,19 @@ int fd; v_write(fd, buf, i); } -unparsefputs (s, fd) - char *s; - int fd; +unparsefputs (char *s, int fd) { if (s) { while (*s) unparseputc (*s++, fd); } } -static void SwitchBufs(); +static void SwitchBufs(TScreen *screen); static void -ToAlternate(screen) -TScreen *screen; +ToAlternate(TScreen *screen) { - extern ScrnBuf Allocate(); + extern ScrnBuf Allocate(int nrow, int ncol, Char **addr); if(screen->alternate) return; @@ -2377,8 +2344,7 @@ TScreen *screen; } static void -FromAlternate(screen) -TScreen *screen; +FromAlternate(TScreen *screen) { if(!screen->alternate) return; @@ -2388,8 +2354,7 @@ TScreen *screen; } static void -SwitchBufs(screen) - TScreen *screen; +SwitchBufs(TScreen *screen) { int rows, top; @@ -2431,8 +2396,7 @@ SwitchBufs(screen) /* swap buffer line pointers between alt and regular screens */ -SwitchBufPtrs(screen) - TScreen *screen; +SwitchBufPtrs(TScreen *screen) { int rows = screen->max_row + 1; char *save [4 * MAX_ROWS]; @@ -2443,7 +2407,7 @@ SwitchBufPtrs(screen) memmove( (char *)screen->altbuf, (char *)save, 4 * sizeof(char *) * rows); } -VTRun() +VTRun(void) { TScreen *screen = &term->screen; int i; @@ -2483,10 +2447,7 @@ VTRun() } /*ARGSUSED*/ -static void VTExpose(w, event, region) - Widget w; - XEvent *event; - Region region; +static void VTExpose(Widget w, XEvent *event, Region region) { TScreen *screen = &term->screen; @@ -2498,8 +2459,7 @@ static void VTExpose(w, event, region) HandleExposure (screen, event); } -static void VTGraphicsOrNoExpose (event) - XEvent *event; +static void VTGraphicsOrNoExpose (XEvent *event) { TScreen *screen = &term->screen; if (screen->incopy <= 0) { @@ -2521,11 +2481,11 @@ static void VTGraphicsOrNoExpose (event) } /*ARGSUSED*/ -static void VTNonMaskableEvent (w, closure, event, cont) -Widget w; /* unused */ -XtPointer closure; /* unused */ -XEvent *event; -Boolean *cont; /* unused */ +static void VTNonMaskableEvent (Widget w, XtPointer closure, XEvent *event, Boolean *cont) + /* unused */ + /* unused */ + + /* unused */ { switch (event->type) { case GraphicsExpose: @@ -2538,8 +2498,7 @@ Boolean *cont; /* unused */ -static void VTResize(w) - Widget w; +static void VTResize(Widget w) { if (XtIsRealized(w)) ScreenResize (&term->screen, term->core.width, term->core.height, @@ -2553,7 +2512,7 @@ static String xgterm_trans = "WM_PROTOCOLS: DeleteWindow()\n\ : KeyboardMapping()\n"; -int VTInit () +int VTInit (void) { TScreen *screen = &term->screen; Widget vtparent = term->core.parent; @@ -2567,11 +2526,11 @@ int VTInit () return (1); } -static void VTallocbuf () +static void VTallocbuf (void) { TScreen *screen = &term->screen; int nrows = screen->max_row + 1; - extern ScrnBuf Allocate(); + extern ScrnBuf Allocate(int nrow, int ncol, Char **addr); /* allocate screen buffer now, if necessary. */ if (screen->scrollWidget) @@ -2585,7 +2544,7 @@ static void VTallocbuf () return; } -static void VTClassInit () +static void VTClassInit (void) { XtAddConverter(XtRString, XtRGravity, XmuCvtStringToGravity, (XtConvertArgList) NULL, (Cardinal) 0); @@ -2593,10 +2552,7 @@ static void VTClassInit () /* ARGSUSED */ -static void VTInitialize (wrequest, wnew, args, num_args) - Widget wrequest, wnew; - ArgList args; - Cardinal *num_args; +static void VTInitialize (Widget wrequest, Widget wnew, ArgList args, Cardinal *num_args) { XgtermWidget request = (XgtermWidget) wrequest; XgtermWidget new = (XgtermWidget) wnew; @@ -2705,17 +2661,13 @@ static void VTInitialize (wrequest, wnew, args, num_args) } -static void VTDestroy (w) -Widget w; +static void VTDestroy (Widget w) { XtFree(((XgtermWidget)w)->screen.selection); } /*ARGSUSED*/ -static void VTRealize (w, valuemask, values) - Widget w; - XtValueMask *valuemask; - XSetWindowAttributes *values; +static void VTRealize (Widget w, XtValueMask *valuemask, XSetWindowAttributes *values) { unsigned int width, height; TScreen *screen = &term->screen; @@ -3011,10 +2963,7 @@ static void VTInitI18N() #endif -static Boolean VTSetValues (cur, request, new, args, num_args) - Widget cur, request, new; - ArgList args; - Cardinal *num_args; +static Boolean VTSetValues (Widget cur, Widget request, Widget new, ArgList args, Cardinal *num_args) { XgtermWidget curvt = (XgtermWidget) cur; XgtermWidget newvt = (XgtermWidget) new; @@ -3074,7 +3023,7 @@ static Boolean VTSetValues (cur, request, new, args, num_args) * Shows cursor at new cursor position in screen. */ void -ShowCursor() +ShowCursor(void) { TScreen *screen = &term->screen; int x, y, flags; @@ -3193,7 +3142,7 @@ ShowCursor() * hide cursor at previous cursor position in screen. */ void -HideCursor() +HideCursor(void) { TScreen *screen = &term->screen; GC currentGC; @@ -3262,8 +3211,7 @@ HideCursor() screen->cursor_state = OFF; } -VTReset(full) - Boolean full; +VTReset(Boolean full) { TScreen *screen = &term->screen; @@ -3335,8 +3283,7 @@ VTReset(full) * and sets the indicated ranges to the indicated values. */ -int set_character_class (s) - char *s; +int set_character_class (char *s) { int i; /* iterator, index into s */ int len; /* length of s */ @@ -3432,11 +3379,7 @@ int set_character_class (s) } /* ARGSUSED */ -static void HandleKeymapChange(w, event, params, param_count) - Widget w; - XEvent *event; - String *params; - Cardinal *param_count; +static void HandleKeymapChange(Widget w, XEvent *event, String *params, Cardinal *param_count) { static XtTranslations keymap, original; static XtResource key_resources[] = { @@ -3465,11 +3408,11 @@ static void HandleKeymapChange(w, event, params, param_count) /* ARGSUSED */ -static void HandleBell(w, event, params, param_count) - Widget w; - XEvent *event; /* unused */ - String *params; /* [0] = volume */ - Cardinal *param_count; /* 0 or 1 */ +static void HandleBell(Widget w, XEvent *event, String *params, Cardinal *param_count) + + /* unused */ + /* [0] = volume */ + /* 0 or 1 */ { int percent = (*param_count) ? atoi(params[0]) : 0; @@ -3478,22 +3421,22 @@ static void HandleBell(w, event, params, param_count) /* ARGSUSED */ -static void HandleVisualBell(w, event, params, param_count) - Widget w; - XEvent *event; /* unused */ - String *params; /* unused */ - Cardinal *param_count; /* unused */ +static void HandleVisualBell(Widget w, XEvent *event, String *params, Cardinal *param_count) + + /* unused */ + /* unused */ + /* unused */ { VisualBell(); } /* ARGSUSED */ -static void HandleIgnore(w, event, params, param_count) - Widget w; - XEvent *event; /* unused */ - String *params; /* unused */ - Cardinal *param_count; /* unused */ +static void HandleIgnore(Widget w, XEvent *event, String *params, Cardinal *param_count) + + /* unused */ + /* unused */ + /* unused */ { /* do nothing, but check for funny escape sequences */ (void) SendMousePosition(w, event); @@ -3502,13 +3445,7 @@ static void HandleIgnore(w, event, params, param_count) /* ARGSUSED */ static void -DoSetSelectedFont(w, client_data, selection, type, value, length, format) - Widget w; - XtPointer client_data; - Atom *selection, *type; - XtPointer value; - unsigned long *length; - int *format; +DoSetSelectedFont(Widget w, XtPointer client_data, Atom *selection, Atom *type, XtPointer value, long unsigned int *length, int *format) { char *val = (char *)value; int len; @@ -3530,9 +3467,7 @@ DoSetSelectedFont(w, client_data, selection, type, value, length, format) } } -void FindFontSelection (atom_name, justprobe) - char *atom_name; - Bool justprobe; +void FindFontSelection (char *atom_name, int justprobe) { static AtomPtr *atoms; static int atomCount = 0; @@ -3565,11 +3500,11 @@ void FindFontSelection (atom_name, justprobe) /* ARGSUSED */ -void HandleSetFont(w, event, params, param_count) - Widget w; - XEvent *event; /* unused */ - String *params; /* unused */ - Cardinal *param_count; /* unused */ +void HandleSetFont(Widget w, XEvent *event, String *params, Cardinal *param_count) + + /* unused */ + /* unused */ + /* unused */ { int fontnum; char *name1 = NULL, *name2 = NULL; @@ -3620,10 +3555,7 @@ void HandleSetFont(w, event, params, param_count) } -void SetVTFont (i, doresize, name1, name2) - int i; - Bool doresize; - char *name1, *name2; +void SetVTFont (int i, int doresize, char *name1, char *name2) { TScreen *screen = &term->screen; @@ -3643,11 +3575,7 @@ void SetVTFont (i, doresize, name1, name2) } -int LoadNewFont (screen, nfontname, bfontname, doresize, fontnum) - TScreen *screen; - char *nfontname, *bfontname; - Bool doresize; - int fontnum; +int LoadNewFont (TScreen *screen, char *nfontname, char *bfontname, int doresize, int fontnum) { XFontStruct *nfs = NULL, *bfs = NULL; XGCValues xgcv; @@ -3756,9 +3684,7 @@ int LoadNewFont (screen, nfontname, bfontname, doresize, fontnum) } static void -update_font_info (screen, doresize) - TScreen *screen; - Bool doresize; +update_font_info (TScreen *screen, int doresize) { int i, j, width, height, scrollbar_width; @@ -3798,8 +3724,7 @@ update_font_info (screen, doresize) set_vt_box (screen); } -set_vt_box (screen) - TScreen *screen; +set_vt_box (TScreen *screen) { XPoint *vp; @@ -3812,8 +3737,7 @@ set_vt_box (screen) } -set_cursor_gcs (screen) - TScreen *screen; +set_cursor_gcs (TScreen *screen) { XGCValues xgcv; unsigned long mask; diff --git a/xgterm/cursor.c b/xgterm/cursor.c index c6de77d..b18fef5 100644 --- a/xgterm/cursor.c +++ b/xgterm/cursor.c @@ -29,8 +29,7 @@ #include "ptyx.h" /* also gets Xlib.h */ -static void _CheckSelection(screen) -TScreen *screen; +static void _CheckSelection(TScreen *screen) { extern XgtermWidget term; /* %%% gross */ @@ -48,10 +47,7 @@ TScreen *screen; * (this includes scrolling regions) * The origin is considered to be 0, 0 for this procedure. */ -CursorSet(screen, row, col, flags) -TScreen *screen; -int row, col; -unsigned flags; +CursorSet(TScreen *screen, int row, int col, unsigned int flags) { int maxr; @@ -71,9 +67,7 @@ unsigned flags; /* * moves the cursor left n, no wrap around */ -CursorBack(screen, n) -TScreen *screen; -int n; +CursorBack(TScreen *screen, int n) { int i, j, k, rev; extern XgtermWidget term; @@ -100,9 +94,7 @@ int n; /* * moves the cursor forward n, no wraparound */ -CursorForward(screen, n) -TScreen *screen; -int n; +CursorForward(TScreen *screen, int n) { screen->cur_col += n; if (screen->cur_col > screen->max_col) @@ -115,9 +107,7 @@ int n; * moves the cursor down n, no scrolling. * Won't pass bottom margin or bottom of screen. */ -CursorDown(screen, n) -TScreen *screen; -int n; +CursorDown(TScreen *screen, int n) { int max; @@ -135,9 +125,7 @@ int n; * moves the cursor up n, no linestarving. * Won't pass top margin or top of screen. */ -CursorUp(screen, n) -TScreen *screen; -int n; +CursorUp(TScreen *screen, int n) { int min; @@ -156,9 +144,7 @@ int n; * Won't leave scrolling region. No carriage return. */ void -Index(screen, amount) -TScreen *screen; -int amount; +Index(TScreen *screen, int amount) { int j; @@ -181,9 +167,7 @@ int amount; * Won't leave scrolling region. No carriage return. */ void -RevIndex(screen, amount) -TScreen *screen; -int amount; +RevIndex(TScreen *screen, int amount) { /* * reverse indexing when above scrolling region is cursor up. @@ -202,8 +186,7 @@ int amount; /* * Moves Cursor To First Column In Line */ -CarriageReturn(screen) -TScreen *screen; +CarriageReturn(TScreen *screen) { screen->cur_col = 0; screen->do_wrap = 0; @@ -213,9 +196,7 @@ TScreen *screen; /* * Save Cursor and Attributes */ -CursorSave(term, sc) -XgtermWidget term; -SavedCursor *sc; +CursorSave(XgtermWidget term, SavedCursor *sc) { TScreen *screen = &term->screen; @@ -230,9 +211,7 @@ SavedCursor *sc; /* * Restore Cursor and Attributes */ -CursorRestore(term, sc) -XgtermWidget term; -SavedCursor *sc; +CursorRestore(XgtermWidget term, SavedCursor *sc) { TScreen *screen = &term->screen; diff --git a/xgterm/gtermio.c b/xgterm/gtermio.c index 451e9e1..108b1de 100644 --- a/xgterm/gtermio.c +++ b/xgterm/gtermio.c @@ -212,18 +212,18 @@ typedef Request *RequestPtr; static RequestPtr request_head = NULL; static RequestPtr request_tail = NULL; -static int gio_reset(int, GtermWidget, char *); -static int gio_setginmodeterm(); -static int gio_output(); -static int gio_clear(); -static int gio_retcursor(), gio_queue_output(), gio_queue_request(); -static int gio_hardreset(), gio_activate(), gio_enable(), gio_tekmode(); -static int gio_processdata(), gio_ptyinput(), gio_escape(), gio_status(); -static int gio_activate_cb(); -static int gio_connect_cb(); -static int gio_deactivate_cb(); -static void gio_keyinput(), gio_resize(); -static void pl_decodepts(), gio_retenq(); +static void gio_reset(int, GtermWidget, char *); +static int gio_setginmodeterm(int dummy, char *str); +static int gio_output(void); +static int gio_clear(int dummy); +static int gio_retcursor(int key, int sx, int sy, int raster, int rx, int ry, int datalen), gio_queue_output(int fd, XtPointer tcl, char *objname, int key, char *strval), gio_queue_request(int sx, int sy, int raster, int rx, int ry, int key, char *strval); +static int gio_hardreset(int dummy), gio_activate(int dummy, int state), gio_enable(int dummy, int onoff), gio_tekmode(int dummy, int onoff); +static int gio_processdata(void), gio_ptyinput(int notused, char *ttybuf, int nchars), gio_escape(void), gio_status(int dummy, char *app_name, char *app_class); +static int gio_activate_cb(int dummy, Widget w, int state); +static int gio_connect_cb(int dummy, Display *display, Widget toplevel, int state); +static int gio_deactivate_cb(int dummy, Widget w, int state); +static void gio_keyinput(XtPointer notused, Widget w, XEvent *event), gio_resize(XtPointer notused, Widget w); +static void pl_decodepts(void), gio_retenq(void); /* Externally callable routines. */ static struct GT_function gio_functions[] = { @@ -240,9 +240,9 @@ static struct GT_function gio_functions[] = { /* Translation to hook Tek menu to gterm widget. */ -extern void HandlePopupMenu(); -extern void DeleteWindow(); -extern char *gtermio_getResource(); +extern void HandlePopupMenu(Widget w, XEvent *event, String *params, Cardinal *param_count); +extern void DeleteWindow(Widget w, XEvent *event, String *params, Cardinal *num_params); +extern char *gtermio_getResource(char *name); static Atom wm_delete_window = 0; /* for ICCCM delete window */ static char *gio_shellTrans = @@ -438,7 +438,7 @@ gio_connect_cb (int dummy, Display *display, Widget toplevel, int state) { if (state) { extern Widget term; - extern char *mktemp(); + extern char *mktemp(char *); XrmDatabase db1, db2; char *fname, buf[256]; @@ -1637,12 +1637,12 @@ gio_keyinput (XtPointer notused, Widget w, XEvent *event) * processing routine. */ static int -gio_retcursor (key, sx, sy, raster, rx, ry, datalen) -int key; /* key (or whatever) typed to trigger read */ -int sx, sy; /* screen coords of event */ -int raster; /* raster number */ -int rx, ry; /* raster coords of event */ -int datalen; /* nchars of data following cursor value */ +gio_retcursor (int key, int sx, int sy, int raster, int rx, int ry, int datalen) + /* key (or whatever) typed to trigger read */ + /* screen coords of event */ + /* raster number */ + /* raster coords of event */ + /* nchars of data following cursor value */ { int n=0, mc_x, mc_y; char curval[20]; @@ -1701,7 +1701,7 @@ int datalen; /* nchars of data following cursor value */ /* GIO_RETENQ -- Respond to the ESC ENQ request. */ static void -gio_retenq() +gio_retenq(void) { int mc_x, mc_y; char curval[7]; @@ -1751,7 +1751,7 @@ static struct _esc **e_pcand, **e_acand; /* candidates arrays */ static int e_npcand, e_nacand; /* number of candidates */ static int e_charno; /* char being examined */ static int scanok; /* clr if decode fails */ -static int startscan(), getint(), getstr(), endscan(); +static int startscan(void), getint(int *value), getstr(char *value), endscan(void); static struct _esc e_table[] = { #include "gtermio.esc" /* Gterm escape sequence table */ @@ -1775,7 +1775,7 @@ static struct _esc e_table[] = { * screen. */ static int -gio_escape() +gio_escape(void) { struct _esc *esc; int ch, i, j; @@ -2505,7 +2505,7 @@ gio_escape() /* STARTSCAN -- Reset the scanok flag at the start of a scan. */ static int -startscan() +startscan(void) { int ch; @@ -2526,8 +2526,7 @@ startscan() * if a decode error occurs. */ static int -getint (value) -int *value; +getint (int *value) { int ch; int v; @@ -2579,8 +2578,7 @@ int *value; * if a decode error occurs. */ static int -getstr (value) -char *value; +getstr (char *value) { int ch; char *op = value; @@ -2615,7 +2613,7 @@ char *value; /* ENDSCAN -- Scan forward to the ']' input argument list delimiter. */ static int -endscan() +endscan(void) { int ch; diff --git a/xgterm/gtermio.h b/xgterm/gtermio.h index ef61375..538db91 100644 --- a/xgterm/gtermio.h +++ b/xgterm/gtermio.h @@ -7,12 +7,12 @@ struct GT_function { XtPointer data; /* callback data */ }; -void gt_deactivate(); -void gt_activate(); -int gt_flush(); -int gt_tekmode(); -int gt_activated(); -int gt_status(); -void gtermio_register(); -void gtermio_open_workstation(); -void gtermio_close_workstation(); +void gt_deactivate(void); +void gt_activate(void); +int gt_flush(void); +int gt_tekmode(int state); +int gt_activated(void); +int gt_status(void); +void gtermio_register(struct GT_function *functions, int nfunc); +void gtermio_open_workstation(void); +void gtermio_close_workstation(void); diff --git a/xgterm/input.c b/xgterm/input.c index 34d2ad9..f3b83b8 100644 --- a/xgterm/input.c +++ b/xgterm/input.c @@ -57,12 +57,11 @@ static char *kypd_apl = " ABCDEFGHIJKLMNOPQRSTUVWXYZ??????abcdefghijklmnopqrstuvwxyzXXX"; static char *cur = "DACB"; -static int funcvalue(), sunfuncvalue(); +static int funcvalue(int keycode), sunfuncvalue(int keycode); extern Boolean sunFunctionKeys; static void -AdjustAfterInput (screen) -TScreen *screen; +AdjustAfterInput (TScreen *screen) { if(screen->scrollkey && screen->topline != 0) WindowScroll(screen, 0); @@ -83,11 +82,7 @@ TScreen *screen; } void -Input (keyboard, screen, event, eightbit) - TKeyboard *keyboard; - TScreen *screen; - XKeyEvent *event; - Bool eightbit; +Input (TKeyboard *keyboard, TScreen *screen, XKeyEvent *event, int eightbit) { #ifdef I18N @@ -186,10 +181,7 @@ Input (keyboard, screen, event, eightbit) return; } -StringInput (screen, string, nbytes) - TScreen *screen; - char *string; - int nbytes; +StringInput (TScreen *screen, char *string, int nbytes) { int pty = screen->respond; @@ -198,8 +190,7 @@ StringInput (screen, string, nbytes) AdjustAfterInput(screen); } -static int funcvalue (keycode) - int keycode; +static int funcvalue (int keycode) { switch (keycode) { case XK_F1: return(11); @@ -239,9 +230,8 @@ static int funcvalue (keycode) } -static int sunfuncvalue (keycode) - int keycode; - { +static int sunfuncvalue (int keycode) +{ switch (keycode) { case XK_F1: return(224); case XK_F2: return(225); diff --git a/xgterm/main.c b/xgterm/main.c index 3043009..434a00d 100644 --- a/xgterm/main.c +++ b/xgterm/main.c @@ -450,7 +450,7 @@ int Ptyfd; #define SIGNAL_RETURN return #endif -SIGNAL_T Exit(); +SIGNAL_T Exit(int n); #ifndef X_NOT_POSIX #include @@ -476,16 +476,16 @@ extern void exit(); extern char *ttyname(); #endif -extern char *ptsname(); +extern char *ptsname(int); -extern char *strindex (); -extern void HandlePopupMenu(); -extern void gtermio_connect(); -extern void resize(); +extern char *strindex (char *s1, char *s2); +extern void HandlePopupMenu(Widget w, XEvent *event, String *params, Cardinal *param_count); +extern void gtermio_connect(int notused, Display *display, Widget toplevel, int state); +extern void resize(TScreen *screen, char *TermName, char *oldtc, char *newtc); int switchfb[] = {0, 2, 1, 3}; -static SIGNAL_T reapchild (); +static SIGNAL_T reapchild (int n); static Bool added_utmp_entry = False; static char **command_to_exec; @@ -524,7 +524,7 @@ static struct jtchars d_jtc = { #endif /* sony */ #endif /* USE_SYSV_TERMIO */ -static int parse_tty_modes (); +static int parse_tty_modes (char *s, struct _xttymodes *modelist); /* * SYSV has the termio.c_cc[V] and ltchars; BSD has tchars and ltchars; * SVR4 has only termio.c_cc, but it includes everything from ltchars. @@ -604,7 +604,7 @@ extern void setpwent(); extern void endpwent(); #endif -extern struct passwd *fgetpwent(); +extern struct passwd *fgetpwent(FILE *); #else /* not USE_SYSV_UTMP */ static char etc_utmp[] = UTMP_FILENAME; #ifdef LASTLOG @@ -887,8 +887,7 @@ get_termcap(char *name, char *buffer, char *resized) } -static void Syntax (badOption) - char *badOption; +static void Syntax (char *badOption) { struct _options *opt; int col; @@ -913,7 +912,7 @@ static void Syntax (badOption) exit (1); } -static void Help () +static void Help (void) { struct _options *opt; char **cpp; @@ -938,12 +937,7 @@ static void Help () #if defined(TIOCCONS) || defined(SRIOCSREDIR) /* ARGSUSED */ static Boolean -ConvertConsoleSelection(w, selection, target, type, value, length, format) - Widget w; - Atom *selection, *target, *type; - XtPointer *value; - unsigned long *length; - int *format; +ConvertConsoleSelection(Widget w, Atom *selection, Atom *target, Atom *type, XtPointer *value, long unsigned int *length, int *format) { /* we don't save console output, so can't offer it */ return False; @@ -963,19 +957,15 @@ XtAppContext app_con; Widget toplevel; Bool waiting_for_initial_map; -extern void do_hangup(); -extern void xt_error(); +extern void do_hangup(Widget gw, caddr_t closure, caddr_t data); +__attribute__((noreturn)) void xt_error(String message); /* * DeleteWindow(): Action proc to implement ICCCM delete_window. */ /* ARGSUSED */ void -DeleteWindow(w, event, params, num_params) - Widget w; - XEvent *event; - String *params; - Cardinal *num_params; +DeleteWindow(Widget w, XEvent *event, String *params, Cardinal *num_params) { if (w == toplevel) if (term->screen.Tshow) @@ -991,11 +981,7 @@ DeleteWindow(w, event, params, num_params) /* ARGSUSED */ void -KeyboardMapping(w, event, params, num_params) - Widget w; - XEvent *event; - String *params; - Cardinal *num_params; +KeyboardMapping(Widget w, XEvent *event, String *params, Cardinal *num_params) { switch (event->type) { case MappingNotify: @@ -1013,15 +999,13 @@ Atom wm_delete_window; int -main (argc, argv) -int argc; -char **argv; +main (int argc, char **argv) { TScreen *screen; int pty; int Xsocket, mode; - char *base_name(); - int xerror(), xioerror(); + char *base_name(char *name); + int xerror(Display *display, XErrorEvent *event), xioerror(Display *dpy); #ifdef I18N setlocale(LC_ALL, NULL); @@ -1502,8 +1486,7 @@ char **argv; VTRun(); } -char *base_name(name) -char *name; +char *base_name(char *name) { char *cp; @@ -1847,8 +1830,7 @@ get_pty (pty) * a functional interface for allocating a pty. * Returns 0 if found a pty, 1 if fails. */ -int pty_search(pty) - int *pty; +int pty_search(int *pty) { static int devindex, letter = 0; @@ -1901,7 +1883,7 @@ int pty_search(pty) return 1; } -get_terminal () +get_terminal (void) /* * sets up X and initializes the terminal structure except for term.buf.fildes. */ @@ -1957,8 +1939,7 @@ static char *vtterm[] = { }; /* ARGSUSED */ -SIGNAL_T hungtty(i) - int i; +SIGNAL_T hungtty(int i) { longjmp(env, 1); SIGNAL_RETURN; @@ -1995,9 +1976,7 @@ typedef struct { */ void -HsSysError(pf, error) -int pf; -int error; +HsSysError(int pf, int error) { handshake_t handshake; @@ -2012,7 +1991,7 @@ int error; static int pc_pipe[2]; /* this pipe is used for parent to child transfer */ static int cp_pipe[2]; /* this pipe is used for child to parent transfer */ -void first_map_occurred () +void first_map_occurred (void) { handshake_t handshake; TScreen *screen = &term->screen; @@ -2235,7 +2214,7 @@ spawn(void) #endif /* USE_LASTLOG */ #endif /* HAVE_UTMP */ #endif /* !USE_UTEMPTER */ - char *x_basename(); + char *x_basename(char *name); /* Noisy compilers (suppress some unused-variable warnings) */ (void) rc; @@ -4957,8 +4936,7 @@ spawn () SIGNAL_T -Exit(n) - int n; +Exit(int n) { TScreen *screen = &term->screen; int pty = term->screen.respond; /* file descriptor of pty */ @@ -5068,10 +5046,7 @@ Exit(n) /* ARGSUSED */ void -resize(screen, TermName, oldtc, newtc) -TScreen *screen; -char *TermName; -char *oldtc, *newtc; +resize(TScreen *screen, char *TermName, char *oldtc, char *newtc) { #ifndef USE_SYSV_ENVVARS char *ptr1, *ptr2; @@ -5116,7 +5091,7 @@ char *oldtc, *newtc; * Returns the pid of the child, or 0 or -1 if none or error. */ int -nonblocking_wait() +nonblocking_wait(void) { #ifdef USE_POSIX_WAIT pid_t pid; @@ -5138,8 +5113,7 @@ nonblocking_wait() } /* ARGSUSED */ -static SIGNAL_T reapchild (n) - int n; +static SIGNAL_T reapchild (int n) { int pid; @@ -5165,9 +5139,7 @@ static SIGNAL_T reapchild (n) int -remove_termcap_entry (buf, str) - char *buf; - char *str; +remove_termcap_entry (char *buf, char *str) { char *strinbuf; @@ -5194,9 +5166,7 @@ remove_termcap_entry (buf, str) * where setting consists of the words in the modelist followed by a character * or ^char. */ -static int parse_tty_modes (s, modelist) - char *s; - struct _xttymodes *modelist; +static int parse_tty_modes (char *s, struct _xttymodes *modelist) { struct _xttymodes *mp; int c; @@ -5229,8 +5199,7 @@ static int parse_tty_modes (s, modelist) } -int GetBytesAvailable (fd) - int fd; +int GetBytesAvailable (int fd) { #ifdef FIONREAD static long arg; @@ -5253,9 +5222,7 @@ int GetBytesAvailable (fd) everybody who used to call killpg() */ int -kill_process_group(pid, sig) - int pid; - int sig; +kill_process_group(int pid, int sig) { #ifndef X_NOT_POSIX return kill (-pid, sig); diff --git a/xgterm/menu.c b/xgterm/menu.c index b08bbd7..d1bb763 100644 --- a/xgterm/menu.c +++ b/xgterm/menu.c @@ -39,26 +39,26 @@ in this Software without prior written authorization from the X Consortium. #include #include -extern void FindFontSelection(); +extern void FindFontSelection(char *atom_name, int justprobe); Arg menuArgs[2] = {{ XtNleftBitmap, (XtArgVal) 0 }, { XtNsensitive, (XtArgVal) 0 }}; -void do_hangup(); +void do_hangup(Widget gw, caddr_t closure, caddr_t data); -static void do_securekbd(), do_allowsends(), do_visualbell(), +static void do_securekbd(Widget gw, caddr_t closure, caddr_t data), do_allowsends(Widget gw, caddr_t closure, caddr_t data), do_visualbell(Widget gw, caddr_t closure, caddr_t data), #ifdef ALLOWLOGGING - do_logging(), + do_logging(Widget gw, caddr_t closure, caddr_t data), #endif - do_redraw(), do_suspend(), do_continue(), do_interrupt(), - do_terminate(), do_kill(), do_quit(), do_scrollbar(), do_jumpscroll(), - do_reversevideo(), do_autowrap(), do_reversewrap(), do_autolinefeed(), - do_appcursor(), do_appkeypad(), do_scrollkey(), do_scrollttyoutput(), - do_allow132(), do_cursesemul(), do_marginbell(), do_altscreen(), - do_softreset(), do_hardreset(), do_clearsavedlines(), - do_vthide(), do_vtshow(), do_vtmode(), do_vtfont(), - do_gioenable(), do_tekshow(), do_tekmode(), do_tekpage(), - do_tekreset(), do_tekcopy(), do_tekhide(), do_colortext(); + do_redraw(Widget gw, caddr_t closure, caddr_t data), do_suspend(Widget gw, caddr_t closure, caddr_t data), do_continue(Widget gw, caddr_t closure, caddr_t data), do_interrupt(Widget gw, caddr_t closure, caddr_t data), + do_terminate(Widget gw, caddr_t closure, caddr_t data), do_kill(Widget gw, caddr_t closure, caddr_t data), do_quit(Widget gw, caddr_t closure, caddr_t data), do_scrollbar(Widget gw, caddr_t closure, caddr_t data), do_jumpscroll(Widget gw, caddr_t closure, caddr_t data), + do_reversevideo(Widget gw, caddr_t closure, caddr_t data), do_autowrap(Widget gw, caddr_t closure, caddr_t data), do_reversewrap(Widget gw, caddr_t closure, caddr_t data), do_autolinefeed(Widget gw, caddr_t closure, caddr_t data), + do_appcursor(Widget gw, caddr_t closure, caddr_t data), do_appkeypad(Widget gw, caddr_t closure, caddr_t data), do_scrollkey(Widget gw, caddr_t closure, caddr_t data), do_scrollttyoutput(Widget gw, caddr_t closure, caddr_t data), + do_allow132(Widget gw, caddr_t closure, caddr_t data), do_cursesemul(Widget gw, caddr_t closure, caddr_t data), do_marginbell(Widget gw, caddr_t closure, caddr_t data), do_altscreen(Widget gw, caddr_t closure, caddr_t data), + do_softreset(Widget gw, caddr_t closure, caddr_t data), do_hardreset(Widget gw, caddr_t closure, caddr_t data), do_clearsavedlines(Widget gw, caddr_t closure, caddr_t data), + do_vthide(Widget gw, caddr_t closure, caddr_t data), do_vtshow(Widget gw, caddr_t closure, caddr_t data), do_vtmode(Widget gw, caddr_t closure, caddr_t data), do_vtfont(Widget gw, caddr_t closure, caddr_t data), + do_gioenable(Widget gw, caddr_t closure, caddr_t data), do_tekshow(Widget gw, caddr_t closure, caddr_t data), do_tekmode(Widget gw, caddr_t closure, caddr_t data), do_tekpage(Widget gw, caddr_t closure, caddr_t data), + do_tekreset(Widget gw, caddr_t closure, caddr_t data), do_tekcopy(Widget gw, caddr_t closure, caddr_t data), do_tekhide(Widget gw, caddr_t closure, caddr_t data), do_colortext(Widget gw, caddr_t closure, caddr_t data); /* @@ -128,7 +128,7 @@ MenuEntry tekMenuEntries[] = { { "vtshow", do_vtshow, NULL }, /* 2 */ { "tekreset", do_tekreset, NULL }}; /* 3 */ -static Widget create_menu(); +static Widget create_menu(Widget w, Widget toplevelw, char *name, struct _MenuEntry *entries, int nentries); extern Widget toplevel; /* @@ -147,11 +147,11 @@ static unsigned char check_bits[] = { */ /* ARGSUSED */ -static Bool domenu (w, event, params, param_count) - Widget w; - XEvent *event; /* unused */ - String *params; /* mainMenu, vtMenu, or tekMenu */ - Cardinal *param_count; /* 0 or 1 */ +static Bool domenu (Widget w, XEvent *event, String *params, Cardinal *param_count) + + /* unused */ + /* mainMenu, vtMenu, or tekMenu */ + /* 0 or 1 */ { TScreen *screen = &term->screen; Widget ww; @@ -282,20 +282,20 @@ static Bool domenu (w, event, params, param_count) return True; } -void HandleCreateMenu (w, event, params, param_count) - Widget w; - XEvent *event; /* unused */ - String *params; /* mainMenu, vtMenu, or tekMenu */ - Cardinal *param_count; /* 0 or 1 */ +void HandleCreateMenu (Widget w, XEvent *event, String *params, Cardinal *param_count) + + /* unused */ + /* mainMenu, vtMenu, or tekMenu */ + /* 0 or 1 */ { (void) domenu (w, event, params, param_count); } -void HandlePopupMenu (w, event, params, param_count) - Widget w; - XEvent *event; /* unused */ - String *params; /* mainMenu, vtMenu, or tekMenu */ - Cardinal *param_count; /* 0 or 1 */ +void HandlePopupMenu (Widget w, XEvent *event, String *params, Cardinal *param_count) + + /* unused */ + /* mainMenu, vtMenu, or tekMenu */ + /* 0 or 1 */ { if (domenu (w, event, params, param_count)) { XtCallActionProc (w, "XawPositionSimpleMenu", event, params, 1); @@ -312,12 +312,7 @@ void HandlePopupMenu (w, event, params, param_count) * create_menu - create a popup shell and stuff the menu into it. */ -static Widget create_menu (w, toplevelw, name, entries, nentries) - Widget w; - Widget toplevelw; - char *name; - struct _MenuEntry *entries; - int nentries; +static Widget create_menu (Widget w, Widget toplevelw, char *name, struct _MenuEntry *entries, int nentries) { TScreen *screen = &term->screen; static XtCallbackRec cb[2] = { { NULL, NULL }, { NULL, NULL }}; @@ -368,8 +363,7 @@ static Widget create_menu (w, toplevelw, name, entries, nentries) return m; } -init_menu (menu) - char *menu; +init_menu (char *menu) { TScreen *screen = &term->screen; int i; @@ -399,9 +393,7 @@ init_menu (menu) } /* ARGSUSED */ -static void handle_send_signal (gw, sig) - Widget gw; - int sig; +static void handle_send_signal (Widget gw, int sig) { TScreen *screen = &term->screen; @@ -414,15 +406,12 @@ static void handle_send_signal (gw, sig) */ /* ARGSUSED */ -void DoSecureKeyboard (time) - Time time; +void DoSecureKeyboard (Time time) { do_securekbd (term->screen.mainMenu, NULL, NULL); } -static void do_securekbd (gw, closure, data) - Widget gw; - caddr_t closure, data; +static void do_securekbd (Widget gw, caddr_t closure, caddr_t data) { TScreen *screen = &term->screen; Time time = CurrentTime; /* XXX - wrong */ @@ -445,9 +434,7 @@ static void do_securekbd (gw, closure, data) } -static void do_allowsends (gw, closure, data) - Widget gw; - caddr_t closure, data; +static void do_allowsends (Widget gw, caddr_t closure, caddr_t data) { TScreen *screen = &term->screen; @@ -457,9 +444,7 @@ static void do_allowsends (gw, closure, data) */ } -static void do_visualbell (gw, closure, data) - Widget gw; - caddr_t closure, data; +static void do_visualbell (Widget gw, caddr_t closure, caddr_t data) { TScreen *screen = &term->screen; @@ -468,9 +453,7 @@ static void do_visualbell (gw, closure, data) } #ifdef ALLOWLOGGING -static void do_logging (gw, closure, data) - Widget gw; - caddr_t closure, data; +static void do_logging (Widget gw, caddr_t closure, caddr_t data) { TScreen *screen = &term->screen; @@ -483,9 +466,7 @@ static void do_logging (gw, closure, data) } #endif -static void do_redraw (gw, closure, data) - Widget gw; - caddr_t closure, data; +static void do_redraw (Widget gw, caddr_t closure, caddr_t data) { Redraw (); } @@ -498,9 +479,7 @@ static void do_redraw (gw, closure, data) /* ARGSUSED */ -static void do_suspend (gw, closure, data) - Widget gw; - caddr_t closure, data; +static void do_suspend (Widget gw, caddr_t closure, caddr_t data) { #ifdef SIGTSTP handle_send_signal (gw, SIGTSTP); @@ -508,9 +487,7 @@ static void do_suspend (gw, closure, data) } /* ARGSUSED */ -static void do_continue (gw, closure, data) - Widget gw; - caddr_t closure, data; +static void do_continue (Widget gw, caddr_t closure, caddr_t data) { #ifdef SIGCONT handle_send_signal (gw, SIGCONT); @@ -518,40 +495,30 @@ static void do_continue (gw, closure, data) } /* ARGSUSED */ -static void do_interrupt (gw, closure, data) - Widget gw; - caddr_t closure, data; +static void do_interrupt (Widget gw, caddr_t closure, caddr_t data) { handle_send_signal (gw, SIGINT); } /* ARGSUSED */ -void do_hangup (gw, closure, data) - Widget gw; - caddr_t closure, data; +void do_hangup (Widget gw, caddr_t closure, caddr_t data) { handle_send_signal (gw, SIGHUP); } /* ARGSUSED */ -static void do_terminate (gw, closure, data) - Widget gw; - caddr_t closure, data; +static void do_terminate (Widget gw, caddr_t closure, caddr_t data) { handle_send_signal (gw, SIGTERM); } /* ARGSUSED */ -static void do_kill (gw, closure, data) - Widget gw; - caddr_t closure, data; +static void do_kill (Widget gw, caddr_t closure, caddr_t data) { handle_send_signal (gw, SIGKILL); } -static void do_quit (gw, closure, data) - Widget gw; - caddr_t closure, data; +static void do_quit (Widget gw, caddr_t closure, caddr_t data) { Cleanup (0); } @@ -562,9 +529,7 @@ static void do_quit (gw, closure, data) * vt menu callbacks */ -static void do_scrollbar (gw, closure, data) - Widget gw; - caddr_t closure, data; +static void do_scrollbar (Widget gw, caddr_t closure, caddr_t data) { TScreen *screen = &term->screen; @@ -577,9 +542,7 @@ static void do_scrollbar (gw, closure, data) } -static void do_jumpscroll (gw, closure, data) - Widget gw; - caddr_t closure, data; +static void do_jumpscroll (Widget gw, caddr_t closure, caddr_t data) { TScreen *screen = &term->screen; @@ -594,9 +557,7 @@ static void do_jumpscroll (gw, closure, data) } -static void do_reversevideo (gw, closure, data) - Widget gw; - caddr_t closure, data; +static void do_reversevideo (Widget gw, caddr_t closure, caddr_t data) { term->flags ^= REVERSE_VIDEO; ReverseVideo (term); @@ -604,9 +565,7 @@ static void do_reversevideo (gw, closure, data) } -static void do_colortext (gw, closure, data) - Widget gw; - caddr_t closure, data; +static void do_colortext (Widget gw, caddr_t closure, caddr_t data) { term->misc.dynamicColors = !term->misc.dynamicColors; update_colortext (); @@ -614,54 +573,42 @@ static void do_colortext (gw, closure, data) } -static void do_autowrap (gw, closure, data) - Widget gw; - caddr_t closure, data; +static void do_autowrap (Widget gw, caddr_t closure, caddr_t data) { term->flags ^= WRAPAROUND; update_autowrap(); } -static void do_reversewrap (gw, closure, data) - Widget gw; - caddr_t closure, data; +static void do_reversewrap (Widget gw, caddr_t closure, caddr_t data) { term->flags ^= REVERSEWRAP; update_reversewrap(); } -static void do_autolinefeed (gw, closure, data) - Widget gw; - caddr_t closure, data; +static void do_autolinefeed (Widget gw, caddr_t closure, caddr_t data) { term->flags ^= LINEFEED; update_autolinefeed(); } -static void do_appcursor (gw, closure, data) - Widget gw; - caddr_t closure, data; +static void do_appcursor (Widget gw, caddr_t closure, caddr_t data) { term->keyboard.flags ^= CURSOR_APL; update_appcursor(); } -static void do_appkeypad (gw, closure, data) - Widget gw; - caddr_t closure, data; +static void do_appkeypad (Widget gw, caddr_t closure, caddr_t data) { term->keyboard.flags ^= KYPD_APL; update_appkeypad(); } -static void do_scrollkey (gw, closure, data) - Widget gw; - caddr_t closure, data; +static void do_scrollkey (Widget gw, caddr_t closure, caddr_t data) { TScreen *screen = &term->screen; @@ -670,9 +617,7 @@ static void do_scrollkey (gw, closure, data) } -static void do_scrollttyoutput (gw, closure, data) - Widget gw; - caddr_t closure, data; +static void do_scrollttyoutput (Widget gw, caddr_t closure, caddr_t data) { TScreen *screen = &term->screen; @@ -681,9 +626,7 @@ static void do_scrollttyoutput (gw, closure, data) } -static void do_allow132 (gw, closure, data) - Widget gw; - caddr_t closure, data; +static void do_allow132 (Widget gw, caddr_t closure, caddr_t data) { TScreen *screen = &term->screen; @@ -692,9 +635,7 @@ static void do_allow132 (gw, closure, data) } -static void do_cursesemul (gw, closure, data) - Widget gw; - caddr_t closure, data; +static void do_cursesemul (Widget gw, caddr_t closure, caddr_t data) { TScreen *screen = &term->screen; @@ -703,9 +644,7 @@ static void do_cursesemul (gw, closure, data) } -static void do_marginbell (gw, closure, data) - Widget gw; - caddr_t closure, data; +static void do_marginbell (Widget gw, caddr_t closure, caddr_t data) { TScreen *screen = &term->screen; @@ -714,34 +653,26 @@ static void do_marginbell (gw, closure, data) } -static void do_altscreen (gw, closure, data) - Widget gw; - caddr_t closure, data; +static void do_altscreen (Widget gw, caddr_t closure, caddr_t data) { /* do nothing for now; eventually, will want to flip screen */ } -static void do_softreset (gw, closure, data) - Widget gw; - caddr_t closure, data; +static void do_softreset (Widget gw, caddr_t closure, caddr_t data) { VTReset (FALSE); } -static void do_hardreset (gw, closure, data) - Widget gw; - caddr_t closure, data; +static void do_hardreset (Widget gw, caddr_t closure, caddr_t data) { gt_reset(); VTReset (TRUE); /* does a longjmp */ } -static void do_clearsavedlines (gw, closure, data) - Widget gw; - caddr_t closure, data; +static void do_clearsavedlines (Widget gw, caddr_t closure, caddr_t data) { TScreen *screen = &term->screen; @@ -751,25 +682,19 @@ static void do_clearsavedlines (gw, closure, data) } /* ARGSUSED */ -static void do_gioenable (gw, closure, data) - Widget gw; - caddr_t closure, data; +static void do_gioenable (Widget gw, caddr_t closure, caddr_t data) { gt_enable (!gt_enable(2)); update_gioenable(); } /* ARGSUSED */ -static void do_tekmode (gw, closure, data) - Widget gw; - caddr_t closure, data; +static void do_tekmode (Widget gw, caddr_t closure, caddr_t data) { switch_modes (gt_tekmode(2)); /* switch to tek mode */ } -static void handle_tekshow (gw, allowswitch) - Widget gw; - Bool allowswitch; +static void handle_tekshow (Widget gw, int allowswitch) { TScreen *screen = &term->screen; @@ -782,26 +707,20 @@ static void handle_tekshow (gw, allowswitch) } /* ARGSUSED */ -static void do_tekshow (gw, closure, data) - Widget gw; - caddr_t closure, data; +static void do_tekshow (Widget gw, caddr_t closure, caddr_t data) { handle_tekshow (gw, True); } /* ARGSUSED */ -static void do_tekonoff (gw, closure, data) - Widget gw; - caddr_t closure, data; +static void do_tekonoff (Widget gw, caddr_t closure, caddr_t data) { handle_tekshow (gw, False); } /* ARGSUSED */ -static void do_vthide (gw, closure, data) - Widget gw; - caddr_t closure, data; +static void do_vthide (Widget gw, caddr_t closure, caddr_t data) { hide_vt_window(); } @@ -811,9 +730,7 @@ static void do_vthide (gw, closure, data) * vtfont menu */ -static void do_vtfont (gw, closure, data) - Widget gw; - caddr_t closure, data; +static void do_vtfont (Widget gw, caddr_t closure, caddr_t data) { char *entryname = (char *) closure; int i; @@ -833,17 +750,13 @@ static void do_vtfont (gw, closure, data) */ -static void do_tekpage (gw, closure, data) - Widget gw; - caddr_t closure, data; +static void do_tekpage (Widget gw, caddr_t closure, caddr_t data) { gt_clear(); } -static void do_tekreset (gw, closure, data) - Widget gw; - caddr_t closure, data; +static void do_tekreset (Widget gw, caddr_t closure, caddr_t data) { gt_reset(); set_vthide_sensitivity(); @@ -856,17 +769,13 @@ static void do_tekreset (gw, closure, data) } -static void do_tekcopy (gw, closure, data) - Widget gw; - caddr_t closure, data; +static void do_tekcopy (Widget gw, caddr_t closure, caddr_t data) { /* TekCopy (); */ } -static void handle_vtshow (gw, allowswitch) - Widget gw; - Bool allowswitch; +static void handle_vtshow (Widget gw, int allowswitch) { TScreen *screen = &term->screen; @@ -879,23 +788,17 @@ static void handle_vtshow (gw, allowswitch) Bell(); } -static void do_vtshow (gw, closure, data) - Widget gw; - caddr_t closure, data; +static void do_vtshow (Widget gw, caddr_t closure, caddr_t data) { handle_vtshow (gw, True); } -static void do_vtonoff (gw, closure, data) - Widget gw; - caddr_t closure, data; +static void do_vtonoff (Widget gw, caddr_t closure, caddr_t data) { handle_vtshow (gw, False); } -static void do_vtmode (gw, closure, data) - Widget gw; - caddr_t closure, data; +static void do_vtmode (Widget gw, caddr_t closure, caddr_t data) { TScreen *screen = &term->screen; @@ -904,9 +807,7 @@ static void do_vtmode (gw, closure, data) /* ARGSUSED */ -static void do_tekhide (gw, closure, data) - Widget gw; - caddr_t closure, data; +static void do_tekhide (Widget gw, caddr_t closure, caddr_t data) { gt_deactivate(); set_vthide_sensitivity(); @@ -924,13 +825,7 @@ static void do_tekhide (gw, closure, data) * public handler routines */ -static void handle_toggle (proc, var, params, nparams, w, closure, data) - void (*proc)(); - int var; - String *params; - Cardinal nparams; - Widget w; - caddr_t closure, data; +static void handle_toggle (void (*proc) (/* ??? */), int var, String *params, Cardinal nparams, Widget w, caddr_t closure, caddr_t data) { int dir = -2; @@ -967,11 +862,7 @@ static void handle_toggle (proc, var, params, nparams, w, closure, data) return; } -void HandleAllowSends(w, event, params, param_count) - Widget w; - XEvent *event; - String *params; - Cardinal *param_count; +void HandleAllowSends(Widget w, XEvent *event, String *params, Cardinal *param_count) { /* Currently since we use Xt event processing we cannot easily disable * sendevents as is done in xevent(). @@ -981,22 +872,14 @@ void HandleAllowSends(w, event, params, param_count) */ } -void HandleSetVisualBell(w, event, params, param_count) - Widget w; - XEvent *event; - String *params; - Cardinal *param_count; +void HandleSetVisualBell(Widget w, XEvent *event, String *params, Cardinal *param_count) { handle_toggle (do_visualbell, (int) term->screen.visualbell, params, *param_count, w, NULL, NULL); } #ifdef ALLOWLOGGING -void HandleLogging(w, event, params, param_count) - Widget w; - XEvent *event; - String *params; - Cardinal *param_count; +void HandleLogging(Widget w, XEvent *event, String *params, Cardinal *param_count) { handle_toggle (do_logging, (int) term->screen.logging, params, *param_count, w, NULL, NULL); @@ -1004,21 +887,17 @@ void HandleLogging(w, event, params, param_count) #endif /* ARGSUSED */ -void HandleRedraw(w, event, params, param_count) - Widget w; - XEvent *event; - String *params; - Cardinal *param_count; +void HandleRedraw(Widget w, XEvent *event, String *params, Cardinal *param_count) { do_redraw(w, NULL, NULL); } /* ARGSUSED */ -void HandleSendSignal(w, event, params, param_count) - Widget w; - XEvent *event; /* unused */ - String *params; - Cardinal *param_count; +void HandleSendSignal(Widget w, XEvent *event, String *params, Cardinal *param_count) + + /* unused */ + + { static struct sigtab { char *name; @@ -1057,150 +936,90 @@ void HandleSendSignal(w, event, params, param_count) } /* ARGSUSED */ -void HandleQuit(w, event, params, param_count) - Widget w; - XEvent *event; - String *params; - Cardinal *param_count; +void HandleQuit(Widget w, XEvent *event, String *params, Cardinal *param_count) { do_quit(w, NULL, NULL); } -void HandleScrollbar(w, event, params, param_count) - Widget w; - XEvent *event; - String *params; - Cardinal *param_count; +void HandleScrollbar(Widget w, XEvent *event, String *params, Cardinal *param_count) { handle_toggle (do_scrollbar, (int) term->screen.scrollbar, params, *param_count, w, NULL, NULL); } -void HandleJumpscroll(w, event, params, param_count) - Widget w; - XEvent *event; - String *params; - Cardinal *param_count; +void HandleJumpscroll(Widget w, XEvent *event, String *params, Cardinal *param_count) { handle_toggle (do_jumpscroll, (int) term->screen.jumpscroll, params, *param_count, w, NULL, NULL); } -void HandleReverseVideo(w, event, params, param_count) - Widget w; - XEvent *event; - String *params; - Cardinal *param_count; +void HandleReverseVideo(Widget w, XEvent *event, String *params, Cardinal *param_count) { handle_toggle (do_reversevideo, (int) (term->flags & REVERSE_VIDEO), params, *param_count, w, NULL, NULL); } -void HandleAutoWrap(w, event, params, param_count) - Widget w; - XEvent *event; - String *params; - Cardinal *param_count; +void HandleAutoWrap(Widget w, XEvent *event, String *params, Cardinal *param_count) { handle_toggle (do_autowrap, (int) (term->flags & WRAPAROUND), params, *param_count, w, NULL, NULL); } -void HandleReverseWrap(w, event, params, param_count) - Widget w; - XEvent *event; - String *params; - Cardinal *param_count; +void HandleReverseWrap(Widget w, XEvent *event, String *params, Cardinal *param_count) { handle_toggle (do_reversewrap, (int) (term->flags & REVERSEWRAP), params, *param_count, w, NULL, NULL); } -void HandleAutoLineFeed(w, event, params, param_count) - Widget w; - XEvent *event; - String *params; - Cardinal *param_count; +void HandleAutoLineFeed(Widget w, XEvent *event, String *params, Cardinal *param_count) { handle_toggle (do_autolinefeed, (int) (term->flags & LINEFEED), params, *param_count, w, NULL, NULL); } -void HandleAppCursor(w, event, params, param_count) - Widget w; - XEvent *event; - String *params; - Cardinal *param_count; +void HandleAppCursor(Widget w, XEvent *event, String *params, Cardinal *param_count) { handle_toggle (do_appcursor, (int) (term->keyboard.flags & CURSOR_APL), params, *param_count, w, NULL, NULL); } -void HandleAppKeypad(w, event, params, param_count) - Widget w; - XEvent *event; - String *params; - Cardinal *param_count; +void HandleAppKeypad(Widget w, XEvent *event, String *params, Cardinal *param_count) { handle_toggle (do_appkeypad, (int) (term->keyboard.flags & KYPD_APL), params, *param_count, w, NULL, NULL); } -void HandleScrollKey(w, event, params, param_count) - Widget w; - XEvent *event; - String *params; - Cardinal *param_count; +void HandleScrollKey(Widget w, XEvent *event, String *params, Cardinal *param_count) { handle_toggle (do_scrollkey, (int) term->screen.scrollkey, params, *param_count, w, NULL, NULL); } -void HandleScrollTtyOutput(w, event, params, param_count) - Widget w; - XEvent *event; - String *params; - Cardinal *param_count; +void HandleScrollTtyOutput(Widget w, XEvent *event, String *params, Cardinal *param_count) { handle_toggle (do_scrollttyoutput, (int) term->screen.scrollttyoutput, params, *param_count, w, NULL, NULL); } -void HandleAllow132(w, event, params, param_count) - Widget w; - XEvent *event; - String *params; - Cardinal *param_count; +void HandleAllow132(Widget w, XEvent *event, String *params, Cardinal *param_count) { handle_toggle (do_allow132, (int) term->screen.c132, params, *param_count, w, NULL, NULL); } -void HandleCursesEmul(w, event, params, param_count) - Widget w; - XEvent *event; - String *params; - Cardinal *param_count; +void HandleCursesEmul(Widget w, XEvent *event, String *params, Cardinal *param_count) { handle_toggle (do_cursesemul, (int) term->screen.curses, params, *param_count, w, NULL, NULL); } -void HandleMarginBell(w, event, params, param_count) - Widget w; - XEvent *event; - String *params; - Cardinal *param_count; +void HandleMarginBell(Widget w, XEvent *event, String *params, Cardinal *param_count) { handle_toggle (do_marginbell, (int) term->screen.marginbell, params, *param_count, w, NULL, NULL); } -void HandleAltScreen(w, event, params, param_count) - Widget w; - XEvent *event; - String *params; - Cardinal *param_count; +void HandleAltScreen(Widget w, XEvent *event, String *params, Cardinal *param_count) { /* eventually want to see if sensitive or not */ handle_toggle (do_altscreen, (int) term->screen.alternate, @@ -1208,40 +1027,24 @@ void HandleAltScreen(w, event, params, param_count) } /* ARGSUSED */ -void HandleSoftReset(w, event, params, param_count) - Widget w; - XEvent *event; - String *params; - Cardinal *param_count; +void HandleSoftReset(Widget w, XEvent *event, String *params, Cardinal *param_count) { do_softreset(w, NULL, NULL); } /* ARGSUSED */ -void HandleHardReset(w, event, params, param_count) - Widget w; - XEvent *event; - String *params; - Cardinal *param_count; +void HandleHardReset(Widget w, XEvent *event, String *params, Cardinal *param_count) { do_hardreset(w, NULL, NULL); } /* ARGSUSED */ -void HandleClearSavedLines(w, event, params, param_count) - Widget w; - XEvent *event; - String *params; - Cardinal *param_count; +void HandleClearSavedLines(Widget w, XEvent *event, String *params, Cardinal *param_count) { do_clearsavedlines(w, NULL, NULL); } -void HandleSetTerminalType(w, event, params, param_count) - Widget w; - XEvent *event; - String *params; - Cardinal *param_count; +void HandleSetTerminalType(Widget w, XEvent *event, String *params, Cardinal *param_count) { if (*param_count == 1) { switch (params[0][0]) { @@ -1259,11 +1062,7 @@ void HandleSetTerminalType(w, event, params, param_count) } } -void HandleVisibility(w, event, params, param_count) - Widget w; - XEvent *event; - String *params; - Cardinal *param_count; +void HandleVisibility(Widget w, XEvent *event, String *params, Cardinal *param_count) { if (*param_count == 2) { switch (params[0][0]) { @@ -1284,31 +1083,19 @@ void HandleVisibility(w, event, params, param_count) } /* ARGSUSED */ -void HandleTekPage(w, event, params, param_count) - Widget w; - XEvent *event; - String *params; - Cardinal *param_count; +void HandleTekPage(Widget w, XEvent *event, String *params, Cardinal *param_count) { do_tekpage(w, NULL, NULL); } /* ARGSUSED */ -void HandleTekReset(w, event, params, param_count) - Widget w; - XEvent *event; - String *params; - Cardinal *param_count; +void HandleTekReset(Widget w, XEvent *event, String *params, Cardinal *param_count) { do_tekreset(w, NULL, NULL); } /* ARGSUSED */ -void HandleTekCopy(w, event, params, param_count) - Widget w; - XEvent *event; - String *params; - Cardinal *param_count; +void HandleTekCopy(Widget w, XEvent *event, String *params, Cardinal *param_count) { do_tekcopy(w, NULL, NULL); } diff --git a/xgterm/menu.h b/xgterm/menu.h index 4b7d01e..e3afdef 100644 --- a/xgterm/menu.h +++ b/xgterm/menu.h @@ -24,38 +24,38 @@ extern MenuEntry mainMenuEntries[], vtMenuEntries[], tekMenuEntries[]; extern MenuEntry fontMenuEntries[]; extern Arg menuArgs[]; -extern void HandleAllowSends(); -extern void HandleSetVisualBell(); +extern void HandleAllowSends(Widget w, XEvent *event, String *params, Cardinal *param_count); +extern void HandleSetVisualBell(Widget w, XEvent *event, String *params, Cardinal *param_count); #ifdef ALLOWLOGGING -extern void HandleLogging(); +extern void HandleLogging(Widget w, XEvent *event, String *params, Cardinal *param_count); #endif -extern void HandleRedraw(); -extern void HandleSendSignal(); -extern void HandleQuit(); -extern void HandleScrollbar(); -extern void HandleJumpscroll(); -extern void HandleReverseVideo(); +extern void HandleRedraw(Widget w, XEvent *event, String *params, Cardinal *param_count); +extern void HandleSendSignal(Widget w, XEvent *event, String *params, Cardinal *param_count); +extern void HandleQuit(Widget w, XEvent *event, String *params, Cardinal *param_count); +extern void HandleScrollbar(Widget w, XEvent *event, String *params, Cardinal *param_count); +extern void HandleJumpscroll(Widget w, XEvent *event, String *params, Cardinal *param_count); +extern void HandleReverseVideo(Widget w, XEvent *event, String *params, Cardinal *param_count); extern void HandleColorText(); -extern void HandleAutoWrap(); -extern void HandleReverseWrap(); -extern void HandleAutoLineFeed(); -extern void HandleAppCursor(); -extern void HandleAppKeypad(); -extern void HandleScrollKey(); -extern void HandleScrollTtyOutput(); -extern void HandleAllow132(); -extern void HandleCursesEmul(); -extern void HandleMarginBell(); -extern void HandleAltScreen(); -extern void HandleSoftReset(); -extern void HandleHardReset(); -extern void HandleClearSavedLines(); -extern void HandleSetTerminalType(); -extern void HandleVisibility(); -extern void HandleTekPage(); -extern void HandleTekReset(); -extern void HandleTekCopy(); -extern void DoSecureKeyboard(); +extern void HandleAutoWrap(Widget w, XEvent *event, String *params, Cardinal *param_count); +extern void HandleReverseWrap(Widget w, XEvent *event, String *params, Cardinal *param_count); +extern void HandleAutoLineFeed(Widget w, XEvent *event, String *params, Cardinal *param_count); +extern void HandleAppCursor(Widget w, XEvent *event, String *params, Cardinal *param_count); +extern void HandleAppKeypad(Widget w, XEvent *event, String *params, Cardinal *param_count); +extern void HandleScrollKey(Widget w, XEvent *event, String *params, Cardinal *param_count); +extern void HandleScrollTtyOutput(Widget w, XEvent *event, String *params, Cardinal *param_count); +extern void HandleAllow132(Widget w, XEvent *event, String *params, Cardinal *param_count); +extern void HandleCursesEmul(Widget w, XEvent *event, String *params, Cardinal *param_count); +extern void HandleMarginBell(Widget w, XEvent *event, String *params, Cardinal *param_count); +extern void HandleAltScreen(Widget w, XEvent *event, String *params, Cardinal *param_count); +extern void HandleSoftReset(Widget w, XEvent *event, String *params, Cardinal *param_count); +extern void HandleHardReset(Widget w, XEvent *event, String *params, Cardinal *param_count); +extern void HandleClearSavedLines(Widget w, XEvent *event, String *params, Cardinal *param_count); +extern void HandleSetTerminalType(Widget w, XEvent *event, String *params, Cardinal *param_count); +extern void HandleVisibility(Widget w, XEvent *event, String *params, Cardinal *param_count); +extern void HandleTekPage(Widget w, XEvent *event, String *params, Cardinal *param_count); +extern void HandleTekReset(Widget w, XEvent *event, String *params, Cardinal *param_count); +extern void HandleTekCopy(Widget w, XEvent *event, String *params, Cardinal *param_count); +extern void DoSecureKeyboard(Time time); /* * The following definitions MUST match the order of entries given in diff --git a/xgterm/misc.c b/xgterm/misc.c index 60ac55d..5f14efd 100644 --- a/xgterm/misc.c +++ b/xgterm/misc.c @@ -58,16 +58,16 @@ extern char *malloc(); extern char *getenv(); #endif -static void DoSpecialEnterNotify(); -static void DoSpecialLeaveNotify(); +static void DoSpecialEnterNotify(XEnterWindowEvent *ev); +static void DoSpecialLeaveNotify(XEnterWindowEvent *ev); -void selectwindow(), unselectwindow(); -void VisualBell(), FlushLog(), Setenv(); +void selectwindow(TScreen *screen, int flag), unselectwindow(TScreen *screen, int flag); +void VisualBell(void), FlushLog(TScreen *screen), Setenv(char *var, char *value); extern XtAppContext app_con; void -xevents() +xevents(void) { XEvent event; XtInputMask input_mask; @@ -116,9 +116,9 @@ xevents() } -Cursor make_colored_cursor (cursorindex, fg, bg) - int cursorindex; /* index into font */ - unsigned long fg, bg; /* pixel value */ +Cursor make_colored_cursor (int cursorindex, long unsigned int fg, long unsigned int bg) + /* index into font */ + /* pixel value */ { TScreen *screen = &term->screen; Cursor c; @@ -132,11 +132,7 @@ Cursor make_colored_cursor (cursorindex, fg, bg) } /* ARGSUSED */ -void HandleKeyPressed(w, event, params, nparams) - Widget w; - XEvent *event; - String *params; - Cardinal *nparams; +void HandleKeyPressed(Widget w, XEvent *event, String *params, Cardinal *nparams) { TScreen *screen = &term->screen; @@ -146,11 +142,7 @@ void HandleKeyPressed(w, event, params, nparams) Input (&term->keyboard, screen, &event->xkey, False); } /* ARGSUSED */ -void HandleEightBitKeyPressed(w, event, params, nparams) - Widget w; - XEvent *event; - String *params; - Cardinal *nparams; +void HandleEightBitKeyPressed(Widget w, XEvent *event, String *params, Cardinal *nparams) { TScreen *screen = &term->screen; @@ -161,11 +153,7 @@ void HandleEightBitKeyPressed(w, event, params, nparams) } /* ARGSUSED */ -void HandleStringEvent(w, event, params, nparams) - Widget w; - XEvent *event; - String *params; - Cardinal *nparams; +void HandleStringEvent(Widget w, XEvent *event, String *params, Cardinal *nparams) { TScreen *screen = &term->screen; @@ -196,8 +184,7 @@ void HandleStringEvent(w, event, params, nparams) } } -static void DoSpecialEnterNotify (ev) - XEnterWindowEvent *ev; +static void DoSpecialEnterNotify (XEnterWindowEvent *ev) { TScreen *screen = &term->screen; @@ -211,10 +198,7 @@ static void DoSpecialEnterNotify (ev) } /*ARGSUSED*/ -void HandleEnterWindow(w, eventdata, event) -Widget w; -XEnterWindowEvent *event; -caddr_t eventdata; +void HandleEnterWindow(Widget w, caddr_t eventdata, XEnterWindowEvent *event) { /* This code is necessary as xevent does not see all events anymore. */ XEvent *ev = (XEvent *) event; @@ -224,8 +208,7 @@ caddr_t eventdata; } -static void DoSpecialLeaveNotify (ev) - XEnterWindowEvent *ev; +static void DoSpecialLeaveNotify (XEnterWindowEvent *ev) { TScreen *screen = &term->screen; @@ -240,10 +223,7 @@ static void DoSpecialLeaveNotify (ev) /*ARGSUSED*/ -void HandleLeaveWindow(w, eventdata, event) -Widget w; -XEnterWindowEvent *event; -caddr_t eventdata; +void HandleLeaveWindow(Widget w, caddr_t eventdata, XEnterWindowEvent *event) { /* This code is necessary as xevent does not see all events anymore. */ XEvent *ev = (XEvent *) event; @@ -254,10 +234,7 @@ caddr_t eventdata; /*ARGSUSED*/ -void HandleFocusChange(w, eventdata, event) -Widget w; -XFocusChangeEvent *event; -caddr_t eventdata; +void HandleFocusChange(Widget w, caddr_t eventdata, XFocusChangeEvent *event) { TScreen *screen = &term->screen; @@ -280,9 +257,7 @@ caddr_t eventdata; void -selectwindow(screen, flag) -TScreen *screen; -int flag; +selectwindow(TScreen *screen, int flag) { #ifdef I18N if (screen->xic) @@ -299,9 +274,7 @@ int flag; } void -unselectwindow(screen, flag) -TScreen *screen; -int flag; +unselectwindow(TScreen *screen, int flag) { if (screen->always_highlight) return; @@ -321,7 +294,7 @@ int flag; static long lastBellTime; /* in milliseconds */ void -Bell() +Bell(void) { extern XgtermWidget term; TScreen *screen = &term->screen; @@ -370,7 +343,7 @@ Bell() } void -VisualBell() +VisualBell(void) { extern XgtermWidget term; TScreen *screen = &term->screen; @@ -399,11 +372,7 @@ VisualBell() } /* ARGSUSED */ -void HandleBellPropertyChange(w, data, ev, more) - Widget w; - XtPointer data; - XEvent *ev; - Boolean *more; +void HandleBellPropertyChange(Widget w, XtPointer data, XEvent *ev, Boolean *more) { TScreen *screen = &term->screen; @@ -413,7 +382,7 @@ void HandleBellPropertyChange(w, data, ev, more) } void -Redraw() +Redraw(void) { extern XgtermWidget term; TScreen *screen = &term->screen; @@ -451,11 +420,7 @@ Redraw() * being available. */ void -creat_as(uid, gid, pathname, mode) - int uid; - int gid; - char *pathname; - int mode; +creat_as(int uid, int gid, char *pathname, int mode) { int fd; int waited; @@ -506,8 +471,7 @@ creat_as(uid, gid, pathname, mode) * by default. */ void -StartLog(screen) -TScreen *screen; +StartLog(TScreen *screen) { char *cp; int i; @@ -613,8 +577,7 @@ TScreen *screen; } void -CloseLog(screen) -TScreen *screen; +CloseLog(TScreen *screen) { if(!screen->logging || (screen->inhibit & I_LOG)) return; @@ -625,8 +588,7 @@ TScreen *screen; } void -FlushLog(screen) -TScreen *screen; +FlushLog(TScreen *screen) { Char *cp; int i; @@ -657,8 +619,7 @@ void logpipe() #endif /* ALLOWLOGGING */ -do_osc(func) -int (*func)(); +do_osc(int (*func) (/* ??? */)) { int mode, c; char *cp; @@ -697,7 +658,7 @@ int (*func)(); case 13: case 14: case 15: case 16: { - extern Boolean ChangeColorsRequest(); + extern Boolean ChangeColorsRequest(XgtermWidget pTerm, int start, char *names); if (term->misc.dynamicColors) ChangeColorsRequest(term,mode-10,buf); } @@ -735,9 +696,7 @@ int (*func)(); } } -static ChangeGroup(attribute, value) - String attribute; - XtArgVal value; +static ChangeGroup(String attribute, XtArgVal value) { extern Widget toplevel; Arg args[1]; @@ -746,14 +705,12 @@ static ChangeGroup(attribute, value) XtSetValues( toplevel, args, 1 ); } -Changename(name) -char *name; +Changename(char *name) { ChangeGroup( XtNiconName, (XtArgVal)name ); } -Changetitle(name) -char *name; +Changetitle(char *name) { ChangeGroup( XtNtitle, (XtArgVal)name ); } @@ -763,8 +720,7 @@ char *name; ScrnColors *pOldColors= NULL; Boolean -GetOldColors(pTerm) -XgtermWidget pTerm; +GetOldColors(XgtermWidget pTerm) { int i; if (pOldColors==NULL) { @@ -784,9 +740,7 @@ int i; } Boolean -UpdateOldColors(pTerm,pNew) -XgtermWidget pTerm; -ScrnColors *pNew; +UpdateOldColors(XgtermWidget pTerm, ScrnColors *pNew) { int i; @@ -813,7 +767,7 @@ int i; } void -ReverseOldColors() +ReverseOldColors(void) { ScrnColors *pOld= pOldColors; Pixel tmpPix; @@ -864,11 +818,7 @@ char *tmpName; } Boolean -AllocateColor(pTerm,pNew,ndx,name) -XgtermWidget pTerm; -ScrnColors *pNew; -int ndx; -char *name; +AllocateColor(XgtermWidget pTerm, ScrnColors *pNew, int ndx, char *name) { XColor def; TScreen *screen= &pTerm->screen; @@ -889,10 +839,7 @@ char *newName; } Boolean -ChangeColorsRequest(pTerm,start,names) -XgtermWidget pTerm; -int start; -char *names; +ChangeColorsRequest(XgtermWidget pTerm, int start, char *names) { char *thisName; ScrnColors newColors; @@ -942,9 +889,7 @@ int i,ndx; #ifndef DEBUG /* ARGSUSED */ #endif -Panic(s, a) -char *s; -int a; +Panic(char *s, int a) { #ifdef DEBUG if(debug) { @@ -956,8 +901,7 @@ int a; #endif /* DEBUG */ } -char *SysErrorMsg (n) - int n; +char *SysErrorMsg (int n) { #if __STDC__ return strerror(n); @@ -968,8 +912,7 @@ char *SysErrorMsg (n) } -SysError (i) -int i; +SysError (int i) { int oerrno; @@ -980,8 +923,7 @@ int i; Cleanup(i); } -Error (i) -int i; +Error (int i) { fprintf (stderr, "%s: Error %d\n", xgterm_name, i); Cleanup(i); @@ -991,8 +933,7 @@ int i; /* * cleanup by sending SIGHUP to client processes */ -Cleanup (code) -int code; +Cleanup (int code) { extern XgtermWidget term; TScreen *screen; @@ -1012,8 +953,7 @@ int code; * to have to do a realloc(). */ void -Setenv (var, value) -char *var, *value; +Setenv (char *var, char *value) { extern char **environ; int envindex = 0; @@ -1044,8 +984,7 @@ char *var, *value; * returns a pointer to the first occurrence of s2 in s1, * or NULL if there are none. */ -char *strindex (s1, s2) -char *s1, *s2; +char *strindex (char *s1, char *s2) { char *s3; int s2len = strlen (s2); @@ -1064,14 +1003,12 @@ char *s1, *s2; * depending upon the value of the environment variable XGXERROR, if defined. */ /*ARGSUSED*/ -xerror (display, event) -Display *display; -XErrorEvent *event; +xerror (Display *display, XErrorEvent *event) { static char *envvar = "XGXERROR"; static char *env_maxerrs = "XGMAXERROR"; static int nerrs = 0, maxerrs = -1; - extern char *getenv(); + extern char *getenv(const char *); char fname[128]; char *action = NULL, *err = NULL; int pid; @@ -1134,8 +1071,7 @@ XErrorEvent *event; } /*ARGSUSED*/ -xioerror(dpy) -Display *dpy; +xioerror(Display *dpy) { (void) fprintf (stderr, "%s: fatal IO error %d (%s) or KillClient on X server \"%s\"\r\n", @@ -1145,8 +1081,7 @@ Display *dpy; Exit(ERROR_XIOERROR); } -void xt_error(message) - String message; +void xt_error(String message) { extern char *ProgramName; @@ -1154,8 +1089,7 @@ void xt_error(message) exit(1); } -XStrCmp(s1, s2) -char *s1, *s2; +XStrCmp(char *s1, char *s2) { if (s1 && s2) return(strcmp(s1, s2)); if (s1 && *s1) return(1); @@ -1163,18 +1097,14 @@ char *s1, *s2; return(0); } -static void withdraw_window (dpy, w, scr) - Display *dpy; - Window w; - int scr; +static void withdraw_window (Display *dpy, Window w, int scr) { (void) XmuUpdateMapHints (dpy, w, NULL); XWithdrawWindow (dpy, w, scr); return; } -void set_vt_visibility (on) - Boolean on; +void set_vt_visibility (Boolean on) { TScreen *screen = &term->screen; @@ -1203,8 +1133,7 @@ void set_vt_visibility (on) extern Atom wm_delete_window; /* for ICCCM delete window */ -void set_tek_visibility (on) -Boolean on; +void set_tek_visibility (Boolean on) { TScreen *screen = &term->screen; if (on) { @@ -1223,7 +1152,7 @@ Boolean on; update_vtshow(); } -void end_tek_mode () +void end_tek_mode (void) { TScreen *screen = &term->screen; @@ -1239,7 +1168,7 @@ void end_tek_mode () } } -void end_vt_mode () +void end_vt_mode (void) { TScreen *screen = &term->screen; @@ -1256,8 +1185,8 @@ void end_vt_mode () return; } -void switch_modes (tovt) - Bool tovt; /* if true, then become vt mode */ +void switch_modes (int tovt) + /* if true, then become vt mode */ { if (tovt) gt_tekmode (0); @@ -1275,7 +1204,7 @@ void switch_modes (tovt) update_vtshow(); } -void hide_vt_window () +void hide_vt_window (void) { TScreen *screen = &term->screen; @@ -1283,7 +1212,7 @@ void hide_vt_window () switch_modes (False); } -void hide_tek_window () +void hide_tek_window (void) { TScreen *screen = &term->screen; @@ -1302,11 +1231,11 @@ void hide_tek_window () * passes in the display and toplevel widget for this connection. */ void -gtermio_connect (notused, display, toplevel, state) -int notused; -Display *display; /* UI display */ -Widget toplevel; /* toplevel widget */ -int state; /* 1=open, 0=close */ +gtermio_connect (int notused, Display *display, Widget toplevel, int state) + + /* UI display */ + /* toplevel widget */ + /* 1=open, 0=close */ { TScreen *screen = &term->screen; @@ -1326,7 +1255,7 @@ int state; /* 1=open, 0=close */ * vt100 and graphics mode. */ static void -set_workstation_state (state) +set_workstation_state (int state) { TScreen *screen = &term->screen; @@ -1340,8 +1269,8 @@ set_workstation_state (state) update_vttekmode(); } -void gtermio_open_workstation() { set_workstation_state(1); } -void gtermio_close_workstation() { set_workstation_state(0); } +void gtermio_open_workstation(void) { set_workstation_state(1); } +void gtermio_close_workstation(void) { set_workstation_state(0); } /* GTERMIO protocol module functions. @@ -1362,9 +1291,7 @@ int (*gtermio_SGMT)(); XtPointer gtermio_SGMT_data; * graphics data, activate or deactivate the graphics window, and so on. */ void -gtermio_register (functions, nfunc) -struct GT_function *functions; -int nfunc; +gtermio_register (struct GT_function *functions, int nfunc) { struct GT_function *fp; int i; @@ -1406,8 +1333,7 @@ int nfunc; * from Xgterm. */ char * -gtermio_getResource (name) -char *name; +gtermio_getResource (char *name) { if (strcmp (name, "geometry") == 0) return (term->misc.T_geometry); @@ -1418,7 +1344,7 @@ char *name; /* gt_reset -- Reset the graphics window. */ void -gt_reset() +gt_reset(void) { if (gtermio_reset) (*gtermio_reset)(gtermio_reset_data); @@ -1427,7 +1353,7 @@ gt_reset() /* gt_clear -- Clear the graphics window. */ void -gt_clear() +gt_clear(void) { if (gtermio_clear) (*gtermio_clear)(gtermio_clear_data); @@ -1438,9 +1364,7 @@ gt_clear() * returned as the function value. */ int -gt_input (bptr, bcnt) -char *bptr; -int bcnt; +gt_input (char *bptr, int bcnt) { if (gtermio_input) return ((*gtermio_input)(gtermio_input_data, bptr, bcnt)); @@ -1452,7 +1376,7 @@ int bcnt; * graphics data is processed and output to the screen. */ int -gt_flush() +gt_flush(void) { if (gtermio_output) return ((*gtermio_output) (gtermio_output_data)); @@ -1463,7 +1387,7 @@ gt_flush() /* gt_activate -- Activate the graphics window. */ void -gt_activate() +gt_activate(void) { if (gtermio_activate) (*gtermio_activate)(gtermio_activate_data, 1); @@ -1472,7 +1396,7 @@ gt_activate() /* gt_deactivate -- Deactivate the graphics window. */ void -gt_deactivate() +gt_deactivate(void) { if (gtermio_activate) (*gtermio_activate)(gtermio_activate_data, 0); @@ -1481,7 +1405,7 @@ gt_deactivate() /* gt_activated -- Test whether the graphics window is activated. */ int -gt_activated() +gt_activated(void) { if (gtermio_activate) return ((*gtermio_activate)(gtermio_activate_data, 2)); @@ -1492,7 +1416,7 @@ gt_activated() /* gt_status -- Test whether the graphics window is instantiated or reset. */ int -gt_status() +gt_status(void) { if (gtermio_status) { char name[256]; @@ -1516,8 +1440,7 @@ gt_status() * be directed to the text window. */ int -gt_enable (state) -int state; +gt_enable (int state) { if (gtermio_enable) return ((*gtermio_enable)(gtermio_enable_data, state)); @@ -1528,8 +1451,7 @@ int state; /* gt_tekmode -- Activate the graphics window. */ int -gt_tekmode (state) -int state; +gt_tekmode (int state) { TScreen *screen = &term->screen; int tekEmu; @@ -1546,8 +1468,7 @@ int state; * cursor read value in the gtermio code. */ void -gt_set_ginmode_trailers (trailers) -char *trailers; +gt_set_ginmode_trailers (char *trailers) { if (gtermio_SGMT) (*gtermio_SGMT)(gtermio_SGMT_data, trailers); diff --git a/xgterm/ptyx.h b/xgterm/ptyx.h index ef69a12..5630f7c 100644 --- a/xgterm/ptyx.h +++ b/xgterm/ptyx.h @@ -551,7 +551,7 @@ typedef struct _XgtermWidgetRec { #define I_SIGNAL 0x02 #define I_TEK 0x04 -extern Cursor make_colored_cursor(); -extern int GetBytesAvailable(); -extern void first_map_occurred(); -extern int kill_process_group(); +extern Cursor make_colored_cursor(int cursorindex, long unsigned int fg, long unsigned int bg); +extern int GetBytesAvailable(int fd); +extern void first_map_occurred(void); +extern int kill_process_group(int pid, int sig); diff --git a/xgterm/screen.c b/xgterm/screen.c index c77de84..e8455d6 100644 --- a/xgterm/screen.c +++ b/xgterm/screen.c @@ -51,7 +51,7 @@ #endif -ScrnBuf Allocate (nrow, ncol, addr) +ScrnBuf Allocate (int nrow, int ncol, Char **addr) /* allocates memory for a 2-dimensional array of chars and returns a pointer thereto @@ -61,8 +61,8 @@ ScrnBuf Allocate (nrow, ncol, addr) > character array, the second one is the attributes, the third is the > foreground color, and the fourth is the background color. */ -int nrow, ncol; -Char **addr; + + { ScrnBuf base; Char *tmp; @@ -87,10 +87,7 @@ Char **addr; * (Return value only necessary with SouthWestGravity.) */ static -Reallocate(sbuf, sbufaddr, nrow, ncol, oldrow, oldcol) - ScrnBuf *sbuf; - Char **sbufaddr; - int nrow, ncol, oldrow, oldcol; +Reallocate(ScrnBuf *sbuf, Char **sbufaddr, int nrow, int ncol, int oldrow, int oldcol) { ScrnBuf base; Char *tmp; @@ -163,16 +160,16 @@ Reallocate(sbuf, sbufaddr, nrow, ncol, oldrow, oldcol) } void -ScreenWrite (screen, str, flags, cur_fg, cur_bg, length) +ScreenWrite (TScreen *screen, char *str, unsigned int flags, unsigned int cur_fg, unsigned int cur_bg, int length) /* Writes str into buf at row row and column col. Characters are set to match flags. */ -TScreen *screen; -char *str; -unsigned flags; -unsigned cur_fg, cur_bg; -int length; /* length of string */ + + + + + /* length of string */ { Char *attrs, *attrs0, *fgs, *bgs; int avail = screen->max_col - screen->cur_col + 1; @@ -203,16 +200,16 @@ int length; /* length of string */ *attrs0 |= LINEWRAPPED; } -ScrnInsertLine (sb, last, where, n, size) +ScrnInsertLine (ScrnBuf sb, int last, int where, int n, int size) /* Inserts n blank lines at sb + where, treating last as a bottom margin. Size is the size of each entry in sb. Requires: 0 <= where < where + n <= last n <= MAX_ROWS */ -ScrnBuf sb; -int last; -int where, n, size; + + + { int i; char *save [4 * MAX_ROWS]; @@ -243,16 +240,16 @@ int where, n, size; } -ScrnDeleteLine (sb, last, where, n, size) +ScrnDeleteLine (ScrnBuf sb, int last, int where, int n, int size) /* Deletes n lines at sb + where, treating last as a bottom margin. Size is the size of each entry in sb. Requires 0 <= where < where + n < = last n <= MAX_ROWS */ -ScrnBuf sb; -int n, last, size; -int where; + + + { int i; char *save [4 * MAX_ROWS]; @@ -274,13 +271,13 @@ int where; } -ScrnInsertChar (sb, row, col, n, size) +ScrnInsertChar (ScrnBuf sb, int row, int col, int n, int size) /* Inserts n blanks in sb at row, col. Size is the size of each row. */ - ScrnBuf sb; - int row, size; - int col, n; + + + { int i, j; Char *ptr = sb [4 * row]; @@ -303,13 +300,13 @@ ScrnInsertChar (sb, row, col, n, size) } -ScrnDeleteChar (sb, row, col, n, size) +ScrnDeleteChar (ScrnBuf sb, int row, int col, int n, int size) /* Deletes n characters in sb at row, col. Size is the size of each row. */ - ScrnBuf sb; - int row, size; - int n, col; + + + { Char *ptr = sb[4 * row]; Char *attrs = sb[4 * row + 1]; @@ -325,16 +322,16 @@ ScrnDeleteChar (sb, row, col, n, size) } -ScrnRefresh (screen, toprow, leftcol, nrows, ncols, force) +ScrnRefresh (TScreen *screen, int toprow, int leftcol, int nrows, int ncols, Boolean force) /* Repaints the area enclosed by the parameters. Requires: (toprow, leftcol), (toprow + nrows, leftcol + ncols) are coordinates of characters in screen; nrows and ncols positive. */ -TScreen *screen; -int toprow, leftcol, nrows, ncols; -Boolean force; /* ... leading/trailing spaces */ + + + /* ... leading/trailing spaces */ { int y = toprow * FontHeight(screen) + screen->border + screen->fnt_norm->ascent; @@ -525,13 +522,13 @@ Boolean force; /* ... leading/trailing spaces */ } } -ClearBufRows (screen, first, last) +ClearBufRows (TScreen *screen, int first, int last) /* Sets the rows first though last of the buffer of screen to spaces. Requires first <= last; first, last are rows of screen->buf. */ -TScreen *screen; -int first, last; + + { first *= 4; last = 4 * last + 3; @@ -555,10 +552,7 @@ int first, last; 7. Clears origin mode and sets scrolling region to be entire screen. 8. Returns 0 */ -ScreenResize (screen, width, height, flags) - TScreen *screen; - int width, height; - unsigned *flags; +ScreenResize (TScreen *screen, int width, int height, unsigned int *flags) { int rows, cols; int border = 2 * screen->border; @@ -707,11 +701,11 @@ ScreenResize (screen, width, height, flags) * over the end of the line, it stops at the end of the line. */ void -ScrnSetAttributes(screen, row, col, mask, value, length) -TScreen *screen; -int row, col; -unsigned mask, value; -int length; /* length of string */ +ScrnSetAttributes(TScreen *screen, int row, int col, unsigned int mask, unsigned int value, int length) + + + + /* length of string */ { Char *attrs; int avail = screen->max_col - col + 1; @@ -736,11 +730,11 @@ int length; /* length of string */ * the number of bytes of attributes (<= length) */ int -ScrnGetAttributes(screen, row, col, str, length) -TScreen *screen; -int row, col; -Char *str; -int length; /* length of string */ +ScrnGetAttributes(TScreen *screen, int row, int col, Char *str, int length) + + + + /* length of string */ { Char *attrs; int avail = screen->max_col - col + 1; @@ -758,9 +752,7 @@ int length; /* length of string */ return ret; } Bool -non_blank_line(sb, row, col, len) -ScrnBuf sb; -int row, col, len; +non_blank_line(ScrnBuf sb, int row, int col, int len) { int i; Char *ptr = sb [4 * row]; diff --git a/xgterm/scrollbar.c b/xgterm/scrollbar.c index ffe3900..b4fb4d4 100644 --- a/xgterm/scrollbar.c +++ b/xgterm/scrollbar.c @@ -43,19 +43,17 @@ /* Event handlers */ -static void ScrollTextTo(); -static void ScrollTextUpDownBy(); +static void ScrollTextTo(Widget scrollbarWidget, XtPointer client_data, XtPointer call_data); +static void ScrollTextUpDownBy(Widget scrollbarWidget, XtPointer client_data, XtPointer call_data); -void ScrollBarOn(), ScrollBarOff(), WindowScroll(); +void ScrollBarOn(XgtermWidget xw, int init, int doalloc), ScrollBarOff(TScreen *screen), WindowScroll(TScreen *screen, int top); /* resize the text window for a terminal screen, modifying the * appropriate WM_SIZE_HINTS and taking advantage of bit gravity. */ -static void ResizeScreen(xw, min_width, min_height ) - XgtermWidget xw; - int min_width, min_height; +static void ResizeScreen(XgtermWidget xw, int min_width, int min_height) { TScreen *screen = &xw->screen; #ifndef nothack @@ -161,17 +159,14 @@ static void ResizeScreen(xw, min_width, min_height ) #endif } -void DoResizeScreen (xw) - XgtermWidget xw; +void DoResizeScreen (XgtermWidget xw) { int border = 2 * xw->screen.border; ResizeScreen (xw, border + xw->screen.scrollbar, border); } -static Widget CreateScrollBar(xw, x, y, height) - XgtermWidget xw; - int x, y, height; +static Widget CreateScrollBar(XgtermWidget xw, int x, int y, int height) { Widget scrollWidget; @@ -196,16 +191,13 @@ static Widget CreateScrollBar(xw, x, y, height) return (scrollWidget); } -static void RealizeScrollBar (sbw, screen) - Widget sbw; - TScreen *screen; +static void RealizeScrollBar (Widget sbw, TScreen *screen) { XtRealizeWidget (sbw); } -ScrollBarReverseVideo(scrollWidget) - Widget scrollWidget; +ScrollBarReverseVideo(Widget scrollWidget) { Arg args[4]; int nargs = XtNumber(args); @@ -230,8 +222,7 @@ ScrollBarReverseVideo(scrollWidget) -ScrollBarDrawThumb(scrollWidget) - Widget scrollWidget; +ScrollBarDrawThumb(Widget scrollWidget) { TScreen *screen = &term->screen; int thumbTop, thumbHeight, totalHeight; @@ -246,10 +237,7 @@ ScrollBarDrawThumb(scrollWidget) } -ResizeScrollBar(scrollWidget, x, y, height) - Widget scrollWidget; - int x, y; - unsigned height; +ResizeScrollBar(Widget scrollWidget, int x, int y, unsigned int height) { XtConfigureWidget(scrollWidget, x, y, scrollWidget->core.width, height, scrollWidget->core.border_width); @@ -259,9 +247,7 @@ ResizeScrollBar(scrollWidget, x, y, height) } void -WindowScroll(screen, top) - TScreen *screen; - int top; +WindowScroll(TScreen *screen, int top) { int i, lines; int scrolltop, scrollheight, refreshtop; @@ -309,9 +295,7 @@ WindowScroll(screen, top) void -ScrollBarOn (xw, init, doalloc) - XgtermWidget xw; - int init, doalloc; +ScrollBarOn (XgtermWidget xw, int init, int doalloc) { TScreen *screen = &xw->screen; int border = 2 * screen->border; @@ -384,8 +368,7 @@ ScrollBarOn (xw, init, doalloc) } void -ScrollBarOff(screen) - TScreen *screen; +ScrollBarOff(TScreen *screen) { if(!screen->scrollbar) return; @@ -400,10 +383,7 @@ ScrollBarOff(screen) } /*ARGSUSED*/ -static void ScrollTextTo(scrollbarWidget, client_data, call_data) - Widget scrollbarWidget; - XtPointer client_data; - XtPointer call_data; +static void ScrollTextTo(Widget scrollbarWidget, XtPointer client_data, XtPointer call_data) { float *topPercent = (float *) call_data; TScreen *screen = &term->screen; @@ -422,10 +402,7 @@ static void ScrollTextTo(scrollbarWidget, client_data, call_data) } /*ARGSUSED*/ -static void ScrollTextUpDownBy(scrollbarWidget, client_data, call_data) - Widget scrollbarWidget; - XtPointer client_data; - XtPointer call_data; +static void ScrollTextUpDownBy(Widget scrollbarWidget, XtPointer client_data, XtPointer call_data) { int pixels = (int) call_data; @@ -447,8 +424,7 @@ static void ScrollTextUpDownBy(scrollbarWidget, client_data, call_data) /* * assume that b is lower case and allow plural */ -static int specialcmplowerwiths (a, b) - char *a, *b; +static int specialcmplowerwiths (char *a, char *b) { char ca, cb; @@ -473,10 +449,7 @@ static int specialcmplowerwiths (a, b) return 0; } -static int params_to_pixels (screen, params, n) - TScreen *screen; - String *params; - int n; +static int params_to_pixels (TScreen *screen, String *params, int n) { int mult = 1; char *s; @@ -506,11 +479,7 @@ static int params_to_pixels (screen, params, n) /*ARGSUSED*/ -void HandleScrollForward (gw, event, params, nparams) - Widget gw; - XEvent *event; - String *params; - Cardinal *nparams; +void HandleScrollForward (Widget gw, XEvent *event, String *params, Cardinal *nparams) { XgtermWidget w = (XgtermWidget) gw; TScreen *screen = &w->screen; @@ -522,11 +491,7 @@ void HandleScrollForward (gw, event, params, nparams) /*ARGSUSED*/ -void HandleScrollBack (gw, event, params, nparams) - Widget gw; - XEvent *event; - String *params; - Cardinal *nparams; +void HandleScrollBack (Widget gw, XEvent *event, String *params, Cardinal *nparams) { XgtermWidget w = (XgtermWidget) gw; TScreen *screen = &w->screen; diff --git a/xgterm/tabs.c b/xgterm/tabs.c index bdb39c5..7376cde 100644 --- a/xgterm/tabs.c +++ b/xgterm/tabs.c @@ -37,8 +37,7 @@ /* * places tabstops at only every 8 columns */ -TabReset(tabs) -Tabs tabs; +TabReset(unsigned int *tabs) { int i; @@ -53,9 +52,7 @@ Tabs tabs; /* * places a tabstop at col */ -TabSet(tabs, col) - Tabs tabs; - int col; +TabSet(unsigned int *tabs, int col) { tabs[col >> 5] |= (1 << (col & 31)); } @@ -63,9 +60,7 @@ TabSet(tabs, col) /* * clears a tabstop at col */ -TabClear(tabs, col) - Tabs tabs; - int col; +TabClear(unsigned int *tabs, int col) { tabs[col >> 5] &= ~(1 << (col & 31)); } @@ -75,9 +70,7 @@ TabClear(tabs, col) * (or MAX_TABS - 1 if there are no more). * A tabstop at col is ignored. */ -TabNext (tabs, col) - Tabs tabs; - int col; +TabNext (unsigned int *tabs, int col) { extern XgtermWidget term; TScreen *screen = &term->screen; @@ -96,8 +89,7 @@ TabNext (tabs, col) /* * clears all tabs */ -TabZonk (tabs) -Tabs tabs; +TabZonk (unsigned int *tabs) { int i; diff --git a/xgterm/util.c b/xgterm/util.c index 35396a3..c48c4bc 100644 --- a/xgterm/util.c +++ b/xgterm/util.c @@ -34,20 +34,19 @@ #include -static void horizontal_copy_area(); -static void vertical_copy_area(); -void scrolling_copy_area(); +static void horizontal_copy_area(TScreen *screen, int firstchar, int nchars, int amount); +static void vertical_copy_area(TScreen *screen, int firstline, int nlines, int amount); +void scrolling_copy_area(TScreen *screen, int firstline, int nlines, int amount); -void Scroll(), InsertLine(), DeleteLine(), CopyWait(), recolor_cursor(); -void ShowCursor(), HideCursor(); -void ClearScreen(), ClearLeft(), ClearRight(); +void Scroll(TScreen *screen, int amount), InsertLine(TScreen *screen, int n), DeleteLine(TScreen *screen, int n), CopyWait(TScreen *screen), recolor_cursor(Cursor cursor, long unsigned int fg, long unsigned int bg); +void ShowCursor(void), HideCursor(void); +void ClearScreen(TScreen *screen), ClearLeft(TScreen *screen), ClearRight(TScreen *screen); /* * These routines are used for the jump scroll feature */ void -FlushScroll(screen) -TScreen *screen; +FlushScroll(TScreen *screen) { int i; int shift = -screen->topline; @@ -130,8 +129,7 @@ TScreen *screen; } int -AddToRefresh(screen) -TScreen *screen; +AddToRefresh(TScreen *screen) { int amount = screen->refresh_amt; int row = screen->cur_row; @@ -165,9 +163,7 @@ TScreen *screen; * requires: amount > 0 */ void -Scroll(screen, amount) -TScreen *screen; -int amount; +Scroll(TScreen *screen, int amount) { int i = screen->bot_marg - screen->top_marg + 1; int shift; @@ -271,9 +267,7 @@ int amount; * Requires: amount > 0 */ void -RevScroll(screen, amount) -TScreen *screen; -int amount; +RevScroll(TScreen *screen, int amount) { int i = screen->bot_marg - screen->top_marg + 1; int shift; @@ -342,9 +336,7 @@ int amount; * bottom margin are lost. */ void -InsertLine (screen, n) -TScreen *screen; -int n; +InsertLine (TScreen *screen, int n) { int i; int shift; @@ -406,9 +398,7 @@ int n; * at the cursor's position, lines added at bottom margin are blank. */ void -DeleteLine(screen, n) -TScreen *screen; -int n; +DeleteLine(TScreen *screen, int n) { int i; int shift; @@ -489,9 +479,7 @@ int n; * Insert n blanks at the cursor's position, no wraparound */ void -InsertChar (screen, n) - TScreen *screen; - int n; +InsertChar (TScreen *screen, int n) { int cx, cy; @@ -533,9 +521,7 @@ InsertChar (screen, n) * Deletes n chars at the cursor's position, no wraparound. */ void -DeleteChar (screen, n) - TScreen *screen; - int n; +DeleteChar (TScreen *screen, int n) { int width; @@ -575,8 +561,7 @@ DeleteChar (screen, n) * Clear from cursor position to beginning of display, inclusive. */ void -ClearAbove (screen) -TScreen *screen; +ClearAbove (TScreen *screen) { int top, height; @@ -605,8 +590,7 @@ TScreen *screen; * Clear from cursor position to end of display, inclusive. */ void -ClearBelow (screen) -TScreen *screen; +ClearBelow (TScreen *screen) { int top; @@ -630,8 +614,7 @@ TScreen *screen; * Clear last part of cursor's line, inclusive. */ void -ClearRight (screen) -TScreen *screen; +ClearRight (TScreen *screen) { if(screen->cursor_state) HideCursor(); @@ -664,8 +647,7 @@ TScreen *screen; * Clear first part of cursor's line, inclusive. */ void -ClearLeft (screen) - TScreen *screen; +ClearLeft (TScreen *screen) { int i; Char *cp; @@ -704,8 +686,7 @@ ClearLeft (screen) * Erase the cursor's line. */ void -ClearLine(screen) -TScreen *screen; +ClearLine(TScreen *screen) { if(screen->cursor_state) HideCursor(); @@ -730,8 +711,7 @@ TScreen *screen; } void -ClearScreen(screen) -TScreen *screen; +ClearScreen(TScreen *screen) { int top; @@ -756,8 +736,7 @@ TScreen *screen; } void -CopyWait(screen) -TScreen *screen; +CopyWait(TScreen *screen) { XEvent reply; XEvent *rep = &reply; @@ -798,11 +777,7 @@ TScreen *screen; * used by vertical_copy_area and and horizontal_copy_area */ static void -copy_area(screen, src_x, src_y, width, height, dest_x, dest_y) - TScreen *screen; - int src_x, src_y; - unsigned int width, height; - int dest_x, dest_y; +copy_area(TScreen *screen, int src_x, int src_y, unsigned int width, unsigned int height, int dest_x, int dest_y) { /* wait for previous CopyArea to complete unless multiscroll is enabled and active */ @@ -828,11 +803,11 @@ copy_area(screen, src_x, src_y, width, height, dest_x, dest_y) * use when inserting or deleting characters on the current line */ static void -horizontal_copy_area(screen, firstchar, nchars, amount) - TScreen *screen; - int firstchar; /* char pos on screen to start copying at */ - int nchars; - int amount; /* number of characters to move right */ +horizontal_copy_area(TScreen *screen, int firstchar, int nchars, int amount) + + /* char pos on screen to start copying at */ + + /* number of characters to move right */ { int src_x = CursorX(screen, firstchar); int src_y = CursorY(screen, screen->cur_row); @@ -846,11 +821,11 @@ horizontal_copy_area(screen, firstchar, nchars, amount) * use when inserting or deleting lines from the screen */ static void -vertical_copy_area(screen, firstline, nlines, amount) - TScreen *screen; - int firstline; /* line on screen to start copying at */ - int nlines; - int amount; /* number of lines to move up (neg=down) */ +vertical_copy_area(TScreen *screen, int firstline, int nlines, int amount) + + /* line on screen to start copying at */ + + /* number of lines to move up (neg=down) */ { if(nlines > 0) { int src_x, src_y; @@ -870,11 +845,11 @@ vertical_copy_area(screen, firstline, nlines, amount) * use when scrolling the entire screen */ void -scrolling_copy_area(screen, firstline, nlines, amount) - TScreen *screen; - int firstline; /* line on screen to start copying at */ - int nlines; - int amount; /* number of lines to move up (neg=down) */ +scrolling_copy_area(TScreen *screen, int firstline, int nlines, int amount) + + /* line on screen to start copying at */ + + /* number of lines to move up (neg=down) */ { if(nlines > 0) { @@ -887,9 +862,7 @@ scrolling_copy_area(screen, firstline, nlines, amount) * Returns 1 iff the area where the cursor was got refreshed. */ int -HandleExposure (screen, event) - TScreen *screen; - XEvent *event; +HandleExposure (TScreen *screen, XEvent *event) { XExposeEvent *reply = (XExposeEvent *)event; @@ -933,10 +906,7 @@ HandleExposure (screen, event) * The rectangle passed in is pixel coordinates. */ int -handle_translated_exposure (screen, rect_x, rect_y, rect_width, rect_height) - TScreen *screen; - int rect_x, rect_y; - unsigned int rect_width, rect_height; +handle_translated_exposure (TScreen *screen, int rect_x, int rect_y, unsigned int rect_width, unsigned int rect_height) { int toprow, leftcol, nrows, ncols; extern Bool waiting_for_initial_map; @@ -988,8 +958,7 @@ handle_translated_exposure (screen, rect_x, rect_y, rect_width, rect_height) } void -ReverseVideo (termw) - XgtermWidget termw; +ReverseVideo (XgtermWidget termw) { TScreen *screen = &termw->screen; GC tmpGC; @@ -1034,9 +1003,9 @@ ReverseVideo (termw) void -recolor_cursor (cursor, fg, bg) - Cursor cursor; /* X cursor ID to set */ - unsigned long fg, bg; /* pixel indexes to look up */ +recolor_cursor (Cursor cursor, long unsigned int fg, long unsigned int bg) + /* X cursor ID to set */ + /* pixel indexes to look up */ { TScreen *screen = &term->screen; Display *dpy = screen->display; @@ -1053,9 +1022,7 @@ recolor_cursor (cursor, fg, bg) void -GetColors(term,pColors) - XgtermWidget term; - ScrnColors *pColors; +GetColors(XgtermWidget term, ScrnColors *pColors) { TScreen *screen = &term->screen; GC tmpGC; @@ -1072,9 +1039,7 @@ GetColors(term,pColors) void -ChangeColors(term,pNew) - XgtermWidget term; - ScrnColors *pNew; +ChangeColors(XgtermWidget term, ScrnColors *pNew) { TScreen *screen = &term->screen; GC tmpGC; From 2a0ee01dd4b844b6ea42f5ab7a8fe9137dbe969d Mon Sep 17 00:00:00 2001 From: Ole Streicher Date: Fri, 9 Aug 2024 20:41:14 +0200 Subject: [PATCH 17/21] Cast function parameters if needed --- obm/Obm.c | 7 ++-- obm/ObmP.h | 4 +-- obm/ObmW/Gterm.c | 4 +-- obm/ObmW/Gterm.h | 4 +-- obm/ObmW/GtermGraphics.c | 2 +- obm/ObmW/GtermImaging.c | 2 +- obm/ObmW/GtermMarker.c | 20 +++++------ obm/ObmW/ListTree.c | 6 ++-- obm/ObmW/Table.c | 11 +++--- obm/gterm.c | 14 ++++---- obm/marker.c | 10 +++--- xgterm/button.c | 8 ++--- xgterm/gtermio.c | 12 +++---- xgterm/menu.c | 6 ++-- xgterm/misc.c | 1 + ximtool/fitsio.c | 6 ++-- ximtool/iis.c | 4 +-- ximtool/irafio.c | 22 ++++++------ ximtool/ism.c | 6 ++-- ximtool/load.c | 6 ++-- ximtool/logo.c | 2 +- ximtool/quant.c | 9 ++--- ximtool/raster.c | 75 +++++++++++++++++++++------------------- ximtool/util.c | 2 +- ximtool/ximclient.c | 17 +++------ ximtool/ximtool.h | 8 ++++- ximtool/zscale.c | 2 +- 27 files changed, 137 insertions(+), 133 deletions(-) diff --git a/obm/Obm.c b/obm/Obm.c index e8d07c3..5d96e2c 100644 --- a/obm/Obm.c +++ b/obm/Obm.c @@ -909,7 +909,7 @@ obmUndisplay (ObmContext obm, ObmObject obj) /* obmGetClassrec -- Get the class record for the named class. */ ObjClassRec -obmGetClassrec (char *classname) +obmGetClassrec (const char *classname) { ObjClassRec classrec; int i; @@ -995,9 +995,10 @@ obmRemoveCallback (ObmCallback *callback_list, ObmCallback callback) * the given Tcl interepter. */ int -obmClientCommand (Tcl_Interp *tcl, char *commmand) +obmClientCommand (Tcl_Interp *tcl, const char *commmand) { - char *ip, *op; + const char *ip; + char *op; char name[SZ_NAME]; Tcl_CmdInfo info; diff --git a/obm/ObmP.h b/obm/ObmP.h index 5051f16..46bf273 100644 --- a/obm/ObmP.h +++ b/obm/ObmP.h @@ -520,10 +520,10 @@ typedef unsigned char uchar; typedef struct widgetObject *WidgetObject; -int obmClientCommand (Tcl_Interp *tcl, char *commmand); +int obmClientCommand (Tcl_Interp *tcl, const char *commmand); extern int obmClass(struct objClassRec *classrec, long unsigned int flag1, long unsigned int flag2); extern ObmObject obmFindObject(struct obmContext *obm, const char *object); -extern ObjClassRec obmGetClassrec(char *classname); +extern ObjClassRec obmGetClassrec(const char *classname); extern Widget widgetGetPointer(struct obmObject *object); extern ObmCallback obmAddCallback(struct _obmCallback **callback_list); extern void widget_setTTName(WidgetObject obj, char *name); diff --git a/obm/ObmW/Gterm.c b/obm/ObmW/Gterm.c index 3f7756a..b11d089 100644 --- a/obm/ObmW/Gterm.c +++ b/obm/ObmW/Gterm.c @@ -650,7 +650,7 @@ GtermClassRec gtermClassRec = { /* class_initialize */ XawInitializeWidgetSet, /* class_part_initialize */ NULL, /* class_inited */ False, - /* initialize */ Initialize, + /* initialize */ (XtInitProc)Initialize, /* initialize_hook */ NULL, /* realize */ Realize, /* actions */ gtermActionsList, @@ -665,7 +665,7 @@ GtermClassRec gtermClassRec = { /* destroy */ Destroy, /* resize */ Resize, /* expose */ Redisplay, - /* set_values */ SetValues, + /* set_values */ (XtSetValuesFunc)SetValues, /* set_values_hook */ NULL, /* set_values_almost */ XtInheritSetValuesAlmost, /* get_values_hook */ NULL, diff --git a/obm/ObmW/Gterm.h b/obm/ObmW/Gterm.h index cfe074e..069f008 100644 --- a/obm/ObmW/Gterm.h +++ b/obm/ObmW/Gterm.h @@ -404,7 +404,7 @@ extern void GtOverrideTranslations(GtermWidget w, char *translations); extern void GtWriteAlphaCursor(GtermWidget w, int x, int y); extern void GtEraseAlphaCursor(GtermWidget w); extern void GtSetTextRes(GtermWidget w, int optrows, int optcols); -extern void GtReadIomap(GtermWidget w, uchar *iomap, int first, int nelem); +extern void GtReadIomap(GtermWidget w, ushort *iomap, int first, int nelem); extern void GtWriteIomap(GtermWidget w, ushort *iomap, int first, int nelem); extern void GtReadLUT(GtermWidget w, long unsigned int *lut, int first, int nelem); @@ -412,7 +412,7 @@ extern void GmAddCallback(struct marker *gm, int events, GmIMethod func, XtPoint extern void GmDeleteCallback(struct marker *gm, GmIMethod func, XtPointer client_data); extern XtPointer GmCreate(GtermWidget w, int type, int interactive); extern int GmDestroy(struct marker *gm); -extern int GmGetAttribute(struct marker *gm, char *attribute, XtArgVal value, char *type); +extern int GmGetAttribute(struct marker *gm, const char *attribute, XtArgVal value, char *type); extern void GmGetAttributes(struct marker *gm, ArgList args, int nargs, char *argtype); extern void GmGetBoundingBox(struct marker *gm, int *x, int *y, int *width, int *height); extern int GmGetVertices(struct marker *gm, DPoint *points, int first, int maxpts); diff --git a/obm/ObmW/GtermGraphics.c b/obm/ObmW/GtermGraphics.c index e1ced03..6d2e2bc 100644 --- a/obm/ObmW/GtermGraphics.c +++ b/obm/ObmW/GtermGraphics.c @@ -757,7 +757,7 @@ GtSetCursorType (GtermWidget w, int type) if ((interval = w->gterm.ginmodeBlinkInterval)) { XtAppContext appcon = XtWidgetToApplicationContext ((Widget) w); id = XtAppAddTimeOut (appcon, - interval, blink_cursor, (XtPointer)w); + interval, (XtTimerCallbackProc)blink_cursor, (XtPointer)w); } else id = (XtIntervalId) NULL; break; diff --git a/obm/ObmW/GtermImaging.c b/obm/ObmW/GtermImaging.c index 840f06f..a177090 100644 --- a/obm/ObmW/GtermImaging.c +++ b/obm/ObmW/GtermImaging.c @@ -1901,7 +1901,7 @@ GtWriteIomap (GtermWidget w, ushort *iomap, int first, int nelem) /* GtReadIomap -- Read back the contents of the iomap. */ void -GtReadIomap (GtermWidget w, uchar *iomap, int first, int nelem) +GtReadIomap (GtermWidget w, ushort *iomap, int first, int nelem) { int c1, c2; diff --git a/obm/ObmW/GtermMarker.c b/obm/ObmW/GtermMarker.c index 7ebf505..be4c7cc 100644 --- a/obm/ObmW/GtermMarker.c +++ b/obm/ObmW/GtermMarker.c @@ -64,7 +64,7 @@ static void gm_text_init(struct marker *gm, int interactive), gm_line_init(struc static void gm_boxx_init(struct marker *gm, int interactive), gm_circ_init(struct marker *gm, int interactive), gm_elip_init(struct marker *gm, int interactive), gm_pgon_init(struct marker *gm, int interactive); static int gm_putint(int ival, XtArgVal value, char *type), gm_putfloat(double fval, XtArgVal value, char *type), gm_do_callbacks(struct marker *gm, int events, XEvent *event, String *params, Cardinal nparams); static void gm_constraint(struct marker *gm, struct marker *new_gm, int what); -static int gm_getint(XtArgVal value, char *type), gm_getattribute(char *attribute), gm_gettype(char *type); +static int gm_getint(XtArgVal value, char *type), gm_getattribute(const char *attribute), gm_gettype(char *type); static double gm_getfloat(XtArgVal value, char *type); static char *gm_getstring(XtArgVal value, char *type); @@ -196,7 +196,7 @@ GtMarkerInit (GtermWidget w) } /* Set the default gterm window translations. */ - gm_load_translations (w, NULL); + gm_load_translations (w, 0); /* Get graphics drawing GC. */ /* gc = XCreateGC (display, w->gterm.root, 0, NULL); */ @@ -261,7 +261,7 @@ GtMarkerFree (GtermWidget w) } /* Set the default gterm window translations. */ - gm_load_translations (w, NULL); + gm_load_translations (w, 0); for (gm = w->gterm.gm_tail; gm; gm = gm->prev) GmDestroy (gm); @@ -373,12 +373,12 @@ gm_focusout (GtermWidget w, int enableSetTrans) static void gm_refocus (GtermWidget w) { - XMotionEvent event; + XEvent event; int nparams = 0; event.type = MotionNotify; /* MF009 */ - event.x = w->gterm.last_x; - event.y = w->gterm.last_y; + event.xmotion.x = w->gterm.last_x; + event.xmotion.y = w->gterm.last_y; HandleTrackCursor ((Widget)w, &event, NULL, &nparams); } @@ -406,11 +406,11 @@ gm_request_translations (GtermWidget w, struct marker *gm) w->gterm.gm_reqTranslations = gm; if (!w->gterm.useTimers) - gm_load_translations (w, NULL); + gm_load_translations (w, 0); else if (!w->gterm.gm_timer_id) { w->gterm.gm_timer_id = XtAppAddTimeOut (XtWidgetToApplicationContext((Widget)w), 0, - gm_load_translations, (XtPointer)w); + (XtTimerCallbackProc)gm_load_translations, (XtPointer)w); } } @@ -1324,7 +1324,7 @@ GmGetAttributes (struct marker *gm, ArgList args, int nargs, char *argtype) /* GmGetAttribute -- Get the value of a marker attribute. */ int -GmGetAttribute (struct marker *gm, char *attribute, XtArgVal value, char *type) +GmGetAttribute (struct marker *gm, const char *attribute, XtArgVal value, char *type) { GtermWidget w = gm->w; int i; @@ -1991,7 +1991,7 @@ gm_gettype (char *type) static int -gm_getattribute (char *attribute) +gm_getattribute (const char *attribute) { if (strcmp (attribute, GmType) == 0) return (Ga_Type); diff --git a/obm/ObmW/ListTree.c b/obm/ObmW/ListTree.c index 9455ccc..308e99b 100644 --- a/obm/ObmW/ListTree.c +++ b/obm/ObmW/ListTree.c @@ -196,9 +196,9 @@ ListTreeClassRec listtreeClassRec = /* compress_exposure */ XtExposeCompressMultiple, /* compress_enterleave */ True, /* visible_interest */ True, - /* destroy */ Destroy, + /* destroy */ (XtWidgetProc)Destroy, /* resize */ Resize, - /* expose */ Redisplay, + /* expose */ (XtExposeProc)Redisplay, /* set_values */ SetValues, /* set_values_hook */ NULL, /* set_values_almost */ XtInheritSetValuesAlmost, @@ -589,7 +589,7 @@ QueryGeometry(ListTreeWidget lw, XtWidgetGeometry *parent_idea, XtWidgetGeometry if (!parent_wants_w && !parent_wants_h) return (XtGeometryYes); - we_changed_size = Layout(lw, !parent_wants_w, !parent_wants_h, &nw, &nh); + we_changed_size = Layout((Widget)lw, !parent_wants_w, !parent_wants_h, &nw, &nh); our_idea->request_mode |= (CWWidth | CWHeight); our_idea->width = nw; our_idea->height = nh; diff --git a/obm/ObmW/Table.c b/obm/ObmW/Table.c index 6261d03..dc2db12 100644 --- a/obm/ObmW/Table.c +++ b/obm/ObmW/Table.c @@ -1930,10 +1930,11 @@ static char* DummyString(void) return XtNewString(""); } -static char* CopyOnlyPrintable(char *raw) +static char* CopyOnlyPrintable(const char *raw) { char* clear; - char *s,*h; + const char *s; + char *h; int lenght; for(s = raw, lenght = 0; (*s) != '\0';) @@ -2479,7 +2480,7 @@ XawTableDeleteRow (Widget w, int row) Boolean have_find; int i, j; - have_find = go_table((XtPointer)w, CompareCells, STUFF(tw), + have_find = go_table((XtPointer)w, (XawTableProc)CompareCells, STUFF(tw), row, row, 0, COLUMNS(tw)-1, XawTABLE_RIGHT_DOWN, &i, &j, (XtPointer)tw->table.cell_own); @@ -2936,7 +2937,7 @@ XawTableDeleteColumn (Widget w, int column) Boolean have_find; int i, j; - have_find = go_table((XtPointer)w, CompareCells, STUFF(tw), + have_find = go_table((XtPointer)w, (XawTableProc)CompareCells, STUFF(tw), 0, ROWS(tw)-1, column, column, XawTABLE_RIGHT_DOWN, &i, &j, (XtPointer)tw->table.cell_own); @@ -3572,7 +3573,7 @@ XawTableSetColumnJustify (Widget w, int column, XtJustify justify) if (XtIsRealized(w) && w->core.visible && !tw->table.no_redraw && !tw->table.no_refigure) { - (void)go_table((XtPointer)w, PaintCell, STUFF(tw), + (void)go_table((XtPointer)w, (XawTableProc)PaintCell, STUFF(tw), 0, ROWS(tw)-1, column, column, XawTABLE_DOWN_RIGHT, &i, &j, (XtPointer)NULL); diff --git a/obm/gterm.c b/obm/gterm.c index 537038d..29f3ee1 100644 --- a/obm/gterm.c +++ b/obm/gterm.c @@ -1003,16 +1003,16 @@ gtermSetCursorPos (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) raster = (argc > 3) ? atoi (argv[3]) : -1; if (raster >= 0) { - sv_raster = GtGetRaster (wp->w); + sv_raster = GtGetRaster ((GtermWidget)wp->w); if (raster != sv_raster) - GtSetRaster (wp->w, raster); + GtSetRaster ((GtermWidget)wp->w, raster); } - GtSetCursorPos (wp->w, x, y); + GtSetCursorPos ((GtermWidget)wp->w, x, y); if (raster >= 0) if (raster != sv_raster) - GtSetRaster (wp->w, sv_raster); + GtSetRaster ((GtermWidget)wp->w, sv_raster); return (TCL_OK); } @@ -1037,7 +1037,7 @@ gtermGetCursorPos (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) xout = argv[1]; yout = argv[2]; - GtGetCursorPos (wp->w, &x, &y); + GtGetCursorPos ((GtermWidget)wp->w, &x, &y); sprintf (buf, "%d", x); Tcl_SetVar (obm->tcl, xout, buf, 0); sprintf (buf, "%d", y); @@ -3704,7 +3704,7 @@ gtermUnmapPixel (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) src = 0; do { - src = GtSelectRaster (wp->w, dst=src, + src = GtSelectRaster ((GtermWidget)wp->w, dst=src, GtPixel, dx, dy, GtNDC, &sx, &sy, &mapping); if (src != dst) { ndcToPixel (w, src, sx, sy, &fx, &fy); @@ -3789,7 +3789,7 @@ gtermMarkerInit (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) GtermObject obj = (GtermObject) msg->object[msg->level]; WidgetPrivate wp = &obj->widget; - GtMarkerInit (wp->w); + GtMarkerInit ((GtermWidget)wp->w); return (TCL_OK); } diff --git a/obm/marker.c b/obm/marker.c index c12fd2e..533faae 100644 --- a/obm/marker.c +++ b/obm/marker.c @@ -828,7 +828,7 @@ markerNotify (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) first_param = (argc > 1) ? 2 : 1; GmNotify (mp->gm, GmStrToEvent(event_type), &event, - argv[first_param], max (0, argc - first_param)); + &argv[first_param], max (0, argc - first_param)); return (TCL_OK); } @@ -884,7 +884,7 @@ markerFocusCallback ( Cardinal nparams) { MarkerPrivate mp = &obj->marker; - ObmObject gtobj = mp->pobj; + WidgetObject gtobj = (WidgetObject)mp->pobj; ObmContext obm = mp->obm; if (events & GmEvFocusIn) @@ -1549,11 +1549,11 @@ markerGetRegion (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) if (unmap) { do { - src = GtSelectRaster (mp->gt, dst=src, + src = GtSelectRaster ((GtermWidget)mp->gt, dst=src, GtPixel, (int)(pv[0].x + 0.5), (int)(pv[0].y + 0.5), GtPixel, &x, &y, &mapping); if (src != dst) - GtMapVector (mp->gt, mapping, GtUnmap, pv, pv, pvlen); + GtMapVector ((GtermWidget)mp->gt, mapping, GtUnmap, pv, pv, pvlen); } while (dst != src); } @@ -1562,7 +1562,7 @@ markerGetRegion (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) * level, which we scale to the range 0-1 floating at the GUI level. */ if (ctype_out == GtNDC) { - GtPixelToNDC (mp->gt, src, pv, pv, pvlen); + GtPixelToNDC ((GtermWidget)mp->gt, src, pv, pv, pvlen); for (i=0; i < pvlen; i++) { pv[i].x /= (double)MAXNDC; pv[i].y /= (double)MAXNDC; diff --git a/xgterm/button.c b/xgterm/button.c index 0876c01..4a7506b 100644 --- a/xgterm/button.c +++ b/xgterm/button.c @@ -132,7 +132,7 @@ Boolean SendMousePosition(Widget w, XEvent *event) if (KeyModifiers == 0) { if (event->type == ButtonPress) - EditorButton(event); + EditorButton((XButtonEvent *)event); return True; } return False; @@ -140,7 +140,7 @@ Boolean SendMousePosition(Widget w, XEvent *event) case 2: /* DEC vt200 compatible */ if (KeyModifiers == 0 || KeyModifiers == ControlMask) { - EditorButton(event); + EditorButton((XButtonEvent *)event); return True; } return False; @@ -149,11 +149,11 @@ Boolean SendMousePosition(Widget w, XEvent *event) if ( event->type == ButtonPress && KeyModifiers == 0 && event->xbutton.button == Button1 ) { - TrackDown(event); + TrackDown((XButtonEvent *)event); return True; } if (KeyModifiers == 0 || KeyModifiers == ControlMask) { - EditorButton(event); + EditorButton((XButtonEvent *)event); return True; } /* fall through */ diff --git a/xgterm/gtermio.c b/xgterm/gtermio.c index 108b1de..8e2312c 100644 --- a/xgterm/gtermio.c +++ b/xgterm/gtermio.c @@ -287,7 +287,7 @@ gio_setup ( ObmAddCallback (obm, OBMCB_clientOutput|OBMCB_preserve, gio_queue_output, NULL); ObmAddCallback (obm, OBMCB_setGterm|OBMCB_preserve, - gio_reset, NULL); + (ObmFunc)gio_reset, NULL); /* Register xgterm global actions. */ if (!actions_registered) { @@ -573,7 +573,7 @@ gio_hardreset (int dummy) * whenever any important data structures change, e.g., if the graphics * window is resized. */ -static int +static void gio_reset (int notused, GtermWidget w, char *args) { int i; @@ -581,7 +581,7 @@ gio_reset (int notused, GtermWidget w, char *args) /* Make this the active graphics widget. */ if ((gw = w) == NULL) - return (0); + return; GtReset (w); GtActivate (w); @@ -639,8 +639,6 @@ gio_reset (int notused, GtermWidget w, char *args) cur_x = tx_leftmargin; cur_y = tx_charbase; - - return (0); } @@ -1616,7 +1614,7 @@ gio_keyinput (XtPointer notused, Widget w, XEvent *event) * cursor is in, in addition to the usual screen coordinates. */ if (wincursor) { - raster = GtSelectRaster (w, 0, GtPixel, sx, sy, + raster = GtSelectRaster ((GtermWidget)w, 0, GtPixel, sx, sy, GtNDC, &rx, &ry, &mapping); ry = MAXNDC - ry; } else @@ -1624,7 +1622,7 @@ gio_keyinput (XtPointer notused, Widget w, XEvent *event) gio_retcursor (strbuf[0], sx, sy, raster, rx, ry, 0); if (w) - GtSetCursorType (w, GtBusyCursor); + GtSetCursorType ((GtermWidget)w, GtBusyCursor); } else v_write (pty_fd, strbuf, nbytes); } diff --git a/xgterm/menu.c b/xgterm/menu.c index d1bb763..a8af8da 100644 --- a/xgterm/menu.c +++ b/xgterm/menu.c @@ -164,7 +164,7 @@ static Bool domenu (Widget w, XEvent *event, String *params, Cardinal *param_cou switch (params[0][0]) { case 'm': if (!screen->mainMenu) { - screen->mainMenu = create_menu (term, toplevel, "mainMenu", + screen->mainMenu = create_menu ((Widget)term, toplevel, "mainMenu", mainMenuEntries, XtNumber(mainMenuEntries)); update_securekbd(); @@ -185,7 +185,7 @@ static Bool domenu (Widget w, XEvent *event, String *params, Cardinal *param_cou case 'v': if (!screen->vtMenu) { - screen->vtMenu = create_menu (term, toplevel, "vtMenu", + screen->vtMenu = create_menu ((Widget)term, toplevel, "vtMenu", vtMenuEntries, XtNumber(vtMenuEntries)); /* and turn off the alternate screen entry */ @@ -243,7 +243,7 @@ static Bool domenu (Widget w, XEvent *event, String *params, Cardinal *param_cou case 'f': if (!screen->fontMenu) { - screen->fontMenu = create_menu (term, toplevel, "fontMenu", + screen->fontMenu = create_menu ((Widget)term, toplevel, "fontMenu", fontMenuEntries, NMENUFONTS); set_menu_font (True); diff --git a/xgterm/misc.c b/xgterm/misc.c index 5f14efd..4d72da3 100644 --- a/xgterm/misc.c +++ b/xgterm/misc.c @@ -1081,6 +1081,7 @@ xioerror(Display *dpy) Exit(ERROR_XIOERROR); } +__attribute__((noreturn)) void xt_error(String message) { extern char *ProgramName; diff --git a/ximtool/fitsio.c b/ximtool/fitsio.c index c0a5e74..f7bc3ea 100644 --- a/ximtool/fitsio.c +++ b/ximtool/fitsio.c @@ -87,6 +87,7 @@ static char *ftgdata (); static char *ftfixdata (); #endif +extern void min_max(void *a, int npts, int bitpix, float *min, float *max); /* ---------------- * Public routines. @@ -744,7 +745,6 @@ ftgbyte(FITS *fs, uchar *cbuff, int nelem, int zsc, int zr, float *z1, float *z2 int pmin = 0, pmax = 255; int npts, stdline; extern void zscale(char *im, int nx, int ny, int bitpix, float *z1, float *z2, float contrast, int opt_size, int len_stdline); - extern void min_max(char *a, int npts, int bitpix, float *min, float *max); /* if the data is uchar, then read it directly */ if (fs->bitpix == 8 && (fs->bscale == 1.0 && fs->bzero == 0.0)) { @@ -824,7 +824,7 @@ ftgbyte(FITS *fs, uchar *cbuff, int nelem, int zsc, int zr, float *z1, float *z2 zscale ((char *)buf, fs->axes[0], fs->axes[1], fs->bitpix, z1, z2, CONTRAST, nsample, stdline); else if (zr) - min_max ((float *)buf, nelem, fs->bitpix, z1, z2); + min_max (buf, nelem, fs->bitpix, z1, z2); } else { /* compute the optimal zscale values */ @@ -832,7 +832,7 @@ ftgbyte(FITS *fs, uchar *cbuff, int nelem, int zsc, int zr, float *z1, float *z2 zscale (voidbuff, fs->axes[0], fs->axes[1], fs->bitpix, z1, z2, CONTRAST, nsample, stdline); else if (zr) - min_max ((float *)voidbuff, nelem, fs->bitpix, z1, z2); + min_max (voidbuff, nelem, fs->bitpix, z1, z2); } /* convert short int to uchar */ diff --git a/ximtool/iis.c b/ximtool/iis.c index eb08226..c57b584 100644 --- a/ximtool/iis.c +++ b/ximtool/iis.c @@ -125,7 +125,7 @@ xim_iisClose (XimDataPtr xim) for (i=0, chan=NULL; i < XtNumber(xim->chan); i++) { chan = &xim->chan[i]; if (chan->id) { - xim_removeInput (xim, chan->id); + xim_removeInput (xim, (XPointer)chan->id); chan->id = 0; } @@ -426,7 +426,7 @@ xim_disconnectClient (IoChanPtr chan) case IO_UNIX: close (chan->datain); if (chan->id) { - xim_removeInput (chan->xim, chan->id); + xim_removeInput (chan->xim, (XPointer)chan->id); chan->id = 0; } chan->type = 0; diff --git a/ximtool/irafio.c b/ximtool/irafio.c index d1da42b..004adf2 100644 --- a/ximtool/irafio.c +++ b/ximtool/irafio.c @@ -157,20 +157,20 @@ loadIRAF (char *fname, uchar **image, int *nx, int *ny, uchar *r, uchar *g, uch /* Get the interesting stuff. */ if (is_swapped()) - bswap4 (&header_v2[IM_V2SWAPPED], 1, &swapped, 1, sizeof(int)); + bswap4 (&header_v2[IM_V2SWAPPED], 1, (char *)&swapped, 1, sizeof(int)); else bcopy ((char *)&header_v2[IM_V2SWAPPED], &swapped, sizeof(int)); if (is_swapped()) { - bswap4 (&header_v2[IM_V2PHYSLEN], 1, &px, 1, sizeof(int)); - bswap4 (&header_v2[IM_V2PHYSLEN+sizeof(int)], 1, &py, 1, + bswap4 (&header_v2[IM_V2PHYSLEN], 1, (char *)&px, 1, sizeof(int)); + bswap4 (&header_v2[IM_V2PHYSLEN+sizeof(int)], 1, (char *)&py, 1, sizeof(int)); - bswap4 (&header_v2[IM_V2LEN], 1, nx, 1, sizeof(int)); - bswap4 (&header_v2[IM_V2LEN+sizeof(int)], 1, ny, 1, + bswap4 (&header_v2[IM_V2LEN], 1, (char *)nx, 1, sizeof(int)); + bswap4 (&header_v2[IM_V2LEN+sizeof(int)], 1, (char *)ny, 1, sizeof(int)); - bswap4 (&header_v2[IM_V2PIXTYPE], 1, &ptype, 1, + bswap4 (&header_v2[IM_V2PIXTYPE], 1, (char *)&ptype, 1, sizeof(int)); - bswap4 (&header_v2[IM_V2PIXOFF], 1, &offset, 1, + bswap4 (&header_v2[IM_V2PIXOFF], 1, (char *)&offset, 1, sizeof(int)); } else { bcopy ((char *)&header_v2[IM_V2PHYSLEN], &px, sizeof(int)); @@ -285,15 +285,15 @@ getIRAFHdr (char *fname) /* Get the interesting stuff. */ if (is_swapped()) - bswap4 (&header_v2[IM_V2SWAPPED], 1, &swapped, 1, sizeof(int)); + bswap4 (&header_v2[IM_V2SWAPPED], 1, (char *)&swapped, 1, sizeof(int)); else bcopy ((char *)&header_v2[IM_V2SWAPPED], &swapped, sizeof(int)); if (is_swapped()) { - bswap4 (&header_v2[IM_V2LEN], 1, &nx, 1, sizeof(int)); - bswap4 (&header_v2[IM_V2LEN+sizeof(int)], 1, &ny, 1, + bswap4 (&header_v2[IM_V2LEN], 1, (char *)&nx, 1, sizeof(int)); + bswap4 (&header_v2[IM_V2LEN+sizeof(int)], 1, (char *)&ny, 1, sizeof(int)); - bswap4 (&header_v2[IM_V2PIXTYPE], 1, &ptype, 1, + bswap4 (&header_v2[IM_V2PIXTYPE], 1, (char *)&ptype, 1, sizeof(int)); } else { bcopy ((char *)&header_v2[IM_V2LEN], &nx, sizeof(int)); diff --git a/ximtool/ism.c b/ximtool/ism.c index 6e43e28..8c38839 100644 --- a/ximtool/ism.c +++ b/ximtool/ism.c @@ -156,7 +156,7 @@ xim_ismClose (XimDataPtr xim) for (i=0, chan=NULL; i < XtNumber(xim->ism_client); i++) { chan = &xim->ism_client[i]; if (chan->id) { - xim_removeInput (xim, chan->id); + xim_removeInput (xim, (XPointer)chan->id); chan->id = 0; } @@ -169,7 +169,7 @@ xim_ismClose (XimDataPtr xim) /* Close the ISM request socket. */ chan = &(xim->ism_chan); if (chan->id) { - xim_removeInput (xim, chan->id); + xim_removeInput (xim, (XPointer)chan->id); chan->id = 0; } close (chan->datain); @@ -236,7 +236,7 @@ ism_disconnectClient (IsmIoChanPtr chan) { close (chan->datain); if (chan->id) { - xim_removeInput (chan->xim, chan->id); + xim_removeInput (chan->xim, (XPointer)chan->id); chan->connected = 0; chan->id = 0; } diff --git a/ximtool/load.c b/ximtool/load.c index 18762e4..183e9e3 100644 --- a/ximtool/load.c +++ b/ximtool/load.c @@ -298,7 +298,7 @@ xim_loadFile (XimDataPtr xim, char *fname, int frame) xim->width = cf->width; xim->height = cf->height; - GtSetLogRes (xim->gt, cf->width, cf->height); + GtSetLogRes ((GtermWidget)xim->gt, cf->width, cf->height); /* Fit the frame. */ xim_message (xim, "frameFit", "init"); @@ -607,7 +607,7 @@ listFiles (char *directory, char *pattern, int *number_entries, int files_only) } else { /* Otherwise, check the filename against the pattern list. */ for (i=0; i < npatterns; i++) { - if (globExpression(entry->d_name, &patterns[i])) { + if (globExpression(entry->d_name, patterns[i])) { pattern_matches = 1; break; } @@ -859,7 +859,7 @@ sortGraymap (unsigned char *a, unsigned char *b, int npix, unsigned char *red, u b[i] = (unsigned char) ((float) red[a[i]] / scale); /* Sort the input colormap. */ - qsort (red, ncols, sizeof (unsigned char), ucharCompare); + qsort (red, ncols, sizeof (unsigned char), (int(*)())ucharCompare); /* Set the new colormap. 0-ncols are the scaled colors in the desired * number of cells, everything above that we set to zero. diff --git a/ximtool/logo.c b/ximtool/logo.c index 6b1bc60..70d5f4a 100644 --- a/ximtool/logo.c +++ b/ximtool/logo.c @@ -29,7 +29,7 @@ xim_displayLogo (XimDataPtr xim) /* Set the logical resolution of the display. */ - GtSetLogRes (xim->gt, LOGO_XDIM, LOGO_YDIM); + GtSetLogRes ((GtermWidget)xim->gt, LOGO_XDIM, LOGO_YDIM); if (xim_writeDisplay (xim, 1, "logo", logo_data, LOGO_XDIM, LOGO_YDIM, r, g, b, LOGO_NCOLORS) < 0) diff --git a/ximtool/quant.c b/ximtool/quant.c index d1fd6ff..da0bce6 100644 --- a/ximtool/quant.c +++ b/ximtool/quant.c @@ -450,15 +450,15 @@ medianCut (colorhist_vector chv, int colors, int sum, pixval maxval, int newcolo if (rl >= gl && rl >= bl) qsort( (char *)&(chv[indx]),clrs,sizeof(struct colorhist_item), - redCompare) ; + (int(*)())redCompare) ; else if (gl >= bl) qsort( (char *)&(chv[indx]),clrs,sizeof(struct colorhist_item), - greenCompare) ; + (int(*)())greenCompare) ; else qsort( (char *)&(chv[indx]),clrs,sizeof(struct colorhist_item), - blueCompare) ; + (int(*)())blueCompare) ; } /* @@ -482,7 +482,8 @@ medianCut (colorhist_vector chv, int colors, int sum, pixval maxval, int newcolo bv[boxes].colors = clrs - i; bv[boxes].sum = sm - lowersum; ++boxes; - qsort ((char *) bv, boxes, sizeof(struct box) , sumCompare) ; + qsort ((char *) bv, boxes, sizeof(struct box), + (int(*)())sumCompare) ; } /* diff --git a/ximtool/raster.c b/ximtool/raster.c index 1ab8a19..7cb6225 100644 --- a/ximtool/raster.c +++ b/ximtool/raster.c @@ -423,12 +423,12 @@ xim_reset (XimDataPtr xim, Widget w) xim->cb = w; xim_iisiomap (w, iomap, &iomap_len); GtPostResizeProc ((GtermWidget) w, set_colorbar, xim); - GtWriteIomap (w, iomap, 0, iomap_len); + GtWriteIomap ((GtermWidget)w, iomap, 0, iomap_len); } else { xim->gt = w; xim_iisiomap (w, iomap, &iomap_len); GtPostResizeProc ((GtermWidget) w, xim_resize, xim); - GtWriteIomap (w, iomap, 0, iomap_len); + GtWriteIomap ((GtermWidget)w, iomap, 0, iomap_len); } } @@ -497,20 +497,20 @@ xim_resize (XimDataPtr xim, Widget w) &junk, &junk, &junk); GtCreateRaster ((GtermWidget) w, fb->zoomras, zoomtype, width, height, depth); - xim_setMapping (xim, NULL, frame, fb->dispmap, + xim_setMapping ((FrameBufPtr)xim, NULL, frame, fb->dispmap, fb->zoomras, 0, M_FILL); if (!active) { - GtDisableMapping (w, fb->dispmap, 0); - xim_setMapping (xim, NULL, frame, fb->zoommap, + GtDisableMapping ((GtermWidget)w, fb->dispmap, 0); + xim_setMapping ((FrameBufPtr)xim, NULL, frame, fb->zoommap, fb->raster, fb->zoomras, M_FILL); - GtDisableMapping (w, fb->zoommap, 0); + GtDisableMapping ((GtermWidget)w, fb->zoommap, 0); } } else { if (active) { - GtEnableMapping (w, fb->dispmap, 0); - GtSetDisplayRaster (w, xim->display_frame); + GtEnableMapping ((GtermWidget)w, fb->dispmap, 0); + GtSetDisplayRaster ((GtermWidget)w, xim->display_frame); } else - GtDisableMapping (w, fb->dispmap, 0); + GtDisableMapping ((GtermWidget)w, fb->dispmap, 0); } /* Set the new mapping. */ @@ -750,9 +750,11 @@ fast: fb->zoomras = GtNextRaster (gt); fb->zoomras, GtServer, width, height, depth) < 0) goto nice; - xim_setMapping (xim, fb, frame, fb->zoommap = GtNextMapping(gt), + xim_setMapping ((FrameBufPtr)xim, (XimDataPtr)fb, + frame, fb->zoommap = GtNextMapping(gt), fb->raster, fb->zoomras, xim->autoscale ? M_ASPECT : M_UNITARY); - xim_setMapping (xim, fb, frame, fb->dispmap = GtNextMapping(gt), + xim_setMapping ((FrameBufPtr)xim, (XimDataPtr)fb, + frame, fb->dispmap = GtNextMapping(gt), fb->zoomras, 0, M_FILL); } else if (strcmp (memModel, "beNiceToServer") == 0) { @@ -770,9 +772,11 @@ nice: fb->zoomras = GtNextRaster (gt); fb->zoomras, GtClient, width, height, depth) < 0) goto small; - xim_setMapping (xim, fb, frame, fb->zoommap = GtNextMapping(gt), + xim_setMapping ((FrameBufPtr)xim, (XimDataPtr)fb, + frame, fb->zoommap = GtNextMapping(gt), fb->raster, fb->zoomras, xim->autoscale ? M_ASPECT : M_UNITARY); - xim_setMapping (xim, fb, frame, fb->dispmap = GtNextMapping(gt), + xim_setMapping ((FrameBufPtr)xim, (XimDataPtr)fb, + frame, fb->dispmap = GtNextMapping(gt), fb->zoomras, 0, M_FILL); } else if (strcmp (memModel, "small") == 0) { @@ -791,7 +795,8 @@ small: fb->zoomras = 0; "xim_initFrame: creating 'small' model (0x%x)\n", fb->zoomras); - xim_setMapping (xim, fb, frame, fb->zoommap = GtNextMapping(gt), + xim_setMapping ((FrameBufPtr)xim, (XimDataPtr)fb, + frame, fb->zoommap = GtNextMapping(gt), fb->raster, fb->zoomras, xim->autoscale ? M_ASPECT : M_UNITARY); fb->dispmap = fb->zoommap; @@ -895,8 +900,8 @@ xim_tileFrames (XimDataPtr xim, int frame_list) } xim->tileFrames = (frame_list != 0); - GtClearScreen (w); - initialize_shadow_pixmap (w, 0); + GtClearScreen ((GtermWidget)w); + initialize_shadow_pixmap ((GtermWidget)w, 0); xim_resize (xim, w); /* Entering tile frame mode. @@ -928,13 +933,13 @@ xim_tileFrames (XimDataPtr xim, int frame_list) fb = &xim->frames[i]; if (!mapping) mapping = fb->dispmap; - else if (GtCompareMappings (w, mapping, fb->dispmap) < 0) + else if (GtCompareMappings ((GtermWidget)w, mapping, fb->dispmap) < 0) mapping = fb->dispmap; } for (i=0; i < xim->nframes; i++) if (!(xim->tileFramesList & (1 << i))) { fb = &xim->frames[i]; - GtRaiseMapping (w, fb->dispmap, mapping); + GtRaiseMapping ((GtermWidget)w, fb->dispmap, mapping); } } @@ -966,7 +971,7 @@ xim_highlightFrame (XimDataPtr xim, int frame) xim_getScreen (xim, frame, &sx, &sy, &width, &height, &depth); if (sx > 0 && sy > 0) { - gm = GmCreate (xim->gt, Gm_Box, False); + gm = GmCreate ((GtermWidget)xim->gt, Gm_Box, False); XtSetArg (args[nargs], GmX, sx + (width-1)/2); nargs++; XtSetArg (args[nargs], GmY, sy + (height-1)/2); nargs++; @@ -1058,7 +1063,7 @@ xim_labelTiles (XimDataPtr xim) * and provide a background which lets them be read despite * whatever image scaling is in place. */ - gm = GmCreate (xim->gt, Gm_Text, False); + gm = GmCreate ((GtermWidget)xim->gt, Gm_Text, False); nargs = 0; /* initialize */ len = strlen (text); @@ -1150,7 +1155,7 @@ xim_registerFrames (XimDataPtr xim, int *frames, int reference_frame, bits |= (1 << (i - 1)); } - GtGetMapping (gt, fb->zoommap, + GtGetMapping ((GtermWidget)gt, fb->zoommap, &rop, &src,&st,&sx,&sy,&snx,&sny, &dst,&dt,&dx,&dy,&dnx,&dny); for (i=0; i < xim->nframes; i++) { @@ -1163,7 +1168,7 @@ xim_registerFrames (XimDataPtr xim, int *frames, int reference_frame, fr->xflip = fb->xflip; fr->yflip = fb->yflip; if (!xim_onScreen (xim, fb->frameno)) - GtDisableMapping (gt, fr->zoommap, 0); + GtDisableMapping ((GtermWidget)gt, fr->zoommap, 0); if (offsets) { /* fb is the current display buffer, fr is some other @@ -1177,13 +1182,13 @@ xim_registerFrames (XimDataPtr xim, int *frames, int reference_frame, nsx = (int)(sx - fb->xoff + fr->xoff); nsy = (int)(sy - fb->yoff + fr->yoff); - GtSetMapping (gt, fr->zoommap, xim->rop, + GtSetMapping ((GtermWidget)gt, fr->zoommap, xim->rop, fr->raster, st,nsx,nsy, snx,sny, fr->zoomras,dt,dx,dy,dnx,dny); - GtRefreshMapping (gt, fr->zoommap); + GtRefreshMapping ((GtermWidget)gt, fr->zoommap); } else { - GtSetMapping (gt, fr->zoommap, xim->rop, + GtSetMapping ((GtermWidget)gt, fr->zoommap, xim->rop, fr->raster, st,sx,sy, snx,sny, fr->zoomras,dt,dx,dy,dnx,dny); } @@ -1676,7 +1681,7 @@ xim_setFlip (XimDataPtr xim, FrameBufPtr fb, int flip_x, int flip_y) if (flip_y) fb->yflip = !fb->yflip; - GtGetMapping (gt, fb->zoommap, + GtGetMapping ((GtermWidget)gt, fb->zoommap, &rop, &src,&st,&sx,&sy,&snx,&sny, &dst,&dt,&dx,&dy,&dnx,&dny); dnx = abs (dnx); @@ -1684,7 +1689,7 @@ xim_setFlip (XimDataPtr xim, FrameBufPtr fb, int flip_x, int flip_y) dny = abs (dny); dny = fb->yflip ? -dny : dny; - GtSetMapping (gt, fb->zoommap, + GtSetMapping ((GtermWidget)gt, fb->zoommap, rop, src,st,sx,sy,snx,sny, dst,dt,dx,dy,dnx,dny); xim_message (xim, "xflip", fb->xflip ? "true" : "false"); @@ -1697,7 +1702,7 @@ xim_setFlip (XimDataPtr xim, FrameBufPtr fb, int flip_x, int flip_y) void xim_setRop (XimDataPtr xim, FrameBufPtr fb, int rop) { - Widget gt = xim->gt; + GtermWidget gt = (GtermWidget)xim->gt; int src, st, sx, sy, snx, sny; int dst, dt, dx, dy, dnx, dny; int oldrop; @@ -1715,9 +1720,9 @@ xim_setRop (XimDataPtr xim, FrameBufPtr fb, int rop) void xim_setCursorPos (XimDataPtr xim, float sx, float sy) { - GtSetRaster (xim->gt, xim->df_p->frameno); - GtSetCursorPos (xim->gt, (int)sx, (int)sy); - GtSetRaster (xim->gt, 0); + GtSetRaster ((GtermWidget)xim->gt, xim->df_p->frameno); + GtSetCursorPos ((GtermWidget)xim->gt, (int)sx, (int)sy); + GtSetRaster ((GtermWidget)xim->gt, 0); } @@ -1733,11 +1738,11 @@ xim_getCursorPos (XimDataPtr xim, float *sx, float *sy, int rx, ry, rmap; int src, x, y, i; - GtGetCursorPos (xim->gt, &x, &y); - src = GtSelectRaster (xim->gt, 0, GtPixel, x,y, GtNDC, &rx, &ry, &rmap); + GtGetCursorPos ((GtermWidget)xim->gt, &x, &y); + src = GtSelectRaster ((GtermWidget)xim->gt, 0, GtPixel, x,y, GtNDC, &rx, &ry, &rmap); pv1.x = rx; pv1.y = ry; - GtNDCToPixel (xim->gt, src, &pv1, &pv2, 1); + GtNDCToPixel ((GtermWidget)xim->gt, src, &pv1, &pv2, 1); *sx = pv2.x; *sy = pv2.y; @@ -2237,7 +2242,7 @@ xim_frameRegion (XimDataPtr xim, FrameBufPtr fb) int dt, dx, dy, dnx, dny; char buf[SZ_LINE]; - if (GtGetMapping (xim->gt, fb->zoommap, &rop, + if (GtGetMapping ((GtermWidget)xim->gt, fb->zoommap, &rop, &src, &st, &sx, &sy, &snx, &sny, &dst, &dt, &dx, &dy, &dnx, &dny) == -1) return; diff --git a/ximtool/util.c b/ximtool/util.c index f02c6b3..09a9c7b 100644 --- a/ximtool/util.c +++ b/ximtool/util.c @@ -164,7 +164,7 @@ is_swapped (void) /* MIN_MAX -- Get the min and max values of an array. */ void -min_max (char *a, int npts, int bitpix, float *min, float *max) +min_max (void *a, int npts, int bitpix, float *min, float *max) { int i; diff --git a/ximtool/ximclient.c b/ximtool/ximclient.c index 1dd881c..2dc9f99 100644 --- a/ximtool/ximclient.c +++ b/ximtool/ximclient.c @@ -71,15 +71,6 @@ */ -/* Client callback struct. */ -typedef struct { - XimDataPtr xim; - Tcl_Interp *tcl; - Tcl_Interp *server; -} XimClient, *XimClientPtr; - - - static int initialize(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv), Reset(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv), Quit(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv); static int setColormap(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv), updateColormap(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv), windowColormap(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv); static int zoom(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv), pan(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv), getSource(XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv); @@ -183,9 +174,9 @@ xim_clientOpen (XimDataPtr xim) Tcl_CreateCommand (tcl, "help", (Tcl_CmdProc *) help, (ClientData)xc, NULL); Tcl_CreateCommand (tcl, - "info", info, (ClientData)xc, NULL); + "info", (Tcl_CmdProc *) info, (ClientData)xc, NULL); Tcl_CreateCommand (tcl, - "windowRGB", windowRGB, (ClientData)xc, NULL); + "windowRGB", (Tcl_CmdProc *) windowRGB, (ClientData)xc, NULL); /* ISM module callbacks. */ Tcl_CreateCommand (tcl, @@ -388,7 +379,7 @@ getSource (XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv) char buf[SZ_NAME]; int rop; - GtGetMapping (xim->gt, fb->zoommap, &rop, + GtGetMapping ((GtermWidget)xim->gt, fb->zoommap, &rop, &src,&st,&sx,&sy,&snx,&sny, &dst,&dt,&dx,&dy,&dnx,&dny); if (argc > 1) { @@ -2261,7 +2252,7 @@ windowRGB (XimClientPtr xc, Tcl_Interp *tcl, int argc, char **argv) save = atoi(argv[4]); /* Query and read the current colormap. */ - GtQueryColormap (xim->gt, cm->mapno, &first, &nelem, &maxelem); + GtQueryColormap ((GtermWidget)xim->gt, cm->mapno, &first, &nelem, &maxelem); GtReadColormap ((GtermWidget) xim->gt, cm->mapno, first, nelem, r,g,b); diff --git a/ximtool/ximtool.h b/ximtool/ximtool.h index b5d22f4..c67cb11 100644 --- a/ximtool/ximtool.h +++ b/ximtool/ximtool.h @@ -2,6 +2,7 @@ * XIMTOOL.H -- Global definitions for XImtool. */ +#include #include "../version.h" #include "eps.h" @@ -315,7 +316,12 @@ typedef struct { } XimData, *XimDataPtr; - +/* Client callback struct. */ +typedef struct { + XimDataPtr xim; + Tcl_Interp *tcl; + Tcl_Interp *server; +} XimClient, *XimClientPtr; #ifdef XIMTOOL_MAIN XimData ximtool_data; diff --git a/ximtool/zscale.c b/ximtool/zscale.c index c7bfa18..0b9db6a 100644 --- a/ximtool/zscale.c +++ b/ximtool/zscale.c @@ -77,7 +77,7 @@ zscale (char *im, int nx, int ny, int bitpix, float *z1, float *z2, float contra /* Sort the sample, compute the minimum, maximum, and median pixel * values. */ - qsort (sample, npix, sizeof (float), floatCompare); + qsort (sample, npix, sizeof (float), (int(*)())floatCompare); zmin = *sample; zmax = *(sample+npix-1); From a553a0a0d70371922d0851dbab3e0471b828ac18 Mon Sep 17 00:00:00 2001 From: Ole Streicher Date: Fri, 9 Aug 2024 20:53:56 +0200 Subject: [PATCH 18/21] Remove _STDC_ ifdefs; today everything is standard C --- xgterm/VTPrsTbl.c | 24 +++++++++--------------- xgterm/misc.c | 5 ----- ximtool/eps.c | 2 -- ximtool/fitsio.c | 13 ------------- ximtool/gifio.c | 13 ------------- ximtool/rasio.c | 9 --------- 6 files changed, 9 insertions(+), 57 deletions(-) diff --git a/xgterm/VTPrsTbl.c b/xgterm/VTPrsTbl.c index 1392de9..bf20209 100644 --- a/xgterm/VTPrsTbl.c +++ b/xgterm/VTPrsTbl.c @@ -27,18 +27,12 @@ #include "VTparse.h" -#if __STDC__ -#define Const const -#else -#define Const /**/ -#endif - /* * Stupid Apollo C preprocessor can't handle long lines. So... To keep * it happy, we put each onto a separate line.... Sigh... */ -Const int groundtable[] = +const int groundtable[] = { /* NUL SOH STX ETX */ CASE_IGNORE, @@ -362,7 +356,7 @@ CASE_PRINT, CASE_PRINT, }; -Const int csitable[] = /* ESC [ */ +const int csitable[] = /* ESC [ */ { /* NUL SOH STX ETX */ CASE_IGNORE, @@ -686,7 +680,7 @@ CASE_GROUND_STATE, CASE_GROUND_STATE, }; -Const int dectable[] = /* ESC [ ? */ +const int dectable[] = /* ESC [ ? */ { /* NUL SOH STX ETX */ CASE_IGNORE, @@ -1010,7 +1004,7 @@ CASE_GROUND_STATE, CASE_GROUND_STATE, }; -Const int eigtable[] = /* CASE_ESC_IGNORE */ +const int eigtable[] = /* CASE_ESC_IGNORE */ { /* NUL SOH STX ETX */ CASE_IGNORE, @@ -1335,7 +1329,7 @@ CASE_GROUND_STATE, CASE_GROUND_STATE, }; -Const int esctable[] = /* ESC */ +const int esctable[] = /* ESC */ { /* NUL SOH STX ETX */ CASE_IGNORE, @@ -1659,7 +1653,7 @@ CASE_GROUND_STATE, CASE_GROUND_STATE, }; -Const int iestable[] = /* CASE_IGNORE_ESC */ +const int iestable[] = /* CASE_IGNORE_ESC */ { /* NUL SOH STX ETX */ CASE_IGNORE_STATE, @@ -1983,7 +1977,7 @@ CASE_GROUND_STATE, CASE_GROUND_STATE, }; -Const int igntable[] = /* CASE_IGNORE_STATE */ +const int igntable[] = /* CASE_IGNORE_STATE */ { /* NUL SOH STX ETX */ CASE_IGNORE, @@ -2307,7 +2301,7 @@ CASE_GROUND_STATE, CASE_GROUND_STATE, }; -Const int scrtable[] = /* ESC # */ +const int scrtable[] = /* ESC # */ { /* NUL SOH STX ETX */ CASE_IGNORE, @@ -2631,7 +2625,7 @@ CASE_GROUND_STATE, CASE_GROUND_STATE, }; -Const int scstable[] = /* ESC ( etc. */ +const int scstable[] = /* ESC ( etc. */ { /* NUL SOH STX ETX */ CASE_IGNORE, diff --git a/xgterm/misc.c b/xgterm/misc.c index 4d72da3..4ab52c5 100644 --- a/xgterm/misc.c +++ b/xgterm/misc.c @@ -903,12 +903,7 @@ Panic(char *s, int a) char *SysErrorMsg (int n) { -#if __STDC__ return strerror(n); -#else - - return((n >= 0) ? (char *)strerror(n) : "unknown error"); -#endif /* __STDC__ */ } diff --git a/ximtool/eps.c b/ximtool/eps.c index 548ae3d..725fc25 100644 --- a/ximtool/eps.c +++ b/ximtool/eps.c @@ -5,10 +5,8 @@ #include #include "eps.h" -#ifdef __STDC__ #include #include -#endif #ifdef SOLARIS #include diff --git a/ximtool/fitsio.c b/ximtool/fitsio.c index f7bc3ea..e3ad925 100644 --- a/ximtool/fitsio.c +++ b/ximtool/fitsio.c @@ -61,8 +61,6 @@ typedef struct { } FITS; /* Function prototypes */ -#ifdef __STDC__ - #include #include @@ -75,17 +73,6 @@ static char *rdcard (char *card, char *name, enum datatype dtype, long int *kval static void wrcard (char *card, char *name, enum datatype dtype, int kvalue); static char *ftgdata (FITS *fs, void *buffer, int nelem); static char *ftfixdata (FITS *fs, void *buffer, int nelem); -#else -static char *ftopen2d (); -static void ftclose (); -static char *ftgbyte (); -static char *rdheader (); -static char *wrheader (); -static char *rdcard (); -static void wrcard (); -static char *ftgdata (); -static char *ftfixdata (); -#endif extern void min_max(void *a, int npts, int bitpix, float *min, float *max); diff --git a/ximtool/gifio.c b/ximtool/gifio.c index c7a1840..82abccc 100644 --- a/ximtool/gifio.c +++ b/ximtool/gifio.c @@ -76,8 +76,6 @@ static struct { /* Function prototypes */ -#ifdef __STDC__ - #include #include @@ -106,17 +104,6 @@ static int LWZReadByte (FILE *fd, int flag, int input_code_size ); static char *ReadImage (FILE *fd, int len, int height, int interlace, int ignore, uchar **image ); -#else -static int colorstobpp(), GIFNextPixel(); -static void BumpPixel (), GIFEncode (), Putword (), compress (); -static void output (), cl_block (), cl_hash (), writeerr (), char_init (); -static void char_out (), flush_char (); - -static char *ReadGIF (), *ReadImage (); -static int ReadColorMap (), DoExtension (), GetDataBlock (); -static int GetCode (), LWZReadByte (); -#endif - static byte *pixels; static int nrows, ncols; static char *errstr = NULL; diff --git a/ximtool/rasio.c b/ximtool/rasio.c index 28ccb86..e2e5c21 100644 --- a/ximtool/rasio.c +++ b/ximtool/rasio.c @@ -56,7 +56,6 @@ static char errstr[128]; #define RAS_RLE 0x80 -#ifdef __STDC__ static char *sunRasError(char *, char *); static int rle_read(unsigned char *, int, int, FILE *, int); static void SunRas1to8(unsigned char *, unsigned char *, int); @@ -64,14 +63,6 @@ static void SunRas8to1(unsigned char *, unsigned char *, int, int); static int read_sun_long(long *, FILE *); static int write_sun_long(long, FILE *); static void fixBGR(unsigned char *, int, int); -#else -static char *sunRasError(); -static int rle_read(); -static void SunRas1to8(); -static void SunRas8to1(); -static int read_sun_long(), write_sun_long(); -static void fixBGR(); -#endif /* From f5c6c1fc7e1852e608b9f96ab9ba5be6dd3ab22b Mon Sep 17 00:00:00 2001 From: Ole Streicher Date: Fri, 9 Aug 2024 20:59:23 +0200 Subject: [PATCH 19/21] Fix MakeWidget call in HTMLformat.c --- obm/ObmW/HTMLformat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/obm/ObmW/HTMLformat.c b/obm/ObmW/HTMLformat.c index a9a23c8..48de9b3 100644 --- a/obm/ObmW/HTMLformat.c +++ b/obm/ObmW/HTMLformat.c @@ -3646,7 +3646,7 @@ TriggerMarkChanges(HTMLWidget hw, struct mark_up *mptr, int *x, int *y) { free(tptr); WidgetId++; - (void)MakeWidget(hw, mptr->start, x, y, + MakeWidget(hw, mptr->start, *x, *y, WidgetId, CurrentForm); } else From 478c00cd5887a3b9fe3f45a9e8e5fe81488ada38 Mon Sep 17 00:00:00 2001 From: Ole Streicher Date: Fri, 9 Aug 2024 23:07:06 +0200 Subject: [PATCH 20/21] Fix calling sequences in xgterm --- xgterm/charproc.c | 33 ++++++++++++++++++++------------- xgterm/main.c | 13 ++++++++----- 2 files changed, 28 insertions(+), 18 deletions(-) diff --git a/xgterm/charproc.c b/xgterm/charproc.c index 75f519b..2927872 100644 --- a/xgterm/charproc.c +++ b/xgterm/charproc.c @@ -115,7 +115,13 @@ static void update_font_info(TScreen *screen, int doresize); static void bitset(unsigned int *p, int mask), bitclr(unsigned int *p, int mask); void ShowCursor(void), HideCursor(void); - + +void unparseseq(ANSI *ap, int fd); +void unparseputn(unsigned int n, int fd); +void unparseputc(char c, int fd); +void unparsefputs (char *s, int fd); +void VTReset(Boolean full); + #define DEFAULT -1 #define TEXT_BUF_SIZE 1024 #define TRACKTIMESEC 4L @@ -2265,7 +2271,7 @@ static void bitclr(unsigned int *p, int mask) *p &= ~mask; } -unparseseq(ANSI *ap, int fd) +void unparseseq(ANSI *ap, int fd) { int c; int i; @@ -2296,7 +2302,7 @@ unparseseq(ANSI *ap, int fd) } } -unparseputn(unsigned int n, int fd) +void unparseputn(unsigned int n, int fd) { unsigned int q; @@ -2306,7 +2312,7 @@ unparseputn(unsigned int n, int fd) unparseputc((char) ('0' + (n%10)), fd); } -unparseputc(char c, int fd) +void unparseputc(char c, int fd) { char buf[2]; int i = 1; @@ -2319,7 +2325,7 @@ unparseputc(char c, int fd) v_write(fd, buf, i); } -unparsefputs (char *s, int fd) +void unparsefputs (char *s, int fd) { if (s) { while (*s) unparseputc (*s++, fd); @@ -2336,8 +2342,8 @@ ToAlternate(TScreen *screen) if(screen->alternate) return; if(!screen->altbuf) - screen->altbuf = Allocate(screen->max_row + 1, screen->max_col - + 1, &screen->abuf_address); + screen->altbuf = Allocate(screen->max_row + 1, + screen->max_col + 1, (Char **)&screen->abuf_address); SwitchBufs(screen); screen->alternate = TRUE; update_altscreen(); @@ -2536,7 +2542,7 @@ static void VTallocbuf (void) if (screen->scrollWidget) nrows += screen->savelines; screen->allbuf = Allocate (nrows, screen->max_col + 1, - &screen->sbuf_address); + (Char **)&screen->sbuf_address); if (screen->scrollWidget) screen->buf = &screen->allbuf[4 * screen->savelines]; else @@ -2628,17 +2634,17 @@ static void VTInitialize (Widget wrequest, Widget wnew, ArgList args, Cardinal * * to care about the shell's border being part of our focus. */ XtAddEventHandler(XtParent(new), FocusChangeMask, FALSE, - HandleFocusChange, (Opaque)NULL); + (XtEventHandler)HandleFocusChange, (Opaque)NULL); XtAddEventHandler((Widget)new, 0L, TRUE, VTNonMaskableEvent, (Opaque)NULL); XtAddEventHandler((Widget)new, PropertyChangeMask, FALSE, HandleBellPropertyChange, (Opaque)NULL); /* These apply to vt100 window events. */ - XtAddEventHandler (wnew, EnterWindowMask, FALSE, HandleEnterWindow, - (Opaque)NULL); - XtAddEventHandler (wnew, LeaveWindowMask, FALSE, HandleLeaveWindow, - (Opaque)NULL); + XtAddEventHandler (wnew, EnterWindowMask, FALSE, + (XtEventHandler)HandleLeaveWindow, (Opaque)NULL); + XtAddEventHandler (wnew, LeaveWindowMask, FALSE, + (XtEventHandler)HandleLeaveWindow, (Opaque)NULL); new->screen.bellInProgress = FALSE; set_character_class (new->screen.charClass); @@ -3211,6 +3217,7 @@ HideCursor(void) screen->cursor_state = OFF; } +void VTReset(Boolean full) { TScreen *screen = &term->screen; diff --git a/xgterm/main.c b/xgterm/main.c index 434a00d..246d0f2 100644 --- a/xgterm/main.c +++ b/xgterm/main.c @@ -481,7 +481,7 @@ extern char *ptsname(int); extern char *strindex (char *s1, char *s2); extern void HandlePopupMenu(Widget w, XEvent *event, String *params, Cardinal *param_count); extern void gtermio_connect(int notused, Display *display, Widget toplevel, int state); -extern void resize(TScreen *screen, char *TermName, char *oldtc, char *newtc); +extern void resize(TScreen *screen, char *TermName, char *oldtc); int switchfb[] = {0, 2, 1, 3}; @@ -524,7 +524,6 @@ static struct jtchars d_jtc = { #endif /* sony */ #endif /* USE_SYSV_TERMIO */ -static int parse_tty_modes (char *s, struct _xttymodes *modelist); /* * SYSV has the termio.c_cc[V] and ltchars; BSD has tchars and ltchars; * SVR4 has only termio.c_cc, but it includes everything from ltchars. @@ -579,6 +578,8 @@ struct _xttymodes { { NULL, 0, 0, '\0' }, /* end of data */ }; +static int parse_tty_modes (char *s, struct _xttymodes *modelist); + #ifdef USE_SYSV_UTMP #if defined(X_NOT_STDC_ENV) || defined(AIXV3) extern struct utmp *getutent(); @@ -971,12 +972,12 @@ DeleteWindow(Widget w, XEvent *event, String *params, Cardinal *num_params) if (term->screen.Tshow) hide_vt_window(); else - do_hangup(w); + do_hangup(w, NULL, NULL); else if (term->screen.Vshow) hide_tek_window(); else - do_hangup(w); + do_hangup(w, NULL, NULL); } /* ARGSUSED */ @@ -5046,10 +5047,12 @@ Exit(int n) /* ARGSUSED */ void -resize(TScreen *screen, char *TermName, char *oldtc, char *newtc) +resize(TScreen *screen, char *TermName, char *oldtc) { #ifndef USE_SYSV_ENVVARS char *ptr1, *ptr2; + char buf[1024]; + char *newtc = buf; int i; int li_first = 0; char *temp; From 0c4c23dd4e4ed13bd482d94b0905987325318cb3 Mon Sep 17 00:00:00 2001 From: Ole Streicher Date: Fri, 9 Aug 2024 20:48:19 +0200 Subject: [PATCH 21/21] Convert pointer to long to avoid gcc-14 error --- obm/ObmW/HTMLformat.c | 2 +- obm/marker.c | 2 +- xgterm/gtermio.c | 2 +- ximtool/raster.c | 12 ++++++------ ximtool/ximtool.c | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/obm/ObmW/HTMLformat.c b/obm/ObmW/HTMLformat.c index 48de9b3..20fd83b 100644 --- a/obm/ObmW/HTMLformat.c +++ b/obm/ObmW/HTMLformat.c @@ -3655,7 +3655,7 @@ TriggerMarkChanges(HTMLWidget hw, struct mark_up *mptr, int *x, int *y) { free(tptr); } - WidgetPlace(hw, mptr, x, y, Width); + WidgetPlace(hw, mptr, (int *)x, (int *)y, Width); } } break; diff --git a/obm/marker.c b/obm/marker.c index 533faae..bead9fb 100644 --- a/obm/marker.c +++ b/obm/marker.c @@ -1508,7 +1508,7 @@ markerGetRegion (MsgContext msg, Tcl_Interp *tcl, int argc, char **argv) XtSetArg (args[4], GmHeight, &height); GmGetAttributes (mp->gm, args, 5, XtRInt); - if (GmGetAttribute (mp->gm, GmRotangle, &rotangle, XtRFloat) < 0) + if (GmGetAttribute (mp->gm, GmRotangle, (long)&rotangle, XtRFloat) < 0) return (TCL_ERROR); /* Get the points array, needed for some markers. */ diff --git a/xgterm/gtermio.c b/xgterm/gtermio.c index 8e2312c..c3a96b3 100644 --- a/xgterm/gtermio.c +++ b/xgterm/gtermio.c @@ -307,7 +307,7 @@ gio_postconnectcallback (int (*connect)(), int client_data) { if (obm) { ObmAddCallback (obm, OBMCB_connect|OBMCB_preserve, - connect, client_data); + connect, (XtPointer)client_data); } } diff --git a/ximtool/raster.c b/ximtool/raster.c index 7cb6225..bc8b04e 100644 --- a/ximtool/raster.c +++ b/ximtool/raster.c @@ -983,7 +983,7 @@ xim_highlightFrame (XimDataPtr xim, int frame) XtSetArg (args[nargs], GmActivated, True); nargs++; GmLower (gm, NULL); - GmSetAttribute (gm, GmLineColor, xim->borderColor, XtRString); + GmSetAttribute (gm, GmLineColor, (XtArgVal)xim->borderColor, XtRString); GmSetAttributes (gm, args, nargs, XtRInt); xim->gm_border = gm; @@ -1077,11 +1077,11 @@ xim_labelTiles (XimDataPtr xim) XtSetArg (args[nargs], GmActivated, True); nargs++; XtSetArg (args[nargs], GmImageText, True); nargs++; - GmSetAttribute (gm, GmWidth, tw, XtRString); - GmSetAttribute (gm, GmHeight, "1ch", XtRString); - GmSetAttribute (gm, GmTextBgColor, "black", XtRString); - GmSetAttribute (gm, GmTextColor, "yellow", XtRString); - GmSetAttribute (gm, GmText, text, XtRString); + GmSetAttribute (gm, GmWidth, (XtArgVal)tw, XtRString); + GmSetAttribute (gm, GmHeight, (XtArgVal)"1ch", XtRString); + GmSetAttribute (gm, GmTextBgColor, (XtArgVal)"black", XtRString); + GmSetAttribute (gm, GmTextColor, (XtArgVal)"yellow", XtRString); + GmSetAttribute (gm, GmText, (XtArgVal)text, XtRString); GmSetAttributes (gm, args, nargs, XtRInt); GmMarkpos (gm); GmRedraw (gm, GXcopy, True); diff --git a/ximtool/ximtool.c b/ximtool/ximtool.c index 86bfd41..e724ae9 100644 --- a/ximtool/ximtool.c +++ b/ximtool/ximtool.c @@ -182,7 +182,7 @@ main (int argc, char **argv) /* Initialize the object manager. */ xim->obm = obm = (XtPointer) ObmOpen (app_context, argc, argv); - ObmAddCallback (obm, OBMCB_setGterm|OBMCB_preserve, xim_reset, + ObmAddCallback (obm, OBMCB_setGterm|OBMCB_preserve, (ObmFunc)xim_reset, (XtPointer)xim);