Merge remote-tracking branch 'origin/released'

Conflicts:
	xorg-server/Xext/securitysrv.h
	xorg-server/glx/glxext.h
	xorg-server/glx/indirect_reqsize.c
	xorg-server/glx/indirect_size_get.c
	xorg-server/hw/xwin/winclip.c
	xorg-server/hw/xwin/winfont.c
	xorg-server/hw/xwin/winglobals.c
	xorg-server/hw/xwin/winglobals.h
	xorg-server/hw/xwin/winmonitors.h
	xorg-server/include/closestr.h
	xorg-server/include/pixmapstr.h
	xorg-server/include/servermd.h
	xorg-server/include/site.h
	xorg-server/include/windowstr.h
	xorg-server/include/xkbstr.h

6 files changed, 189 insertions, 164 deletions

diff --git a/xorg-server/hw/xfree86/i2c/bt829.h b/xorg-server/hw/xfree86/i2c/bt829.h
index 06e488f04..2709bee50 100644
--- a/xorg-server/hw/xfree86/i2c/bt829.h
+++ b/xorg-server/hw/xfree86/i2c/bt829.h
@@ -4,36 +4,36 @@
 #include "xf86i2c.h"
 
 typedef struct {
-	int 		tunertype;	/* Must be set before init */
-        /* Private variables */
-	I2CDevRec d;
-
-    	CARD8		brightness;
-    	CARD8 		ccmode;
-        CARD8           code;
-    	CARD16		contrast;
-    	CARD8		format;
-	int		height;
-    	CARD8		hue;
-        CARD8           len;
-    	CARD8		mux;
-    	CARD8           out_en;
-        CARD8           p_io;
-    	CARD16		sat_u;
-    	CARD16		sat_v;
-        CARD8           vbien;
-        CARD8           vbifmt;
-	int 		width;
-
-    	CARD16		hdelay;
-        CARD16		hscale;
-    	CARD16		vactive;
-    	CARD16		vdelay;
-        CARD16		vscale;
-
-        CARD16          htotal;
-    	CARD8		id;
-    	CARD8		svideo_mux;
+    int tunertype;              /* Must be set before init */
+    /* Private variables */
+    I2CDevRec d;
+
+    CARD8 brightness;
+    CARD8 ccmode;
+    CARD8 code;
+    CARD16 contrast;
+    CARD8 format;
+    int height;
+    CARD8 hue;
+    CARD8 len;
+    CARD8 mux;
+    CARD8 out_en;
+    CARD8 p_io;
+    CARD16 sat_u;
+    CARD16 sat_v;
+    CARD8 vbien;
+    CARD8 vbifmt;
+    int width;
+
+    CARD16 hdelay;
+    CARD16 hscale;
+    CARD16 vactive;
+    CARD16 vdelay;
+    CARD16 vscale;
+
+    CARD16 htotal;
+    CARD8 id;
+    CARD8 svideo_mux;
 } BT829Rec, *BT829Ptr;
 
 #define xf86_bt829_Detect	bt829_Detect
@@ -46,20 +46,20 @@ extern _X_EXPORT BT829Ptr bt829_Detect(I2CBusPtr b, I2CSlaveAddr addr);
 #define xf86_bt829_ATIInit	bt829_ATIInit
 extern _X_EXPORT int bt829_ATIInit(BT829Ptr bt);
 
-#define BT829_NTSC		1	/* NTSC-M */
-#define BT829_NTSC_JAPAN	2	/* NTSC-Japan */
-#define BT829_PAL		3	/* PAL-B,D,G,H,I */
-#define BT829_PAL_M		4	/* PAL-M */
-#define BT829_PAL_N		5	/* PAL-N */
-#define BT829_SECAM		6	/* SECAM */
-#define BT829_PAL_N_COMB	7	/* PAL-N combination */
+#define BT829_NTSC		1       /* NTSC-M */
+#define BT829_NTSC_JAPAN	2       /* NTSC-Japan */
+#define BT829_PAL		3       /* PAL-B,D,G,H,I */
+#define BT829_PAL_M		4       /* PAL-M */
+#define BT829_PAL_N		5       /* PAL-N */
+#define BT829_SECAM		6       /* SECAM */
+#define BT829_PAL_N_COMB	7       /* PAL-N combination */
 
 #define xf86_bt829_SetFormat	bt829_SetFormat
 extern _X_EXPORT int bt829_SetFormat(BT829Ptr bt, CARD8 format);
 
