frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove declarations of symbols that are never defined. 

These symbols were removed from the X Server, or never declared.
  One symbol that may need special attention is XkbBuildCoreState(),
that doesn't have a prototype anywhere, but is called from
xkb/xkbEvents.c:XkbFilterEvents(), and also used by the macros
XkbStateFieldFromRec() and XkbGrabStateFromRec() defined in
include/xkbstr.h.
  fb/wfbrename.h also may need some cleanup, as it makes several
"renames" of non existing symbols.
This commit is contained in:
Paulo Cesar Pereira de Andrade 2008-11-30 01:33:20 -02:00
parent d6cbd4511e
commit fb22d4d928
22 changed files with 0 additions and 264 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fb/fb.h
View File

@ -1675,19 +1675,6 @@ fbPushFill (DrawablePtr pDrawable,
int width, int width,
int height); int height);
void
fbPush1toN (DrawablePtr pSrcDrawable,
DrawablePtr pDstDrawable,
GCPtr pGC,
BoxPtr pbox,
int nbox,
int dx,
int dy,
Bool reverse,
Bool upsidedown,
Pixel bitplane,
void *closure);
void void
fbPushImage (DrawablePtr pDrawable, fbPushImage (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
@ -1789,9 +1776,6 @@ fbScreenInit(ScreenPtr pScreen,
int width, int width,
int bpp); int bpp);
void
fbInitializeBackingStore (ScreenPtr pScreen);
/* /*
* fbseg.c * fbseg.c
*/ */

8
fb/fbscreen.c
View File

@ -241,14 +241,6 @@ fbFinishScreenInit(ScreenPtr pScreen,
pScreen->ModifyPixmapHeader = fb24_32ModifyPixmapHeader; pScreen->ModifyPixmapHeader = fb24_32ModifyPixmapHeader;
pScreen->CreateScreenResources = fb24_32CreateScreenResources; pScreen->CreateScreenResources = fb24_32CreateScreenResources;
} }
#endif
#if 0
/* leave backing store initialization to the enclosing code so
* it can choose the correct order of wrappers
*/
/* init backing store here so we can overwrite CloseScreen without stepping
* on the backing store wrapped version */
fbInitializeBackingStore (pScreen);
#endif #endif
return TRUE; return TRUE;
} }

4
hw/xfree86/common/xf86.h
View File

