From 81d55b2ce1ba7126771089d9b25dbb272ba99fb2 Mon Sep 17 00:00:00 2001 From: cshapiro <cshapiro> Date: Fri, 19 Oct 2007 09:57:22 +0000 Subject: [PATCH] Cleanup compiler warnings. --- motif/server/callbacks.c | 23 +-- motif/server/datatrans.c | 6 +- motif/server/events.c | 12 +- motif/server/functions.h | 346 ++++++++++++++++++------------------ motif/server/list.c | 58 +++--- motif/server/main.c | 17 +- motif/server/message.c | 6 +- motif/server/motif.c | 49 ++--- motif/server/packet.c | 11 +- motif/server/requests.c | 8 +- motif/server/resources.c | 6 +- motif/server/server.c | 6 +- motif/server/tables.c | 13 +- motif/server/text.c | 58 +++--- motif/server/translations.c | 16 +- motif/server/widgets.c | 93 +++++----- motif/server/xmstring.c | 48 ++--- 17 files changed, 396 insertions(+), 380 deletions(-) diff --git a/motif/server/callbacks.c b/motif/server/callbacks.c index 21030dd05..d0852c406 100644 --- a/motif/server/callbacks.c +++ b/motif/server/callbacks.c @@ -1,6 +1,6 @@ /* - $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/motif/server/callbacks.c,v 1.4 1997/08/22 20:49:31 pw Exp $ + $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/motif/server/callbacks.c,v 1.5 2007/10/19 09:57:22 cshapiro Rel $ This code was written as part of the CMU Common Lisp project at Carnegie Mellon University, and has been placed in the public domain. @@ -45,6 +45,7 @@ #include <Xm/MainW.h> #include <Xm/ScrolledW.h> #include <Xm/PanedW.h> +#include <Xm/Protocols.h> #include "global.h" #include "datatrans.h" @@ -67,13 +68,13 @@ XmAnyCallbackStruct *callback_info = NULL; -int TerminateCallback(message_t message) +void TerminateCallback(message_t message) { end_callback_loop--; } -int RXtAddCallback(message_t message) +void RXtAddCallback(message_t message) { Widget w; String callback_name; @@ -86,7 +87,7 @@ int RXtAddCallback(message_t message) XtAddCallback(w,callback_name,CallbackHandler,(caddr_t)name_token); } -int RXtRemoveCallback(message_t message) +void RXtRemoveCallback(message_t message) { Widget w; int name_token; @@ -98,7 +99,7 @@ int RXtRemoveCallback(message_t message) CallbackHandler,(caddr_t)name_token); } -int RXmAddProtocolCallback(message_t message) +void RXmAddProtocolCallback(message_t message) { Widget w; Atom prop,protocol; @@ -116,11 +117,11 @@ int RXmAddProtocolCallback(message_t message) XmAddProtocolCallback(w,prop,protocol,ProtocolHandler,closure); } -int RXmRemoveProtocolCallback(message_t message) +void RXmRemoveProtocolCallback(message_t message) { Widget w; Atom prop,protocol; - ProtocolClosure *closure,*current; + ProtocolClosure *closure = NULL,*current; int found = False; toolkit_read_value(message,&w,XtRWidget); @@ -151,7 +152,7 @@ int RXmRemoveProtocolCallback(message_t message) } -int RReturnTextCallbackDoit(message_t message) +void RReturnTextCallbackDoit(message_t message) { Boolean doit; XmTextVerifyPtr info = (XmTextVerifyPtr)callback_info; @@ -261,7 +262,6 @@ void CallbackHandler(Widget *w, int name_token, XmAnyCallbackStruct *info) { WidgetClass class = XtClass(*w); int exit_value; - XEvent event; message_t reply = message_new(next_serial++); message_add_packet(reply); @@ -316,6 +316,7 @@ void CallbackHandler(Widget *w, int name_token, XmAnyCallbackStruct *info) *** the callback_info mechanism for supporting modifications to the *** callback structure would no longer work if callbacks could be nested. while( exit_value<end_callback_loop ) { + XEvent event; XtAppNextEvent(app_context, &event); XtDispatchEvent(&event); } @@ -329,7 +330,6 @@ void CallbackHandler(Widget *w, int name_token, XmAnyCallbackStruct *info) void ProtocolHandler(Widget *w, ProtocolClosure *c, XmAnyCallbackStruct *info) { int exit_value; - XEvent event; message_t reply = message_new(next_serial++); message_add_packet(reply); @@ -348,7 +348,8 @@ void ProtocolHandler(Widget *w, ProtocolClosure *c, XmAnyCallbackStruct *info) /* **** The non-blocking version while( exit_value<end_callback_loop ) { - XtAppNextEvent(app_context, &event); + XEvent event; + XtAppNextEvent(app_context, &event); XtDispatchEvent(&event); } */ diff --git a/motif/server/datatrans.c b/motif/server/datatrans.c index 77f5d3fbc..e36711a7c 100644 --- a/motif/server/datatrans.c +++ b/motif/server/datatrans.c @@ -1,6 +1,6 @@ /* - $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/motif/server/datatrans.c,v 1.8 2000/02/15 11:59:25 pw Exp $ + $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/motif/server/datatrans.c,v 1.9 2007/10/19 09:57:22 cshapiro Rel $ This code was written as part of the CMU Common Lisp project at Carnegie Mellon University, and has been placed in the public domain. @@ -153,7 +153,7 @@ void message_write_resource_list(message_t message,ResourceList *list,int tag) else { int size; long type_tag = find_type_entry(type); - unsigned long val; + unsigned long val = 0; if( type_tag < 0 ) { fprintf(stderr,"Choked on type %s\n",type); fflush(stderr); @@ -527,7 +527,7 @@ void toolkit_write_value(message_t message, caddr_t value, String type) void toolkit_read_value(message_t message,char *dest,String type) { - int tag,data,stuff; + int tag,data; type_reader read_value; data = message_get_dblword(message); diff --git a/motif/server/events.c b/motif/server/events.c index 5d3d2eed4..ea5307a16 100644 --- a/motif/server/events.c +++ b/motif/server/events.c @@ -1,6 +1,6 @@ /* - $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/motif/server/events.c,v 1.3 1994/10/27 17:16:51 ram Exp $ + $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/motif/server/events.c,v 1.4 2007/10/19 09:57:22 cshapiro Rel $ This code was written as part of the CMU Common Lisp project at Carnegie Mellon University, and has been placed in the public domain. @@ -378,7 +378,7 @@ void write_event(message_t reply,XEvent *event) -int RTransportEvent(message_t message) +void RTransportEvent(message_t message) { XEvent *event; message_t reply = prepare_reply(message); @@ -394,7 +394,7 @@ int RTransportEvent(message_t message) -int RXtAddEventHandler(message_t message) +void RXtAddEventHandler(message_t message) { Widget widget; int mask,non_maskable; @@ -409,10 +409,10 @@ int RXtAddEventHandler(message_t message) else f = EventHandler; - XtAddEventHandler(widget,mask,non_maskable,f,mask); + XtAddEventHandler(widget,mask,non_maskable,f,(XtPointer)mask); } -int RXtRemoveEventHandler(message_t message) +void RXtRemoveEventHandler(message_t message) { Widget widget; int mask,non_maskable; @@ -427,7 +427,7 @@ int RXtRemoveEventHandler(message_t message) else f = EventHandler; - XtRemoveEventHandler(widget,mask,non_maskable,f,mask); + XtRemoveEventHandler(widget,mask,non_maskable,f,(XtPointer)mask); } void CoreEventHandler(Widget widget,int mask,int nonmaskable,XEvent *event) diff --git a/motif/server/functions.h b/motif/server/functions.h index a9c576aaa..d7ac9cc6e 100644 --- a/motif/server/functions.h +++ b/motif/server/functions.h @@ -1,6 +1,6 @@ /* - $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/motif/server/functions.h,v 1.3 1997/08/22 20:49:33 pw Exp $ + $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/motif/server/functions.h,v 1.4 2007/10/19 09:57:22 cshapiro Rel $ This code was written as part of the CMU Common Lisp project at Carnegie Mellon University, and has been placed in the public domain. @@ -8,193 +8,193 @@ */ /* In requests.c */ -extern QuitServer(); +extern void QuitServer(message_t); /* in callbacks.c */ -extern TerminateCallback(); -extern RXtAddCallback(); -extern RXtRemoveCallback(); -extern RXmAddProtocolCallback(); -extern RXmRemoveProtocolCallback(); -extern RReturnTextCallbackDoit(); +extern void TerminateCallback(message_t); +extern void RXtAddCallback(message_t); +extern void RXtRemoveCallback(message_t); +extern void RXmAddProtocolCallback(message_t); +extern void RXmRemoveProtocolCallback(message_t); +extern void RReturnTextCallbackDoit(message_t); /* in events.c */ -extern RTransportEvent(); -extern RXtAddEventHandler(); -extern RXtRemoveEventHandler(); +extern void RTransportEvent(message_t); +extern void RXtAddEventHandler(message_t); +extern void RXtRemoveEventHandler(message_t); /* in widgets.c */ -extern RXtAppCreateShell(); -extern RXtCreateManagedWidget(); -extern RXtCreateWidget(); -extern RXtDestroyWidget(); -extern RXtRealizeWidget(); -extern RXtUnrealizeWidget(); -extern RXtMapWidget(); -extern RXtUnmapWidget(); -extern RXtSetSensitive(); -extern RXtCreatePopupShell(); -extern RXtPopup(); -extern RXtManageChild(); -extern RXtUnmanageChild(); -extern RXtManageChildren(); -extern RXtUnmanageChildren(); -extern RXtPopdown(); -extern RXtIsManaged(); -extern RXtPopupSpringLoaded(); -extern RXtIsRealized(); -extern RXtWindow(); -extern RXtName(); -extern RXtIsSensitive(); -extern RXtIsApplicationShell(); -extern RXtIsComposite(); -extern RXtIsConstraint(); -extern RXtIsObject(); -extern RXtIsOverrideShell(); -extern RXtIsRectObj(); -extern RXtIsShell(); -extern RXtIsTopLevelShell(); -extern RXtIsTransientShell(); -extern RXtIsVendorShell(); -extern RXtIsWMShell(); -extern RXtNameToWidget(); -extern RXtParent(); -extern RXtTranslateCoords(); -extern RXmCreateMenuBar(); -extern RXmCreateOptionMenu(); -extern RXmCreateRadioBox(); -extern RXmCreateWarningDialog(); -extern RXmCreateBulletinBoardDialog(); -extern RXmCreateErrorDialog(); -extern RXmCreateFileSelectionDialog(); -extern RXmCreateFormDialog(); -extern RXmCreateInformationDialog(); -extern RXmCreateMessageDialog(); -extern RXmCreatePopupMenu(); -extern RXmCreatePromptDialog(); -extern RXmCreatePulldownMenu(); -extern RXmCreateQuestionDialog(); -extern RXmCreateScrolledList(); -extern RXmCreateScrolledText(); -extern RXmCreateSelectionDialog(); -extern RXmCreateWorkingDialog(); -extern RXCreateFontCursor(); +extern void RXtAppCreateShell(message_t); +extern void RXtCreateManagedWidget(message_t); +extern void RXtCreateWidget(message_t); +extern void RXtDestroyWidget(message_t); +extern void RXtRealizeWidget(message_t); +extern void RXtUnrealizeWidget(message_t); +extern void RXtMapWidget(message_t); +extern void RXtUnmapWidget(message_t); +extern void RXtSetSensitive(message_t); +extern void RXtCreatePopupShell(message_t); +extern void RXtPopup(message_t); +extern void RXtManageChild(message_t); +extern void RXtUnmanageChild(message_t); +extern void RXtManageChildren(message_t); +extern void RXtUnmanageChildren(message_t); +extern void RXtPopdown(message_t); +extern void RXtIsManaged(message_t); +extern void RXtPopupSpringLoaded(message_t); +extern void RXtIsRealized(message_t); +extern void RXtWindow(message_t); +extern void RXtName(message_t); +extern void RXtIsSensitive(message_t); +extern void RXtIsApplicationShell(message_t); +extern void RXtIsComposite(message_t); +extern void RXtIsConstraint(message_t); +extern void RXtIsObject(message_t); +extern void RXtIsOverrideShell(message_t); +extern void RXtIsRectObj(message_t); +extern void RXtIsShell(message_t); +extern void RXtIsTopLevelShell(message_t); +extern void RXtIsTransientShell(message_t); +extern void RXtIsVendorShell(message_t); +extern void RXtIsWMShell(message_t); +extern void RXtNameToWidget(message_t); +extern void RXtParent(message_t); +extern void RXtTranslateCoords(message_t); +extern void RXmCreateMenuBar(message_t); +extern void RXmCreateOptionMenu(message_t); +extern void RXmCreateRadioBox(message_t); +extern void RXmCreateWarningDialog(message_t); +extern void RXmCreateBulletinBoardDialog(message_t); +extern void RXmCreateErrorDialog(message_t); +extern void RXmCreateFileSelectionDialog(message_t); +extern void RXmCreateFormDialog(message_t); +extern void RXmCreateInformationDialog(message_t); +extern void RXmCreateMessageDialog(message_t); +extern void RXmCreatePopupMenu(message_t); +extern void RXmCreatePromptDialog(message_t); +extern void RXmCreatePulldownMenu(message_t); +extern void RXmCreateQuestionDialog(message_t); +extern void RXmCreateScrolledList(message_t); +extern void RXmCreateScrolledText(message_t); +extern void RXmCreateSelectionDialog(message_t); +extern void RXmCreateWorkingDialog(message_t); +extern void RXCreateFontCursor(message_t); /* In resources.c */ -extern RXtSetValues(); -extern RXtGetValues(); +extern void RXtSetValues(message_t); +extern void RXtGetValues(message_t); /* In motif.c */ -extern RXmUpdateDisplay(); -extern RXmIsMotifWMRunning(); -extern RXmCommandAppendValue(); -extern RXmCommandError(); -extern RXmCommandSetValue(); -extern RXmScaleGetValue(); -extern RXmScaleSetValue(); -extern RXmToggleButtonGetState(); -extern RXmToggleButtonSetState(); -extern RXmAddTabGroup(); -extern RXmRemoveTabGroup(); -extern RXmProcessTraversal(); -extern RXmMessageBoxGetChild(); -extern RXmSelectionBoxGetChild(); -extern RXmFileSelectionBoxGetChild(); -extern RXmCommandGetChild(); -extern RXmScrolledWindowSetAreas(); -extern RXmTrackingLocate(); -extern RXmMenuPosition(); -extern RXmScrollBarGetValues(); -extern RXmScrollBarSetValues(); +extern void RXmUpdateDisplay(message_t); +extern void RXmIsMotifWMRunning(message_t); +extern void RXmCommandAppendValue(message_t); +extern void RXmCommandError(message_t); +extern void RXmCommandSetValue(message_t); +extern void RXmScaleGetValue(message_t); +extern void RXmScaleSetValue(message_t); +extern void RXmToggleButtonGetState(message_t); +extern void RXmToggleButtonSetState(message_t); +extern void RXmAddTabGroup(message_t); +extern void RXmRemoveTabGroup(message_t); +extern void RXmProcessTraversal(message_t); +extern void RXmMessageBoxGetChild(message_t); +extern void RXmSelectionBoxGetChild(message_t); +extern void RXmFileSelectionBoxGetChild(message_t); +extern void RXmCommandGetChild(message_t); +extern void RXmScrolledWindowSetAreas(message_t); +extern void RXmTrackingLocate(message_t); +extern void RXmMenuPosition(message_t); +extern void RXmScrollBarGetValues(message_t); +extern void RXmScrollBarSetValues(message_t); /* In translations.c */ -extern RXtParseTranslationTable(); -extern RXtAugmentTranslations(); -extern RXtOverrideTranslations(); -extern RXtUninstallTranslations(); -extern RXtParseAcceleratorTable(); -extern RXtInstallAccelerators(); -extern RXtInstallAllAccelerators(); +extern void RXtParseTranslationTable(message_t); +extern void RXtAugmentTranslations(message_t); +extern void RXtOverrideTranslations(message_t); +extern void RXtUninstallTranslations(message_t); +extern void RXtParseAcceleratorTable(message_t); +extern void RXtInstallAccelerators(message_t); +extern void RXtInstallAllAccelerators(message_t); /* In text.c */ -extern RXmTextClearSelection(); -extern RXmTextCopy(); -extern RXmTextCut(); -extern RXmTextGetBaseline(); -extern RXmTextGetEditable(); -extern RXmTextGetInsertionPosition(); -extern RXmTextGetLastPosition(); -extern RXmTextGetMaxLength(); -extern RXmTextGetSelection(); -extern RXmTextGetSelectionPosition(); -extern RXmTextGetString(); -extern RXmTextGetTopCharacter(); -extern RXmTextInsert(); -extern RXmTextPaste(); -extern RXmTextPosToXY(); -extern RXmTextRemove(); -extern RXmTextReplace(); -extern RXmTextScroll(); -extern RXmTextSetAddMode(); -extern RXmTextSetEditable(); -extern RXmTextSetHighlight(); -extern RXmTextSetInsertionPosition(); -extern RXmTextSetMaxLength(); -extern RXmTextSetSelection(); -extern RXmTextSetString(); -extern RXmTextSetTopCharacter(); -extern RXmTextShowPosition(); -extern RXmTextXYToPos(); +extern void RXmTextClearSelection(message_t); +extern void RXmTextCopy(message_t); +extern void RXmTextCut(message_t); +extern void RXmTextGetBaseline(message_t); +extern void RXmTextGetEditable(message_t); +extern void RXmTextGetInsertionPosition(message_t); +extern void RXmTextGetLastPosition(message_t); +extern void RXmTextGetMaxLength(message_t); +extern void RXmTextGetSelection(message_t); +extern void RXmTextGetSelectionPosition(message_t); +extern void RXmTextGetString(message_t); +extern void RXmTextGetTopCharacter(message_t); +extern void RXmTextInsert(message_t); +extern void RXmTextPaste(message_t); +extern void RXmTextPosToXY(message_t); +extern void RXmTextRemove(message_t); +extern void RXmTextReplace(message_t); +extern void RXmTextScroll(message_t); +extern void RXmTextSetAddMode(message_t); +extern void RXmTextSetEditable(message_t); +extern void RXmTextSetHighlight(message_t); +extern void RXmTextSetInsertionPosition(message_t); +extern void RXmTextSetMaxLength(message_t); +extern void RXmTextSetSelection(message_t); +extern void RXmTextSetString(message_t); +extern void RXmTextSetTopCharacter(message_t); +extern void RXmTextShowPosition(message_t); +extern void RXmTextXYToPos(message_t); /* In xmstring.c */ -extern RXmFontListAdd(); -extern RXmFontListCreate(); -extern RXmFontListFree(); -extern RXmStringBaseline(); -extern RXmStringByteCompare(); -extern RXmStringCompare(); -extern RXmStringConcat(); -extern RXmStringCopy(); -extern RXmStringCreate(); -extern RXmStringCreateLtoR(); -extern RXmStringGetLtoR(); -extern RXmStringCreateSimple(); -extern RXmStringEmpty(); -extern RXmStringExtent(); -extern RXmStringFree(); -extern RXmStringHasSubstring(); -extern RXmStringHeight(); -extern RXmStringLength(); -extern RXmStringLineCount(); -extern RXmStringNConcat(); -extern RXmStringNCopy(); -extern RXmStringSeparatorCreate(); -extern RXmStringWidth(); +extern void RXmFontListAdd(message_t); +extern void RXmFontListCreate(message_t); +extern void RXmFontListFree(message_t); +extern void RXmStringBaseline(message_t); +extern void RXmStringByteCompare(message_t); +extern void RXmStringCompare(message_t); +extern void RXmStringConcat(message_t); +extern void RXmStringCopy(message_t); +extern void RXmStringCreate(message_t); +extern void RXmStringCreateLtoR(message_t); +extern void RXmStringGetLtoR(message_t); +extern void RXmStringCreateSimple(message_t); +extern void RXmStringEmpty(message_t); +extern void RXmStringExtent(message_t); +extern void RXmStringFree(message_t); +extern void RXmStringHasSubstring(message_t); +extern void RXmStringHeight(message_t); +extern void RXmStringLength(message_t); +extern void RXmStringLineCount(message_t); +extern void RXmStringNConcat(message_t); +extern void RXmStringNCopy(message_t); +extern void RXmStringSeparatorCreate(message_t); +extern void RXmStringWidth(message_t); /* In list.c */ -extern RSetItems(); -extern RGetItems(); -extern RXmListAddItem(); -extern RXmListAddItemUnselected(); -extern RXmListDeleteItem(); -extern RXmListDeletePos(); -extern RXmListDeselectAllItems(); -extern RXmListDeselectItem(); -extern RXmListDeselectPos(); -extern RXmListSelectItem(); -extern RXmListSelectPos(); -extern RXmListSetBottomItem(); -extern RXmListSetBottomPos(); -extern RXmListSetHorizPos(); -extern RXmListSetItem(); -extern RXmListSetPos(); -extern RXmListAddItems(); -extern RXmListDeleteAllItems(); -extern RXmListDeleteItems(); -extern RXmListDeleteItemsPos(); -extern RXmListItemExists(); -extern RXmListItemPos(); -extern RXmListReplaceItems(); -extern RXmListReplaceItemsPos(); -extern RXmListSetAddMode(); -extern RXmListGetSelectedPos(); +extern void RSetItems(message_t); +extern void RGetItems(message_t); +extern void RXmListAddItem(message_t); +extern void RXmListAddItemUnselected(message_t); +extern void RXmListDeleteItem(message_t); +extern void RXmListDeletePos(message_t); +extern void RXmListDeselectAllItems(message_t); +extern void RXmListDeselectItem(message_t); +extern void RXmListDeselectPos(message_t); +extern void RXmListSelectItem(message_t); +extern void RXmListSelectPos(message_t); +extern void RXmListSetBottomItem(message_t); +extern void RXmListSetBottomPos(message_t); +extern void RXmListSetHorizPos(message_t); +extern void RXmListSetItem(message_t); +extern void RXmListSetPos(message_t); +extern void RXmListAddItems(message_t); +extern void RXmListDeleteAllItems(message_t); +extern void RXmListDeleteItems(message_t); +extern void RXmListDeleteItemsPos(message_t); +extern void RXmListItemExists(message_t); +extern void RXmListItemPos(message_t); +extern void RXmListReplaceItems(message_t); +extern void RXmListReplaceItemsPos(message_t); +extern void RXmListSetAddMode(message_t); +extern void RXmListGetSelectedPos(message_t); diff --git a/motif/server/list.c b/motif/server/list.c index 0bc304437..5c40b8e58 100644 --- a/motif/server/list.c +++ b/motif/server/list.c @@ -1,6 +1,6 @@ /* - $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/motif/server/list.c,v 1.3 1997/08/22 20:49:34 pw Exp $ + $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/motif/server/list.c,v 1.4 2007/10/19 09:57:22 cshapiro Rel $ This code was written as part of the CMU Common Lisp project at Carnegie Mellon University, and has been placed in the public domain. @@ -44,7 +44,7 @@ void find_items_resources(Widget w, String *items, String *count) *items = *count = NULL; } -int RSetItems(message_t message) +void RSetItems(message_t message) { Widget w; StringTable items; @@ -57,7 +57,7 @@ int RSetItems(message_t message) find_items_resources(w,&items_name,&count_name); if( !items_name ) { XtWarning("Invalid widget class in SET-ITEMS. Ignoring request."); - return NULL; + return; } XtSetArg(args[0], items_name, items.data); @@ -65,7 +65,7 @@ int RSetItems(message_t message) XtSetValues(w, args, 2); } -int RGetItems(message_t message) +void RGetItems(message_t message) { Widget w; StringTable items; @@ -78,7 +78,7 @@ int RGetItems(message_t message) find_items_resources(w,&items_name,&count_name); if( !items_name ) { XtWarning("Invalid widget class in GET-ITEMS. Ignoring request."); - return NULL; + return; } XtSetArg(args[0], items_name, &items.data); @@ -91,7 +91,7 @@ int RGetItems(message_t message) must_confirm = False; } -int RXmListAddItem(message_t message) +void RXmListAddItem(message_t message) { Widget w; XmString item; @@ -103,7 +103,7 @@ int RXmListAddItem(message_t message) XmListAddItem(w,item,pos); } -int RXmListAddItemUnselected(message_t message) +void RXmListAddItemUnselected(message_t message) { Widget w; XmString item; @@ -115,7 +115,7 @@ int RXmListAddItemUnselected(message_t message) XmListAddItemUnselected(w,item,pos); } -int RXmListDeleteItem(message_t message) +void RXmListDeleteItem(message_t message) { Widget w; XmString item; @@ -126,7 +126,7 @@ int RXmListDeleteItem(message_t message) } -int RXmListDeletePos(message_t message) +void RXmListDeletePos(message_t message) { Widget w; int pos; @@ -136,7 +136,7 @@ int RXmListDeletePos(message_t message) XmListDeletePos(w,pos); } -int RXmListDeselectAllItems(message_t message) +void RXmListDeselectAllItems(message_t message) { Widget w; @@ -144,7 +144,7 @@ int RXmListDeselectAllItems(message_t message) XmListDeselectAllItems(w); } -int RXmListDeselectItem(message_t message) +void RXmListDeselectItem(message_t message) { Widget w; XmString item; @@ -154,7 +154,7 @@ int RXmListDeselectItem(message_t message) XmListDeselectItem(w,item); } -int RXmListDeselectPos(message_t message) +void RXmListDeselectPos(message_t message) { Widget w; int pos; @@ -164,7 +164,7 @@ int RXmListDeselectPos(message_t message) XmListDeselectPos(w,pos); } -int RXmListSelectItem(message_t message) +void RXmListSelectItem(message_t message) { Widget w; XmString item; @@ -176,7 +176,7 @@ int RXmListSelectItem(message_t message) XmListSelectItem(w,item,notify); } -int RXmListSelectPos(message_t message) +void RXmListSelectPos(message_t message) { Widget w; int pos; @@ -188,7 +188,7 @@ int RXmListSelectPos(message_t message) XmListSelectPos(w,pos,notify); } -int RXmListSetBottomItem(message_t message) +void RXmListSetBottomItem(message_t message) { Widget w; XmString item; @@ -198,7 +198,7 @@ int RXmListSetBottomItem(message_t message) XmListSetBottomItem(w,item); } -int RXmListSetBottomPos(message_t message) +void RXmListSetBottomPos(message_t message) { Widget w; int pos; @@ -208,7 +208,7 @@ int RXmListSetBottomPos(message_t message) XmListSetBottomPos(w,pos); } -int RXmListSetHorizPos(message_t message) +void RXmListSetHorizPos(message_t message) { Widget w; int pos; @@ -218,7 +218,7 @@ int RXmListSetHorizPos(message_t message) XmListSetHorizPos(w,pos); } -int RXmListSetItem(message_t message) +void RXmListSetItem(message_t message) { Widget w; XmString item; @@ -228,7 +228,7 @@ int RXmListSetItem(message_t message) XmListSetItem(w,item); } -int RXmListSetPos(message_t message) +void RXmListSetPos(message_t message) { Widget w; int pos; @@ -238,7 +238,7 @@ int RXmListSetPos(message_t message) XmListSetPos(w,pos); } -int RXmListAddItems(message_t message) +void RXmListAddItems(message_t message) { Widget w; StringTable items; @@ -250,7 +250,7 @@ int RXmListAddItems(message_t message) XmListAddItems(w,(XmString *)items.data,items.length,pos); } -int RXmListDeleteAllItems(message_t message) +void RXmListDeleteAllItems(message_t message) { Widget w; @@ -258,7 +258,7 @@ int RXmListDeleteAllItems(message_t message) XmListDeleteAllItems(w); } -int RXmListDeleteItems(message_t message) +void RXmListDeleteItems(message_t message) { Widget w; StringTable items; @@ -268,7 +268,7 @@ int RXmListDeleteItems(message_t message) XmListDeleteItems(w,(XmString *)items.data,items.length); } -int RXmListDeleteItemsPos(message_t message) +void RXmListDeleteItemsPos(message_t message) { Widget w; int count,pos; @@ -279,7 +279,7 @@ int RXmListDeleteItemsPos(message_t message) XmListDeleteItemsPos(w,count,pos); } -int RXmListItemExists(message_t message) +void RXmListItemExists(message_t message) { Widget w; XmString item; @@ -289,7 +289,7 @@ int RXmListItemExists(message_t message) reply_with_boolean(message,XmListItemExists(w,item)); } -int RXmListItemPos(message_t message) +void RXmListItemPos(message_t message) { Widget w; XmString item; @@ -299,7 +299,7 @@ int RXmListItemPos(message_t message) reply_with_integer(message,XmListItemPos(w,item)); } -int RXmListReplaceItems(message_t message) +void RXmListReplaceItems(message_t message) { Widget w; StringTable old,new; @@ -310,7 +310,7 @@ int RXmListReplaceItems(message_t message) XmListReplaceItems(w,(XmString *)old.data,old.length,(XmString *)new.data); } -int RXmListReplaceItemsPos(message_t message) +void RXmListReplaceItemsPos(message_t message) { Widget w; StringTable new; @@ -322,7 +322,7 @@ int RXmListReplaceItemsPos(message_t message) XmListReplaceItemsPos(w,(XmString *)new.data,new.length,pos); } -int RXmListSetAddMode(message_t message) +void RXmListSetAddMode(message_t message) { Widget w; Boolean state; @@ -332,7 +332,7 @@ int RXmListSetAddMode(message_t message) XmListSetAddMode(w,state); } -int RXmListGetSelectedPos(message_t message) +void RXmListGetSelectedPos(message_t message) { Widget w; IntList pos; diff --git a/motif/server/main.c b/motif/server/main.c index 74492af2d..e380c793d 100644 --- a/motif/server/main.c +++ b/motif/server/main.c @@ -1,6 +1,6 @@ /* - $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/motif/server/main.c,v 1.14 2001/03/08 00:08:50 pw Exp $ + $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/motif/server/main.c,v 1.15 2007/10/19 09:57:22 cshapiro Rel $ This code was written as part of the CMU Common Lisp project at Carnegie Mellon University, and has been placed in the public domain. @@ -18,6 +18,9 @@ #include <arpa/inet.h> #include <errno.h> #include <signal.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> #include <sys/wait.h> @@ -59,7 +62,7 @@ struct sockaddr_un unixAddress; int global_argc; char **global_argv; -int global_will_trace=NULL; +int global_will_trace=0; int will_fork=1; int use_inet_socket=1; int use_unix_socket=1; @@ -152,7 +155,7 @@ void establish_client(int s) { int pid=0,socket; struct sockaddr sa; - int sa_length = sizeof(struct sockaddr); + socklen_t sa_length = sizeof(struct sockaddr); socket = accept(s, &sa, &sa_length); if( socket < 0 ) @@ -182,7 +185,7 @@ void establish_client(int s) } } -main(int argc, char **argv) +int main(int argc, char **argv) { fd_set rfds; int nfound,nfds,i; @@ -211,9 +214,9 @@ main(int argc, char **argv) else if( !strcmp(argv[i],"-local") ) socket_choice = Local; else if( !strcmp(argv[i],"-noinet") ) - use_inet_socket = NULL; + use_inet_socket = 0; else if( !strcmp(argv[i],"-nounix") ) - use_unix_socket = NULL; + use_unix_socket = 0; } switch( socket_choice ) { @@ -225,7 +228,7 @@ main(int argc, char **argv) sprintf(socket_path,"/tmp/.motif_socket-u%d",getuid()); break; case Local: - use_inet_socket = NULL; + use_inet_socket = 0; sprintf(socket_path,"/tmp/.motif_socket-p%d",getpid()); break; } diff --git a/motif/server/message.c b/motif/server/message.c index 5659dfa78..8ea2d7094 100644 --- a/motif/server/message.c +++ b/motif/server/message.c @@ -1,6 +1,6 @@ /* - $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/motif/server/message.c,v 1.6 2000/02/15 11:59:25 pw Exp $ + $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/motif/server/message.c,v 1.7 2007/10/19 09:57:22 cshapiro Rel $ This code was written as part of the CMU Common Lisp project at Carnegie Mellon University, and has been placed in the public domain. @@ -240,7 +240,7 @@ message_t message_read(int socket) { /* There is no client support for getting here yet! */ kill_deferred_message(first->serial); if( global_will_trace ) { - printf("Got cancellation for serial %d\n",first->serial); + printf("Got cancellation for serial %ld\n",first->serial); fflush(stdout); continue;} } @@ -250,7 +250,7 @@ message_t message_read(int socket) { new->packet_count = 1; return new; } - if(new = message_defer_packet(first)) /* intential assignment */ + if( (new = message_defer_packet(first)) ) /* intentional assignment */ return new; } } diff --git a/motif/server/motif.c b/motif/server/motif.c index dba1b048c..ea0ae7fa6 100644 --- a/motif/server/motif.c +++ b/motif/server/motif.c @@ -1,6 +1,6 @@ /* - $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/motif/server/motif.c,v 1.4 2001/03/08 00:08:50 pw Exp $ + $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/motif/server/motif.c,v 1.5 2007/10/19 09:57:22 cshapiro Rel $ This code was written as part of the CMU Common Lisp project at Carnegie Mellon University, and has been placed in the public domain. @@ -16,6 +16,11 @@ #include <Xm/MessageB.h> #include <Xm/FileSB.h> #include <Xm/SelectioB.h> +#include <Xm/Scale.h> +#include <Xm/ScrolledW.h> +#include <Xm/RowColumn.h> +#include <Xm/ToggleB.h> +#include <Xm/ScrollBar.h> #include "global.h" #include "datatrans.h" @@ -23,7 +28,7 @@ #include "tables.h" #include "requests.h" -int RXmUpdateDisplay(message_t message) +void RXmUpdateDisplay(message_t message) { Widget w; @@ -31,7 +36,7 @@ int RXmUpdateDisplay(message_t message) XmUpdateDisplay(w); } -int RXmIsMotifWMRunning(message_t message) +void RXmIsMotifWMRunning(message_t message) { Widget w; @@ -39,7 +44,7 @@ int RXmIsMotifWMRunning(message_t message) reply_with_boolean(message,XmIsMotifWMRunning(w)); } -int RXmScrolledWindowSetAreas(message_t message) +void RXmScrolledWindowSetAreas(message_t message) { Widget w; Widget hscroll,vscroll,work_region; @@ -51,7 +56,7 @@ int RXmScrolledWindowSetAreas(message_t message) XmScrolledWindowSetAreas(w,hscroll,vscroll,work_region); } -int RXmTrackingLocate(message_t message) +void RXmTrackingLocate(message_t message) { Widget w; Cursor cursor; @@ -63,7 +68,7 @@ int RXmTrackingLocate(message_t message) XmTrackingLocate(w,cursor,confine_to); } -int RXmMenuPosition(message_t message) +void RXmMenuPosition(message_t message) { Widget w; XButtonPressedEvent *event; @@ -78,7 +83,7 @@ int RXmMenuPosition(message_t message) /* Functions for accessing XmCommand widgets */ -int RXmCommandAppendValue(message_t message) +void RXmCommandAppendValue(message_t message) { Widget widget; XmString command; @@ -88,7 +93,7 @@ int RXmCommandAppendValue(message_t message) XmCommandAppendValue(widget,command); } -int RXmCommandError(message_t message) +void RXmCommandError(message_t message) { Widget widget; XmString error; @@ -98,7 +103,7 @@ int RXmCommandError(message_t message) XmCommandError(widget,error); } -int RXmCommandSetValue(message_t message) +void RXmCommandSetValue(message_t message) { Widget w; XmString value; @@ -112,7 +117,7 @@ int RXmCommandSetValue(message_t message) /* Functions for dealing with XmScale widgets */ -int RXmScaleGetValue(message_t message) +void RXmScaleGetValue(message_t message) { Widget widget; int value; @@ -122,7 +127,7 @@ int RXmScaleGetValue(message_t message) reply_with_integer(message,value); } -int RXmScaleSetValue(message_t message) +void RXmScaleSetValue(message_t message) { Widget widget; int value; @@ -136,7 +141,7 @@ int RXmScaleSetValue(message_t message) /* Functions for dealing with XmToggleButton widgets */ -int RXmToggleButtonGetState(message_t message) +void RXmToggleButtonGetState(message_t message) { Widget w; int state; @@ -146,7 +151,7 @@ int RXmToggleButtonGetState(message_t message) reply_with_boolean(message,state); } -int RXmToggleButtonSetState(message_t message) +void RXmToggleButtonSetState(message_t message) { Widget w; Boolean state,notify; @@ -161,7 +166,7 @@ int RXmToggleButtonSetState(message_t message) /* Functions for using Tab groups */ -int RXmAddTabGroup(message_t message) +void RXmAddTabGroup(message_t message) { Widget w; @@ -169,7 +174,7 @@ int RXmAddTabGroup(message_t message) XmAddTabGroup(w); } -int RXmRemoveTabGroup(message_t message) +void RXmRemoveTabGroup(message_t message) { Widget w; @@ -177,7 +182,7 @@ int RXmRemoveTabGroup(message_t message) XmRemoveTabGroup(w); } -int RXmProcessTraversal(message_t message) +void RXmProcessTraversal(message_t message) { Widget w; int direction; @@ -199,22 +204,22 @@ int RXmProcessTraversal(message_t message) toolkit_read_value(message,&which_child,XtREnum); \ reply_with_widget(message,query_func(w,which_child)) -int RXmMessageBoxGetChild(message_t message) +void RXmMessageBoxGetChild(message_t message) { DEFINE_CHILD_QUERY(XmMessageBoxGetChild); } -int RXmSelectionBoxGetChild(message_t message) +void RXmSelectionBoxGetChild(message_t message) { DEFINE_CHILD_QUERY(XmSelectionBoxGetChild); } -int RXmFileSelectionBoxGetChild(message_t message) +void RXmFileSelectionBoxGetChild(message_t message) { DEFINE_CHILD_QUERY(XmFileSelectionBoxGetChild); } -int RXmCommandGetChild(message_t message) +void RXmCommandGetChild(message_t message) { DEFINE_CHILD_QUERY(XmCommandGetChild); } @@ -223,7 +228,7 @@ int RXmCommandGetChild(message_t message) /* Functions for getting/setting values of XmScrollBar widgets */ -int RXmScrollBarGetValues(message_t message) +void RXmScrollBarGetValues(message_t message) { Widget widget; int value,slider_size,increment,page_increment; @@ -243,7 +248,7 @@ int RXmScrollBarGetValues(message_t message) must_confirm = False; } -int RXmScrollBarSetValues(message_t message) +void RXmScrollBarSetValues(message_t message) { Widget w; int value,slider_size,increment,page_increment; diff --git a/motif/server/packet.c b/motif/server/packet.c index 107098696..b5dffe1ca 100644 --- a/motif/server/packet.c +++ b/motif/server/packet.c @@ -1,6 +1,6 @@ /* - $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/motif/server/packet.c,v 1.3 1994/10/27 17:16:51 ram Exp $ + $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/motif/server/packet.c,v 1.4 2007/10/19 09:57:22 cshapiro Rel $ This code was written as part of the CMU Common Lisp project at Carnegie Mellon University, and has been placed in the public domain. @@ -8,6 +8,7 @@ */ #include <stdio.h> +#include <unistd.h> #include <X11/Intrinsic.h> #include "global.h" @@ -124,8 +125,8 @@ void packet_send(int socket, packet_t packet) { if( global_will_trace ) { printf("packet_send: Sending packet --\n"); - printf("packet_send: serial = %u\n",packet->serial); - printf("packet_send: length = %u\n",packet->length); + printf("packet_send: serial = %ld\n",packet->serial); + printf("packet_send: length = %ld\n",packet->length); printf("packet_send: this is packet %d of %d\n",packet->current, packet->total); fflush(stdout); @@ -165,8 +166,8 @@ void packet_read(int socket, packet_t packet) { if( global_will_trace ) { printf("packet_read: Receiving packet --\n"); - printf("packet_read: serial = %u\n",packet->serial); - printf("packet_read: length = %u\n",packet->length); + printf("packet_read: serial = %ld\n",packet->serial); + printf("packet_read: length = %ld\n",packet->length); printf("packet_read: This is packet %d of %d\n",packet->current, packet->total); fflush(stdout); diff --git a/motif/server/requests.c b/motif/server/requests.c index 9d65702b0..f8aa1fad1 100644 --- a/motif/server/requests.c +++ b/motif/server/requests.c @@ -1,6 +1,6 @@ /* - $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/motif/server/requests.c,v 1.5 1997/12/31 18:57:55 pw Exp $ + $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/motif/server/requests.c,v 1.6 2007/10/19 09:57:22 cshapiro Rel $ This code was written as part of the CMU Common Lisp project at Carnegie Mellon University, and has been placed in the public domain. @@ -8,6 +8,8 @@ */ #include <stdio.h> +#include <stdlib.h> +#include <unistd.h> #include <X11/Intrinsic.h> #include <X11/StringDefs.h> @@ -20,7 +22,7 @@ #include "functions.h" #include "tables.h" -typedef int (*request_f)(message_t); +typedef void (*request_f)(message_t); Boolean must_confirm = False; int processing_depth = 0; Garbage garbage_list = NULL; @@ -195,7 +197,7 @@ void process_request(message_t message,int socket) must_confirm = old_must_confirm; } -int QuitServer(message_t message) +void QuitServer(message_t message) { close(client_socket); if( !will_fork ) diff --git a/motif/server/resources.c b/motif/server/resources.c index 532611442..0d973a18c 100644 --- a/motif/server/resources.c +++ b/motif/server/resources.c @@ -1,6 +1,6 @@ /* - $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/motif/server/resources.c,v 1.3 1997/12/31 18:57:58 pw Exp $ + $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/motif/server/resources.c,v 1.4 2007/10/19 09:57:22 cshapiro Rel $ This code was written as part of the CMU Common Lisp project at Carnegie Mellon University, and has been placed in the public domain. @@ -22,7 +22,7 @@ extern message_t prepare_reply(message_t m); -int RXtSetValues(message_t message) +void RXtSetValues(message_t message) { Widget w; ResourceList resources; @@ -35,7 +35,7 @@ int RXtSetValues(message_t message) XtSetValues(w,resources.args,resources.length); } -int RXtGetValues(message_t message) +void RXtGetValues(message_t message) { message_t reply; Widget w; diff --git a/motif/server/server.c b/motif/server/server.c index 3d122f45e..62f6ebdde 100644 --- a/motif/server/server.c +++ b/motif/server/server.c @@ -1,6 +1,6 @@ /* - $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/motif/server/server.c,v 1.4 1994/10/27 17:16:51 ram Exp $ + $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/motif/server/server.c,v 1.5 2007/10/19 09:57:22 cshapiro Rel $ This code was written as part of the CMU Common Lisp project at Carnegie Mellon University, and has been placed in the public domain. @@ -11,6 +11,8 @@ #include <ctype.h> #include <errno.h> #include <setjmp.h> +#include <stdlib.h> +#include <unistd.h> #include <X11/Intrinsic.h> #include <X11/StringDefs.h> @@ -101,7 +103,7 @@ void get_input(caddr_t closure, int *socket, XtInputId *id) void greet_client(int socket) { short byte; - int result,pad; + int result; char *dpy_name,*app_class,*app_name; message_t first; diff --git a/motif/server/tables.c b/motif/server/tables.c index 59dc43661..8220ef554 100644 --- a/motif/server/tables.c +++ b/motif/server/tables.c @@ -1,6 +1,6 @@ /* - $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/motif/server/tables.c,v 1.2 1994/10/27 17:16:51 ram Exp $ + $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/motif/server/tables.c,v 1.3 2007/10/19 09:57:22 cshapiro Rel $ This code was written as part of the CMU Common Lisp project at Carnegie Mellon University, and has been placed in the public domain. @@ -8,6 +8,7 @@ */ #include <stdio.h> +#include <stdlib.h> #include <X11/Intrinsic.h> #include <X11/IntrinsicP.h> @@ -104,7 +105,8 @@ void assure_class_initialized(WidgetClass class) void record_class_resources(WidgetClass class,class_resources *r) { XtResourceList resource_list,constraint_list; - int resource_count,constraint_count,index,extra=0; + Cardinal resource_count,constraint_count; + int index,extra=0; XtGetResourceList(class,&resource_list,&resource_count); XtGetConstraintResourceList(class,&constraint_list,&constraint_count); @@ -180,9 +182,10 @@ void record_class_resources(WidgetClass class,class_resources *r) XtNewString(constraint_list[index].resource_type); } - qsort(r->resource_list,resource_count,sizeof(resource_entry),resource_cmp); - qsort(r->constraint_list,constraint_count, - sizeof(resource_entry),resource_cmp); + qsort(r->resource_list,resource_count,sizeof(resource_entry), + (int (*)(const void *,const void *))resource_cmp); + qsort(r->constraint_list,constraint_count,sizeof(resource_entry), + (int (*)(const void *,const void *))resource_cmp); r->resource_count = resource_count; r->constraint_count = constraint_count; diff --git a/motif/server/text.c b/motif/server/text.c index 08caa6635..623c09980 100644 --- a/motif/server/text.c +++ b/motif/server/text.c @@ -1,6 +1,6 @@ /* - $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/motif/server/text.c,v 1.2 1994/10/27 17:16:51 ram Exp $ + $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/motif/server/text.c,v 1.3 2007/10/19 09:57:22 cshapiro Rel $ This code was written as part of the CMU Common Lisp project at Carnegie Mellon University, and has been placed in the public domain. @@ -23,7 +23,7 @@ /* Functions for using the XmText widgets */ -int RXmTextClearSelection(message_t message) +void RXmTextClearSelection(message_t message) { Widget w; Time t; @@ -33,7 +33,7 @@ int RXmTextClearSelection(message_t message) XmTextClearSelection(w,t); } -int RXmTextCopy(message_t message) +void RXmTextCopy(message_t message) { Widget w; Time t; @@ -43,7 +43,7 @@ int RXmTextCopy(message_t message) reply_with_boolean(message,XmTextCopy(w,t)); } -int RXmTextCut(message_t message) +void RXmTextCut(message_t message) { Widget w; Time t; @@ -59,37 +59,37 @@ int RXmTextCut(message_t message) toolkit_read_value(message,&w,XtRWidget); \ reply_func(message,query_func(w)) -int RXmTextGetBaseline(message_t message) +void RXmTextGetBaseline(message_t message) { DEFINE_TEXT_QUERY(XmTextGetBaseline,reply_with_integer); } -int RXmTextGetEditable(message_t message) +void RXmTextGetEditable(message_t message) { DEFINE_TEXT_QUERY(XmTextGetEditable,reply_with_boolean); } -int RXmTextGetInsertionPosition(message_t message) +void RXmTextGetInsertionPosition(message_t message) { DEFINE_TEXT_QUERY(XmTextGetInsertionPosition,reply_with_integer); } -int RXmTextGetLastPosition(message_t message) +void RXmTextGetLastPosition(message_t message) { DEFINE_TEXT_QUERY(XmTextGetLastPosition,reply_with_integer); } -int RXmTextGetMaxLength(message_t message) +void RXmTextGetMaxLength(message_t message) { DEFINE_TEXT_QUERY(XmTextGetMaxLength,reply_with_integer); } -int RXmTextGetTopCharacter(message_t message) +void RXmTextGetTopCharacter(message_t message) { DEFINE_TEXT_QUERY(XmTextGetTopCharacter,reply_with_integer); } -int RXmTextGetSelection(message_t message) +void RXmTextGetSelection(message_t message) { Widget w; char *sel; @@ -100,7 +100,7 @@ int RXmTextGetSelection(message_t message) register_garbage(sel,GarbageData); } -int RXmTextGetSelectionPosition(message_t message) +void RXmTextGetSelectionPosition(message_t message) { Widget w; Boolean result; @@ -118,7 +118,7 @@ int RXmTextGetSelectionPosition(message_t message) must_confirm=False; } -int RXmTextGetString(message_t message) +void RXmTextGetString(message_t message) { Widget w; char *s; @@ -129,7 +129,7 @@ int RXmTextGetString(message_t message) register_garbage(s,GarbageData); } -int RXmTextInsert(message_t message) +void RXmTextInsert(message_t message) { Widget w; XmTextPosition pos; @@ -142,17 +142,17 @@ int RXmTextInsert(message_t message) } /* These aren't really query functions, but they fit the model of one */ -int RXmTextPaste(message_t message) +void RXmTextPaste(message_t message) { DEFINE_TEXT_QUERY(XmTextPaste,reply_with_boolean); } -int RXmTextRemove(message_t message) +void RXmTextRemove(message_t message) { DEFINE_TEXT_QUERY(XmTextRemove,reply_with_boolean); } -int RXmTextPosToXY(message_t message) +void RXmTextPosToXY(message_t message) { Widget w; XmTextPosition pos; @@ -172,7 +172,7 @@ int RXmTextPosToXY(message_t message) must_confirm=False; } -int RXmTextReplace(message_t message) +void RXmTextReplace(message_t message) { Widget w; XmTextPosition from,to; @@ -193,47 +193,47 @@ int RXmTextReplace(message_t message) toolkit_read_value(message,&value,reptype); \ setter(w,value) -int RXmTextScroll(message_t message) +void RXmTextScroll(message_t message) { DEFINE_TEXT_SET(XmTextScroll,int,XtRInt); } -int RXmTextSetAddMode(message_t message) +void RXmTextSetAddMode(message_t message) { DEFINE_TEXT_SET(XmTextSetAddMode,int,XtRBoolean); } -int RXmTextSetEditable(message_t message) +void RXmTextSetEditable(message_t message) { DEFINE_TEXT_SET(XmTextSetEditable,int,XtRBoolean); } -int RXmTextSetInsertionPosition(message_t message) +void RXmTextSetInsertionPosition(message_t message) { DEFINE_TEXT_SET(XmTextSetInsertionPosition,XmTextPosition,XtRInt); } -int RXmTextSetMaxLength(message_t message) +void RXmTextSetMaxLength(message_t message) { DEFINE_TEXT_SET(XmTextSetMaxLength,int,XtRInt); } -int RXmTextSetString(message_t message) +void RXmTextSetString(message_t message) { DEFINE_TEXT_SET(XmTextSetString,String,XtRString); } -int RXmTextSetTopCharacter(message_t message) +void RXmTextSetTopCharacter(message_t message) { DEFINE_TEXT_SET(XmTextSetTopCharacter,XmTextPosition,XtRInt); } -int RXmTextShowPosition(message_t message) +void RXmTextShowPosition(message_t message) { DEFINE_TEXT_SET(XmTextShowPosition,XmTextPosition,XtRInt); } -int RXmTextSetHighlight(message_t message) +void RXmTextSetHighlight(message_t message) { Widget w; XmTextPosition left,right; @@ -246,7 +246,7 @@ int RXmTextSetHighlight(message_t message) XmTextSetHighlight(w,left,right,mode); } -int RXmTextSetSelection(message_t message) +void RXmTextSetSelection(message_t message) { Widget w; XmTextPosition first,last; @@ -259,7 +259,7 @@ int RXmTextSetSelection(message_t message) XmTextSetSelection(w,first,last,t); } -int RXmTextXYToPos(message_t message) +void RXmTextXYToPos(message_t message) { Widget w; Position x,y; diff --git a/motif/server/translations.c b/motif/server/translations.c index f5b35cce1..d1c186bca 100644 --- a/motif/server/translations.c +++ b/motif/server/translations.c @@ -1,6 +1,6 @@ /* - $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/motif/server/translations.c,v 1.2 1994/10/27 17:16:51 ram Exp $ + $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/motif/server/translations.c,v 1.3 2007/10/19 09:57:22 cshapiro Rel $ This code was written as part of the CMU Common Lisp project at Carnegie Mellon University, and has been placed in the public domain. @@ -49,7 +49,7 @@ void LispActionProc(Widget w,XEvent *event,String *params,Cardinal *num_params) -int RXtParseTranslationTable(message_t message) +void RXtParseTranslationTable(message_t message) { String table; XtTranslations t; @@ -63,7 +63,7 @@ int RXtParseTranslationTable(message_t message) must_confirm = False; } -int RXtAugmentTranslations(message_t message) +void RXtAugmentTranslations(message_t message) { Widget w; XtTranslations t; @@ -74,7 +74,7 @@ int RXtAugmentTranslations(message_t message) XtAugmentTranslations(w,t); } -int RXtOverrideTranslations(message_t message) +void RXtOverrideTranslations(message_t message) { Widget w; XtTranslations t; @@ -85,7 +85,7 @@ int RXtOverrideTranslations(message_t message) XtOverrideTranslations(w,t); } -int RXtUninstallTranslations(message_t message) +void RXtUninstallTranslations(message_t message) { Widget w; @@ -93,7 +93,7 @@ int RXtUninstallTranslations(message_t message) XtUninstallTranslations(w); } -int RXtParseAcceleratorTable(message_t message) +void RXtParseAcceleratorTable(message_t message) { String table; XtAccelerators accel; @@ -107,7 +107,7 @@ int RXtParseAcceleratorTable(message_t message) must_confirm = False; } -int RXtInstallAccelerators(message_t message) +void RXtInstallAccelerators(message_t message) { Widget dest,src; @@ -116,7 +116,7 @@ int RXtInstallAccelerators(message_t message) XtInstallAccelerators(dest,src); } -int RXtInstallAllAccelerators(message_t message) +void RXtInstallAllAccelerators(message_t message) { Widget dest,src; diff --git a/motif/server/widgets.c b/motif/server/widgets.c index be999ca43..64fa4e013 100644 --- a/motif/server/widgets.c +++ b/motif/server/widgets.c @@ -1,6 +1,6 @@ /* - $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/motif/server/widgets.c,v 1.4 1997/08/22 20:49:38 pw Exp $ + $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/motif/server/widgets.c,v 1.5 2007/10/19 09:57:22 cshapiro Rel $ This code was written as part of the CMU Common Lisp project at Carnegie Mellon University, and has been placed in the public domain. @@ -29,7 +29,7 @@ #include "tables.h" #include "requests.h" -int RXtAppCreateShell(message_t message) +void RXtAppCreateShell(message_t message) { Widget shell; ResourceList resources; @@ -44,7 +44,7 @@ int RXtAppCreateShell(message_t message) reply_with_widget(message,shell); } -int RXtRealizeWidget(message_t message) +void RXtRealizeWidget(message_t message) { Widget widget; @@ -52,7 +52,7 @@ int RXtRealizeWidget(message_t message) XtRealizeWidget(widget); } -int RXtUnrealizeWidget(message_t message) +void RXtUnrealizeWidget(message_t message) { Widget widget; @@ -60,7 +60,7 @@ int RXtUnrealizeWidget(message_t message) XtUnrealizeWidget(widget); } -int RXtMapWidget(message_t message) +void RXtMapWidget(message_t message) { Widget widget; @@ -68,7 +68,7 @@ int RXtMapWidget(message_t message) XtMapWidget(widget); } -int RXtUnmapWidget(message_t message) +void RXtUnmapWidget(message_t message) { Widget widget; @@ -76,7 +76,7 @@ int RXtUnmapWidget(message_t message) XtUnmapWidget(widget); } -int RXtSetSensitive(message_t message) +void RXtSetSensitive(message_t message) { Widget widget; Boolean sensitivity; @@ -86,7 +86,7 @@ int RXtSetSensitive(message_t message) XtSetSensitive(widget,sensitivity); } -int RXtCreateWidget(message_t message) +void RXtCreateWidget(message_t message) { String name; WidgetClass class; @@ -106,7 +106,7 @@ int RXtCreateWidget(message_t message) reply_with_widget(message,w); } -int RXtCreateManagedWidget(message_t message) +void RXtCreateManagedWidget(message_t message) { String name; WidgetClass class; @@ -126,7 +126,7 @@ int RXtCreateManagedWidget(message_t message) reply_with_widget(message,w); } -int RXtDestroyWidget(message_t message) +void RXtDestroyWidget(message_t message) { Widget widget; @@ -134,9 +134,8 @@ int RXtDestroyWidget(message_t message) XtDestroyWidget(widget); } -int RXtCreatePopupShell(message_t message) +void RXtCreatePopupShell(message_t message) { - message_t reply; String name; WidgetClass class; Widget parent,widget; @@ -156,7 +155,7 @@ int RXtCreatePopupShell(message_t message) reply_with_widget(message,widget); } -int RXtPopup(message_t message) +void RXtPopup(message_t message) { Widget widget; XtGrabKind grab_kind; @@ -166,7 +165,7 @@ int RXtPopup(message_t message) XtPopup(widget,grab_kind); } -int RXtPopdown(message_t message) +void RXtPopdown(message_t message) { Widget widget; @@ -174,7 +173,7 @@ int RXtPopdown(message_t message) XtPopdown(widget); } -int RXtManageChild(message_t message) +void RXtManageChild(message_t message) { Widget widget; @@ -182,7 +181,7 @@ int RXtManageChild(message_t message) XtManageChild(widget); } -int RXtUnmanageChild(message_t message) +void RXtUnmanageChild(message_t message) { Widget widget; @@ -190,7 +189,7 @@ int RXtUnmanageChild(message_t message) XtUnmanageChild(widget); } -int RXtManageChildren(message_t message) +void RXtManageChildren(message_t message) { MyWidgetList list; @@ -198,7 +197,7 @@ int RXtManageChildren(message_t message) XtManageChildren(list.widgets,list.length); } -int RXtUnmanageChildren(message_t message) +void RXtUnmanageChildren(message_t message) { MyWidgetList list; @@ -206,7 +205,7 @@ int RXtUnmanageChildren(message_t message) XtUnmanageChildren(list.widgets,list.length); } -int RXtIsManaged(message_t message) +void RXtIsManaged(message_t message) { Widget w; @@ -214,7 +213,7 @@ int RXtIsManaged(message_t message) reply_with_boolean(message,XtIsManaged(w)); } -int RXtPopupSpringLoaded(message_t message) +void RXtPopupSpringLoaded(message_t message) { Widget w; @@ -222,7 +221,7 @@ int RXtPopupSpringLoaded(message_t message) XtPopupSpringLoaded(w); } -int RXtIsRealized(message_t message) +void RXtIsRealized(message_t message) { Widget w; @@ -230,7 +229,7 @@ int RXtIsRealized(message_t message) reply_with_boolean(message,XtIsRealized(w)); } -int RXtWindow(message_t message) +void RXtWindow(message_t message) { Widget w; message_t reply=prepare_reply(message); @@ -242,7 +241,7 @@ int RXtWindow(message_t message) must_confirm=False; } -int RXtName(message_t message) +void RXtName(message_t message) { Widget w; @@ -250,7 +249,7 @@ int RXtName(message_t message) reply_with_string(message,XtName(w)); } -int RXtIsSensitive(message_t message) +void RXtIsSensitive(message_t message) { Widget w; @@ -259,7 +258,7 @@ int RXtIsSensitive(message_t message) } #define XT_IS_REQUEST(WHAT) \ -int RXtIs##WHAT(message_t message) \ +void RXtIs##WHAT(message_t message) \ {\ Widget w;\ toolkit_read_value(message, &w, XtRWidget);\ @@ -278,7 +277,7 @@ XT_IS_REQUEST(TransientShell) XT_IS_REQUEST(VendorShell) XT_IS_REQUEST(WMShell) -int RXtNameToWidget(message_t message) +void RXtNameToWidget(message_t message) { String name; Widget reference; @@ -289,14 +288,14 @@ int RXtNameToWidget(message_t message) reply_with_widget(message, XtNameToWidget(reference, name)); } -int RXtParent(message_t message) +void RXtParent(message_t message) { Widget widget; toolkit_read_value(message, &widget, XtRWidget); reply_with_widget(message, XtParent(widget)); } -int RXtTranslateCoords(message_t message) +void RXtTranslateCoords(message_t message) { Widget w; int x,y,root_x,root_y; @@ -318,7 +317,7 @@ int RXtTranslateCoords(message_t message) -int RXmCreateMenuBar(message_t message) +void RXmCreateMenuBar(message_t message) { String name; Widget widget,parent; @@ -335,7 +334,7 @@ int RXmCreateMenuBar(message_t message) reply_with_widget(message,widget); } -int RXmCreateOptionMenu(message_t message) +void RXmCreateOptionMenu(message_t message) { String name; Widget widget,parent; @@ -352,7 +351,7 @@ int RXmCreateOptionMenu(message_t message) reply_with_widget(message,widget); } -int RXmCreateRadioBox(message_t message) +void RXmCreateRadioBox(message_t message) { String name; Widget widget,parent; @@ -387,77 +386,77 @@ void dialog_maker(message_t message,Widget (*buildfunc)(),WidgetClass class) reply_with_widgets(message,this,shell); } -int RXmCreateWarningDialog(message_t message) +void RXmCreateWarningDialog(message_t message) { dialog_maker(message,XmCreateWarningDialog,xmMessageBoxWidgetClass); } -int RXmCreateBulletinBoardDialog(message_t message) +void RXmCreateBulletinBoardDialog(message_t message) { dialog_maker(message,XmCreateBulletinBoardDialog,xmBulletinBoardWidgetClass); } -int RXmCreateErrorDialog(message_t message) +void RXmCreateErrorDialog(message_t message) { dialog_maker(message,XmCreateErrorDialog,xmMessageBoxWidgetClass); } -int RXmCreateFileSelectionDialog(message_t message) +void RXmCreateFileSelectionDialog(message_t message) { dialog_maker(message,XmCreateFileSelectionDialog,xmFileSelectionBoxWidgetClass); } -int RXmCreateFormDialog(message_t message) +void RXmCreateFormDialog(message_t message) { dialog_maker(message,XmCreateFormDialog,xmFormWidgetClass); } -int RXmCreateInformationDialog(message_t message) +void RXmCreateInformationDialog(message_t message) { dialog_maker(message,XmCreateInformationDialog,xmMessageBoxWidgetClass); } -int RXmCreateMessageDialog(message_t message) +void RXmCreateMessageDialog(message_t message) { dialog_maker(message,XmCreateMessageDialog,xmMessageBoxWidgetClass); } -int RXmCreatePopupMenu(message_t message) +void RXmCreatePopupMenu(message_t message) { dialog_maker(message,XmCreatePopupMenu,xmRowColumnWidgetClass); } -int RXmCreatePromptDialog(message_t message) +void RXmCreatePromptDialog(message_t message) { dialog_maker(message,XmCreatePromptDialog,xmSelectionBoxWidgetClass); } -int RXmCreatePulldownMenu(message_t message) +void RXmCreatePulldownMenu(message_t message) { dialog_maker(message,XmCreatePulldownMenu,xmRowColumnWidgetClass); } -int RXmCreateQuestionDialog(message_t message) +void RXmCreateQuestionDialog(message_t message) { dialog_maker(message,XmCreateQuestionDialog,xmMessageBoxWidgetClass); } -int RXmCreateScrolledList(message_t message) +void RXmCreateScrolledList(message_t message) { dialog_maker(message,XmCreateScrolledList,xmListWidgetClass); } -int RXmCreateScrolledText(message_t message) +void RXmCreateScrolledText(message_t message) { dialog_maker(message,XmCreateScrolledText,xmTextWidgetClass); } -int RXmCreateSelectionDialog(message_t message) +void RXmCreateSelectionDialog(message_t message) { dialog_maker(message,XmCreateSelectionDialog,xmSelectionBoxWidgetClass); } -int RXmCreateWorkingDialog(message_t message) +void RXmCreateWorkingDialog(message_t message) { dialog_maker(message,XmCreateWorkingDialog,xmMessageBoxWidgetClass); } @@ -466,7 +465,7 @@ int RXmCreateWorkingDialog(message_t message) /* Some random functions */ -int RXCreateFontCursor(message_t message) +void RXCreateFontCursor(message_t message) { int shape; Cursor crs; diff --git a/motif/server/xmstring.c b/motif/server/xmstring.c index 074baeebd..a0eb697a6 100644 --- a/motif/server/xmstring.c +++ b/motif/server/xmstring.c @@ -1,6 +1,6 @@ /* - $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/motif/server/xmstring.c,v 1.2 1994/10/27 17:16:51 ram Exp $ + $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/motif/server/xmstring.c,v 1.3 2007/10/19 09:57:22 cshapiro Rel $ This code was written as part of the CMU Common Lisp project at Carnegie Mellon University, and has been placed in the public domain. @@ -22,7 +22,7 @@ /* Functions for building XmFontLists */ -int RXmFontListAdd(message_t message) +void RXmFontListAdd(message_t message) { XmFontList oldlist,newlist; XFontStruct *fstruct; @@ -40,7 +40,7 @@ int RXmFontListAdd(message_t message) #define BOLD_FONT "-*-helvetica-bold-r-normal--11-*" -int RXmFontListCreate(message_t message) +void RXmFontListCreate(message_t message) { XFontStruct *fstruct; Font font; @@ -56,7 +56,7 @@ int RXmFontListCreate(message_t message) reply_with_font_list(message,flist); } -int RXmFontListFree(message_t message) +void RXmFontListFree(message_t message) { XmFontList flist; @@ -68,7 +68,7 @@ int RXmFontListFree(message_t message) /* Functions for using XmStrings */ -int RXmStringBaseline(message_t message) +void RXmStringBaseline(message_t message) { XmFontList flist; XmString xs; @@ -78,7 +78,7 @@ int RXmStringBaseline(message_t message) reply_with_integer(message,XmStringBaseline(flist,xs)); } -int RXmStringByteCompare(message_t message) +void RXmStringByteCompare(message_t message) { XmString s1,s2; @@ -87,7 +87,7 @@ int RXmStringByteCompare(message_t message) reply_with_boolean(message,XmStringByteCompare(s1,s2)); } -int RXmStringCompare(message_t message) +void RXmStringCompare(message_t message) { XmString s1,s2; @@ -96,7 +96,7 @@ int RXmStringCompare(message_t message) reply_with_boolean(message,XmStringCompare(s1,s2)); } -int RXmStringConcat(message_t message) +void RXmStringConcat(message_t message) { XmString s1,s2; @@ -105,7 +105,7 @@ int RXmStringConcat(message_t message) reply_with_xmstring(message,XmStringConcat(s1,s2)); } -int RXmStringCopy(message_t message) +void RXmStringCopy(message_t message) { XmString s; @@ -113,7 +113,7 @@ int RXmStringCopy(message_t message) reply_with_xmstring(message,XmStringCopy(s)); } -int RXmStringCreate(message_t message) +void RXmStringCreate(message_t message) { String s,charset; @@ -122,7 +122,7 @@ int RXmStringCreate(message_t message) reply_with_xmstring(message,XmStringCreate(s,charset)); } -int RXmStringCreateLtoR(message_t message) +void RXmStringCreateLtoR(message_t message) { String s,charset; @@ -131,7 +131,7 @@ int RXmStringCreateLtoR(message_t message) reply_with_xmstring(message,XmStringCreateLtoR(s,charset)); } -int RXmStringGetLtoR(message_t message) +void RXmStringGetLtoR(message_t message) { XmString xs; String text,charset; @@ -151,7 +151,7 @@ int RXmStringGetLtoR(message_t message) must_confirm = False; } -int RXmStringCreateSimple(message_t message) +void RXmStringCreateSimple(message_t message) { String s; @@ -159,7 +159,7 @@ int RXmStringCreateSimple(message_t message) reply_with_xmstring(message,XmStringCreateSimple(s)); } -int RXmStringEmpty(message_t message) +void RXmStringEmpty(message_t message) { XmString s; @@ -167,7 +167,7 @@ int RXmStringEmpty(message_t message) reply_with_boolean(message,XmStringEmpty(s)); } -int RXmStringExtent(message_t message) +void RXmStringExtent(message_t message) { XmFontList flist; XmString s; @@ -184,7 +184,7 @@ int RXmStringExtent(message_t message) must_confirm=False; } -int RXmStringFree(message_t message) +void RXmStringFree(message_t message) { XmString s; @@ -192,7 +192,7 @@ int RXmStringFree(message_t message) XmStringFree(s); } -int RXmStringHasSubstring(message_t message) +void RXmStringHasSubstring(message_t message) { XmString s,subs; @@ -201,7 +201,7 @@ int RXmStringHasSubstring(message_t message) reply_with_boolean(message,XmStringHasSubstring(s,subs)); } -int RXmStringHeight(message_t message) +void RXmStringHeight(message_t message) { XmFontList flist; XmString s; @@ -211,7 +211,7 @@ int RXmStringHeight(message_t message) reply_with_integer(message,XmStringHeight(flist,s)); } -int RXmStringLength(message_t message) +void RXmStringLength(message_t message) { XmString s; @@ -219,7 +219,7 @@ int RXmStringLength(message_t message) reply_with_integer(message,XmStringLength(s)); } -int RXmStringLineCount(message_t message) +void RXmStringLineCount(message_t message) { XmString s; @@ -227,7 +227,7 @@ int RXmStringLineCount(message_t message) reply_with_integer(message,XmStringLineCount(s)); } -int RXmStringNConcat(message_t message) +void RXmStringNConcat(message_t message) { XmString s1,s2; int bytes; @@ -238,7 +238,7 @@ int RXmStringNConcat(message_t message) reply_with_xmstring(message,XmStringNConcat(s1,s2,bytes)); } -int RXmStringNCopy(message_t message) +void RXmStringNCopy(message_t message) { XmString s; int bytes; @@ -248,12 +248,12 @@ int RXmStringNCopy(message_t message) reply_with_xmstring(message,XmStringNCopy(s,bytes)); } -int RXmStringSeparatorCreate(message_t message) +void RXmStringSeparatorCreate(message_t message) { reply_with_xmstring(message,XmStringSeparatorCreate()); } -int RXmStringWidth(message_t message) +void RXmStringWidth(message_t message) { XmFontList flist; XmString s; -- GitLab