-#define BT829_MUX2	1	/* ATI -> composite video */
-#define BT829_MUX0	2	/* ATI -> tv tuner */
-#define BT829_MUX1	3	/* ATI -> s-video */
+#define BT829_MUX2	1       /* ATI -> composite video */
+#define BT829_MUX0	2       /* ATI -> tv tuner */
+#define BT829_MUX1	3       /* ATI -> s-video */
 
 #define xf86_bt829_SetMux	bt829_SetMux
 extern _X_EXPORT int bt829_SetMux(BT829Ptr bt, CARD8 mux);
@@ -69,17 +69,21 @@ extern _X_EXPORT int bt829_SetCaptSize(BT829Ptr bt, int width, int height);
 
 #define xf86_bt829_SetBrightness	bt829_SetBrightness
 extern _X_EXPORT void bt829_SetBrightness(BT829Ptr bt, int brightness);
+
 #define xf86_bt829_SetContrast		bt829_SetContrast
 extern _X_EXPORT void bt829_SetContrast(BT829Ptr bt, int contrast);
+
 #define xf86_bt829_SetSaturation	bt829_SetSaturation
 extern _X_EXPORT void bt829_SetSaturation(BT829Ptr bt, int saturation);
+
 #define xf86_bt829_SetTint		bt829_SetTint
-extern _X_EXPORT void bt829_SetTint(BT829Ptr bt, int hue);	 /* Hue */
+extern _X_EXPORT void bt829_SetTint(BT829Ptr bt, int hue);      /* Hue */
 
 #define xf86_bt829_SetOUT_EN		bt829_SetOUT_EN
-extern _X_EXPORT void bt829_SetOUT_EN(BT829Ptr bt, BOOL out_en);/* VPOLE register */
+extern _X_EXPORT void bt829_SetOUT_EN(BT829Ptr bt, BOOL out_en);        /* VPOLE register */
+
 #define xf86_bt829_SetP_IO		bt829_SetP_IO
-extern _X_EXPORT void bt829_SetP_IO(BT829Ptr bt, CARD8 p_io);	 /* P_IO register */
+extern _X_EXPORT void bt829_SetP_IO(BT829Ptr bt, CARD8 p_io);   /* P_IO register */
 
 extern _X_EXPORT int bt829_SetCC(BT829Ptr bt);
 
diff --git a/xorg-server/hw/xfree86/i2c/fi1236.h b/xorg-server/hw/xfree86/i2c/fi1236.h
index 8dd7e4fdb..053089277 100644
--- a/xorg-server/hw/xfree86/i2c/fi1236.h
+++ b/xorg-server/hw/xfree86/i2c/fi1236.h
@@ -7,64 +7,63 @@
 #undef NUM
 
 typedef struct {
-	CARD32 fcar;           /* 16 * fcar_Mhz */
-	CARD32 min_freq;       /* 16 * min_freq_Mhz */
-	CARD32 max_freq;       /* 16 * max_freq_Mhz */
-	
-	CARD32 threshold1;     /* 16 * Value_Mhz */
-	CARD32 threshold2;     /* 16 * Value_Mhz */
-	
-	CARD8  band_low;
-	CARD8  band_mid;
-	CARD8  band_high;
-	CARD8  control;
-	} FI1236_parameters;
+    CARD32 fcar;                /* 16 * fcar_Mhz */
+    CARD32 min_freq;            /* 16 * min_freq_Mhz */
+    CARD32 max_freq;            /* 16 * max_freq_Mhz */
 