@ -64,7 +64,6 @@ extern DevPrivateKey xf86CreateRootWindowKey;
extern DevPrivateKey xf86PixmapKey; extern DevPrivateKey xf86PixmapKey;
extern ScrnInfoPtr *xf86Screens; /* List of pointers to ScrnInfoRecs */ extern ScrnInfoPtr *xf86Screens; /* List of pointers to ScrnInfoRecs */
extern const unsigned char byte_reversed[256]; extern const unsigned char byte_reversed[256];
extern ScrnInfoPtr xf86CurrentScreen;
extern Bool pciSlotClaimed; extern Bool pciSlotClaimed;
extern Bool fbSlotClaimed; extern Bool fbSlotClaimed;
#if defined(__sparc__) || defined(__sparc) #if defined(__sparc__) || defined(__sparc)
@ -130,7 +129,6 @@ Bool xf86CheckPciMemBase(struct pci_device * pPci, memType base);
void xf86SetAccessFuncs(EntityInfoPtr pEnt, xf86SetAccessFuncPtr funcs, void xf86SetAccessFuncs(EntityInfoPtr pEnt, xf86SetAccessFuncPtr funcs,
xf86SetAccessFuncPtr oldFuncs); xf86SetAccessFuncPtr oldFuncs);
Bool xf86IsEntityPrimary(int entityIndex); Bool xf86IsEntityPrimary(int entityIndex);
resPtr xf86ReallocatePciResources(int entityIndex, resPtr pRes);
resPtr xf86SetOperatingState(resList list, int entityIndex, int mask); resPtr xf86SetOperatingState(resList list, int entityIndex, int mask);
void xf86EnterServerState(xf86State state); void xf86EnterServerState(xf86State state);
ScrnInfoPtr xf86FindScreenForEntity(int entityIndex); ScrnInfoPtr xf86FindScreenForEntity(int entityIndex);
@ -277,7 +275,6 @@ void xf86LoaderRefSymLists(const char **, ...);
void xf86LoaderRefSymbols(const char *, ...); void xf86LoaderRefSymbols(const char *, ...);
void xf86SetBackingStore(ScreenPtr pScreen); void xf86SetBackingStore(ScreenPtr pScreen);
void xf86SetSilkenMouse(ScreenPtr pScreen); void xf86SetSilkenMouse(ScreenPtr pScreen);
int xf86NewSerialNumber(WindowPtr p, pointer unused);
pointer xf86FindXvOptions(int scrnIndex, int adapt_index, char *port_name, pointer xf86FindXvOptions(int scrnIndex, int adapt_index, char *port_name,
char **adaptor_name, pointer *adaptor_options); char **adaptor_name, pointer *adaptor_options);
void xf86GetOS(const char **name, int *major, int *minor, int *teeny); void xf86GetOS(const char **name, int *major, int *minor, int *teeny);
@ -363,7 +360,6 @@ void xf86CollectOptions(ScrnInfoPtr pScrn, pointer extraOpts);
/* xf86RandR.c */ /* xf86RandR.c */
#ifdef RANDR #ifdef RANDR
Bool xf86RandRInit (ScreenPtr pScreen); Bool xf86RandRInit (ScreenPtr pScreen);
void xf86RandRSetInitialMode (ScreenPtr pScreen);
Rotation xf86GetRotation(ScreenPtr pScreen); Rotation xf86GetRotation(ScreenPtr pScreen);
Bool xf86RandRSetNewVirtualAndDimensions(ScreenPtr pScreen, Bool xf86RandRSetNewVirtualAndDimensions(ScreenPtr pScreen,
int newvirtX, int newvirtY, int newvirtX, int newvirtY,

3
hw/xfree86/common/xf86Module.h
View File

@ -189,9 +189,6 @@ extern ExtensionModule *ExtensionModuleList;
pointer LoadSubModule(pointer, const char *, const char **, pointer LoadSubModule(pointer, const char *, const char **,
const char **, pointer, const XF86ModReqInfo *, const char **, pointer, const XF86ModReqInfo *,
int *, int *); int *, int *);
pointer LoadSubModuleLocal(pointer, const char *, const char **,
const char **, pointer, const XF86ModReqInfo *,
int *, int *);
void UnloadSubModule(pointer); void UnloadSubModule(pointer);
void UnloadModule (pointer); void UnloadModule (pointer);
#endif #endif

11
hw/xfree86/common/xf86Priv.h
View File

@ -61,9 +61,6 @@ extern char *xf86LayoutName;
extern char *xf86ScreenName; extern char *xf86ScreenName;
extern char *xf86PointerName; extern char *xf86PointerName;
extern char *xf86KeyboardName; extern char *xf86KeyboardName;
#ifdef KEEPBPP
extern int xf86Bpp;
#endif
extern int xf86FbBpp; extern int xf86FbBpp;
extern int xf86Depth; extern int xf86Depth;
extern Pix24Flags xf86Pix24; extern Pix24Flags xf86Pix24;
@ -83,11 +80,6 @@ extern const char *xf86LogFile;
extern MessageType xf86LogFileFrom; extern MessageType xf86LogFileFrom;
extern Bool xf86LogFileWasOpened; extern Bool xf86LogFileWasOpened;
extern serverLayoutRec xf86ConfigLayout; extern serverLayoutRec xf86ConfigLayout;
extern Pix24Flags xf86ConfigPix24;
extern unsigned short xf86MouseCflags[];
extern Bool xf86SupportedMouseTypes[];
extern int xf86NumMouseTypes;
extern DriverPtr *xf86DriverList; extern DriverPtr *xf86DriverList;
extern int xf86NumDrivers; extern int xf86NumDrivers;
@ -123,13 +115,10 @@ extern RootWinPropPtr *xf86RegisteredPropertiesTable;
/* xf86Bus.c */ /* xf86Bus.c */
void xf86BusProbe(void); void xf86BusProbe(void);
void xf86ChangeBusIndex(int oldIndex, int newIndex);
void xf86AccessInit(void); void xf86AccessInit(void);
void xf86AccessEnter(void); void xf86AccessEnter(void);
void xf86AccessLeave(void); void xf86AccessLeave(void);
void xf86EntityInit(void); void xf86EntityInit(void);
void xf86EntityEnter(void);
void xf86EntityLeave(void);
void xf86AccessLeaveState(void); void xf86AccessLeaveState(void);
void xf86FindPrimaryDevice(void); void xf86FindPrimaryDevice(void);

4
hw/xfree86/common/xf86Xinput.h
View File

@ -155,7 +155,6 @@ typedef struct _DeviceAssocRec
extern InputInfoPtr xf86InputDevs; extern InputInfoPtr xf86InputDevs;
/* xf86Xinput.c */ /* xf86Xinput.c */
void InitExtInput(void);
void xf86PostMotionEvent(DeviceIntPtr device, int is_absolute, void xf86PostMotionEvent(DeviceIntPtr device, int is_absolute,
int first_valuator, int num_valuators, ...); int first_valuator, int num_valuators, ...);
void xf86PostMotionEventP(DeviceIntPtr device, int is_absolute, void xf86PostMotionEventP(DeviceIntPtr device, int is_absolute,
@ -171,8 +170,6 @@ void xf86PostKeyEvent(DeviceIntPtr device, unsigned int key_code, int is_down,
void xf86PostKeyboardEvent(DeviceIntPtr device, unsigned int key_code, void xf86PostKeyboardEvent(DeviceIntPtr device, unsigned int key_code,
int is_down); int is_down);
void xf86ActivateDevice(LocalDevicePtr local); void xf86ActivateDevice(LocalDevicePtr local);
Bool xf86CheckButton(int button, int down);
void xf86SwitchCoreDevice(LocalDevicePtr device, DeviceIntPtr core);
LocalDevicePtr xf86FirstLocalDevice(void); LocalDevicePtr xf86FirstLocalDevice(void);
int xf86ScaleAxis(int Cx, int Sxhigh, int Sxlow, int Rxhigh, int Rxlow); int xf86ScaleAxis(int Cx, int Sxhigh, int Sxlow, int Rxhigh, int Rxlow);
void xf86XInputSetScreen(LocalDevicePtr local, int screen_number, int x, int y); void xf86XInputSetScreen(LocalDevicePtr local, int screen_number, int x, int y);
@ -185,7 +182,6 @@ void xf86AddEnabledDevice(InputInfoPtr pInfo);
void xf86RemoveEnabledDevice(InputInfoPtr pInfo); void xf86RemoveEnabledDevice(InputInfoPtr pInfo);
void xf86DisableDevice(DeviceIntPtr dev, Bool panic); void xf86DisableDevice(DeviceIntPtr dev, Bool panic);
void xf86EnableDevice(DeviceIntPtr dev); void xf86EnableDevice(DeviceIntPtr dev);
int xf86NewInputDevice(IDevPtr idev, DeviceIntPtr *pdev, BOOL is_auto);
/* xf86Helper.c */ /* xf86Helper.c */
void xf86AddInputDriver(InputDriverPtr driver, pointer module, int flags); void xf86AddInputDriver(InputDriverPtr driver, pointer module, int flags);

2
hw/xfree86/dixmods/extmod/dgaproc.h
View File

@ -126,8 +126,6 @@ Bool DGAStealMotionEvent(DeviceIntPtr dev, int Index, int dx, int dy);
Bool DGAStealKeyEvent(DeviceIntPtr dev, int Index, int key_code, int is_down); Bool DGAStealKeyEvent(DeviceIntPtr dev, int Index, int key_code, int is_down);
Bool DGAIsDgaEvent (xEvent *e); Bool DGAIsDgaEvent (xEvent *e);
Bool DGADeliverEvent (ScreenPtr pScreen, xEvent *e);
Bool DGAOpenFramebuffer(int Index, char **name, unsigned char **mem, Bool DGAOpenFramebuffer(int Index, char **name, unsigned char **mem,
int *size, int *offset, int *flags); int *size, int *offset, int *flags);
void DGACloseFramebuffer(int Index); void DGACloseFramebuffer(int Index);

1
hw/xfree86/int10/xf86int10.h
View File

@ -129,7 +129,6 @@ int run_bios_int(int num, xf86Int10InfoPtr pInt);
void dump_code(xf86Int10InfoPtr pInt); void dump_code(xf86Int10InfoPtr pInt);
void dump_registers(xf86Int10InfoPtr pInt); void dump_registers(xf86Int10InfoPtr pInt);
void stack_trace(xf86Int10InfoPtr pInt); void stack_trace(xf86Int10InfoPtr pInt);
xf86Int10InfoPtr getInt10Rec(int entityIndex);
CARD8 bios_checksum(const CARD8 *start, int size); CARD8 bios_checksum(const CARD8 *start, int size);
void LockLegacyVGA(xf86Int10InfoPtr pInt, legacyVGAPtr vga); void LockLegacyVGA(xf86Int10InfoPtr pInt, legacyVGAPtr vga);
void UnlockLegacyVGA(xf86Int10InfoPtr pInt, legacyVGAPtr vga); void UnlockLegacyVGA(xf86Int10InfoPtr pInt, legacyVGAPtr vga);

4
hw/xfree86/loader/loaderProcs.h
View File

@ -82,10 +82,6 @@ ModuleDescPtr LoadModule(const char *, const char *, const char **,
ModuleDescPtr LoadSubModule(ModuleDescPtr, const char *, ModuleDescPtr LoadSubModule(ModuleDescPtr, const char *,
const char **, const char **, pointer, const char **, const char **, pointer,
const XF86ModReqInfo *, int *, int *); const XF86ModReqInfo *, int *, int *);
ModuleDescPtr LoadSubModuleLocal(ModuleDescPtr, const char *,
const char **, const char **,
pointer, const XF86ModReqInfo *,
int *, int *);
ModuleDescPtr DuplicateModule(ModuleDescPtr mod, ModuleDescPtr parent); ModuleDescPtr DuplicateModule(ModuleDescPtr mod, ModuleDescPtr parent);
void UnloadModule(ModuleDescPtr); void UnloadModule(ModuleDescPtr);
void UnloadSubModule(ModuleDescPtr); void UnloadSubModule(ModuleDescPtr);

5
hw/xfree86/os-support/xf86_OSproc.h
View File

@ -110,10 +110,6 @@
#define XF86_M_RNG 0x080 /* ring */ #define XF86_M_RNG 0x080 /* ring */
#define XF86_M_DSR 0x100 /* data set ready */ #define XF86_M_DSR 0x100 /* data set ready */
#ifdef XF86_OS_PRIVS
extern void xf86WrapperInit(void);
#endif
#ifndef NO_OSLIB_PROTOTYPES #ifndef NO_OSLIB_PROTOTYPES
/* /*
* This is to prevent re-entrancy to FatalError() when aborting. * This is to prevent re-entrancy to FatalError() when aborting.
@ -168,7 +164,6 @@ extern int xf86GetSerialModemState(int fd);
extern int xf86SerialModemSetBits(int fd, int bits); extern int xf86SerialModemSetBits(int fd, int bits);
extern int xf86SerialModemClearBits(int fd, int bits); extern int xf86SerialModemClearBits(int fd, int bits);
extern int xf86LoadKernelModule(const char *pathname); extern int xf86LoadKernelModule(const char *pathname);
extern void xf86RingBell(int volume, int pitch, int duration);
/* AGP GART interface */ /* AGP GART interface */

2
hw/xfree86/parser/xf86Optrec.h
View File

@ -100,13 +100,11 @@ XF86OptionPtr xf86newOption(char *name, char *value);
XF86OptionPtr xf86nextOption(XF86OptionPtr list); XF86OptionPtr xf86nextOption(XF86OptionPtr list);
XF86OptionPtr xf86findOption(XF86OptionPtr list, const char *name); XF86OptionPtr xf86findOption(XF86OptionPtr list, const char *name);
char *xf86findOptionValue(XF86OptionPtr list, const char *name); char *xf86findOptionValue(XF86OptionPtr list, const char *name);
int xf86findOptionBoolean (XF86OptionPtr, const char *, int);
XF86OptionPtr xf86optionListCreate(const char **options, int count, int used); XF86OptionPtr xf86optionListCreate(const char **options, int count, int used);
XF86OptionPtr xf86optionListMerge(XF86OptionPtr head, XF86OptionPtr tail); XF86OptionPtr xf86optionListMerge(XF86OptionPtr head, XF86OptionPtr tail);
char *xf86configStrdup (const char *s); char *xf86configStrdup (const char *s);
int xf86nameCompare (const char *s1, const char *s2); int xf86nameCompare (const char *s1, const char *s2);
char *xf86uLongToString(unsigned long i); char *xf86uLongToString(unsigned long i);
void xf86debugListOptions(XF86OptionPtr);
XF86OptionPtr xf86parseOption(XF86OptionPtr head); XF86OptionPtr xf86parseOption(XF86OptionPtr head);
void xf86printOptionList(FILE *fp, XF86OptionPtr list, int tabs); void xf86printOptionList(FILE *fp, XF86OptionPtr list, int tabs);

4
hw/xfree86/ramdac/TI.h
View File

@ -10,10 +10,6 @@ void TIramdacSave(ScrnInfoPtr pScrn, RamDacRecPtr RamDacRec, RamDacRegRecPtr Ram
void TIramdacRestore(ScrnInfoPtr pScrn, RamDacRecPtr RamDacRec, RamDacRegRecPtr RamDacRegRec); void TIramdacRestore(ScrnInfoPtr pScrn, RamDacRecPtr RamDacRec, RamDacRegRecPtr RamDacRegRec);
void TIramdac3026SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr RamDacRegRec); void TIramdac3026SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr RamDacRegRec);
void TIramdac3030SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr RamDacRegRec); void TIramdac3030SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr RamDacRegRec);
unsigned long TIramdac3030CalculateMNPForClock(unsigned long RefClock,
unsigned long ReqClock, char IsPixClock, unsigned long MinClock,
unsigned long MaxClock, unsigned long *rM, unsigned long *rN,
unsigned long *rP);
void TIramdacHWCursorInit(xf86CursorInfoPtr infoPtr); void TIramdacHWCursorInit(xf86CursorInfoPtr infoPtr);
void TIramdacLoadPalette( ScrnInfoPtr pScrn, int numColors, int *indices, void TIramdacLoadPalette( ScrnInfoPtr pScrn, int numColors, int *indices,
LOCO *colors, VisualPtr pVisual); LOCO *colors, VisualPtr pVisual);

2
hw/xfree86/ramdac/xf86RamDac.h
View File

@ -113,8 +113,6 @@ RamDacHelperRecPtr RamDacHelperCreateInfoRec(void);
void RamDacDestroyInfoRec(RamDacRecPtr RamDacRec); void RamDacDestroyInfoRec(RamDacRecPtr RamDacRec);
void RamDacHelperDestroyInfoRec(RamDacHelperRecPtr RamDacRec); void RamDacHelperDestroyInfoRec(RamDacHelperRecPtr RamDacRec);
Bool RamDacInit(ScrnInfoPtr pScrn, RamDacRecPtr RamDacRec); Bool RamDacInit(ScrnInfoPtr pScrn, RamDacRecPtr RamDacRec);
void RamDacSetGamma(ScrnInfoPtr pScrn, Bool Real8BitDac);
void RamDacRestoreDACValues(ScrnInfoPtr pScrn);
Bool RamDacHandleColormaps(ScreenPtr pScreen, int maxColors, int sigRGBbits, Bool RamDacHandleColormaps(ScreenPtr pScreen, int maxColors, int sigRGBbits,
unsigned int flags); unsigned int flags);
void RamDacFreeRec(ScrnInfoPtr pScrn); void RamDacFreeRec(ScrnInfoPtr pScrn);

6
hw/xfree86/vbe/vbe.h
View File

@ -307,12 +307,6 @@ typedef struct _vbeModeInfoRec {
struct _vbeModeInfoRec *next; struct _vbeModeInfoRec *next;
} vbeModeInfoRec, *vbeModeInfoPtr; } vbeModeInfoRec, *vbeModeInfoPtr;
vbeModeInfoPtr VBEBuildVbeModeList(vbeInfoPtr pVbe,
VbeInfoBlock *vbe);
unsigned short VBECalcVbeModeIndex(vbeModeInfoPtr m,
DisplayModePtr mode, int bpp);
typedef struct { typedef struct {
CARD8 *state; CARD8 *state;
CARD8 *pstate; CARD8 *pstate;

10
include/dix.h
View File

@ -169,8 +169,6 @@ extern void SendErrorToClient(
extern void MarkClientException( extern void MarkClientException(
ClientPtr /*client*/); ClientPtr /*client*/);
extern void ddxBeforeReset (void);
/* dixutils.c */ /* dixutils.c */
extern void CopyISOLatin1Lowered( extern void CopyISOLatin1Lowered(
@ -381,10 +379,6 @@ extern int DeliverDeviceEvents(
extern void DefineInitialRootWindow( extern void DefineInitialRootWindow(
WindowPtr /* win */); WindowPtr /* win */);
extern void SetupSprite(
DeviceIntPtr /* pDev */,
ScreenPtr /* pScreen */);
extern void InitializeSprite( extern void InitializeSprite(
DeviceIntPtr /* pDev */, DeviceIntPtr /* pDev */,
WindowPtr /* pWin */); WindowPtr /* pWin */);
@ -454,10 +448,6 @@ extern int GrabDevice(
Bool /* coreGrab */); Bool /* coreGrab */);
extern void InitEvents(void); extern void InitEvents(void);
extern void InitSprite(
DeviceIntPtr /* pDev */,
Bool /* hasCursor */
);
extern void CloseDownEvents(void); extern void CloseDownEvents(void);

113
include/xkbfile.h
View File

@ -76,11 +76,6 @@ typedef void (*XkbFileAddOnFunc)(
#define _XkbErrXReqFailure 25 #define _XkbErrXReqFailure 25
#define _XkbErrBadImplementation 26 #define _XkbErrBadImplementation 26
extern char * _XkbErrMessages[];
extern unsigned _XkbErrCode;
extern char * _XkbErrLocation;
extern unsigned _XkbErrData;
/***====================================================================***/ /***====================================================================***/
_XFUNCPROTOBEGIN _XFUNCPROTOBEGIN
@ -149,16 +144,6 @@ extern char * XkbIMWhichStateMaskText(
unsigned /* format */ unsigned /* format */
); );
extern char * XkbAccessXDetailText(
unsigned /* state */,
unsigned /* format */
);
extern char * XkbNKNDetailMaskText(
unsigned /* detail */,
unsigned /* format */
);
extern char * XkbControlsMaskText( extern char * XkbControlsMaskText(
unsigned /* ctrls */, unsigned /* ctrls */,
unsigned /* format */ unsigned /* format */
@ -212,14 +197,6 @@ extern int XkbFindKeycodeByName(
Bool /* use_aliases */ Bool /* use_aliases */
); );
extern Bool XkbLookupGroupAndLevel(
XkbDescPtr /* xkb */,
int /* key */,
int * /* mods_inout */,
int * /* grp_inout */,
int * /* lvl_rtrn */
);
/***====================================================================***/ /***====================================================================***/
extern Atom XkbInternAtom( extern Atom XkbInternAtom(
@ -227,8 +204,6 @@ extern Atom XkbInternAtom(
Bool /* onlyIfExists */ Bool /* onlyIfExists */
); );
extern void XkbInitAtoms(void);
/***====================================================================***/ /***====================================================================***/
#ifdef _XKBGEOM_H_ #ifdef _XKBGEOM_H_
@ -246,17 +221,6 @@ typedef struct _XkbDrawable {
struct _XkbDrawable * next; struct _XkbDrawable * next;
} XkbDrawableRec,*XkbDrawablePtr; } XkbDrawableRec,*XkbDrawablePtr;
extern XkbDrawablePtr
XkbGetOrderedDrawables(
XkbGeometryPtr /* geom */,
XkbSectionPtr /* section */
);
extern void
XkbFreeOrderedDrawables(
XkbDrawablePtr /* draw */
);
#endif #endif
/***====================================================================***/ /***====================================================================***/
@ -266,11 +230,6 @@ extern unsigned XkbConvertGetByNameComponents(
unsigned /* orig */ unsigned /* orig */
); );
extern unsigned XkbConvertXkbComponents(
Bool /* toXkm */,
unsigned /* orig */
);
extern Bool XkbNameMatchesPattern( extern Bool XkbNameMatchesPattern(
char * /* name */, char * /* name */,
char * /* pattern */ char * /* pattern */
@ -323,56 +282,6 @@ extern Bool XkbWriteXKBGeometry(
void * /* priv */ void * /* priv */
); );
extern Bool XkbWriteXKBSemantics(
FILE * /* file */,
XkbDescPtr /* result */,
Bool /* topLevel */,
Bool /* showImplicit */,
XkbFileAddOnFunc /* addOn */,
void * /* priv */
);
extern Bool XkbWriteXKBLayout(
FILE * /* file */,
XkbDescPtr /* result */,
Bool /* topLevel */,
Bool /* showImplicit */,
XkbFileAddOnFunc /* addOn */,
void * /* priv */
);
extern Bool XkbWriteXKBKeymap(
FILE * /* file */,
XkbDescPtr /* result */,
Bool /* topLevel */,
Bool /* showImplicit */,
XkbFileAddOnFunc /* addOn */,
void * /* priv */
);
extern Bool XkbWriteXKBFile(
FILE * /* file */,
XkbDescPtr /* result */,
Bool /* showImplicit */,
XkbFileAddOnFunc /* addOn */,
void * /* priv */
);
extern Bool XkbWriteCFile(
FILE * /* file */,
char * /* name */,
XkbDescPtr /* info */
);
extern Bool XkbWriteXKMFile(
FILE * /* file */,
XkbDescPtr /* result */
);
extern Bool XkbWriteToServer(
XkbDescPtr /* result */
);
extern void XkbEnsureSafeMapName( extern void XkbEnsureSafeMapName(
char * /* name */ char * /* name */
); );
@ -385,10 +294,6 @@ extern Bool XkbWriteXKBKeymapForNames(
unsigned /* need */ unsigned /* need */
); );
extern Status XkbMergeFile(
XkbDescPtr /* xkb */
);
/***====================================================================***/ /***====================================================================***/
extern Bool XkmProbe( extern Bool XkmProbe(
@ -411,24 +316,6 @@ extern Bool XkmReadTOC(
xkmSectionInfo * /* toc */ xkmSectionInfo * /* toc */
); );
extern xkmSectionInfo *XkmFindTOCEntry(
xkmFileInfo * /* finfo */,
xkmSectionInfo * /* toc */,
unsigned /* type */
);
extern Bool XkmReadFileSection(
FILE * /* file */,
xkmSectionInfo * /* toc */,
XkbDescPtr /* result */,
unsigned * /* loaded_rtrn */
);
extern char * XkmReadFileSectionName(
FILE * /* file */,
xkmSectionInfo * /* toc */
);
#endif /* _XKMFORMAT_H */ #endif /* _XKMFORMAT_H */
_XFUNCPROTOEND _XFUNCPROTOEND

28
include/xkbsrv.h
View File

@ -295,8 +295,6 @@ extern int XkbDisableLockActions;
extern int XkbKeyboardErrorCode; extern int XkbKeyboardErrorCode;
extern char * XkbBaseDirectory; extern char * XkbBaseDirectory;
extern char * XkbBinDirectory; extern char * XkbBinDirectory;
extern char * XkbInitialMap;
extern unsigned int XkbXIUnsupported;
extern Bool noXkbExtension; extern Bool noXkbExtension;
@ -484,12 +482,6 @@ extern void XkbSetActionKeyMods(
unsigned int /* mods */ unsigned int /* mods */
); );
extern Bool XkbCheckActionVMods(
XkbDescPtr /* xkb */,
XkbAction * /* act */,
unsigned int /* changed */
);
extern unsigned int XkbMaskForVMask( extern unsigned int XkbMaskForVMask(
XkbDescPtr /* xkb */, XkbDescPtr /* xkb */,
unsigned int /* vmask */ unsigned int /* vmask */
@ -705,11 +697,6 @@ extern void XkbSendNamesNotify(
xkbNamesNotify * /* ev */ xkbNamesNotify * /* ev */
); );
extern void XkbSendCompatNotify(
DeviceIntPtr /* kbd */,
xkbCompatMapNotify * /* ev */
);
extern void XkbSendActionMessage( extern void XkbSendActionMessage(
DeviceIntPtr /* kbd */, DeviceIntPtr /* kbd */,
xkbActionMessage * /* ev */ xkbActionMessage * /* ev */
@ -827,11 +814,6 @@ extern void XkbDDXUpdateDeviceIndicators(
CARD32 /* newState */ CARD32 /* newState */
); );
extern void XkbDDXFakePointerButton(
int /* event */,
int /* button */
);
extern void XkbDDXFakePointerMotion( extern void XkbDDXFakePointerMotion(
unsigned int /* flags */, unsigned int /* flags */,
int /* x */, int /* x */,
@ -1037,16 +1019,6 @@ extern Bool XkbDDXNamesFromRules(
XkbComponentNamesPtr /* names */ XkbComponentNamesPtr /* names */
); );
extern Bool XkbDDXApplyConfig(
void * /* cfg_in */,
XkbSrvInfoPtr /* xkbi */
);
extern int _XkbStrCaseCmp(
char * /* str1 */,
char * /* str2 */
);
_XFUNCPROTOEND _XFUNCPROTOEND
#define XkbAtomGetString(s) NameForAtom(s) #define XkbAtomGetString(s) NameForAtom(s)

8
mi/mipointer.h
View File

@ -110,14 +110,6 @@ extern void miPointerWarpCursor(
int /*y*/ int /*y*/
) _X_DEPRECATED; ) _X_DEPRECATED;
extern int miPointerGetMotionEvents(
DeviceIntPtr /*pPtr*/,
xTimecoord * /*coords*/,
unsigned long /*start*/,
unsigned long /*stop*/,
ScreenPtr /*pScreen*/
);
/* Deprecated in favour of miPointerSetPosition. */ /* Deprecated in favour of miPointerSetPosition. */
extern void miPointerAbsoluteCursor( extern void miPointerAbsoluteCursor(
int /*x*/, int /*x*/,

3
miext/shadow/shadow.h
View File

@ -95,9 +95,6 @@ shadowAdd (ScreenPtr pScreen,
void void
shadowRemove (ScreenPtr pScreen, PixmapPtr pPixmap); shadowRemove (ScreenPtr pScreen, PixmapPtr pPixmap);
shadowBufPtr
shadowFindBuf (WindowPtr pWindow);
Bool Bool
shadowInit (ScreenPtr pScreen, ShadowUpdateProc update, ShadowWindowProc window); shadowInit (ScreenPtr pScreen, ShadowUpdateProc update, ShadowWindowProc window);

12
randr/randrstr.h
View File

@ -409,9 +409,6 @@ miRandRInit (ScreenPtr pScreen);
Bool Bool
miRRGetInfo (ScreenPtr pScreen, Rotation *rotations); miRRGetInfo (ScreenPtr pScreen, Rotation *rotations);
Bool
miRRGetScreenInfo (ScreenPtr pScreen);
Bool Bool
miRRCrtcSet (ScreenPtr pScreen, miRRCrtcSet (ScreenPtr pScreen,
RRCrtcPtr crtc, RRCrtcPtr crtc,
@ -504,12 +501,6 @@ Bool RRScreenInit (ScreenPtr pScreen);
Rotation Rotation
RRGetRotation (ScreenPtr pScreen); RRGetRotation (ScreenPtr pScreen);
int
RRSetScreenConfig (ScreenPtr pScreen,
Rotation rotation,
int rate,
RRScreenSizePtr pSize);
#endif #endif
/* rrcrtc.c */ /* rrcrtc.c */
@ -699,9 +690,6 @@ RRModePtr
RRModeGet (xRRModeInfo *modeInfo, RRModeGet (xRRModeInfo *modeInfo,
const char *name); const char *name);
void
RRModePruneUnused (ScreenPtr pScreen);
/* /*
* Destroy a mode. * Destroy a mode.
*/ */

14
render/mipict.h
View File

@ -80,14 +80,6 @@ miChangePictureFilter (PicturePtr pPicture,
xFixed *params, xFixed *params,
int nparams); int nparams);
Bool
miClipPicture (RegionPtr pRegion,
PicturePtr pPicture,
INT16 xReg,
INT16 yReg,
INT16 xPict,
INT16 yPict);
void void
miCompositeSourceValidate (PicturePtr pPicture, miCompositeSourceValidate (PicturePtr pPicture,
INT16 x, INT16 x,
@ -169,12 +161,6 @@ miPointFixedBounds (int npoint, xPointFixed *points, BoxPtr bounds);
void void
miTriangleBounds (int ntri, xTriangle *tris, BoxPtr bounds); miTriangleBounds (int ntri, xTriangle *tris, BoxPtr bounds);
void
miRasterizeTriangle (PicturePtr pMask,
xTriangle *tri,
int x_off,
int y_off);
void void
miTriangles (CARD8 op, miTriangles (CARD8 op,
PicturePtr pSrc, PicturePtr pSrc,

4
render/picturestr.h
View File

@ -634,10 +634,6 @@ AddTraps (PicturePtr pPicture,
int ntraps, int ntraps,
xTrap *traps); xTrap *traps);
pixman_image_t *
PixmanImageFromPicture (PicturePtr pPict,
Bool hasClip);
PicturePtr PicturePtr
CreateSolidPicture (Picture pid, CreateSolidPicture (Picture pid,
xRenderColor *color, xRenderColor *color,