diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-25 10:41:05 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-25 10:41:05 +0000 |
| commit | 272e57235cd60a2e65ac8258d96a02eb3939b687 (patch) | |
| tree | 789d74bd6ec1cc468f1f81aab97d4e4dfdb2d5c5 /libXmu/src | |
| parent | b39f063f74bf0163eaf34db03134f226d18142ec (diff) | |
| download | vcxsrv-272e57235cd60a2e65ac8258d96a02eb3939b687.tar.gz vcxsrv-272e57235cd60a2e65ac8258d96a02eb3939b687.tar.bz2 vcxsrv-272e57235cd60a2e65ac8258d96a02eb3939b687.zip | |
git update until 25 Mar 2011
xserver
fontconfig
glproto
libXau
libXft
libXmu
libfontenc
libxcb
mesa
mkfontscale
pixman
randrproto
xkeyboard-config
xtrans
xwininfo
updated following packages:
xproto-7.0.21
xineramaproto-1.2.1
libXt-1.1.1
libxkbfile-1.0.7
libXpm-3.5.9
libXfont-1.4.3
libXaw-1.0.9
bdftopcf-1.0.3
encodings-1.0.4
fixesproto-5.0
font-adobe-100dpi-1.0.3
font-adobe-75dpi-1.0.3
font-adobe-utopia-100dpi-1.0.4
font-adobe-utopia-75dpi-1.0.4
font-adobe-utopia-type1-1.0.4
font-alias-1.0.3
font-arabic-misc-1.0.3
font-bh-100dpi-1.0.3
font-bh-75dpi-1.0.3
font-bh-lucidatypewriter-100dpi-1.0.3
font-bh-lucidatypewriter-75dpi-1.0.3
font-bh-ttf-1.0.3
font-bh-type1-1.0.3
font-bitstream-100dpi-1.0.3
font-bitstream-75dpi-1.0.3
font-bitstream-speedo-1.0.2
font-bitstream-type1-1.0.3
font-cronyx-cyrillic-1.0.3
font-cursor-misc-1.0.3
font-daewoo-misc-1.0.3
font-dec-misc-1.0.3
font-ibm-type1-1.0.3
font-isas-misc-1.0.3
font-jis-misc-1.0.3
font-micro-misc-1.0.3
font-misc-cyrillic-1.0.3
font-misc-ethiopic-1.0.3
font-misc-meltho-1.0.3
font-misc-misc-1.1.2
font-mutt-misc-1.0.3
font-schumacher-misc-1.1.2
font-screen-cyrillic-1.0.4
font-sony-misc-1.0.3
font-sun-misc-1.0.3
font-util-1.2.0
font-winitzki-cyrillic-1.0.3
font-xfree86-type1-1.0.4
Diffstat (limited to 'libXmu/src')
46 files changed, 588 insertions, 1449 deletions
diff --git a/libXmu/src/AllCmap.c b/libXmu/src/AllCmap.c index 09ae52aa4..1daa8de7c 100644 --- a/libXmu/src/AllCmap.c +++ b/libXmu/src/AllCmap.c @@ -1,5 +1,3 @@ -/* $Xorg: AllCmap.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/AllCmap.c,v 1.7 2001/01/17 19:42:53 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/libXmu/src/Atoms.c b/libXmu/src/Atoms.c index dcdf497a5..48e243194 100644 --- a/libXmu/src/Atoms.c +++ b/libXmu/src/Atoms.c @@ -1,5 +1,3 @@ -/* $Xorg: Atoms.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Atoms.c,v 3.7 2001/07/25 15:04:50 dawes Exp $ */ /* * This file contains routines to cache atoms, avoiding multiple diff --git a/libXmu/src/ClientWin.c b/libXmu/src/ClientWin.c index 7fc273f1f..3af323e0a 100644 --- a/libXmu/src/ClientWin.c +++ b/libXmu/src/ClientWin.c @@ -1,5 +1,3 @@ -/* $Xorg: ClientWin.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/ClientWin.c,v 1.7 2001/12/14 19:55:34 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/libXmu/src/Clip.c b/libXmu/src/Clip.c index 121a69f23..ff87a80c0 100644 --- a/libXmu/src/Clip.c +++ b/libXmu/src/Clip.c @@ -24,7 +24,6 @@ * dealings in this Software without prior written authorization from the * XFree86 Project. */ -/* $XFree86: xc/lib/Xmu/Clip.c,v 1.1 1998/08/16 10:25:03 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/libXmu/src/CloseHook.c b/libXmu/src/CloseHook.c index 5e66d0cad..ca9d9def6 100644 --- a/libXmu/src/CloseHook.c +++ b/libXmu/src/CloseHook.c @@ -1,5 +1,3 @@ -/* $Xorg: CloseHook.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -24,7 +22,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/CloseHook.c,v 3.5 2001/07/25 15:04:50 dawes Exp $ */ /* * CloseDisplayHook package - provide callback on XCloseDisplay diff --git a/libXmu/src/CmapAlloc.c b/libXmu/src/CmapAlloc.c index 1f27f1eef..0bccb829c 100644 --- a/libXmu/src/CmapAlloc.c +++ b/libXmu/src/CmapAlloc.c @@ -1,5 +1,3 @@ -/* $Xorg: CmapAlloc.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /* Copyright 1989, 1994, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/CmapAlloc.c,v 1.6 2001/01/17 19:42:53 dawes Exp $ */ /* * Author: Donna Converse, MIT X Consortium diff --git a/libXmu/src/CrCmap.c b/libXmu/src/CrCmap.c index 011c71465..4343f5f0f 100644 --- a/libXmu/src/CrCmap.c +++ b/libXmu/src/CrCmap.c @@ -1,5 +1,3 @@ -/* $Xorg: CrCmap.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/CrCmap.c,v 3.6 2001/01/17 19:42:53 dawes Exp $ */ /* * Author: Donna Converse, MIT X Consortium diff --git a/libXmu/src/CrPixFBit.c b/libXmu/src/CrPixFBit.c index c7ff6caf2..9489a19a0 100644 --- a/libXmu/src/CrPixFBit.c +++ b/libXmu/src/CrPixFBit.c @@ -1,5 +1,3 @@ -/* $Xorg: CrPixFBit.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/CrPixFBit.c,v 1.6 2001/01/17 19:42:53 dawes Exp $ */ /* * This file contains miscellaneous utility routines and is not part of the diff --git a/libXmu/src/CursorName.c b/libXmu/src/CursorName.c index 17f390246..8867e8fa4 100644 --- a/libXmu/src/CursorName.c +++ b/libXmu/src/CursorName.c @@ -1,5 +1,3 @@ -/* $Xorg: CursorName.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/CursorName.c,v 3.7tsi Exp $ */ #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/libXmu/src/CvtCache.c b/libXmu/src/CvtCache.c index 8dd4602ea..39a5d0caf 100644 --- a/libXmu/src/CvtCache.c +++ b/libXmu/src/CvtCache.c @@ -1,5 +1,3 @@ -/* $Xorg: CvtCache.c,v 1.5 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/CvtCache.c,v 3.6 2001/08/23 00:03:21 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium diff --git a/libXmu/src/CvtStdSel.c b/libXmu/src/CvtStdSel.c index a6f206ade..81d1a8474 100644 --- a/libXmu/src/CvtStdSel.c +++ b/libXmu/src/CvtStdSel.c @@ -1,6 +1,3 @@ -/* $Xorg: CvtStdSel.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ -/* $XdotOrg: xc/lib/Xmu/CvtStdSel.c,v 1.5 2005/05/22 04:36:38 alanc Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -26,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/CvtStdSel.c,v 3.19 2001/11/21 16:22:59 tsi Exp $ */ /* * This file contains routines to handle common selection targets. diff --git a/libXmu/src/DefErrMsg.c b/libXmu/src/DefErrMsg.c index d1aa9ad9a..37fe0aa31 100644 --- a/libXmu/src/DefErrMsg.c +++ b/libXmu/src/DefErrMsg.c @@ -1,5 +1,3 @@ -/* $Xorg: DefErrMsg.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,13 +23,11 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/DefErrMsg.c,v 1.7 2001/01/17 19:42:54 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include <stdio.h> -#define NEED_EVENTS #include <X11/Xlibint.h> #include <X11/Xproto.h> #include <X11/Xmu/Error.h> diff --git a/libXmu/src/DelCmap.c b/libXmu/src/DelCmap.c index 1f2c6abe8..f29ae00f0 100644 --- a/libXmu/src/DelCmap.c +++ b/libXmu/src/DelCmap.c @@ -1,5 +1,3 @@ -/* $Xorg: DelCmap.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/DelCmap.c,v 1.6 2001/01/17 19:42:54 dawes Exp $ */ /* * Author: Donna Converse, MIT X Consortium diff --git a/libXmu/src/DisplayQue.c b/libXmu/src/DisplayQue.c index ae9f92e1d..de76a69c4 100644 --- a/libXmu/src/DisplayQue.c +++ b/libXmu/src/DisplayQue.c @@ -1,5 +1,3 @@ -/* $Xorg: DisplayQue.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/DisplayQue.c,v 3.4 2001/07/25 15:04:50 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium diff --git a/libXmu/src/Distinct.c b/libXmu/src/Distinct.c index f00b00b5a..9d31494ec 100644 --- a/libXmu/src/Distinct.c +++ b/libXmu/src/Distinct.c @@ -1,5 +1,3 @@ -/* $Xorg: Distinct.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1990, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Distinct.c,v 3.5 2001/07/25 15:04:50 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/libXmu/src/DrRndRect.c b/libXmu/src/DrRndRect.c index 7fe5489d0..1373de07d 100644 --- a/libXmu/src/DrRndRect.c +++ b/libXmu/src/DrRndRect.c @@ -1,5 +1,3 @@ -/* $Xorg: DrRndRect.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/DrRndRect.c,v 1.6 2001/01/17 19:42:54 dawes Exp $ */ /* * XmuDrawRoundedRectangle, XmuFillRoundedRectangle diff --git a/libXmu/src/DrawLogo.c b/libXmu/src/DrawLogo.c index 74e64d866..4af89b530 100644 --- a/libXmu/src/DrawLogo.c +++ b/libXmu/src/DrawLogo.c @@ -1,5 +1,3 @@ -/* $Xorg: DrawLogo.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/DrawLogo.c,v 1.7 2001/01/17 19:42:54 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/libXmu/src/EditresCom.c b/libXmu/src/EditresCom.c index 51ac24895..b4554e142 100644 --- a/libXmu/src/EditresCom.c +++ b/libXmu/src/EditresCom.c @@ -1,5 +1,3 @@ -/* $Xorg: EditresCom.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/EditresCom.c,v 1.21 2003/10/24 15:44:05 tsi Exp $ */ /* * Author: Chris D. Peterson, Dave Sternlicht, MIT X Consortium @@ -51,60 +48,60 @@ in this Software without prior written authorization from The Open Group. #include <stdlib.h> #include <string.h> -#define _XEditResPutBool _XEditResPut8 +#define _XEditResPutBool _XEditResPut8 #define _XEditResPutResourceType _XEditResPut8 /* * Types */ typedef enum { - BlockNone, - BlockSetValues, - BlockAll + BlockNone, + BlockSetValues, + BlockAll } EditresBlock; typedef struct _SetValuesEvent { - EditresCommand type; /* first field must be type */ - WidgetInfo *widgets; - unsigned short num_entries; /* number of set values requests */ - char *name; - char *res_type; + EditresCommand type; /* first field must be type */ + WidgetInfo *widgets; + unsigned short num_entries; /* number of set values requests */ + char *name; + char *res_type; XtPointer value; unsigned short value_len; } SetValuesEvent; typedef struct _SVErrorInfo { - SetValuesEvent *event; - ProtocolStream *stream; - unsigned short *count; - WidgetInfo *entry; + SetValuesEvent *event; + ProtocolStream *stream; + unsigned short *count; + WidgetInfo *entry; } SVErrorInfo; typedef struct _GetValuesEvent { - EditresCommand type; /* first field must be type */ - WidgetInfo *widgets; - unsigned short num_entries; /* number of get values requests */ - char *name; + EditresCommand type; /* first field must be type */ + WidgetInfo *widgets; + unsigned short num_entries; /* number of get values requests */ + char *name; } GetValuesEvent; typedef struct _FindChildEvent { - EditresCommand type; /* first field must be type */ - WidgetInfo *widgets; + EditresCommand type; /* first field must be type */ + WidgetInfo *widgets; short x, y; } FindChildEvent; typedef struct _GenericGetEvent { - EditresCommand type; /* first field must be type */ - WidgetInfo *widgets; - unsigned short num_entries; /* number of set values requests */ + EditresCommand type; /* first field must be type */ + WidgetInfo *widgets; + unsigned short num_entries; /* number of set values requests */ } GenericGetEvent, GetResEvent, GetGeomEvent; /* * Common to all events */ typedef struct _AnyEvent { - EditresCommand type; /* first field must be type */ - WidgetInfo *widgets; + EditresCommand type; /* first field must be type */ + WidgetInfo *widgets; } AnyEvent; /* @@ -122,7 +119,7 @@ typedef struct _Globals { EditresBlock block; SVErrorInfo error_info; ProtocolStream stream; - ProtocolStream *command_stream; /* command stream */ + ProtocolStream *command_stream; /* command stream */ #if defined(LONG64) || defined(WORD64) unsigned long base_address; #endif @@ -206,25 +203,25 @@ _XEditResCheckMessages(Widget w, XtPointer data, XEvent *event, Boolean *cont) { Time time; ResIdent ident; - static Boolean first_time = False; + static Boolean first_time = False; static Atom res_editor, res_comm; - Display *dpy; + Display *dpy; - if (event->type == ClientMessage) + if (event->type == ClientMessage) { - XClientMessageEvent * c_event = (XClientMessageEvent *)event; + XClientMessageEvent * c_event = (XClientMessageEvent *)event; dpy = XtDisplay(w); - if (!first_time) + if (!first_time) { Atom atoms[4]; - static char *names[] = { + static char *names[] = { EDITRES_NAME, EDITRES_COMMAND_ATOM, - EDITRES_PROTOCOL_ATOM, EDITRES_CLIENT_VALUE - }; - - first_time = True; - XInternAtoms(dpy, names, 4, False, atoms); + EDITRES_PROTOCOL_ATOM, EDITRES_CLIENT_VALUE + }; + + first_time = True; + XInternAtoms(dpy, names, 4, False, atoms); res_editor = atoms[0]; res_editor_command = atoms[1]; res_editor_protocol = atoms[2]; @@ -233,23 +230,24 @@ _XEditResCheckMessages(Widget w, XtPointer data, XEvent *event, Boolean *cont) LoadResources(w); } - if ((c_event->message_type != res_editor) - || (c_event->format != EDITRES_SEND_EVENT_FORMAT)) + if ((c_event->message_type != res_editor) + || (c_event->format != EDITRES_SEND_EVENT_FORMAT)) return; time = c_event->data.l[0]; res_comm = c_event->data.l[1]; ident = (ResIdent) c_event->data.l[2]; - if (c_event->data.l[3] != CURRENT_PROTOCOL_VERSION) + if (c_event->data.l[3] != CURRENT_PROTOCOL_VERSION) { _XEditResResetStream(&globals.stream); - _XEditResPut8(&globals.stream, (unsigned int) CURRENT_PROTOCOL_VERSION); + _XEditResPut8(&globals.stream, + (unsigned int) CURRENT_PROTOCOL_VERSION); SendCommand(w, res_comm, ident, ProtocolMismatch, &globals.stream); return; } XtGetSelectionValue(w, res_comm, res_editor_command, - GetCommand, (XtPointer)(long)ident, time); + GetCommand, (XtPointer)(long)ident, time); } } @@ -279,134 +277,134 @@ static EditresEvent * BuildEvent(Widget w, Atom sel, XtPointer data, ResIdent ident, unsigned long length) { - EditresEvent *event; + EditresEvent *event; ProtocolStream alloc_stream, *stream; unsigned char temp; register unsigned int i; - stream = &alloc_stream; - stream->current = stream->top = (unsigned char *)data; - stream->size = HEADER_SIZE; /* size of header */ + stream = &alloc_stream; + stream->current = stream->top = (unsigned char *)data; + stream->size = HEADER_SIZE; /* size of header */ /* - * Retrieve the Header + * Retrieve the Header */ - if (length < HEADER_SIZE) + if (length < HEADER_SIZE) { - SendFailure(w, sel, ident, ERROR_MESSAGE); - return (NULL); + SendFailure(w, sel, ident, ERROR_MESSAGE); + return (NULL); } - (void)_XEditResGet8(stream, &temp); - if (temp != ident) /* Id's don't match, ignore request */ - return (NULL); + (void)_XEditResGet8(stream, &temp); + if (temp != ident) /* Id's don't match, ignore request */ + return (NULL); - event = (EditresEvent *)XtCalloc(sizeof(EditresEvent), 1); + event = (EditresEvent *)XtCalloc(sizeof(EditresEvent), 1); + + (void)_XEditResGet8(stream, &temp); + event->any_event.type = (EditresCommand)temp; + (void)_XEditResGet32(stream, &stream->size); + stream->top = stream->current; /* reset stream to top of value */ - (void)_XEditResGet8(stream, &temp); - event->any_event.type = (EditresCommand)temp; - (void)_XEditResGet32(stream, &stream->size); - stream->top = stream->current; /* reset stream to top of value */ - /* - * Now retrieve the data segment + * Now retrieve the data segment */ - switch(event->any_event.type) + switch(event->any_event.type) { case SendWidgetTree: break; /* no additional info */ case SetValues: { - SetValuesEvent *sv_event = (SetValuesEvent *)event; - - if (!(_XEditResGetString8(stream, &sv_event->name) - && _XEditResGetString8(stream, &sv_event->res_type))) + SetValuesEvent *sv_event = (SetValuesEvent *)event; + + if (!(_XEditResGetString8(stream, &sv_event->name) + && _XEditResGetString8(stream, &sv_event->res_type))) goto done; /* * Since we need the value length, we have to pull the - * value out by hand + * value out by hand */ - if (!_XEditResGet16(stream, &sv_event->value_len)) + if (!_XEditResGet16(stream, &sv_event->value_len)) goto done; - sv_event->value = XtMalloc(sizeof(char) * (sv_event->value_len + 1)); + sv_event->value = XtMalloc(sizeof(char) * (sv_event->value_len + 1)); - for (i = 0; i < sv_event->value_len; i++) - if (!_XEditResGet8(stream, (unsigned char *)sv_event->value + i)) + for (i = 0; i < sv_event->value_len; i++) + if (!_XEditResGet8(stream, (unsigned char *)sv_event->value + i)) goto done; - ((char*)sv_event->value)[i] = '\0'; + ((char*)sv_event->value)[i] = '\0'; - if (!_XEditResGet16(stream, &sv_event->num_entries)) + if (!_XEditResGet16(stream, &sv_event->num_entries)) goto done; sv_event->widgets = (WidgetInfo *) XtCalloc(sizeof(WidgetInfo), sv_event->num_entries); - - for (i = 0; i < sv_event->num_entries; i++) + + for (i = 0; i < sv_event->num_entries; i++) if (!_XEditResGetWidgetInfo(stream, sv_event->widgets + i)) goto done; - } + } break; case FindChild: - { - FindChildEvent *find_event = (FindChildEvent *)event; - - find_event->widgets = (WidgetInfo *)XtCalloc(sizeof(WidgetInfo), 1); + { + FindChildEvent *find_event = (FindChildEvent *)event; + + find_event->widgets = (WidgetInfo *)XtCalloc(sizeof(WidgetInfo), 1); - if (!(_XEditResGetWidgetInfo(stream, find_event->widgets) - && _XEditResGetSigned16(stream, &find_event->x) - && _XEditResGetSigned16(stream, &find_event->y))) + if (!(_XEditResGetWidgetInfo(stream, find_event->widgets) + && _XEditResGetSigned16(stream, &find_event->x) + && _XEditResGetSigned16(stream, &find_event->y))) goto done; - } + } break; case GetGeometry: case GetResources: - { - GenericGetEvent *get_event = (GenericGetEvent *)event; - - if (!_XEditResGet16(stream, &get_event->num_entries)) + { + GenericGetEvent *get_event = (GenericGetEvent *)event; + + if (!_XEditResGet16(stream, &get_event->num_entries)) goto done; - + get_event->widgets = (WidgetInfo *) XtCalloc(sizeof(WidgetInfo), get_event->num_entries); - for (i = 0; i < get_event->num_entries; i++) - if (!_XEditResGetWidgetInfo(stream, get_event->widgets + i)) + for (i = 0; i < get_event->num_entries; i++) + if (!_XEditResGetWidgetInfo(stream, get_event->widgets + i)) goto done; - } + } break; - case GetValues: - { - GetValuesEvent *gv_event = (GetValuesEvent *)event; + case GetValues: + { + GetValuesEvent *gv_event = (GetValuesEvent *)event; - _XEditResGetString8(stream, &gv_event->name); - _XEditResGet16(stream, &gv_event->num_entries); + _XEditResGetString8(stream, &gv_event->name); + _XEditResGet16(stream, &gv_event->num_entries); gv_event->widgets = (WidgetInfo *) XtCalloc(sizeof(WidgetInfo), gv_event->num_entries); - _XEditResGetWidgetInfo(stream, gv_event->widgets); - } - break; + _XEditResGetWidgetInfo(stream, gv_event->widgets); + } + break; default: { char buf[BUFSIZ]; - + XmuSnprintf(buf, sizeof(buf), - "Unknown Protocol request %d.", event->any_event.type); + "Unknown Protocol request %d.", event->any_event.type); SendFailure(w, sel, ident, buf); - FreeEvent(event); - return (NULL); + FreeEvent(event); + return (NULL); } } - return (event); + return (event); - done: + done: SendFailure(w, sel, ident, ERROR_MESSAGE); FreeEvent(event); - return (NULL); -} + return (NULL); +} /* * Function: @@ -422,17 +420,17 @@ static void FreeEvent(EditresEvent *event) { if (event->any_event.widgets != NULL) - { + { XtFree((char *)event->any_event.widgets->ids); XtFree((char *)event->any_event.widgets); } if (event->any_event.type == SetValues) - { + { XtFree(event->set_values_event.name); XtFree(event->set_values_event.res_type); } - + XtFree((char *)event); } @@ -452,13 +450,13 @@ static void GetCommand(Widget w, XtPointer data, Atom *selection, Atom *type, XtPointer value, unsigned long *length, int *format) { - ResIdent ident = (ResIdent)(long)data; - EditresEvent *event; + ResIdent ident = (ResIdent)(long)data; + EditresEvent *event; - if (*type != res_editor_protocol || *format != EDITRES_FORMAT) + if (*type != res_editor_protocol || *format != EDITRES_FORMAT) return; - if ((event = BuildEvent(w, *selection, value, ident, *length)) != NULL) + if ((event = BuildEvent(w, *selection, value, ident, *length)) != NULL) { ExecuteCommand(w, *selection, ident, event); FreeEvent(event); @@ -481,24 +479,24 @@ GetCommand(Widget w, XtPointer data, Atom *selection, Atom *type, static void ExecuteCommand(Widget w, Atom sel, ResIdent ident, EditresEvent *event) { - char *(*func)(Widget, EditresEvent*, ProtocolStream*); - char *str; + char *(*func)(Widget, EditresEvent*, ProtocolStream*); + char *str; - if (globals.block == BlockAll) + if (globals.block == BlockAll) { - SendFailure(w, sel, ident, + SendFailure(w, sel, ident, "This client has blocked all Editres commands."); return; } - else if (globals.block == BlockSetValues - && event->any_event.type == SetValues) + else if (globals.block == BlockSetValues + && event->any_event.type == SetValues) { - SendFailure(w, sel, ident, + SendFailure(w, sel, ident, "This client has blocked all SetValues requests."); return; } - switch(event->any_event.type) + switch(event->any_event.type) { case SendWidgetTree: #if defined(LONG64) || defined(WORD64) @@ -521,7 +519,7 @@ ExecuteCommand(Widget w, Atom sel, ResIdent ident, EditresEvent *event) case GetValues: func = DumpValues; break; - default: + default: { char buf[BUFSIZ]; @@ -535,7 +533,7 @@ ExecuteCommand(Widget w, Atom sel, ResIdent ident, EditresEvent *event) _XEditResResetStream(&globals.stream); if ((str = (*func)(w, event, &globals.stream)) == NULL) SendCommand(w, sel, ident, PartialSuccess, &globals.stream); - else + else SendFailure(w, sel, ident, str); } @@ -565,13 +563,13 @@ ConvertReturnCommand(Widget w, Atom *selection, Atom *target, Atom *type_ret, int *format_ret) { /* - * I assume the intrinsics give me the correct selection back + * I assume the intrinsics give me the correct selection back */ if ((*target != client_value)) - return (False); + return (False); *type_ret = res_editor_protocol; - *value_ret = (XtPointer)globals.command_stream->real_top; + *value_ret = (XtPointer)globals.command_stream->real_top; *length_ret = globals.command_stream->size + HEADER_SIZE; *format_ret = EDITRES_FORMAT; @@ -637,13 +635,13 @@ BuildReturnPacket(ResIdent ident, EditResError error, ProtocolStream *stream) { long old_alloc, old_size; unsigned char *old_current; - + /* * We have cleverly keep enough space at the top of the header * for the return protocol stream, so all we have to do is * fill in the space */ - /* + /* * Fool the insert routines into putting the header in the right * place while being damn sure not to realloc (that would be very bad.) */ @@ -652,8 +650,8 @@ BuildReturnPacket(ResIdent ident, EditResError error, ProtocolStream *stream) old_size = stream->size; stream->current = stream->real_top; - stream->alloc = stream->size + (2 * HEADER_SIZE); - + stream->alloc = stream->size + (2 * HEADER_SIZE); + _XEditResPut8(stream, ident); _XEditResPut8(stream, (unsigned char)error); _XEditResPut32(stream, old_size); @@ -661,9 +659,9 @@ BuildReturnPacket(ResIdent ident, EditResError error, ProtocolStream *stream) stream->alloc = old_alloc; stream->current = old_current; stream->size = old_size; - - return ((XtPointer)stream->real_top); -} + + return ((XtPointer)stream->real_top); +} /* * Function: @@ -683,14 +681,14 @@ SendCommand(Widget w, Atom sel, ResIdent ident, EditResError error, ProtocolStream *stream) { BuildReturnPacket(ident, error, stream); - globals.command_stream = stream; + globals.command_stream = stream; - /* - * I REALLY want to own the selection. Since this was not triggered - * by a user action, and I am the only one using this atom it is safe to - * use CurrentTime - */ - XtOwnSelection(w, sel, CurrentTime, ConvertReturnCommand, NULL, CommandDone); + /* + * I REALLY want to own the selection. Since this was not triggered + * by a user action, and I am the only one using this atom it is safe to + * use CurrentTime + */ + XtOwnSelection(w, sel, CurrentTime, ConvertReturnCommand, NULL, CommandDone); } /************************************************************ @@ -698,8 +696,8 @@ SendCommand(Widget w, Atom sel, ResIdent ident, EditResError error, ************************************************************/ static int qcmp_widget_list(register _Xconst void *left, register _Xconst void *right) -{ - return (char *)*(Widget **)left - (char *)*(Widget **)right; +{ + return (char *)*(Widget **)left - (char *)*(Widget **)right; } /* @@ -723,128 +721,129 @@ static int FindChildren(Widget parent, Widget **children, Bool normal, Bool popup, Bool extra) { - CompositeWidget cw = (CompositeWidget)parent; - Cardinal i, num_children, current = 0; - Widget *extra_widgets = NULL; - Cardinal num_extra = 0; - + CompositeWidget cw = (CompositeWidget)parent; + Cardinal i, num_children, current = 0; + Widget *extra_widgets = NULL; + Cardinal num_extra = 0; + num_children = 0; if (XtIsWidget(parent) && popup) num_children += parent->core.num_popups; - - if (XtIsComposite(parent) && normal) - num_children += cw->composite.num_children; - if (XtIsWidget(parent) && extra) + if (XtIsComposite(parent) && normal) + num_children += cw->composite.num_children; + + if (XtIsWidget(parent) && extra) { - XtResourceList norm_list, cons_list; - Cardinal num_norm, num_cons; - Arg args[1]; - Widget widget; + XtResourceList norm_list, cons_list; + Cardinal num_norm, num_cons; + Arg args[1]; + Widget widget; - XtGetResourceList(XtClass(parent), &norm_list, &num_norm); + XtGetResourceList(XtClass(parent), &norm_list, &num_norm); - if (XtParent(parent) != NULL) - XtGetConstraintResourceList(XtClass(XtParent(parent)), - &cons_list, &num_cons); - else - num_cons = 0; + if (XtParent(parent) != NULL) + XtGetConstraintResourceList(XtClass(XtParent(parent)), + &cons_list, &num_cons); + else + num_cons = 0; - extra_widgets = (Widget *)XtMalloc(sizeof(Widget)); - for (i = 0; i < num_norm; i++) - if (strcmp(norm_list[i].resource_type, XtRWidget) == 0) - { - widget = NULL; - XtSetArg(args[0], norm_list[i].resource_name, &widget); - XtGetValues(parent, args, 1); - if (widget && XtParent(widget) == parent) - { - ++num_extra; - extra_widgets = (Widget *) - XtRealloc((char *)extra_widgets, num_extra * sizeof(Widget)); - extra_widgets[num_extra - 1] = widget; - } - } - for (i = 0; i < num_cons; i++) - if (strcmp(cons_list[i].resource_type, XtRWidget) == 0) - { - widget = NULL; - XtSetArg(args[0], cons_list[i].resource_name, &widget); - XtGetValues(parent, args, 1); - if (widget && XtParent(widget) == parent) - { - ++num_extra; - extra_widgets = (Widget *) - XtRealloc((char *)extra_widgets, num_extra * sizeof(Widget)); - extra_widgets[num_extra - 1] = widget; - } - } - if (num_norm) - XtFree((char *)norm_list); - if (num_cons) - XtFree((char *)cons_list); + extra_widgets = (Widget *)XtMalloc(sizeof(Widget)); + for (i = 0; i < num_norm; i++) + if (strcmp(norm_list[i].resource_type, XtRWidget) == 0) + { + widget = NULL; + XtSetArg(args[0], norm_list[i].resource_name, &widget); + XtGetValues(parent, args, 1); + if (widget && XtParent(widget) == parent) + { + ++num_extra; + extra_widgets = (Widget *) XtRealloc( + (char *)extra_widgets, num_extra * sizeof(Widget)); + extra_widgets[num_extra - 1] = widget; + } + } + for (i = 0; i < num_cons; i++) + if (strcmp(cons_list[i].resource_type, XtRWidget) == 0) + { + widget = NULL; + XtSetArg(args[0], cons_list[i].resource_name, &widget); + XtGetValues(parent, args, 1); + if (widget && XtParent(widget) == parent) + { + ++num_extra; + extra_widgets = (Widget *) XtRealloc( + (char *)extra_widgets, num_extra * sizeof(Widget)); + extra_widgets[num_extra - 1] = widget; + } + } + if (num_norm) + XtFree((char *)norm_list); + if (num_cons) + XtFree((char *)cons_list); } - if ((num_children + num_extra) == 0) + if ((num_children + num_extra) == 0) { - *children = NULL; - return (0); + *children = NULL; + return (0); } - *children = (Widget *)XtMalloc(sizeof(Widget) * (num_children + num_extra)); + *children = (Widget *)XtMalloc(sizeof(Widget) * (num_children + num_extra)); if (XtIsComposite(parent) && normal) - for (i = 0; i < cw->composite.num_children; i++, current++) - (*children)[current] = cw->composite.children[i]; + for (i = 0; i < cw->composite.num_children; i++, current++) + (*children)[current] = cw->composite.children[i]; if (XtIsWidget(parent) && popup) - for (i = 0; i < parent->core.num_popups; i++, current++) + for (i = 0; i < parent->core.num_popups; i++, current++) (*children)[current] = parent->core.popup_list[i]; - if (num_extra) + if (num_extra) /* Check for dups */ { - Cardinal j, old_num_extra = num_extra; - - qsort(extra_widgets, num_extra, sizeof(Widget), qcmp_widget_list); - for (i = 0; i < num_extra - 1; i++) - while (i < num_extra - 1 && extra_widgets[i] == extra_widgets[i + 1]) - { - memmove(&extra_widgets[i], &extra_widgets[i + 1], - (num_extra - i) * sizeof(Widget)); - --num_extra; - } - - for (i = 0; i < num_children; i++) - for (j = 0; j < num_extra; j++) - if ((*children)[i] == extra_widgets[j]) + Cardinal j, old_num_extra = num_extra; + + qsort(extra_widgets, num_extra, sizeof(Widget), qcmp_widget_list); + for (i = 0; i < num_extra - 1; i++) + while (i < num_extra - 1 && + extra_widgets[i] == extra_widgets[i + 1]) { - if ((j + 1) < num_extra) - memmove(&extra_widgets[j], &extra_widgets[j + 1], - (num_extra - j) * sizeof(Widget)); - --num_extra; + memmove(&extra_widgets[i], &extra_widgets[i + 1], + (num_extra - i) * sizeof(Widget)); + --num_extra; } - if (old_num_extra != num_extra) - *children = (Widget *)XtRealloc((char *)*children, sizeof(Widget) - * (num_children + num_extra)); - - if (num_extra) - memcpy(&(*children)[num_children], extra_widgets, - sizeof(Widget) * num_extra); + for (i = 0; i < num_children; i++) + for (j = 0; j < num_extra; j++) + if ((*children)[i] == extra_widgets[j]) + { + if ((j + 1) < num_extra) + memmove(&extra_widgets[j], &extra_widgets[j + 1], + (num_extra - j) * sizeof(Widget)); + --num_extra; + } + + if (old_num_extra != num_extra) + *children = (Widget *)XtRealloc((char *)*children, sizeof(Widget) + * (num_children + num_extra)); + + if (num_extra) + memcpy(&(*children)[num_children], extra_widgets, + sizeof(Widget) * num_extra); } - if (extra_widgets) - XtFree((char *)extra_widgets); - if (num_children + num_extra == 0) + if (extra_widgets) + XtFree((char *)extra_widgets); + if (num_children + num_extra == 0) { - XtFree((char *)*children); - *children = NULL; + XtFree((char *)*children); + *children = NULL; } - return (num_children + num_extra); + return (num_children + num_extra); } - + /* * Function: * IsChild @@ -861,22 +860,22 @@ static Bool IsChild(Widget top, Widget parent, Widget child) { int i, num_children; - Widget *children; + Widget *children; if (parent == NULL) - return (top == child); + return (top == child); - num_children = FindChildren(parent, &children, True, True, True); + num_children = FindChildren(parent, &children, True, True, True); - for (i = 0; i < num_children; i++) - if (children[i] == child) - { + for (i = 0; i < num_children; i++) + if (children[i] == child) + { XtFree((char *)children); - return (True); - } + return (True); + } XtFree((char *)children); - return (False); + return (False); } /* @@ -890,35 +889,35 @@ IsChild(Widget top, Widget parent, Widget child) * Description: * Makes sure all the widgets still exist */ -static char * +static char * VerifyWidget(Widget w, WidgetInfo *info) { Widget top; register int count; register Widget parent; - register unsigned long *child; + register unsigned long *child; - for (top = w; XtParent(top) != NULL; top = XtParent(top)) - ; + for (top = w; XtParent(top) != NULL; top = XtParent(top)) + ; parent = NULL; child = info->ids; count = 0; - while (True) + while (True) { - if (!IsChild(top, parent, (Widget) *child)) - return ("This widget no longer exists in the client."); + if (!IsChild(top, parent, (Widget) *child)) + return ("This widget no longer exists in the client."); if (++count == info->num_widgets) break; - parent = (Widget)*child++; + parent = (Widget)*child++; } - info->real_widget = (Widget)*child; + info->real_widget = (Widget)*child; - return (NULL); + return (NULL); } /************************************************************ @@ -942,23 +941,23 @@ VerifyWidget(Widget w, WidgetInfo *info) static char * DoSetValues(Widget w, EditresEvent *event, ProtocolStream *stream) { - char *str; + char *str; register unsigned i; unsigned short count = 0; - SetValuesEvent *sv_event = (SetValuesEvent *)event; - - _XEditResPut16(stream, count); /* insert 0, will be overwritten later */ + SetValuesEvent *sv_event = (SetValuesEvent *)event; - for (i = 0; i < sv_event->num_entries; i++) + _XEditResPut16(stream, count); /* insert 0, will be overwritten later */ + + for (i = 0; i < sv_event->num_entries; i++) { - if ((str = VerifyWidget(w, &sv_event->widgets[i])) != NULL) + if ((str = VerifyWidget(w, &sv_event->widgets[i])) != NULL) { - _XEditResPutWidgetInfo(stream, &sv_event->widgets[i]); + _XEditResPutWidgetInfo(stream, &sv_event->widgets[i]); _XEditResPutString8(stream, str); count++; } - else - ExecuteSetValues(sv_event->widgets[i].real_widget, + else + ExecuteSetValues(sv_event->widgets[i].real_widget, sv_event, sv_event->widgets + i, stream, &count); } @@ -968,7 +967,7 @@ DoSetValues(Widget w, EditresEvent *event, ProtocolStream *stream) *(stream->top) = count >> XER_NBBY; *(stream->top + 1) = count; - return (NULL); + return (NULL); } /* @@ -990,14 +989,14 @@ static void HandleToolkitErrors(String name, String type, String class, String msg, String *params, Cardinal *num_params) { - SVErrorInfo *info = &globals.error_info; - char buf[BUFSIZ]; + SVErrorInfo *info = &globals.error_info; + char buf[BUFSIZ]; - if (streq(name, "unknownType")) + if (streq(name, "unknownType")) XmuSnprintf(buf, sizeof(buf), "The `%s' resource is not used by this widget.", info->event->name); - else if (streq(name, "noColormap")) + else if (streq(name, "noColormap")) XmuSnprintf(buf, sizeof(buf), msg, params[0]); else if (streq(name, "conversionFailed") || streq(name, "conversionError")) { @@ -1011,14 +1010,14 @@ HandleToolkitErrors(String name, String type, String class, String msg, "Could not convert the `%s' resource.", info->event->name); } - else + else XmuSnprintf(buf, sizeof(buf), "Name: %s, Type: %s, Class: %s, Msg: %s", name, type, class, msg); /* - * Insert this info into the protocol stream, and update the count - */ + * Insert this info into the protocol stream, and update the count + */ (*(info->count))++; _XEditResPutWidgetInfo(info->stream, info->entry); _XEditResPutString8(info->stream, buf); @@ -1041,11 +1040,11 @@ ExecuteSetValues(Widget w, SetValuesEvent *sv_event, WidgetInfo *entry, ProtocolStream *stream, unsigned short *count) { XtErrorMsgHandler old; - SVErrorInfo *info = &globals.error_info; - + SVErrorInfo *info = &globals.error_info; + info->event = sv_event; /* No data can be passed to */ info->stream = stream; /* an error handler, so we */ - info->count = count; /* have to use a global */ + info->count = count; /* have to use a global */ info->entry = entry; old = XtAppSetWarningMsgHandler(XtWidgetToApplicationContext(w), @@ -1079,34 +1078,34 @@ ExecuteSetValues(Widget w, SetValuesEvent *sv_event, WidgetInfo *entry, */ #define TOOLKIT_TYPE ("Xt") /*ARGSUSED*/ -static char * +static char * DumpWidgets(Widget w, EditresEvent *event, ProtocolStream *stream) { unsigned short count = 0; - - /* Find Tree's root */ - for (; XtParent(w) != NULL; w = XtParent(w)) - ; - + + /* Find Tree's root */ + for (; XtParent(w) != NULL; w = XtParent(w)) + ; + /* - * hold space for count, overwritten later + * hold space for count, overwritten later */ - _XEditResPut16(stream, (unsigned int)0); + _XEditResPut16(stream, (unsigned int)0); DumpChildren(w, stream, &count); /* - * write out toolkit type + * write out toolkit type */ _XEditResPutString8(stream, TOOLKIT_TYPE); /* - * Overwrite the first 2 bytes with the real count + * Overwrite the first 2 bytes with the real count */ *(stream->top) = count >> XER_NBBY; *(stream->top + 1) = count; - return (NULL); + return (NULL); } /* @@ -1135,12 +1134,12 @@ isApplicationShell(Widget w) register WidgetClass c; if (!XtIsTopLevelShell(w)) - return (False); - for (c = XtClass(w); c; c = c->core_class.superclass) - if (strcmp(c->core_class.class_name, "ApplicationShell") == 0) - return (True); + return (False); + for (c = XtClass(w); c; c = c->core_class.superclass) + if (strcmp(c->core_class.class_name, "ApplicationShell") == 0) + return (True); - return (False); + return (False); } static void @@ -1149,36 +1148,36 @@ DumpChildren(Widget w, ProtocolStream *stream, unsigned short *count) int i, num_children; Widget *children; unsigned long window; - char *c_class; + char *c_class; (*count)++; - - InsertWidget(stream, w); /* Insert the widget into the stream */ + + InsertWidget(stream, w); /* Insert the widget into the stream */ _XEditResPutString8(stream, XtName(w)); /* Insert name */ if (isApplicationShell(w)) - c_class = ((ApplicationShellWidget)w)->application.class; + c_class = ((ApplicationShellWidget)w)->application.class; else - c_class = XtClass(w)->core_class.class_name; + c_class = XtClass(w)->core_class.class_name; - _XEditResPutString8(stream, c_class); /* Insert class */ + _XEditResPutString8(stream, c_class); /* Insert class */ - if (XtIsWidget(w)) - if (XtIsRealized(w)) + if (XtIsWidget(w)) + if (XtIsRealized(w)) window = XtWindow(w); else window = EDITRES_IS_UNREALIZED; - else - window = EDITRES_IS_OBJECT; + else + window = EDITRES_IS_OBJECT; - _XEditResPut32(stream, window); /* Insert window id */ + _XEditResPut32(stream, window); /* Insert window id */ /* - * Find children and recurse + * Find children and recurse */ - num_children = FindChildren(w, &children, True, True, True); - for (i = 0; i < num_children; i++) + num_children = FindChildren(w, &children, True, True, True); + for (i = 0; i < num_children; i++) DumpChildren(children[i], stream, count); XtFree((char *)children); @@ -1206,28 +1205,28 @@ static char * DoGetGeometry(Widget w, EditresEvent *event, ProtocolStream *stream) { unsigned i; - char *str; - GetGeomEvent *geom_event = (GetGeomEvent *)event; - + char *str; + GetGeomEvent *geom_event = (GetGeomEvent *)event; + _XEditResPut16(stream, geom_event->num_entries); - for (i = 0; i < geom_event->num_entries; i++) + for (i = 0; i < geom_event->num_entries; i++) { - /* - * Send out the widget id + /* + * Send out the widget id */ - _XEditResPutWidgetInfo(stream, &geom_event->widgets[i]); + _XEditResPutWidgetInfo(stream, &geom_event->widgets[i]); - if ((str = VerifyWidget(w, &geom_event->widgets[i])) != NULL) + if ((str = VerifyWidget(w, &geom_event->widgets[i])) != NULL) { - _XEditResPutBool(stream, True); /* an error occured */ - _XEditResPutString8(stream, str); /* set message */ + _XEditResPutBool(stream, True); /* an error occured */ + _XEditResPutString8(stream, str); /* set message */ } - else + else ExecuteGetGeometry(geom_event->widgets[i].real_widget, stream); } - return (NULL); + return (NULL); } /* @@ -1253,10 +1252,10 @@ ExecuteGetGeometry(Widget w, ProtocolStream *stream) Arg args[8]; Cardinal num_args = 0; Position x, y; - - if (!XtIsRectObj(w) || (XtIsWidget(w) && !XtIsRealized(w))) + + if (!XtIsRectObj(w) || (XtIsWidget(w) && !XtIsRealized(w))) { - _XEditResPutBool(stream, False); /* no error */ + _XEditResPutBool(stream, False); /* no error */ _XEditResPutBool(stream, False); /* not visable */ for (i = 0; i < 5; i++) /* fill in extra space with 0's */ _XEditResPut16(stream, 0); @@ -1270,26 +1269,26 @@ ExecuteGetGeometry(Widget w, ProtocolStream *stream) num_args++; XtGetValues(w, args, num_args); - if (!(XtIsManaged(w) && mapped_when_man) && XtIsWidget(w)) + if (!(XtIsManaged(w) && mapped_when_man) && XtIsWidget(w)) { XWindowAttributes attrs; - - /* + + /* * The toolkit does not maintain mapping state, we have - * to go to the server + * to go to the server */ - if (XGetWindowAttributes(XtDisplay(w), XtWindow(w), &attrs) != 0) + if (XGetWindowAttributes(XtDisplay(w), XtWindow(w), &attrs) != 0) { - if (attrs.map_state != IsViewable) + if (attrs.map_state != IsViewable) { - _XEditResPutBool(stream, False); /* no error */ - _XEditResPutBool(stream, False); /* not visable */ - for (i = 0; i < 5; i++) /* fill in extra space with 0's */ + _XEditResPutBool(stream, False); /* no error */ + _XEditResPutBool(stream, False); /* not visable */ + for (i = 0; i < 5; i++) /* fill in extra space with 0's */ _XEditResPut16(stream, 0); return; } } - else + else { _XEditResPut8(stream, True); /* Error occured. */ _XEditResPutString8(stream, "XGetWindowAttributes failed."); @@ -1299,8 +1298,8 @@ ExecuteGetGeometry(Widget w, ProtocolStream *stream) XtTranslateCoords(w, -((int) border_width), -((int) border_width), &x, &y); - _XEditResPutBool(stream, False); /* no error */ - _XEditResPutBool(stream, True); /* Visable */ + _XEditResPutBool(stream, False); /* no error */ + _XEditResPutBool(stream, True); /* Visable */ _XEditResPut16(stream, x); _XEditResPut16(stream, y); _XEditResPut16(stream, width); @@ -1332,7 +1331,7 @@ PositionInChild(Widget child, int x, int y) Position child_x, child_y; Boolean mapped_when_managed; - if (!XtIsRectObj(child)) /* we must at least be a rect obj */ + if (!XtIsRectObj(child)) /* we must at least be a rect obj */ return (False); num = 0; @@ -1343,25 +1342,25 @@ PositionInChild(Widget child, int x, int y) XtSetArg(args[num], XtNy, &child_y); num++; XtSetArg(args[num], XtNborderWidth, &border_width); num++; XtGetValues(child, args, num); - + /* * The only way we will know of the widget is mapped is to see if * mapped when managed is True and this is a managed child. Otherwise - * we will have to ask the server if this window is mapped + * we will have to ask the server if this window is mapped */ - if (XtIsWidget(child) && !(mapped_when_managed && XtIsManaged(child))) + if (XtIsWidget(child) && !(mapped_when_managed && XtIsManaged(child))) { XWindowAttributes attrs; - if (XGetWindowAttributes(XtDisplay(child), XtWindow(child), &attrs) - && attrs.map_state != IsViewable) + if (XGetWindowAttributes(XtDisplay(child), XtWindow(child), &attrs) + && attrs.map_state != IsViewable) return (False); } - return ((x >= child_x) - && (x <= (child_x + (Position)width + 2 * (Position)border_width)) - && (y >= child_y) - && (y <= (child_y + (Position)height + 2 * (Position)border_width))); + return ((x >= child_x) + && (x <= (child_x + (Position)width + 2 * (Position)border_width)) + && (y >= child_y) + && (y <= (child_y + (Position)height + 2 * (Position)border_width))); } /* @@ -1376,28 +1375,28 @@ PositionInChild(Widget child, int x, int y) * Description: * Finds the child that actually contains the point shown. */ -static Widget +static Widget _FindChild(Widget parent, int x, int y) { - Widget *children; - int i = FindChildren(parent, &children, True, False, True); + Widget *children; + int i = FindChildren(parent, &children, True, False, True); - while (i > 0) + while (i > 0) { i--; - if (PositionInChild(children[i], x, y)) + if (PositionInChild(children[i], x, y)) { Widget child = children[i]; - + XtFree((char *)children); - return (_FindChild(child, x - child->core.x, y - child->core.y)); + return (_FindChild(child, x - child->core.x, y - child->core.y)); } } XtFree((char *)children); - return (parent); + return (parent); } /* @@ -1418,25 +1417,25 @@ _FindChild(Widget parent, int x, int y) static char * DoFindChild(Widget w, EditresEvent *event, ProtocolStream *stream) { - char *str; + char *str; Widget parent, child; Position parent_x, parent_y; - FindChildEvent *find_event = (FindChildEvent *)event; - - if ((str = VerifyWidget(w, find_event->widgets)) != NULL) - return (str); + FindChildEvent *find_event = (FindChildEvent *)event; + + if ((str = VerifyWidget(w, find_event->widgets)) != NULL) + return (str); parent = find_event->widgets->real_widget; XtTranslateCoords(parent, (Position) 0, (Position) 0, &parent_x, &parent_y); - + child = _FindChild(parent, find_event->x - (int) parent_x, find_event->y - (int) parent_y); InsertWidget(stream, child); - return (NULL); + return (NULL); } /************************************************************ @@ -1461,30 +1460,30 @@ static char * DoGetResources(Widget w, EditresEvent *event, ProtocolStream *stream) { unsigned int i; - char *str; - GetResEvent *res_event = (GetResEvent *)event; - + char *str; + GetResEvent *res_event = (GetResEvent *)event; + _XEditResPut16(stream, res_event->num_entries); /* number of replys */ - for (i = 0; i < res_event->num_entries; i++) + for (i = 0; i < res_event->num_entries; i++) { - /* - * Send out the widget id + /* + * Send out the widget id */ - _XEditResPutWidgetInfo(stream, &res_event->widgets[i]); - if ((str = VerifyWidget(w, &res_event->widgets[i])) != NULL) + _XEditResPutWidgetInfo(stream, &res_event->widgets[i]); + if ((str = VerifyWidget(w, &res_event->widgets[i])) != NULL) { - _XEditResPutBool(stream, True); /* an error occured */ - _XEditResPutString8(stream, str); /* set message */ + _XEditResPutBool(stream, True); /* an error occured */ + _XEditResPutString8(stream, str); /* set message */ } - else + else { - _XEditResPutBool(stream, False); /* no error occured */ - ExecuteGetResources(res_event->widgets[i].real_widget, stream); + _XEditResPutBool(stream, False); /* no error occured */ + ExecuteGetResources(res_event->widgets[i].real_widget, stream); } } - return (NULL); + return (NULL); } /* Function: @@ -1504,43 +1503,43 @@ ExecuteGetResources(Widget w, ProtocolStream *stream) Cardinal num_norm, num_cons; register Cardinal i; - /* - * Get Normal Resources + /* + * Get Normal Resources */ XtGetResourceList(XtClass(w), &norm_list, &num_norm); - if (XtParent(w) != NULL) - XtGetConstraintResourceList(XtClass(XtParent(w)), &cons_list,&num_cons); + if (XtParent(w) != NULL) + XtGetConstraintResourceList(XtClass(XtParent(w)), &cons_list,&num_cons); else num_cons = 0; - _XEditResPut16(stream, num_norm + num_cons); /* how many resources */ - + _XEditResPut16(stream, num_norm + num_cons); /* how many resources */ + /* - * Insert all the normal resources + * Insert all the normal resources */ - for (i = 0; i < num_norm; i++) + for (i = 0; i < num_norm; i++) { _XEditResPutResourceType(stream, NormalResource); _XEditResPutString8(stream, norm_list[i].resource_name); _XEditResPutString8(stream, norm_list[i].resource_class); _XEditResPutString8(stream, norm_list[i].resource_type); } - XtFree((char *)norm_list); + XtFree((char *)norm_list); /* - * Insert all the constraint resources + * Insert all the constraint resources */ - if (num_cons > 0) + if (num_cons > 0) { - for (i = 0; i < num_cons; i++) + for (i = 0; i < num_cons; i++) { _XEditResPutResourceType(stream, ConstraintResource); _XEditResPutString8(stream, cons_list[i].resource_name); _XEditResPutString8(stream, cons_list[i].resource_class); _XEditResPutString8(stream, cons_list[i].resource_type); } - XtFree((char *)cons_list); + XtFree((char *)cons_list); } } @@ -1562,31 +1561,31 @@ ExecuteGetResources(Widget w, ProtocolStream *stream) static char * DumpValues(Widget w, EditresEvent* event, ProtocolStream* stream) { - char *str; - Arg warg[1]; - String res_value = NULL; - GetValuesEvent *gv_event = (GetValuesEvent *)event; - - /* put the count in the stream */ - _XEditResPut16(stream, (unsigned int)1); - - /* - * Get the resource of the widget asked for by the - * resource editor and insert it into the stream - */ - XtSetArg(warg[0], gv_event->name, &res_value); - - if ((str = VerifyWidget(w, &gv_event->widgets[0])) != NULL) - _XEditResPutString8(stream, str); - else + char *str; + Arg warg[1]; + String res_value = NULL; + GetValuesEvent *gv_event = (GetValuesEvent *)event; + + /* put the count in the stream */ + _XEditResPut16(stream, (unsigned int)1); + + /* + * Get the resource of the widget asked for by the + * resource editor and insert it into the stream + */ + XtSetArg(warg[0], gv_event->name, &res_value); + + if ((str = VerifyWidget(w, &gv_event->widgets[0])) != NULL) + _XEditResPutString8(stream, str); + else { - _XEditresGetStringValues(gv_event->widgets[0].real_widget, warg, 1); - if (!res_value) - res_value = "NoValue"; - _XEditResPutString8(stream, res_value); + _XEditresGetStringValues(gv_event->widgets[0].real_widget, warg, 1); + if (!res_value) + res_value = "NoValue"; + _XEditResPutString8(stream, res_value); } - return (NULL); + return (NULL); } /************************************************************ @@ -1608,26 +1607,26 @@ static void InsertWidget(ProtocolStream *stream, Widget w) { Widget temp; - unsigned long *widget_list; + unsigned long *widget_list; register int i, num_widgets; - for (temp = w, i = 0; temp != NULL; temp = XtParent(temp), i++) - ; + for (temp = w, i = 0; temp != NULL; temp = XtParent(temp), i++) + ; num_widgets = i; - widget_list = (unsigned long *)XtMalloc(sizeof(unsigned long) * num_widgets); + widget_list = (unsigned long *)XtMalloc(sizeof(unsigned long) * num_widgets); /* - * Put the widgets into the list - * make sure that they are inserted in the list from parent -> child + * Put the widgets into the list + * make sure that they are inserted in the list from parent -> child */ - for (i--, temp = w; temp != NULL; temp = XtParent(temp), i--) + for (i--, temp = w; temp != NULL; temp = XtParent(temp), i--) widget_list[i] = (unsigned long)temp; - - _XEditResPut16(stream, num_widgets); /* insert number of widgets */ - for (i = 0; i < num_widgets; i++) /* insert Widgets themselves */ + + _XEditResPut16(stream, num_widgets); /* insert number of widgets */ + for (i = 0; i < num_widgets; i++) /* insert Widgets themselves */ _XEditResPut32(stream, widget_list[i]); - + XtFree((char *)widget_list); } @@ -1651,7 +1650,7 @@ _XEditResPutString8(ProtocolStream *stream, char *str) int i, len = strlen(str); _XEditResPut16(stream, len); - for (i = 0; i < len; i++, str++) + for (i = 0; i < len; i++, str++) _XEditResPut8(stream, *str); } @@ -1671,11 +1670,11 @@ _XEditResPut8(ProtocolStream *stream, unsigned int value) { unsigned char temp; - if (stream->size >= stream->alloc) + if (stream->size >= stream->alloc) { stream->alloc += 100; - stream->real_top = (unsigned char *) - XtRealloc((char *)stream->real_top, stream->alloc + HEADER_SIZE); + stream->real_top = (unsigned char *) + XtRealloc((char *)stream->real_top, stream->alloc + HEADER_SIZE); stream->top = stream->real_top + HEADER_SIZE; stream->current = stream->top + stream->size; } @@ -1719,8 +1718,8 @@ _XEditResPut32(ProtocolStream *stream, unsigned long value) { int i; - for (i = 3; i >= 0; i--) - _XEditResPut8(stream, (value >> (XER_NBBY * i)) & BYTE_MASK); + for (i = 3; i >= 0; i--) + _XEditResPut8(stream, (value >> (XER_NBBY * i)) & BYTE_MASK); } /* @@ -1740,7 +1739,7 @@ _XEditResPutWidgetInfo(ProtocolStream *stream, WidgetInfo *info) unsigned int i; _XEditResPut16(stream, info->num_widgets); - for (i = 0; i < info->num_widgets; i++) + for (i = 0; i < info->num_widgets; i++) _XEditResPut32(stream, info->ids[i]); } @@ -1762,17 +1761,17 @@ _XEditResResetStream(ProtocolStream *stream) { stream->current = stream->top; stream->size = 0; - if (stream->real_top == NULL) + if (stream->real_top == NULL) { - stream->real_top = (unsigned char *) - XtRealloc((char *)stream->real_top, stream->alloc + HEADER_SIZE); + stream->real_top = (unsigned char *) + XtRealloc((char *)stream->real_top, stream->alloc + HEADER_SIZE); stream->top = stream->real_top + HEADER_SIZE; stream->current = stream->top + stream->size; } } /* - * NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE + * NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE * * The only modified field if the "current" field * @@ -1796,11 +1795,11 @@ _XEditResResetStream(ProtocolStream *stream) Bool _XEditResGet8(ProtocolStream *stream, unsigned char *value) { - if (stream->size < (unsigned long)(stream->current - stream->top)) - return (False); + if (stream->size < (unsigned long)(stream->current - stream->top)) + return (False); - *value = *((stream->current)++); - return (True); + *value = *((stream->current)++); + return (True); } /* @@ -1822,11 +1821,11 @@ _XEditResGet16(ProtocolStream *stream, unsigned short *value) { unsigned char temp1, temp2; - if (!(_XEditResGet8(stream, &temp1) && _XEditResGet8(stream, &temp2))) - return (False); - - *value = ((unsigned short)temp1 << XER_NBBY) + (unsigned short)temp2; - return (True); + if (!(_XEditResGet8(stream, &temp1) && _XEditResGet8(stream, &temp2))) + return (False); + + *value = ((unsigned short)temp1 << XER_NBBY) + (unsigned short)temp2; + return (True); } /* @@ -1848,19 +1847,19 @@ _XEditResGetSigned16(ProtocolStream *stream, short *value) { unsigned char temp1, temp2; - if (!(_XEditResGet8(stream, &temp1) && _XEditResGet8(stream, &temp2))) - return (False); - - if (temp1 & (1 << (XER_NBBY - 1))) /* If the sign bit is active */ + if (!(_XEditResGet8(stream, &temp1) && _XEditResGet8(stream, &temp2))) + return (False); + + if (temp1 & (1 << (XER_NBBY - 1))) /* If the sign bit is active */ { *value = -1; /* store all 1's */ *value &= (temp1 << XER_NBBY); /* Now and in the MSB */ - *value &= temp2; /* and LSB */ + *value &= temp2; /* and LSB */ } - else - *value = ((unsigned short)temp1 << XER_NBBY) + (unsigned short)temp2; + else + *value = ((unsigned short)temp1 << XER_NBBY) + (unsigned short)temp2; - return (True); + return (True); } /* @@ -1882,11 +1881,11 @@ _XEditResGet32(ProtocolStream *stream, unsigned long *value) { unsigned short temp1, temp2; - if (!(_XEditResGet16(stream, &temp1) && _XEditResGet16(stream, &temp2))) - return (False); - - *value = ((unsigned short)temp1 << (XER_NBBY * 2)) + (unsigned short)temp2; - return (True); + if (!(_XEditResGet16(stream, &temp1) && _XEditResGet16(stream, &temp2))) + return (False); + + *value = ((unsigned short)temp1 << (XER_NBBY * 2)) + (unsigned short)temp2; + return (True); } /* Function: @@ -1908,23 +1907,23 @@ _XEditResGetString8(ProtocolStream *stream, char **str) unsigned short len; register unsigned i; - if (!_XEditResGet16(stream, &len)) - return (False); + if (!_XEditResGet16(stream, &len)) + return (False); *str = XtMalloc(sizeof(char) * (len + 1)); - for (i = 0; i < len; i++) + for (i = 0; i < len; i++) { - if (!_XEditResGet8(stream, (unsigned char *)*str + i)) + if (!_XEditResGet8(stream, (unsigned char *)*str + i)) { XtFree(*str); *str = NULL; - return (False); + return (False); } } - (*str)[i] = '\0'; + (*str)[i] = '\0'; - return (True); + return (True); } /* @@ -1947,26 +1946,26 @@ _XEditResGetWidgetInfo(ProtocolStream *stream, WidgetInfo *info) { unsigned int i; - if (!_XEditResGet16(stream, &info->num_widgets)) - return (False); + if (!_XEditResGet16(stream, &info->num_widgets)) + return (False); - info->ids = (unsigned long *)XtMalloc(sizeof(long) * info->num_widgets); + info->ids = (unsigned long *)XtMalloc(sizeof(long) * info->num_widgets); - for (i = 0; i < info->num_widgets; i++) + for (i = 0; i < info->num_widgets; i++) { - if (!_XEditResGet32(stream, info->ids + i)) + if (!_XEditResGet32(stream, info->ids + i)) { XtFree((char *)info->ids); info->ids = NULL; - return (False); + return (False); } #if defined(LONG64) || defined(WORD64) info->ids[i] |= globals.base_address; #endif } - return (True); + return (True); } - + /************************************************************ * Code for Loading the EditresBlock resource ************************************************************/ @@ -1999,13 +1998,13 @@ CvtStringToBlock(Display *dpy, XrmValue *args, Cardinal *num_args, XmuNCopyISOLatin1Lowered(ptr, from_val->addr, sizeof(ptr)); - if (streq(ptr, "none")) + if (streq(ptr, "none")) block = BlockNone; - else if (streq(ptr, "setvalues")) + else if (streq(ptr, "setvalues")) block = BlockSetValues; - else if (streq(ptr, "all")) + else if (streq(ptr, "all")) block = BlockAll; - else + else { Cardinal num_params = 1; String params[1]; @@ -2018,17 +2017,17 @@ CvtStringToBlock(Display *dpy, XrmValue *args, Cardinal *num_args, return FALSE; } - if (to_val->addr != NULL) + if (to_val->addr != NULL) { - if (to_val->size < sizeof(EditresBlock)) + if (to_val->size < sizeof(EditresBlock)) { to_val->size = sizeof(EditresBlock); return FALSE; } *(EditresBlock *)(to_val->addr) = block; } - else - to_val->addr = (XtPointer)block; + else + to_val->addr = (XtPointer)block; to_val->size = sizeof(EditresBlock); return TRUE; @@ -2051,18 +2050,18 @@ LoadResources(Widget w) { static XtResource resources[] = { {"editresBlock", "EditresBlock", XtREditresBlock, sizeof(EditresBlock), - XtOffsetOf(Globals, block), XtRImmediate, (XtPointer)BlockNone} + XtOffsetOf(Globals, block), XtRImmediate, (XtPointer)BlockNone} }; - for (; XtParent(w) != NULL; w = XtParent(w)) - ; + for (; XtParent(w) != NULL; w = XtParent(w)) + ; XtAppSetTypeConverter(XtWidgetToApplicationContext(w), XtRString, XtREditresBlock, CvtStringToBlock, - NULL, 0, XtCacheAll, NULL); + NULL, 0, XtCacheAll, NULL); - XtGetApplicationResources(w, (XtPointer)&globals, resources, - XtNumber(resources), NULL, 0); + XtGetApplicationResources(w, (XtPointer)&globals, resources, + XtNumber(resources), NULL, 0); } /* @@ -2078,137 +2077,137 @@ LoadResources(Widget w) static void _XEditresGetStringValues(Widget w, Arg *warg, int numargs) { - static char buffer[32]; - XtResourceList res_list; - Cardinal num_res; - XtResource *res = NULL; - long value; - Cardinal i; - char *string = ""; - Arg args[1]; - XrmValue to, from; - - /* - * Look for the resource - */ - XtGetResourceList(XtClass(w), &res_list, &num_res); - for (i = 0; i < num_res; i++) - if (strcmp(res_list[i].resource_name, warg->name) == 0) - { - res = &res_list[i]; - break; - } + static char buffer[32]; + XtResourceList res_list; + Cardinal num_res; + XtResource *res = NULL; + long value; + Cardinal i; + char *string = ""; + Arg args[1]; + XrmValue to, from; - if (res == NULL && XtParent(w) != NULL) - { - XtFree((char *)res_list); - XtGetConstraintResourceList(XtClass(XtParent(w)), &res_list, &num_res); - for (i = 0; i < num_res; i++) + /* + * Look for the resource + */ + XtGetResourceList(XtClass(w), &res_list, &num_res); + for (i = 0; i < num_res; i++) if (strcmp(res_list[i].resource_name, warg->name) == 0) - { + { res = &res_list[i]; break; - } + } + + if (res == NULL && XtParent(w) != NULL) + { + XtFree((char *)res_list); + XtGetConstraintResourceList(XtClass(XtParent(w)), &res_list, &num_res); + for (i = 0; i < num_res; i++) + if (strcmp(res_list[i].resource_name, warg->name) == 0) + { + res = &res_list[i]; + break; + } } - if (res == NULL) + if (res == NULL) { - /* Couldn't find resource */ - - XtFree((char *)res_list); - *(XtPointer *)warg->value = NULL; - return; + /* Couldn't find resource */ + + XtFree((char *)res_list); + *(XtPointer *)warg->value = NULL; + return; } - /* try to get the value in the proper size */ - switch (res->resource_size) + /* try to get the value in the proper size */ + switch (res->resource_size) { #ifdef LONG64 - long v8; + long v8; #endif - int v4; - short v2; - char v1; + int v4; + short v2; + char v1; case 1: - XtSetArg(args[0], res->resource_name, &v1); - XtGetValues(w, args, 1); - value = (int)v1; - break; + XtSetArg(args[0], res->resource_name, &v1); + XtGetValues(w, args, 1); + value = (int)v1; + break; case 2: - XtSetArg(args[0], res->resource_name, &v2); - XtGetValues(w, args, 1); - value = (int)v2; - break; + XtSetArg(args[0], res->resource_name, &v2); + XtGetValues(w, args, 1); + value = (int)v2; + break; case 4: - XtSetArg(args[0], res->resource_name, &v4); - XtGetValues(w, args, 1); - value = (int)v4; - break; + XtSetArg(args[0], res->resource_name, &v4); + XtGetValues(w, args, 1); + value = (int)v4; + break; #ifdef LONG64 case 8: - XtSetArg(args[0], res->resource_name, &v8); - XtGetValues(w, args, 1); - value = (long)v8; - break; + XtSetArg(args[0], res->resource_name, &v8); + XtGetValues(w, args, 1); + value = (long)v8; + break; #endif default: - fprintf(stderr, "_XEditresGetStringValues: bad size %d\n", - res->resource_size); - string = "bad size"; - *(char **)(warg->value) = string; - XtFree((char *)res_list); - return; + fprintf(stderr, "_XEditresGetStringValues: bad size %d\n", + res->resource_size); + string = "bad size"; + *(char **)(warg->value) = string; + XtFree((char *)res_list); + return; } - /* - * If the resource is already String, no conversion needed - */ - if (strcmp(XtRString, res->resource_type) == 0) + /* + * If the resource is already String, no conversion needed + */ + if (strcmp(XtRString, res->resource_type) == 0) { - if (value == 0) - string = "(null)"; - else - string = (char *)value; + if (value == 0) + string = "(null)"; + else + string = (char *)value; } - else + else { - from.size = res->resource_size; - from.addr = (XPointer)&value; - to.addr = NULL; - to.size = 0; - - if (XtConvertAndStore(w,res->resource_type, &from, XtRString, &to)) - string = to.addr; - else + from.size = res->resource_size; + from.addr = (XPointer)&value; + to.addr = NULL; + to.size = 0; + + if (XtConvertAndStore(w,res->resource_type, &from, XtRString, &to)) + string = to.addr; + else { - string = buffer; - /* - * Conversion failed, fall back to representing it as integer - */ - switch (res->resource_size) + string = buffer; + /* + * Conversion failed, fall back to representing it as integer + */ + switch (res->resource_size) { case sizeof(char): - XmuSnprintf(buffer, sizeof(buffer), "%d", (int)(value & 0xff)); - break; + XmuSnprintf(buffer, sizeof(buffer), "%d", (int)(value & 0xff)); + break; case sizeof(short): - XmuSnprintf(buffer, sizeof(buffer), "%d", (int)(value & 0xffff)); - break; + XmuSnprintf(buffer, sizeof(buffer), "%d", (int)(value & 0xffff)); + break; case sizeof(int): - XmuSnprintf(buffer, sizeof(buffer), "0x%08x", (int)value); - break; + XmuSnprintf(buffer, sizeof(buffer), "0x%08x", (int)value); + break; #ifdef LONG64 case sizeof(long): - XmuSnprintf(buffer, sizeof(buffer), "0x%016lx", value); - break; + XmuSnprintf(buffer, sizeof(buffer), "0x%016lx", value); + break; #endif } } } - if (string == NULL) - string = ""; + if (string == NULL) + string = ""; - *(char **)(warg->value) = string; - XtFree((char *)res_list); + *(char **)(warg->value) = string; + XtFree((char *)res_list); } diff --git a/libXmu/src/ExtAgent.c b/libXmu/src/ExtAgent.c index 27955678f..6b0dfdbd8 100644 --- a/libXmu/src/ExtAgent.c +++ b/libXmu/src/ExtAgent.c @@ -1,5 +1,3 @@ -/* $Xorg: ExtAgent.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1994, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/ExtAgent.c,v 1.6 2001/01/17 19:42:55 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/libXmu/src/FToCback.c b/libXmu/src/FToCback.c index 6da4826f7..4ca8d459a 100644 --- a/libXmu/src/FToCback.c +++ b/libXmu/src/FToCback.c @@ -1,5 +1,3 @@ -/* $Xorg: FToCback.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1988,1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/FToCback.c,v 1.6 2001/01/17 19:42:55 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/libXmu/src/GetHost.c b/libXmu/src/GetHost.c index 19793fd7f..2f0bccded 100644 --- a/libXmu/src/GetHost.c +++ b/libXmu/src/GetHost.c @@ -1,5 +1,3 @@ -/* $Xorg: GetHost.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/GetHost.c,v 3.7 2001/07/25 15:04:50 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium diff --git a/libXmu/src/GrayPixmap.c b/libXmu/src/GrayPixmap.c index 478269f8a..ccea46116 100644 --- a/libXmu/src/GrayPixmap.c +++ b/libXmu/src/GrayPixmap.c @@ -1,5 +1,3 @@ -/* $Xorg: GrayPixmap.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1987, 1988, 1998 The Open Group @@ -49,7 +47,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xmu/GrayPixmap.c,v 1.5 2001/01/17 19:42:55 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/libXmu/src/Initer.c b/libXmu/src/Initer.c index f18492f69..bd7678480 100644 --- a/libXmu/src/Initer.c +++ b/libXmu/src/Initer.c @@ -1,5 +1,3 @@ -/* $Xorg: Initer.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1988, 1989, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Initer.c,v 1.6 2001/01/17 19:42:56 dawes Exp $ */ /* Created By: Chris D. Peterson * MIT X Consortium diff --git a/libXmu/src/LocBitmap.c b/libXmu/src/LocBitmap.c index 112f3cff4..0cfbdaa23 100644 --- a/libXmu/src/LocBitmap.c +++ b/libXmu/src/LocBitmap.c @@ -1,5 +1,3 @@ -/* $Xorg: LocBitmap.c,v 1.7 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/LocBitmap.c,v 3.9 2001/12/14 19:55:47 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium diff --git a/libXmu/src/Lookup.c b/libXmu/src/Lookup.c index 27676c1da..75b546df4 100644 --- a/libXmu/src/Lookup.c +++ b/libXmu/src/Lookup.c @@ -1,5 +1,3 @@ -/* $Xorg: Lookup.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1988, 1989, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Lookup.c,v 3.7 2001/01/17 19:42:56 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/libXmu/src/LookupCmap.c b/libXmu/src/LookupCmap.c index e7d7008e5..5756b83ec 100644 --- a/libXmu/src/LookupCmap.c +++ b/libXmu/src/LookupCmap.c @@ -1,5 +1,3 @@ -/* $Xorg: LookupCmap.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/LookupCmap.c,v 1.7 2001/07/25 15:04:50 dawes Exp $ */ /* * Author: Donna Converse, MIT X Consortium diff --git a/libXmu/src/Lower.c b/libXmu/src/Lower.c index 06ad31a29..7522cc161 100644 --- a/libXmu/src/Lower.c +++ b/libXmu/src/Lower.c @@ -1,5 +1,3 @@ -/* $Xorg: Lower.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -26,8 +24,6 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Lower.c,v 1.11 2001/07/25 15:04:50 dawes Exp $ */ - #define XK_LATIN1 #ifdef HAVE_CONFIG_H #include <config.h> @@ -37,13 +33,6 @@ in this Software without prior written authorization from The Open Group. #include <X11/Xmu/SysUtil.h> #include <stdio.h> - -#ifndef HAS_SNPRINTF -#undef SCOPE -#define SCOPE static -#include "snprintf.c" -#endif - #include <stdarg.h> /* diff --git a/libXmu/src/Makefile.in b/libXmu/src/Makefile.in deleted file mode 100644 index 4bfeb6425..000000000 --- a/libXmu/src/Makefile.in +++ /dev/null @@ -1,719 +0,0 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = src -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(lintlibdir)" -LTLIBRARIES = $(lib_LTLIBRARIES) -am__DEPENDENCIES_1 = -libXmu_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_1 = ClientWin.lo CursorName.lo DefErrMsg.lo GetHost.lo \ - Lower.lo -am_libXmu_la_OBJECTS = $(am__objects_1) AllCmap.lo Atoms.lo Clip.lo \ - CloseHook.lo CmapAlloc.lo CrCmap.lo CrPixFBit.lo CvtCache.lo \ - CvtStdSel.lo DelCmap.lo DisplayQue.lo Distinct.lo DrawLogo.lo \ - DrRndRect.lo EditresCom.lo ExtAgent.lo FToCback.lo \ - GrayPixmap.lo Initer.lo LocBitmap.lo Lookup.lo LookupCmap.lo \ - RdBitF.lo ScrOfWin.lo ShapeWidg.lo StdCmap.lo StrToBS.lo \ - StrToBmap.lo StrToCurs.lo StrToGrav.lo StrToJust.lo \ - StrToLong.lo StrToOrnt.lo StrToShap.lo StrToWidg.lo \ - UpdMapHint.lo VisCmap.lo WidgetNode.lo Xct.lo sharedlib.lo -libXmu_la_OBJECTS = $(am_libXmu_la_OBJECTS) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) -am__v_lt_0 = --silent -libXmu_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libXmu_la_LDFLAGS) $(LDFLAGS) -o $@ -libXmuu_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_libXmuu_la_OBJECTS = ClientWin.lo CursorName.lo DefErrMsg.lo \ - GetHost.lo Lower.lo -libXmuu_la_OBJECTS = $(am_libXmuu_la_OBJECTS) -libXmuu_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libXmuu_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ -CCLD = $(CC) -LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -SOURCES = $(libXmu_la_SOURCES) $(libXmuu_la_SOURCES) -DIST_SOURCES = $(libXmu_la_SOURCES) $(libXmuu_la_SOURCES) -DATA = $(lintlib_DATA) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ -ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -APP_MAN_DIR = @APP_MAN_DIR@ -APP_MAN_SUFFIX = @APP_MAN_SUFFIX@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CHANGELOG_CMD = @CHANGELOG_CMD@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CWARNFLAGS = @CWARNFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DRIVER_MAN_DIR = @DRIVER_MAN_DIR@ -DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ -DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -FILE_MAN_DIR = @FILE_MAN_DIR@ -FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ -GREP = @GREP@ -HAS_SNPRINTF = @HAS_SNPRINTF@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIB_MAN_DIR = @LIB_MAN_DIR@ -LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ -LINT = @LINT@ -LINTLIB = @LINTLIB@ -LINTLIBUU = @LINTLIBUU@ -LINT_FLAGS = @LINT_FLAGS@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MISC_MAN_DIR = @MISC_MAN_DIR@ -MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ -MKDIR_P = @MKDIR_P@ -NMEDIT = @NMEDIT@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -XMUU_CFLAGS = @XMUU_CFLAGS@ -XMUU_LIBS = @XMUU_LIBS@ -XMU_CFLAGS = @XMU_CFLAGS@ -XMU_LIBS = @XMU_LIBS@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -distcleancheck_listfiles = @distcleancheck_listfiles@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -lib_LTLIBRARIES = libXmu.la libXmuu.la -BITMAP_DEFINES = -DBITMAPDIR=\"$(includedir)/X11/bitmaps\" -AM_CPPFLAGS = \ - -I${top_srcdir}/include \ - -I${top_srcdir}/include/X11/Xmu \ - $(BITMAP_DEFINES) -D_BSD_SOURCE - -AM_CFLAGS = $(CWARNFLAGS) $(XMU_CFLAGS) -libXmu_la_LDFLAGS = -version-number 6:2:0 -no-undefined -libXmuu_la_LDFLAGS = -version-number 1:0:0 -no-undefined -libXmu_la_LIBADD = $(XMU_LIBS) -libXmuu_la_LIBADD = $(XMUU_LIBS) -libXmuu_la_SOURCES = \ - ClientWin.c \ - CursorName.c \ - DefErrMsg.c \ - GetHost.c \ - Lower.c - -libXmu_la_SOURCES = \ - $(libXmuu_la_SOURCES) \ - AllCmap.c \ - Atoms.c \ - Clip.c \ - CloseHook.c \ - CmapAlloc.c \ - CrCmap.c \ - CrPixFBit.c \ - CvtCache.c \ - CvtStdSel.c \ - DelCmap.c \ - DisplayQue.c \ - Distinct.c \ - DrawLogo.c \ - DrRndRect.c \ - EditresCom.c \ - ExtAgent.c \ - FToCback.c \ - GrayPixmap.c \ - Initer.c \ - LocBitmap.c \ - Lookup.c \ - LookupCmap.c \ - RdBitF.c \ - ScrOfWin.c \ - ShapeWidg.c \ - StdCmap.c \ - StrToBS.c \ - StrToBmap.c \ - StrToCurs.c \ - StrToGrav.c \ - StrToJust.c \ - StrToLong.c \ - StrToOrnt.c \ - StrToShap.c \ - StrToWidg.c \ - UpdMapHint.c \ - VisCmap.c \ - WidgetNode.c \ - Xct.c \ - sharedlib.c - -@LINT_TRUE@ALL_LINT_FLAGS = $(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -@LINT_TRUE@ $(AM_CPPFLAGS) $(CPPFLAGS) - -@MAKE_LINT_LIB_TRUE@lintlibdir = $(libdir) -@MAKE_LINT_LIB_TRUE@lintlib_DATA = $(LINTLIB) $(LINTLIBUU) -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): -install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ - list2="$$list2 $$p"; \ - else :; fi; \ - done; \ - test -z "$$list2" || { \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ - } - -uninstall-libLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ - done - -clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libXmu.la: $(libXmu_la_OBJECTS) $(libXmu_la_DEPENDENCIES) - $(AM_V_CCLD)$(libXmu_la_LINK) -rpath $(libdir) $(libXmu_la_OBJECTS) $(libXmu_la_LIBADD) $(LIBS) -libXmuu.la: $(libXmuu_la_OBJECTS) $(libXmuu_la_DEPENDENCIES) - $(AM_V_CCLD)$(libXmuu_la_LINK) -rpath $(libdir) $(libXmuu_la_OBJECTS) $(libXmuu_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AllCmap.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Atoms.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ClientWin.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Clip.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CloseHook.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CmapAlloc.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CrCmap.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CrPixFBit.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CursorName.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CvtCache.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CvtStdSel.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DefErrMsg.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DelCmap.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DisplayQue.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Distinct.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DrRndRect.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DrawLogo.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/EditresCom.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ExtAgent.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FToCback.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetHost.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GrayPixmap.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Initer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LocBitmap.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Lookup.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LookupCmap.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Lower.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RdBitF.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ScrOfWin.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ShapeWidg.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StdCmap.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StrToBS.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StrToBmap.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StrToCurs.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StrToGrav.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StrToJust.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StrToLong.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StrToOrnt.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StrToShap.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StrToWidg.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UpdMapHint.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/VisCmap.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/WidgetNode.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Xct.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sharedlib.Plo@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-lintlibDATA: $(lintlib_DATA) - @$(NORMAL_INSTALL) - test -z "$(lintlibdir)" || $(MKDIR_P) "$(DESTDIR)$(lintlibdir)" - @list='$(lintlib_DATA)'; test -n "$(lintlibdir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(lintlibdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(lintlibdir)" || exit $$?; \ - done - -uninstall-lintlibDATA: - @$(NORMAL_UNINSTALL) - @list='$(lintlib_DATA)'; test -n "$(lintlibdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(lintlibdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(lintlibdir)" && rm -f $$files - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LTLIBRARIES) $(DATA) -installdirs: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(lintlibdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: install-lintlibDATA - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: install-libLTLIBRARIES - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-libLTLIBRARIES uninstall-lintlibDATA - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libLTLIBRARIES install-lintlibDATA install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-libLTLIBRARIES uninstall-lintlibDATA - - -@LINT_TRUE@lint: -@LINT_TRUE@ $(LINT) $(ALL_LINT_FLAGS) $(libXmu_la_SOURCES) $(XEXT_LIBS) - -@MAKE_LINT_LIB_TRUE@$(LINTLIB): $(libXmu_la_SOURCES) -@MAKE_LINT_LIB_TRUE@ $(LINT) -y -oXmu -x $(ALL_LINT_FLAGS) $(libXmu_la_SOURCES) - -@MAKE_LINT_LIB_TRUE@$(LINTLIBUU): $(libXmuu_la_SOURCES) -@MAKE_LINT_LIB_TRUE@ $(LINT) -y -oXmuu -x $(ALL_LINT_FLAGS) $(libXmuu_la_SOURCES) - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/libXmu/src/RdBitF.c b/libXmu/src/RdBitF.c index 073e3dfbd..9402159b3 100644 --- a/libXmu/src/RdBitF.c +++ b/libXmu/src/RdBitF.c @@ -1,5 +1,3 @@ -/* $Xorg: RdBitF.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/RdBitF.c,v 3.12 2001/12/14 19:55:48 dawes Exp $ */ /* * This file contains miscellaneous utility routines and is not part of the diff --git a/libXmu/src/ScrOfWin.c b/libXmu/src/ScrOfWin.c index dbba3c65b..b8fc09ad9 100644 --- a/libXmu/src/ScrOfWin.c +++ b/libXmu/src/ScrOfWin.c @@ -1,5 +1,3 @@ -/* $Xorg: ScrOfWin.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/ScrOfWin.c,v 1.6 2001/01/17 19:42:56 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium diff --git a/libXmu/src/ShapeWidg.c b/libXmu/src/ShapeWidg.c index 732018c92..bb8c4fbb3 100644 --- a/libXmu/src/ShapeWidg.c +++ b/libXmu/src/ShapeWidg.c @@ -1,5 +1,3 @@ -/* $Xorg: ShapeWidg.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/ShapeWidg.c,v 1.7 2001/01/17 19:42:56 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/libXmu/src/StdCmap.c b/libXmu/src/StdCmap.c index 3fb3f25dd..5d2ce6160 100644 --- a/libXmu/src/StdCmap.c +++ b/libXmu/src/StdCmap.c @@ -1,5 +1,3 @@ -/* $Xorg: StdCmap.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/StdCmap.c,v 1.5 2001/01/17 19:42:56 dawes Exp $ */ /* * Author: Donna Converse, MIT X Consortium diff --git a/libXmu/src/StrToBS.c b/libXmu/src/StrToBS.c index 79fbedda6..0dd0be519 100644 --- a/libXmu/src/StrToBS.c +++ b/libXmu/src/StrToBS.c @@ -1,5 +1,3 @@ -/* $Xorg: StrToBS.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -26,8 +24,6 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/StrToBS.c,v 1.6 2001/01/17 19:42:56 dawes Exp $ */ - #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/libXmu/src/StrToBmap.c b/libXmu/src/StrToBmap.c index f46a99a1a..80df74bc7 100644 --- a/libXmu/src/StrToBmap.c +++ b/libXmu/src/StrToBmap.c @@ -1,5 +1,3 @@ -/* $Xorg: StrToBmap.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1987, 1988, 1998 The Open Group @@ -49,7 +47,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xmu/StrToBmap.c,v 1.5 2001/01/17 19:42:57 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/libXmu/src/StrToCurs.c b/libXmu/src/StrToCurs.c index 7f13c0d4e..4d72f80cb 100644 --- a/libXmu/src/StrToCurs.c +++ b/libXmu/src/StrToCurs.c @@ -1,5 +1,3 @@ -/* $Xorg: StrToCurs.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1987, 1988, 1998 The Open Group @@ -50,8 +48,6 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xmu/StrToCurs.c,v 1.11 2002/09/19 13:21:58 tsi Exp $ */ - #ifdef HAVE_CONFIG_H #include <config.h> #endif @@ -159,25 +155,29 @@ XmuCvtStringToCursor(XrmValuePtr args, Cardinal *num_args, if (0 == strncmp(FONTSPECIFIER, name, strlen(FONTSPECIFIER))) { char source_name[PATH_MAX], mask_name[PATH_MAX]; - int source_char, mask_char, fields; + int source_char, mask_char, fields = 0; Font source_font, mask_font; XrmValue fromString, toFont; XrmValue cvtArg; Boolean success; Display *dpy = DisplayOfScreen(screen); - char *strspec = NULL; + char *strspec = NULL; + int strspeclen; #ifdef XMU_KLUDGE Cardinal num; #endif - strspec = XtMalloc(strlen("FONT %s %d %s %d") + 21); - sprintf(strspec, "FONT %%%lds %%d %%%lds %%d", - (unsigned long)sizeof(source_name) - 1, - (unsigned long)sizeof(mask_name) - 1); - fields = sscanf(name, strspec, - source_name, &source_char, - mask_name, &mask_char); - XtFree(strspec); + strspeclen = strlen("FONT %s %d %s %d") + 21; + strspec = XtMalloc(strspeclen); + if (strspec != NULL) { + snprintf(strspec, strspeclen, "FONT %%%lds %%d %%%lds %%d", + (unsigned long)sizeof(source_name) - 1, + (unsigned long)sizeof(mask_name) - 1); + fields = sscanf(name, strspec, + source_name, &source_char, + mask_name, &mask_char); + XtFree(strspec); + } if (fields < 2) { XtStringConversionWarning(name, XtRCursor); return; diff --git a/libXmu/src/StrToGrav.c b/libXmu/src/StrToGrav.c index a0c99687c..8d86fe51d 100644 --- a/libXmu/src/StrToGrav.c +++ b/libXmu/src/StrToGrav.c @@ -1,5 +1,3 @@ -/* $Xorg: StrToGrav.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/StrToGrav.c,v 1.6 2001/01/17 19:42:57 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/libXmu/src/StrToJust.c b/libXmu/src/StrToJust.c index f3b4b7828..03b38545d 100644 --- a/libXmu/src/StrToJust.c +++ b/libXmu/src/StrToJust.c @@ -1,5 +1,3 @@ -/* $Xorg: StrToJust.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -26,8 +24,6 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/StrToJust.c,v 1.6 2001/01/17 19:42:57 dawes Exp $ */ - #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/libXmu/src/StrToLong.c b/libXmu/src/StrToLong.c index 6a7539aa9..c0663f5ce 100644 --- a/libXmu/src/StrToLong.c +++ b/libXmu/src/StrToLong.c @@ -1,5 +1,3 @@ -/* $Xorg: StrToLong.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/StrToLong.c,v 1.8 2001/08/23 00:03:21 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/libXmu/src/StrToOrnt.c b/libXmu/src/StrToOrnt.c index 209b13a19..0c41c116c 100644 --- a/libXmu/src/StrToOrnt.c +++ b/libXmu/src/StrToOrnt.c @@ -1,5 +1,3 @@ -/* $Xorg: StrToOrnt.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -26,8 +24,6 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/StrToOrnt.c,v 1.6 2001/01/17 19:42:57 dawes Exp $ */ - #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/libXmu/src/StrToShap.c b/libXmu/src/StrToShap.c index 3f17c01e9..298c91522 100644 --- a/libXmu/src/StrToShap.c +++ b/libXmu/src/StrToShap.c @@ -1,5 +1,3 @@ -/* $Xorg: StrToShap.c,v 1.5 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/StrToShap.c,v 1.6 2001/01/17 19:42:57 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/libXmu/src/StrToWidg.c b/libXmu/src/StrToWidg.c index 190e91f56..c22b82764 100644 --- a/libXmu/src/StrToWidg.c +++ b/libXmu/src/StrToWidg.c @@ -1,5 +1,3 @@ -/* $Xorg: StrToWidg.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1994, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/StrToWidg.c,v 1.6 2001/01/17 19:42:57 dawes Exp $ */ /* * XmuCvtStringToWidget diff --git a/libXmu/src/UpdMapHint.c b/libXmu/src/UpdMapHint.c index aeba3037f..389b80213 100644 --- a/libXmu/src/UpdMapHint.c +++ b/libXmu/src/UpdMapHint.c @@ -1,5 +1,3 @@ -/* $Xorg: UpdMapHint.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/UpdMapHint.c,v 1.6 2001/01/17 19:42:57 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium diff --git a/libXmu/src/VisCmap.c b/libXmu/src/VisCmap.c index 54022cc9a..0a35713ba 100644 --- a/libXmu/src/VisCmap.c +++ b/libXmu/src/VisCmap.c @@ -1,5 +1,3 @@ -/* $Xorg: VisCmap.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/VisCmap.c,v 1.6 2001/01/17 19:42:57 dawes Exp $ */ /* * Author: Donna Converse, MIT X Consortium diff --git a/libXmu/src/WidgetNode.c b/libXmu/src/WidgetNode.c index e157ccc10..ac6c9ec9d 100644 --- a/libXmu/src/WidgetNode.c +++ b/libXmu/src/WidgetNode.c @@ -1,5 +1,3 @@ -/* $Xorg: WidgetNode.c,v 1.5 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -26,8 +24,6 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/WidgetNode.c,v 1.12 2002/09/19 13:21:58 tsi Exp $ */ - /* * Author: Jim Fulton, MIT X Consortium */ diff --git a/libXmu/src/Xct.c b/libXmu/src/Xct.c index b186d27d7..1db470ebb 100644 --- a/libXmu/src/Xct.c +++ b/libXmu/src/Xct.c @@ -1,5 +1,3 @@ -/* $Xorg: Xct.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Xct.c,v 1.8 2001/07/25 15:04:50 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/libXmu/src/sharedlib.c b/libXmu/src/sharedlib.c index 0ef5e3ce9..4bb8c3b5f 100644 --- a/libXmu/src/sharedlib.c +++ b/libXmu/src/sharedlib.c @@ -1,5 +1,3 @@ -/* $Xorg: sharedlib.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1991, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/sharedlib.c,v 3.4 2001/07/25 15:04:51 dawes Exp $ */ #if defined(SUNSHLIB) && !defined(SHAREDCODE) |