+    CARD32 threshold1;          /* 16 * Value_Mhz */
+    CARD32 threshold2;          /* 16 * Value_Mhz */
+
+    CARD8 band_low;
+    CARD8 band_mid;
+    CARD8 band_high;
+    CARD8 control;
+} FI1236_parameters;
 
 typedef struct {
-	/* what we want */
-	/* all frequencies are in Mhz */
-	double f_rf;	/* frequency to tune to */
-	double f_if1;   /* first intermediate frequency */
-	double f_if2;   /* second intermediate frequency */
-	double f_ref;   /* reference frequency */
-	double f_ifbw;  /* bandwidth */
-	double f_step;  /* step */
-	
-	/* what we compute */
-	double f_lo1;
-	double f_lo2;
-	int LO1I;
-	int LO2I;
-	int SEL;
-	int STEP;
-	int NUM;
-	} MT2032_parameters;
+    /* what we want */
+    /* all frequencies are in Mhz */
+    double f_rf;                /* frequency to tune to */
+    double f_if1;               /* first intermediate frequency */
+    double f_if2;               /* second intermediate frequency */
+    double f_ref;               /* reference frequency */
+    double f_ifbw;              /* bandwidth */
+    double f_step;              /* step */
+
+    /* what we compute */
+    double f_lo1;
+    double f_lo2;
+    int LO1I;
+    int LO2I;
+    int SEL;
+    int STEP;
+    int NUM;
+} MT2032_parameters;
 
 typedef struct {
-	I2CDevRec  d;
-	int type;
-
-	void* afc_source;    /* The AFC source may be another chip like TDA988x */
-	
-	int afc_delta;
-	CARD32 original_frequency;
-	Bool afc_timer_installed;
-	int afc_count;
-	int last_afc_hint;
-	
-	double video_if;
-	FI1236_parameters parm;
-	int xogc; /* for MT2032 */
-	
-	struct {
-		CARD8   div1;
-		CARD8   div2;
-		CARD8   control;
-		CARD8   band;
-		CARD8	  aux;	/* this is for MK3 tuners */
-		} tuner_data;
-	} FI1236Rec, *FI1236Ptr;
+    I2CDevRec d;
+    int type;
+
+    void *afc_source;           /* The AFC source may be another chip like TDA988x */
+
+    int afc_delta;
+    CARD32 original_frequency;
+    Bool afc_timer_installed;
+    int afc_count;
+    int last_afc_hint;
+
+    double video_if;
+    FI1236_parameters parm;
+    int xogc;                   /* for MT2032 */
+
+    struct {
+        CARD8 div1;
+        CARD8 div2;
+        CARD8 control;
+        CARD8 band;
+        CARD8 aux;              /* this is for MK3 tuners */
+    } tuner_data;
+} FI1236Rec, *FI1236Ptr;
 
 #define TUNER_TYPE_FI1236              0
 #define TUNER_TYPE_FI1216              1
