Skip to content

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

Merge branch 'uli42-pr/upgrade_libX11' into 3.6.x

Attributes GH PR #214: https://github.com/ArcticaProject/nx-libs/pull/214 Fixes ArcticaProject/nx-libs#157.
parents 6dce607b b8de7bf6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 792 additions and 672 deletions
nx-X11/config/cf/X11.tmpl
View file @ 051d521f
......@@ -1053,6 +1053,7 @@ XCOMM X Window System make variables; these need to be coordinated with rules
XSMDIR = XsmDir /* xsm config files */
NLSDIR = NlsDir /* nls files */
XLOCALEDIR = XLocaleDir /* locale files */
XLOCALELIBDIR = XlocaleDir /* FIXME: For now take XLOCALEDIR, unsure about the correct setting */
PROXYMANAGERDIR = ProxyManagerDir /* proxy manager config files */
XAPPLOADDIR = XAppLoadDir /* application default resource dir */
......@@ -1129,6 +1130,7 @@ VENDORSUPPORTDEFS = VendorSupportDefines
SYSTEMENVLIBDIR = SystemBuildLibPath
# endif
#define XlocaleClientSetup Concat3(XLOCALEDIR,=,BuildI18NDir)
Concat3(XLOCALELIBDIR,=,BuildI18NDir)
XENVLIBDIR = X11BuildLibPath
CLIENTENVSETUP = Concat3(BuildLibPathVar,=,BuildLibPath) XlocaleClientSetup
#else
......
nx-X11/extras/Mesa/src/glx/x11/indirect_size.c
View file @ 051d521f
......@@ -55,7 +55,7 @@
# define INTERNAL
# endif
#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__APPLE__)
#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__APPLE__) || defined(__DARWIN__)
# undef HAVE_ALIAS
#endif
#ifdef HAVE_ALIAS
......
nx-X11/include/DECkeysym.h
View file @ 051d521f
/***********************************************************
Copyright 1988, 1998 The Open Group
......
nx-X11/include/Sunkeysym.h
View file @ 051d521f
/*
* Copyright (c) 1991, Oracle and/or its affiliates. All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
*/
/************************************************************
Copyright 1991, 1998 The Open Group
......@@ -23,32 +44,6 @@ 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.
Copyright 1991 by Sun Microsystems, Inc. Mountain View, CA.
All Rights Reserved
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 no-
tice appear in all copies and that both that copyright no-
tice and this permission notice appear in supporting docu-
mentation, and that the name of Sun not be used in
advertising or publicity pertaining to distribution of the
software without specific prior written permission. Sun
makes no representations about the suitability of this
software for any purpose. It is provided "as is" without any
express or implied warranty.
SUN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FIT-
NESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SUN BE LI-
ABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
***********************************************************/
/*
......
nx-X11/include/X.h
View file @ 051d521f
/*
* $Xorg: X.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $
*/
/* Definitions for the X window system likely to be used by applications */
#ifndef X_H
......@@ -215,7 +211,8 @@ are reserved in the protocol for errors and replies. */
#define ColormapNotify 32
#define ClientMessage 33
#define MappingNotify 34
#define LASTEvent 35 /* must be bigger than any event # */
#define GenericEvent 35
#define LASTEvent 36 /* must be bigger than any event # */
/* Key masks. Used as modifiers to GrabButton and GrabKey, results of QueryPointer,
......
nx-X11/include/Xos_r.h
View file @ 051d521f
......@@ -257,7 +257,7 @@ typedef struct {
*/
#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || \
defined(__APPLE__) || defined(__DragonFly__)
defined(__APPLE__) || defined(__DARWIN__) || defined(__DragonFly__)
static __inline__ void _Xpw_copyPasswd(_Xgetpwparams p)
{
memcpy(&(p).pws, (p).pwp, sizeof(struct passwd));
......@@ -327,7 +327,7 @@ static __inline__ void _Xpw_copyPasswd(_Xgetpwparams p)
(_Xos_processUnlock), \
(p).pwp )
#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(__APPLE__)
#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(__APPLE__) && !defined(__DARWIN__)
/* SVR4 threads, AIX 4.2.0 and earlier and OSF/1 3.2 and earlier pthreads */
# define X_NEEDS_PWPARAMS
typedef struct {
......@@ -620,7 +620,7 @@ typedef struct {
} _Xreaddirparams;
# if defined(_POSIX_THREAD_SAFE_FUNCTIONS) || defined(AIXV3) || \
defined(AIXV4) || defined(__APPLE__)
defined(AIXV4) || defined(__APPLE__) || defined(__DARWIN__)
/* AIX defines the draft POSIX symbol, but uses the final API. */
/* POSIX final API, returns (int)0 on success. */
# if defined(__osf__)
......
nx-X11/include/Xproto.h
View file @ 051d521f
/*
* $Xorg: Xproto.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $
*/
/* Definitions for the X window system used by server and c bindings */
/*
......@@ -263,10 +259,13 @@ restoring the definitions in X.h. */
typedef CARD16 KeyButMask;
/*****************
connection setup structure. This is followed by
numRoots xWindowRoot structs.
Connection setup structures. See Chapter 8: Connection Setup
of the X Window System Protocol specification for details.
*****************/
/* Client initiates handshake with this data, followed by the strings
* for the auth protocol & data.
*/
typedef struct {
CARD8 byteOrder;
BYTE pad;
......@@ -276,6 +275,16 @@ typedef struct {
CARD16 pad2 B16;
} xConnClientPrefix;
/* Server response to xConnClientPrefix.
*
* If success == Success, this is followed by xConnSetup and
* numRoots xWindowRoot structs.
*
* If success == Failure, this is followed by a reason string.
*
* The protocol also defines a case of success == Authenticate, but
* that doesn't seem to have ever been implemented by the X Consortium.
*/
typedef struct {
CARD8 success;
BYTE lengthReason; /*num bytes in string following if failure */
......@@ -1055,8 +1064,8 @@ typedef struct _xEvent {
BYTE bpad;
} createNotify;
/*
* The event feilds in the structures for DestroyNotify, UnmapNotify,
* MapNotify, ReparentNotify, ConfigureNotify, CirclulateNotify, GravityNotify,
* The event fields in the structures for DestroyNotify, UnmapNotify,
* MapNotify, ReparentNotify, ConfigureNotify, CirculateNotify, GravityNotify,
* must be at the same offset because server internal code is depending upon
* this to patch up the events before they are delivered.
* Also note that MapRequest, ConfigureRequest and CirculateRequest have
......@@ -1118,7 +1127,7 @@ typedef struct _xEvent {
} resizeRequest;
struct {
/* The event field in the circulate record is really the parent when this
is used as a CirculateRequest insteaad of a CircluateNotify */
is used as a CirculateRequest instead of a CirculateNotify */
CARD32 pad00 B32;
Window event B32, window B32, parent B32;
BYTE place; /* Top or Bottom */
......@@ -1204,6 +1213,38 @@ typedef struct _xEvent {
} u;
} xEvent;
/*********************************************************
*
* Generic event
*
* Those events are not part of the core protocol spec and can be used by
* various extensions.
* type is always GenericEvent
* extension is the minor opcode of the extension the event belongs to.
* evtype is the actual event type, unique __per extension__.
*
* GenericEvents can be longer than 32 bytes, with the length field
* specifying the number of 4 byte blocks after the first 32 bytes.
*
*
*/
typedef struct
{
BYTE type;
CARD8 extension;
CARD16 sequenceNumber B16;
CARD32 length B32;
CARD16 evtype B16;
CARD16 pad2 B16;
CARD32 pad3 B32;
CARD32 pad4 B32;
CARD32 pad5 B32;
CARD32 pad6 B32;
CARD32 pad7 B32;
} xGenericEvent;
/* KeymapNotify events are not included in the above union because they
are different from all other events: they do not have a "detail"
or "sequenceNumber", so there is room for a 248-bit key mask. */
......@@ -1705,7 +1746,7 @@ typedef struct {
CARD32 planeMask B32;
} xGetImageReq;
/* the folloiwng used by PolyText8 and PolyText16 */
/* the following used by PolyText8 and PolyText16 */
typedef struct {
CARD8 reqType;
......
nx-X11/include/keysym.h
View file @ 051d521f
/***********************************************************
Copyright 1987, 1998 The Open Group
......@@ -68,6 +67,8 @@ SOFTWARE.
#define XK_VIETNAMESE
#define XK_CURRENCY
#define XK_MATHEMATICAL
#define XK_BRAILLE
#define XK_SINHALA
#include <nx-X11/keysymdef.h>
#include <X11/keysymdef.h>
nx-X11/lib/X11/AddDIC.c
View file @ 051d521f
......@@ -2,7 +2,7 @@
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
* All Rights Reserved
*
*
* This file is a component of an X Window System-specific implementation
* of Xcms based on the TekColor Color Management System. Permission is
* hereby granted to use, copy, modify, sell, and otherwise distribute this
......@@ -10,10 +10,10 @@
* that this copyright, permission, and disclaimer notice is reproduced in
* all copies of this software and in supporting documentation. TekColor
* is a trademark of Tektronix, Inc.
*
*
* Tektronix makes no representation about the suitability of this software
* for any purpose. It is provided "as is" and with all faults.
*
*
* TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
* INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
* PARTICULAR PURPOSE. IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
......@@ -31,7 +31,6 @@
*
*
*/
/* $XFree86$ */
#ifdef HAVE_CONFIG_H
#include <config.h>
......@@ -56,8 +55,7 @@
* SYNOPSIS
*/
Status
XcmsAddColorSpace(pCS)
XcmsColorSpace *pCS;
XcmsAddColorSpace(XcmsColorSpace *pCS)
/*
* DESCRIPTION
* DI Color Spaces are managed on a global basis.
......
nx-X11/lib/X11/AddSF.c
View file @ 051d521f
......@@ -2,7 +2,7 @@
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
* All Rights Reserved
*
*
* This file is a component of an X Window System-specific implementation
* of Xcms based on the TekColor Color Management System. Permission is
* hereby granted to use, copy, modify, sell, and otherwise distribute this
......@@ -10,10 +10,10 @@
* that this copyright, permission, and disclaimer notice is reproduced in
* all copies of this software and in supporting documentation. TekColor
* is a trademark of Tektronix, Inc.
*
*
* Tektronix makes no representation about the suitability of this software
* for any purpose. It is provided "as is" and with all faults.
*
*
* TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
* INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
* PARTICULAR PURPOSE. IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
......@@ -31,7 +31,6 @@
*
*
*/
/* $XFree86$ */
#ifdef HAVE_CONFIG_H
#include <config.h>
......@@ -56,8 +55,7 @@
* SYNOPSIS
*/
Status
XcmsAddFunctionSet(pNewFS)
XcmsFunctionSet *pNewFS;
XcmsAddFunctionSet(XcmsFunctionSet *pNewFS)
/*
* DESCRIPTION
* Additional Screen Color Characterization Function Sets are
......
nx-X11/lib/X11/AllCells.c
View file @ 051d521f
......@@ -24,19 +24,20 @@ in this Software without prior written authorization from The Open Group.
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "Xlibint.h"
Status XAllocColorCells(dpy, cmap, contig, masks, nplanes, pixels, ncolors)
register Display *dpy;
Colormap cmap;
Bool contig;
unsigned int ncolors; /* CARD16 */
unsigned int nplanes; /* CARD16 */
unsigned long *masks; /* LISTofCARD32 */ /* RETURN */
unsigned long *pixels; /* LISTofCARD32 */ /* RETURN */
Status XAllocColorCells(
register Display *dpy,
Colormap cmap,
Bool contig,
unsigned long *masks, /* LISTofCARD32 */ /* RETURN */
unsigned int nplanes, /* CARD16 */
unsigned long *pixels, /* LISTofCARD32 */ /* RETURN */
unsigned int ncolors) /* CARD16 */
{
Status status;
......
nx-X11/lib/X11/AllPlanes.c
View file @ 051d521f
......@@ -29,15 +29,18 @@ in this Software without prior written authorization from The Open Group.
#endif
#include "Xlibint.h"
Status XAllocColorPlanes(dpy, cmap, contig, pixels, ncolors, nreds, ngreens,
nblues, rmask, gmask, bmask)
register Display *dpy;
Colormap cmap;
Bool contig;
unsigned long *pixels; /* LISTofCARD32 */ /* RETURN */
int ncolors;
int nreds, ngreens, nblues;
unsigned long *rmask, *gmask, *bmask; /* CARD32 */ /* RETURN */
Status XAllocColorPlanes(
register Display *dpy,
Colormap cmap,
Bool contig,
unsigned long *pixels, /* LISTofCARD32 */ /* RETURN */
int ncolors,
int nreds,
int ngreens,
int nblues,
unsigned long *rmask,
unsigned long *gmask,
unsigned long *bmask) /* CARD32 */ /* RETURN */
{
xAllocColorPlanesReply rep;
Status status;
......@@ -68,4 +71,4 @@ unsigned long *rmask, *gmask, *bmask; /* CARD32 */ /* RETURN */
UnlockDisplay(dpy);
SyncHandle();
return(status);
}
}
nx-X11/lib/X11/AllowEv.c
View file @ 051d521f
......@@ -30,10 +30,10 @@ in this Software without prior written authorization from The Open Group.
#include "Xlibint.h"
int
XAllowEvents(dpy, mode, time)
register Display *dpy;
int mode;
Time time;
XAllowEvents(
register Display *dpy,
int mode,
Time time)
{
register xAllowEventsReq *req;
......
nx-X11/lib/X11/AutoRep.c
View file @ 051d521f
......@@ -30,8 +30,7 @@ in this Software without prior written authorization from The Open Group.
#include "Xlibint.h"
int
XAutoRepeatOn (dpy)
register Display *dpy;
XAutoRepeatOn (register Display *dpy)
{
XKeyboardControl values;
values.auto_repeat_mode = AutoRepeatModeOn;
......@@ -40,8 +39,7 @@ register Display *dpy;
}
int
XAutoRepeatOff (dpy)
register Display *dpy;
XAutoRepeatOff (register Display *dpy)
{
XKeyboardControl values;
values.auto_repeat_mode = AutoRepeatModeOff;
......
nx-X11/lib/X11/Backgnd.c
View file @ 051d521f
......@@ -30,10 +30,10 @@ in this Software without prior written authorization from The Open Group.
#include "Xlibint.h"
int
XSetWindowBackground(dpy, w, pixel)
register Display *dpy;
Window w;
unsigned long pixel;
XSetWindowBackground(
register Display *dpy,
Window w,
unsigned long pixel)
{
register xChangeWindowAttributesReq *req;
......
nx-X11/lib/X11/BdrWidth.c
View file @ 051d521f
......@@ -33,10 +33,10 @@ from The Open Group.
#include "Xlibint.h"
int
XSetWindowBorderWidth(dpy, w, width)
Display *dpy;
Window w;
unsigned int width;
XSetWindowBorderWidth(
Display *dpy,
Window w,
unsigned int width)
{
unsigned long lwidth = width; /* must be CARD32 */
......
nx-X11/lib/X11/Bell.c
View file @ 051d521f
......@@ -30,9 +30,9 @@ in this Software without prior written authorization from The Open Group.
#include "Xlibint.h"
int
XBell(dpy, percent)
register Display *dpy;
int percent;
XBell(
register Display *dpy,
int percent)
{
register xBellReq *req;
......
nx-X11/lib/X11/Border.c
View file @ 051d521f
......@@ -30,10 +30,10 @@ in this Software without prior written authorization from The Open Group.
#include "Xlibint.h"
int
XSetWindowBorder(dpy, w, pixel)
register Display *dpy;
Window w;
unsigned long pixel;
XSetWindowBorder(
register Display *dpy,
Window w,
unsigned long pixel)
{
register xChangeWindowAttributesReq *req;
......
nx-X11/lib/X11/CCC.c
View file @ 051d521f
......@@ -2,7 +2,7 @@
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
* All Rights Reserved
*
*
* This file is a component of an X Window System-specific implementation
* of Xcms based on the TekColor Color Management System. Permission is
* hereby granted to use, copy, modify, sell, and otherwise distribute this
......@@ -10,10 +10,10 @@
* that this copyright, permission, and disclaimer notice is reproduced in
* all copies of this software and in supporting documentation. TekColor
* is a trademark of Tektronix, Inc.
*
*
* Tektronix makes no representation about the suitability of this software
* for any purpose. It is provided "as is" and with all faults.
*
*
* TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
* INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
* PARTICULAR PURPOSE. IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
......@@ -84,17 +84,16 @@ from The Open Group.
* SYNOPSIS
*/
XcmsCCC
XcmsCreateCCC(dpy, screenNumber, visual, clientWhitePt, gamutCompProc,
gamutCompClientData, whitePtAdjProc, whitePtAdjClientData)
Display *dpy;
int screenNumber;
Visual *visual;
XcmsColor *clientWhitePt;
XcmsCompressionProc gamutCompProc;
XPointer gamutCompClientData;
XcmsWhiteAdjustProc whitePtAdjProc;
XPointer whitePtAdjClientData;
XcmsCCC
XcmsCreateCCC(
Display *dpy,
int screenNumber,
Visual *visual,
XcmsColor *clientWhitePt,
XcmsCompressionProc gamutCompProc,
XPointer gamutCompClientData,
XcmsWhiteAdjustProc whitePtAdjProc,
XPointer whitePtAdjClientData)
/*
* DESCRIPTION
* Given a Display, Screen, Visual, etc., this routine creates
......@@ -114,7 +113,7 @@ XcmsCreateCCC(dpy, screenNumber, visual, clientWhitePt, gamutCompProc,
if (pDefaultCCC == NULL ||
!(newccc = (XcmsCCC) Xcalloc(1, (unsigned) sizeof(XcmsCCCRec)))) {
return(NULL);
}
}
/*
* Should inherit the following as result of a memmove():
......@@ -171,10 +170,10 @@ XcmsCreateCCC(dpy, screenNumber, visual, clientWhitePt, gamutCompProc,
*
* SYNOPSIS
*/
XcmsCCC
XcmsDefaultCCC(dpy, screenNumber)
Display *dpy;
int screenNumber;
XcmsCCC
XcmsDefaultCCC(
Display *dpy,
int screenNumber)
/*
* DESCRIPTION
* Given a Display and Screen, this routine creates
......@@ -254,8 +253,7 @@ XcmsDefaultCCC(dpy, screenNumber)
* SYNOPSIS
*/
void
XcmsFreeCCC(ccc)
XcmsCCC ccc;
XcmsFreeCCC(XcmsCCC ccc)
/*
* DESCRIPTION
* Frees memory associated with a Color Conversion Context
......
nx-X11/lib/X11/ChAccCon.c
View file @ 051d521f
......@@ -30,25 +30,21 @@ in this Software without prior written authorization from The Open Group.
#include "Xlibint.h"
int
XEnableAccessControl(dpy)
register Display *dpy;
XEnableAccessControl(register Display *dpy)
{
return XSetAccessControl(dpy, EnableAccess);
}
int
XDisableAccessControl(dpy)
register Display *dpy;
XDisableAccessControl(register Display *dpy)
{
return XSetAccessControl(dpy, DisableAccess);
}
int
XSetAccessControl(dpy, mode)
register Display *dpy;
int mode;
XSetAccessControl(
register Display *dpy,
int mode)
{
register xSetAccessControlReq *req;
......
nx-X11/lib/X11/ChActPGb.c
View file @ 051d521f
......@@ -30,11 +30,11 @@ in this Software without prior written authorization from The Open Group.
#include "Xlibint.h"
int
XChangeActivePointerGrab(dpy, event_mask, curs, time)
register Display *dpy;
unsigned int event_mask; /* CARD16 */
Cursor curs;
Time time;
XChangeActivePointerGrab(
register Display *dpy,
unsigned int event_mask, /* CARD16 */
Cursor curs,
Time time)
{
register xChangeActivePointerGrabReq *req;
......
nx-X11/lib/X11/ChClMode.c
View file @ 051d521f
......@@ -30,10 +30,9 @@ in this Software without prior written authorization from The Open Group.
#include "Xlibint.h"
int
XSetCloseDownMode(dpy, mode)
register Display *dpy;
int mode;
XSetCloseDownMode(
register Display *dpy,
int mode)
{
register xSetCloseDownModeReq *req;
......
nx-X11/lib/X11/ChCmap.c
View file @ 051d521f
......@@ -30,10 +30,10 @@ in this Software without prior written authorization from The Open Group.
#include "Xlibint.h"
int
XSetWindowColormap(dpy, w, colormap)
register Display *dpy;
Window w;
Colormap colormap;
XSetWindowColormap(
register Display *dpy,
Window w,
Colormap colormap)
{
register xChangeWindowAttributesReq *req;
......
nx-X11/lib/X11/ChGC.c
View file @ 051d521f
......@@ -31,11 +31,11 @@ in this Software without prior written authorization from The Open Group.
#include "Cr.h"
int
XChangeGC (dpy, gc, valuemask, values)
register Display *dpy;
GC gc;
unsigned long valuemask;
XGCValues *values;
XChangeGC (
register Display *dpy,
GC gc,
unsigned long valuemask,
XGCValues *values)
{
LockDisplay(dpy);
......
nx-X11/lib/X11/ChKeyCon.c
View file @ 051d521f
......@@ -30,10 +30,10 @@ in this Software without prior written authorization from The Open Group.
#include "Xlibint.h"
int
XChangeKeyboardControl(dpy, mask, value_list)
register Display *dpy;
unsigned long mask;
XKeyboardControl *value_list;
XChangeKeyboardControl(
register Display *dpy,
unsigned long mask,
XKeyboardControl *value_list)
{
unsigned long values[8];
register unsigned long *value = values;
......@@ -46,7 +46,7 @@ XChangeKeyboardControl(dpy, mask, value_list)
if (mask & KBKeyClickPercent)
*value++ = value_list->key_click_percent;
if (mask & KBBellPercent)
*value++ = value_list->bell_percent;
......
nx-X11/lib/X11/ChPntCon.c
View file @ 051d521f
......@@ -30,11 +30,13 @@ in this Software without prior written authorization from The Open Group.
#include "Xlibint.h"
int
XChangePointerControl(dpy, do_acc, do_thresh, acc_numerator,
acc_denominator, threshold)
register Display *dpy;
Bool do_acc, do_thresh;
int acc_numerator, acc_denominator, threshold;
XChangePointerControl(
register Display *dpy,
Bool do_acc,
Bool do_thresh,
int acc_numerator,
int acc_denominator,
int threshold)
{
register xChangePointerControlReq *req;
......
nx-X11/lib/X11/ChSaveSet.c
View file @ 051d521f
......@@ -30,10 +30,10 @@ in this Software without prior written authorization from The Open Group.
#include "Xlibint.h"
int
XChangeSaveSet(dpy, win, mode)
register Display *dpy;
Window win;
int mode;
XChangeSaveSet(
register Display *dpy,
Window win,
int mode)
{
register xChangeSaveSetReq *req;
......@@ -47,17 +47,17 @@ int mode;
}
int
XAddToSaveSet(dpy, win)
register Display *dpy;
Window win;
XAddToSaveSet(
register Display *dpy,
Window win)
{
return XChangeSaveSet(dpy,win,SetModeInsert);
}
int
XRemoveFromSaveSet (dpy, win)
register Display *dpy;
Window win;
XRemoveFromSaveSet (
register Display *dpy,
Window win)
{
return XChangeSaveSet(dpy,win,SetModeDelete);
}
nx-X11/lib/X11/ChWAttrs.c
View file @ 051d521f
......@@ -36,11 +36,11 @@ in this Software without prior written authorization from The Open Group.
CWDontPropagate|CWColormap|CWCursor)
int
XChangeWindowAttributes (dpy, w, valuemask, attributes)
register Display *dpy;
Window w;
unsigned long valuemask;
XSetWindowAttributes *attributes;
XChangeWindowAttributes (
register Display *dpy,
Window w,
unsigned long valuemask,
XSetWindowAttributes *attributes)
{
register xChangeWindowAttributesReq *req;
......
nx-X11/lib/X11/ChWindow.c
View file @ 051d521f
......@@ -30,10 +30,11 @@ in this Software without prior written authorization from The Open Group.
#include "Xlibint.h"
int
XResizeWindow(dpy, w, width, height)
register Display *dpy;
Window w;
unsigned int width, height;
XResizeWindow(
register Display *dpy,
Window w,
unsigned int width,
unsigned int height)
{
register xConfigureWindowReq *req;
......
nx-X11/lib/X11/ChkIfEv.c
View file @ 051d521f
......@@ -23,28 +23,27 @@ 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$ */
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "Xlibint.h"
/*
/*
* Check existing events in queue to find if any match. If so, return.
* If not, flush buffer and see if any more events are readable. If one
* matches, return. If all else fails, tell the user no events found.
*/
Bool XCheckIfEvent (dpy, event, predicate, arg)
register Display *dpy;
Bool XCheckIfEvent (
register Display *dpy,
register XEvent *event, /* XEvent to be filled in. */
Bool (*predicate)(
Display* /* display */,
XEvent* /* event */,
char* /* arg */
); /* function to call */
register XEvent *event; /* XEvent to be filled in. */
char *arg;
), /* function to call */
char *arg)
{
register _XQEvent *prev, *qelt;
unsigned long qe_serial = 0;
......@@ -60,6 +59,7 @@ Bool XCheckIfEvent (dpy, event, predicate, arg)
&& (*predicate)(dpy, &qelt->event, arg)) {
*event = qelt->event;
_XDeq(dpy, prev, qelt);
_XStoreEventCookie(dpy, event);
UnlockDisplay(dpy);
return True;
}
......@@ -90,15 +90,16 @@ Bool XCheckIfEvent (dpy, event, predicate, arg)
* events.
*/
Bool XCheckIfEventNoFlush (dpy, event, predicate, arg)
register Display *dpy;
Bool XCheckIfEventNoFlush (
register Display *dpy,
register XEvent *event, /* XEvent to be filled in. */
Bool (*predicate)(
Display* /* display */,
XEvent* /* event */,
char* /* arg */
); /* function to call */
register XEvent *event; /* XEvent to be filled in. */
char *arg;
), /* function to call */
char *arg)
{
register _XQEvent *prev, *qelt;
unsigned long qe_serial = 0;
......@@ -114,6 +115,7 @@ Bool XCheckIfEventNoFlush (dpy, event, predicate, arg)
&& (*predicate)(dpy, &qelt->event, arg)) {
*event = qelt->event;
_XDeq(dpy, prev, qelt);
_XStoreEventCookie(dpy, event);
UnlockDisplay(dpy);
return True;
}
......
nx-X11/lib/X11/ChkMaskEv.c
View file @ 051d521f
......@@ -35,28 +35,32 @@ extern long const _Xevent_to_mask[];
#define AllButtons (Button1MotionMask|Button2MotionMask|Button3MotionMask|\
Button4MotionMask|Button5MotionMask)
/*
/*
* Check existing events in queue to find if any match. If so, return.
* If not, flush buffer and see if any more events are readable. If one
* matches, return. If all else fails, tell the user no events found.
*/
Bool XCheckMaskEvent (dpy, mask, event)
register Display *dpy;
long mask; /* Selected event mask. */
register XEvent *event; /* XEvent to be filled in. */
Bool XCheckMaskEvent (
register Display *dpy,
long mask, /* Selected event mask. */
register XEvent *event) /* XEvent to be filled in. */
{
register _XQEvent *prev, *qelt;
unsigned long qe_serial = 0;
int n; /* time through count */
LockDisplay(dpy);
/* Delete unclaimed cookies */
_XFreeEventCookies(dpy);
prev = NULL;
for (n = 3; --n >= 0;) {
for (qelt = prev ? prev->next : dpy->head;
qelt;
prev = qelt, qelt = qelt->next) {
if ((qelt->event.type < LASTEvent) &&
if ((qelt->event.type < GenericEvent) &&
(_Xevent_to_mask[qelt->event.type] & mask) &&
((qelt->event.type != MotionNotify) ||
(mask & AllPointers) ||
......
nx-X11/lib/X11/ChkTypEv.c
View file @ 051d521f
......@@ -29,22 +29,26 @@ in this Software without prior written authorization from The Open Group.
#endif
#include "Xlibint.h"
/*
/*
* Check existing events in queue to find if any match. If so, return.
* If not, flush buffer and see if any more events are readable. If one
* matches, return. If all else fails, tell the user no events found.
*/
Bool XCheckTypedEvent (dpy, type, event)
register Display *dpy;
int type; /* Selected event type. */
register XEvent *event; /* XEvent to be filled in. */
Bool XCheckTypedEvent (
register Display *dpy,
int type, /* Selected event type. */
register XEvent *event) /* XEvent to be filled in. */
{
register _XQEvent *prev, *qelt;
unsigned long qe_serial = 0;
int n; /* time through count */
LockDisplay(dpy);
/* Delete unclaimed cookies */
_XFreeEventCookies(dpy);
prev = NULL;
for (n = 3; --n >= 0;) {
for (qelt = prev ? prev->next : dpy->head;
......
nx-X11/lib/X11/ChkTypWEv.c
View file @ 051d521f
......@@ -29,23 +29,27 @@ in this Software without prior written authorization from The Open Group.
#endif
#include "Xlibint.h"
/*
/*
* Check existing events in queue to find if any match. If so, return.
* If not, flush buffer and see if any more events are readable. If one
* matches, return. If all else fails, tell the user no events found.
*/
Bool XCheckTypedWindowEvent (dpy, w, type, event)
register Display *dpy;
Window w; /* Selected window. */
int type; /* Selected event type. */
register XEvent *event; /* XEvent to be filled in. */
Bool XCheckTypedWindowEvent (
register Display *dpy,
Window w, /* Selected window. */
int type, /* Selected event type. */
register XEvent *event) /* XEvent to be filled in. */
{
register _XQEvent *prev, *qelt;
unsigned long qe_serial = 0;
int n; /* time through count */
LockDisplay(dpy);
/* Delete unclaimed cookies */
_XFreeEventCookies(dpy);
prev = NULL;
for (n = 3; --n >= 0;) {
for (qelt = prev ? prev->next : dpy->head;
......
nx-X11/lib/X11/ChkWinEv.c
View file @ 051d521f
......@@ -34,30 +34,34 @@ extern long const _Xevent_to_mask[];
#define AllButtons (Button1MotionMask|Button2MotionMask|Button3MotionMask|\
Button4MotionMask|Button5MotionMask)
/*
/*
* Check existing events in queue to find if any match. If so, return.
* If not, flush buffer and see if any more events are readable. If one
* matches, return. If all else fails, tell the user no events found.
*/
Bool XCheckWindowEvent (dpy, w, mask, event)
register Display *dpy;
Window w; /* Selected window. */
long mask; /* Selected event mask. */
register XEvent *event; /* XEvent to be filled in. */
Bool XCheckWindowEvent (
register Display *dpy,
Window w, /* Selected window. */
long mask, /* Selected event mask. */
register XEvent *event) /* XEvent to be filled in. */
{
register _XQEvent *prev, *qelt;
unsigned long qe_serial = 0;
int n; /* time through count */
LockDisplay(dpy);
/* Delete unclaimed cookies */
_XFreeEventCookies(dpy);
prev = NULL;
for (n = 3; --n >= 0;) {
for (qelt = prev ? prev->next : dpy->head;
qelt;
prev = qelt, qelt = qelt->next) {
if ((qelt->event.xany.window == w) &&
(qelt->event.type < LASTEvent) &&
(qelt->event.type < GenericEvent) &&
(_Xevent_to_mask[qelt->event.type] & mask) &&
((qelt->event.type != MotionNotify) ||
(mask & AllPointers) ||
......
nx-X11/lib/X11/CirWin.c
View file @ 051d521f
......@@ -30,10 +30,10 @@ in this Software without prior written authorization from The Open Group.
#include "Xlibint.h"
int
XCirculateSubwindows(dpy, w, direction)
register Display *dpy;
Window w;
int direction;
XCirculateSubwindows(
register Display *dpy,
Window w,
int direction)
{
register xCirculateWindowReq *req;
......
nx-X11/lib/X11/CirWinDn.c
View file @ 051d521f
......@@ -30,9 +30,9 @@ in this Software without prior written authorization from The Open Group.
#include "Xlibint.h"
int
XCirculateSubwindowsDown(dpy,w)
register Display *dpy;
Window w;
XCirculateSubwindowsDown(
register Display *dpy,
Window w)
{
register xCirculateWindowReq *req;
......
nx-X11/lib/X11/CirWinUp.c
View file @ 051d521f
......@@ -30,9 +30,9 @@ in this Software without prior written authorization from The Open Group.
#include "Xlibint.h"
int
XCirculateSubwindowsUp(dpy, w)
register Display *dpy;
Window w;
XCirculateSubwindowsUp(
register Display *dpy,
Window w)
{
register xCirculateWindowReq *req;
......
nx-X11/lib/X11/ClDisplay.c
View file @ 051d521f
......@@ -30,12 +30,16 @@ from The Open Group.
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#if USE_XCB
#include "Xxcbint.h"
#else /* !USE_XCB */
#include <nx-X11/Xtrans/Xtrans.h>
#endif /* USE_XCB */
#include "Xlib.h"
#include "Xlibint.h"
#include "Xintconn.h"
/*
/*
* XCloseDisplay - XSync the connection to the X Server, close the connection,
* and free all associated storage. Extension close procs should only free
* memory and must be careful about the types of requests they generate.
......@@ -68,7 +72,11 @@ XCloseDisplay (
if (dpy->request != dpy->last_request_read)
XSync(dpy, 1);
}
#if USE_XCB
xcb_disconnect(dpy->xcb->connection);
#else /* !USE_XCB */
_XDisconnectDisplay(dpy->trans_conn);
#endif /* USE_XCB */
_XFreeDisplayStructure (dpy);
return 0;
}
nx-X11/lib/X11/Clear.c
View file @ 051d521f
......@@ -30,9 +30,9 @@ in this Software without prior written authorization from The Open Group.
#include "Xlibint.h"
int
XClearWindow(dpy, w)
register Display *dpy;
Window w;
XClearWindow(
register Display *dpy,
Window w)
{
register xClearAreaReq *req;
......
nx-X11/lib/X11/ClearArea.c
View file @ 051d521f
......@@ -30,12 +30,14 @@ in this Software without prior written authorization from The Open Group.
#include "Xlibint.h"
int
XClearArea (dpy, w, x, y, width, height, exposures)
register Display *dpy;
Window w;
int x, y;
unsigned int width, height;
Bool exposures;
XClearArea (
register Display *dpy,
Window w,
int x,
int y,
unsigned int width,
unsigned int height,
Bool exposures)
{
register xClearAreaReq *req;
......
nx-X11/lib/X11/Cmap.h
View file @ 051d521f
/* $XFree86$ */
#ifndef _CMAP_H_
#define _CMAP_H_
......
nx-X11/lib/X11/ConfWind.c
View file @ 051d521f
......@@ -30,11 +30,13 @@ in this Software without prior written authorization from The Open Group.
#include "Xlibint.h"
int
XMoveResizeWindow(dpy, w, x, y, width, height)
register Display *dpy;
Window w;
int x, y;
unsigned int width, height;
XMoveResizeWindow(
register Display *dpy,
Window w,
int x,
int y,
unsigned int width,
unsigned int height)
{
register xConfigureWindowReq *req;
......
nx-X11/lib/X11/Context.c
View file @ 051d521f
......@@ -4,13 +4,13 @@ Copyright 1987, 1988, 1990 by Digital Equipment Corporation, Maynard,
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 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
......@@ -154,7 +154,7 @@ static void _XFreeContextDB(Display *display)
/* Save the given value of data to correspond with the keys XID and context.
Returns nonzero error code if an error has occured, 0 otherwise.
Possible errors are Out-of-memory.
*/
*/
int XSaveContext(
Display *display,
......@@ -228,16 +228,12 @@ int XSaveContext(
/* Given an XID and context, returns the associated data. Note that data
/* Given an XID and context, returns the associated data. Note that data
here is a pointer since it is a return value. Returns nonzero error code
if an error has occured, 0 otherwise. Possible errors are Entry-not-found.
*/
int XFindContext(display, rid, context, data)
Display *display;
register XID rid;
register XContext context;
XPointer *data; /* RETURN */
int XFindContext(Display *display, XID rid, XContext context, XPointer *data)
{
register DB db;
register TableEntry entry;
......@@ -272,10 +268,7 @@ int XFindContext(display, rid, context, data)
with the same arguments.
*/
int XDeleteContext(display, rid, context)
Display *display;
register XID rid;
register XContext context;
int XDeleteContext(Display *display, XID rid, XContext context)
{
register DB db;
register TableEntry entry, *prev;
......
nx-X11/lib/X11/ConvSel.c
View file @ 051d521f
......@@ -30,12 +30,13 @@ in this Software without prior written authorization from The Open Group.
#include "Xlibint.h"
int
XConvertSelection(dpy, selection, target, property, requestor, time)
register Display *dpy;
Atom selection, target;
Atom property;
Window requestor;
Time time;
XConvertSelection(
register Display *dpy,
Atom selection,
Atom target,
Atom property,
Window requestor,
Time time)
{
register xConvertSelectionReq *req;
......
nx-X11/lib/X11/CopyArea.c
View file @ 051d521f
......@@ -30,15 +30,17 @@ in this Software without prior written authorization from The Open Group.
#include "Xlibint.h"
int
XCopyArea(dpy, src_drawable, dst_drawable, gc,
src_x, src_y, width, height,
dst_x, dst_y)
register Display *dpy;
Drawable src_drawable, dst_drawable;
GC gc;
int src_x, src_y;
unsigned int width, height;
int dst_x, dst_y;
XCopyArea(
register Display *dpy,
Drawable src_drawable,
Drawable dst_drawable,
GC gc,
int src_x,
int src_y,
unsigned int width,
unsigned int height,
int dst_x,
int dst_y)
{
register xCopyAreaReq *req;
......
nx-X11/lib/X11/CopyCmap.c
View file @ 051d521f
......@@ -40,9 +40,9 @@ extern XcmsCmapRec * _XcmsCopyCmapRecAndFree(Display *dpy,
Colormap copy_cmap);
#endif
Colormap XCopyColormapAndFree(dpy, src_cmap)
register Display *dpy;
Colormap src_cmap;
Colormap XCopyColormapAndFree(
register Display *dpy,
Colormap src_cmap)
{
Colormap mid;
register xCopyColormapAndFreeReq *req;
......@@ -59,6 +59,6 @@ Colormap src_cmap;
#if XCMS
_XcmsCopyCmapRecAndFree(dpy, src_cmap, mid);
#endif
return(mid);
}
nx-X11/lib/X11/CopyGC.c
View file @ 051d521f
......@@ -30,10 +30,11 @@ in this Software without prior written authorization from The Open Group.
#include "Xlibint.h"
int
XCopyGC (dpy, srcGC, mask, destGC)
register Display *dpy;
unsigned long mask; /* which ones to set initially */
GC srcGC, destGC;
XCopyGC (
register Display *dpy,
GC srcGC,
unsigned long mask, /* which ones to set initially */
GC destGC)
{
register XGCValues *destgv = &destGC->values,
*srcgv = &srcGC->values;
......@@ -43,7 +44,7 @@ XCopyGC (dpy, srcGC, mask, destGC)
LockDisplay(dpy);
mask &= (1L << (GCLastBit + 1)) - 1;
/* if some of the source values to be copied are "dirty", flush them
/* if some of the source values to be copied are "dirty", flush them
out before sending the CopyGC request. */
if (srcGC->dirty & mask)
_XFlushGCCache(dpy, srcGC);
......@@ -58,7 +59,7 @@ XCopyGC (dpy, srcGC, mask, destGC)
if (mask & GCFunction)
destgv->function = srcgv->function;
if (mask & GCPlaneMask)
destgv->plane_mask = srcgv->plane_mask;
......@@ -76,14 +77,14 @@ XCopyGC (dpy, srcGC, mask, destGC)
if (mask & GCCapStyle)
destgv->cap_style = srcgv->cap_style;
if (mask & GCJoinStyle)
destgv->join_style = srcgv->join_style;
if (mask & GCFillStyle)
destgv->fill_style = srcgv->fill_style;
if (mask & GCFillRule)
if (mask & GCFillRule)
destgv->fill_rule = srcgv->fill_rule;
if (mask & GCArcMode)
......@@ -101,19 +102,19 @@ XCopyGC (dpy, srcGC, mask, destGC)
if (mask & GCTileStipYOrigin)
destgv->ts_y_origin = srcgv->ts_y_origin;
if (mask & GCFont)
if (mask & GCFont)
destgv->font = srcgv->font;
if (mask & GCSubwindowMode)
if (mask & GCSubwindowMode)
destgv->subwindow_mode = srcgv->subwindow_mode;
if (mask & GCGraphicsExposures)
if (mask & GCGraphicsExposures)
destgv->graphics_exposures = srcgv->graphics_exposures;
if (mask & GCClipXOrigin)
if (mask & GCClipXOrigin)
destgv->clip_x_origin = srcgv->clip_x_origin;
if (mask & GCClipYOrigin)
if (mask & GCClipYOrigin)
destgv->clip_y_origin = srcgv->clip_y_origin;
if (mask & GCClipMask) {
......@@ -121,7 +122,7 @@ XCopyGC (dpy, srcGC, mask, destGC)
destgv->clip_mask = srcgv->clip_mask;
}
if (mask & GCDashOffset)
if (mask & GCDashOffset)
destgv->dash_offset = srcgv->dash_offset;
if (mask & GCDashList) {
......
nx-X11/lib/X11/CopyPlane.c
View file @ 051d521f
......@@ -30,18 +30,20 @@ in this Software without prior written authorization from The Open Group.
#include "Xlibint.h"
int
XCopyPlane(dpy, src_drawable, dst_drawable, gc,
src_x, src_y, width, height,
dst_x, dst_y, bit_plane)
register Display *dpy;
Drawable src_drawable, dst_drawable;
GC gc;
int src_x, src_y;
unsigned int width, height;
int dst_x, dst_y;
unsigned long bit_plane;
XCopyPlane(
register Display *dpy,
Drawable src_drawable,
Drawable dst_drawable,
GC gc,
int src_x,
int src_y,
unsigned int width,
unsigned int height,
int dst_x,
int dst_y,
unsigned long bit_plane)
{
{
register xCopyPlaneReq *req;
LockDisplay(dpy);
......
nx-X11/lib/X11/Cr.h
View file @ 051d521f
/* $XFree86$ */
#ifndef _CR_H_
#define _CR_H_
......
nx-X11/lib/X11/CrBFData.c
View file @ 051d521f
......@@ -23,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$ */
#ifdef HAVE_CONFIG_H
#include <config.h>
......@@ -31,10 +30,10 @@ in this Software without prior written authorization from The Open Group.
#include "Xlib.h"
/*
* XCreateBitmapFromData: Routine to make a pixmap of depth 1 from user
* XCreateBitmapFromData: Routine to make a pixmap of depth 1 from user
* supplied data.
* D is any drawable on the same screen that the pixmap will be used in.
* Data is a pointer to the bit data, and
* Data is a pointer to the bit data, and
* width & height give the size in bits of the pixmap.
*
* The following format is assumed for data:
......@@ -46,7 +45,7 @@ in this Software without prior written authorization from The Open Group.
* bitmap_unit=8
* xoffset=0
* no extra bytes per line
*/
*/
Pixmap XCreateBitmapFromData(
Display *display,
Drawable d,
......
nx-X11/lib/X11/CrCmap.c
View file @ 051d521f
......@@ -31,11 +31,11 @@ in this Software without prior written authorization from The Open Group.
#include "Xcmsint.h"
Colormap XCreateColormap(dpy, w, visual, alloc)
register Display *dpy;
Window w;
Visual *visual;
int alloc;
Colormap XCreateColormap(
register Display *dpy,
Window w,
Visual *visual,
int alloc)
{
register xCreateColormapReq *req;
Colormap mid;
......@@ -51,7 +51,9 @@ int alloc;
UnlockDisplay(dpy);
SyncHandle();
#ifdef XCMS
_XcmsAddCmapRec(dpy, mid, w, visual);
#endif
return(mid);
}
nx-X11/lib/X11/CrCursor.c
View file @ 051d521f
......@@ -23,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$ */
#ifdef HAVE_CONFIG_H
#include <config.h>
......@@ -40,19 +39,22 @@ _XTryShapeBitmapCursor (Display *dpy,
unsigned int x,
unsigned int y);
#endif
Cursor XCreatePixmapCursor(dpy, source, mask, foreground, background, x, y)
register Display *dpy;
Pixmap source, mask;
XColor *foreground, *background;
unsigned int x, y;
{
Cursor XCreatePixmapCursor(
register Display *dpy,
Pixmap source,
Pixmap mask,
XColor *foreground,
XColor *background,
unsigned int x,
unsigned int y)
{
register xCreateCursorReq *req;
Cursor cid;
#ifdef USE_DYNAMIC_XCURSOR
cid = _XTryShapeBitmapCursor (dpy, source, mask,
cid = _XTryShapeBitmapCursor (dpy, source, mask,
foreground, background, x, y);
if (cid)
return cid;
......
nx-X11/lib/X11/CrGC.c
View file @ 051d521f
......@@ -61,11 +61,11 @@ static void _XGenerateGCList(
GC gc,
xReq *req);
GC XCreateGC (dpy, d, valuemask, values)
register Display *dpy;
Drawable d; /* Window or Pixmap for which depth matches */
unsigned long valuemask; /* which ones to set initially */
XGCValues *values; /* the values themselves */
GC XCreateGC (
register Display *dpy,
Drawable d, /* Window or Pixmap for which depth matches */
unsigned long valuemask, /* which ones to set initially */
XGCValues *values) /* the values themselves */
{
register GC gc;
register xCreateGCReq *req;
......@@ -148,10 +148,10 @@ _XGenerateGCList (
req->length += (nvalues = value - values);
/*
/*
* note: Data is a macro that uses its arguments multiple
* times, so "nvalues" is changed in a separate assignment
* statement
* statement
*/
nvalues <<= 2;
......@@ -161,11 +161,11 @@ _XGenerateGCList (
int
_XUpdateGCCache (gc, mask, attr)
register unsigned long mask;
register XGCValues *attr;
register GC gc;
{
_XUpdateGCCache (
register GC gc,
register unsigned long mask,
register XGCValues *attr)
{
register XGCValues *gv = &gc->values;
if (mask & GCFunction)
......@@ -173,7 +173,7 @@ _XUpdateGCCache (gc, mask, attr)
gv->function = attr->function;
gc->dirty |= GCFunction;
}
if (mask & GCPlaneMask)
if (gv->plane_mask != attr->plane_mask) {
gv->plane_mask = attr->plane_mask;
......@@ -209,7 +209,7 @@ _XUpdateGCCache (gc, mask, attr)
gv->cap_style = attr->cap_style;
gc->dirty |= GCCapStyle;
}
if (mask & GCJoinStyle)
if (gv->join_style != attr->join_style) {
gv->join_style = attr->join_style;
......@@ -308,13 +308,13 @@ _XUpdateGCCache (gc, mask, attr)
gc->dashes = 0;
}
return 0;
}
}
/* can only call when display is already locked. */
void _XFlushGCCache(dpy, gc)
Display *dpy;
GC gc;
void _XFlushGCCache(
Display *dpy,
GC gc)
{
register xChangeGCReq *req;
register _XExtension *ext;
......@@ -331,13 +331,15 @@ void _XFlushGCCache(dpy, gc)
}
}
void XFlushGC(dpy, gc)
Display *dpy;
GC gc;
void
XFlushGC(
Display *dpy,
GC gc)
{
FlushGC(dpy, gc);
}
GContext XGContextFromGC(gc)
GC gc;
{ return (gc->gid); }
GContext XGContextFromGC(GC gc)
{
return (gc->gid);
}
nx-X11/lib/X11/CrGlCur.c
View file @ 051d521f
......@@ -44,14 +44,18 @@ in this Software without prior written authorization from The Open Group.
#endif
#include "Cr.h"
#ifdef __CYGWIN__
#define LIBXCURSOR "cygXcursor-1.dll"
#endif
#if defined(hpux)
typedef shl_dt XModuleType;
typedef shl_t XModuleType;
#else
typedef void *XModuleType;
#endif
#ifndef LIBXCURSOR
#define LIBXCURSOR "libXcursor.so"
#define LIBXCURSOR "libXcursor.so.1"
#endif
static char libraryName[] = LIBXCURSOR;
......@@ -76,18 +80,18 @@ open_library (void)
break;
*dot = '\0';
}
return 0;
return NULL;
}
static void *
fetch_symbol (XModuleType module, char *under_symbol)
fetch_symbol (XModuleType module, const char *under_symbol)
{
void *result = NULL;
char *symbol = under_symbol + 1;
const char *symbol = under_symbol + 1;
#if defined(hpux)
int getsyms_cnt, i;
struct shl_symbol *symbols;
getsyms_cnt = shl_getsymbols(module, TYPE_PROCEDURE,
EXPORT_SYMBOLS, malloc, &symbols);
......@@ -218,20 +222,20 @@ _XTryShapeBitmapCursor (Display *dpy,
}
#endif
Cursor XCreateGlyphCursor(dpy, source_font, mask_font,
source_char, mask_char,
foreground, background)
register Display *dpy;
Font source_font, mask_font;
unsigned int source_char, mask_char;
XColor _Xconst *foreground, *background;
{
Cursor XCreateGlyphCursor(
register Display *dpy,
Font source_font,
Font mask_font,
unsigned int source_char,
unsigned int mask_char,
XColor _Xconst *foreground,
XColor _Xconst *background)
{
Cursor cid;
register xCreateGlyphCursorReq *req;
#ifdef USE_DYNAMIC_XCURSOR
cid = _XTryShapeCursor (dpy, source_font, mask_font,
cid = _XTryShapeCursor (dpy, source_font, mask_font,
source_char, mask_char, foreground, background);
if (cid)
return cid;
......
nx-X11/lib/X11/CrPFBData.c
View file @ 051d521f
......@@ -33,7 +33,7 @@ in this Software without prior written authorization from The Open Group.
/*
* XCreatePixmapFromBitmapData: Routine to make a pixmap from user supplied bitmap data.
* D is any drawable on the same screen that the pixmap will be used in.
* Data is a pointer to the bit data, and
* Data is a pointer to the bit data, and
* width & height give the size in bits of the pixmap.
* Fg and Bg are the pixel values to use for the two colors.
* Depth is the depth of the pixmap to create.
......@@ -47,14 +47,16 @@ in this Software without prior written authorization from The Open Group.
* bitmap_unit=8
* xoffset=0
* no extra bytes per line
*/
Pixmap XCreatePixmapFromBitmapData(display,d,data,width,height,fg,bg,depth)
Display *display;
Drawable d;
char *data;
unsigned int width, height;
unsigned long fg, bg;
unsigned int depth;
*/
Pixmap XCreatePixmapFromBitmapData(
Display *display,
Drawable d,
char *data,
unsigned int width,
unsigned int height,
unsigned long fg,
unsigned long bg,
unsigned int depth)
{
XImage ximage;
GC gc;
......
nx-X11/lib/X11/CrPixmap.c
View file @ 051d521f
......@@ -23,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$ */
#ifdef HAVE_CONFIG_H
#include <config.h>
......@@ -38,10 +37,12 @@ _XNoticeCreateBitmap (Display *dpy,
unsigned int height);
#endif
Pixmap XCreatePixmap (dpy, d, width, height, depth)
register Display *dpy;
Drawable d;
unsigned int width, height, depth;
Pixmap XCreatePixmap (
register Display *dpy,
Drawable d,
unsigned int width,
unsigned int height,
unsigned int depth)
{
Pixmap pid;
register xCreatePixmapReq *req;
......
nx-X11/lib/X11/CrWindow.c
View file @ 051d521f
......@@ -29,14 +29,16 @@ in this Software without prior written authorization from The Open Group.
#endif
#include "Xlibint.h"
Window XCreateSimpleWindow(dpy, parent, x, y, width, height,
borderWidth, border, background)
register Display *dpy;
Window parent;
int x, y;
unsigned int width, height, borderWidth;
unsigned long border;
unsigned long background;
Window XCreateSimpleWindow(
register Display *dpy,
Window parent,
int x,
int y,
unsigned int width,
unsigned int height,
unsigned int borderWidth,
unsigned long border,
unsigned long background)
{
Window wid;
register xCreateWindowReq *req;
......
nx-X11/lib/X11/Cursor.c
View file @ 051d521f
......@@ -31,11 +31,11 @@ in this Software without prior written authorization from The Open Group.
static XColor _Xconst foreground = { 0, 0, 0, 0 }; /* black */
static XColor _Xconst background = { 0, 65535, 65535, 65535 }; /* white */
Cursor XCreateFontCursor(dpy, which)
Display *dpy;
unsigned int which;
Cursor XCreateFontCursor(
Display *dpy,
unsigned int which)
{
/*
/*
* the cursor font contains the shape glyph followed by the mask
* glyph; so character position 0 contains a shape, 1 the mask for 0,
* 2 a shape, etc. <X11/cursorfont.h> contains hash define names
......@@ -47,7 +47,7 @@ Cursor XCreateFontCursor(dpy, which)
if (dpy->cursor_font == None) return None;
}
return XCreateGlyphCursor (dpy, dpy->cursor_font, dpy->cursor_font,
return XCreateGlyphCursor (dpy, dpy->cursor_font, dpy->cursor_font,
which, which + 1, &foreground, &background);
}
nx-X11/lib/X11/CvColW.c
View file @ 051d521f
......@@ -2,7 +2,7 @@
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
* All Rights Reserved
*
*
* This file is a component of an X Window System-specific implementation
* of Xcms based on the TekColor Color Management System. Permission is
* hereby granted to use, copy, modify, sell, and otherwise distribute this
......@@ -10,10 +10,10 @@
* that this copyright, permission, and disclaimer notice is reproduced in
* all copies of this software and in supporting documentation. TekColor
* is a trademark of Tektronix, Inc.
*
*
* Tektronix makes no representation about the suitability of this software
* for any purpose. It is provided "as is" and with all faults.
*
*
* TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
* INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
* PARTICULAR PURPOSE. IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
......
nx-X11/lib/X11/CvCols.c
View file @ 051d521f
......@@ -2,7 +2,7 @@
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
* All Rights Reserved
*
*
* This file is a component of an X Window System-specific implementation
* of Xcms based on the TekColor Color Management System. Permission is
* hereby granted to use, copy, modify, sell, and otherwise distribute this
......@@ -10,10 +10,10 @@
* that this copyright, permission, and disclaimer notice is reproduced in
* all copies of this software and in supporting documentation. TekColor
* is a trademark of Tektronix, Inc.
*
*
* Tektronix makes no representation about the suitability of this software
* for any purpose. It is provided "as is" and with all faults.
*
*
* TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
* INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
* PARTICULAR PURPOSE. IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY
......@@ -237,7 +237,7 @@ ConvertMixedColors(
* batches:
* DI to DD
* DD to DI(not CIEXYZ)
*
*
* format_flag:
* 0x01 : convert Device-Dependent only specifications to the
* target format.
......@@ -419,7 +419,7 @@ _XcmsDIConvertColors(
* 3. The calling routine may want to convert only between
* CIExyY <-> CIEXYZ <-> CIEuvY
* therefore, this routine allows pWhitePt to equal NULL.
*
*
*
* RETURNS
* XcmsFailure if failed,
......@@ -505,7 +505,7 @@ Continue:
* complementary, i.e.,
* for an i, 0 <= i < n elements
* from_CIEXYZ[i] is not the inverse of to_CIEXYZ[i]
*
*
* Execute the functions all the way to CIEXYZ
*/
while (*src_to_CIEXYZ) {
......@@ -601,7 +601,7 @@ _XcmsDDConvertColors(
/*
* Its ok if pColors_in_out->format == XcmsCIEXYZFormat
* or
* or
* if newFormat == XcmsCIEXYZFormat
*/
if ( !( ValidDDColorSpaceID(ccc, pColors_in_out->format)
......@@ -668,7 +668,7 @@ Continue:
* complementary, i.e.,
* for an i, 0 <= i < n elements
* from_CIEXYZ[i] is not the inverse of to_CIEXYZ[i]
*
*
* Execute the functions all the way to CIEXYZ
*/
while (*src_to_CIEXYZ) {
......@@ -712,12 +712,12 @@ Continue:
* SYNOPSIS
*/
Status
XcmsConvertColors(ccc, pColors_in_out, nColors, targetFormat, pCompressed)
XcmsCCC ccc;
XcmsColor *pColors_in_out;
unsigned int nColors;
XcmsColorFormat targetFormat;
Bool *pCompressed;
XcmsConvertColors(
XcmsCCC ccc,
XcmsColor *pColors_in_out,
unsigned int nColors,
XcmsColorFormat targetFormat,
Bool *pCompressed)
/*
* DESCRIPTION
* Convert XcmsColor structures to another format
......
nx-X11/lib/X11/DefCursor.c
View file @ 051d521f
......@@ -30,10 +30,10 @@ in this Software without prior written authorization from The Open Group.
#include "Xlibint.h"
int
XDefineCursor (dpy, w, cursor)
register Display *dpy;
Window w;
Cursor cursor;
XDefineCursor (
register Display *dpy,
Window w,
Cursor cursor)
{
register xChangeWindowAttributesReq *req;
......
nx-X11/lib/X11/DelProp.c
View file @ 051d521f
......@@ -30,10 +30,10 @@ in this Software without prior written authorization from The Open Group.
#include "Xlibint.h"
int
XDeleteProperty(dpy, window, property)
register Display *dpy;
Window window;
Atom property;
XDeleteProperty(
register Display *dpy,
Window window,
Atom property)
{
register xDeletePropertyReq *req;
......
nx-X11/lib/X11/Depths.c
View file @ 051d521f
......@@ -33,10 +33,10 @@ in this Software without prior written authorization from The Open Group.
/*
* XListDepths - return info from connection setup
*/
int *XListDepths (dpy, scrnum, countp)
Display *dpy;
int scrnum;
int *countp;
int *XListDepths (
Display *dpy,
int scrnum,
int *countp)
{
Screen *scr;
int count;
......@@ -51,7 +51,7 @@ int *XListDepths (dpy, scrnum, countp)
depths = (int *) Xmalloc (count * sizeof(int));
if (!depths) return NULL;
for (i = 0, dp = scr->depths; i < count; i++, dp++)
for (i = 0, dp = scr->depths; i < count; i++, dp++)
depths[i] = dp->depth;
} else {
/* a screen must have a depth */
......
nx-X11/lib/X11/DestSubs.c
View file @ 051d521f
......@@ -30,9 +30,9 @@ in this Software without prior written authorization from The Open Group.
#include "Xlibint.h"
int
XDestroySubwindows(dpy, win)
register Display *dpy;
Window win;
XDestroySubwindows(
register Display *dpy,
Window win)
{
register xResourceReq *req;
......
nx-X11/lib/X11/DestWind.c
View file @ 051d521f
......@@ -30,9 +30,9 @@ in this Software without prior written authorization from The Open Group.
#include "Xlibint.h"
int
XDestroyWindow (dpy, w)
register Display *dpy;
Window w;
XDestroyWindow (
register Display *dpy,
Window w)
{
register xResourceReq *req;
......
nx-X11/lib/X11/DisName.c
View file @ 051d521f
......@@ -26,17 +26,16 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
/* $XFree86$ */
/* XDisplayName.c */
/*
/*
* Returns the name of the display XOpenDisplay would use. This is better
* than just printing the "display" variable in a program because that
* could be NULL and/or there could be an environment variable set.
* This makes it easier for programmers to provide meaningful error
* messages.
* messages.
*
*
*
* For example, this is used in XOpenDisplay() as
* strncpy( displaybuf, XDisplayName( display ), sizeof(displaybuf) );
* if ( *displaybuf == '\0' ) return( NULL );
......
nx-X11/lib/X11/DrArc.c
View file @ 051d521f
......@@ -29,20 +29,23 @@ in this Software without prior written authorization from The Open Group.
We don't do this because X_PolyArc applies the GC's join-style if
the last point in one arc coincides with the first point in another.
The client wouldn't expect this and would have no easy way to defeat it. */
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "Xlibint.h"
int
XDrawArc(dpy, d, gc, x, y, width, height, angle1, angle2)
register Display *dpy;
Drawable d;
GC gc;
int x, y; /* INT16 */
unsigned int width, height; /* CARD16 */
int angle1, angle2; /* INT16 */
XDrawArc(
register Display *dpy,
Drawable d,
GC gc,
int x,
int y, /* INT16 */
unsigned int width,
unsigned int height, /* CARD16 */
int angle1,
int angle2) /* INT16 */
{
register xPolyArcReq *req;
register xArc *arc;
......
nx-X11/lib/X11/DrArcs.c
View file @ 051d521f
......@@ -32,12 +32,12 @@ in this Software without prior written authorization from The Open Group.
#define arc_scale (SIZEOF(xArc) / 4)
int
XDrawArcs(dpy, d, gc, arcs, n_arcs)
register Display *dpy;
Drawable d;
GC gc;
XArc *arcs;
int n_arcs;
XDrawArcs(
register Display *dpy,
Drawable d,
GC gc,
XArc *arcs,
int n_arcs)
{
register xPolyArcReq *req;
register long len;
......
nx-X11/lib/X11/DrLine.c
View file @ 051d521f
......@@ -35,11 +35,14 @@ in this Software without prior written authorization from The Open Group.
#define zsize (SIZEOF(xPolySegmentReq) + ZLNSPERBATCH * SIZEOF(xSegment))
int
XDrawLine (dpy, d, gc, x1, y1, x2, y2)
register Display *dpy;
Drawable d;
GC gc;
int x1, y1, x2, y2;
XDrawLine (
register Display *dpy,
Drawable d,
GC gc,
int x1,
int y1,
int x2,
int y2)
{
register xSegment *segment;
......
nx-X11/lib/X11/DrLines.c
View file @ 051d521f
......@@ -30,13 +30,13 @@ in this Software without prior written authorization from The Open Group.
#include "Xlibint.h"
int
XDrawLines (dpy, d, gc, points, npoints, mode)
register Display *dpy;
Drawable d;
GC gc;
XPoint *points;
int npoints;
int mode;
XDrawLines (
register Display *dpy,
Drawable d,
GC gc,
XPoint *points,
int npoints,
int mode)
{
register xPolyLineReq *req;
register long length;
......
nx-X11/lib/X11/DrPoint.c
View file @ 051d521f
......@@ -34,11 +34,12 @@ in this Software without prior written authorization from The Open Group.
#define size (SIZEOF(xPolyPointReq) + PTSPERBATCH * SIZEOF(xPoint))
int
XDrawPoint(dpy, d, gc, x, y)
register Display *dpy;
Drawable d;
GC gc;
int x, y; /* INT16 */
XDrawPoint(
register Display *dpy,
Drawable d,
GC gc,
int x,
int y) /* INT16 */
{
xPoint *point;
......
nx-X11/lib/X11/DrPoints.c
View file @ 051d521f
......@@ -30,13 +30,13 @@ in this Software without prior written authorization from The Open Group.
#include "Xlibint.h"
int
XDrawPoints(dpy, d, gc, points, n_points, mode)
register Display *dpy;
Drawable d;
GC gc;
XPoint *points;
int n_points;
int mode; /* CoordMode */
XDrawPoints(
register Display *dpy,
Drawable d,
GC gc,
XPoint *points,
int n_points,
int mode) /* CoordMode */
{
register xPolyPointReq *req;
register long nbytes;
......
nx-X11/lib/X11/DrRect.c
View file @ 051d521f
......@@ -35,12 +35,14 @@ in this Software without prior written authorization from The Open Group.
#define zsize (SIZEOF(xPolyRectangleReq) + ZRCTSPERBATCH * SIZEOF(xRectangle))
int
XDrawRectangle(dpy, d, gc, x, y, width, height)
register Display *dpy;
Drawable d;
GC gc;
int x, y; /* INT16 */
unsigned int width, height; /* CARD16 */
XDrawRectangle(
register Display *dpy,
Drawable d,
GC gc,
int x,
int y, /* INT16 */
unsigned int width,
unsigned int height) /* CARD16 */
{
xRectangle *rect;
......
nx-X11/lib/X11/DrRects.c
View file @ 051d521f
......@@ -30,12 +30,12 @@ in this Software without prior written authorization from The Open Group.
#include "Xlibint.h"
int
XDrawRectangles(dpy, d, gc, rects, n_rects)
register Display *dpy;
Drawable d;
GC gc;
XRectangle *rects;
int n_rects;
XDrawRectangles(
register Display *dpy,
Drawable d,
GC gc,
XRectangle *rects,
int n_rects)
{
register xPolyRectangleReq *req;
long len;
......
nx-X11/lib/X11/DrSegs.c
View file @ 051d521f
......@@ -30,12 +30,12 @@ in this Software without prior written authorization from The Open Group.
#include "Xlibint.h"
int
XDrawSegments (dpy, d, gc, segments, nsegments)
register Display *dpy;
Drawable d;
GC gc;
XSegment *segments;
int nsegments;
XDrawSegments (
register Display *dpy,
Drawable d,
GC gc,
XSegment *segments,
int nsegments)
{
register xPolySegmentReq *req;
long len;
......
nx-X11/lib/X11/ErrDes.c
View file @ 051d521f
/*
* $Xorg: ErrDes.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $
* $XdotOrg: xc/lib/X11/ErrDes.c,v 1.8 2005/08/26 05:16:46 daniels Exp $
*/
/***********************************************************
......@@ -32,13 +30,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
......@@ -70,34 +68,40 @@ SOFTWARE.
* descriptions of errors in Section 4 of Protocol doc (pp. 350-351); more
* verbose descriptions are given in the error database
*/
static const char * const _XErrorList[] = {
/* No error */ "no error",
/* BadRequest */ "BadRequest",
/* BadValue */ "BadValue",
/* BadWindow */ "BadWindow",
/* BadPixmap */ "BadPixmap",
/* BadAtom */ "BadAtom",
/* BadCursor */ "BadCursor",
/* BadFont */ "BadFont",
/* BadMatch */ "BadMatch",
/* BadDrawable */ "BadDrawable",
/* BadAccess */ "BadAccess",
/* BadAlloc */ "BadAlloc",
/* BadColor */ "BadColor",
/* BadGC */ "BadGC",
/* BadIDChoice */ "BadIDChoice",
/* BadName */ "BadName",
/* BadLength */ "BadLength",
/* BadImplementation */ "BadImplementation",
static const char _XErrorList[] =
/* No error */ "no error\0"
/* BadRequest */ "BadRequest\0"
/* BadValue */ "BadValue\0"
/* BadWindow */ "BadWindow\0"
/* BadPixmap */ "BadPixmap\0"
/* BadAtom */ "BadAtom\0"
/* BadCursor */ "BadCursor\0"
/* BadFont */ "BadFont\0"
/* BadMatch */ "BadMatch\0"
/* BadDrawable */ "BadDrawable\0"
/* BadAccess */ "BadAccess\0"
/* BadAlloc */ "BadAlloc\0"
/* BadColor */ "BadColor\0"
/* BadGC */ "BadGC\0"
/* BadIDChoice */ "BadIDChoice\0"
/* BadName */ "BadName\0"
/* BadLength */ "BadLength\0"
/* BadImplementation */ "BadImplementation"
;
/* offsets into _XErrorList */
static const unsigned char _XErrorOffsets[] = {
0, 9, 20, 29, 39, 49, 57, 67, 75, 84, 96,
106, 115, 124, 130, 142, 150, 160
};
int
XGetErrorText(dpy, code, buffer, nbytes)
register int code;
register Display *dpy;
char *buffer;
int nbytes;
XGetErrorText(
register Display *dpy,
register int code,
char *buffer,
int nbytes)
{
char buf[150];
register _XExtension *ext;
......@@ -106,7 +110,8 @@ XGetErrorText(dpy, code, buffer, nbytes)
if (nbytes == 0) return 0;
if (code <= BadImplementation && code > 0) {
sprintf(buf, "%d", code);
(void) XGetErrorDatabaseText(dpy, "XProtoError", buf, _XErrorList[code],
(void) XGetErrorDatabaseText(dpy, "XProtoError", buf,
_XErrorList + _XErrorOffsets[code],
buffer, nbytes);
} else
buffer[0] = '\0';
......@@ -115,10 +120,10 @@ XGetErrorText(dpy, code, buffer, nbytes)
if (ext->error_string)
(*ext->error_string)(dpy, code, &ext->codes, buffer, nbytes);
if (ext->codes.first_error &&
ext->codes.first_error < code &&
ext->codes.first_error <= code &&
(!bext || ext->codes.first_error > bext->codes.first_error))
bext = ext;
}
}
if (!buffer[0] && bext) {
sprintf(buf, "%s.%d", bext->name, code - bext->codes.first_error);
(void) XGetErrorDatabaseText(dpy, "XProtoError", buf, "", buffer, nbytes);
......@@ -186,7 +191,7 @@ XGetErrorDatabaseText(
tptr = Xmalloc (tlen);
if (tptr) {
sprintf(tptr, "%s.%s", name, type);
XrmGetResource(db, tptr, "ErrorType.ErrorNumber",
XrmGetResource(db, tptr, "ErrorType.ErrorNumber",
&type_str, &result);
if (tptr != temp)
Xfree (tptr);
......
nx-X11/lib/X11/EvToWire.c
View file @ 051d521f
......@@ -38,13 +38,15 @@ from The Open Group.
#include "Xlibint.h"
/*
* reformat a wire event into an XEvent structure of the right type.
* Reformat an XEvent structure to a wire event of the right type.
* Return True on success. If the type is unrecognized, return what
* _XUnknownNativeEvent returns (i.e., False).
*/
Status
_XEventToWire(
register Display *dpy, /* pointer to display structure */
register XEvent *re, /* pointer to where event should be reformatted */
register xEvent *event) /* wire protocol event */
register Display *dpy,
register XEvent *re, /* in: from */
register xEvent *event) /* out: to */
{
switch (event->u.u.type = re->type) {
case KeyPress:
......@@ -351,12 +353,12 @@ register xEvent *event) /* wire protocol event */
case ClientMessage:
{
register int i;
register XClientMessageEvent *ev
register XClientMessageEvent *ev
= (XClientMessageEvent *) re;
event->u.clientMessage.window = ev->window;
event->u.u.detail = ev->format;
switch (ev->format) {
case 8:
case 8:
event->u.clientMessage.u.b.type = ev->message_type;
for (i = 0; i < 20; i++)
event->u.clientMessage.u.b.bytes[i] = ev->data.b[i];
......@@ -396,7 +398,7 @@ register xEvent *event) /* wire protocol event */
event->u.mappingNotify.count = ev->count;
}
break;
default:
return(_XUnknownNativeEvent(dpy, re, event));
}
......
nx-X11/lib/X11/FSSaver.c
View file @ 051d521f
......@@ -30,28 +30,23 @@ in this Software without prior written authorization from The Open Group.
#include "Xlibint.h"
int
XActivateScreenSaver(dpy)
register Display *dpy;
XActivateScreenSaver(register Display *dpy)
{
XForceScreenSaver (dpy, ScreenSaverActive);
return 1;
}
int
XResetScreenSaver(dpy)
register Display *dpy;
XResetScreenSaver(register Display *dpy)
{
XForceScreenSaver (dpy, ScreenSaverReset);
return 1;
}
int
XForceScreenSaver(dpy, mode)
register Display *dpy;
int mode;
XForceScreenSaver(
register Display *dpy,
int mode)
{
register xForceScreenSaverReq *req;
......
nx-X11/lib/X11/FSWrap.c
View file @ 051d521f
......@@ -17,15 +17,15 @@
* OPEN SOFTWARE FOUNDATION DISCLAIMS ALL WARRANTIES WITH REGARD TO
* THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS, IN NO EVENT SHALL OPEN SOFTWARE FOUNDATIONN BE
* LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* M. Collins OSF
*
* M. Collins OSF
*
* Katsuhisa Yano TOSHIBA Corp.
*/
*/
/*
......@@ -179,13 +179,13 @@ XCreateFontSet (
om = XOpenOM(dpy, NULL, NULL, NULL);
if (om == NULL)
return (XFontSet) NULL;
if ((oc = XCreateOC(om, XNBaseFontName, base_font_name_list, NULL))) {
list = &oc->core.missing_list;
oc->core.om_automatic = True;
} else
list = &om->core.required_charset;
*missing_charset_list = copy_string_list(list->charset_list,
list->charset_count);
*missing_charset_count = list->charset_count;
......@@ -198,7 +198,7 @@ XCreateFontSet (
if (!*def_string)
*def_string = "";
}
if (oc == NULL)
XCloseOM(om);
......@@ -206,10 +206,10 @@ XCreateFontSet (
}
int
XFontsOfFontSet(font_set, font_struct_list, font_name_list)
XFontSet font_set;
XFontStruct ***font_struct_list;
char ***font_name_list;
XFontsOfFontSet(
XFontSet font_set,
XFontStruct ***font_struct_list,
char ***font_name_list)
{
*font_name_list = font_set->core.font_info.font_name_list;
*font_struct_list = font_set->core.font_info.font_struct_list;
......@@ -217,50 +217,47 @@ XFontsOfFontSet(font_set, font_struct_list, font_name_list)
}
char *
XBaseFontNameListOfFontSet(font_set)
XFontSet font_set;
XBaseFontNameListOfFontSet(XFontSet font_set)
{
return font_set->core.base_name_list;
}
char *
XLocaleOfFontSet(font_set)
XFontSet font_set;
XLocaleOfFontSet(XFontSet font_set)
{
return font_set->core.om->core.lcd->core->name;
}
extern Bool XContextDependentDrawing(font_set)
XFontSet font_set;
Bool
XContextDependentDrawing(XFontSet font_set)
{
return font_set->core.om->core.context_dependent;
}
Bool
XDirectionalDependentDrawing(font_set)
XFontSet font_set;
XDirectionalDependentDrawing(XFontSet font_set)
{
return font_set->core.om->core.directional_dependent;
}
Bool
XContextualDrawing(font_set)
XFontSet font_set;
XContextualDrawing(XFontSet font_set)
{
return font_set->core.om->core.contextual_drawing;
}
XFontSetExtents *
XExtentsOfFontSet(font_set)
XFontSet font_set;
XExtentsOfFontSet(XFontSet font_set)
{
if (!font_set)
return NULL;
return &font_set->core.font_set_extents;
}
void
XFreeFontSet(dpy, font_set)
Display *dpy;
XFontSet font_set;
XFreeFontSet(
Display *dpy,
XFontSet font_set)
{
XCloseOM(font_set->core.om);
}
nx-X11/lib/X11/FetchName.c
View file @ 051d521f
......@@ -33,17 +33,17 @@ in this Software without prior written authorization from The Open Group.
#include <stdio.h>
Status XFetchName (dpy, w, name)
register Display *dpy;
Window w;
char **name;
Status XFetchName (
register Display *dpy,
Window w,
char **name)
{
Atom actual_type;
int actual_format;
unsigned long nitems;
unsigned long leftover;
unsigned char *data = NULL;
if (XGetWindowProperty(dpy, w, XA_WM_NAME, 0L, (long)BUFSIZ, False, XA_STRING,
if (XGetWindowProperty(dpy, w, XA_WM_NAME, 0L, (long)BUFSIZ, False, XA_STRING,
&actual_type,
&actual_format, &nitems, &leftover, &data) != Success) {
*name = NULL;
......@@ -63,10 +63,10 @@ Status XFetchName (dpy, w, name)
return(0);
}
Status XGetIconName (dpy, w, icon_name)
register Display *dpy;
Window w;
char **icon_name;
Status XGetIconName (
register Display *dpy,
Window w,
char **icon_name)
{
Atom actual_type;
int actual_format;
......@@ -74,7 +74,7 @@ Status XGetIconName (dpy, w, icon_name)
unsigned long leftover;
unsigned char *data = NULL;
if (XGetWindowProperty(dpy, w, XA_WM_ICON_NAME, 0L, (long)BUFSIZ, False,
XA_STRING,
XA_STRING,
&actual_type,
&actual_format, &nitems, &leftover, &data) != Success) {
*icon_name = NULL;
......
nx-X11/lib/X11/FillArc.c
View file @ 051d521f
......@@ -34,13 +34,16 @@ in this Software without prior written authorization from The Open Group.
#define size (SIZEOF(xPolyFillArcReq) + FARCSPERBATCH * SIZEOF(xArc))
int
XFillArc(dpy, d, gc, x, y, width, height, angle1, angle2)
register Display *dpy;
Drawable d;
GC gc;
int x, y; /* INT16 */
unsigned int width, height; /* CARD16 */
int angle1, angle2; /* INT16 */
XFillArc(
register Display *dpy,
Drawable d,
GC gc,
int x,
int y, /* INT16 */
unsigned int width,
unsigned int height, /* CARD16 */
int angle1,
int angle2) /* INT16 */
{
xArc *arc;
......
nx-X11/lib/X11/FillArcs.c
View file @ 051d521f
......@@ -32,12 +32,12 @@ in this Software without prior written authorization from The Open Group.
#define arc_scale (SIZEOF(xArc) / 4)
int
XFillArcs(dpy, d, gc, arcs, n_arcs)
register Display *dpy;
Drawable d;
GC gc;
XArc *arcs;
int n_arcs;
XFillArcs(
register Display *dpy,
Drawable d,
GC gc,
XArc *arcs,
int n_arcs)
{
register xPolyFillArcReq *req;
long len;
......
nx-X11/lib/X11/FillPoly.c
View file @ 051d521f
......@@ -30,14 +30,14 @@ in this Software without prior written authorization from The Open Group.
#include "Xlibint.h"
int
XFillPolygon(dpy, d, gc, points, n_points, shape, mode)
register Display *dpy;
Drawable d;
GC gc;
XPoint *points;
int n_points;
int shape;
int mode;
XFillPolygon(
register Display *dpy,
Drawable d,
GC gc,
XPoint *points,
int n_points,
int shape,
int mode)
{
register xFillPolyReq *req;
register long nbytes;
......@@ -56,7 +56,7 @@ int mode;
/* shift (mult. by 4) before passing to the (possible) macro */
nbytes = n_points << 2;
Data16 (dpy, (short *) points, nbytes);
UnlockDisplay(dpy);
SyncHandle();
......
nx-X11/lib/X11/FillRct.c
View file @ 051d521f
......@@ -34,12 +34,14 @@ in this Software without prior written authorization from The Open Group.
#define size (SIZEOF(xPolyFillRectangleReq) + FRCTSPERBATCH * SIZEOF(xRectangle))
int
XFillRectangle(dpy, d, gc, x, y, width, height)
register Display *dpy;
Drawable d;
GC gc;
int x, y; /* INT16 */
unsigned int width, height; /* CARD16 */
XFillRectangle(
register Display *dpy,
Drawable d,
GC gc,
int x,
int y, /* INT16 */
unsigned int width,
unsigned int height) /* CARD16 */
{
xRectangle *rect;
......@@ -47,7 +49,7 @@ XFillRectangle(dpy, d, gc, x, y, width, height)
FlushGC(dpy, gc);
{
register xPolyFillRectangleReq *req
register xPolyFillRectangleReq *req
= (xPolyFillRectangleReq *) dpy->last_req;
/* if same as previous request, with same drawable, batch requests */
......
nx-X11/lib/X11/FillRcts.c
View file @ 051d521f
......@@ -30,12 +30,12 @@ in this Software without prior written authorization from The Open Group.
#include "Xlibint.h"
int
XFillRectangles(dpy, d, gc, rectangles, n_rects)
register Display *dpy;
Drawable d;
GC gc;
XRectangle *rectangles;
int n_rects;
XFillRectangles(
register Display *dpy,
Drawable d,
GC gc,
XRectangle *rectangles,
int n_rects)
{
register xPolyFillRectangleReq *req;
long len;
......@@ -63,4 +63,3 @@ int n_rects;
SyncHandle();
return 1;
}
nx-X11/lib/X11/FilterEv.c
View file @ 051d521f
......@@ -18,12 +18,12 @@
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
* PERFORMANCE OF THIS SOFTWARE.
*
* Author: Seiji Kuwari OMRON Corporation
* kuwa@omron.co.jp
* kuwa%omron.co.jp@uunet.uu.net
*/
*/
/*
......@@ -69,9 +69,9 @@ extern long const _Xevent_to_mask[];
* Look up if there is a specified filter for the event.
*/
Bool
XFilterEvent(ev, window)
XEvent *ev;
Window window;
XFilterEvent(
XEvent *ev,
Window window)
{
#if XLOCALE
XFilterEventList p;
......@@ -93,9 +93,9 @@ XFilterEvent(ev, window)
if (win == p->window) {
if ((mask & p->event_mask) ||
(ev->type >= p->start_type && ev->type <= p->end_type)) {
UnlockDisplay(ev->xany.display);
ret = (*(p->filter))(ev->xany.display, p->window, ev,
p->client_data);
UnlockDisplay(ev->xany.display);
return(ret);
}
}
......
nx-X11/lib/X11/Flush.c
View file @ 051d521f
......@@ -33,9 +33,8 @@ in this Software without prior written authorization from The Open Group.
/* NOTE: NOT necessary when calling any of the Xlib routines. */
int
XFlush (dpy)
register Display *dpy;
{
XFlush (register Display *dpy)
{
LockDisplay(dpy);
_XFlush (dpy);
UnlockDisplay(dpy);
......
nx-X11/lib/X11/Font.c
View file @ 051d521f
......@@ -123,9 +123,9 @@ XFontStruct *XLoadQueryFont(
return font_result;
}
XFontStruct *XQueryFont (dpy, fid)
register Display *dpy;
Font fid;
XFontStruct *XQueryFont (
register Display *dpy,
Font fid)
{
XFontStruct *font_result;
#ifdef USE_XF86BIGFONT
......@@ -147,10 +147,10 @@ XFontStruct *XQueryFont (dpy, fid)
}
int
XFreeFont(dpy, fs)
register Display *dpy;
XFontStruct *fs;
{
XFreeFont(
register Display *dpy,
XFontStruct *fs)
{
register xResourceReq *req;
register _XExtension *ext;
......@@ -177,10 +177,10 @@ XFreeFont(dpy, fs)
static XFontStruct *
_XQueryFont (dpy, fid, seq)
register Display *dpy;
Font fid;
unsigned long seq;
_XQueryFont (
register Display *dpy,
Font fid,
unsigned long seq)
{
register XFontStruct *fs;
register long nbytes;
......@@ -227,13 +227,13 @@ _XQueryFont (dpy, fid, seq)
fs->all_chars_exist = reply.allCharsExist;
fs->ascent = cvtINT16toInt (reply.fontAscent);
fs->descent = cvtINT16toInt (reply.fontDescent);
/* XXX the next two statements won't work if short isn't 16 bits */
fs->min_bounds = * (XCharStruct *) &reply.minBounds;
fs->max_bounds = * (XCharStruct *) &reply.maxBounds;
fs->n_properties = reply.nFontProps;
/*
/*
* if no properties defined for the font, then it is bad
* font, but shouldn't try to read nothing.
*/
......@@ -384,11 +384,11 @@ _XF86BigfontFreeNop (
}
static XFontStruct *
_XF86BigfontQueryFont (dpy, extcodes, fid, seq)
register Display *dpy;
XF86BigfontCodes *extcodes;
Font fid;
unsigned long seq;
_XF86BigfontQueryFont (
register Display *dpy,
XF86BigfontCodes *extcodes,
Font fid,
unsigned long seq)
{
register XFontStruct *fs;
register long nbytes;
......@@ -470,7 +470,7 @@ _XF86BigfontQueryFont (dpy, extcodes, fid, seq)
fs->max_bounds = * (XCharStruct *) &reply.maxBounds;
fs->n_properties = reply.nFontProps;
/*
/*
* if no properties defined for the font, then it is bad
* font, but shouldn't try to read nothing.
*/
......@@ -554,7 +554,7 @@ _XF86BigfontQueryFont (dpy, extcodes, fid, seq)
signature. Then we set the CAP_VerifiedLocal bit to indicate
the verification was successful. */
if ((addr = shmat(reply.shmid, 0, SHM_RDONLY)) == (char *)-1) {
if ((addr = shmat(reply.shmid, NULL, SHM_RDONLY)) == (char *)-1) {
if (extcodes->serverCapabilities & CAP_VerifiedLocal)
fprintf(stderr, "_XF86BigfontQueryFont: could not attach shm segment\n");
Xfree((char *) pData);
......@@ -606,8 +606,7 @@ _XF86BigfontQueryFont (dpy, extcodes, fid, seq)
}
void
_XF86BigfontFreeFontMetrics (fs)
XFontStruct *fs;
_XF86BigfontFreeFontMetrics (XFontStruct *fs)
{
#ifdef HAS_SHM
XExtData *pData;
......@@ -633,7 +632,7 @@ int _XF86LoadQueryLocaleFont(
Font *fidp)
{
int l;
char *charset, *p;
const char *charset, *p;
char buf[256];
XFontStruct *fs;
XLCd lcd;
......@@ -643,7 +642,7 @@ int _XF86LoadQueryLocaleFont(
l = strlen(name);
if (l < 2 || name[l - 1] != '*' || name[l - 2] != '-')
return 0;
charset = 0;
charset = NULL;
/* next three lines stolen from _XkbGetCharset() */
lcd = _XlcCurrentLC();
if ((lcd = _XlcCurrentLC()) != 0)
......
nx-X11/lib/X11/FontInfo.c
View file @ 051d521f
......@@ -44,7 +44,7 @@ _Xconst char *pattern, /* null-terminated */
int maxNames,
int *actualCount, /* RETURN */
XFontStruct **info) /* RETURN */
{
{
register long nbytes;
register int i;
register XFontStruct *fs;
......@@ -65,7 +65,7 @@ XFontStruct **info) /* RETURN */
for (i = 0; ; i++) {
if (!_XReply (dpy, (xReply *) &reply,
((SIZEOF(xListFontsWithInfoReply) -
((SIZEOF(xListFontsWithInfoReply) -
SIZEOF(xGenericReply)) >> 2), xFalse)) {
for (j=(i-1); (j >= 0); j--) {
Xfree(flist[j]);
......@@ -83,7 +83,7 @@ XFontStruct **info) /* RETURN */
size = i + reply.nReplies + 1;
if (finfo) {
XFontStruct * tmp_finfo = (XFontStruct *)
XFontStruct * tmp_finfo = (XFontStruct *)
Xrealloc ((char *) finfo,
(unsigned) (sizeof(XFontStruct) * size));
char ** tmp_flist = (char **)
......@@ -131,7 +131,7 @@ XFontStruct **info) /* RETURN */
fs->all_chars_exist = reply.allCharsExist;
fs->ascent = cvtINT16toInt (reply.fontAscent);
fs->descent = cvtINT16toInt (reply.fontDescent);
/* XXX the next two statements won't work if short isn't 16 bits */
fs->min_bounds = * (XCharStruct *) &reply.minBounds;
fs->max_bounds = * (XCharStruct *) &reply.maxBounds;
......@@ -201,10 +201,10 @@ XFontStruct **info) /* RETURN */
}
int
XFreeFontInfo (names, info, actualCount)
char **names;
XFontStruct *info;
int actualCount;
XFreeFontInfo (
char **names,
XFontStruct *info,
int actualCount)
{
register int i;
if (names) {
......
nx-X11/lib/X11/FontNames.c
View file @ 051d521f
......@@ -36,7 +36,7 @@ register Display *dpy,
_Xconst char *pattern, /* null-terminated */
int maxNames,
int *actualCount) /* RETURN */
{
{
register long nbytes;
register unsigned i;
register int length;
......@@ -98,9 +98,8 @@ int *actualCount) /* RETURN */
}
int
XFreeFontNames(list)
char **list;
{
XFreeFontNames(char **list)
{
if (list) {
if (!*(list[0]-1)) { /* from ListFontsWithInfo */
register char **names;
......
nx-X11/lib/X11/FreeCmap.c
View file @ 051d521f
......@@ -44,6 +44,9 @@ XFreeColormap(
UnlockDisplay(dpy);
SyncHandle();
#ifdef XCMS
_XcmsDeleteCmapRec(dpy, cmap);
#endif
return 1;
}
nx-X11/lib/X11/FreeCols.c
View file @ 051d521f
......@@ -30,12 +30,12 @@ in this Software without prior written authorization from The Open Group.
#include "Xlibint.h"
int
XFreeColors(dpy, cmap, pixels, npixels, planes)
register Display *dpy;
Colormap cmap;
unsigned long *pixels; /* LISTofCARD32 */
int npixels;
unsigned long planes; /* CARD32 */
XFreeColors(
register Display *dpy,
Colormap cmap,
unsigned long *pixels, /* LISTofCARD32 */
int npixels,
unsigned long planes) /* CARD32 */
{
register xFreeColorsReq *req;
register long nbytes;
......
nx-X11/lib/X11/FreeCurs.c
View file @ 051d521f
......@@ -30,9 +30,9 @@ in this Software without prior written authorization from The Open Group.
#include "Xlibint.h"
int
XFreeCursor(dpy, cursor)
register Display *dpy;
Cursor cursor;
XFreeCursor(
register Display *dpy,
Cursor cursor)
{
register xResourceReq *req;
LockDisplay(dpy);
......
nx-X11/lib/X11/FreeEData.c
View file @ 051d521f
......@@ -30,12 +30,11 @@ in this Software without prior written authorization from The Open Group.
#include "Xlibint.h"
int
_XFreeExtData (extension)
XExtData *extension;
_XFreeExtData (XExtData *extension)
{
XExtData *temp;
while (extension) {
if (extension->free_private)
if (extension->free_private)
(*extension->free_private)(extension);
else Xfree ((char *)extension->private_data);
temp = extension->next;
......
nx-X11/lib/X11/FreeEventData.c 0 → 100644
View file @ 051d521f
/*
* Copyright © 2009 Red Hat, Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
*
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "Xlibint.h"
void
XFreeEventData(Display *dpy, XGenericEventCookie *event)
{
if (_XIsEventCookie(dpy, (XEvent*)event) && event->data)
{
XFree(event->data);
event->data = NULL;
event->cookie = 0;
}
return;
}
nx-X11/lib/X11/FreeGC.c
View file @ 051d521f
......@@ -30,9 +30,9 @@ in this Software without prior written authorization from The Open Group.
#include "Xlibint.h"
int
XFreeGC (dpy, gc)
register Display *dpy;
GC gc;
XFreeGC (
register Display *dpy,
GC gc)
{
register xResourceReq *req;
register _XExtension *ext;
......@@ -47,4 +47,3 @@ XFreeGC (dpy, gc)
Xfree ((char *) gc);
return 1;
}
nx-X11/lib/X11/FreePix.c
View file @ 051d521f
......@@ -30,12 +30,11 @@ in this Software without prior written authorization from The Open Group.
#include "Xlibint.h"
int
XFreePixmap(dpy, pixmap)
register Display *dpy;
Pixmap pixmap;
{
register xResourceReq *req;
XFreePixmap(
register Display *dpy,
Pixmap pixmap)
{
register xResourceReq *req;
LockDisplay(dpy);
GetResReq(FreePixmap, pixmap, req);
UnlockDisplay(dpy);
......
nx-X11/lib/X11/lcUniConv/big5hkscs.h 0 → 100644
View file @ 051d521f
This source diff could not be displayed because it is too large. You can view the blob instead.
nx-X11/lib/X11/lcUniConv/gbk.h 0 → 100644
View file @ 051d521f
This source diff could not be displayed because it is too large. You can view the blob instead.
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