From 0f834b91a4768673833ab4917e87d86c237bb1a6 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 23 Mar 2012 10:05:55 +0100 Subject: libX11 xserver fontconfig mesa pixman xkbcomp xkeyboard-config git update 23 Mar 2012 --- xorg-server/hw/xfree86/common/vidmodeproc.h | 39 +++++++++++++++++------------ 1 file changed, 23 insertions(+), 16 deletions(-) (limited to 'xorg-server/hw/xfree86/common/vidmodeproc.h') diff --git a/xorg-server/hw/xfree86/common/vidmodeproc.h b/xorg-server/hw/xfree86/common/vidmodeproc.h index da4d05e1c..aa43237d4 100644 --- a/xorg-server/hw/xfree86/common/vidmodeproc.h +++ b/xorg-server/hw/xfree86/common/vidmodeproc.h @@ -8,7 +8,6 @@ #ifndef _VIDMODEPROC_H_ #define _VIDMODEPROC_H_ - typedef enum { VIDMODE_H_DISPLAY, VIDMODE_H_SYNCSTART, @@ -35,17 +34,20 @@ typedef enum { } VidModeSelectMonitor; typedef union { - pointer ptr; - int i; - float f; + pointer ptr; + int i; + float f; } vidMonitorValue; extern _X_EXPORT void XFree86VidModeExtensionInit(void); extern _X_EXPORT Bool VidModeAvailable(int scrnIndex); -extern _X_EXPORT Bool VidModeGetCurrentModeline(int scrnIndex, pointer *mode, int *dotClock); -extern _X_EXPORT Bool VidModeGetFirstModeline(int scrnIndex, pointer *mode, int *dotClock); -extern _X_EXPORT Bool VidModeGetNextModeline(int scrnIndex, pointer *mode, int *dotClock); +extern _X_EXPORT Bool VidModeGetCurrentModeline(int scrnIndex, pointer *mode, + int *dotClock); +extern _X_EXPORT Bool VidModeGetFirstModeline(int scrnIndex, pointer *mode, + int *dotClock); +extern _X_EXPORT Bool VidModeGetNextModeline(int scrnIndex, pointer *mode, + int *dotClock); extern _X_EXPORT Bool VidModeDeleteModeline(int scrnIndex, pointer mode); extern _X_EXPORT Bool VidModeZoomViewport(int scrnIndex, int zoom); extern _X_EXPORT Bool VidModeGetViewPort(int scrnIndex, int *x, int *y); @@ -55,23 +57,28 @@ extern _X_EXPORT Bool VidModeLockZoom(int scrnIndex, Bool lock); extern _X_EXPORT Bool VidModeGetMonitor(int scrnIndex, pointer *monitor); extern _X_EXPORT int VidModeGetNumOfClocks(int scrnIndex, Bool *progClock); extern _X_EXPORT Bool VidModeGetClocks(int scrnIndex, int *Clocks); -extern _X_EXPORT ModeStatus VidModeCheckModeForMonitor(int scrnIndex, pointer mode); -extern _X_EXPORT ModeStatus VidModeCheckModeForDriver(int scrnIndex, pointer mode); +extern _X_EXPORT ModeStatus VidModeCheckModeForMonitor(int scrnIndex, + pointer mode); +extern _X_EXPORT ModeStatus VidModeCheckModeForDriver(int scrnIndex, + pointer mode); extern _X_EXPORT void VidModeSetCrtcForMode(int scrnIndex, pointer mode); extern _X_EXPORT Bool VidModeAddModeline(int scrnIndex, pointer mode); extern _X_EXPORT int VidModeGetDotClock(int scrnIndex, int Clock); extern _X_EXPORT int VidModeGetNumOfModes(int scrnIndex); -extern _X_EXPORT Bool VidModeSetGamma(int scrnIndex, float red, float green, float blue); -extern _X_EXPORT Bool VidModeGetGamma(int scrnIndex, float *red, float *green, float *blue); +extern _X_EXPORT Bool VidModeSetGamma(int scrnIndex, float red, float green, + float blue); +extern _X_EXPORT Bool VidModeGetGamma(int scrnIndex, float *red, float *green, + float *blue); extern _X_EXPORT pointer VidModeCreateMode(void); extern _X_EXPORT void VidModeCopyMode(pointer modefrom, pointer modeto); extern _X_EXPORT int VidModeGetModeValue(pointer mode, int valtyp); extern _X_EXPORT void VidModeSetModeValue(pointer mode, int valtyp, int val); -extern _X_EXPORT vidMonitorValue VidModeGetMonitorValue(pointer monitor, int valtyp, int indx); -extern _X_EXPORT Bool VidModeSetGammaRamp(int, int, CARD16 *, CARD16 *, CARD16 *); -extern _X_EXPORT Bool VidModeGetGammaRamp(int, int, CARD16 *, CARD16 *, CARD16 *); +extern _X_EXPORT vidMonitorValue VidModeGetMonitorValue(pointer monitor, + int valtyp, int indx); +extern _X_EXPORT Bool VidModeSetGammaRamp(int, int, CARD16 *, CARD16 *, + CARD16 *); +extern _X_EXPORT Bool VidModeGetGammaRamp(int, int, CARD16 *, CARD16 *, + CARD16 *); extern _X_EXPORT int VidModeGetGammaRampSize(int scrnIndex); #endif - - -- cgit v1.2.3