@@ -86,7 +85,6 @@ typedef struct {
 #define TUNER_OFF      4
 #define TUNER_STILL_TUNING      5
 
-
 void FI1236_tune(FI1236Ptr f, CARD32 frequency);
 
 #define FI1236SymbolsList  \
@@ -96,15 +94,19 @@ void FI1236_tune(FI1236Ptr f, CARD32 frequency);
 
 #define xf86_Detect_FI1236		Detect_FI1236
 extern _X_EXPORT FI1236Ptr Detect_FI1236(I2CBusPtr b, I2CSlaveAddr addr);
+
 #define xf86_FI1236_set_tuner_type	FI1236_set_tuner_type
 extern _X_EXPORT void FI1236_set_tuner_type(FI1236Ptr f, int type);
+
 #define xf86_TUNER_set_frequency	TUNER_set_frequency
 extern _X_EXPORT void TUNER_set_frequency(FI1236Ptr f, CARD32 frequency);
 
 #define xf86_FI1236_AFC			FI1236_AFC
 extern _X_EXPORT int FI1236_AFC(FI1236Ptr f);
+
 #define xf86_TUNER_get_afc_hint		TUNER_get_afc_hint
 extern _X_EXPORT int TUNER_get_afc_hint(FI1236Ptr f);
+
 #define xf86_fi1236_dump_status		fi1236_dump_status
 extern _X_EXPORT void fi1236_dump_status(FI1236Ptr f);
 
diff --git a/xorg-server/hw/xfree86/i2c/msp3430.h b/xorg-server/hw/xfree86/i2c/msp3430.h
index 8423d1411..ef66e1ed8 100644
--- a/xorg-server/hw/xfree86/i2c/msp3430.h
+++ b/xorg-server/hw/xfree86/i2c/msp3430.h
@@ -4,29 +4,28 @@
 #include "xf86i2c.h"
 
 typedef struct {
-        I2CDevRec d;
-	
-	int standard;
-	int connector;
-	int mode;
+    I2CDevRec d;
 
-        CARD8 hardware_version, major_revision, product_code, rom_version;
+    int standard;
+    int connector;
+    int mode;
+
+    CARD8 hardware_version, major_revision, product_code, rom_version;
 #ifdef MSP_DEBUG
-	CARD8 registers_present[256];
+    CARD8 registers_present[256];
 #endif
 
-	CARD16 chip_id;
-	CARD8  chip_family;
-	Bool  recheck;		/*reinitialization needed after channel change */
-	CARD8 c_format;		/*current state of audio format */
-	CARD16 c_standard;	/*current state of standard register */
-	CARD8	c_source;	/*current state of source register */
-	CARD8	c_matrix;	/*current state of matrix register */
-	CARD8	c_fmmatrix;	/*current state of fmmatrix register */
-	int		c_mode;	/* current state of mode for autoswitchimg */
-	CARD8	volume;
-	} MSP3430Rec, * MSP3430Ptr;
-
+    CARD16 chip_id;
+    CARD8 chip_family;
+    Bool recheck;               /*reinitialization needed after channel change */
+    CARD8 c_format;             /*current state of audio format */
+    CARD16 c_standard;          /*current state of standard register */
+    CARD8 c_source;             /*current state of source register */
+    CARD8 c_matrix;             /*current state of matrix register */
+    CARD8 c_fmmatrix;           /*current state of fmmatrix register */
+    int c_mode;                 /* current state of mode for autoswitchimg */
+    CARD8 volume;
+} MSP3430Rec, *MSP3430Ptr;
 
 #define MSP3430_ADDR_1      0x80
 #define MSP3430_ADDR_2		0x84
@@ -37,9 +36,9 @@ typedef struct {
 #define MSP3430_PAL_DK1         (0x100 | MSP3430_PAL)
 #define MSP3430_SECAM           3
 
-#define MSP3430_CONNECTOR_1     1   /* tuner on AIW cards */
-#define MSP3430_CONNECTOR_2     2   /* SVideo on AIW cards */
-#define MSP3430_CONNECTOR_3     3   /* composite on AIW cards */
+#define MSP3430_CONNECTOR_1     1       /* tuner on AIW cards */
+#define MSP3430_CONNECTOR_2     2       /* SVideo on AIW cards */
+#define MSP3430_CONNECTOR_3     3       /* composite on AIW cards */
 
 #define MSP3430_ADDR(a)         ((a)->d.SlaveAddr)
 
@@ -50,7 +49,7 @@ typedef struct {
 /*----------------------------------------------------------*/
 
 /* MSP chip families */
-#define MSPFAMILY_UNKNOWN	0	
+#define MSPFAMILY_UNKNOWN	0
 #define MSPFAMILY_34x0D		1
 #define MSPFAMILY_34x5D		2
 #define MSPFAMILY_34x0G		3
@@ -94,14 +93,18 @@ typedef struct {
 
 #define xf86_InitMSP3430	InitMSP3430
 extern _X_EXPORT void InitMSP3430(MSP3430Ptr m);
+
 #define xf86_DetectMSP3430	DetectMSP3430
 extern _X_EXPORT MSP3430Ptr DetectMSP3430(I2CBusPtr b, I2CSlaveAddr addr);
+
 #define xf86_ResetMSP3430	ResetMSP3430
 extern _X_EXPORT void ResetMSP3430(MSP3430Ptr m);
+
 #define xf86_MSP3430SetVolume	MSP3430SetVolume
-extern _X_EXPORT void MSP3430SetVolume (MSP3430Ptr m, CARD8 value);
+extern _X_EXPORT void MSP3430SetVolume(MSP3430Ptr m, CARD8 value);
+
 #define xf86_MSP3430SetSAP	MSP3430SetSAP
-extern _X_EXPORT void MSP3430SetSAP (MSP3430Ptr m, int mode);
+extern _X_EXPORT void MSP3430SetSAP(MSP3430Ptr m, int mode);
 
 #define MSP3430SymbolsList \
 		"InitMSP3430", \
diff --git a/xorg-server/hw/xfree86/i2c/tda9850.h b/xorg-server/hw/xfree86/i2c/tda9850.h
index d81679510..7d82095f0 100644
--- a/xorg-server/hw/xfree86/i2c/tda9850.h
+++ b/xorg-server/hw/xfree86/i2c/tda9850.h
@@ -4,27 +4,32 @@
 #include "xf86i2c.h"
 
 typedef struct {
-	I2CDevRec d;
-	
-	int mux;
-	int stereo;
-	int sap;
-	Bool mute;
-	Bool sap_mute;
-	} TDA9850Rec, *TDA9850Ptr;
+    I2CDevRec d;
+
+    int mux;
+    int stereo;
+    int sap;
+    Bool mute;
+    Bool sap_mute;
+} TDA9850Rec, *TDA9850Ptr;
 
 #define TDA9850_ADDR_1   0xB4
 
 #define xf86_Detect_tda9850	Detect_tda9850
 extern _X_EXPORT TDA9850Ptr Detect_tda9850(I2CBusPtr b, I2CSlaveAddr addr);
+
 #define xf86_tda9850_init	tda9850_init
 extern _X_EXPORT Bool tda9850_init(TDA9850Ptr t);
+
 #define xf86_tda9850_setaudio	tda9850_setaudio
 extern _X_EXPORT void tda9850_setaudio(TDA9850Ptr t);
+
 #define xf86_tda9850_mute	tda9850_mute
 extern _X_EXPORT void tda9850_mute(TDA9850Ptr t, Bool mute);
+
 #define xf86_tda9850_sap_mute	tda9850_sap_mute
 extern _X_EXPORT void tda9850_sap_mute(TDA9850Ptr t, Bool sap_mute);
+
 #define xf86_tda9850_getstatus	tda9850_getstatus
 extern _X_EXPORT CARD16 tda9850_getstatus(TDA9850Ptr t);
 
diff --git a/xorg-server/hw/xfree86/i2c/tda9885.h b/xorg-server/hw/xfree86/i2c/tda9885.h
index 004f43d5c..2d8a8af15 100644
--- a/xorg-server/hw/xfree86/i2c/tda9885.h
+++ b/xorg-server/hw/xfree86/i2c/tda9885.h
@@ -4,35 +4,35 @@
 #include "xf86i2c.h"
 
 typedef struct {
-	I2CDevRec d;
-	
-	/* write-only parameters */
-		/* B DATA */
-	CARD8  sound_trap;
-	CARD8  auto_mute_fm;
-	CARD8  carrier_mode;
-	CARD8  modulation;
-	CARD8  forced_mute_audio;
-	CARD8  port1;
-	CARD8  port2;
-		/* C DATA */
-	CARD8  top_adjustment;
-	CARD8  deemphasis;
-	CARD8  audio_gain;
-	        /* E DATA */
-	CARD8  standard_sound_carrier;
-	CARD8  standard_video_if;
-	CARD8  minimum_gain;
-	CARD8  gating;
-	CARD8  vif_agc;
-	/* read-only values */
-	
-	CARD8  after_reset;
-	CARD8  afc_status;
-	CARD8  vif_level;
-	CARD8  afc_win;
-	CARD8  fm_carrier;
-	} TDA9885Rec, *TDA9885Ptr;
+    I2CDevRec d;
+
+    /* write-only parameters */
+    /* B DATA */
+    CARD8 sound_trap;
+    CARD8 auto_mute_fm;
+    CARD8 carrier_mode;
+    CARD8 modulation;
+    CARD8 forced_mute_audio;
+    CARD8 port1;
+    CARD8 port2;
+    /* C DATA */
+    CARD8 top_adjustment;
+    CARD8 deemphasis;
+    CARD8 audio_gain;
+    /* E DATA */
+    CARD8 standard_sound_carrier;
+    CARD8 standard_video_if;
+    CARD8 minimum_gain;
+    CARD8 gating;
+    CARD8 vif_agc;
+    /* read-only values */
+
+    CARD8 after_reset;
+    CARD8 afc_status;
+    CARD8 vif_level;
+    CARD8 afc_win;
+    CARD8 fm_carrier;
+} TDA9885Rec, *TDA9885Ptr;
 
 #define TDA9885_ADDR_1   0x86
 #define TDA9885_ADDR_2   0x84
@@ -41,12 +41,16 @@ typedef struct {
 
 #define xf86_Detect_tda9885		Detect_tda9885
 extern _X_EXPORT TDA9885Ptr Detect_tda9885(I2CBusPtr b, I2CSlaveAddr addr);
+
 #define xf86_tda9885_init		tda9885_init
 extern _X_EXPORT Bool tda9885_init(TDA9885Ptr t);
+
 #define xf86_tda9885_setparameters	tda9885_setparameters
 extern _X_EXPORT void tda9885_setparameters(TDA9885Ptr t);
+
 #define xf86_tda9885_getstatus		tda9885_getstatus
 extern _X_EXPORT void tda9885_getstatus(TDA9885Ptr t);
+
 #define xf86_tda9885_dumpstatus		tda9885_dumpstatus
 extern _X_EXPORT void tda9885_dumpstatus(TDA9885Ptr t);
 
diff --git a/xorg-server/hw/xfree86/i2c/uda1380.h b/xorg-server/hw/xfree86/i2c/uda1380.h
index da232f90d..f0bc6167a 100644
--- a/xorg-server/hw/xfree86/i2c/uda1380.h
+++ b/xorg-server/hw/xfree86/i2c/uda1380.h
@@ -35,29 +35,36 @@
 #include "xf86i2c.h"
 
 typedef struct {
-	I2CDevRec d;
-	
-	CARD16 analog_mixer_settings;	/* register 0x03 */
-	
-	} UDA1380Rec, *UDA1380Ptr;
+    I2CDevRec d;
+
+    CARD16 analog_mixer_settings;       /* register 0x03 */
+
+} UDA1380Rec, *UDA1380Ptr;
 
 #define UDA1380_ADDR_1   0x30
 #define UDA1380_ADDR_2   0x34
 
 #define xf86_Detect_uda1380		Detect_uda1380
 extern _X_EXPORT UDA1380Ptr Detect_uda1380(I2CBusPtr b, I2CSlaveAddr addr);
+
 #define xf86_uda1380_init		uda1380_init
 extern _X_EXPORT Bool uda1380_init(UDA1380Ptr t);
+
 #define xf86_uda1380_shutdown		uda1380_shutdown
 extern _X_EXPORT void uda1380_shutdown(UDA1380Ptr t);
+
 #define xf86_uda1380_setvolume		uda1380_setvolume
 extern _X_EXPORT void uda1380_setvolume(UDA1380Ptr t, INT32);
+
 #define xf86_uda1380_mute		uda1380_mute
 extern _X_EXPORT void uda1380_mute(UDA1380Ptr t, Bool);
+
 #define xf86_uda1380_setparameters	uda1380_setparameters
 extern _X_EXPORT void uda1380_setparameters(UDA1380Ptr t);
+
 #define xf86_uda1380_getstatus		uda1380_getstatus
 extern _X_EXPORT void uda1380_getstatus(UDA1380Ptr t);
+
 #define xf86_uda1380_dumpstatus		uda1380_dumpstatus
 extern _X_EXPORT void uda1380_dumpstatus(UDA1380Ptr t);