diff options
| author | marha <marha@users.sourceforge.net> | 2012-05-25 15:19:41 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-05-25 15:19:41 +0200 |
| commit | eef864d36de97903007f04fad9fa43afe297745b (patch) | |
| tree | 28dd3cae5f699b493e4d72e7e7d468a5a2cae7f4 /xorg-server/hw/xfree86/common/xf86.h | |
| parent | f543ceaca6820260f15a4eff86938214cf43c7d2 (diff) | |
| download | vcxsrv-eef864d36de97903007f04fad9fa43afe297745b.tar.gz vcxsrv-eef864d36de97903007f04fad9fa43afe297745b.tar.bz2 vcxsrv-eef864d36de97903007f04fad9fa43afe297745b.zip | |
fontconfig xserver xkeyboard-config pixman git update 2012
Diffstat (limited to 'xorg-server/hw/xfree86/common/xf86.h')
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86.h b/xorg-server/hw/xfree86/common/xf86.h index fc4c34e92..0eb000d41 100644 --- a/xorg-server/hw/xfree86/common/xf86.h +++ b/xorg-server/hw/xfree86/common/xf86.h @@ -76,8 +76,8 @@ extern _X_EXPORT Bool xf86DRI2Enabled(void); extern _X_EXPORT Bool VTSwitchEnabled; /* kbd driver */ -#define XF86SCRNINFO(p) ((ScrnInfoPtr)dixLookupPrivate(&(p)->devPrivates, \ - xf86ScreenKey)) +#define XF86SCRNINFO(p) xf86ScreenToScrn(p) + #define XF86FLIP_PIXELS() \ do { \ if (xf86GetFlipPixels()) { \ @@ -97,12 +97,12 @@ extern _X_EXPORT Bool VTSwitchEnabled; /* kbd driver */ /* PCI related */ #ifdef XSERVER_LIBPCIACCESS #include <pciaccess.h> -extern _X_EXPORT Bool pciSlotClaimed; +extern _X_EXPORT int pciSlotClaimed; extern _X_EXPORT Bool xf86CheckPciSlot(const struct pci_device *); extern _X_EXPORT int xf86ClaimPciSlot(struct pci_device *, DriverPtr drvp, int chipset, GDevPtr dev, Bool active); -extern _X_EXPORT void xf86UnclaimPciSlot(struct pci_device *); +extern _X_EXPORT void xf86UnclaimPciSlot(struct pci_device *, GDevPtr dev); extern _X_EXPORT Bool xf86ParsePciBusString(const char *busID, int *bus, int *device, int *func); extern _X_EXPORT Bool xf86ComparePciBusString(const char *busID, int bus, @@ -449,6 +449,13 @@ xf86RandRSetNewVirtualAndDimensions(ScreenPtr pScreen, extern _X_EXPORT Bool VidModeExtensionInit(ScreenPtr pScreen); +/* convert ScreenPtr to ScrnInfoPtr */ +extern _X_EXPORT ScrnInfoPtr xf86ScreenToScrn(ScreenPtr pScreen); +/* convert ScrnInfoPtr to ScreenPtr */ +extern _X_EXPORT ScreenPtr xf86ScrnToScreen(ScrnInfoPtr pScrn); + #endif /* _NO_XF86_PROTOTYPES */ +#define XF86_HAS_SCRN_CONV 1 /* define for drivers to use in api compat */ + #endif /* _XF86_H */ |