Skip to content

N
nx-libs
Unverified Commit 4b3081c4 authored by Mike Gabriel's avatar Mike Gabriel
Browse files
Options

Merge branch 'sunweaver-pr/drop-really-old-X10-API-code' into 3.6.x

Attributes GH PR #148: https://github.com/ArcticaProject/nx-libs/pull/148 Reviewed by Vadim Troshchinskiy <vadim@qindel.com> -- Fri, 01 Jul 2016 03:12:26 -0700
parents b666a377 f0bf303c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 600 deletions
debian/libnx-x11-dev.install.in
View file @ 4b3081c4
......@@ -12,4 +12,3 @@ usr/include/*/nx-X11/Xutil.h
usr/include/*/nx-X11/cursorfont.h
usr/include/*/nx-X11/misc.h
usr/include/*/nx-X11/os.h
usr/include/*/nx-X11/X10.h
nx-X11/config/cf/README
View file @ 4b3081c4
......@@ -191,7 +191,6 @@ X11.tmpl provides defaults for the following variables:
DebugLibX11 build libX11_d.a
DebugLibXau build libXau_d.a
DebugLibXext build libXext_d.a
DebugOldX build liboldX_d.a
DefaultCursorTheme name of default cursor theme
DefaultFontPath default server font path
DefaultRGBDatabase default server rgb color database
......@@ -226,13 +225,11 @@ X11.tmpl provides defaults for the following variables:
NormalLibX11 build libX11.a
NormalLibXau build libXau.a
NormalLibXext build libXext.a
NormalOldX build liboldX.a
OsNameDefines If uname(2) unavailable, set to -DOS_NAME=OSName
PrimaryScreenResolution resolution of default server screen
ProfileLibX11 build libX11_p.a
ProfileLibXau build libXau_p.a
ProfileLibXext build libXext_p.a
ProfileOldX build liboldX_p.a
ProjectX version indicating this is the X Window System
RemoveTargetProgramByMoving boolean for rm -f that doesn't
SHELLPATH -D for /bin/sh
......@@ -244,7 +241,6 @@ X11.tmpl provides defaults for the following variables:
SharedLibX11 boolean for making sharable libX11.so
SharedLibXau boolean for making sharable libXau.so
SharedLibXext boolean for making sharable libXext.so
SharedOldX boolean for making sharable liboldX.so
ShmDefines MIT-SHM define
TwmDir directory in which to install twm config files
UseCCMakeDepend boolean for using alternate makedepend script
......@@ -313,8 +309,6 @@ An <os>Lib.rules file provides defaults for the following variables:
An <os>Lib.tmpl file provides defaults for the following variables:
SharedOldXReqs required libs for liboldX.so
SharedOldXRev version number for liboldX.so
SharedX11Reqs required libs for libX11.so
SharedX11Rev version number for libX11.so
SharedXauReqs required libs for libXau.so
......
nx-X11/config/cf/X11.tmpl
View file @ 4b3081c4
......@@ -1263,28 +1263,6 @@ ProjectUnsharedLibReferences(XAUTH,NX_Xau,$(XAUTHSRC),$(USRLIBDIR))
#endif
#endif
#ifndef SharedOldX
#define SharedOldX HasSharedLibraries
#endif
#ifndef NormalOldX
#define NormalOldX (!SharedOldX | ForceNormalLib)
#endif
#ifndef DebugOldX
#define DebugOldX NO /* debugged old X library */
#endif
#ifndef ProfileOldX
#define ProfileOldX NO /* profiled old X library */
#endif
OLDXLIBSRC = $(LIBSRC)/oldX
#if SharedOldX
#ifndef SharedOldXRev
#define SharedOldXRev 6.0
#endif
SharedLibReferences(OLDX,NX_oldX,$(OLDXLIBSRC),SOOLDXREV,SharedOldXRev)
#else
ProjectUnsharedLibReferences(OLDX,NX_oldX,$(OLDXLIBSRC),XBuildLibDir)
#endif
#if HasMotif
#ifndef MotifDir
......
nx-X11/config/cf/lnxLib.rules
View file @ 4b3081c4
......@@ -15,10 +15,6 @@ XCOMM $XFree86: xc/config/cf/lnxLib.rules,v 3.52 2003/10/31 20:49:03 herrb Exp $
#define UseRpath NO
#endif
#ifndef SharedOldX
# define SharedOldX NO
#endif
#if UseElfFormat
# if (LinuxCLibMajorVersion >= 5 && LinuxCLibMinorVersion >= 4) || LinuxCLibMajorVersion >= 6
......
nx-X11/config/cf/lnxLib.tmpl
View file @ 4b3081c4
......@@ -7,7 +7,6 @@ XCOMM $XFree86: xc/config/cf/lnxLib.tmpl,v 3.19 2003/10/15 22:47:48 herrb Exp $
#define SharedX11Reqs $(LDPRELIB) -ldl -lXdmcp
#define SharedXlibi18nReqs $(LDPRELIB) $(XONLYLIB)
#define SharedOldXReqs $(LDPRELIB) $(XONLYLIB)
#define SharedXextReqs $(LDPRELIB) $(XONLYLIB)
#define SharedxkbfileReqs $(LDPRELIB) $(XONLYLIB)
......
nx-X11/lib/Imakefile
View file @ 4b3081c4
......@@ -27,15 +27,10 @@ X11LIBDIR = X11
XEXTLIBDIR = Xext
#endif
#if BuildLibraries
OLDXLIBDIR = oldX
#endif
LINTSUBDIRS = \
$(XAULIBDIR) \
$(X11LIBDIR) \
$(OLDXLIBDIR) \
$(XEXTLIBDIR) \
$(XKBLIBDIR) \
$(NULL)
......
nx-X11/lib/oldX/Imakefile deleted 100644 → 0
View file @ b666a377
XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:46:42 cpqbld Exp $
XCOMM $XFree86: xc/lib/oldX/Imakefile,v 1.2 1998/12/20 11:57:19 dawes Exp $
#define DoNormalLib NormalOldX
#define DoSharedLib SharedOldX
#define DoExtraLib SharedOldX
#define DoDebugLib DebugOldX
#define DoProfileLib ProfileOldX
#define LibName NX_oldX
#define SoRev SOOLDXREV
#define IncSubdir nx-X11
#ifdef SharedOldXReqs
REQUIREDLIBS = SharedOldXReqs
#endif
#if Malloc0ReturnsNull
DEFINES = -DMALLOC_0_RETURNS_NULL
#endif
INCLUDES = -I$(XINCLUDESRC) -I$(XLIBSRC)
SRCS = \
XDraw.c \
XCrAssoc.c \
XDelAssoc.c \
XDestAssoc.c \
XLookAssoc.c \
XMakeAssoc.c
HEADERS = X10.h
LINTLIBS =
OBJS = \
XDraw.o \
XCrAssoc.o \
XDelAssoc.o \
XDestAssoc.o \
XLookAssoc.o \
XMakeAssoc.o
#include <Library.tmpl>
DependTarget()
nx-X11/lib/oldX/X10.h deleted 100644 → 0
View file @ b666a377
/* $Xorg: X10.h,v 1.4 2001/02/09 02:04:05 xorgcvs Exp $ */
/*
*
Copyright 1985, 1986, 1987, 1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
documentation.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Except as contained in this notice, the name of The Open Group shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*
* The X Window System is a Trademark of The Open Group.
*
*/
/*
* X10.h - Header definition and support file for the C subroutine
* interface library for V10 support routines.
*/
#ifndef _X10_H_
#define _X10_H_
/* Used in XDraw and XDrawFilled */
typedef struct {
short x, y;
unsigned short flags;
} Vertex;
/* The meanings of the flag bits. If the bit is 1 the predicate is true */
#define VertexRelative 0x0001 /* else absolute */
#define VertexDontDraw 0x0002 /* else draw */
#define VertexCurved 0x0004 /* else straight */
#define VertexStartClosed 0x0008 /* else not */
#define VertexEndClosed 0x0010 /* else not */
/*#define VertexDrawLastPoint 0x0020 */ /* else don't */
/*
The VertexDrawLastPoint option has not been implemented in XDraw and
XDrawFilled so it shouldn't be defined.
*/
/*
* XAssoc - Associations used in the XAssocTable data structure. The
* associations are used as circular queue entries in the association table
* which is contains an array of circular queues (buckets).
*/
typedef struct _XAssoc {
struct _XAssoc *next; /* Next object in this bucket. */
struct _XAssoc *prev; /* Previous obejct in this bucket. */
Display *display; /* Display which ownes the id. */
XID x_id; /* X Window System id. */
char *data; /* Pointer to untyped memory. */
} XAssoc;
/*
* XAssocTable - X Window System id to data structure pointer association
* table. An XAssocTable is a hash table whose buckets are circular
* queues of XAssoc's. The XAssocTable is constructed from an array of
* XAssoc's which are the circular queue headers (bucket headers).
* An XAssocTable consists an XAssoc pointer that points to the first
* bucket in the bucket array and an integer that indicates the number
* of buckets in the array.
*/
typedef struct {
XAssoc *buckets; /* Pointer to first bucket in bucket array.*/
int size; /* Table size (number of buckets). */
} XAssocTable;
XAssocTable *XCreateAssocTable();
char *XLookUpAssoc();
#endif /* _X10_H_ */
nx-X11/lib/oldX/XCrAssoc.c deleted 100644 → 0
View file @ b666a377
/* $Xorg: XCrAssoc.c,v 1.4 2001/02/09 02:04:05 xorgcvs Exp $ */
/*
Copyright 1985, 1998 The Open Group.
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
documentation.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Except as contained in this notice, the name of The Open Group shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "X11/Xlibint.h"
#include "X10.h"
/*
* XCreateAssocTable - Create an XAssocTable. The size argument should be
* a power of two for efficiency reasons. Some size suggestions: use 32
* buckets per 100 objects; a reasonable maximum number of object per
* buckets is 8. If there is an error creating the XAssocTable, a NULL
* pointer is returned.
*/
XAssocTable *XCreateAssocTable(size)
register int size; /* Desired size of the table. */
{
register XAssocTable *table; /* XAssocTable to be initialized. */
register XAssoc *buckets; /* Pointer to the first bucket in */
/* the bucket array. */
/* XMalloc the XAssocTable. */
if ((table = (XAssocTable *)Xmalloc(sizeof(XAssocTable))) == NULL) {
/* XMalloc call failed! */
errno = ENOMEM;
return(NULL);
}
/* XMalloc the buckets (actually just their headers). */
buckets = (XAssoc *)Xcalloc((unsigned)size, (unsigned)sizeof(XAssoc));
if (buckets == NULL) {
/* XCalloc call failed! */
errno = ENOMEM;
return(NULL);
}
/* Insert table data into the XAssocTable structure. */
table->buckets = buckets;
table->size = size;
while (--size >= 0) {
/* Initialize each bucket. */
buckets->prev = buckets;
buckets->next = buckets;
buckets++;
}
return(table);
}
nx-X11/lib/oldX/XDelAssoc.c deleted 100644 → 0
View file @ b666a377
/* $Xorg: XDelAssoc.c,v 1.4 2001/02/09 02:04:05 xorgcvs Exp $ */
/*
Copyright 1985, 1998 The Open Group.
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
documentation.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Except as contained in this notice, the name of The Open Group shall not be
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/oldX/XDelAssoc.c,v 1.3 2001/01/17 19:43:37 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "X11/Xlibint.h"
#include "X10.h"
/*
* XDeleteAssoc - Delete an association in an XAssocTable keyed on
* an XId. An association may be removed only once. Redundant
* deletes are meaningless (but cause no problems).
*/
int
XDeleteAssoc(dpy, table, x_id)
register Display *dpy;
register XAssocTable *table;
register XID x_id;
{
int hash;
register XAssoc *bucket;
register XAssoc *Entry;
/* Hash the XId to get the bucket number. */
hash = x_id & (table->size - 1);
/* Look up the bucket to get the entries in that bucket. */
bucket = &table->buckets[hash];
/* Get the first entry in the bucket. */
Entry = bucket->next;
/* Scan through the entries in the bucket for the right XId. */
for (; Entry != bucket; Entry = Entry->next) {
if (Entry->x_id == x_id) {
/* We have the right XId. */
if (Entry->display == dpy) {
/* We have the right display. */
/* We have the right entry! */
/* Remove it from the queue and */
/* free the entry. */
Entry->prev->next = Entry->next;
Entry->next->prev = Entry->prev;
Xfree((char *)Entry);
return 0;
}
/* Oops, identical XId's on different displays! */
continue;
}
if (Entry->x_id > x_id) {
/* We have gone past where it should be. */
/* It is apparently not in the table. */
return 0;
}
}
/* It is apparently not in the table. */
return 0;
}
nx-X11/lib/oldX/XDestAssoc.c deleted 100644 → 0
View file @ b666a377
/* $Xorg: XDestAssoc.c,v 1.4 2001/02/09 02:04:05 xorgcvs Exp $ */
/*
Copyright 1985, 1998 The Open Group.
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
documentation.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Except as contained in this notice, the name of The Open Group shall not be
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/oldX/XDestAssoc.c,v 1.3 2001/01/17 19:43:38 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "X11/Xlibint.h"
#include "X10.h"
/*
* XDestroyAssocTable - Destroy (free the memory associated with)
* an XAssocTable.
*/
int
XDestroyAssocTable(table)
register XAssocTable *table;
{
register int i;
register XAssoc *bucket;
register XAssoc *Entry, *entry_next;
/* Free the buckets. */
for (i = 0; i < table->size; i++) {
bucket = &table->buckets[i];
for (
Entry = bucket->next;
Entry != bucket;
Entry = entry_next
) {
entry_next = Entry->next;
Xfree((char *)Entry);
}
}
/* Free the bucket array. */
Xfree((char *)table->buckets);
/* Free the table. */
Xfree((char *)table);
return 0;
}
nx-X11/lib/oldX/XLookAssoc.c deleted 100644 → 0
View file @ b666a377
/* $Xorg: XLookAssoc.c,v 1.4 2001/02/09 02:04:05 xorgcvs Exp $ */
/*
Copyright 1985, 1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
documentation.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Except as contained in this notice, the name of The Open Group shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "X11/Xlibint.h"
#include "X10.h"
/*
* XLookUpAssoc - Retrieve the data stored in an XAssocTable by its XId.
* If an appropriately matching XId can be found in the table the routine will
* return apointer to the data associated with it. If the XId can not be found
* in the table the routine will return a NULL pointer. All XId's are relative
* to the currently active Display.
*/
XPointer XLookUpAssoc(dpy, table, x_id)
register Display *dpy;
register XAssocTable *table; /* XAssocTable to search in. */
register XID x_id; /* XId to search for. */
{
int hash;
register XAssoc *bucket;
register XAssoc *Entry;
/* Hash the XId to get the bucket number. */
hash = x_id & (table->size - 1);
/* Look up the bucket to get the entries in that bucket. */
bucket = &table->buckets[hash];
/* Get the first entry in the bucket. */
Entry = bucket->next;
/* Scan through the entries in the bucket for the right XId. */
for (; Entry != bucket; Entry = Entry->next) {
if (Entry->x_id == x_id) {
/* We have the right XId. */
if (Entry->display == dpy) {
/* We have the right display. */
/* We have the right entry! */
return(Entry->data);
}
/* Oops, identical XId's on different displays! */
continue;
}
if (Entry->x_id > x_id) {
/* We have gone past where it should be. */
/* It is apparently not in the table. */
return(NULL);
}
}
/* It is apparently not in the table. */
return(NULL);
}
nx-X11/lib/oldX/XMakeAssoc.c deleted 100644 → 0
View file @ b666a377
/* $Xorg: XMakeAssoc.c,v 1.4 2001/02/09 02:04:05 xorgcvs Exp $ */
/*
Copyright 1985, 1998 The Open Group.
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
documentation.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Except as contained in this notice, the name of The Open Group shall not be
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/oldX/XMakeAssoc.c,v 1.3 2001/01/17 19:43:38 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "X11/Xlibint.h"
#include "X10.h"
/*
* XMakeAssoc - Insert data into an XAssocTable keyed on an XId.
* Data is inserted into the table only once. Redundant inserts are
* meaningless (but cause no problems). The queue in each association
* bucket is sorted (lowest XId to highest XId).
*/
int
XMakeAssoc(dpy, table, x_id, data)
register Display *dpy;
register XAssocTable *table;
register XID x_id;
register XPointer data;
{
int hash;
register XAssoc *bucket;
register XAssoc *Entry;
register XAssoc *new_entry;
/* Hash the XId to get the bucket number. */
hash = x_id & (table->size - 1);
/* Look up the bucket to get the entries in that bucket. */
bucket = &table->buckets[hash];
/* Get the first entry in the bucket. */
Entry = bucket->next;
/* If (Entry != bucket), the bucket is empty so make */
/* the new entry the first entry in the bucket. */
/* if (Entry == bucket), the we have to search the */
/* bucket. */
if (Entry != bucket) {
/* The bucket isn't empty, begin searching. */
/* If we leave the for loop then we have either passed */
/* where the entry should be or hit the end of the bucket. */
/* In either case we should then insert the new entry */
/* before the current value of "Entry". */
for (; Entry != bucket; Entry = Entry->next) {
if (Entry->x_id == x_id) {
/* Entry has the same XId... */
if (Entry->display == dpy) {
/* Entry has the same Display... */
/* Therefore there is already an */
/* entry with this XId and Display, */
/* reset its data value and return. */
Entry->data = data;
return 0;
}
/* We found an association with the right */
/* id but the wrong display! */
continue;
}
/* If the current entry's XId is greater than the */
/* XId of the entry to be inserted then we have */
/* passed the location where the new XId should */
/* be inserted. */
if (Entry->x_id > x_id) break;
}
}
/* If we are here then the new entry should be inserted just */
/* before the current value of "Entry". */
/* Create a new XAssoc and load it with new provided data. */
new_entry = (XAssoc *)Xmalloc(sizeof(XAssoc));
if (new_entry == NULL) {
/* Malloc failed! */
errno = ENOMEM;
_XIOError(dpy);
}
new_entry->display = dpy;
new_entry->x_id = x_id;
new_entry->data = data;
/* Insert the new entry. */
new_entry->prev = Entry->prev;
new_entry->next = Entry;
Entry->prev->next = new_entry;
Entry->prev = new_entry;
return 0;
}
nx-X11/lib/oldX/oldX-def.cpp deleted 100644 → 0
View file @ b666a377
LIBRARY OLDX
VERSION LIBRARY_VERSION
EXPORTS
XDraw
XDrawFilled
XCreateAssocTable
XDeleteAssoc
XDestroyAssocTable
XLookUpAssoc
XMakeAssoc
/* $Xorg: oldX-def.cpp,v 1.3 2000/08/17 19:46:42 cpqbld Exp $ */
nx-libs.spec
View file @ 4b3081c4
......@@ -596,7 +596,6 @@ rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans
%files devel
%defattr(-,root,root)
%{_includedir}/nx-X11/X10.h
%dir %{_includedir}/nx-X11/extensions
%{_includedir}/nx-X11/extensions/panoramiXext.h
%{_includedir}/nx-X11/extensions/record.h
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment