libxmu: Changes to 'upstream-unstable'
COPYING | 8
configure.ac | 71 --
doc/.gitignore | 3
doc/Makefile.am | 62 --
doc/Xmu.xml | 189 +++---
docbook.am | 105 +++
include/X11/Xmu/Atoms.h | 2
include/X11/Xmu/CharSet.h | 2
include/X11/Xmu/CloseHook.h | 2
include/X11/Xmu/Converters.h | 2
include/X11/Xmu/CurUtil.h | 2
include/X11/Xmu/CvtCache.h | 4
include/X11/Xmu/DisplayQue.h | 22
include/X11/Xmu/Drawing.h | 2
include/X11/Xmu/EditresP.h | 54 -
include/X11/Xmu/Error.h | 2
include/X11/Xmu/Initer.h | 2
include/X11/Xmu/Misc.h | 8
include/X11/Xmu/StdCmap.h | 2
include/X11/Xmu/StdSel.h | 2
include/X11/Xmu/WinUtil.h | 2
include/X11/Xmu/Xmu.h | 8
src/AllCmap.c | 20
src/Atoms.c | 14
src/ClientWin.c | 4
src/Clip.c | 2
src/CloseHook.c | 18
src/CmapAlloc.c | 26
src/CrCmap.c | 42 -
src/CursorName.c | 4
src/CvtCache.c | 6
src/CvtStdSel.c | 4
src/DefErrMsg.c | 14
src/DelCmap.c | 4
src/DisplayQue.c | 4
src/DrawLogo.c | 16
src/EditresCom.c | 1176 +++++++++++++++++++++----------------------
src/ExtAgent.c | 2
src/FToCback.c | 4
src/GrayPixmap.c | 10
src/Initer.c | 14
src/LocBitmap.c | 18
src/Lookup.c | 4
src/LookupCmap.c | 32 -
src/Lower.c | 11
src/Makefile.am | 4
src/RdBitF.c | 18
src/ShapeWidg.c | 6
src/StdCmap.c | 14
src/StrToBS.c | 4
src/StrToBmap.c | 10
src/StrToCurs.c | 46 -
src/StrToGrav.c | 6
src/StrToJust.c | 4
src/StrToLong.c | 2
src/StrToOrnt.c | 4
src/StrToShap.c | 4
src/UpdMapHint.c | 2
src/VisCmap.c | 6
src/WidgetNode.c | 6
src/Xct.c | 4
src/sharedlib.c | 6
62 files changed, 1087 insertions(+), 1064 deletions(-)
New commits:
commit 6437d834cd66621e4e9f4decf7341b6d7ff45556
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Mar 5 23:00:10 2012 -0800
libXmu 1.1.1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 932a5c2..17fff03 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libXmu], [1.1.0],
+AC_INIT([libXmu], [1.1.1],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXmu])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
commit ccd9e64515d6fc7b5367d6d98ecd3abf5b084026
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Nov 10 20:34:03 2011 -0800
Fix gcc -Wwrite-strings warnings (some, not all)
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/include/X11/Xmu/EditresP.h b/include/X11/Xmu/EditresP.h
index 61ec51d..ed9dd41 100644
--- a/include/X11/Xmu/EditresP.h
+++ b/include/X11/Xmu/EditresP.h
@@ -335,7 +335,7 @@ _XFUNCPROTOBEGIN
void _XEditResPutString8
(
ProtocolStream *stream,
- char *str
+ _Xconst char *str
);
void _XEditResPut8
diff --git a/src/Atoms.c b/src/Atoms.c
index 6cc91a2..6f0ca64 100644
--- a/src/Atoms.c
+++ b/src/Atoms.c
@@ -50,7 +50,7 @@ typedef struct _DisplayRec {
} DisplayRec;
struct _AtomRec {
- char *name;
+ _Xconst char *name;
DisplayRec* head;
};
@@ -99,7 +99,7 @@ AtomPtr
XmuMakeAtom(_Xconst char *name)
{
AtomPtr ptr = XtNew(struct _AtomRec);
- ptr->name = (char *) name;
+ ptr->name = name;
ptr->head = NULL;
return ptr;
}
@@ -107,7 +107,7 @@ XmuMakeAtom(_Xconst char *name)
char *
XmuNameOfAtom(AtomPtr atom_ptr)
{
- return atom_ptr->name;
+ return (char *) atom_ptr->name;
}
diff --git a/src/DefErrMsg.c b/src/DefErrMsg.c
index 091d2c4..3cb914a 100644
--- a/src/DefErrMsg.c
+++ b/src/DefErrMsg.c
@@ -43,7 +43,7 @@ XmuPrintDefaultErrorMessage(Display *dpy, XErrorEvent *event, FILE *fp)
char buffer[BUFSIZ];
char mesg[BUFSIZ];
char number[32];
- char *mtype = "XlibMessage";
+ _Xconst char *mtype = "XlibMessage";
register _XExtension *ext = (_XExtension *)NULL;
_XExtension *bext = (_XExtension *)NULL;
XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
diff --git a/src/EditresCom.c b/src/EditresCom.c
index b4554e1..716a2b3 100644
--- a/src/EditresCom.c
+++ b/src/EditresCom.c
@@ -142,13 +142,13 @@ static Boolean CvtStringToBlock(Display*, XrmValue*, Cardinal*,
XrmValue*, XrmValue*, XtPointer*);
static EditresEvent *BuildEvent(Widget, Atom, XtPointer, ResIdent,
unsigned long);
-static char *DoFindChild(Widget, EditresEvent*, ProtocolStream*);
-static char *DoGetGeometry(Widget, EditresEvent*, ProtocolStream*);
-static char *DoGetResources(Widget, EditresEvent*, ProtocolStream*);
-static char *DoSetValues(Widget, EditresEvent*, ProtocolStream*);
+static _Xconst char *DoFindChild(Widget, EditresEvent*, ProtocolStream*);
+static _Xconst char *DoGetGeometry(Widget, EditresEvent*, ProtocolStream*);
+static _Xconst char *DoGetResources(Widget, EditresEvent*, ProtocolStream*);
+static _Xconst char *DoSetValues(Widget, EditresEvent*, ProtocolStream*);
static void DumpChildren(Widget, ProtocolStream*, unsigned short*);
-static char *DumpValues(Widget, EditresEvent*, ProtocolStream*);
-static char *DumpWidgets(Widget, EditresEvent*, ProtocolStream*);
+static _Xconst char *DumpValues(Widget, EditresEvent*, ProtocolStream*);
+static _Xconst char *DumpWidgets(Widget, EditresEvent*, ProtocolStream*);
static void ExecuteCommand(Widget, Atom, ResIdent, EditresEvent*);
static void ExecuteGetGeometry(Widget, ProtocolStream*);
static void ExecuteGetResources(Widget w, ProtocolStream *stream);
@@ -167,8 +167,8 @@ static Bool PositionInChild(Widget, int, int);
static int qcmp_widget_list(register _Xconst void*, register _Xconst void*);
static void SendCommand(Widget, Atom, ResIdent, EditResError,
ProtocolStream*);
-static void SendFailure(Widget, Atom, ResIdent, char*);
-static char *VerifyWidget(Widget, WidgetInfo*);
+static void SendFailure(Widget, Atom, ResIdent, _Xconst char*);
+static _Xconst char *VerifyWidget(Widget, WidgetInfo*);
/*
* External
@@ -215,13 +215,13 @@ _XEditResCheckMessages(Widget w, XtPointer data, XEvent *event, Boolean *cont)
if (!first_time)
{
Atom atoms[4];
- static char *names[] = {
+ static _Xconst char *names[] = {
EDITRES_NAME, EDITRES_COMMAND_ATOM,
EDITRES_PROTOCOL_ATOM, EDITRES_CLIENT_VALUE
};
first_time = True;
- XInternAtoms(dpy, names, 4, False, atoms);
+ XInternAtoms(dpy, (char **) names, 4, False, atoms);
res_editor = atoms[0];
res_editor_command = atoms[1];
res_editor_protocol = atoms[2];
@@ -479,8 +479,8 @@ 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;
+ _Xconst char *(*func)(Widget, EditresEvent*, ProtocolStream*);
+ _Xconst char *str;
if (globals.block == BlockAll)
{
@@ -609,7 +609,7 @@ CommandDone(Widget widget, Atom *selection, Atom *target)
* Sends a failure message
*/
static void
-SendFailure(Widget w, Atom sel, ResIdent ident, char *str)
+SendFailure(Widget w, Atom sel, ResIdent ident, _Xconst char *str)
{
_XEditResResetStream(&globals.stream);
_XEditResPutString8(&globals.stream, str);
@@ -889,7 +889,7 @@ IsChild(Widget top, Widget parent, Widget child)
* Description:
* Makes sure all the widgets still exist
*/
-static char *
+static _Xconst char *
VerifyWidget(Widget w, WidgetInfo *info)
{
Widget top;
@@ -938,10 +938,10 @@ VerifyWidget(Widget w, WidgetInfo *info)
* Returns:
* NULL
*/
-static char *
+static _Xconst char *
DoSetValues(Widget w, EditresEvent *event, ProtocolStream *stream)
{
- char *str;
+ _Xconst char *str;
register unsigned i;
unsigned short count = 0;
SetValuesEvent *sv_event = (SetValuesEvent *)event;
@@ -1078,7 +1078,7 @@ ExecuteSetValues(Widget w, SetValuesEvent *sv_event, WidgetInfo *entry,
*/
#define TOOLKIT_TYPE ("Xt")
/*ARGSUSED*/
-static char *
+static _Xconst char *
DumpWidgets(Widget w, EditresEvent *event, ProtocolStream *stream)
{
unsigned short count = 0;
@@ -1201,11 +1201,11 @@ DumpChildren(Widget w, ProtocolStream *stream, unsigned short *count)
* Returns:
* NULL
*/
-static char *
+static _Xconst char *
DoGetGeometry(Widget w, EditresEvent *event, ProtocolStream *stream)
{
unsigned i;
- char *str;
+ _Xconst char *str;
GetGeomEvent *geom_event = (GetGeomEvent *)event;
_XEditResPut16(stream, geom_event->num_entries);
@@ -1414,10 +1414,10 @@ _FindChild(Widget parent, int x, int y)
* An allocated error message if something went horribly wrong and
* no set values were performed, else NULL.
*/
-static char *
+static _Xconst char *
DoFindChild(Widget w, EditresEvent *event, ProtocolStream *stream)
{
- char *str;
+ _Xconst char *str;
Widget parent, child;
Position parent_x, parent_y;
FindChildEvent *find_event = (FindChildEvent *)event;
@@ -1456,11 +1456,11 @@ DoFindChild(Widget w, EditresEvent *event, ProtocolStream *stream)
* Returns:
* NULL
*/
-static char *
+static _Xconst char *
DoGetResources(Widget w, EditresEvent *event, ProtocolStream *stream)
{
unsigned int i;
- char *str;
+ _Xconst char *str;
GetResEvent *res_event = (GetResEvent *)event;
_XEditResPut16(stream, res_event->num_entries); /* number of replys */
@@ -1558,12 +1558,12 @@ ExecuteGetResources(Widget w, ProtocolStream *stream)
* NULL
*/
/*ARGSUSED*/
-static char *
+static _Xconst char *
DumpValues(Widget w, EditresEvent* event, ProtocolStream* stream)
{
- char *str;
+ _Xconst char *str;
Arg warg[1];
- String res_value = NULL;
+ _Xconst _XtString res_value = NULL;
GetValuesEvent *gv_event = (GetValuesEvent *)event;
/* put the count in the stream */
@@ -1645,7 +1645,7 @@ InsertWidget(ProtocolStream *stream, Widget w)
* Inserts a string into the protocol stream.
*/
void
-_XEditResPutString8(ProtocolStream *stream, char *str)
+_XEditResPutString8(ProtocolStream *stream, _Xconst char *str)
{
int i, len = strlen(str);
diff --git a/src/StrToGrav.c b/src/StrToGrav.c
index 44cc13b..ca8bb53 100644
--- a/src/StrToGrav.c
+++ b/src/StrToGrav.c
@@ -39,7 +39,7 @@ in this Software without prior written authorization from The Open Group.
*/
static struct _namepair {
XrmQuark quark;
- char *name;
+ _Xconst char *name;
XtGravity gravity;
} names[] = {
{ NULLQUARK, XtEForget, ForgetGravity },
commit 72ac4c4a464b3aec21cdbe367c9d465cbe0f3ff1
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Nov 10 09:55:07 2011 -0800
Drop support for pre-ANSI-C89 preprocessors
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/src/Atoms.c b/src/Atoms.c
index 412f399..6cc91a2 100644
--- a/src/Atoms.c
+++ b/src/Atoms.c
@@ -60,15 +60,9 @@ struct _AtomRec {
#define STATIC static
#endif
-#if !defined(UNIXCPP) || defined(ANSICPP)
#define DeclareAtom(atom,text) \
STATIC struct _AtomRec __##atom = { text, NULL }; \
AtomPtr _##atom = &__##atom;
-#else
-#define DeclareAtom(atom,text) \
-STATIC struct _AtomRec __/**/atom = { text, NULL }; \
-AtomPtr _/**/atom = &__/**/atom;
-#endif
DeclareAtom(XA_ATOM_PAIR, "ATOM_PAIR" )
DeclareAtom(XA_CHARACTER_POSITION, "CHARACTER_POSITION" )
diff --git a/src/sharedlib.c b/src/sharedlib.c
index 4bb8c3b..b47213d 100644
--- a/src/sharedlib.c
+++ b/src/sharedlib.c
@@ -36,15 +36,9 @@ struct _AtomRec {
struct _DisplayRec* head;
};
-#if !defined(UNIXCPP) || defined(ANSICPP)
#define DeclareAtom(atom) \
extern struct _AtomRec __##atom; \
AtomPtr _##atom = &__##atom;
-#else
-#define DeclareAtom(atom) \
-extern struct _AtomRec __/**/atom; \
-AtomPtr _/**/atom = &__/**/atom;
-#endif
DeclareAtom(XA_ATOM_PAIR)
DeclareAtom(XA_CHARACTER_POSITION)
commit 004d535c707251bd4fb47426f90712c195c6dfc7
Author: Matt Dew <marcoz@osource.org>
Date: Tue Oct 4 20:51:48 2011 -0600
Cleanup IDs and links in doc
1 - fix the capitalization of the ID attributes to match either the
<title> or <funcdef> string it goes with.
2 - fix any <linkend>'s that were affected by 1.
3 - any <function> in the docs that has an actual funcdef,
will become an olink.
Signed-off-by: Matt Dew <marcoz@osource.org>
diff --git a/doc/Xmu.xml b/doc/Xmu.xml
index 43d8047..2d363a9 100644
--- a/doc/Xmu.xml
+++ b/doc/Xmu.xml
@@ -49,8 +49,8 @@ is a trademark of The Open Group.
</legalnotice>
</articleinfo>
- <sect1 id='introduction'>
- <title>Introduction</title>
+ <sect1 id='Introduction'>
+<title>Introduction</title>
<para>
The Xmu Library is a collection of miscellaneous (some might say random)
@@ -81,8 +81,8 @@ cc -o xapplication xapplication.o `pkg-config --libs xmu`
</sect1>
- <sect1 id='atom_functions'>
- <title>Atom Functions</title>
+ <sect1 id='Atom_Functions'>
+<title>Atom Functions</title>
<para>
To use the functions and macros defined in this section, you should include
@@ -203,11 +203,11 @@ value is cached, such that subsequent requests do not cause
another round-trip to the server.
</para>
- <para id="XmuMakeAtom">
+ <para>
<indexterm zone="XmuMakeAtom">
- <primary><function>XmuMakeAtom</function></primary>
+ <primary><xref linkend='XmuMakeAtom' xrefstyle='select: title'/></primary>
</indexterm>
- <funcsynopsis id='xmumakeatom'>
+ <funcsynopsis id='XmuMakeAtom'>
<funcprototype>
<funcdef>AtomPtr <function>XmuMakeAtom</function></funcdef>
<paramdef>const char *<parameter>name</parameter></paramdef>
@@ -228,15 +228,15 @@ for an
<type>Atom</type>
with the
given name.
-<function>XmuInternAtom</function>
+<xref linkend='XmuInternAtom' xrefstyle='select: title'/>
can be used to cache the Atom value for one or more displays.
</para>
- <para id="XmuNameOfAtom">
+ <para>
<indexterm zone="XmuNameOfAtom">
- <primary><function>XmuNameOfAtom</function></primary>
+ <primary><xref linkend='XmuNameOfAtom' xrefstyle='select: title'/></primary>
</indexterm>
- <funcsynopsis id='xmunameofatom'>
+ <funcsynopsis id='XmuNameOfAtom'>
<funcprototype>
<funcdef>char *<function>XmuNameOfAtom</function></funcdef>
<paramdef>AtomPtr <parameter>atom_ptr</parameter></paramdef>
@@ -254,11 +254,11 @@ specifies the AtomPtr
The function returns the name of an AtomPtr.
</para>
- <para id="XmuInternAtom">
+ <para>
<indexterm zone="XmuInternAtom">
- <primary><function>XmuInternAtom</function></primary>
+ <primary><xref linkend='XmuInternAtom' xrefstyle='select: title'/></primary>
</indexterm>
- <funcsynopsis id='xmuinternatom'>
+ <funcsynopsis id='XmuInternAtom'>
<funcprototype>
<funcdef>Atom <function>XmuInternAtom</function></funcdef>
<paramdef>Display *<parameter>dpy</parameter></paramdef>
@@ -290,11 +290,11 @@ is cached,
such that subsequent requests do not cause another round-trip to the server.
</para>
- <para id="XmuGetAtomName">
+ <para>
<indexterm zone="XmuGetAtomName">
- <primary><function>XmuGetAtomName</function></primary>
+ <primary><xref linkend='XmuGetAtomName' xrefstyle='select: title'/></primary>
</indexterm>
- <funcsynopsis id='xmugetatomname'>
+ <funcsynopsis id='XmuGetAtomName'>
<funcprototype>
<funcdef>char *<function>XmuGetAtomName</function></funcdef>
<paramdef>Display *<parameter>dpy</parameter></paramdef>
@@ -322,11 +322,11 @@ The result is cached, such that subsequent
requests do not cause another round-trip to the server.
</para>
- <para id="XmuInternStrings">
+ <para>
<indexterm zone="XmuInternStrings">
- <primary><function>XmuInternStrings</function></primary>
+ <primary><xref linkend='XmuInternStrings' xrefstyle='select: title'/></primary>
</indexterm>
- <funcsynopsis id='xmuinternstrings'>
+ <funcsynopsis id='XmuInternStrings'>
<funcprototype>
<funcdef>void <function>XmuInternStrings</function></funcdef>
<paramdef>Display *<parameter>dpy</parameter></paramdef>
@@ -371,8 +371,8 @@ The caller is responsible for preallocating the array pointed at by atoms.
</sect1>
- <sect1 id='error_handler_functions'>
- <title>Error Handler Functions</title>
+ <sect1 id='Error_Handler_Functions'>
+<title>Error Handler Functions</title>
<para>
To use the functions defined in this section, you should include the header
@@ -384,11 +384,11 @@ file
and link against the libXmu or libXmuu library.
</para>
- <para id="XmuPrintDefaultErrorMessage">
+ <para>
<indexterm zone="XmuPrintDefaultErrorMessage">
- <primary><function>XmuPrintDefaultErrorMessage</function></primary>
+ <primary><xref linkend='XmuPrintDefaultErrorMessage' xrefstyle='select: title'/></primary>
</indexterm>
- <funcsynopsis id='xmuprintdefaulterrormessage'>
+ <funcsynopsis id='XmuPrintDefaultErrorMessage'>
<funcprototype>
<funcdef>int <function>XmuPrintDefaultErrorMessage</function></funcdef>
<paramdef>Display *<parameter>dpy</parameter></paramdef>
@@ -454,21 +454,21 @@ specifies the error
This function ignores errors for
<errorname>BadWindow</errorname>
errors for
-<function>XQueryTree</function>
+<olink targetdoc='libX11' targetptr='XQueryTree'><function>XQueryTree</function></olink>
and
-<function>XGetWindowAttributes</function>,
+<olink targetdoc='libX11' targetptr='XGetWindowAttributes'><function>XGetWindowAttributes</function></olink>,
and ignores
<errorname>BadDrawable</errorname>
errors for
-<function>XGetGeometry</function>;
+<olink targetdoc='libX11' targetptr='XGetGeometry'><function>XGetGeometry</function></olink>;
it returns 0 in those cases. Otherwise, it prints the default error message,
and returns a non-zero value if the caller should consider exiting,
and 0 if the caller should not exit.
</para>
</sect1>
- <sect1 id='system_utility_functions'>
- <title>System Utility Functions</title>
+ <sect1 id='System_Utility_Functions'>
+<title>System Utility Functions</title>
<para>
To use the functions defined in this section, you should include the header
@@ -550,8 +550,8 @@ in software that needs to continue to support non-Unix98 compliant platforms.
</sect1>
- <sect1 id='window_utility_functions'>
- <title>Window Utility Functions</title>
+ <sect1 id='Window_Utility_Functions'>
+<title>Window Utility Functions</title>
<para>
To use the functions defined in this section, you should include the header
@@ -675,17 +675,17 @@ and
flags in the hints structure, and then stores the hints for the
window using
<indexterm zone="XmuUpdateMapHints">
- <primary><function>XSetWMNormalHints</function></primary>
+ <primary><olink targetdoc='libX11' targetptr='XSetWMNormalHints'><function>XSetWMNormalHints</function></olink></primary>
</indexterm>
-<function>XSetWMNormalHints</function>
+<olink targetdoc='libX11' targetptr='XSetWMNormalHints'><function>XSetWMNormalHints</function></olink>
and returns
<symbol>True</symbol>.
If <symbol>NULL</symbol> is passed for the
hints structure, then the current hints are read back from the window using
<indexterm zone="XmuUpdateMapHints">
- <primary><function>XGetWMNormalHints</function></primary>
+ <primary><olink targetdoc='libX11' targetptr='XGetWMNormalHints'><function>XGetWMNormalHints</function></olink></primary>
</indexterm>
-<function>XGetWMNormalHints</function>
+<olink targetdoc='libX11' targetptr='XGetWMNormalHints'><function>XGetWMNormalHints</function></olink>
and are used instead, and
<symbol>True</symbol>
is returned; otherwise
@@ -695,8 +695,8 @@ is returned.
</sect1>
- <sect1 id='cursor_utility_functions'>
- <title>Cursor Utility Functions</title>
+ <sect1 id='Cursor_Utility_Functions'>
+<title>Cursor Utility Functions</title>
<para>
To use the functions defined in this section, you should include the header
@@ -736,8 +736,8 @@ manual.
</sect1>
- <sect1 id='graphics_functions'>
- <title>Graphics Functions</title>
+ <sect1 id='Graphics_Functions'>
+<title>Graphics Functions</title>
<para>
To use the functions defined in this section, you should include the header
@@ -1128,10 +1128,10 @@ returns the y coordinate of the hotspot
This function reads a standard bitmap file description from the specified
stream, and returns the parsed data in a format suitable for passing to
-<function>XCreateBitmapFromData</function>.
+<olink targetdoc='libX11' targetptr='XCreateBitmapFromData'><function>XCreateBitmapFromData</function></olink>.
The return value of the function has the same
interpretation as the return value for
-<function>XReadBitmapFile</function>.
+<olink targetdoc='libX11' targetptr='XReadBitmapFile'><function>XReadBitmapFile</function></olink>.
</para>
<para id="XmuReadBitmapDataFromFile">
@@ -1190,10 +1190,10 @@ returns the y coordinate of the hotspot
This function reads a standard bitmap file description from the specified
file, and returns the parsed data in a format suitable for passing to
-<function>XCreateBitmapFromData</function>.
+<olink targetdoc='libX11' targetptr='XCreateBitmapFromData'><function>XCreateBitmapFromData</function></olink>.
The return value of the function has the same
interpretation as the return value for
-<function>XReadBitmapFile</function>.
+<olink targetdoc='libX11' targetptr='XReadBitmapFile'><function>XReadBitmapFile</function></olink>.
</para>
<para id="XmuLocateBitmapFile">
@@ -1265,7 +1265,7 @@ returns the y coordinate of the hotspot
</variablelist>
This function reads a file in standard bitmap file format, using
-<function>XReadBitmapFile</function>,
+<olink targetdoc='libX11' targetptr='XReadBitmapFile'><function>XReadBitmapFile</function></olink>,
and returns the created bitmap. The filename may be
absolute, or relative to the global resource named
<indexterm zone="XmuLocateBitmapFile">
@@ -1352,7 +1352,7 @@ specifies the background pixel value
This function creates a pixmap of the specified width, height, and depth, on
the same screen as the specified drawable, and then performs an
-<function>XCopyPlane</function>
+<olink targetdoc='libX11' targetptr='XCopyPlane'><function>XCopyPlane</function></olink>
from the specified bitmap to the pixmap,
using the specified foreground and background pixel values.
The created pixmap is returned.
@@ -1360,8 +1360,8 @@ The created pixmap is returned.
</sect1>
- <sect1 id='selection_functions'>
- <title>Selection Functions</title>
+ <sect1 id='Selection_Functions'>
+<title>Selection Functions</title>
<para>
To use the functions defined in this section, you should include the header
@@ -1450,8 +1450,8 @@ if the conversion was successful, else it returns
</para>
</sect1>
- <sect1 id='type_converter_functions'>
- <title>Type Converter Functions</title>
+ <sect1 id='Type_Converter_Functions'>
+<title>Type Converter Functions</title>
<para>
To use the functions defined in this section, you should include the header
@@ -2310,8 +2310,8 @@ XtSetTypeConverter(XtRString, XtRWidget, XmuNewCvtStringToWidget,
</sect1>
- <sect1 id='character_set_functions'>
- <title>Character Set Functions</title>
+ <sect1 id='Character_Set_Functions'>
+<title>Character Set Functions</title>
<para>
To use the functions defined in this section, you should include the header
@@ -2517,8 +2517,8 @@ less than second. The two strings are assumed to be encoded using ISO
</para>
</sect1>
- <sect1 id='keyboard_event'>
- <title>Keyboard Event Translation Functions</title>
+ <sect1 id='Keyboard_Event_Translation_Functions'>
+<title>Keyboard Event Translation Functions</title>
<para>
To use the functions defined in this section, you should include the header
@@ -2533,7 +2533,7 @@ and link against the libXmu library.
<warning><para>
The functions in this section are <emphasis remap='B'>deprecated</emphasis> because they don't work
in most locales now supported by X11; the function
-<function>XmbLookupString</function>
+<olink targetdoc='libX11' targetptr='XmbLookupString'><function>XmbLookupString</function></olink>
provides a better alternative.
</para></warning>
@@ -2585,7 +2585,7 @@ specifies or returns the compose state
</variablelist>
This function is identical to
-<function>XLookupString</function>,
+<olink targetdoc='libX11' targetptr='XLookupString'><function>XLookupString</function></olink>,
and exists only for naming symmetry with other functions.
</para>
@@ -2637,7 +2637,7 @@ specifies or returns the compose state
</variablelist>
This function is similar to
-<function>XLookupString</function>,
+<olink targetdoc='libX11' targetptr='XLookupString'><function>XLookupString</function></olink>,
except that it maps a key event
to an Latin-2 (ISO 8859-2) string, or to an ASCII control string.
</para>
@@ -2690,7 +2690,7 @@ specifies or returns the compose state
</variablelist>
This function is similar to
-<function>XLookupString</function>,
+<olink targetdoc='libX11' targetptr='XLookupString'><function>XLookupString</function></olink>,
except that it maps a key event
to an Latin-3 (ISO 8859-3) string, or to an ASCII control string.
</para>
@@ -2743,7 +2743,7 @@ specifies or returns the compose state
</variablelist>
This function is similar to
-<function>XLookupString</function>,
+<olink targetdoc='libX11' targetptr='XLookupString'><function>XLookupString</function></olink>,
except that it maps a key event
to an Latin-4 (ISO 8859-4) string, or to an ASCII control string.
</para>
@@ -2796,7 +2796,7 @@ specifies or returns the compose state
</variablelist>
This function is similar to
-<function>XLookupString</function>,
+<olink targetdoc='libX11' targetptr='XLookupString'><function>XLookupString</function></olink>,
except that it maps a key event
to a string in an encoding consisting of Latin-1 (ISO 8859-1) and ASCII
control in the Graphics Left half (values 0 to 127), and Katakana in the
@@ -2852,7 +2852,7 @@ specifies or returns the compose state
</variablelist>
This function is similar to
-<function>XLookupString</function>,
+<olink targetdoc='libX11' targetptr='XLookupString'><function>XLookupString</function></olink>,
except that it maps a key event
to a string in the JIS X0201-1976 encoding, including ASCII control.
</para>
@@ -2905,7 +2905,7 @@ specifies or returns the compose state
</variablelist>
This function is similar to
-<function>XLookupString</function>,
+<olink targetdoc='libX11' targetptr='XLookupString'><function>XLookupString</function></olink>,
except that it maps a key event
to a Latin/Arabic (ISO 8859-6) string, or to an ASCII control string.
</para>
@@ -2958,7 +2958,7 @@ specifies or returns the compose state
</variablelist>
This function is similar to
-<function>XLookupString</function>,
+<olink targetdoc='libX11' targetptr='XLookupString'><function>XLookupString</function></olink>,
except that it maps a key event
to a Latin/Cyrillic (ISO 8859-5) string, or to an ASCII control string.
</para>
@@ -3011,7 +3011,7 @@ specifies or returns the compose state
</variablelist>
This function is similar to
-<function>XLookupString</function>,
+<olink targetdoc='libX11' targetptr='XLookupString'><function>XLookupString</function></olink>,
except that it maps a key event
to a Latin/Greek (ISO 8859-7) string, or to an ASCII control string.
</para>
@@ -3064,7 +3064,7 @@ specifies or returns the compose state
</variablelist>
This function is similar to
-<function>XLookupString</function>,
+<olink targetdoc='libX11' targetptr='XLookupString'><function>XLookupString</function></olink>,
except that it maps a key event
to a Latin/Hebrew (ISO 8859-8) string, or to an ASCII control string.
</para>
@@ -3117,14 +3117,14 @@ specifies or returns the compose state
</variablelist>
This function is similar to
-<function>XLookupString</function>,
+<olink targetdoc='libX11' targetptr='XLookupString'><function>XLookupString</function></olink>,
except that it maps a key event to an APL string.
</para>
</sect1>
- <sect1 id='compound_text_functions'>
- <title>Compound Text Functions</title>
+ <sect1 id='Compound_Text_Functions'>
+<title>Compound Text Functions</title>
<para>
The functions defined in this section are for parsing Compound Text strings,
@@ -3478,8 +3478,8 @@ structure.
</sect1>
- <sect1 id='closedisplay_hook_functions'>
- <title>CloseDisplay Hook Functions</title>
+ <sect1 id='CloseDisplay_Hook_Functions'>
+<title>CloseDisplay Hook Functions</title>
<para>
To use the functions defined in this section, you should include the header
@@ -3652,8 +3652,8 @@ if a matching callback exists, else returns
</para>
</sect1>
- <sect1 id='display_queue_functions'>
- <title>Display Queue Functions</title>
+ <sect1 id='Display_Queue_Functions'>
+<title>Display Queue Functions</title>
<para>
To use the functions and types defined in this section, you should include the
@@ -3917,8 +3917,8 @@ is not called on the display.
</sect1>
- <sect1 id='toolkit_convenience_functions'>
- <title>Toolkit Convenience Functions</title>
+ <sect1 id='Toolkit_Convenience_Functions'>
+<title>Toolkit Convenience Functions</title>
<para>
To use the functions defined in this section, you should include the header
@@ -3995,8 +3995,8 @@ Otherwise, this function does nothing.
</sect1>
- <sect1 id='standard_colormap_functions'>
- <title>Standard Colormap Functions</title>
+ <sect1 id='Standard_Colormap_Functions'>
+<title>Standard Colormap Functions</title>
<para>
To use the functions defined in this section, you should include the header
@@ -4534,8 +4534,8 @@ possible.
</sect1>
- <sect1 id='widget_description_functions'>
- <title>Widget Description Functions</title>
+ <sect1 id='Widget_Description_Functions'>
+<title>Widget Description Functions</title>
<para>
The functions defined in this section are for building a description of
@@ -4601,7 +4601,7 @@ specifies the widget class for which resources should be obtained.
specifies the widget that should be used for creating an instance of
<parameter>node</parameter>
from which resources are extracted. This is typically the value returned
-by <function>XtAppInitialize</function>.
+by <olink targetdoc='libXaw' targetptr='XtAppInitialize'><function>XtAppInitialize</function></olink>.
</para></listitem>
</varlistentry>
<varlistentry>
@@ -4696,8 +4696,8 @@ widget name or widget class name. If no match is found, it returns
</sect1>
- <sect1 id='participation_in_the_editres_protocol'>
- <title>Participation in the Editres Protocol</title>
+ <sect1 id='Participation_in_the_Editres_Protocol'>
+<title>Participation in the Editres Protocol</title>
<para>
<indexterm>
commit d7d2ad7dde7b2653aa1e08e9339674bc40f1560a
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat Sep 24 17:00:09 2011 -0700
Fix build with -DDEBUG
https://bugs.freedesktop.org/show_bug.cgi?id=1069
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
diff --git a/src/CmapAlloc.c b/src/CmapAlloc.c
index 78cdb1a..31cc153 100644
--- a/src/CmapAlloc.c
+++ b/src/CmapAlloc.c
@@ -330,7 +330,7 @@ icbrt_with_guess(int a, int guess)
icbrt_loopcount++;
#endif
delta = (guess - a/(guess*guess))/3;
-#ifdef DEBUG
+#if defined(DEBUG) && defined(_X_ROOT_STATS)
printf("pass %d: guess=%d, delta=%d\n", icbrt_loopcount, guess, delta);
#endif
guess -= delta;
commit 66492163cb244fbe22c67bebb14c0918dd11eab6
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Sep 16 22:46:25 2011 -0700
Strip trailing whitespace
Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}'
git diff -w & git diff -b show no diffs from this change
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/COPYING b/COPYING
index ab822fb..67a8b74 100644
--- a/COPYING
+++ b/COPYING
@@ -28,13 +28,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
All Rights Reserved
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
+both that copyright notice and this permission notice appear in
supporting documentation, and that the name of Digital not be
used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
+software without specific, written prior permission.
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
diff --git a/include/X11/Xmu/Atoms.h b/include/X11/Xmu/Atoms.h
index 3d86910..fc59b31 100644
--- a/include/X11/Xmu/Atoms.h
+++ b/include/X11/Xmu/Atoms.h
@@ -1,4 +1,4 @@
-/*
+/*
Copyright 1988, 1998 The Open Group
diff --git a/include/X11/Xmu/CharSet.h b/include/X11/Xmu/CharSet.h
index 1ce9166..9d9e53a 100644
--- a/include/X11/Xmu/CharSet.h
+++ b/include/X11/Xmu/CharSet.h
@@ -1,4 +1,4 @@
-/*
+/*
Copyright 1988, 1998 The Open Group
diff --git a/include/X11/Xmu/CloseHook.h b/include/X11/Xmu/CloseHook.h
index 2481ebf..1b895a9 100644
--- a/include/X11/Xmu/CloseHook.h
+++ b/include/X11/Xmu/CloseHook.h
@@ -1,4 +1,4 @@
-/*
+/*
Copyright 1988, 1998 The Open Group
diff --git a/include/X11/Xmu/Converters.h b/include/X11/Xmu/Converters.h
index 3779750..19ece56 100644
--- a/include/X11/Xmu/Converters.h
+++ b/include/X11/Xmu/Converters.h
@@ -1,5 +1,5 @@
/*
-
+
Copyright 1988, 1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/include/X11/Xmu/CurUtil.h b/include/X11/Xmu/CurUtil.h
index 3524d77..ab577a2 100644
--- a/include/X11/Xmu/CurUtil.h
+++ b/include/X11/Xmu/CurUtil.h
@@ -1,5 +1,5 @@
/*
-
+
Copyright 1988, 1998 The Open Group
Reply to: