andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge latest (4.3.99.16) from XFree86 (vendor) branch

Browse Source
This commit is contained in:
Kaleb Keithley 2003-11-26 22:49:07 +00:00
parent c57959ad6a
commit 0097b6fe2d
796 changed files with 58012 additions and 26524 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1155
GL/apple/aglGlx.c Normal file
View File

File diff suppressed because it is too large Load Diff

1341
GL/apple/indirect.c Normal file
View File

File diff suppressed because it is too large Load Diff

70
GL/glx/g_disptab.c
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab.c,v 1.3 2001/03/21 16:29:35 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab.c,v 1.4 2003/09/28 20:15:41 alanh Exp $ */
/* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
/*
** License Applicability. Except to the extent portions of this file are
@ -32,7 +32,7 @@
#include "glxserver.h"
#include "glxext.h"
#include "g_disptab.h"
__GLXdispatchSingleProcPtr __glXSingleTable[] = {
__GLXdispatchSingleProcPtr __glXSingleTable[__GLX_SINGLE_TABLE_SIZE] = {
__glXNoSuchSingleOpcode,
__glXRender,
__glXRenderLarge,
@ -54,12 +54,12 @@ __GLXdispatchSingleProcPtr __glXSingleTable[] = {
__glXQueryExtensionsString,
__glXQueryServerString,
__glXClientInfo,
__glXNoSuchSingleOpcode,
__glXNoSuchSingleOpcode,
__glXNoSuchSingleOpcode,
__glXNoSuchSingleOpcode,
__glXNoSuchSingleOpcode,
__glXNoSuchSingleOpcode,
__glXNoSuchSingleOpcode, /* glXGetFBConfigs */
__glXNoSuchSingleOpcode, /* glXCreatePixmap */
__glXNoSuchSingleOpcode, /* glXDestroyPixmap */
__glXNoSuchSingleOpcode, /* glXCreateNewContext */
__glXNoSuchSingleOpcode, /* glXQueryContext */
__glXMakeContextCurrent,
__glXNoSuchSingleOpcode,
__glXNoSuchSingleOpcode,
__glXNoSuchSingleOpcode,
@ -409,10 +409,27 @@ __GLXdispatchRenderProcPtr __glXRenderTable[] = {
__glXDisp_MultiTexCoord4dvARB,
__glXDisp_MultiTexCoord4fvARB,
__glXDisp_MultiTexCoord4ivARB,
__glXDisp_MultiTexCoord4svARB,
__glXDisp_MultiTexCoord4svARB, /* 213 */
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode, /* 220 */
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXDisp_WindowPos3fARB /* 230 */
};
__GLXdispatchSingleProcPtr __glXSwapSingleTable[] = {
__GLXdispatchSingleProcPtr __glXSwapSingleTable[__GLX_SINGLE_TABLE_SIZE] = {
__glXNoSuchSingleOpcode,
__glXSwapRender,
__glXSwapRenderLarge,
@ -434,12 +451,12 @@ __GLXdispatchSingleProcPtr __glXSwapSingleTable[] = {
__glXSwapQueryExtensionsString,
__glXSwapQueryServerString,
__glXSwapClientInfo,
__glXNoSuchSingleOpcode,
__glXNoSuchSingleOpcode,
__glXNoSuchSingleOpcode,
__glXNoSuchSingleOpcode,
__glXNoSuchSingleOpcode,
__glXNoSuchSingleOpcode,
__glXNoSuchSingleOpcode, /* glXGetFBConfigs */
__glXNoSuchSingleOpcode, /* glXCreatePixmap */
__glXNoSuchSingleOpcode, /* glXDestroyPixmap */
__glXNoSuchSingleOpcode, /* glXCreateNewContext */
__glXNoSuchSingleOpcode, /* glXQueryContext */
__glXSwapMakeContextCurrent,
__glXNoSuchSingleOpcode,
__glXNoSuchSingleOpcode,
__glXNoSuchSingleOpcode,
@ -575,7 +592,7 @@ __GLXdispatchSingleProcPtr __glXSwapSingleTable[] = {
__glXDispSwap_GetMinmaxParameteriv,
};
__GLXdispatchRenderProcPtr __glXSwapRenderTable[] = {
__GLXdispatchRenderProcPtr __glXSwapRenderTable[__GLX_RENDER_TABLE_SIZE] = {
__glXNoSuchRenderOpcode,
__glXDispSwap_CallList,
__glXDispSwap_CallLists,
@ -789,5 +806,22 @@ __GLXdispatchRenderProcPtr __glXSwapRenderTable[] = {
__glXDispSwap_MultiTexCoord4dvARB,
__glXDispSwap_MultiTexCoord4fvARB,
__glXDispSwap_MultiTexCoord4ivARB,
__glXDispSwap_MultiTexCoord4svARB,
__glXDispSwap_MultiTexCoord4svARB, /* 213 */
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode, /* 220 */
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXDispSwap_WindowPos3fARB /* 230 */
};

14
GL/glx/g_disptab.h
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab.h,v 1.3 2001/03/21 16:29:35 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab.h,v 1.4 2003/09/28 20:15:42 alanh Exp $ */
/* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
#ifndef _GLX_g_disptab_h_
#define _GLX_g_disptab_h_
@ -51,6 +51,8 @@ extern int __glXVendorPrivateWithReply(__GLXclientState*, GLbyte*);
extern int __glXQueryExtensionsString(__GLXclientState*, GLbyte*);
extern int __glXQueryServerString(__GLXclientState*, GLbyte*);
extern int __glXClientInfo(__GLXclientState*, GLbyte*);
extern int __glXMakeContextCurrent(__GLXclientState*, GLbyte*);
extern int __glXDisp_NewList(__GLXclientState*, GLbyte*);
extern int __glXDisp_EndList(__GLXclientState*, GLbyte*);
extern int __glXDisp_DeleteLists(__GLXclientState*, GLbyte*);
@ -323,6 +325,7 @@ extern void __glXDisp_MultiTexCoord4dvARB(GLbyte*);
extern void __glXDisp_MultiTexCoord4fvARB(GLbyte*);
extern void __glXDisp_MultiTexCoord4ivARB(GLbyte*);
extern void __glXDisp_MultiTexCoord4svARB(GLbyte*);
extern void __glXDisp_WindowPos3fARB(GLbyte *);
extern int __glXSwapRender(__GLXclientState*, GLbyte*);
extern int __glXSwapRenderLarge(__GLXclientState*, GLbyte*);
@ -344,6 +347,8 @@ extern int __glXSwapVendorPrivateWithReply(__GLXclientState*, GLbyte*);
extern int __glXSwapQueryExtensionsString(__GLXclientState*, GLbyte*);
extern int __glXSwapQueryServerString(__GLXclientState*, GLbyte*);
extern int __glXSwapClientInfo(__GLXclientState*, GLbyte*);
extern int __glXSwapMakeContextCurrent(__GLXclientState*, GLbyte*);
extern int __glXDispSwap_NewList(__GLXclientState*, GLbyte*);
extern int __glXDispSwap_EndList(__GLXclientState*, GLbyte*);
extern int __glXDispSwap_DeleteLists(__GLXclientState*, GLbyte*);
@ -616,15 +621,18 @@ extern void __glXDispSwap_MultiTexCoord4dvARB(GLbyte*);
extern void __glXDispSwap_MultiTexCoord4fvARB(GLbyte*);
extern void __glXDispSwap_MultiTexCoord4ivARB(GLbyte*);
extern void __glXDispSwap_MultiTexCoord4svARB(GLbyte*);
extern void __glXDispSwap_WindowPos3fARB(GLbyte *);
#define __GLX_MIN_GLXCMD_OPCODE 1
#define __GLX_MAX_GLXCMD_OPCODE 20
#define __GLX_MIN_RENDER_OPCODE 1
#define __GLX_MAX_RENDER_OPCODE 213
/*#define __GLX_MAX_RENDER_OPCODE 213*/
#define __GLX_MAX_RENDER_OPCODE 230
#define __GLX_MIN_SINGLE_OPCODE 1
#define __GLX_MAX_SINGLE_OPCODE 159
#define __GLX_SINGLE_TABLE_SIZE 160
#define __GLX_RENDER_TABLE_SIZE 214
/*#define __GLX_RENDER_TABLE_SIZE 214*/
#define __GLX_RENDER_TABLE_SIZE 231
extern __GLXdispatchRenderProcPtr __glXRenderTable[__GLX_RENDER_TABLE_SIZE];
extern __GLXdispatchSingleProcPtr __glXSingleTable[__GLX_SINGLE_TABLE_SIZE];
extern __GLXdispatchRenderProcPtr __glXSwapRenderTable[__GLX_RENDER_TABLE_SIZE];

272
GL/glx/g_disptab_EXT.c
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab_EXT.c,v 1.3 2001/03/21 16:29:35 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab_EXT.c,v 1.4 2003/09/28 20:15:42 alanh Exp $ */
/* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
/*
** License Applicability. Except to the extent portions of this file are
@ -32,21 +32,25 @@
#include "glxserver.h"
#include "glxext.h"
#include "g_disptab_EXT.h"
__GLXdispatchRenderProcPtr __glXRenderTable_EXT[] = {
__glXDisp_ColorTable,
__glXDisp_ColorTableParameterfv,
__GLXdispatchRenderProcPtr __glXRenderTable_EXT[__GLX_MAX_RENDER_OPCODE_EXT - __GLX_MIN_RENDER_OPCODE_EXT + 1] = {
__glXDisp_ColorTable, /* 2053 */
__glXDisp_ColorTableParameterfv, /* 2054 */
__glXDisp_ColorTableParameteriv,
__glXDisp_CopyColorTable,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode, /* 2060 */
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXDisp_PointParameterfARB, /* 2065 */
__glXDisp_PointParameterfvARB, /* 2066 */
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode, /* 2070 */
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
@ -2072,15 +2076,11 @@ __GLXdispatchRenderProcPtr __glXRenderTable_EXT[] = {
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXDisp_BlendColor,
__glXDisp_BlendEquation,
__glXNoSuchRenderOpcode,
__glXDisp_TexSubImage1D,
__glXDisp_TexSubImage2D,
__glXDisp_BlendColor, /* 4096 */
__glXDisp_BlendEquation, /* 4097 */
__glXNoSuchRenderOpcode, /* 4098 */
__glXDisp_TexSubImage1D, /* 4099 */
__glXDisp_TexSubImage2D, /* 4100 */
__glXDisp_ConvolutionFilter1D,
__glXDisp_ConvolutionFilter2D,
__glXDisp_ConvolutionParameterf,
@ -2090,7 +2090,7 @@ __GLXdispatchRenderProcPtr __glXRenderTable_EXT[] = {
__glXDisp_CopyConvolutionFilter1D,
__glXDisp_CopyConvolutionFilter2D,
__glXDisp_SeparableFilter2D,
__glXDisp_Histogram,
__glXDisp_Histogram, /* 4110 */
__glXDisp_Minmax,
__glXDisp_ResetHistogram,
__glXDisp_ResetMinmax,
@ -2100,38 +2100,135 @@ __GLXdispatchRenderProcPtr __glXRenderTable_EXT[] = {
__glXDisp_BindTexture,
__glXDisp_PrioritizeTextures,
__glXDisp_CopyTexImage1D,
__glXDisp_CopyTexImage2D,
__glXDisp_CopyTexSubImage1D,
__glXDisp_CopyTexSubImage2D,
__glXDisp_CopyTexSubImage3D,
__glXDisp_CopyTexImage2D, /* 4120 */
__glXDisp_CopyTexSubImage1D, /* 4121 */
__glXDisp_CopyTexSubImage2D, /* 4122 */
__glXDisp_CopyTexSubImage3D, /* 4123 */
__glXNoSuchRenderOpcode, /* 4124 */
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode, /* 4130 */
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode, /* 4140 */
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode, /* 4150 */
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode, /* 4160 */
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode, /* 4170 */
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode, /* 4180 */
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode, /* 4190 */
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode, /* 4200 */
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode, /* 4210 */
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode, /* 4219 */
__glXDisp_ActiveStencilFaceEXT, /* 4220 */
};
__GLXdispatchVendorPrivProcPtr __glXVendorPrivTable_EXT[] = {
__glXDisp_AreTexturesResidentEXT,
__glXDisp_DeleteTexturesEXT,
__glXDisp_GenTexturesEXT,
__glXDisp_IsTextureEXT,
__GLXdispatchVendorPrivProcPtr __glXVendorPrivTable_EXT[__GLX_MAX_VENDPRIV_OPCODE_EXT - __GLX_MIN_VENDPRIV_OPCODE_EXT + 1] = {
__glXDisp_AreTexturesResidentEXT, /* 11 */
__glXDisp_DeleteTexturesEXT, /* 12 */
__glXDisp_GenTexturesEXT, /* 13 */
__glXDisp_IsTextureEXT, /* 14 */
};
__GLXdispatchRenderProcPtr __glXSwapRenderTable_EXT[] = {
__glXDispSwap_ColorTable,
__glXDispSwap_ColorTableParameterfv,
__GLXdispatchRenderProcPtr __glXSwapRenderTable_EXT[__GLX_MAX_RENDER_OPCODE_EXT - __GLX_MIN_RENDER_OPCODE_EXT + 1] = {
__glXDispSwap_ColorTable, /* 2053 */
__glXDispSwap_ColorTableParameterfv, /* 2054 */
__glXDispSwap_ColorTableParameteriv,
__glXDispSwap_CopyColorTable,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode, /* 2060 */
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXDispSwap_PointParameterfARB, /* 2065 */
__glXDispSwap_PointParameterfvARB, /* 2066 */
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode, /* 2070 */
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
@ -4181,15 +4278,112 @@ __GLXdispatchRenderProcPtr __glXSwapRenderTable_EXT[] = {
__glXDispSwap_BindTexture,
__glXDispSwap_PrioritizeTextures,
__glXDispSwap_CopyTexImage1D,
__glXDispSwap_CopyTexImage2D,
__glXDispSwap_CopyTexSubImage1D,
__glXDispSwap_CopyTexSubImage2D,
__glXDispSwap_CopyTexSubImage3D,
__glXDispSwap_CopyTexImage2D, /* 4120 */
__glXDispSwap_CopyTexSubImage1D, /* 4121 */
__glXDispSwap_CopyTexSubImage2D, /* 4122 */
__glXDispSwap_CopyTexSubImage3D, /* 4123 */
__glXNoSuchRenderOpcode, /* 4124 */
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode, /* 4130 */
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode, /* 4140 */
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode, /* 4150 */
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode, /* 4160 */
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode, /* 4170 */
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode, /* 4180 */
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode, /* 4190 */
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode, /* 4200 */
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode, /* 4210 */
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode, /* 4219 */
__glXDispSwap_ActiveStencilFaceEXT, /* 4220 */
};
__GLXdispatchVendorPrivProcPtr __glXSwapVendorPrivTable_EXT[] = {
__glXDispSwap_AreTexturesResidentEXT,
__glXDispSwap_DeleteTexturesEXT,
__glXDispSwap_GenTexturesEXT,
__glXDispSwap_IsTextureEXT,
__GLXdispatchVendorPrivProcPtr __glXSwapVendorPrivTable_EXT[__GLX_MAX_VENDPRIV_OPCODE_EXT - __GLX_MIN_VENDPRIV_OPCODE_EXT + 1] = {
__glXDispSwap_AreTexturesResidentEXT, /* 11 */
__glXDispSwap_DeleteTexturesEXT, /* 12 */
__glXDispSwap_GenTexturesEXT, /* 13 */
__glXDispSwap_IsTextureEXT, /* 14 */
};

14
GL/glx/g_disptab_EXT.h
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab_EXT.h,v 1.3 2001/03/21 16:29:35 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab_EXT.h,v 1.4 2003/09/28 20:15:42 alanh Exp $ */
/* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
#ifndef _GLX_g_disptab_EXT_h_
#define _GLX_g_disptab_EXT_h_
@ -67,6 +67,9 @@ extern void __glXDisp_CopyTexImage2D(GLbyte*);
extern void __glXDisp_CopyTexSubImage1D(GLbyte*);
extern void __glXDisp_CopyTexSubImage2D(GLbyte*);
extern void __glXDisp_CopyTexSubImage3D(GLbyte*);
extern void __glXDisp_PointParameterfARB(GLbyte*);
extern void __glXDisp_PointParameterfvARB(GLbyte*);
extern void __glXDisp_ActiveStencilFaceEXT(GLbyte*);
extern int __glXDispSwap_AreTexturesResidentEXT(__GLXclientState*, GLbyte*);
extern int __glXDispSwap_DeleteTexturesEXT(__GLXclientState*, GLbyte*);
@ -104,13 +107,16 @@ extern void __glXDispSwap_CopyTexImage2D(GLbyte*);
extern void __glXDispSwap_CopyTexSubImage1D(GLbyte*);
extern void __glXDispSwap_CopyTexSubImage2D(GLbyte*);
extern void __glXDispSwap_CopyTexSubImage3D(GLbyte*);
extern void __glXDispSwap_PointParameterfARB(GLbyte*);
extern void __glXDispSwap_PointParameterfvARB(GLbyte*);
extern void __glXDispSwap_ActiveStencilFaceEXT(GLbyte*);
#define __GLX_MIN_RENDER_OPCODE_EXT 2053
#define __GLX_MAX_RENDER_OPCODE_EXT 4123
#define __GLX_MAX_RENDER_OPCODE_EXT 4220
#define __GLX_MIN_VENDPRIV_OPCODE_EXT 11
#define __GLX_MAX_VENDPRIV_OPCODE_EXT 14
#define __GLX_VENDPRIV_TABLE_SIZE_EXT 4
#define __GLX_RENDER_TABLE_SIZE_EXT 2071
#define __GLX_VENDPRIV_TABLE_SIZE_EXT (__GLX_MAX_VENDPRIV_OPCODE_EXT - __GLX_MIN_VENDPRIV_OPCODE_EXT + 1)
#define __GLX_RENDER_TABLE_SIZE_EXT (__GLX_MAX_RENDER_OPCODE_EXT - __GLX_MIN_RENDER_OPCODE_EXT + 1)
extern __GLXdispatchRenderProcPtr __glXRenderTable_EXT[__GLX_RENDER_TABLE_SIZE_EXT];
extern __GLXdispatchVendorPrivProcPtr __glXVendorPrivTable_EXT[__GLX_VENDPRIV_TABLE_SIZE_EXT];
extern __GLXdispatchRenderProcPtr __glXSwapRenderTable_EXT[__GLX_RENDER_TABLE_SIZE_EXT];

42
GL/glx/g_render.c
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/GL/glx/g_render.c,v 1.4 2001/03/21 16:29:35 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/GL/glx/g_render.c,v 1.6 2003/10/28 22:50:17 tsi Exp $ */
/* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
/*
** License Applicability. Except to the extent portions of this file are
@ -982,6 +982,7 @@ void __glXDisp_TexGend(GLbyte *pc)
void __glXDisp_TexGendv(GLbyte *pc)
{
#ifdef __GLX_ALIGN64
GLenum pname;
GLint cmdlen;
GLint compsize;
@ -990,8 +991,6 @@ void __glXDisp_TexGendv(GLbyte *pc)
compsize = __glTexGendv_size(pname);
if (compsize < 0) compsize = 0;
cmdlen = __GLX_PAD(8+compsize*8);
#ifdef __GLX_ALIGN64
if ((unsigned long)(pc) & 7) {
__GLX_MEM_COPY(pc-4, pc, cmdlen);
pc -= 4;
@ -2075,3 +2074,40 @@ void __glXDisp_MultiTexCoord4svARB(GLbyte *pc)
);
}
/*
* Extensions
*/
void __glXDisp_PointParameterfARB(GLbyte *pc)
{
glPointParameterfARB(
*(GLenum *)(pc + 0),
*(GLfloat *)(pc + 4)
);
}
void __glXDisp_PointParameterfvARB(GLbyte *pc)
{
glPointParameterfvARB(
*(GLenum *)(pc + 0),
(GLfloat *)(pc + 4)
);
}
void __glXDisp_ActiveStencilFaceEXT(GLbyte *pc)
{
glActiveStencilFaceEXT(
*(GLenum *)(pc + 0)
);
}
void __glXDisp_WindowPos3fARB(GLbyte *pc)
{
glWindowPos3fARB(
*(GLfloat *)(pc + 0),
*(GLfloat *)(pc + 4),
*(GLfloat *)(pc + 8)
);
}

64
GL/glx/g_renderswap.c
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/GL/glx/g_renderswap.c,v 1.5 2002/01/14 22:47:08 tsi Exp $ */
/* $XFree86: xc/programs/Xserver/GL/glx/g_renderswap.c,v 1.7 2003/10/28 22:50:17 tsi Exp $ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
@ -1570,7 +1570,9 @@ void __glXDispSwap_TexGend(GLbyte *pc)
void __glXDispSwap_TexGendv(GLbyte *pc)
{
GLenum pname;
#ifdef __GLX_ALIGN64
GLint cmdlen;
#endif
GLint compsize;
__GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
@ -1579,9 +1581,9 @@ void __glXDispSwap_TexGendv(GLbyte *pc)
pname = *(GLenum *)(pc + 4);
compsize = __glTexGendv_size(pname);
if (compsize < 0) compsize = 0;
cmdlen = __GLX_PAD(8+compsize*8);
#ifdef __GLX_ALIGN64
cmdlen = __GLX_PAD(8+compsize*8);
if ((unsigned long)(pc) & 7) {
__GLX_MEM_COPY(pc-4, pc, cmdlen);
pc -= 4;
@ -3306,3 +3308,61 @@ void __glXDispSwap_MultiTexCoord4svARB(GLbyte *pc)
);
}
/*
* Extensions
*/
void __glXDispSwap_PointParameterfARB(GLbyte *pc)
{
__GLX_DECLARE_SWAP_VARIABLES;
__GLX_SWAP_INT(pc + 0);
__GLX_SWAP_FLOAT(pc + 4);
glPointParameterfARB(
*(GLenum *)(pc + 0),
*(GLfloat *)(pc + 4)
);
}
void __glXDispSwap_PointParameterfvARB(GLbyte *pc)
{
GLenum pname;
GLint compsize;
__GLX_DECLARE_SWAP_VARIABLES;
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
__GLX_SWAP_INT(pc + 0);
pname = *(GLenum *)(pc + 0);
compsize = __glPointParameterfvARB_size(pname);
if (compsize < 0) compsize = 0;
__GLX_SWAP_FLOAT_ARRAY(pc + 4, compsize);
glPointParameterfvARB(
*(GLenum *)(pc + 0),
(GLfloat *)(pc + 4)
);
}
void __glXDispSwap_ActiveStencilFaceEXT(GLbyte *pc)
{
__GLX_DECLARE_SWAP_VARIABLES;
__GLX_SWAP_INT(pc + 0);
glActiveStencilFaceEXT(
*(GLenum *)(pc + 0)
);
}
void __glXDispSwap_WindowPos3fARB(GLbyte *pc)
{
__GLX_DECLARE_SWAP_VARIABLES;
__GLX_SWAP_FLOAT(pc + 0);
__GLX_SWAP_FLOAT(pc + 4);
__GLX_SWAP_FLOAT(pc + 8);
glWindowPos3fARB(
*(GLfloat *)(pc + 0),
*(GLfloat *)(pc + 4),
*(GLfloat *)(pc + 8)
);
}

6
GL/glx/g_single.c
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/GL/glx/g_single.c,v 1.5 2002/01/14 22:47:08 tsi Exp $ */
/* $XFree86: xc/programs/Xserver/GL/glx/g_single.c,v 1.6 2003/10/28 22:50:17 tsi Exp $ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
@ -1264,7 +1264,6 @@ int __glXDisp_AreTexturesResident(__GLXclientState *cl, GLbyte *pc)
int __glXDisp_DeleteTextures(__GLXclientState *cl, GLbyte *pc)
{
GLsizei n;
__GLXcontext *cx;
int error;
@ -1273,7 +1272,6 @@ int __glXDisp_DeleteTextures(__GLXclientState *cl, GLbyte *pc)
return error;
}
pc += __GLX_SINGLE_HDR_SIZE;
n = *(GLsizei *)(pc + 0);
glDeleteTextures(
*(GLsizei *)(pc + 0),
@ -1717,7 +1715,6 @@ int __glXDisp_AreTexturesResidentEXT(__GLXclientState *cl, GLbyte *pc)
int __glXDisp_DeleteTexturesEXT(__GLXclientState *cl, GLbyte *pc)
{
GLsizei n;
__GLXcontext *cx;
int error;
@ -1726,7 +1723,6 @@ int __glXDisp_DeleteTexturesEXT(__GLXclientState *cl, GLbyte *pc)
return error;
}
pc += __GLX_VENDPRIV_HDR_SIZE;
n = *(GLsizei *)(pc + 0);
glDeleteTexturesEXT(
*(GLsizei *)(pc + 0),

310
GL/glx/glxcmds.c
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/GL/glx/glxcmds.c,v 1.9 2002/12/14 01:36:09 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/GL/glx/glxcmds.c,v 1.11 2003/10/28 22:50:17 tsi Exp $ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
@ -64,9 +64,13 @@ static __GLimports imports = {
__glXImpFclose,
__glXImpFprintf,
__glXImpGetDrawablePrivate,
__glXImpGetReadablePrivate,
NULL
};
static int DoMakeCurrent( __GLXclientState *cl, GLXDrawable drawId,
GLXDrawable readId, GLXContextID contextId, GLXContextTag tag );
/************************************************************************/
/*
@ -361,26 +365,138 @@ static void StartUsingContext(__GLXclientState *cl, __GLXcontext *glxc)
/*
** Make an OpenGL context and drawable current.
*/
int __glXMakeCurrent(__GLXclientState *cl, GLbyte *pc)
{
xGLXMakeCurrentReq *req = (xGLXMakeCurrentReq *) pc;
return DoMakeCurrent( cl, req->drawable, req->drawable,
req->context, req->oldContextTag );
}
int __glXMakeContextCurrent(__GLXclientState *cl, GLbyte *pc)
{
xGLXMakeContextCurrentReq *req = (xGLXMakeContextCurrentReq *) pc;
return DoMakeCurrent( cl, req->drawable, req->readdrawable,
req->context, req->oldContextTag );
}
int __glXMakeCurrentReadSGI(__GLXclientState *cl, GLbyte *pc)
{
xGLXMakeCurrentReadSGIReq *req = (xGLXMakeCurrentReadSGIReq *) pc;
return DoMakeCurrent( cl, req->drawable, req->readable,
req->context, req->oldContextTag );
}
/**
* Given a drawable ID, get the associated drawable and / or pixmap.
*
* If the specified drawable ID is not a pixmap, \c ppPixmap will be set
* to \c NULL on return. In either case, \c ppDraw will be set to a drawable.
* In the case where the drawable ID is a pixmap, \c ppDraw will be set to
* the drawable associated with that pixmap.
*
* \param glxc Associated GLX context.
* \param drawId ID of the drawable.
* \param ppDraw Location to store the pointer to the drawable.
* \param ppPixmap Location to store the pointer to the pixmap.
* \param client Pointer to the client state.
* \return Zero is returned on success. Otherwise a GLX / X11 protocol error
* is returned.
*
* \notes This function will need some modification when support pbuffers
* is added.
*/
static int GetDrawableOrPixmap( __GLXcontext *glxc, GLXDrawable drawId,
DrawablePtr *ppDraw, __GLXpixmap **ppPixmap,
ClientPtr client )
{
DrawablePtr pDraw;
__GLXpixmap *drawPixmap = NULL;
pDraw = (DrawablePtr) LookupDrawable(drawId, client);
if (pDraw) {
if (pDraw->type == DRAWABLE_WINDOW) {
/*
** Drawable is an X Window.
*/
WindowPtr pWin = (WindowPtr)pDraw;
VisualID vid = wVisual(pWin);
/*
** Check if window and context are similar.
*/
if ((vid != glxc->pVisual->vid) ||
(pWin->drawable.pScreen != glxc->pScreen)) {
client->errorValue = drawId;
return BadMatch;
}
} else {
/*
** An X Pixmap is not allowed as a parameter (a GLX Pixmap
** is, but it must first be created with glxCreateGLXPixmap).
*/
client->errorValue = drawId;
return __glXBadDrawable;
}
} else {
drawPixmap = (__GLXpixmap *) LookupIDByType(drawId, __glXPixmapRes);
if (drawPixmap) {
/*
** Check if pixmap and context are similar.
*/
if (drawPixmap->pScreen != glxc->pScreen ||
drawPixmap->pGlxVisual != glxc->pGlxVisual) {
client->errorValue = drawId;
return BadMatch;
}
pDraw = drawPixmap->pDraw;
} else {
/*
** Drawable is neither a Window nor a GLXPixmap.
*/
client->errorValue = drawId;
return __glXBadDrawable;
}
}
*ppPixmap = drawPixmap;
*ppDraw = pDraw;
return 0;
}
static int DoMakeCurrent( __GLXclientState *cl,
GLXDrawable drawId, GLXDrawable readId,
GLXContextID contextId, GLXContextTag tag )
{
ClientPtr client = cl->client;
DrawablePtr pDraw;
xGLXMakeCurrentReq *req = (xGLXMakeCurrentReq *) pc;
DrawablePtr pRead;
xGLXMakeCurrentReply reply;
GLXDrawable drawId = req->drawable;
GLXContextID contextId = req->context;
__GLXpixmap *pGlxPixmap = 0;
__GLXpixmap *drawPixmap = NULL;
__GLXpixmap *readPixmap = NULL;
__GLXcontext *glxc, *prevglxc;
__GLinterface *gc, *prevgc;
__GLXdrawablePrivate *glxPriv = NULL;
GLXContextTag tag = req->oldContextTag;
__GLXdrawablePrivate *drawPriv = NULL;
__GLXdrawablePrivate *readPriv = NULL;
GLint error;
GLuint mask;
/*
** If one is None and the other isn't, it's a bad match.
*/
if ((drawId == None && contextId != None) ||
(drawId != None && contextId == None)) {
mask = (drawId == None) ? (1 << 0) : 0;
mask |= (readId == None) ? (1 << 1) : 0;
mask |= (contextId == None) ? (1 << 2) : 0;
if ( (mask != 0x00) && (mask != 0x07) ) {
return BadMatch;
}
@ -410,6 +526,8 @@ int __glXMakeCurrent(__GLXclientState *cl, GLbyte *pc)
** Lookup new context. It must not be current for someone else.
*/
if (contextId != None) {
int status;
glxc = (__GLXcontext *) LookupIDByType(contextId, __glXContextRes);
if (!glxc) {
client->errorValue = contextId;
@ -420,72 +538,53 @@ int __glXMakeCurrent(__GLXclientState *cl, GLbyte *pc)
return BadAccess;
}
gc = glxc->gc;
assert( drawId != None );
assert( readId != None );
status = GetDrawableOrPixmap( glxc, drawId, & pDraw, & drawPixmap,
client );
if ( status != 0 ) {
return status;
}
if ( readId != drawId ) {
status = GetDrawableOrPixmap( glxc, readId, & pRead, & readPixmap,
client );
if ( status != 0 ) {
return status;
}
} else {
pRead = pDraw;
}
/* FIXME: Finish refactoring this. - idr */
/* get the drawable private */
if (pDraw) {
drawPriv = __glXGetDrawablePrivate(pDraw, drawId, glxc->modes);
if (drawPriv == NULL) {
return __glXBadDrawable;
}
}
if (pRead != pDraw) {
readPriv = __glXGetDrawablePrivate(pRead, readId, glxc->modes);
if (readPriv == NULL) {
return __glXBadDrawable;
}
} else {
readPriv = drawPriv;
}
} else {
/* Switching to no context. Ignore new drawable. */
glxc = 0;
gc = 0;
}
if (drawId != None) {
pDraw = (DrawablePtr) LookupDrawable(drawId, client);
if (pDraw) {
if (pDraw->type == DRAWABLE_WINDOW) {
/*
** Drawable is an X Window.
*/
WindowPtr pWin = (WindowPtr)pDraw;
VisualID vid = wVisual(pWin);
/*
** Check if window and context are similar.
*/
if ((vid != glxc->pVisual->vid) ||
(pWin->drawable.pScreen != glxc->pScreen)) {
client->errorValue = drawId;
return BadMatch;
}
} else {
/*
** An X Pixmap is not allowed as a parameter (a GLX Pixmap
** is, but it must first be created with glxCreateGLXPixmap).
*/
client->errorValue = drawId;
return __glXBadDrawable;
}
} else {
pGlxPixmap = (__GLXpixmap *) LookupIDByType(drawId,
__glXPixmapRes);
if (pGlxPixmap) {
/*
** Check if pixmap and context are similar.
*/
if (pGlxPixmap->pScreen != glxc->pScreen ||
pGlxPixmap->pGlxVisual != glxc->pGlxVisual) {
client->errorValue = drawId;
return BadMatch;
}
pDraw = pGlxPixmap->pDraw;
} else {
/*
** Drawable is neither a Window nor a GLXPixmap.
*/
client->errorValue = drawId;
return __glXBadDrawable;
}
}
} else {
pDraw = 0;
pRead = 0;
}
/* get the drawable private */
if (pDraw) {
glxPriv = __glXGetDrawablePrivate(pDraw, drawId, glxc->modes);
if (glxPriv == NULL) {
return __glXBadDrawable;
}
}
if (prevglxc) {
/*
@ -506,66 +605,97 @@ int __glXMakeCurrent(__GLXclientState *cl, GLbyte *pc)
if (!(*prevgc->exports.loseCurrent)((__GLcontext *)prevgc)) {
return __glXBadContext;
}
__glXDeassociateContext(prevglxc, prevglxc->glxPriv);
__glXDeassociateContext(prevglxc);
}
if ((glxc != 0) && !glxc->isDirect) {
glxc->glxPriv = glxPriv;
__glXCacheDrawableSize(glxPriv);
glxc->drawPriv = drawPriv;
glxc->readPriv = readPriv;
__glXCacheDrawableSize(drawPriv);
/* make the context current */
if (!(*gc->exports.makeCurrent)((__GLcontext *)gc, &glxPriv->glPriv)) {
glxc->glxPriv = NULL;
if (!(*gc->exports.makeCurrent)((__GLcontext *)gc)) {
glxc->drawPriv = NULL;
glxc->readPriv = NULL;
return __glXBadContext;
}
/* resize the buffers */
if (!__glXResizeDrawableBuffers(glxPriv)) {
if (!__glXResizeDrawableBuffers(drawPriv)) {
/* could not do initial resize. make current failed */
(*gc->exports.loseCurrent)((__GLcontext *)gc);
glxc->glxPriv = NULL;
glxc->drawPriv = NULL;
glxc->readPriv = NULL;
return __glXBadContext;
}
glxc->isCurrent = GL_TRUE;
__glXAssociateContext(glxc, glxPriv);
assert(glxPriv->glxc == glxc);
__glXAssociateContext(glxc);
assert(drawPriv->drawGlxc == glxc);
assert(readPriv->readGlxc == glxc);
}
if (prevglxc) {
if (prevglxc->pGlxPixmap) {
if (prevglxc->drawPixmap) {
if (prevglxc->drawPixmap != prevglxc->readPixmap) {
/*
** The previous drawable was a glx pixmap, release it.
*/
prevglxc->readPixmap->refcnt--;
if (!prevglxc->readPixmap->idExists &&
!prevglxc->readPixmap->refcnt) {
PixmapPtr pPixmap = (PixmapPtr) prevglxc->readPixmap->pDraw;
/*
** The DestroyPixmap routine should decrement the
** refcount of the X pixmap and free only if it's zero.
*/
(*prevglxc->readPixmap->pScreen->DestroyPixmap)(pPixmap);
__glXFree(prevglxc->readPixmap);
}
}
/*
** The previous drawable was a glx pixmap, release it.
*/
prevglxc->pGlxPixmap->refcnt--;
if (!prevglxc->pGlxPixmap->idExists &&
!prevglxc->pGlxPixmap->refcnt) {
PixmapPtr pPixmap = (PixmapPtr) prevglxc->pGlxPixmap->pDraw;
prevglxc->drawPixmap->refcnt--;
if (!prevglxc->drawPixmap->idExists &&
!prevglxc->drawPixmap->refcnt) {
PixmapPtr pPixmap = (PixmapPtr) prevglxc->drawPixmap->pDraw;
/*
** The DestroyPixmap routine should decrement the
** refcount of the X pixmap and free only if it's zero.
*/
(*prevglxc->pGlxPixmap->pScreen->DestroyPixmap)(pPixmap);
__glXFree(prevglxc->pGlxPixmap);
(*prevglxc->drawPixmap->pScreen->DestroyPixmap)(pPixmap);
__glXFree(prevglxc->drawPixmap);
}
prevglxc->pGlxPixmap = 0;
prevglxc->drawPixmap = NULL;
}
ChangeCurrentContext(cl, glxc, tag);
StopUsingContext(prevglxc);
} else {
tag = AddCurrentContext(cl, glxc);
}
if (glxc) {
if (pGlxPixmap) {
pGlxPixmap->refcnt++;
glxc->pGlxPixmap = pGlxPixmap;
if (drawPixmap) {
drawPixmap->refcnt++;
glxc->drawPixmap = drawPixmap;
}
if (readPixmap && (readPixmap != drawPixmap)) {
readPixmap->refcnt++;
glxc->readPixmap = readPixmap;
}
StartUsingContext(cl, glxc);
reply.contextTag = tag;
} else {
reply.contextTag = 0;
}
reply.length = 0;
reply.type = X_Reply;
reply.sequenceNumber = client->sequence;
@ -617,6 +747,8 @@ int __glXQueryVersion(__GLXclientState *cl, GLbyte *pc)
major = req->majorVersion;
minor = req->minorVersion;
(void)major;
(void)minor;
/*
** Server should take into consideration the version numbers sent by the
@ -1446,6 +1578,8 @@ int __glXVendorPrivateWithReply(__GLXclientState *cl, GLbyte *pc)
switch (vendorcode) {
case X_GLXvop_QueryContextInfoEXT:
return __glXQueryContextInfoEXT(cl, pc);
case X_GLXvop_MakeCurrentReadSGI:
return __glXMakeCurrentReadSGI(cl, pc);
default:
break;
}

44
GL/glx/glxcmdsswap.c
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/GL/glx/glxcmdsswap.c,v 1.7 2002/01/14 22:47:08 tsi Exp $ */
/* $XFree86: xc/programs/Xserver/GL/glx/glxcmdsswap.c,v 1.9 2003/10/28 22:50:17 tsi Exp $ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
@ -94,6 +94,34 @@ int __glXSwapMakeCurrent(__GLXclientState *cl, GLbyte *pc)
return __glXMakeCurrent(cl, pc);
}
int __glXSwapMakeContextCurrent(__GLXclientState *cl, GLbyte *pc)
{
xGLXMakeContextCurrentReq *req = (xGLXMakeContextCurrentReq *) pc;
__GLX_DECLARE_SWAP_VARIABLES;
__GLX_SWAP_SHORT(&req->length);
__GLX_SWAP_INT(&req->drawable);
__GLX_SWAP_INT(&req->readdrawable);
__GLX_SWAP_INT(&req->context);
__GLX_SWAP_INT(&req->oldContextTag);
return __glXMakeContextCurrent(cl, pc);
}
int __glXSwapMakeCurrentReadSGI(__GLXclientState *cl, GLbyte *pc)
{
xGLXMakeCurrentReadSGIReq *req = (xGLXMakeCurrentReadSGIReq *) pc;
__GLX_DECLARE_SWAP_VARIABLES;
__GLX_SWAP_SHORT(&req->length);
__GLX_SWAP_INT(&req->drawable);
__GLX_SWAP_INT(&req->readable);
__GLX_SWAP_INT(&req->context);
__GLX_SWAP_INT(&req->oldContextTag);
return __glXMakeCurrentReadSGI(cl, pc);
}
int __glXSwapIsDirect(__GLXclientState *cl, GLbyte *pc)
{
xGLXIsDirectReq *req = (xGLXIsDirectReq *) pc;
@ -329,7 +357,7 @@ int __glXSwapClientInfo(__GLXclientState *cl, GLbyte *pc)
return __glXClientInfo(cl, pc);
}
int __glXSwapQueryContextInfoEXT(__GLXclientState *cl, char *pc)
int __glXSwapQueryContextInfoEXT(__GLXclientState *cl, GLbyte *pc)
{
xGLXQueryContextInfoEXTReq *req = (xGLXQueryContextInfoEXTReq *) pc;
__GLX_DECLARE_SWAP_VARIABLES;
@ -337,7 +365,7 @@ int __glXSwapQueryContextInfoEXT(__GLXclientState *cl, char *pc)
__GLX_SWAP_SHORT(&req->length);
__GLX_SWAP_INT(&req->context);
return __glXQueryContextInfoEXT(cl, (GLbyte *)pc);
return __glXQueryContextInfoEXT(cl, pc);
}
/************************************************************************/
@ -785,6 +813,16 @@ int __glXSwapVendorPrivateWithReply(__GLXclientState *cl, GLbyte *pc)
vendorcode = req->vendorCode;
switch (vendorcode) {
case X_GLXvop_QueryContextInfoEXT:
return __glXSwapQueryContextInfoEXT(cl, pc);
case X_GLXvop_MakeCurrentReadSGI:
return __glXSwapMakeCurrentReadSGI(cl, pc);
default:
break;
}
if ((vendorcode >= __GLX_MIN_VENDPRIV_OPCODE_EXT) &&
(vendorcode <= __GLX_MAX_VENDPRIV_OPCODE_EXT)) {
return (*__glXSwapVendorPrivTable_EXT[vendorcode-__GLX_MIN_VENDPRIV_OPCODE_EXT])(cl, (GLbyte*)req);

11
GL/glx/glxcontext.h
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/GL/glx/glxcontext.h,v 1.4 2002/02/22 21:45:07 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/GL/glx/glxcontext.h,v 1.5 2003/09/28 20:15:43 alanh Exp $ */
#ifndef _GLX_context_h_
#define _GLX_context_h_
@ -54,7 +54,8 @@ struct __GLXcontextRec {
/*
** list of contexts bound to the same drawable
*/
struct __GLXcontextRec *nextPriv;
struct __GLXcontextRec *nextDrawPriv;
struct __GLXcontextRec *nextReadPriv;
/*
** Opaque pointer the context object created by the GL that the
@ -142,12 +143,14 @@ struct __GLXcontextRec {
/*
** Set only if current drawable is a glx pixmap.
*/
__GLXpixmap *pGlxPixmap;
__GLXpixmap *drawPixmap;
__GLXpixmap *readPixmap;
/*
** The drawable private this context is bound to
*/
__GLXdrawablePrivate *glxPriv;
__GLXdrawablePrivate *drawPriv;
__GLXdrawablePrivate *readPriv;
};
/* pending state defines */

10
GL/glx/glxdrawable.h
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/GL/glx/glxdrawable.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/GL/glx/glxdrawable.h,v 1.4 2003/09/28 20:15:43 alanh Exp $ */
#ifndef _GLX_drawable_h_
#define _GLX_drawable_h_
@ -78,9 +78,13 @@ struct __GLXdrawablePrivateRec {
GLint width, height;
/*
** list of contexts bound to this drawable
** Lists of contexts bound to this drawable. There are two lists here.
** One list is of the contexts that have this drawable bound for drawing,
** and the other is the list of contexts that have this drawable bound
** for reading.
*/
struct __GLXcontextRec *glxc;
struct __GLXcontextRec *drawGlxc;
struct __GLXcontextRec *readGlxc;
/*
** "methods" that the drawble should be able to respond to.

6
GL/glx/glxext.c
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/GL/glx/glxext.c,v 1.8 2001/08/23 18:25:40 alanh Exp $
/* $XFree86: xc/programs/Xserver/GL/glx/glxext.c,v 1.9 2003/09/28 20:15:43 alanh Exp $
** The contents of this file are subject to the GLX Public License Version 1.0
** (the "License"). You may not use this file except in compliance with the
** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
@ -114,7 +114,7 @@ static int ClientGone(int clientIndex, XID id)
for (i=0; i < cl->numCurrentContexts; i++) {
cx = cl->currentContexts[i];
if (cx) {
__glXDeassociateContext(cx, cx->glxPriv);
__glXDeassociateContext(cx);
cx->isCurrent = GL_FALSE;
if (!cx->idExists) {
__glXFreeContext(cx);
@ -343,7 +343,7 @@ __GLXcontext *__glXForceCurrent(__GLXclientState *cl, GLXContextTag tag,
}
if (!cx->isDirect) {
if (cx->glxPriv == NULL) {
if (cx->drawPriv == NULL) {
/*
** The drawable has vanished. It must be a window, because only
** windows can be destroyed from under us; GLX pixmaps are

9
GL/glx/glxext.h
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/GL/glx/glxext.h,v 1.4 2001/03/21 16:29:36 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/GL/glx/glxext.h,v 1.7 2003/11/17 22:20:26 dawes Exp $ */
#ifndef _glxext_h_
#define _glxext_h_
@ -71,14 +71,16 @@ extern GLboolean __glXErrorOccured(void);
extern void __glXResetLargeCommandStatus(__GLXclientState*);
extern int __glXQueryContextInfoEXT(__GLXclientState *cl, GLbyte *pc);
extern int __glXSwapQueryContextInfoEXT(__GLXclientState *cl, char *pc);
extern int __glXSwapQueryContextInfoEXT(__GLXclientState *cl, GLbyte *pc);
extern int __glXMakeCurrentReadSGI(__GLXclientState *cl, GLbyte *pc);
extern int __glXSwapMakeCurrentReadSGI(__GLXclientState *cl, GLbyte *pc);
extern void GlxExtensionInit(void);
extern Bool __glXCoreType(void);
extern int GlxInitVisuals(
#if NeedFunctionPrototypes
VisualPtr * visualp,
DepthPtr * depthp,
int * nvisualp,
@ -88,7 +90,6 @@ extern int GlxInitVisuals(
unsigned long sizes,
int bitsPerRGB,
int preferredVis
#endif
);
#endif /* _glxext_h_ */

13
GL/glx/glximports.c
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/GL/glx/glximports.c,v 1.5 2001/03/21 16:29:36 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/GL/glx/glximports.c,v 1.6 2003/09/28 20:15:43 alanh Exp $ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
@ -167,5 +167,14 @@ __GLdrawablePrivate *__glXImpGetDrawablePrivate(__GLcontext *gc)
__GLinterface *glci = (__GLinterface *) gc;
__GLXcontext *glrc = (__GLXcontext *) glci->imports.other;
return &glrc->glxPriv->glPriv;
return &glrc->drawPriv->glPriv;
}
__GLdrawablePrivate *__glXImpGetReadablePrivate(__GLcontext *gc)
{
__GLinterface *glci = (__GLinterface *) gc;
__GLXcontext *glrc = (__GLXcontext *) glci->imports.other;
return &glrc->readPriv->glPriv;
}

3
GL/glx/glximports.h
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/GL/glx/glximports.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/GL/glx/glximports.h,v 1.4 2003/09/28 20:15:43 alanh Exp $ */
#ifndef _glximports_h_
#define _glximports_h_
@ -55,6 +55,7 @@ extern int __glXImpFprintf(__GLcontext *gc, void *stream,
const char *fmt, ...);
extern __GLdrawablePrivate *__glXImpGetDrawablePrivate(__GLcontext *gc);
extern __GLdrawablePrivate *__glXImpGetReadablePrivate(__GLcontext *gc);
#endif /* _glximports_h_ */

93
GL/glx/glxscreens.c
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/GL/glx/glxscreens.c,v 1.10 2002/04/04 14:05:36 eich Exp $ */
/* $XFree86: xc/programs/Xserver/GL/glx/glxscreens.c,v 1.12 2003/09/28 20:15:43 alanh Exp $ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
@ -46,23 +46,77 @@
#include "glxserver.h"
#include "glxutil.h"
static char GLServerExtensions[] =
static const char GLServerExtensions[] =
"GL_ARB_depth_texture "
"GL_ARB_imaging "
"GL_ARB_multitexture "
"GL_ARB_point_parameters "
"GL_ARB_shadow "
"GL_ARB_shadow_ambient "
"GL_ARB_texture_border_clamp "
"GL_ARB_texture_cube_map "
"GL_ARB_texture_env_add "
"GL_ARB_texture_env_combine "
"GL_ARB_texture_env_crossbar "
"GL_ARB_texture_env_dot3 "
"GL_ARB_texture_mirrored_repeat "
"GL_ARB_transpose_matrix "
"GL_ARB_window_pos "
"GL_EXT_abgr "
"GL_EXT_blend_color "
"GL_EXT_blend_minmax "
"GL_EXT_blend_subtract "
"GL_EXT_texture_env_add "
"GL_EXT_texture_env_combine "
"GL_EXT_texture_env_dot3 "
"GL_EXT_texture_lod_bias "
"GL_EXT_bgra "
"GL_EXT_blend_color "
"GL_EXT_blend_func_separate "
"GL_EXT_blend_logic_op "
"GL_EXT_blend_minmax "
"GL_EXT_blend_subtract "
"GL_EXT_clip_volume_hint "
"GL_EXT_copy_texture "
"GL_EXT_draw_range_elements "
"GL_EXT_fog_coord "
"GL_EXT_multi_draw_arrays "
"GL_EXT_packed_pixels "
"GL_EXT_polygon_offset "
"GL_EXT_rescale_normal "
"GL_EXT_secondary_color "
"GL_EXT_separate_specular_color "
"GL_EXT_shadow_funcs "
"GL_EXT_stencil_two_side "
"GL_EXT_stencil_wrap "
"GL_EXT_subtexture "
"GL_EXT_texture "
"GL_EXT_texture3D "
"GL_EXT_texture_edge_clamp "
"GL_EXT_texture_env_add "
"GL_EXT_texture_env_combine "
"GL_EXT_texture_env_dot3 "
"GL_EXT_texture_lod "
"GL_EXT_texture_lod_bias "
"GL_EXT_texture_object "
"GL_EXT_texture_rectangle "
"GL_EXT_vertex_array "
"GL_APPLE_packed_pixels "
"GL_ATI_texture_mirror_once "
"GL_ATI_texture_env_combine3 "
#if 0
/* This is currently removed because there seem to be some problems with
* it and the software-only indirect rendering path. At this point, I'm
* not sure which side (client or server) has the problem. - idr
*/
"GL_HP_occlusion_test "
#endif
"GL_IBM_texture_mirrored_repeat "
"GL_MESA_pack_invert "
"GL_MESA_ycbcr_texture "
"GL_NV_blend_square "
"GL_NV_texgen_reflection "
"GL_NV_texture_rectangle "
"GL_SGIS_generate_mipmap "
"GL_SGIS_texture_border_clamp "
"GL_SGIS_texture_edge_clamp "
"GL_SGIS_texture_lod "
"GL_SGIX_depth_texture "
"GL_SGIX_shadow "
"GL_SGIX_shadow_ambient "
;
/*
@ -75,6 +129,7 @@ static char GLXServerExtensions[] =
"GLX_EXT_visual_info "
"GLX_EXT_visual_rating "
"GLX_EXT_import_context "
"GLX_SGI_make_current_read "
;
/*
@ -94,6 +149,7 @@ GLint __glXNumActiveScreens;
RESTYPE __glXDrawableRes;
#if 0
static int
CountBits(unsigned long mask)
{
@ -106,6 +162,7 @@ CountBits(unsigned long mask)
return count;
}
#endif
#if 0
/*
@ -186,8 +243,13 @@ static Bool DrawableGone(__GLXdrawablePrivate *glxPriv, XID xid)
** When a window is destroyed, notify all context bound to
** it, that there are no longer bound to anything.
*/
for (cx = glxPriv->glxc; cx; cx = cx1) {
cx1 = cx->nextPriv;
for (cx = glxPriv->drawGlxc; cx; cx = cx1) {
cx1 = cx->nextDrawPriv;
cx->pendingState |= __GLX_PENDING_DESTROY;
}
for (cx = glxPriv->readGlxc; cx; cx = cx1) {
cx1 = cx->nextReadPriv;
cx->pendingState |= __GLX_PENDING_DESTROY;
}
}
@ -247,9 +309,14 @@ static Bool PositionWindow(WindowPtr pWin, int x, int y)
/* XXX: what can we possibly do here? */
ret = False;
}
/* mark contexts as needing resize */
glxc = NULL;
for (glxc = glxPriv->glxc; glxc; glxc = glxc->nextPriv) {
for (glxc = glxPriv->drawGlxc; glxc; glxc = glxc->nextDrawPriv) {
glxc->pendingState |= __GLX_PENDING_RESIZE;
}
for (glxc = glxPriv->readGlxc; glxc; glxc = glxc->nextReadPriv) {
glxc->pendingState |= __GLX_PENDING_RESIZE;
}

4
GL/glx/glxserver.h
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/GL/glx/glxserver.h,v 1.4 2001/08/23 18:25:40 alanh Exp $ */
/* $XFree86: xc/programs/Xserver/GL/glx/glxserver.h,v 1.5 2003/09/28 20:15:43 alanh Exp $ */
#ifndef _GLX_server_h_
#define _GLX_server_h_
@ -279,4 +279,6 @@ extern int __glXConvolutionParameterfvSize(GLenum pname);
extern int __glXColorTableParameterfvSize(GLenum pname);
extern int __glXColorTableParameterivSize(GLenum pname);
extern int __glXPointParameterfvARBReqSize(GLbyte *pc, Bool swap);
#endif /* !__GLX_server_h__ */

72
GL/glx/glxutil.c
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/GL/glx/glxutil.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/GL/glx/glxutil.c,v 1.6 2003/09/28 20:15:43 alanh Exp $ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
@ -130,33 +130,59 @@ __glXFree(void *addr)
** associate a context with a drawable
*/
void
__glXAssociateContext(__GLXcontext *glxc, __GLXdrawablePrivate *glxPriv)
__glXAssociateContext(__GLXcontext *glxc)
{
glxc->nextPriv = glxPriv->glxc;
glxPriv->glxc = glxc;
glxc->nextDrawPriv = glxc->drawPriv->drawGlxc;
glxc->drawPriv->drawGlxc = glxc;
__glXRefDrawablePrivate(glxPriv);
__glXRefDrawablePrivate(glxc->drawPriv);
glxc->nextReadPriv = glxc->readPriv->readGlxc;
glxc->readPriv->readGlxc = glxc;
__glXRefDrawablePrivate(glxc->readPriv);
}
/*
** Deassociate a context from a drawable
*/
void
__glXDeassociateContext(__GLXcontext *glxc, __GLXdrawablePrivate *glxPriv)
__glXDeassociateContext(__GLXcontext *glxc)
{
__GLXcontext *glxc1, *glxc2;
__GLXcontext *curr, *prev;
glxc2 = NULL;
for (glxc1=glxPriv->glxc; glxc1; glxc2=glxc1, glxc1=glxc1->nextPriv) {
if (glxc1 == glxc) {
prev = NULL;
for ( curr = glxc->drawPriv->drawGlxc
; curr != NULL
; prev = curr, curr = curr->nextDrawPriv ) {
if (curr == glxc) {
/* found context. Deassociate. */
if (glxc2 == NULL) {
glxPriv->glxc = glxc1->nextPriv;
if (prev == NULL) {
glxc->drawPriv->drawGlxc = curr->nextDrawPriv;
} else {
glxc2->nextPriv = glxc1->nextPriv;
prev->nextDrawPriv = curr->nextDrawPriv;
}
glxc1->nextPriv = NULL;
__glXUnrefDrawablePrivate(glxPriv);
curr->nextDrawPriv = NULL;
__glXUnrefDrawablePrivate(glxc->drawPriv);
break;
}
}
prev = NULL;
for ( curr = glxc->readPriv->readGlxc
; curr != NULL
; prev = curr, curr = curr->nextReadPriv ) {
if (curr == glxc) {
/* found context. Deassociate. */
if (prev == NULL) {
glxc->readPriv->readGlxc = curr->nextReadPriv;
} else {
prev->nextReadPriv = curr->nextReadPriv;
}
curr->nextReadPriv = NULL;
__glXUnrefDrawablePrivate(glxc->readPriv);
break;
}
}
@ -259,16 +285,18 @@ LockDP(__GLdrawablePrivate *glPriv, __GLcontext *gc)
assert((glxc->pendingState & __GLX_PENDING_RESIZE) == 0x0);
}
if (glxc->pendingState & __GLX_PENDING_DESTROY) {
__GLXdrawablePrivate *glxPriv = glxc->glxPriv;
glxc->pendingState &= ~__GLX_PENDING_DESTROY;
assert(glxPriv->xorigin == 0);
assert(glxPriv->yorigin == 0);
assert(glxPriv->width == 0);
assert(glxPriv->height == 0);
assert(glxc->drawPriv->xorigin == 0);
assert(glxc->drawPriv->yorigin == 0);
assert(glxc->drawPriv->width == 0);
assert(glxc->drawPriv->height == 0);
assert(glxc->readPriv->xorigin == 0);
assert(glxc->readPriv->yorigin == 0);
assert(glxc->readPriv->width == 0);
assert(glxc->readPriv->height == 0);
(*glci->exports.notifyDestroy)(gc);
__glXDeassociateContext(glxc, glxPriv);
__glXDeassociateContext(glxc);
assert((glxc->pendingState & __GLX_PENDING_DESTROY) == 0x0);
}
if (glxc->pendingState & __GLX_PENDING_SWAP) {

6
GL/glx/glxutil.h
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/GL/glx/glxutil.h,v 1.3 2001/03/21 16:29:37 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/GL/glx/glxutil.h,v 1.4 2003/09/28 20:15:43 alanh Exp $ */
#ifndef _glxcmds_h_
#define _glxcmds_h_
@ -46,8 +46,8 @@ extern void *__glXRealloc(void *addr, size_t newSize);
extern void __glXFree(void *ptr);
/* relate contexts with drawables */
extern void __glXAssociateContext(__GLXcontext *glxc, __GLXdrawablePrivate *glxPriv);
extern void __glXDeassociateContext(__GLXcontext *glxc, __GLXdrawablePrivate *glxPriv);
extern void __glXAssociateContext(__GLXcontext *glxc);
extern void __glXDeassociateContext(__GLXcontext *glxc);
/* drawable operation */
extern void __glXGetDrawableSize(__GLdrawablePrivate *glPriv,

4
GL/glx/impsize.h
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/GL/glx/impsize.h,v 1.3 2001/03/21 16:29:37 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/GL/glx/impsize.h,v 1.4 2003/09/28 20:15:43 alanh Exp $ */
#ifndef _impsize_h_
#define _impsize_h_
@ -67,4 +67,6 @@ extern int __glTexParameterfv_size(GLenum e);
extern int __glTexParameteriv_size(GLenum e);
extern int __glEvalComputeK(GLenum target);
extern int __glPointParameterfvARB_size(GLenum pname);
#endif /* _impsize_h_ */

20
GL/glx/render2.c
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/GL/glx/render2.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/GL/glx/render2.c,v 1.6 2003/10/28 22:50:18 tsi Exp $ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
@ -82,18 +82,25 @@ void __glXDisp_Map2f(GLbyte *pc)
void __glXDisp_Map1d(GLbyte *pc)
{
GLint order, k, compsize;
GLint order, k;
#ifdef __GLX_ALIGN64
GLint compsize;
#endif
GLenum target;
GLdouble u1, u2, *points;
target = *(GLenum*) (pc + 16);
order = *(GLint*) (pc + 20);
k = __glEvalComputeK(target);
#ifdef __GLX_ALIGN64
if (order < 0 || k < 0) {
compsize = 0;
} else {
compsize = order * k;
}
#endif
__GLX_GET_DOUBLE(u1,pc);
__GLX_GET_DOUBLE(u2,pc+8);
pc += 24;
@ -118,18 +125,25 @@ void __glXDisp_Map1d(GLbyte *pc)
void __glXDisp_Map2d(GLbyte *pc)
{
GLdouble u1, u2, v1, v2, *points;
GLint uorder, vorder, ustride, vstride, k, compsize;
GLint uorder, vorder, ustride, vstride, k;
#ifdef __GLX_ALIGN64
GLint compsize;
#endif
GLenum target;
target = *(GLenum *)(pc + 32);
uorder = *(GLint *)(pc + 36);
vorder = *(GLint *)(pc + 40);
k = __glEvalComputeK(target);
#ifdef __GLX_ALIGN64
if (vorder < 0 || uorder < 0 || k < 0) {
compsize = 0;
} else {
compsize = uorder * vorder * k;
}
#endif
__GLX_GET_DOUBLE(u1,pc);
__GLX_GET_DOUBLE(u2,pc+8);
__GLX_GET_DOUBLE(v1,pc+16);

132
GL/glx/rensize.c
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/GL/glx/rensize.c,v 1.5 2002/02/22 21:45:07 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/GL/glx/rensize.c,v 1.6 2003/09/28 20:15:43 alanh Exp $ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
@ -267,109 +267,8 @@ int __glXPixelMapusvReqSize(GLbyte *pc, Bool swap )
int __glXImageSize( GLenum format, GLenum type, GLsizei w, GLsizei h,
GLint rowLength, GLint skipRows, GLint alignment )
{
GLint bytesPerElement, elementsPerGroup, groupsPerRow;
GLint groupSize, rowSize, padding;
if (w < 0 || h < 0 ||
(type == GL_BITMAP &&
(format != GL_COLOR_INDEX && format != GL_STENCIL_INDEX))) {
return -1;
}
if (w==0 || h==0) return 0;
if (type == GL_BITMAP) {
if (rowLength > 0) {
groupsPerRow = rowLength;
} else {
groupsPerRow = w;
}
rowSize = (groupsPerRow + 7) >> 3;
padding = (rowSize % alignment);
if (padding) {
rowSize += alignment - padding;
}
return ((h + skipRows) * rowSize);
} else {
switch(format) {
case GL_COLOR_INDEX:
case GL_STENCIL_INDEX:
case GL_DEPTH_COMPONENT:
elementsPerGroup = 1;
break;
case GL_RED:
case GL_GREEN:
case GL_BLUE:
case GL_ALPHA:
case GL_LUMINANCE:
case GL_INTENSITY:
elementsPerGroup = 1;
break;
case GL_LUMINANCE_ALPHA:
elementsPerGroup = 2;
break;
case GL_RGB:
case GL_BGR:
elementsPerGroup = 3;
break;
case GL_RGBA:
case GL_BGRA:
case GL_ABGR_EXT:
elementsPerGroup = 4;
break;
default:
return -1;
}
switch(type) {
case GL_UNSIGNED_BYTE:
case GL_BYTE:
bytesPerElement = 1;
break;
case GL_UNSIGNED_BYTE_3_3_2:
case GL_UNSIGNED_BYTE_2_3_3_REV:
bytesPerElement = 1;
elementsPerGroup = 1;
break;
case GL_UNSIGNED_SHORT:
case GL_SHORT:
bytesPerElement = 2;
break;
case GL_UNSIGNED_SHORT_5_6_5:
case GL_UNSIGNED_SHORT_5_6_5_REV:
case GL_UNSIGNED_SHORT_4_4_4_4:
case GL_UNSIGNED_SHORT_4_4_4_4_REV:
case GL_UNSIGNED_SHORT_5_5_5_1:
case GL_UNSIGNED_SHORT_1_5_5_5_REV:
bytesPerElement = 2;
elementsPerGroup = 1;
break;
case GL_INT:
case GL_UNSIGNED_INT:
case GL_FLOAT:
bytesPerElement = 4;
break;
case GL_UNSIGNED_INT_8_8_8_8:
case GL_UNSIGNED_INT_8_8_8_8_REV:
case GL_UNSIGNED_INT_10_10_10_2:
case GL_UNSIGNED_INT_2_10_10_10_REV:
bytesPerElement = 4;
elementsPerGroup = 1;
break;
default:
return -1;
}
groupSize = bytesPerElement * elementsPerGroup;
if (rowLength > 0) {
groupsPerRow = rowLength;
} else {
groupsPerRow = w;
}
rowSize = groupsPerRow * groupSize;
padding = (rowSize % alignment);
if (padding) {
rowSize += alignment - padding;
}
return ((h + skipRows) * rowSize);
}
return __glXImage3DSize( format, type, w, h, 1, 0, rowLength,
0, skipRows, alignment );
}
/* XXX
@ -406,8 +305,6 @@ int __glXImage3DSize( GLenum format, GLenum type, GLsizei w, GLsizei h,
case GL_COLOR_INDEX:
case GL_STENCIL_INDEX:
case GL_DEPTH_COMPONENT:
elementsPerGroup = 1;
break;
case GL_RED:
case GL_GREEN:
case GL_BLUE:
@ -416,6 +313,13 @@ int __glXImage3DSize( GLenum format, GLenum type, GLsizei w, GLsizei h,
case GL_INTENSITY:
elementsPerGroup = 1;
break;
case GL_422_EXT:
case GL_422_REV_EXT:
case GL_422_AVERAGE_EXT:
case GL_422_REV_AVERAGE_EXT:
case GL_DEPTH_STENCIL_NV:
case GL_DEPTH_STENCIL_MESA:
case GL_YCBCR_MESA:
case GL_LUMINANCE_ALPHA:
elementsPerGroup = 2;
break;
@ -451,6 +355,10 @@ int __glXImage3DSize( GLenum format, GLenum type, GLsizei w, GLsizei h,
case GL_UNSIGNED_SHORT_4_4_4_4_REV:
case GL_UNSIGNED_SHORT_5_5_5_1:
case GL_UNSIGNED_SHORT_1_5_5_5_REV:
case GL_UNSIGNED_SHORT_8_8_APPLE:
case GL_UNSIGNED_SHORT_8_8_REV_APPLE:
case GL_UNSIGNED_SHORT_15_1_MESA:
case GL_UNSIGNED_SHORT_1_15_REV_MESA:
bytesPerElement = 2;
elementsPerGroup = 1;
break;
@ -463,6 +371,9 @@ int __glXImage3DSize( GLenum format, GLenum type, GLsizei w, GLsizei h,
case GL_UNSIGNED_INT_8_8_8_8_REV:
case GL_UNSIGNED_INT_10_10_10_2:
case GL_UNSIGNED_INT_2_10_10_10_REV:
case GL_UNSIGNED_INT_24_8_NV:
case GL_UNSIGNED_INT_24_8_MESA:
case GL_UNSIGNED_INT_8_24_REV_MESA:
bytesPerElement = 4;
elementsPerGroup = 1;
break;
@ -998,3 +909,12 @@ int __glXColorTableParameterivReqSize(GLbyte *pc, Bool swap )
/* no difference between fv and iv versions */
return __glXColorTableParameterfvReqSize(pc, swap);
}
int __glXPointParameterfvARBReqSize(GLbyte *pc, Bool swap )
{
GLenum pname = *(GLenum *)(pc + 0);
if (swap) {
pname = SWAPL( pname );
}
return 4 * __glPointParameterfvARB_size( pname );
}

4257
GL/glx/rensizetab.c
View File

File diff suppressed because it is too large Load Diff

218
GL/glx/singlesize.c
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/GL/glx/singlesize.c,v 1.4 2002/02/22 21:45:07 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/GL/glx/singlesize.c,v 1.6 2003/11/06 18:37:56 tsi Exp $ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
@ -35,6 +35,7 @@
*/
#include <GL/gl.h>
#include "glxserver.h"
#include "singlesize.h"
/*
@ -46,101 +47,7 @@
GLint __glReadPixels_size(GLenum format, GLenum type, GLint w, GLint h)
{
GLint elements, esize;
GLint rowsize, padding;
if (w < 0 || h < 0) {
return -1;
}
switch (format) {
case GL_COLOR_INDEX:
case GL_STENCIL_INDEX:
case GL_DEPTH_COMPONENT:
elements = 1;
break;
case GL_RED:
case GL_GREEN:
case GL_BLUE:
case GL_ALPHA:
case GL_LUMINANCE:
case GL_INTENSITY:
elements = 1;
break;
case GL_LUMINANCE_ALPHA:
elements = 2;
break;
case GL_RGB:
case GL_BGR:
elements = 3;
break;
case GL_RGBA:
case GL_BGRA:
case GL_ABGR_EXT:
elements = 4;
break;
default:
return -1;
}
/*
** According to the GLX protocol, each row must be padded to a multiple of
** 4 bytes. 4 bytes also happens to be the default alignment in the pixel
** store modes of the GL.
*/
switch (type) {
case GL_BITMAP:
if (format == GL_COLOR_INDEX || format == GL_STENCIL_INDEX) {
rowsize = ((w * elements)+7)/8;
padding = rowsize % 4;
if (padding) {
rowsize += 4 - padding;
}
return (rowsize * h);
} else {
return -1;
}
case GL_BYTE:
case GL_UNSIGNED_BYTE:
esize = 1;
break;
case GL_UNSIGNED_BYTE_3_3_2:
case GL_UNSIGNED_BYTE_2_3_3_REV:
esize = 1;
elements = 1;
break;
case GL_SHORT:
case GL_UNSIGNED_SHORT:
esize = 2;
break;
case GL_UNSIGNED_SHORT_5_6_5:
case GL_UNSIGNED_SHORT_5_6_5_REV:
case GL_UNSIGNED_SHORT_4_4_4_4:
case GL_UNSIGNED_SHORT_4_4_4_4_REV:
case GL_UNSIGNED_SHORT_5_5_5_1:
case GL_UNSIGNED_SHORT_1_5_5_5_REV:
esize = 2;
elements = 1;
break;
case GL_INT:
case GL_UNSIGNED_INT:
case GL_FLOAT:
esize = 4;
break;
case GL_UNSIGNED_INT_8_8_8_8:
case GL_UNSIGNED_INT_8_8_8_8_REV:
case GL_UNSIGNED_INT_10_10_10_2:
case GL_UNSIGNED_INT_2_10_10_10_REV:
esize = 4;
elements = 1;
break;
default:
return -1;
}
rowsize = w * elements * esize;
padding = rowsize % 4;
if (padding) {
rowsize += 4 - padding;
}
return (rowsize * h);
return __glXImage3DSize( format, type, w, h, 1, 0, 0, 0, 0, 4 );
}
GLint __glGetTexEnvfv_size(GLenum pname)
@ -207,23 +114,43 @@ GLint __glGetTexGeniv_size(GLenum pname)
GLint __glGetTexParameterfv_size(GLenum pname)
{
switch (pname) {
case GL_TEXTURE_BORDER_COLOR:
return 4;
case GL_TEXTURE_WRAP_S:
case GL_TEXTURE_WRAP_T:
case GL_TEXTURE_WRAP_R:
return 1;
case GL_TEXTURE_MIN_FILTER:
case GL_TEXTURE_MAG_FILTER:
return 1;
case GL_TEXTURE_BORDER_COLOR:
return 4;
case GL_TEXTURE_PRIORITY:
return 1;
case GL_TEXTURE_RESIDENT:
return 1;
/* GL_SGIS_texture_lod / GL_EXT_texture_lod / GL 1.2 */
case GL_TEXTURE_MIN_LOD:
case GL_TEXTURE_MAX_LOD:
case GL_TEXTURE_BASE_LEVEL:
case GL_TEXTURE_MAX_LEVEL:
/* GL_SGIX_texture_lod_bias */
case GL_TEXTURE_LOD_BIAS_S_SGIX:
case GL_TEXTURE_LOD_BIAS_T_SGIX:
case GL_TEXTURE_LOD_BIAS_R_SGIX:
/* GL_ARB_shadow / GL 1.4 */
case GL_TEXTURE_COMPARE_MODE:
case GL_TEXTURE_COMPARE_FUNC:
/* GL_SGIX_shadow_ambient / GL_ARB_shadow_ambient */
case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB:
/* GL_SGIX_shadow */
case GL_TEXTURE_COMPARE_SGIX:
case GL_TEXTURE_COMPARE_OPERATOR_SGIX:
/* GL_SGIX_texture_coordinate_clamp */
case GL_TEXTURE_MAX_CLAMP_S_SGIX:
case GL_TEXTURE_MAX_CLAMP_T_SGIX:
case GL_TEXTURE_MAX_CLAMP_R_SGIX:
return 1;
default:
@ -911,6 +838,15 @@ GLint __glGet_size(GLenum sq)
case GL_TEXTURE_BINDING_CUBE_MAP_ARB:
case GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB:
return 1;
case GL_OCCLUSION_TEST_RESULT_HP:
case GL_OCCLUSION_TEST_HP:
return 1;
case GL_PACK_INVERT_MESA:
return 1;
case GL_CULL_VERTEX_IBM:
return 1;
case GL_RASTER_POSITION_UNCLIPPED_IBM:
return 1;
default:
return -1;
}
@ -964,82 +900,8 @@ GLint __glGetTexLevelParameteriv_size(GLenum pname)
GLint __glGetTexImage_size(GLenum target, GLint level, GLenum format,
GLenum type, GLint width, GLint height, GLint depth)
{
GLint elements, esize;
GLint padding, rowsize;
switch (format) {
case GL_RGBA:
case GL_BGRA:
case GL_ABGR_EXT:
elements = 4;
break;
case GL_RGB:
case GL_BGR:
elements = 3;
break;
case GL_RED:
case GL_GREEN:
case GL_BLUE:
case GL_ALPHA:
case GL_LUMINANCE:
case GL_INTENSITY:
elements = 1;
break;
case GL_LUMINANCE_ALPHA:
elements = 2;
break;
default:
return -1;
}
switch (type) {
case GL_BYTE:
case GL_UNSIGNED_BYTE:
esize = 1;
break;
case GL_UNSIGNED_BYTE_3_3_2:
case GL_UNSIGNED_BYTE_2_3_3_REV:
esize = 1;
elements = 1;
break;
case GL_SHORT:
case GL_UNSIGNED_SHORT:
esize = 2;
break;
case GL_UNSIGNED_SHORT_5_6_5:
case GL_UNSIGNED_SHORT_5_6_5_REV:
case GL_UNSIGNED_SHORT_4_4_4_4:
case GL_UNSIGNED_SHORT_4_4_4_4_REV:
case GL_UNSIGNED_SHORT_5_5_5_1:
case GL_UNSIGNED_SHORT_1_5_5_5_REV:
esize = 2;
elements = 1;
break;
case GL_INT:
case GL_UNSIGNED_INT:
case GL_FLOAT:
esize = 4;
break;
case GL_UNSIGNED_INT_8_8_8_8:
case GL_UNSIGNED_INT_8_8_8_8_REV:
case GL_UNSIGNED_INT_10_10_10_2:
case GL_UNSIGNED_INT_2_10_10_10_REV:
esize = 4;
elements = 1;
break;
default:
return -1;
}
/*
** According to the GLX protocol, each row must be padded to a multiple of
** 4 bytes. 4 bytes also happens to be the default alignment in the pixel
** store modes of the GL.
*/
rowsize = width * elements * esize;
padding = rowsize % 4;
if (padding) {
rowsize += 4 - padding;
}
return (rowsize * height * depth);
return __glXImage3DSize( format, type, width, height, depth,
0, 0, 0, 0, 4 );
}
GLint __glGetConvolutionParameteriv_size(GLenum pname)

11
XTrap/xtrapdi.c
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/XTrap/xtrapdi.c,v 1.5 2002/09/18 17:11:47 tsi Exp $ */
/* $XFree86: xc/programs/Xserver/XTrap/xtrapdi.c,v 1.7 2003/10/28 22:52:10 tsi Exp $ */
/*****************************************************************************
Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA
X11R6 Changes Copyright (c) 1994 by Robert Chesler of Absol-Puter, Hudson, NH.
@ -152,7 +152,9 @@ static Bool gate_closed = False; /* The global "gatekeeper" */
static Bool key_ignore = False; /* The global "keymaster" */
static Bool ignore_grabs = False;
static CARD8 next_key = XEKeyIsClear; /* Echo, Clear, or Other */
#ifdef VECTORED_EVENTS
static INT16 current_screen = -1L; /* Current screen for events */
#endif
static INT16 vectored_requests[256L] = {0L}; /* cnt of vectoring clients */
static INT16 vectored_events[KeyPress+MotionNotify] = {0L};
typedef struct _client_list
@ -208,8 +210,9 @@ int XETrapDestroyEnv(pointer value, XID id)
next_key = XEKeyIsClear;
}
#ifdef VECTORED_EVENTS
current_screen = -1L; /* Invalidate current screen */
#endif
#ifdef VERBOSE
ErrorF("%s: Client '%d' Disconnected\n", XTrapExtName,
@ -376,7 +379,7 @@ void DEC_XTRAPInit()
(XETrapType = CreateNewResourceType(XETrapDestroyEnv)) == 0L)
{
ErrorF("%s: Setup can't create new resource type (%d,%d,%d)\n",
XTrapExtName, a,XETrapClass,XETrapType);
XTrapExtName, (int)a,(int)XETrapClass,(int)XETrapType);
return;
}
/* initialize the GetAvailable info reply here */
@ -512,7 +515,9 @@ int XETrapCreateEnv(ClientPtr client)
}
}
#ifdef VECTORED_EVENTS
current_screen = -1L; /* Invalidate current screen */
#endif
#ifdef VERBOSE
if (status == Success)

29
Xext/EVI.c
View File

@ -21,7 +21,7 @@ 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.
********************************************************/
/* $XFree86: xc/programs/Xserver/Xext/EVI.c,v 3.9 2001/10/28 03:32:50 tsi Exp $ */
/* $XFree86: xc/programs/Xserver/Xext/EVI.c,v 3.11 2003/10/28 23:08:43 tsi Exp $ */
#include "X.h"
#include "Xproto.h"
@ -31,8 +31,13 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define _XEVI_SERVER_
#include "XEVIstr.h"
#include "EVIstruct.h"
#include "modinit.h"
#if 0
static unsigned char XEVIReqCode = 0;
#endif
static EviPrivPtr eviPriv;
static int
ProcEVIQueryVersion(ClientPtr client)
{
@ -74,6 +79,7 @@ ProcEVIQueryVersion(ClientPtr client)
visual1++; \
} \
}
static int
ProcEVIGetVisualInfo(ClientPtr client)
{
@ -109,6 +115,7 @@ ProcEVIGetVisualInfo(ClientPtr client)
eviPriv->freeVisualInfo(eviInfo, conflict);
return (client->noClientException);
}
static int
ProcEVIDispatch(ClientPtr client)
{
@ -122,15 +129,16 @@ ProcEVIDispatch(ClientPtr client)
return BadRequest;
}
}
static int
SProcEVIQueryVersion(client)
ClientPtr client;
SProcEVIQueryVersion(ClientPtr client)
{
REQUEST(xEVIQueryVersionReq);
int n;
swaps(&stuff->length, n);
return ProcEVIQueryVersion(client);
}
static int
SProcEVIGetVisualInfo(ClientPtr client)
{
@ -139,6 +147,7 @@ SProcEVIGetVisualInfo(ClientPtr client)
swaps(&stuff->length, n);
return ProcEVIGetVisualInfo(client);
}
static int
SProcEVIDispatch(ClientPtr client)
{
@ -153,12 +162,14 @@ SProcEVIDispatch(ClientPtr client)
return BadRequest;
}
}
/*ARGSUSED*/
static void
EVIResetProc(ExtensionEntry *extEntry)
{
eviDDXReset();
}
/****************
* XEVIExtensionInit
*
@ -167,15 +178,21 @@ EVIResetProc(ExtensionEntry *extEntry)
*
****************/
void
EVIExtensionInit(void)
EVIExtensionInit(INITARGS)
{
#if 0
ExtensionEntry *extEntry;
if ((extEntry = AddExtension(EVINAME, 0, 0,
ProcEVIDispatch,
SProcEVIDispatch,
EVIResetProc, StandardMinorOpcode)))
{
EVIResetProc, StandardMinorOpcode))) {
XEVIReqCode = (unsigned char)extEntry->base;
#else
if (AddExtension(EVINAME, 0, 0,
ProcEVIDispatch, SProcEVIDispatch,
EVIResetProc, StandardMinorOpcode)) {
#endif
eviPriv = eviDDXInit();
}
}

15
Xext/EVIstruct.h
View File

@ -21,33 +21,36 @@ 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.
********************************************************/
/* $XFree86: xc/programs/Xserver/Xext/EVIstruct.h,v 3.6 2003/11/17 22:20:26 dawes Exp $ */
#ifndef EVI_STRUCT_H
#define EVI_STRUCT_H
/*
******************************************************************************
** Per-ddx data
******************************************************************************
*/
typedef int (*GetVisualInfoProc)(
#if NeedNestedPrototypes
VisualID32*,
int,
xExtendedVisualInfo**,
int*,
VisualID32**,
int*
#endif
);
typedef void (*FreeVisualInfoProc)(
#if NeedNestedPrototypes
xExtendedVisualInfo*,
VisualID32*
#endif
);
typedef struct _EviPrivRec {
GetVisualInfoProc getVisualInfo;
FreeVisualInfoProc freeVisualInfo;
} EviPrivRec, *EviPrivPtr;
extern EviPrivPtr eviDDXInit();
extern void eviDDXReset();
extern EviPrivPtr eviDDXInit(void);
extern void eviDDXReset(void);
#endif /* EVI_STRUCT_H */

181
Xext/appgroup.c
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/Xext/appgroup.c,v 1.9 2001/12/17 20:52:25 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xext/appgroup.c,v 1.11 2003/10/28 23:08:43 tsi Exp $ */
/*
Copyright 1996, 1998, 2001 The Open Group
@ -39,6 +39,7 @@ from The Open Group.
#include "servermd.h"
#define _XAG_SERVER_
#include "Xagstr.h"
#include "Xagsrv.h"
#define _SECURITY_SERVER
#include "security.h"
#include "Xfuncproto.h"
@ -49,6 +50,9 @@ from The Open Group.
#include <stdio.h>
#include "modinit.h"
#include "appgroup.h"
typedef struct _AppGroupRec {
struct _AppGroupRec* next;
XID appgroupId;
@ -65,11 +69,14 @@ typedef struct _AppGroupRec {
char* ConnectionInfo;
} AppGroupRec, *AppGroupPtr;
static int ProcXagDispatch (), SProcXagDispatch ();
static void XagResetProc ();
static int ProcXagDispatch(ClientPtr client);
static int SProcXagDispatch(ClientPtr client);
static void XagResetProc(ExtensionEntry* extEntry);
#if 0
static unsigned char XagReqCode = 0;
static int XagErrorBase;
#endif
static int XagCallbackRefCount = 0;
static RESTYPE RT_APPGROUP;
@ -80,9 +87,9 @@ extern char* ConnectionInfo;
extern int connBlockScreenStart;
static
int XagAppGroupFree (what, id)
pointer what;
XID id; /* unused */
int XagAppGroupFree(
pointer what,
XID id) /* unused */
{
int i;
AppGroupPtr pAppGrp = (AppGroupPtr) what;
@ -113,10 +120,10 @@ int XagAppGroupFree (what, id)
}
/* static */
void XagClientStateChange (pcbl, nulldata, calldata)
CallbackListPtr* pcbl;
pointer nulldata;
pointer calldata;
void XagClientStateChange(
CallbackListPtr* pcbl,
pointer nulldata,
pointer calldata)
{
SecurityAuthorizationPtr pAuth;
NewClientInfoRec* pci = (NewClientInfoRec*) calldata;
@ -217,8 +224,9 @@ void XagClientStateChange (pcbl, nulldata, calldata)
}
void
XagExtensionInit ()
XagExtensionInit(INITARGS)
{
#if 0
ExtensionEntry* extEntry;
if ((extEntry = AddExtension (XAGNAME,
@ -230,14 +238,23 @@ XagExtensionInit ()
StandardMinorOpcode))) {
XagReqCode = (unsigned char)extEntry->base;
XagErrorBase = extEntry->errorBase;
#else
if (AddExtension (XAGNAME,
0,
XagNumberErrors,
ProcXagDispatch,
SProcXagDispatch,
XagResetProc,
StandardMinorOpcode)) {
#endif
RT_APPGROUP = CreateNewResourceType (XagAppGroupFree);
}
}
/*ARGSUSED*/
static
void XagResetProc (extEntry)
ExtensionEntry* extEntry;
void XagResetProc(
ExtensionEntry* extEntry)
{
DeleteCallback (&ClientStateCallback, XagClientStateChange, NULL);
XagCallbackRefCount = 0;
@ -245,8 +262,8 @@ void XagResetProc (extEntry)
}
static
int ProcXagQueryVersion (client)
register ClientPtr client;
int ProcXagQueryVersion(
register ClientPtr client)
{
/* REQUEST (xXagQueryVersionReq); */
xXagQueryVersionReply rep;
@ -269,11 +286,11 @@ int ProcXagQueryVersion (client)
}
static
void ProcessAttr (pAppGrp, client, attrib_mask, attribs)
AppGroupPtr pAppGrp;
ClientPtr client;
unsigned int attrib_mask;
CARD32* attribs;
void ProcessAttr(
AppGroupPtr pAppGrp,
ClientPtr client,
unsigned int attrib_mask,
CARD32* attribs)
{
int i;
@ -307,8 +324,8 @@ void ProcessAttr (pAppGrp, client, attrib_mask, attribs)
}
static
void CreateConnectionInfo (pAppGrp)
AppGroupPtr pAppGrp;
void CreateConnectionInfo(
AppGroupPtr pAppGrp)
{
xWindowRoot* rootp;
xWindowRoot* roots[MAXSCREENS];
@ -368,11 +385,11 @@ void CreateConnectionInfo (pAppGrp)
}
static
AppGroupPtr CreateAppGroup (client, appgroupId, attrib_mask, attribs)
ClientPtr client;
XID appgroupId;
unsigned int attrib_mask;
CARD32* attribs;
AppGroupPtr CreateAppGroup(
ClientPtr client,
XID appgroupId,
unsigned int attrib_mask,
CARD32* attribs)
{
AppGroupPtr pAppGrp;
@ -396,10 +413,10 @@ AppGroupPtr CreateAppGroup (client, appgroupId, attrib_mask, attribs)
}
static
int AttrValidate (client, attrib_mask, pAppGrp)
ClientPtr client;
int attrib_mask;
AppGroupPtr pAppGrp;
int AttrValidate(
ClientPtr client,
int attrib_mask,
AppGroupPtr pAppGrp)
{
WindowPtr pWin;
int idepth, ivids, found;
@ -439,8 +456,8 @@ int AttrValidate (client, attrib_mask, pAppGrp)
}
/* static */
int ProcXagCreate (client)
register ClientPtr client;
int ProcXagCreate (
register ClientPtr client)
{
REQUEST (xXagCreateReq);
AppGroupPtr pAppGrp;
@ -471,8 +488,8 @@ int ProcXagCreate (client)
}
/* static */
int ProcXagDestroy (client)
register ClientPtr client;
int ProcXagDestroy(
register ClientPtr client)
{
AppGroupPtr pAppGrp;
REQUEST (xXagDestroyReq);
@ -488,8 +505,8 @@ int ProcXagDestroy (client)
}
static
int ProcXagGetAttr (client)
register ClientPtr client;
int ProcXagGetAttr(
register ClientPtr client)
{
AppGroupPtr pAppGrp;
REQUEST (xXagGetAttrReq);
@ -524,8 +541,8 @@ int ProcXagGetAttr (client)
}
static
int ProcXagQuery (client)
register ClientPtr client;
int ProcXagQuery(
register ClientPtr client)
{
ClientPtr pClient;
AppGroupPtr pAppGrp;
@ -556,8 +573,8 @@ int ProcXagQuery (client)
}
static
int ProcXagCreateAssoc (client)
register ClientPtr client;
int ProcXagCreateAssoc(
register ClientPtr client)
{
REQUEST (xXagCreateAssocReq);
@ -579,8 +596,8 @@ int ProcXagCreateAssoc (client)
}
static
int ProcXagDestroyAssoc (client)
register ClientPtr client;
int ProcXagDestroyAssoc(
register ClientPtr client)
{
/* REQUEST (xXagDestroyAssocReq); */
@ -590,8 +607,8 @@ int ProcXagDestroyAssoc (client)
}
static
int ProcXagDispatch (client)
register ClientPtr client;
int ProcXagDispatch (
register ClientPtr client)
{
REQUEST (xReq);
switch (stuff->data)
@ -616,8 +633,8 @@ int ProcXagDispatch (client)
}
static
int SProcXagQueryVersion (client)
register ClientPtr client;
int SProcXagQueryVersion(
register ClientPtr client)
{
register int n;
REQUEST(xXagQueryVersionReq);
@ -626,8 +643,8 @@ int SProcXagQueryVersion (client)
}
static
int SProcXagCreate (client)
ClientPtr client;
int SProcXagCreate(
ClientPtr client)
{
register int n;
REQUEST (xXagCreateReq);
@ -640,8 +657,8 @@ int SProcXagCreate (client)
}
static
int SProcXagDestroy (client)
ClientPtr client;
int SProcXagDestroy(
ClientPtr client)
{
register int n;
REQUEST (xXagDestroyReq);
@ -652,8 +669,8 @@ int SProcXagDestroy (client)
}
static
int SProcXagGetAttr (client)
ClientPtr client;
int SProcXagGetAttr(
ClientPtr client)
{
register int n;
REQUEST (xXagGetAttrReq);
@ -664,8 +681,8 @@ int SProcXagGetAttr (client)
}
static
int SProcXagQuery (client)
ClientPtr client;
int SProcXagQuery(
ClientPtr client)
{
register int n;
REQUEST (xXagQueryReq);
@ -676,8 +693,8 @@ int SProcXagQuery (client)
}
static
int SProcXagCreateAssoc (client)
ClientPtr client;
int SProcXagCreateAssoc(
ClientPtr client)
{
register int n;
REQUEST (xXagCreateAssocReq);
@ -690,8 +707,8 @@ int SProcXagCreateAssoc (client)
}
static
int SProcXagDestroyAssoc (client)
ClientPtr client;
int SProcXagDestroyAssoc(
ClientPtr client)
{
register int n;
REQUEST (xXagDestroyAssocReq);
@ -702,8 +719,8 @@ int SProcXagDestroyAssoc (client)
}
static
int SProcXagDispatch (client)
register ClientPtr client;
int SProcXagDispatch(
register ClientPtr client)
{
REQUEST(xReq);
switch (stuff->data)
@ -727,20 +744,20 @@ int SProcXagDispatch (client)
}
}
Colormap XagDefaultColormap (client)
ClientPtr client;
Colormap XagDefaultColormap(
ClientPtr client)
{
return (client->appgroup ? client->appgroup->default_colormap : None);
}
VisualID XagRootVisual (client)
ClientPtr client;
VisualID XagRootVisual(
ClientPtr client)
{
return (client->appgroup ? client->appgroup->root_visual : 0);
}
ClientPtr XagLeader (client)
ClientPtr client;
ClientPtr XagLeader(
ClientPtr client)
{
return (client->appgroup ? client->appgroup->leader : NULL);
}
@ -750,9 +767,9 @@ ClientPtr XagLeader (client)
* We don't want to send it to the leader when the window is on a different
* screen, e.g. a print screen.
*/
Bool XagIsControlledRoot (client, pParent)
ClientPtr client;
WindowPtr pParent;
Bool XagIsControlledRoot(
ClientPtr client,
WindowPtr pParent)
{
if (client->appgroup) {
if (client->appgroup->single_screen &&
@ -766,11 +783,11 @@ Bool XagIsControlledRoot (client, pParent)
return FALSE;
}
void XagConnectionInfo (client, conn_prefix, conn_info, num_screen)
ClientPtr client;
xConnSetupPrefix** conn_prefix;
char** conn_info;
int* num_screen;
void XagConnectionInfo(
ClientPtr client,
xConnSetupPrefix** conn_prefix,
char** conn_info,
int* num_screen)
{
if (client->appgroup && client->appgroup->ConnectionInfo) {
*conn_prefix = &client->appgroup->connSetupPrefix;
@ -779,15 +796,15 @@ void XagConnectionInfo (client, conn_prefix, conn_info, num_screen)
}
}
XID XagId (client)
ClientPtr client;
XID XagId(
ClientPtr client)
{
return (client->appgroup ? client->appgroup->appgroupId : 0);
}
void XagGetDeltaInfo (client, buf)
ClientPtr client;
CARD32* buf;
void XagGetDeltaInfo(
ClientPtr client,
CARD32* buf)
{
*buf++ = (CARD32) client->appgroup->default_root;
*buf++ = (CARD32) client->appgroup->root_visual;
@ -796,8 +813,8 @@ void XagGetDeltaInfo (client, buf)
*buf = (CARD32) client->appgroup->white_pixel;
}
void XagCallClientStateChange (client)
ClientPtr client;
void XagCallClientStateChange(
ClientPtr client)
{
if (appGrpList) {
NewClientInfoRec clientinfo;

10
Xext/appgroup.h Normal file
View File

@ -0,0 +1,10 @@
/* $XFree86: xc/programs/Xserver/Xext/appgroup.h,v 1.1 2003/07/16 01:38:28 dawes Exp $ */
void XagClientStateChange(
CallbackListPtr* pcbl,
pointer nulldata,
pointer calldata);
int ProcXagCreate (
register ClientPtr client);
int ProcXagDestroy(
register ClientPtr client);

19
Xext/bigreq.c
View File

@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
/* $XFree86: xc/programs/Xserver/Xext/bigreq.c,v 3.5 2001/12/14 19:58:48 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xext/bigreq.c,v 3.9 2003/11/17 22:20:26 dawes Exp $ */
#define NEED_EVENTS
#include "X.h"
@ -36,26 +36,35 @@ from The Open Group.
#include "dixstruct.h"
#include "extnsionst.h"
#include "bigreqstr.h"
#include "opaque.h"
#include "modinit.h"
#if 0
static unsigned char XBigReqCode;
#endif
static void BigReqResetProc(
#if NeedFunctionPrototypes
ExtensionEntry * /* extEntry */
#endif
);
static DISPATCH_PROC(ProcBigReqDispatch);
void
BigReqExtensionInit()
BigReqExtensionInit(INITARGS)
{
#if 0
ExtensionEntry *extEntry;
if ((extEntry = AddExtension(XBigReqExtensionName, 0, 0,
ProcBigReqDispatch, ProcBigReqDispatch,
BigReqResetProc, StandardMinorOpcode)) != 0)
XBigReqCode = (unsigned char)extEntry->base;
#else
(void) AddExtension(XBigReqExtensionName, 0, 0,
ProcBigReqDispatch, ProcBigReqDispatch,
BigReqResetProc, StandardMinorOpcode);
#endif
DeclareExtensionSecurity(XBigReqExtensionName, TRUE);
}
@ -84,7 +93,7 @@ ProcBigReqDispatch (client)
rep.type = X_Reply;
rep.length = 0;
rep.sequenceNumber = client->sequence;
rep.max_request_size = MAX_BIG_REQUEST_SIZE;
rep.max_request_size = maxBigRequestSize;
if (client->swapped) {
swaps(&rep.sequenceNumber, n);
swapl(&rep.max_request_size, n);

59
Xext/cup.c
View File

@ -24,7 +24,7 @@ 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: xc/programs/Xserver/Xext/cup.c,v 1.10 2001/12/14 19:58:48 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xext/cup.c,v 1.12 2003/10/28 23:08:43 tsi Exp $ */
#define NEED_REPLIES
#define NEED_EVENTS
@ -47,11 +47,16 @@ in this Software without prior written authorization from The Open Group.
#include "xf86_ansic.h"
#endif
static int ProcDispatch (), SProcDispatch ();
static void ResetProc ();
#include "modinit.h"
static int ProcDispatch(ClientPtr client);
static int SProcDispatch(ClientPtr client);
static void ResetProc(ExtensionEntry* extEntry);
#if 0
static unsigned char ReqCode = 0;
static int ErrorBase;
#endif
#if defined(WIN32) || defined(TESTWIN32)
#define HAVE_SPECIAL_DESKTOP_COLORS
@ -123,8 +128,9 @@ static xColorItem citems[] = {
#define NUM_DESKTOP_COLORS (sizeof citems / sizeof citems[0])
void
XcupExtensionInit ()
XcupExtensionInit (INITARGS)
{
#if 0
ExtensionEntry* extEntry;
if ((extEntry = AddExtension (XCUPNAME,
@ -137,20 +143,29 @@ XcupExtensionInit ()
ReqCode = (unsigned char)extEntry->base;
ErrorBase = extEntry->errorBase;
}
#else
(void) AddExtension (XCUPNAME,
0,
XcupNumberErrors,
ProcDispatch,
SProcDispatch,
ResetProc,
StandardMinorOpcode);
#endif
/* PC servers initialize the desktop colors (citems) here! */
}
/*ARGSUSED*/
static
void ResetProc (extEntry)
ExtensionEntry* extEntry;
void ResetProc(
ExtensionEntry* extEntry)
{
}
static
int ProcQueryVersion (client)
register ClientPtr client;
int ProcQueryVersion(
register ClientPtr client)
{
/* REQUEST (xXcupQueryVersionReq); */
xXcupQueryVersionReply rep;
@ -173,8 +188,8 @@ int ProcQueryVersion (client)
}
static
int ProcGetReservedColormapEntries (client)
register ClientPtr client;
int ProcGetReservedColormapEntries(
register ClientPtr client)
{
REQUEST (xXcupGetReservedColormapEntriesReq);
xXcupGetReservedColormapEntriesReply rep;
@ -206,8 +221,8 @@ int ProcGetReservedColormapEntries (client)
}
static
int ProcStoreColors (client)
register ClientPtr client;
int ProcStoreColors(
register ClientPtr client)
{
REQUEST (xXcupStoreColorsReq);
ColormapPtr pcmp;
@ -265,8 +280,8 @@ int ProcStoreColors (client)
}
static
int ProcDispatch (client)
register ClientPtr client;
int ProcDispatch(
register ClientPtr client)
{
REQUEST (xReq);
switch (stuff->data)
@ -283,8 +298,8 @@ int ProcDispatch (client)
}
static
int SProcQueryVersion (client)
register ClientPtr client;
int SProcQueryVersion(
register ClientPtr client)
{
register int n;
@ -294,8 +309,8 @@ int SProcQueryVersion (client)
}
static
int SProcGetReservedColormapEntries (client)
ClientPtr client;
int SProcGetReservedColormapEntries(
ClientPtr client)
{
register int n;
@ -307,8 +322,8 @@ int SProcGetReservedColormapEntries (client)
}
static
int SProcXcupStoreColors (client)
ClientPtr client;
int SProcXcupStoreColors(
ClientPtr client)
{
register int n;
int count;
@ -325,8 +340,8 @@ int SProcXcupStoreColors (client)
}
static
int SProcDispatch (client)
register ClientPtr client;
int SProcDispatch(
register ClientPtr client)
{
REQUEST(xReq);
switch (stuff->data)

14
Xext/dpms.c
View File

@ -33,7 +33,7 @@ Equipment Corporation.
* @(#)RCSfile: dpms.c,v Revision: 1.1.4.5 (DEC) Date: 1996/03/04 15:27:00
*/
/* $XFree86: xc/programs/Xserver/Xext/dpms.c,v 3.9 2001/10/28 03:32:50 tsi Exp $ */
/* $XFree86: xc/programs/Xserver/Xext/dpms.c,v 3.11 2003/10/28 23:08:43 tsi Exp $ */
#include "X.h"
#include "Xproto.h"
@ -46,8 +46,11 @@ Equipment Corporation.
#include "dpms.h"
#include "dpmsstr.h"
#include "dpmsproc.h"
#include "modinit.h"
#if 0
static unsigned char DPMSCode;
#endif
static DISPATCH_PROC(ProcDPMSDispatch);
static DISPATCH_PROC(SProcDPMSDispatch);
static DISPATCH_PROC(ProcDPMSGetVersion);
@ -69,15 +72,20 @@ static DISPATCH_PROC(SProcDPMSCapable);
static void DPMSResetProc(ExtensionEntry* extEntry);
void
DPMSExtensionInit()
DPMSExtensionInit(INITARGS)
{
#if 0
ExtensionEntry *extEntry;
if ((extEntry = AddExtension(DPMSExtensionName, 0, 0,
ProcDPMSDispatch, SProcDPMSDispatch,
DPMSResetProc, StandardMinorOpcode)))
DPMSCode = (unsigned char)extEntry->base;
return;
#else
(void) AddExtension(DPMSExtensionName, 0, 0,
ProcDPMSDispatch, SProcDPMSDispatch,
DPMSResetProc, StandardMinorOpcode);
#endif
}
/*ARGSUSED*/

4
Xext/dpmsproc.h
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/Xext/dpmsproc.h,v 1.3 2001/10/28 03:32:50 tsi Exp $ */
/* $XFree86: xc/programs/Xserver/Xext/dpmsproc.h,v 1.4 2003/07/16 01:38:29 dawes Exp $ */
/* Prototypes for functions that the DDX must provide */
@ -6,7 +6,7 @@
#define _DPMSPROC_H_
void DPMSSet(int level);
int DPMSGet(int *level);
int DPMSGet(int *plevel);
Bool DPMSSupported(void);
#endif

6
Xext/dpmsstubs.c
View File

@ -26,10 +26,12 @@ dealings in this Software without prior written authorization from Digital
Equipment Corporation.
******************************************************************/
/* $XFree86: xc/programs/Xserver/Xext/dpmsstubs.c,v 3.4 2001/01/17 22:13:15 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xext/dpmsstubs.c,v 3.5 2003/07/16 01:38:29 dawes Exp $ */
typedef int Bool;
#include "dpmsproc.h"
#define FALSE 0
Bool DPMSSupported(void)
@ -37,7 +39,7 @@ Bool DPMSSupported(void)
return FALSE;
}
int DPSMGet(int *level)
int DPMSGet(int *plevel)
{
return -1;
}

12
Xext/fontcache.c
View File

@ -27,7 +27,7 @@
*
* Id: fontcache.c,v 1.12 1999/01/31 13:47:45 akiyama Exp $
*/
/* $XFree86: xc/programs/Xserver/Xext/fontcache.c,v 1.5 2000/02/23 20:29:39 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xext/fontcache.c,v 1.8 2003/11/17 22:20:26 dawes Exp $ */
/* THIS IS NOT AN X CONSORTIUM STANDARD */
@ -47,13 +47,12 @@
#include "Xfuncproto.h"
#include "swaprep.h"
#include "modinit.h"
static int miscErrorBase;
static void FontCacheResetProc(
#if NeedFunctionPrototypes
ExtensionEntry* /* extEntry */
#endif
);
static DISPATCH_PROC(ProcFontCacheDispatch);
@ -67,11 +66,12 @@ static DISPATCH_PROC(SProcFontCacheGetCacheStatistics);
static DISPATCH_PROC(SProcFontCacheQueryVersion);
static DISPATCH_PROC(SProcFontCacheChangeCacheSettings);
#if 0
static unsigned char FontCacheReqCode = 0;
#endif
void
FontCacheExtensionInit()
FontCacheExtensionInit(INITARGS)
{
ExtensionEntry* extEntry;
@ -83,7 +83,9 @@ FontCacheExtensionInit()
SProcFontCacheDispatch,
FontCacheResetProc,
StandardMinorOpcode))) {
#if 0
FontCacheReqCode = (unsigned char)extEntry->base;
#endif
miscErrorBase = extEntry->errorBase;
}
}

38
Xext/mbuf.c
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/Xext/mbuf.c,v 3.14 2001/12/14 19:58:49 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xext/mbuf.c,v 3.16 2003/11/17 22:20:26 dawes Exp $ */
/************************************************************
Copyright 1989, 1998 The Open Group
@ -61,50 +61,40 @@ in this Software without prior written authorization from The Open Group.
#define ValidEventMasks (ExposureMask|MultibufferClobberNotifyMask|MultibufferUpdateNotifyMask)
#if 0
static unsigned char MultibufferReqCode;
#endif
static int MultibufferEventBase;
static int MultibufferErrorBase;
int MultibufferScreenIndex = -1;
int MultibufferWindowIndex = -1;
static void PerformDisplayRequest (
#if NeedFunctionPrototypes
MultibuffersPtr * /* ppMultibuffers */,
MultibufferPtr * /* pMultibuffer */,
int /* nbuf */
#endif
);
static Bool QueueDisplayRequest (
#if NeedFunctionPrototypes
ClientPtr /* client */,
TimeStamp /* activateTime */
#endif
);
static void BumpTimeStamp (
#if NeedFunctionPrototypes
TimeStamp * /* ts */,
CARD32 /* inc */
#endif
);
static void AliasMultibuffer (
#if NeedFunctionPrototypes
MultibuffersPtr /* pMultibuffers */,
int /* i */
#endif
);
static void RecalculateMultibufferOtherEvents (
#if NeedFunctionPrototypes
MultibufferPtr /* pMultibuffer */
#endif
);
static int EventSelectForMultibuffer(
#if NeedFunctionPrototypes
MultibufferPtr /* pMultibuffer */,
ClientPtr /* client */,
Mask /* mask */
#endif
);
/*
@ -113,10 +103,8 @@ static int EventSelectForMultibuffer(
*/
RESTYPE MultibufferDrawableResType;
static int MultibufferDrawableDelete (
#if NeedFunctionPrototypes
pointer /* value */,
XID /* id */
#endif
);
/*
* The per-buffer data can be found as a resource with this type.
@ -125,10 +113,8 @@ static int MultibufferDrawableDelete (
*/
static RESTYPE MultibufferResType;
static int MultibufferDelete (
#if NeedFunctionPrototypes
pointer /* value */,
XID /* id */
#endif
);
/*
@ -137,10 +123,8 @@ static int MultibufferDelete (
*/
static RESTYPE MultibuffersResType;
static int MultibuffersDelete (
#if NeedFunctionPrototypes
pointer /* value */,
XID /* id */
#endif
);
/*
@ -149,10 +133,8 @@ static int MultibuffersDelete (
*/
static RESTYPE OtherClientResType;
static int OtherClientDelete (
#if NeedFunctionPrototypes
pointer /* value */,
XID /* id */
#endif
);
/****************
@ -187,44 +169,32 @@ static DISPATCH_PROC(SProcSetBufferAttributes);
static DISPATCH_PROC(SProcSetMBufferAttributes);
static void MultibufferResetProc(
#if NeedFunctionPrototypes
ExtensionEntry * /* extEntry */
#endif
);
static void SClobberNotifyEvent(
#if NeedFunctionPrototypes
xMbufClobberNotifyEvent * /* from */,
xMbufClobberNotifyEvent * /* to */
# endif
);
static void SUpdateNotifyEvent(
#if NeedFunctionPrototypes
xMbufUpdateNotifyEvent * /* from */,
xMbufUpdateNotifyEvent * /* to */
#endif
);
static Bool MultibufferPositionWindow(
#if NeedFunctionPrototypes
WindowPtr /* pWin */,
int /* x */,
int /* y */
#endif
);
static void SetupBackgroundPainter (
#if NeedFunctionPrototypes
WindowPtr /* pWin */,
GCPtr /* pGC */
#endif
);
static int DeliverEventsToMultibuffer (
#if NeedFunctionPrototypes
MultibufferPtr /* pMultibuffer */,
xEvent * /* pEvents */,
int /* count */,
Mask /* filter */
#endif
);
void
@ -279,7 +249,9 @@ MultibufferExtensionInit()
ProcMultibufferDispatch, SProcMultibufferDispatch,
MultibufferResetProc, StandardMinorOpcode)))
{
#if 0
MultibufferReqCode = (unsigned char)extEntry->base;
#endif
MultibufferEventBase = extEntry->eventBase;
MultibufferErrorBase = extEntry->errorBase;
EventSwapVector[MultibufferEventBase + MultibufferClobberNotify] = (EventSwapPtr) SClobberNotifyEvent;

39
Xext/mbufbf.c
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/Xext/mbufbf.c,v 3.4 2001/12/14 19:58:49 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xext/mbufbf.c,v 3.6 2003/11/10 18:21:42 tsi Exp $ */
/*
Copyright 1989, 1998 The Open Group
@ -243,7 +243,7 @@ bufMultibufferInit(pScreen, pMBScreen)
pMBPriv->rgnChanged = TRUE;
REGION_INIT(pScreen, &pMBPriv->backBuffer, &box, 1);
REGION_INIT(pScreen, &pMBPriv->subtractRgn, &box, 1);
REGION_INIT(pScreen, &pMBPriv->unionRgn, NullBox, 0);
REGION_NULL(pScreen, &pMBPriv->unionRgn);
/* Misc functions */
pMBPriv->CopyBufferBits = bufCopyBufferBitsFunc[pScreen->myNum];
@ -778,7 +778,7 @@ bufPostValidateTree(pParent, pChild, kind)
pUnionRgn);
/* Paint gained and lost backbuffer areas in select plane */
REGION_INIT(pScreen, &exposed, NullBox, 0);
REGION_NULL(pScreen, &exposed);
REGION_SUBTRACT(pScreen, &exposed, pSubtractRgn, pUnionRgn);
(* pMBPriv->DrawSelectPlane)(pScreen, pMBPriv->selectPlane,
&exposed, FRONT_BUFFER);
@ -793,33 +793,6 @@ bufPostValidateTree(pParent, pChild, kind)
}
}
/* XXX - Knows region internals. */
static Bool
RegionsEqual(reg1, reg2)
RegionPtr reg1;
RegionPtr reg2;
{
int i;
BoxPtr rects1, rects2;
if (reg1->extents.x1 != reg2->extents.x1) return FALSE;
if (reg1->extents.x2 != reg2->extents.x2) return FALSE;
if (reg1->extents.y1 != reg2->extents.y1) return FALSE;
if (reg1->extents.y2 != reg2->extents.y2) return FALSE;
if (REGION_NUM_RECTS(reg1) != REGION_NUM_RECTS(reg2)) return FALSE;
rects1 = REGION_RECTS(reg1);
rects2 = REGION_RECTS(reg2);
for (i = 0; i != REGION_NUM_RECTS(reg1); i++) {
if (rects1[i].x1 != rects2[i].x1) return FALSE;
if (rects1[i].x2 != rects2[i].x2) return FALSE;
if (rects1[i].y1 != rects2[i].y1) return FALSE;
if (rects1[i].y2 != rects2[i].y2) return FALSE;
}
return TRUE;
}
/*
* If the window is multibuffered and displaying the backbuffer,
* add the old clipList to the subtractRgn and add the new clipList
@ -849,7 +822,7 @@ bufClipNotify(pWin, dx,dy)
{
RegionPtr pOldClipList = (RegionPtr) pMBWindow->devPrivate.ptr;
if (! RegionsEqual(pOldClipList, &pWin->clipList))
if (! REGION_EQUAL(pScreen, pOldClipList, &pWin->clipList))
{
if (pMBWindow->displayedMultibuffer == BACK_BUFFER)
{
@ -940,8 +913,8 @@ bufWindowExposures(pWin, prgn, other_exposed)
/* miWindowExposures munges prgn and other_exposed. */
if (handleBuffers)
{
REGION_INIT(pScreen, &tmp_rgn, NullBox, 0);
REGION_COPY(pScreen, &tmp_rgn,prgn);
REGION_NULL(pScreen, &tmp_rgn);
REGION_COPY(pScreen, &tmp_rgn, prgn);
}
UNWRAP_SCREEN_FUNC(pScreen, pMBPriv, void, WindowExposures);

15
Xext/mitmisc.c
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/Xext/mitmisc.c,v 3.4 2001/12/14 19:58:49 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xext/mitmisc.c,v 3.7 2003/11/17 22:20:26 dawes Exp $ */
/************************************************************
Copyright 1989, 1998 The Open Group
@ -38,15 +38,16 @@ in this Software without prior written authorization from The Open Group.
#include "extnsionst.h"
#define _MITMISC_SERVER_
#include "mitmiscstr.h"
#include "modinit.h"
extern Bool permitOldBugs;
#if 0
static unsigned char MITReqCode;
#endif
static void MITResetProc(
#if NeedFunctionPrototypes
ExtensionEntry * /* extEntry */
#endif
);
static DISPATCH_PROC(ProcMITDispatch);
@ -57,14 +58,20 @@ static DISPATCH_PROC(SProcMITGetBugMode);
static DISPATCH_PROC(SProcMITSetBugMode);
void
MITMiscExtensionInit()
MITMiscExtensionInit(INITARGS)
{
#if 0
ExtensionEntry *extEntry;
if ((extEntry = AddExtension(MITMISCNAME, 0, 0,
ProcMITDispatch, SProcMITDispatch,
MITResetProc, StandardMinorOpcode)) != 0)
MITReqCode = (unsigned char)extEntry->base;
#else
(void) AddExtension(MITMISCNAME, 0, 0,
ProcMITDispatch, SProcMITDispatch,
MITResetProc, StandardMinorOpcode);
#endif
}
/*ARGSUSED*/

155
Xext/panoramiX.c
View File

@ -23,7 +23,7 @@ shall not be used in advertising or otherwise to promote the sale, use or other
dealings in this Software without prior written authorization from Digital
Equipment Corporation.
******************************************************************/
/* $XFree86: xc/programs/Xserver/Xext/panoramiX.c,v 3.32 2002/08/01 00:30:34 mvojkovi Exp $ */
/* $XFree86: xc/programs/Xserver/Xext/panoramiX.c,v 3.38 2003/11/10 18:21:43 tsi Exp $ */
#define NEED_REPLIES
#include <stdio.h>
@ -50,9 +50,12 @@ Equipment Corporation.
#ifdef RENDER
#include "picturestr.h"
#endif
#include "modinit.h"
#if 0
static unsigned char PanoramiXReqCode = 0;
#endif
/*
* PanoramiX data declarations
*/
@ -62,14 +65,13 @@ int PanoramiXPixHeight = 0;
int PanoramiXNumScreens = 0;
PanoramiXData *panoramiXdataPtr = NULL;
RegionRec PanoramiXScreenRegion = {{0, 0, 0, 0}, NULL};
static int PanoramiXNumDepths;
static DepthPtr PanoramiXDepths;
static int PanoramiXNumVisuals;
static VisualPtr PanoramiXVisuals;
RegionRec PanoramiXScreenRegion;
int PanoramiXNumDepths;
DepthPtr PanoramiXDepths;
int PanoramiXNumVisuals;
VisualPtr PanoramiXVisuals;
/* We support at most 256 visuals */
XID *PanoramiXVisualTable = NULL;
@ -79,57 +81,23 @@ unsigned long XRT_PIXMAP;
unsigned long XRT_GC;
unsigned long XRT_COLORMAP;
int (* SavedProcVector[256]) ();
ScreenInfo *GlobalScrInfo;
static int panoramiXGeneration;
static int ProcPanoramiXDispatch();
/*
* Function prototypes
*/
static int panoramiXGeneration;
static int ProcPanoramiXDispatch(ClientPtr client);
static void PanoramiXResetProc(ExtensionEntry*);
/*
* External references for data variables
* External references for functions and data variables
*/
extern int SProcPanoramiXDispatch();
extern char *ConnectionInfo;
extern int connBlockScreenStart;
extern xConnSetupPrefix connSetupPrefix;
#include "panoramiXh.h"
/*
* Server dispatcher function replacements
*/
int PanoramiXCreateWindow(), PanoramiXChangeWindowAttributes();
int PanoramiXDestroyWindow(), PanoramiXDestroySubwindows();
int PanoramiXChangeSaveSet(), PanoramiXReparentWindow();
int PanoramiXMapWindow(), PanoramiXMapSubwindows();
int PanoramiXUnmapWindow(), PanoramiXUnmapSubwindows();
int PanoramiXConfigureWindow(), PanoramiXCirculateWindow();
int PanoramiXGetGeometry(), PanoramiXTranslateCoords();
int PanoramiXCreatePixmap(), PanoramiXFreePixmap();
int PanoramiXCreateGC(), PanoramiXChangeGC();
int PanoramiXCopyGC(), PanoramiXCopyColormapAndFree();
int PanoramiXSetDashes(), PanoramiXSetClipRectangles();
int PanoramiXFreeGC(), PanoramiXClearToBackground();
int PanoramiXCopyArea(), PanoramiXCopyPlane();
int PanoramiXPolyPoint(), PanoramiXPolyLine();
int PanoramiXPolySegment(), PanoramiXPolyRectangle();
int PanoramiXPolyArc(), PanoramiXFillPoly();
int PanoramiXPolyFillArc(), PanoramiXPolyFillRectangle();
int PanoramiXPutImage(), PanoramiXGetImage();
int PanoramiXPolyText8(), PanoramiXPolyText16();
int PanoramiXImageText8(), PanoramiXImageText16();
int PanoramiXCreateColormap(), PanoramiXFreeColormap();
int PanoramiXInstallColormap(), PanoramiXUninstallColormap();
int PanoramiXAllocColor(), PanoramiXAllocNamedColor();
int PanoramiXAllocColorCells(), PanoramiXStoreNamedColor();
int PanoramiXFreeColors(), PanoramiXStoreColors();
int PanoramiXAllocColorPlanes();
int (* SavedProcVector[256]) (ClientPtr client) = { NULL, };
ScreenInfo *GlobalScrInfo = NULL;
static int PanoramiXGCIndex = -1;
static int PanoramiXScreenIndex = -1;
@ -460,7 +428,7 @@ void PanoramiXExtensionInit(int argc, char *argv[])
int i;
Bool success = FALSE;
ExtensionEntry *extEntry;
ScreenPtr pScreen;
ScreenPtr pScreen = screenInfo.screens[0];
PanoramiXScreenPtr pScreenPriv;
int w, h;
@ -483,7 +451,10 @@ void PanoramiXExtensionInit(int argc, char *argv[])
ErrorF("PanoramiXExtensionInit(): failed to AddExtension\n");
break;
}
#if 0
PanoramiXReqCode = (unsigned char)extEntry->base;
#endif
/*
* First make sure all the basic allocations succeed. If not,
@ -539,14 +510,16 @@ void PanoramiXExtensionInit(int argc, char *argv[])
}
REGION_INIT(pScreen, &PanoramiXScreenRegion, NullBox, 1);
REGION_NULL(pScreen, &PanoramiXScreenRegion);
for (i = 0; i < PanoramiXNumScreens; i++) {
BoxRec TheBox;
pScreen = screenInfo.screens[i];
panoramiXdataPtr[i].x = dixScreenOrigins[i].x;
panoramiXdataPtr[i].y = dixScreenOrigins[i].y;
panoramiXdataPtr[i].width = (screenInfo.screens[i])->width;
panoramiXdataPtr[i].height = (screenInfo.screens[i])->height;
panoramiXdataPtr[i].width = pScreen->width;
panoramiXdataPtr[i].height = pScreen->height;
TheBox.x1 = panoramiXdataPtr[i].x;
TheBox.x2 = TheBox.x1 + panoramiXdataPtr[i].width;
@ -646,7 +619,6 @@ Bool PanoramiXCreateConnectionBlock(void)
int old_width, old_height;
float width_mult, height_mult;
xWindowRoot *root;
xConnSetup *setup;
xVisualType *visual;
xDepth *depth;
VisualPtr pVisual;
@ -692,7 +664,6 @@ Bool PanoramiXCreateConnectionBlock(void)
screenInfo.numScreens = i;
setup = (xConnSetup *) ConnectionInfo;
root = (xWindowRoot *) (ConnectionInfo + connBlockScreenStart);
length = connBlockScreenStart + sizeof(xWindowRoot);
@ -764,19 +735,54 @@ void PanoramiXConsolidate(void)
int i, j, k;
VisualPtr pVisual, pVisual2;
ScreenPtr pScreen, pScreen2;
PanoramiXRes *root, *defmap;
DepthPtr pDepth, pDepth2;
PanoramiXRes *root, *defmap, *saver;
Bool foundDepth, missingDepth;
if(!PanoramiXVisualTable)
PanoramiXVisualTable = xcalloc(256 * MAXSCREENS, sizeof(XID));
pScreen = screenInfo.screens[0];
pVisual = pScreen->visuals;
pDepth = pScreen->allowedDepths;
PanoramiXNumDepths = 0;
PanoramiXDepths = xcalloc(pScreen->numDepths,sizeof(DepthRec));
PanoramiXNumVisuals = 0;
PanoramiXVisuals = xcalloc(pScreen->numVisuals,sizeof(VisualRec));
for (i = 0; i < pScreen->numDepths; i++, pDepth++) {
missingDepth = FALSE;
for (j = 1; j < PanoramiXNumScreens; j++) {
pScreen2 = screenInfo.screens[j];
pDepth2 = pScreen2->allowedDepths;
foundDepth = FALSE;
for (k = 0; k < pScreen2->numDepths; k++, pDepth2++) {
if(pDepth2->depth == pDepth->depth) {
foundDepth = TRUE;
break;
}
}
if(!foundDepth) {
missingDepth = TRUE;
break;
}
}
if(!missingDepth) {
PanoramiXDepths[PanoramiXNumDepths].depth = pDepth->depth;
PanoramiXDepths[PanoramiXNumDepths].numVids = 0;
if(pDepth->numVids)
PanoramiXDepths[PanoramiXNumDepths].vids =
xalloc(sizeof(VisualID) * pDepth->numVids);
else
PanoramiXDepths[PanoramiXNumDepths].vids = NULL;
PanoramiXNumDepths++;
}
}
for (i = 0; i < pScreen->numVisuals; i++, pVisual++) {
PanoramiXVisualTable[pVisual->vid * MAXSCREENS] = pVisual->vid;
@ -796,23 +802,12 @@ void PanoramiXConsolidate(void)
(pVisual->offsetGreen == pVisual2->offsetGreen) &&
(pVisual->offsetBlue == pVisual2->offsetBlue))
{
Bool AlreadyUsed = FALSE;
#if 0
/* Open GL should do this reduction, not us */
for (l = 0; l < 256; l++) {
if (pVisual2->vid ==
PanoramiXVisualTable[(l * MAXSCREENS) + j])
{
AlreadyUsed = TRUE;
break;
}
}
#endif
if (!AlreadyUsed) {
/* We merely assign the first visual that matches. OpenGL
will need to get involved at some point if you want
match GLX visuals */
PanoramiXVisualTable[(pVisual->vid * MAXSCREENS) + j] =
pVisual2->vid;
break;
}
}
}
}
@ -827,8 +822,6 @@ void PanoramiXConsolidate(void)
/* if it does, make sure it's in the list of supported depths and visuals */
if(PanoramiXVisualTable[pVisual->vid * MAXSCREENS]) {
Bool GotIt = FALSE;
PanoramiXVisuals[PanoramiXNumVisuals].vid = pVisual->vid;
PanoramiXVisuals[PanoramiXNumVisuals].class = pVisual->class;
PanoramiXVisuals[PanoramiXNumVisuals].bitsPerRGBValue = pVisual->bitsPerRGBValue;
@ -846,18 +839,9 @@ void PanoramiXConsolidate(void)
if (PanoramiXDepths[j].depth == pVisual->nplanes) {
PanoramiXDepths[j].vids[PanoramiXDepths[j].numVids] = pVisual->vid;
PanoramiXDepths[j].numVids++;
GotIt = TRUE;
break;
}
}
if (!GotIt) {
PanoramiXDepths[PanoramiXNumDepths].depth = pVisual->nplanes;
PanoramiXDepths[PanoramiXNumDepths].numVids = 1;
PanoramiXDepths[PanoramiXNumDepths].vids = xalloc(sizeof(VisualID) * 256);
PanoramiXDepths[PanoramiXNumDepths].vids[0] = pVisual->vid;
PanoramiXNumDepths++;
}
}
}
@ -866,14 +850,22 @@ void PanoramiXConsolidate(void)
root->type = XRT_WINDOW;
defmap = (PanoramiXRes *) xalloc(sizeof(PanoramiXRes));
defmap->type = XRT_COLORMAP;
saver = (PanoramiXRes *) xalloc(sizeof(PanoramiXRes));
saver->type = XRT_WINDOW;
for (i = 0; i < PanoramiXNumScreens; i++) {
root->info[i].id = WindowTable[i]->drawable.id;
root->u.win.class = InputOutput;
root->u.win.root = TRUE;
saver->info[i].id = savedScreenInfo[i].wid;
saver->u.win.class = InputOutput;
saver->u.win.root = TRUE;
defmap->info[i].id = (screenInfo.screens[i])->defColormap;
}
AddResource(root->info[0].id, XRT_WINDOW, root);
AddResource(saver->info[0].id, XRT_WINDOW, saver);
AddResource(defmap->info[0].id, XRT_COLORMAP, defmap);
}
@ -1134,6 +1126,7 @@ XineramaGetImageData(
BoxRec SrcBox, *pbox;
int x, y, w, h, i, j, nbox, size, sizeNeeded, ScratchPitch, inOut, depth;
DrawablePtr pDraw = pDrawables[0];
ScreenPtr pScreen = pDraw->pScreen;
char *ScratchMem = NULL;
size = 0;
@ -1149,7 +1142,7 @@ XineramaGetImageData(
SrcBox.y2 = SrcBox.y1 + height;
REGION_INIT(pScreen, &SrcRegion, &SrcBox, 1);
REGION_INIT(pScreen, &GrabRegion, NullBox, 1);
REGION_NULL(pScreen, &GrabRegion);
depth = (format == XYPixmap) ? 1 : pDraw->depth;

3
Xext/panoramiX.h
View File

@ -19,7 +19,7 @@
* or in FAR 52.227-19, as applicable. *
* *
*****************************************************************/
/* $XFree86: xc/programs/Xserver/Xext/panoramiX.h,v 1.5 2001/01/03 02:54:17 keithp Exp $ */
/* $XFree86: xc/programs/Xserver/Xext/panoramiX.h,v 1.6 2003/03/23 04:56:02 mvojkovi Exp $ */
/* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */
@ -52,6 +52,7 @@ typedef struct {
struct {
char visibility;
char class;
char root;
} win;
struct {
Bool shared;

25
Xext/panoramiXSwap.c
View File

@ -23,7 +23,7 @@ shall not be used in advertising or otherwise to promote the sale, use or other
dealings in this Software without prior written authorization from Digital
Equipment Corporation.
******************************************************************/
/* $XFree86: xc/programs/Xserver/Xext/panoramiXSwap.c,v 3.8 2001/08/23 13:01:36 alanh Exp $ */
/* $XFree86: xc/programs/Xserver/Xext/panoramiXSwap.c,v 3.10 2003/09/13 21:33:03 dawes Exp $ */
#include <stdio.h>
#include "X.h"
@ -47,28 +47,7 @@ Equipment Corporation.
#include "panoramiXproto.h"
#include "panoramiXsrv.h"
#include "globals.h"
/*
* External references for data variables
*/
extern char *ConnectionInfo;
extern int connBlockScreenStart;
#if NeedFunctionPrototypes
#define PROC_EXTERN(pfunc) extern int pfunc(ClientPtr)
#else
#define PROC_EXTERN(pfunc) extern int pfunc()
#endif
PROC_EXTERN(ProcPanoramiXQueryVersion);
PROC_EXTERN(ProcPanoramiXGetState);
PROC_EXTERN(ProcPanoramiXGetScreenCount);
PROC_EXTERN(ProcPanoramiXGetScreenSize);
PROC_EXTERN(ProcXineramaIsActive);
PROC_EXTERN(ProcXineramaQueryScreens);
#include "panoramiXh.h"
static int
SProcPanoramiXQueryVersion (ClientPtr client)

78
Xext/panoramiXh.h Normal file
View File

@ -0,0 +1,78 @@
/* $XFree86: xc/programs/Xserver/Xext/panoramiXh.h,v 1.3 2003/11/17 22:20:26 dawes Exp $ */
/*
* Server dispatcher function replacements
*/
extern int PanoramiXCreateWindow(ClientPtr client);
extern int PanoramiXChangeWindowAttributes(ClientPtr client);
extern int PanoramiXDestroyWindow(ClientPtr client);
extern int PanoramiXDestroySubwindows(ClientPtr client);
extern int PanoramiXChangeSaveSet(ClientPtr client);
extern int PanoramiXReparentWindow(ClientPtr client);
extern int PanoramiXMapWindow(ClientPtr client);
extern int PanoramiXMapSubwindows(ClientPtr client);
extern int PanoramiXUnmapWindow(ClientPtr client);
extern int PanoramiXUnmapSubwindows(ClientPtr client);
extern int PanoramiXConfigureWindow(ClientPtr client);
extern int PanoramiXCirculateWindow(ClientPtr client);
extern int PanoramiXGetGeometry(ClientPtr client);
extern int PanoramiXTranslateCoords(ClientPtr client);
extern int PanoramiXCreatePixmap(ClientPtr client);
extern int PanoramiXFreePixmap(ClientPtr client);
extern int PanoramiXCreateGC(ClientPtr client);
extern int PanoramiXChangeGC(ClientPtr client);
extern int PanoramiXCopyGC(ClientPtr client);
extern int PanoramiXCopyColormapAndFree(ClientPtr client);
extern int PanoramiXSetDashes(ClientPtr client);
extern int PanoramiXSetClipRectangles(ClientPtr client);
extern int PanoramiXFreeGC(ClientPtr client);
extern int PanoramiXClearToBackground(ClientPtr client);
extern int PanoramiXCopyArea(ClientPtr client);
extern int PanoramiXCopyPlane(ClientPtr client);
extern int PanoramiXPolyPoint(ClientPtr client);
extern int PanoramiXPolyLine(ClientPtr client);
extern int PanoramiXPolySegment(ClientPtr client);
extern int PanoramiXPolyRectangle(ClientPtr client);
extern int PanoramiXPolyArc(ClientPtr client);
extern int PanoramiXFillPoly(ClientPtr client);
extern int PanoramiXPolyFillArc(ClientPtr client);
extern int PanoramiXPolyFillRectangle(ClientPtr client);
extern int PanoramiXPutImage(ClientPtr client);
extern int PanoramiXGetImage(ClientPtr client);
extern int PanoramiXPolyText8(ClientPtr client);
extern int PanoramiXPolyText16(ClientPtr client);
extern int PanoramiXImageText8(ClientPtr client);
extern int PanoramiXImageText16(ClientPtr client);
extern int PanoramiXCreateColormap(ClientPtr client);
extern int PanoramiXFreeColormap(ClientPtr client);
extern int PanoramiXInstallColormap(ClientPtr client);
extern int PanoramiXUninstallColormap(ClientPtr client);
extern int PanoramiXAllocColor(ClientPtr client);
extern int PanoramiXAllocNamedColor(ClientPtr client);
extern int PanoramiXAllocColorCells(ClientPtr client);
extern int PanoramiXStoreNamedColor(ClientPtr client);
extern int PanoramiXFreeColors(ClientPtr client);
extern int PanoramiXStoreColors(ClientPtr client);
extern int PanoramiXAllocColorPlanes(ClientPtr client);
#define PROC_EXTERN(pfunc) extern int pfunc(ClientPtr)
PROC_EXTERN(ProcPanoramiXQueryVersion);
PROC_EXTERN(ProcPanoramiXGetState);
PROC_EXTERN(ProcPanoramiXGetScreenCount);
PROC_EXTERN(ProcPanoramiXGetScreenSize);
PROC_EXTERN(ProcXineramaQueryScreens);
PROC_EXTERN(ProcXineramaIsActive);
extern Bool XineramaCreateGC(GCPtr pGC);
extern int SProcPanoramiXDispatch(ClientPtr client);
extern char *ConnectionInfo;
extern int connBlockScreenStart;
extern xConnSetupPrefix connSetupPrefix;
extern ScreenInfo *GlobalScrInfo;
extern int (* SavedProcVector[256]) (ClientPtr client);

98
Xext/panoramiXprocs.c
View File

@ -26,7 +26,7 @@ Equipment Corporation.
/* Massively rewritten by Mark Vojkovich <markv@valinux.com> */
/* $XFree86: xc/programs/Xserver/Xext/panoramiXprocs.c,v 3.33 2002/04/10 21:38:53 mvojkovi Exp $ */
/* $XFree86: xc/programs/Xserver/Xext/panoramiXprocs.c,v 3.37 2003/11/10 18:21:43 tsi Exp $ */
#include <stdio.h>
#include "X.h"
@ -46,20 +46,21 @@ Equipment Corporation.
#include "panoramiX.h"
#include "panoramiXsrv.h"
#include "resource.h"
#include "panoramiXh.h"
#define XINERAMA_IMAGE_BUFSIZE (256*1024)
#define INPUTONLY_LEGAL_MASK (CWWinGravity | CWEventMask | \
CWDontPropagate | CWOverrideRedirect | CWCursor )
extern ScreenInfo *GlobalScrInfo;
extern char *ConnectionInfo;
extern int connBlockScreenStart;
#if 0
extern void (* EventSwapVector[128]) (fsError *, fsError *);
extern int (* SavedProcVector[256]) ();
extern void (* EventSwapVector[128]) ();
extern void Swap32Write(), SLHostsExtend(), SQColorsExtend(),
extern void Swap32Write();
extern void SLHostsExtend();
extern void SQColorsExtend();
WriteSConnectionInfo();
extern void WriteSConnSetupPrefix();
#endif
/* Various of the DIX function interfaces were not designed to allow
* the client->errorValue to be set on BadValue and other errors.
@ -131,6 +132,7 @@ int PanoramiXCreateWindow(ClientPtr client)
newWin->type = XRT_WINDOW;
newWin->u.win.visibility = VisibilityNotViewable;
newWin->u.win.class = stuff->class;
newWin->u.win.root = FALSE;
newWin->info[0].id = stuff->wid;
for(j = 1; j < PanoramiXNumScreens; j++)
newWin->info[j].id = FakeClientID(client->index);
@ -140,7 +142,8 @@ int PanoramiXCreateWindow(ClientPtr client)
orig_visual = stuff->visual;
orig_x = stuff->x;
orig_y = stuff->y;
parentIsRoot = (stuff->parent == WindowTable[0]->drawable.id);
parentIsRoot = (stuff->parent == WindowTable[0]->drawable.id) ||
(stuff->parent == savedScreenInfo[0].wid);
FOR_NSCREENS_BACKWARD(j) {
stuff->wid = newWin->info[j].id;
stuff->parent = parent->info[j].id;
@ -329,7 +332,8 @@ int PanoramiXReparentWindow(ClientPtr client)
x = stuff->x;
y = stuff->y;
parentIsRoot = (stuff->parent == WindowTable[0]->drawable.id);
parentIsRoot = (stuff->parent == WindowTable[0]->drawable.id) ||
(stuff->parent == savedScreenInfo[0].wid);
FOR_NSCREENS_BACKWARD(j) {
stuff->window = win->info[j].id;
stuff->parent = parent->info[j].id;
@ -468,7 +472,9 @@ int PanoramiXConfigureWindow(ClientPtr client)
}
}
if(pWin->parent && (pWin->parent == WindowTable[0])) {
if(pWin->parent && ((pWin->parent == WindowTable[0]) ||
(pWin->parent->drawable.id == savedScreenInfo[0].wid)))
{
if ((Mask)stuff->mask & CWX) {
x_offset = 0;
x = *((CARD32 *)&stuff[1]);
@ -548,7 +554,9 @@ int PanoramiXGetGeometry(ClientPtr client)
WindowPtr pWin = (WindowPtr)pDraw;
rep.x = pWin->origin.x - wBorderWidth (pWin);
rep.y = pWin->origin.y - wBorderWidth (pWin);
if(pWin->parent == WindowTable[0]) {
if((pWin->parent == WindowTable[0]) ||
(pWin->parent->drawable.id == savedScreenInfo[0].wid))
{
rep.x += panoramiXdataPtr[0].x;
rep.y += panoramiXdataPtr[0].y;
}
@ -582,7 +590,9 @@ int PanoramiXTranslateCoords(ClientPtr client)
rep.sameScreen = xTrue;
rep.child = None;
if(pWin == WindowTable[0]) {
if((pWin == WindowTable[0]) ||
(pWin->drawable.id == savedScreenInfo[0].wid))
{
x = stuff->srcX - panoramiXdataPtr[0].x;
y = stuff->srcY - panoramiXdataPtr[0].y;
} else {
@ -622,7 +632,9 @@ int PanoramiXTranslateCoords(ClientPtr client)
}
rep.dstX = x - pDst->drawable.x;
rep.dstY = y - pDst->drawable.y;
if(pDst == WindowTable[0]) {
if((pDst == WindowTable[0]) ||
(pDst->drawable.id == savedScreenInfo[0].wid))
{
rep.dstX += panoramiXdataPtr[0].x;
rep.dstY += panoramiXdataPtr[0].y;
}
@ -947,7 +959,7 @@ int PanoramiXClearToBackground(ClientPtr client)
x = stuff->x;
y = stuff->y;
isRoot = (stuff->window == WindowTable[0]->drawable.id);
isRoot = win->u.win.root;
FOR_NSCREENS_BACKWARD(j) {
stuff->window = win->info[j].id;
if(isRoot) {
@ -1002,11 +1014,9 @@ int PanoramiXCopyArea(ClientPtr client)
client, stuff->gc, XRT_GC, SecurityReadAccess)))
return BadGC;
if((dst->type == XRT_WINDOW) &&
(stuff->dstDrawable == WindowTable[0]->drawable.id))
if((dst->type == XRT_WINDOW) && dst->u.win.root)
dstIsRoot = TRUE;
if((src->type == XRT_WINDOW) &&
(stuff->srcDrawable == WindowTable[0]->drawable.id))
if((src->type == XRT_WINDOW) && src->u.win.root)
srcIsRoot = TRUE;
srcx = stuff->srcX; srcy = stuff->srcY;
@ -1095,7 +1105,7 @@ int PanoramiXCopyArea(ClientPtr client)
RegionRec totalReg;
Bool overlap;
REGION_INIT(pScreen, &totalReg, NullBox, 1);
REGION_NULL(pScreen, &totalReg);
FOR_NSCREENS_BACKWARD(j) {
if(pRgn[j]) {
if(srcIsRoot) {
@ -1152,11 +1162,9 @@ int PanoramiXCopyPlane(ClientPtr client)
client, stuff->gc, XRT_GC, SecurityReadAccess)))
return BadGC;
if((dst->type == XRT_WINDOW) &&
(stuff->dstDrawable == WindowTable[0]->drawable.id))
if((dst->type == XRT_WINDOW) && dst->u.win.root)
dstIsRoot = TRUE;
if((src->type == XRT_WINDOW) &&
(stuff->srcDrawable == WindowTable[0]->drawable.id))
if((src->type == XRT_WINDOW) && src->u.win.root)
srcIsRoot = TRUE;
srcx = stuff->srcX; srcy = stuff->srcY;
@ -1208,7 +1216,7 @@ int PanoramiXCopyPlane(ClientPtr client)
RegionRec totalReg;
Bool overlap;
REGION_INIT(pScreen, &totalReg, NullBox, 1);
REGION_NULL(pScreen, &totalReg);
FOR_NSCREENS_BACKWARD(j) {
if(pRgn[j]) {
REGION_APPEND(pScreen, &totalReg, pRgn[j]);
@ -1246,8 +1254,7 @@ int PanoramiXPolyPoint(ClientPtr client)
client, stuff->gc, XRT_GC, SecurityReadAccess)))
return BadGC;
isRoot = (draw->type == XRT_WINDOW) &&
(stuff->drawable == WindowTable[0]->drawable.id);
isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;
npoint = ((client->req_len << 2) - sizeof(xPolyPointReq)) >> 2;
if (npoint > 0) {
origPts = (xPoint *) ALLOCATE_LOCAL(npoint * sizeof(xPoint));
@ -1305,8 +1312,7 @@ int PanoramiXPolyLine(ClientPtr client)
client, stuff->gc, XRT_GC, SecurityReadAccess)))
return BadGC;
isRoot = (draw->type == XRT_WINDOW) &&
(stuff->drawable == WindowTable[0]->drawable.id);
isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;
npoint = ((client->req_len << 2) - sizeof(xPolyLineReq)) >> 2;
if (npoint > 0){
origPts = (xPoint *) ALLOCATE_LOCAL(npoint * sizeof(xPoint));
@ -1364,8 +1370,7 @@ int PanoramiXPolySegment(ClientPtr client)
client, stuff->gc, XRT_GC, SecurityReadAccess)))
return BadGC;
isRoot = (draw->type == XRT_WINDOW) &&
(stuff->drawable == WindowTable[0]->drawable.id);
isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;
nsegs = (client->req_len << 2) - sizeof(xPolySegmentReq);
if(nsegs & 4) return BadLength;
@ -1427,8 +1432,7 @@ int PanoramiXPolyRectangle(ClientPtr client)
client, stuff->gc, XRT_GC, SecurityReadAccess)))
return BadGC;
isRoot = (draw->type == XRT_WINDOW) &&
(stuff->drawable == WindowTable[0]->drawable.id);
isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;
nrects = (client->req_len << 2) - sizeof(xPolyRectangleReq);
if(nrects & 4) return BadLength;
@ -1488,8 +1492,7 @@ int PanoramiXPolyArc(ClientPtr client)
client, stuff->gc, XRT_GC, SecurityReadAccess)))
return BadGC;
isRoot = (draw->type == XRT_WINDOW) &&
(stuff->drawable == WindowTable[0]->drawable.id);
isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;
narcs = (client->req_len << 2) - sizeof(xPolyArcReq);
if(narcs % sizeof(xArc)) return BadLength;
@ -1547,8 +1550,7 @@ int PanoramiXFillPoly(ClientPtr client)
client, stuff->gc, XRT_GC, SecurityReadAccess)))
return BadGC;
isRoot = (draw->type == XRT_WINDOW) &&
(stuff->drawable == WindowTable[0]->drawable.id);
isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;
count = ((client->req_len << 2) - sizeof(xFillPolyReq)) >> 2;
if (count > 0){
@ -1607,8 +1609,7 @@ int PanoramiXPolyFillRectangle(ClientPtr client)
client, stuff->gc, XRT_GC, SecurityReadAccess)))
return BadGC;
isRoot = (draw->type == XRT_WINDOW) &&
(stuff->drawable == WindowTable[0]->drawable.id);
isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;
things = (client->req_len << 2) - sizeof(xPolyFillRectangleReq);
if(things & 4) return BadLength;
@ -1667,8 +1668,7 @@ int PanoramiXPolyFillArc(ClientPtr client)
client, stuff->gc, XRT_GC, SecurityReadAccess)))
return BadGC;
isRoot = (draw->type == XRT_WINDOW) &&
(stuff->drawable == WindowTable[0]->drawable.id);
isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;
narcs = (client->req_len << 2) - sizeof(xPolyFillArcReq);
IF_RETURN((narcs % sizeof(xArc)), BadLength);
@ -1726,8 +1726,7 @@ int PanoramiXPutImage(ClientPtr client)
client, stuff->gc, XRT_GC, SecurityReadAccess)))
return BadGC;
isRoot = (draw->type == XRT_WINDOW) &&
(stuff->drawable == WindowTable[0]->drawable.id);
isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;
orig_x = stuff->dstX;
orig_y = stuff->dstY;
@ -1786,8 +1785,7 @@ int PanoramiXGetImage(ClientPtr client)
format = stuff->format;
planemask = stuff->planeMask;
isRoot = (draw->type == XRT_WINDOW) &&
(stuff->drawable == WindowTable[0]->drawable.id);
isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;
if(isRoot) {
if( /* check for being onscreen */
@ -1919,8 +1917,7 @@ PanoramiXPolyText8(ClientPtr client)
client, stuff->gc, XRT_GC, SecurityReadAccess)))
return BadGC;
isRoot = (draw->type == XRT_WINDOW) &&
(stuff->drawable == WindowTable[0]->drawable.id);
isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;
orig_x = stuff->x;
orig_y = stuff->y;
@ -1959,8 +1956,7 @@ PanoramiXPolyText16(ClientPtr client)
client, stuff->gc, XRT_GC, SecurityReadAccess)))
return BadGC;
isRoot = (draw->type == XRT_WINDOW) &&
(stuff->drawable == WindowTable[0]->drawable.id);
isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;
orig_x = stuff->x;
orig_y = stuff->y;
@ -1999,8 +1995,7 @@ int PanoramiXImageText8(ClientPtr client)
client, stuff->gc, XRT_GC, SecurityReadAccess)))
return BadGC;
isRoot = (draw->type == XRT_WINDOW) &&
(stuff->drawable == WindowTable[0]->drawable.id);
isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;
orig_x = stuff->x;
orig_y = stuff->y;
@ -2039,8 +2034,7 @@ int PanoramiXImageText16(ClientPtr client)
client, stuff->gc, XRT_GC, SecurityReadAccess)))
return BadGC;
isRoot = (draw->type == XRT_WINDOW) &&
(stuff->drawable == WindowTable[0]->drawable.id);
isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;
orig_x = stuff->x;
orig_y = stuff->y;

9
Xext/sampleEVI.c
View File

@ -21,6 +21,8 @@ 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.
********************************************************/
/* $XFree86: xc/programs/Xserver/Xext/sampleEVI.c,v 3.5 2003/07/16 01:38:29 dawes Exp $ */
#include "X.h"
#include "Xproto.h"
#include "dixstruct.h"
@ -76,6 +78,7 @@ static int sampleGetVisualInfo(
*n_info_rn = sz_evi;
return Success;
}
static void sampleFreeVisualInfo(
xExtendedVisualInfo *evi,
VisualID32 *conflict)
@ -85,13 +88,15 @@ static void sampleFreeVisualInfo(
if (conflict)
xfree(conflict);
}
EviPrivPtr eviDDXInit()
EviPrivPtr eviDDXInit(void)
{
static EviPrivRec eviPriv;
eviPriv.getVisualInfo = sampleGetVisualInfo;
eviPriv.freeVisualInfo = sampleFreeVisualInfo;
return &eviPriv;
}
void eviDDXReset()
void eviDDXReset(void)
{
}

165
Xext/saver.c
View File

@ -1,6 +1,5 @@
/*
* $XConsortium: saver.c,v 1.12 94/04/17 20:59:36 dpw Exp $
* $XFree86: xc/programs/Xserver/Xext/saver.c,v 3.4 2001/08/23 13:01:36 alanh Exp $
*
Copyright (c) 1992 X Consortium
@ -28,6 +27,8 @@ in this Software without prior written authorization from the X Consortium.
* Author: Keith Packard, MIT X Consortium
*/
/* $XFree86: xc/programs/Xserver/Xext/saver.c,v 3.8 2003/11/17 22:20:26 dawes Exp $ */
#define NEED_REPLIES
#define NEED_EVENTS
#include "X.h"
@ -45,6 +46,11 @@ in this Software without prior written authorization from the X Consortium.
#include "gcstruct.h"
#include "cursorstr.h"
#include "colormapst.h"
#ifdef PANORAMIX
#include "panoramiX.h"
#include "panoramiXsrv.h"
#endif
#ifdef IN_MODULE
#include <xf86_ansic.h>
@ -52,7 +58,11 @@ in this Software without prior written authorization from the X Consortium.
#include <stdio.h>
#endif
#include "modinit.h"
#if 0
static unsigned char ScreenSaverReqCode = 0;
#endif
static int ScreenSaverEventBase = 0;
extern DISPATCH_PROC(ProcScreenSaverQueryInfo);
@ -69,52 +79,38 @@ static DISPATCH_PROC(SProcScreenSaverSetAttributes);
static DISPATCH_PROC(SProcScreenSaverUnsetAttributes);
static Bool ScreenSaverHandle (
#if NeedFunctionPrototypes
ScreenPtr /* pScreen */,
int /* xstate */,
Bool /* force */
#endif
);
static Bool
CreateSaverWindow (
#if NeedFunctionPrototypes
ScreenPtr /* pScreen */
#endif
);
static Bool
DestroySaverWindow (
#if NeedFunctionPrototypes
ScreenPtr /* pScreen */
#endif
);
static void
UninstallSaverColormap (
#if NeedFunctionPrototypes
ScreenPtr /* pScreen */
#endif
);
static void
CheckScreenPrivate (
#if NeedFunctionPrototypes
ScreenPtr /* pScreen */
#endif
);
static void SScreenSaverNotifyEvent (
#if NeedFunctionPrototypes
xScreenSaverNotifyEvent * /* from */,
xScreenSaverNotifyEvent * /* to */
#endif
);
static void ScreenSaverResetProc (
#if NeedFunctionPrototypes
ExtensionEntry * /* extEntry */
#endif
);
/*
@ -138,25 +134,19 @@ typedef struct _ScreenSaverEvent {
} ScreenSaverEventRec;
static int ScreenSaverFreeEvents(
#if NeedFunctionPrototypes
pointer /* value */,
XID /* id */
#endif
);
static Bool setEventMask (
#if NeedFunctionPrototypes
ScreenPtr /* pScreen */,
ClientPtr /* client */,
unsigned long /* mask */
#endif
);
static unsigned long getEventMask (
#if NeedFunctionPrototypes
ScreenPtr /* pScreen */,
ClientPtr /* client */
#endif
);
/*
@ -184,31 +174,23 @@ typedef struct _ScreenSaverAttr {
} ScreenSaverAttrRec, *ScreenSaverAttrPtr;
static int ScreenSaverFreeAttr (
#if NeedFunctionPrototypes
pointer /* value */,
XID /* id */
#endif
);
static void FreeAttrs (
#if NeedFunctionPrototypes
ScreenSaverAttrPtr /* pAttr */
#endif
);
static void FreeScreenAttr (
#if NeedFunctionPrototypes
ScreenSaverAttrPtr /* pAttr */
#endif
);
static void
SendScreenSaverNotify (
#if NeedFunctionPrototypes
ScreenPtr /* pScreen */,
int /* state */,
Bool /* forced */
#endif
);
typedef struct _ScreenSaverScreenPrivate {
@ -220,9 +202,7 @@ typedef struct _ScreenSaverScreenPrivate {
static ScreenSaverScreenPrivatePtr
MakeScreenPrivate (
#if NeedFunctionPrototypes
ScreenPtr /* pScreen */
#endif
);
static int ScreenPrivateIndex;
@ -242,7 +222,7 @@ static int ScreenPrivateIndex;
****************/
void
ScreenSaverExtensionInit()
ScreenSaverExtensionInit(INITARGS)
{
ExtensionEntry *extEntry;
int i;
@ -261,7 +241,9 @@ ScreenSaverExtensionInit()
ProcScreenSaverDispatch, SProcScreenSaverDispatch,
ScreenSaverResetProc, StandardMinorOpcode)))
{
#if 0
ScreenSaverReqCode = (unsigned char)extEntry->base;
#endif
ScreenSaverEventBase = extEntry->eventBase;
EventSwapVector[ScreenSaverEventBase] = (EventSwapPtr) SScreenSaverNotifyEvent;
}
@ -460,7 +442,6 @@ SendScreenSaverNotify (pScreen, state, forced)
xScreenSaverNotifyEvent ev;
ClientPtr client;
int kind;
ScreenSaverStuffPtr pSaver;
UpdateCurrentTimeIf ();
mask = ScreenSaverNotifyMask;
@ -470,7 +451,6 @@ SendScreenSaverNotify (pScreen, state, forced)
pPriv = GetScreenPrivate(pScreen);
if (!pPriv)
return;
pSaver = &savedScreenInfo[pScreen->myNum];
if (pPriv->attr)
kind = ScreenSaverExternal;
else if (ScreenSaverBlanking != DontPreferBlanking)
@ -696,7 +676,10 @@ ScreenSaverHandle (pScreen, xstate, force)
ret = TRUE;
}
SendScreenSaverNotify (pScreen, state, force);
#ifdef PANORAMIX
if(noPanoramiXExtension || !pScreen->myNum)
#endif
SendScreenSaverNotify (pScreen, state, force);
return ret;
}
@ -810,8 +793,7 @@ ProcScreenSaverSelectInput (client)
}
static int
ProcScreenSaverSetAttributes (client)
register ClientPtr client;
ScreenSaverSetAttributes (ClientPtr client)
{
REQUEST(xScreenSaverSetAttributesReq);
DrawablePtr pDraw;
@ -829,7 +811,6 @@ ProcScreenSaverSetAttributes (client)
WindowOptPtr ancwopt;
unsigned long *pVlist;
unsigned long *values = 0;
int valuei;
unsigned long tmask, imask;
unsigned long val;
Pixmap pixID;
@ -957,7 +938,6 @@ ProcScreenSaverSetAttributes (client)
ret = BadAlloc;
goto bail;
}
valuei = 0;
pAttr->screen = pScreen;
pAttr->client = client;
pAttr->x = stuff->x;
@ -1191,8 +1171,7 @@ bail:
}
static int
ProcScreenSaverUnsetAttributes (client)
register ClientPtr client;
ScreenSaverUnsetAttributes (ClientPtr client)
{
REQUEST(xScreenSaverSetAttributesReq);
DrawablePtr pDraw;
@ -1212,6 +1191,110 @@ ProcScreenSaverUnsetAttributes (client)
return Success;
}
static int
ProcScreenSaverSetAttributes (ClientPtr client)
{
#ifdef PANORAMIX
if(!noPanoramiXExtension) {
REQUEST(xScreenSaverSetAttributesReq);
PanoramiXRes *draw;
PanoramiXRes *backPix = NULL;
PanoramiXRes *bordPix = NULL;
PanoramiXRes *cmap = NULL;
int i, status = 0, len;
int pback_offset = 0, pbord_offset = 0, cmap_offset = 0;
XID orig_visual, tmp;
REQUEST_AT_LEAST_SIZE (xScreenSaverSetAttributesReq);
if(!(draw = (PanoramiXRes *)SecurityLookupIDByClass(
client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess)))
return BadDrawable;
len = stuff->length - (sizeof(xScreenSaverSetAttributesReq) >> 2);
if (Ones(stuff->mask) != len)
return BadLength;
if((Mask)stuff->mask & CWBackPixmap) {
pback_offset = Ones((Mask)stuff->mask & (CWBackPixmap - 1));
tmp = *((CARD32 *) &stuff[1] + pback_offset);
if ((tmp != None) && (tmp != ParentRelative)) {
if(!(backPix = (PanoramiXRes*) SecurityLookupIDByType(
client, tmp, XRT_PIXMAP, SecurityReadAccess)))
return BadPixmap;
}
}
if ((Mask)stuff->mask & CWBorderPixmap) {
pbord_offset = Ones((Mask)stuff->mask & (CWBorderPixmap - 1));
tmp = *((CARD32 *) &stuff[1] + pbord_offset);
if (tmp != CopyFromParent) {
if(!(bordPix = (PanoramiXRes*) SecurityLookupIDByType(
client, tmp, XRT_PIXMAP, SecurityReadAccess)))
return BadPixmap;
}
}
if ((Mask)stuff->mask & CWColormap) {
cmap_offset = Ones((Mask)stuff->mask & (CWColormap - 1));
tmp = *((CARD32 *) &stuff[1] + cmap_offset);
if ((tmp != CopyFromParent) && (tmp != None)) {
if(!(cmap = (PanoramiXRes*) SecurityLookupIDByType(
client, tmp, XRT_COLORMAP, SecurityReadAccess)))
return BadColor;
}
}
orig_visual = stuff->visualID;
FOR_NSCREENS_BACKWARD(i) {
stuff->drawable = draw->info[i].id;
if (backPix)
*((CARD32 *) &stuff[1] + pback_offset) = backPix->info[i].id;
if (bordPix)
*((CARD32 *) &stuff[1] + pbord_offset) = bordPix->info[i].id;
if (cmap)
*((CARD32 *) &stuff[1] + cmap_offset) = cmap->info[i].id;
if (orig_visual != CopyFromParent)
stuff->visualID =
PanoramiXVisualTable[(orig_visual*MAXSCREENS) + i];
status = ScreenSaverSetAttributes(client);
}
return status;
}
#endif
return ScreenSaverSetAttributes(client);
}
static int
ProcScreenSaverUnsetAttributes (ClientPtr client)
{
#ifdef PANORAMIX
if(!noPanoramiXExtension) {
REQUEST(xScreenSaverUnsetAttributesReq);
PanoramiXRes *draw;
int i;
if(!(draw = (PanoramiXRes *)SecurityLookupIDByClass(
client, stuff->drawable, XRC_DRAWABLE, SecurityWriteAccess)))
return BadDrawable;
for(i = PanoramiXNumScreens - 1; i > 0; i--) {
stuff->drawable = draw->info[i].id;
ScreenSaverUnsetAttributes(client);
}
stuff->drawable = draw->info[0].id;
}
#endif
return ScreenSaverUnsetAttributes(client);
}
static DISPATCH_PROC((*NormalVector[])) = {
ProcScreenSaverQueryVersion,
ProcScreenSaverQueryInfo,

162
Xext/security.c
View File

@ -24,7 +24,7 @@ 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: xc/programs/Xserver/Xext/security.c,v 1.11 2002/05/31 18:45:53 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xext/security.c,v 1.16 2003/11/17 22:20:26 dawes Exp $ */
#include "dixstruct.h"
#include "extnsionst.h"
@ -56,6 +56,8 @@ extern unsigned char LbxReqCode;
#undef index
#endif
#include "modinit.h"
static int SecurityErrorBase; /* first Security error number */
static int SecurityEventBase; /* first Security event number */
@ -73,14 +75,10 @@ static RESTYPE RTEventClient;
* the extension can't be listed or queried.
*/
int (*UntrustedProcVector[256])(
#if NeedNestedPrototypes
ClientPtr /*client*/
#endif
);
int (*SwappedUntrustedProcVector[256])(
#if NeedNestedPrototypes
ClientPtr /*client*/
#endif
);
/* SecurityAudit
@ -102,9 +100,8 @@ SecurityAudit(char *format, ...)
if (auditTrailLevel < SECURITY_AUDIT_LEVEL)
return;
AuditPrefix(format);
va_start(args, format);
VErrorF(format, args);
VAuditF(format, args);
va_end(args);
} /* SecurityAudit */
@ -123,9 +120,9 @@ SecurityAudit(char *format, ...)
*/
static int
SecurityDeleteAuthorization(value, id)
pointer value;
XID id;
SecurityDeleteAuthorization(
pointer value,
XID id)
{
SecurityAuthorizationPtr pAuth = (SecurityAuthorizationPtr)value;
unsigned short name_len, data_len;
@ -141,6 +138,7 @@ SecurityDeleteAuthorization(value, id)
assert(status);
status = RemoveAuthorization(name_len, name, data_len, data);
assert(status);
(void)status;
/* free the auth timer if there is one */
@ -181,9 +179,9 @@ SecurityDeleteAuthorization(value, id)
/* resource delete function for RTEventClient */
static int
SecurityDeleteAuthorizationEventClient(value, id)
pointer value;
XID id;
SecurityDeleteAuthorizationEventClient(
pointer value,
XID id)
{
OtherClientsPtr pEventClient, prev = NULL;
SecurityAuthorizationPtr pAuth = (SecurityAuthorizationPtr)value;
@ -223,9 +221,9 @@ SecurityDeleteAuthorizationEventClient(value, id)
*/
static CARD32
SecurityComputeAuthorizationTimeout(pAuth, seconds)
SecurityAuthorizationPtr pAuth;
unsigned int seconds;
SecurityComputeAuthorizationTimeout(
SecurityAuthorizationPtr pAuth,
unsigned int seconds)
{
/* maxSecs is the number of full seconds that can be expressed in
* 32 bits worth of milliseconds
@ -264,10 +262,10 @@ SecurityComputeAuthorizationTimeout(pAuth, seconds)
*/
static CARD32
SecurityAuthorizationExpired(timer, time, pval)
OsTimerPtr timer;
CARD32 time;
pointer pval;
SecurityAuthorizationExpired(
OsTimerPtr timer,
CARD32 time,
pointer pval)
{
SecurityAuthorizationPtr pAuth = (SecurityAuthorizationPtr)pval;
@ -299,8 +297,8 @@ SecurityAuthorizationExpired(timer, time, pval)
*/
static void
SecurityStartAuthorizationTimer(pAuth)
SecurityAuthorizationPtr pAuth;
SecurityStartAuthorizationTimer(
SecurityAuthorizationPtr pAuth)
{
pAuth->timer = TimerSet(pAuth->timer, 0,
SecurityComputeAuthorizationTimeout(pAuth, pAuth->timeout),
@ -313,8 +311,8 @@ SecurityStartAuthorizationTimer(pAuth)
*/
static int
ProcSecurityQueryVersion(client)
ClientPtr client;
ProcSecurityQueryVersion(
ClientPtr client)
{
/* REQUEST(xSecurityQueryVersionReq); */
xSecurityQueryVersionReply rep;
@ -345,10 +343,10 @@ ProcSecurityQueryVersion(client)
static int
SecurityEventSelectForAuthorization(pAuth, client, mask)
SecurityAuthorizationPtr pAuth;
ClientPtr client;
Mask mask;
SecurityEventSelectForAuthorization(
SecurityAuthorizationPtr pAuth,
ClientPtr client,
Mask mask)
{
OtherClients *pEventClient;
@ -385,8 +383,8 @@ SecurityEventSelectForAuthorization(pAuth, client, mask)
static int
ProcSecurityGenerateAuthorization(client)
ClientPtr client;
ProcSecurityGenerateAuthorization(
ClientPtr client)
{
REQUEST(xSecurityGenerateAuthorizationReq);
int len; /* request length in CARD32s*/
@ -582,8 +580,8 @@ bailout:
} /* ProcSecurityGenerateAuthorization */
static int
ProcSecurityRevokeAuthorization(client)
ClientPtr client;
ProcSecurityRevokeAuthorization(
ClientPtr client)
{
REQUEST(xSecurityRevokeAuthorizationReq);
SecurityAuthorizationPtr pAuth;
@ -607,8 +605,8 @@ ProcSecurityRevokeAuthorization(client)
static int
ProcSecurityDispatch(client)
ClientPtr client;
ProcSecurityDispatch(
ClientPtr client)
{
REQUEST(xReq);
@ -626,8 +624,8 @@ ProcSecurityDispatch(client)
} /* ProcSecurityDispatch */
static int
SProcSecurityQueryVersion(client)
ClientPtr client;
SProcSecurityQueryVersion(
ClientPtr client)
{
REQUEST(xSecurityQueryVersionReq);
register char n;
@ -641,8 +639,8 @@ SProcSecurityQueryVersion(client)
static int
SProcSecurityGenerateAuthorization(client)
ClientPtr client;
SProcSecurityGenerateAuthorization(
ClientPtr client)
{
REQUEST(xSecurityGenerateAuthorizationReq);
register char n;
@ -664,8 +662,8 @@ SProcSecurityGenerateAuthorization(client)
static int
SProcSecurityRevokeAuthorization(client)
ClientPtr client;
SProcSecurityRevokeAuthorization(
ClientPtr client)
{
REQUEST(xSecurityRevokeAuthorizationReq);
register char n;
@ -678,8 +676,8 @@ SProcSecurityRevokeAuthorization(client)
static int
SProcSecurityDispatch(client)
ClientPtr client;
SProcSecurityDispatch(
ClientPtr client)
{
REQUEST(xReq);
@ -697,8 +695,9 @@ SProcSecurityDispatch(client)
} /* SProcSecurityDispatch */
static void
SwapSecurityAuthorizationRevokedEvent(from, to)
xSecurityAuthorizationRevokedEvent *from, *to;
SwapSecurityAuthorizationRevokedEvent(
xSecurityAuthorizationRevokedEvent *from,
xSecurityAuthorizationRevokedEvent *to)
{
to->type = from->type;
to->detail = from->detail;
@ -726,10 +725,10 @@ SwapSecurityAuthorizationRevokedEvent(from, to)
*/
static void
SecurityDetermineEventPropogationLimits(dev, ppWin, ppStopWin)
DeviceIntPtr dev;
WindowPtr *ppWin;
WindowPtr *ppStopWin;
SecurityDetermineEventPropogationLimits(
DeviceIntPtr dev,
WindowPtr *ppWin,
WindowPtr *ppStopWin)
{
WindowPtr pFocusWin = dev->focus ? dev->focus->win : NoneWin;
@ -896,9 +895,9 @@ SecurityCheckDeviceAccess(client, dev, fromRequest)
*/
static pointer
SecurityAuditResourceIDAccess(client, id)
ClientPtr client;
XID id;
SecurityAuditResourceIDAccess(
ClientPtr client,
XID id)
{
int cid = CLIENT_ID(id);
int reqtype = ((xReq *)client->requestBuffer)->reqType;
@ -950,12 +949,12 @@ SecurityAuditResourceIDAccess(client, id)
*/
static pointer
SecurityCheckResourceIDAccess(client, id, rtype, access_mode, rval)
ClientPtr client;
XID id;
RESTYPE rtype;
Mask access_mode;
pointer rval;
SecurityCheckResourceIDAccess(
ClientPtr client,
XID id,
RESTYPE rtype,
Mask access_mode,
pointer rval)
{
int cid = CLIENT_ID(id);
int reqtype = ((xReq *)client->requestBuffer)->reqType;
@ -1116,10 +1115,10 @@ SecurityCheckResourceIDAccess(client, id, rtype, access_mode, rval)
*/
static void
SecurityClientStateCallback(pcbl, nulldata, calldata)
CallbackListPtr *pcbl;
pointer nulldata;
pointer calldata;
SecurityClientStateCallback(
CallbackListPtr *pcbl,
pointer nulldata,
pointer calldata)
{
NewClientInfoRec *pci = (NewClientInfoRec *)calldata;
ClientPtr client = pci->client;
@ -1220,6 +1219,7 @@ SecurityCensorImage(client, pVisibleRegion, widthBytesLine, pDraw, x, y, w, h,
unsigned int format;
char * pBuf;
{
ScreenPtr pScreen = pDraw->pScreen;
RegionRec imageRegion; /* region representing x,y,w,h */
RegionRec censorRegion; /* region to obliterate */
BoxRec imageBox;
@ -1230,7 +1230,7 @@ SecurityCensorImage(client, pVisibleRegion, widthBytesLine, pDraw, x, y, w, h,
imageBox.x2 = x + w;
imageBox.y2 = y + h;
REGION_INIT(pScreen, &imageRegion, &imageBox, 1);
REGION_INIT(pScreen, &censorRegion, NullBox, 0);
REGION_NULL(pScreen, &censorRegion);
/* censorRegion = imageRegion - visibleRegion */
REGION_SUBTRACT(pScreen, &censorRegion, &imageRegion, pVisibleRegion);
@ -1348,7 +1348,7 @@ static char *SecurityKeywords[] = {
/*#define PROPDEBUG 1*/
static void
SecurityFreePropertyAccessList()
SecurityFreePropertyAccessList(void)
{
while (PropertyAccessList)
{
@ -1365,8 +1365,8 @@ SecurityFreePropertyAccessList()
#endif
static char *
SecuritySkipWhitespace(p)
char *p;
SecuritySkipWhitespace(
char *p)
{
while (SecurityIsWhitespace(*p))
p++;
@ -1375,8 +1375,8 @@ SecuritySkipWhitespace(p)
static char *
SecurityParseString(rest)
char **rest;
SecurityParseString(
char **rest)
{
char *startOfString;
char *s = *rest;
@ -1412,8 +1412,8 @@ SecurityParseString(rest)
static int
SecurityParseKeyword(p)
char **p;
SecurityParseKeyword(
char **p)
{
int i;
char *s = *p;
@ -1433,8 +1433,8 @@ SecurityParseKeyword(p)
static Bool
SecurityParsePropertyAccessRule(p)
char *p;
SecurityParsePropertyAccessRule(
char *p)
{
char *propname;
char c;
@ -1574,8 +1574,8 @@ static char **SecurityPolicyStrings = NULL;
static int nSecurityPolicyStrings = 0;
static Bool
SecurityParseSitePolicy(p)
char *p;
SecurityParseSitePolicy(
char *p)
{
char *policyStr = SecurityParseString(&p);
char *copyPolicyStr;
@ -1613,7 +1613,7 @@ SecurityGetSitePolicyStrings(n)
} /* SecurityGetSitePolicyStrings */
static void
SecurityFreeSitePolicyStrings()
SecurityFreeSitePolicyStrings(void)
{
if (SecurityPolicyStrings)
{
@ -1630,7 +1630,7 @@ SecurityFreeSitePolicyStrings()
static void
SecurityLoadPropertyAccessList()
SecurityLoadPropertyAccessList(void)
{
FILE *f;
int lineNumber = 0;
@ -1732,9 +1732,9 @@ SecurityLoadPropertyAccessList()
static Bool
SecurityMatchString(ws, cs)
char *ws;
char *cs;
SecurityMatchString(
char *ws,
char *cs)
{
while (*ws && *cs)
{
@ -1908,8 +1908,8 @@ SecurityCheckPropertyAccess(client, pWin, propertyName, access_mode)
*/
static void
SecurityResetProc(extEntry)
ExtensionEntry *extEntry;
SecurityResetProc(
ExtensionEntry *extEntry)
{
SecurityFreePropertyAccessList();
SecurityFreeSitePolicyStrings();
@ -1944,7 +1944,7 @@ XSecurityOptions(argc, argv, i)
*/
void
SecurityExtensionInit()
SecurityExtensionInit(INITARGS)
{
ExtensionEntry *extEntry;
int i;

43
Xext/shape.c
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/Xext/shape.c,v 3.16 2001/12/14 19:58:50 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xext/shape.c,v 3.19 2003/11/17 22:20:26 dawes Exp $ */
/************************************************************
Copyright 1989, 1998 The Open Group
@ -46,45 +46,33 @@ in this Software without prior written authorization from The Open Group.
#ifdef EXTMODULE
#include "xf86_ansic.h"
#endif
#include "modinit.h"
typedef RegionPtr (*CreateDftPtr)(
#if NeedNestedPrototypes
WindowPtr /* pWin */
#endif
);
static int ShapeFreeClient(
#if NeedFunctionPrototypes
pointer /* data */,
XID /* id */
#endif
);
static int ShapeFreeEvents(
#if NeedFunctionPrototypes
pointer /* data */,
XID /* id */
#endif
);
static void SendShapeNotify(
#if NeedFunctionPrototypes
WindowPtr /* pWin */,
int /* which */
#endif
);
static void ShapeResetProc(
#if NeedFunctionPrototypes
ExtensionEntry * /* extEntry */
#endif
);
static void SShapeNotifyEvent(
#if NeedFunctionPrototypes
xShapeNotifyEvent * /* from */,
xShapeNotifyEvent * /* to */
#endif
);
static int
RegionOperate (
#if NeedFunctionPrototypes
ClientPtr /* client */,
WindowPtr /* pWin */,
int /* kind */,
@ -94,14 +82,9 @@ RegionOperate (
int /* xoff */,
int /* yoff */,
CreateDftPtr /* create */
#endif
);
#if NeedFunctionPrototypes
#define CREATE_PROC(func) RegionPtr func(WindowPtr /* pWin */)
#else
#define CREATE_PROC(func) RegionPtr func(/* WindowPtr pWin */)
#endif
static CREATE_PROC(CreateBoundingShape);
static CREATE_PROC(CreateClipShape);
@ -134,7 +117,9 @@ static DISPATCH_PROC(SProcShapeSelectInput);
#include "panoramiXsrv.h"
#endif
#if 0
static unsigned char ShapeReqCode = 0;
#endif
static int ShapeEventBase = 0;
static RESTYPE ClientType, EventType; /* resource types for event masks */
@ -164,7 +149,7 @@ typedef struct _ShapeEvent {
****************/
void
ShapeExtensionInit()
ShapeExtensionInit(INITARGS)
{
ExtensionEntry *extEntry;
@ -175,7 +160,9 @@ ShapeExtensionInit()
ProcShapeDispatch, SProcShapeDispatch,
ShapeResetProc, StandardMinorOpcode)))
{
#if 0
ShapeReqCode = (unsigned char)extEntry->base;
#endif
ShapeEventBase = extEntry->eventBase;
EventSwapVector[ShapeEventBase] = (EventSwapPtr) SShapeNotifyEvent;
}
@ -390,8 +377,8 @@ ProcShapeRectangles (client)
#ifdef PANORAMIX
static int
ProcPanoramiXShapeRectangles (client)
register ClientPtr client;
ProcPanoramiXShapeRectangles(
register ClientPtr client)
{
REQUEST(xShapeRectanglesReq);
PanoramiXRes *win;
@ -479,8 +466,8 @@ ProcShapeMask (client)
#ifdef PANORAMIX
static int
ProcPanoramiXShapeMask (client)
register ClientPtr client;
ProcPanoramiXShapeMask(
register ClientPtr client)
{
REQUEST(xShapeMaskReq);
PanoramiXRes *win, *pmap;
@ -594,8 +581,8 @@ ProcShapeCombine (client)
#ifdef PANORAMIX
static int
ProcPanoramiXShapeCombine (client)
register ClientPtr client;
ProcPanoramiXShapeCombine(
register ClientPtr client)
{
REQUEST(xShapeCombineReq);
PanoramiXRes *win, *win2;
@ -663,8 +650,8 @@ ProcShapeOffset (client)
#ifdef PANORAMIX
static int
ProcPanoramiXShapeOffset (client)
register ClientPtr client;
ProcPanoramiXShapeOffset(
register ClientPtr client)
{
REQUEST(xShapeOffsetReq);
PanoramiXRes *win;

53
Xext/shm.c
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/Xext/shm.c,v 3.36 2002/04/03 19:51:11 herrb Exp $ */
/* $XFree86: xc/programs/Xserver/Xext/shm.c,v 3.40 2003/11/17 22:20:27 dawes Exp $ */
/************************************************************
Copyright 1989, 1998 The Open Group
@ -29,6 +29,8 @@ in this Software without prior written authorization from The Open Group.
/* $Xorg: shm.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */
#define SHM
#include <sys/types.h>
#ifndef Lynx
#include <sys/ipc.h>
@ -65,6 +67,8 @@ in this Software without prior written authorization from The Open Group.
#include "panoramiXsrv.h"
#endif
#include "modinit.h"
typedef struct _ShmDesc {
struct _ShmDesc *next;
int shmid;
@ -78,21 +82,15 @@ static void miShmPutImage(XSHM_PUT_IMAGE_ARGS);
static void fbShmPutImage(XSHM_PUT_IMAGE_ARGS);
static PixmapPtr fbShmCreatePixmap(XSHM_CREATE_PIXMAP_ARGS);
static int ShmDetachSegment(
#if NeedFunctionPrototypes
pointer /* value */,
XID /* shmseg */
#endif
);
static void ShmResetProc(
#if NeedFunctionPrototypes
ExtensionEntry * /* extEntry */
#endif
);
static void SShmCompletionEvent(
#if NeedFunctionPrototypes
xShmCompletionEvent * /* from */,
xShmCompletionEvent * /* to */
#endif
);
static Bool ShmDestroyPixmap (PixmapPtr pPixmap);
@ -159,7 +157,7 @@ static ShmFuncs fbFuncs = {fbShmCreatePixmap, fbShmPutImage};
}
#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__)
#include <sys/signal.h>
static Bool badSysCall = FALSE;
@ -181,23 +179,32 @@ static Bool CheckForShmSyscall()
badSysCall = FALSE;
shmid = shmget(IPC_PRIVATE, 4096, IPC_CREAT);
/* Clean up */
if (shmid != -1)
{
/* Successful allocation - clean up */
shmctl(shmid, IPC_RMID, (struct shmid_ds *)NULL);
}
else
{
/* Allocation failed */
badSysCall = TRUE;
}
signal(SIGSYS, oldHandler);
return(!badSysCall);
}
#define MUST_CHECK_FOR_SHM_SYSCALL
#endif
void
ShmExtensionInit()
ShmExtensionInit(INITARGS)
{
ExtensionEntry *extEntry;
int i;
#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
#ifdef MUST_CHECK_FOR_SHM_SYSCALL
if (!CheckForShmSyscall())
{
ErrorF("MIT-SHM extension disabled due to lack of kernel support\n");
@ -270,17 +277,17 @@ ExtensionEntry *extEntry;
}
void
ShmRegisterFuncs(pScreen, funcs)
ScreenPtr pScreen;
ShmFuncsPtr funcs;
ShmRegisterFuncs(
ScreenPtr pScreen,
ShmFuncsPtr funcs)
{
shmFuncs[pScreen->myNum] = funcs;
}
void
ShmSetPixmapFormat(pScreen, format)
ScreenPtr pScreen;
int format;
ShmSetPixmapFormat(
ScreenPtr pScreen,
int format)
{
shmPixFormat[pScreen->myNum] = format;
}
@ -572,8 +579,7 @@ ProcPanoramiXShmPutImage(register ClientPtr client)
client, stuff->gc, XRT_GC, SecurityReadAccess)))
return BadGC;
isRoot = (draw->type == XRT_WINDOW) &&
(stuff->drawable == WindowTable[0]->drawable.id);
isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;
orig_x = stuff->dstX;
orig_y = stuff->dstY;
@ -633,8 +639,7 @@ ProcPanoramiXShmGetImage(ClientPtr client)
format = stuff->format;
planemask = stuff->planeMask;
isRoot = (draw->type == XRT_WINDOW) &&
(stuff->drawable == WindowTable[0]->drawable.id);
isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;
if(isRoot) {
if( /* check for being onscreen */
@ -709,8 +714,8 @@ ProcPanoramiXShmGetImage(ClientPtr client)
}
static int
ProcPanoramiXShmCreatePixmap(client)
register ClientPtr client;
ProcPanoramiXShmCreatePixmap(
register ClientPtr client)
{
ScreenPtr pScreen = NULL;
PixmapPtr pMap = NULL;

16
Xext/sleepuntil.c
View File

@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
*
* Author: Keith Packard, MIT X Consortium
*/
/* $XFree86: xc/programs/Xserver/Xext/sleepuntil.c,v 3.5 2001/12/14 19:58:51 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xext/sleepuntil.c,v 3.7 2003/11/17 22:20:27 dawes Exp $ */
/* dixsleep.c - implement millisecond timeouts for X clients */
@ -44,10 +44,8 @@ typedef struct _Sertafied {
ClientPtr pClient;
XID id;
void (*notifyFunc)(
#if NeedNestedPrototypes
ClientPtr /* client */,
pointer /* closure */
#endif
);
pointer closure;
@ -59,37 +57,31 @@ static Bool BlockHandlerRegistered;
static int SertafiedGeneration;
static void ClientAwaken(
#if NeedFunctionPrototypes
ClientPtr /* client */,
pointer /* closure */
#endif
);
static int SertafiedDelete(
#if NeedFunctionPrototypes
pointer /* value */,
XID /* id */
#endif
);
static void SertafiedBlockHandler(
#if NeedFunctionPrototypes
pointer /* data */,
OSTimePtr /* wt */,
pointer /* LastSelectMask */
#endif
);
static void SertafiedWakeupHandler(
#if NeedFunctionPrototypes
pointer /* data */,
int /* i */,
pointer /* LastSelectMask */
#endif
);
int
ClientSleepUntil (client, revive, notifyFunc, closure)
ClientPtr client;
TimeStamp *revive;
void (*notifyFunc)();
void (*notifyFunc)(
ClientPtr /* client */,
pointer /* closure */);
pointer closure;
{
SertafiedPtr pRequest, pReq, pPrev;

6
Xext/sleepuntil.h
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/Xext/sleepuntil.h,v 1.1 2001/08/01 00:44:44 tsi Exp $ */
/* $XFree86: xc/programs/Xserver/Xext/sleepuntil.h,v 1.2 2003/11/17 22:20:27 dawes Exp $ */
/*
* Copyright (C) 2001 The XFree86 Project, Inc. All Rights Reserved.
*
@ -31,17 +31,13 @@
#include "dix.h"
extern int ClientSleepUntil(
#if NeedFunctionPrototypes
ClientPtr client,
TimeStamp *revive,
void (*notifyFunc)(
#if NeedNestedPrototypes
ClientPtr /* client */,
pointer /* closure */
#endif
),
pointer Closure
#endif
);
#endif

79
Xext/sync.c
View File

@ -50,7 +50,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
*/
/* $XFree86: xc/programs/Xserver/Xext/sync.c,v 3.11 2001/12/14 19:58:51 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xext/sync.c,v 3.14 2003/11/17 22:20:27 dawes Exp $ */
#define NEED_REPLIES
#define NEED_EVENTS
@ -76,10 +76,11 @@ PERFORMANCE OF THIS SOFTWARE.
#endif
#endif
#include "modinit.h"
/*
* Local Global Variables
*/
static int SyncReqCode;
static int SyncEventBase;
static int SyncErrorBase;
static RESTYPE RTCounter = 0;
@ -98,219 +99,165 @@ static SyncCounter **SysCounterList = NULL;
static int
FreeAlarm(
#if NeedFunctionPrototypes
pointer /* addr */,
XID /* id */
#endif
);
static int
FreeAlarmClient(
#if NeedFunctionPrototypes
pointer /* value */,
XID /* id */
#endif
);
static int
FreeAwait(
#if NeedFunctionPrototypes
pointer /* addr */,
XID /* id */
#endif
);
static void
ServertimeBracketValues(
#if NeedFunctionPrototypes
pointer /* pCounter */,
CARD64 * /* pbracket_less */,
CARD64 * /* pbracket_greater */
#endif
);
static void
ServertimeQueryValue(
#if NeedFunctionPrototypes
pointer /* pCounter */,
CARD64 * /* pValue_return */
#endif
);
static void
ServertimeWakeupHandler(
#if NeedFunctionPrototypes
pointer /* env */,
int /* rc */,
pointer /* LastSelectMask */
#endif
);
static int
SyncInitTrigger(
#if NeedFunctionPrototypes
ClientPtr /* client */,
SyncTrigger * /* pTrigger */,
XSyncCounter /* counter */,
Mask /* changes */
#endif
);
static void
SAlarmNotifyEvent(
#if NeedFunctionPrototypes
xSyncAlarmNotifyEvent * /* from */,
xSyncAlarmNotifyEvent * /* to */
#endif
);
static void
SCounterNotifyEvent(
#if NeedFunctionPrototypes
xSyncCounterNotifyEvent * /* from */,
xSyncCounterNotifyEvent * /* to */
#endif
);
static void
ServertimeBlockHandler(
#if NeedFunctionPrototypes
pointer /* env */,
struct timeval ** /* wt */,
pointer /* LastSelectMask */
#endif
);
static int
SyncAddTriggerToCounter(
#if NeedFunctionPrototypes
SyncTrigger * /* pTrigger */
#endif
);
extern void
SyncAlarmCounterDestroyed(
#if NeedFunctionPrototypes
SyncTrigger * /* pTrigger */
#endif
);
static void
SyncAlarmTriggerFired(
#if NeedFunctionPrototypes
SyncTrigger * /* pTrigger */
#endif
);
static void
SyncAwaitTriggerFired(
#if NeedFunctionPrototypes
SyncTrigger * /* pTrigger */
#endif
);
static int
SyncChangeAlarmAttributes(
#if NeedFunctionPrototypes
ClientPtr /* client */,
SyncAlarm * /* pAlarm */,
Mask /* mask */,
CARD32 * /* values */
#endif
);
static Bool
SyncCheckTriggerNegativeComparison(
#if NeedFunctionPrototypes
SyncTrigger * /* pTrigger */,
CARD64 /* oldval */
#endif
);
static Bool
SyncCheckTriggerNegativeTransition(
#if NeedFunctionPrototypes
SyncTrigger * /* pTrigger */,
CARD64 /* oldval */
#endif
);
static Bool
SyncCheckTriggerPositiveComparison(
#if NeedFunctionPrototypes
SyncTrigger * /* pTrigger */,
CARD64 /* oldval */
#endif
);
static Bool
SyncCheckTriggerPositiveTransition(
#if NeedFunctionPrototypes
SyncTrigger * /* pTrigger */,
CARD64 /* oldval */
#endif
);
static SyncCounter *
SyncCreateCounter(
#if NeedFunctionPrototypes
ClientPtr /* client */,
XSyncCounter /* id */,
CARD64 /* initialvalue */
#endif
);
static void SyncComputeBracketValues(
#if NeedFunctionPrototypes
SyncCounter * /* pCounter */,
Bool /* startOver */
#endif
);
static void
SyncDeleteTriggerFromCounter(
#if NeedFunctionPrototypes
SyncTrigger * /* pTrigger */
#endif
);
static Bool
SyncEventSelectForAlarm(
#if NeedFunctionPrototypes
SyncAlarm * /* pAlarm */,
ClientPtr /* client */,
Bool /* wantevents */
#endif
);
static void
SyncInitServerTime(
#if NeedFunctionPrototypes
void
#endif
);
static void
SyncResetProc(
#if NeedFunctionPrototypes
ExtensionEntry * /* extEntry */
#endif
);
static void
SyncSendAlarmNotifyEvents(
#if NeedFunctionPrototypes
SyncAlarm * /* pAlarm */
#endif
);
static void
SyncSendCounterNotifyEvents(
#if NeedFunctionPrototypes
ClientPtr /* client */,
SyncAwait ** /* ppAwait */,
int /* num_events */
#endif
);
static DISPATCH_PROC(ProcSyncAwait);
@ -1081,10 +1028,8 @@ SyncCreateCounter(client, id, initialvalue)
}
static int FreeCounter(
#if NeedFunctionPrototypes
pointer /*env*/,
XID /*id*/
#endif
);
/*
@ -1098,8 +1043,13 @@ SyncCreateSystemCounter(name, initial, resolution, counterType,
CARD64 initial;
CARD64 resolution;
SyncCounterType counterType;
void (*QueryValue) ();
void (*BracketValues) ();
void (*QueryValue) (
pointer /* pCounter */,
CARD64 * /* pValue_return */);
void (*BracketValues) (
pointer /* pCounter */,
CARD64 * /* pbracket_less */,
CARD64 * /* pbracket_greater */);
{
SyncCounter *pCounter;
@ -1588,6 +1538,8 @@ ProcSyncSetCounter(client)
SyncCounter *pCounter;
CARD64 newvalue;
REQUEST_SIZE_MATCH(xSyncSetCounterReq);
pCounter = (SyncCounter *)SecurityLookupIDByType(client, stuff->cid,
RTCounter, SecurityWriteAccess);
if (pCounter == NULL)
@ -2031,12 +1983,11 @@ static int
ProcSyncDestroyAlarm(client)
ClientPtr client;
{
SyncAlarm *pAlarm;
REQUEST(xSyncDestroyAlarmReq);
REQUEST_SIZE_MATCH(xSyncDestroyAlarmReq);
if (!(pAlarm = (SyncAlarm *)SecurityLookupIDByType(client, stuff->alarm,
if (!((SyncAlarm *)SecurityLookupIDByType(client, stuff->alarm,
RTAlarm, SecurityDestroyAccess)))
{
client->errorValue = stuff->alarm;
@ -2399,7 +2350,7 @@ SyncResetProc(extEntry)
* ** Initialise the extension.
*/
void
SyncExtensionInit()
SyncExtensionInit(INITARGS)
{
ExtensionEntry *extEntry;
@ -2424,7 +2375,6 @@ SyncExtensionInit()
return;
}
SyncReqCode = extEntry->base;
SyncEventBase = extEntry->eventBase;
SyncErrorBase = extEntry->errorBase;
EventSwapVector[SyncEventBase + XSyncCounterNotify] = (EventSwapPtr) SCounterNotifyEvent;
@ -2488,6 +2438,7 @@ pointer LastSelectMask;
{
Bool overflow;
XSyncValueSubtract(&delay, *pnext_time, Now, &overflow);
(void)overflow;
timeout = XSyncValueLow32(delay);
}
AdjustWaitForDelay(wt, timeout); /* os/utils.c */

16
Xext/xcmisc.c
View File

@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
/* $XFree86: xc/programs/Xserver/Xext/xcmisc.c,v 3.5 2001/12/14 19:58:51 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xext/xcmisc.c,v 3.8 2003/11/17 22:20:27 dawes Exp $ */
#define NEED_EVENTS
#define NEED_REPLIES
@ -38,13 +38,14 @@ from The Open Group.
#include "extnsionst.h"
#include "swaprep.h"
#include "xcmiscstr.h"
#include "modinit.h"
#if 0
static unsigned char XCMiscCode;
#endif
static void XCMiscResetProc(
#if NeedFunctionPrototypes
ExtensionEntry * /* extEntry */
#endif
);
static DISPATCH_PROC(ProcXCMiscDispatch);
@ -57,14 +58,21 @@ static DISPATCH_PROC(SProcXCMiscGetXIDList);
static DISPATCH_PROC(SProcXCMiscGetXIDRange);
void
XCMiscExtensionInit()
XCMiscExtensionInit(INITARGS)
{
#if 0
ExtensionEntry *extEntry;
if ((extEntry = AddExtension(XCMiscExtensionName, 0, 0,
ProcXCMiscDispatch, SProcXCMiscDispatch,
XCMiscResetProc, StandardMinorOpcode)) != 0)
XCMiscCode = (unsigned char)extEntry->base;
#else
(void) AddExtension(XCMiscExtensionName, 0, 0,
ProcXCMiscDispatch, SProcXCMiscDispatch,
XCMiscResetProc, StandardMinorOpcode);
#endif
DeclareExtensionSecurity(XCMiscExtensionName, TRUE);
}

39
Xext/xf86bigfont.c
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/Xext/xf86bigfont.c,v 1.13 2001/06/30 22:41:44 tsi Exp $ */
/* $XFree86: xc/programs/Xserver/Xext/xf86bigfont.c,v 1.18 2003/11/17 22:20:27 dawes Exp $ */
/*
* BIGFONT extension for sharing font metrics between clients (if possible)
* and for transmitting font metrics to clients in a compressed form.
@ -73,9 +73,7 @@
#include "xf86bigfstr.h"
static void XF86BigfontResetProc(
#if NeedFunctionPrototypes
ExtensionEntry * /* extEntry */
#endif
);
static DISPATCH_PROC(ProcXF86BigfontDispatch);
@ -85,7 +83,9 @@ static DISPATCH_PROC(SProcXF86BigfontDispatch);
static DISPATCH_PROC(SProcXF86BigfontQueryVersion);
static DISPATCH_PROC(SProcXF86BigfontQueryFont);
#if 0
static unsigned char XF86BigfontReqCode;
#endif
#ifdef HAS_SHM
@ -112,9 +112,10 @@ SigSysHandler(
badSysCall = TRUE;
}
static Bool CheckForShmSyscall()
static Bool
CheckForShmSyscall(void)
{
void (*oldHandler)();
void (*oldHandler)(int);
int shmid = -1;
/* If no SHM support in the kernel, the bad syscall will generate SIGSYS */
@ -122,10 +123,16 @@ static Bool CheckForShmSyscall()
badSysCall = FALSE;
shmid = shmget(IPC_PRIVATE, 4096, IPC_CREAT);
/* Clean up */
if (shmid != -1) {
if (shmid != -1)
{
/* Successful allocation - clean up */
shmctl(shmid, IPC_RMID, (struct shmid_ds *)NULL);
}
else
{
/* Allocation failed */
badSysCall = TRUE;
}
signal(SIGSYS, oldHandler);
return (!badSysCall);
}
@ -139,6 +146,7 @@ static Bool CheckForShmSyscall()
void
XFree86BigfontExtensionInit()
{
#if 0
ExtensionEntry* extEntry;
if ((extEntry = AddExtension(XF86BIGFONTNAME,
@ -149,10 +157,25 @@ XFree86BigfontExtensionInit()
XF86BigfontResetProc,
StandardMinorOpcode))) {
XF86BigfontReqCode = (unsigned char) extEntry->base;
#else
if (AddExtension(XF86BIGFONTNAME,
XF86BigfontNumberEvents,
XF86BigfontNumberErrors,
ProcXF86BigfontDispatch,
SProcXF86BigfontDispatch,
XF86BigfontResetProc,
StandardMinorOpcode)) {
#endif
#ifdef HAS_SHM
#ifdef MUST_CHECK_FOR_SHM_SYSCALL
/*
* Note: Local-clients will not be optimized without shared memory
* support. Remote-client optimization does not depend on shared
* memory support. Thus, the extension is still registered even
* when shared memory support is not functional.
*/
if (!CheckForShmSyscall()) {
ErrorF(XF86BIGFONTNAME " extension disabled due to lack of shared memory support in the kernel\n");
ErrorF(XF86BIGFONTNAME " extension local-client optimization disabled due to lack of shared memory support in the kernel\n");
return;
}
#endif

45
Xext/xprint.c
View File

@ -64,7 +64,7 @@ copyright holders.
** *********************************************************
**
********************************************************************/
/* $XFree86: xc/programs/Xserver/Xext/xprint.c,v 1.13 2001/11/23 19:21:31 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xext/xprint.c,v 1.15 2003/10/28 23:08:44 tsi Exp $ */
#define _XP_PRINT_SERVER_
#include "X.h"
@ -83,6 +83,7 @@ copyright holders.
#include "Printstr.h"
#include "../Xprint/DiPrint.h"
#include "../Xprint/attributes.h"
#include "modinit.h"
static void XpResetProc(ExtensionEntry *);
@ -282,7 +283,7 @@ static CARD32 allEvents = XPPrintMask | XPAttributeMask;
*/
void
XpExtensionInit(void)
XpExtensionInit(INITARGS)
{
ExtensionEntry *extEntry;
int i;
@ -753,15 +754,17 @@ ProcXpGetPageDimensions(ClientPtr client)
return XpErrorBase+XPBadContext;
}
if(pContext->funcs.GetMediumDimensions != 0)
result = pContext->funcs.GetMediumDimensions(pContext, &width, &height);
else
if((pContext->funcs.GetMediumDimensions == 0) ||
(pContext->funcs.GetReproducibleArea == 0))
return BadImplementation;
if(pContext->funcs.GetReproducibleArea != 0)
result = pContext->funcs.GetMediumDimensions(pContext, &width, &height);
if(result != Success)
return result;
result = pContext->funcs.GetReproducibleArea(pContext, &rect);
else
return BadImplementation;
if(result != Success)
return result;
rep.type = X_Reply;
rep.sequenceNumber = client->sequence;
@ -814,11 +817,13 @@ ProcXpSetImageResolution(ClientPtr client)
}
rep.prevRes = pContext->imageRes;
if(pContext->funcs.SetImageResolution != 0)
if(pContext->funcs.SetImageResolution != 0) {
result = pContext->funcs.SetImageResolution(pContext,
(int)stuff->imageRes,
&status);
else
if(result != Success)
status = FALSE;
} else
status = FALSE;
rep.type = X_Reply;
@ -1491,7 +1496,6 @@ ProcXpStartJob(ClientPtr client)
REQUEST(xPrintStartJobReq);
XpContextPtr pContext;
int result = Success;
XpScreenPtr pPrintScreen;
REQUEST_SIZE_MATCH(xPrintStartJobReq);
@ -1509,7 +1513,6 @@ ProcXpStartJob(ClientPtr client)
return BadValue;
}
pPrintScreen = XpScreens[pContext->screenNum];
if(pContext->funcs.StartJob != 0)
result = pContext->funcs.StartJob(pContext,
(stuff->saveData == XPGetData)? TRUE:FALSE,
@ -1533,7 +1536,6 @@ static int
ProcXpEndJob(ClientPtr client)
{
REQUEST(xPrintEndJobReq);
XpScreenPtr pPrintScreen;
int result = Success;
XpContextPtr pContext;
@ -1543,8 +1545,6 @@ ProcXpEndJob(ClientPtr client)
== (XpContextPtr)NULL)
return XpErrorBase+XPBadSequence;
pPrintScreen = XpScreens[pContext->screenNum];
if(!(pContext->state & JOB_STARTED))
return XpErrorBase+XPBadSequence;
@ -1603,8 +1603,6 @@ ProcXpEndJob(ClientPtr client)
static Bool
DoStartDoc(ClientPtr client, XpStDocPtr c)
{
XpScreenPtr pPrintScreen;
int result = Success;
XpContextPtr pContext = c->pContext;
if(c->pContext->state & JOB_GET_DATA &&
@ -1619,10 +1617,8 @@ DoStartDoc(ClientPtr client, XpStDocPtr c)
return TRUE;
}
pPrintScreen = XpScreens[pContext->screenNum];
if(pContext->funcs.StartDoc != 0)
result = pContext->funcs.StartDoc(pContext, c->type);
(void) pContext->funcs.StartDoc(pContext, c->type);
else
{
SendErrorToClient(client, XpReqCode, X_PrintStartPage, 0,
@ -1682,7 +1678,6 @@ static int
ProcXpEndDoc(ClientPtr client)
{
REQUEST(xPrintEndDocReq);
XpScreenPtr pPrintScreen;
XpContextPtr pContext;
int result = Success;
@ -1692,8 +1687,6 @@ ProcXpEndDoc(ClientPtr client)
== (XpContextPtr)NULL)
return XpErrorBase+XPBadSequence;
pPrintScreen = XpScreens[pContext->screenNum];
if(!(pContext->state & DOC_RAW_STARTED) &&
!(pContext->state & DOC_COOKED_STARTED))
return XpErrorBase+XPBadSequence;
@ -1744,7 +1737,6 @@ DoStartPage(
ClientPtr client,
XpStPagePtr c)
{
XpScreenPtr pPrintScreen;
WindowPtr pWin = c->pWin;
int result = Success;
XpContextPtr pContext = c->pContext;
@ -1815,9 +1807,6 @@ DoStartPage(
pPage->context = pContext;
pContext->pageWin = c->pWin->drawable.id;
pPrintScreen = XpScreens[pContext->screenNum];
if(pContext->funcs.StartPage != 0)
result = pContext->funcs.StartPage(pContext, pWin);
else
@ -1884,7 +1873,6 @@ static int
ProcXpEndPage(ClientPtr client)
{
REQUEST(xPrintEndPageReq);
XpScreenPtr pPrintScreen;
int result = Success;
XpContextPtr pContext;
XpPagePtr page;
@ -1899,7 +1887,6 @@ ProcXpEndPage(ClientPtr client)
if(!(pContext->state & PAGE_STARTED))
return XpErrorBase+XPBadSequence;
pPrintScreen = XpScreens[pContext->screenNum];
pWin = (WindowPtr )LookupIDByType(pContext->pageWin, RT_WINDOW);
/* Call the ddx's EndPage proc. */

15
Xext/xres.c
View File

@ -1,7 +1,7 @@
/*
Copyright (c) 2002 XFree86 Inc
*/
/* $XFree86: xc/programs/Xserver/Xext/xres.c,v 1.5 2002/07/01 02:25:55 tsi Exp $ */
/* $XFree86: xc/programs/Xserver/Xext/xres.c,v 1.8 2003/10/28 23:08:44 tsi Exp $ */
#define NEED_EVENTS
#define NEED_REPLIES
@ -14,10 +14,7 @@
#include "swaprep.h"
#include "XResproto.h"
#include "pixmapstr.h"
extern RESTYPE lastResourceType;
extern RESTYPE TypeMask;
extern Atom *ResourceNames;
#include "modinit.h"
static int
ProcXResQueryVersion (ClientPtr client)
@ -30,6 +27,8 @@ ProcXResQueryVersion (ClientPtr client)
client_major = stuff->client_major;
client_minor = stuff->client_minor;
(void) client_major;
(void) client_minor;
rep.type = X_Reply;
rep.length = 0;
@ -314,11 +313,9 @@ SProcResDispatch (ClientPtr client)
}
void
ResExtensionInit(void)
ResExtensionInit(INITARGS)
{
ExtensionEntry *extEntry;
extEntry = AddExtension(XRES_NAME, 0, 0,
(void) AddExtension(XRES_NAME, 0, 0,
ProcResDispatch, SProcResDispatch,
ResResetProc, StandardMinorOpcode);

60
Xext/xtest.c
View File

@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
/* $XFree86: xc/programs/Xserver/Xext/xtest.c,v 3.7 2001/12/14 19:58:51 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xext/xtest.c,v 3.11 2003/11/17 22:20:27 dawes Exp $ */
#include "X.h"
#define NEED_EVENTS
@ -53,22 +53,27 @@ from The Open Group.
#include "xf86_ansic.h"
#endif
#include "modinit.h"
#if 0
static unsigned char XTestReqCode;
#endif
#ifdef XINPUT
extern int DeviceValuator;
#endif /* XINPUT */
static void XTestResetProc(
#if NeedFunctionPrototypes
ExtensionEntry * /* extEntry */
#ifdef PANORAMIX
#include "panoramiX.h"
#include "panoramiXsrv.h"
#endif
static void XTestResetProc(
ExtensionEntry * /* extEntry */
);
static int XTestSwapFakeInput(
#if NeedFunctionPrototypes
ClientPtr /* client */,
xReq * /* req */
#endif
);
static DISPATCH_PROC(ProcXTestCompareCursor);
@ -83,14 +88,20 @@ static DISPATCH_PROC(SProcXTestGetVersion);
static DISPATCH_PROC(SProcXTestGrabControl);
void
XTestExtensionInit()
XTestExtensionInit(INITARGS)
{
#if 0
ExtensionEntry *extEntry;
if ((extEntry = AddExtension(XTestExtensionName, 0, 0,
ProcXTestDispatch, SProcXTestDispatch,
XTestResetProc, StandardMinorOpcode)) != 0)
XTestReqCode = (unsigned char)extEntry->base;
#else
(void) AddExtension(XTestExtensionName, 0, 0,
ProcXTestDispatch, SProcXTestDispatch,
XTestResetProc, StandardMinorOpcode);
#endif
}
/*ARGSUSED*/
@ -378,6 +389,33 @@ ProcXTestFakeInput(client)
client->errorValue = ev->u.u.detail;
return BadValue;
}
#ifdef PANORAMIX
if (!noPanoramiXExtension) {
ScreenPtr pScreen = root->drawable.pScreen;
BoxRec box;
int i;
int x = ev->u.keyButtonPointer.rootX + panoramiXdataPtr[0].x;
int y = ev->u.keyButtonPointer.rootY + panoramiXdataPtr[0].y;
if (!POINT_IN_REGION(pScreen, &XineramaScreenRegions[pScreen->myNum],
x, y, &box)) {
FOR_NSCREENS(i) {
if (i == pScreen->myNum) continue;
if (POINT_IN_REGION(pScreen,
&XineramaScreenRegions[i],
x, y, &box)) {
root = WindowTable[i];
x -= panoramiXdataPtr[i].x;
y -= panoramiXdataPtr[i].y;
ev->u.keyButtonPointer.rootX = x;
ev->u.keyButtonPointer.rootY = y;
break;
}
}
}
}
#endif
if (ev->u.keyButtonPointer.rootX < 0)
ev->u.keyButtonPointer.rootX = 0;
else if (ev->u.keyButtonPointer.rootX >= root->drawable.width)
@ -386,7 +424,15 @@ ProcXTestFakeInput(client)
ev->u.keyButtonPointer.rootY = 0;
else if (ev->u.keyButtonPointer.rootY >= root->drawable.height)
ev->u.keyButtonPointer.rootY = root->drawable.height - 1;
#ifdef PANORAMIX
if ((!noPanoramiXExtension
&& root->drawable.pScreen->myNum != XineramaGetCursorScreen())
|| (noPanoramiXExtension && root != GetCurrentRootWindow()))
#else
if (root != GetCurrentRootWindow())
#endif
{
NewCurrentScreen(root->drawable.pScreen,
ev->u.keyButtonPointer.rootX,

41
Xext/xtest1dd.c
View File

@ -52,7 +52,7 @@ Telephone and Telegraph Company or of the Regents of the
University of California.
*/
/* $XFree86: xc/programs/Xserver/Xext/xtest1dd.c,v 3.5 2001/12/14 19:58:52 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xext/xtest1dd.c,v 3.7 2003/11/17 22:20:28 dawes Exp $ */
/***************************************************************
* include files
@ -157,11 +157,6 @@ static xTestInputActionEvent input_action_packet;
* current input action event
*/
static int packet_index;
/*
* set to 1 when the input action event is full and needs to be sent to the
* client
*/
static int input_action_event_full = 0;
/*
* logical x position of the mouse during input action gathering
*/
@ -170,14 +165,6 @@ short xtest_mousex;
* logical y position of the mouse during input action gathering
*/
short xtest_mousey;
/*
* logical x position of the mouse during input action playback
*/
static short mx;
/*
* logical y position of the mouse during input action playback
*/
static short my;
/*
* logical x position of the mouse while we are reading fake input actions
* from the client and putting them into the fake input action array
@ -288,60 +275,38 @@ KeyCode xtest_command_key = 0;
***************************************************************/
static void parse_key_fake(
#if NeedFunctionPrototypes
XTestKeyInfo * /* fkey */
#endif
);
static void parse_motion_fake(
#if NeedFunctionPrototypes
XTestMotionInfo * /* fmotion */
#endif
);
static void parse_jump_fake(
#if NeedFunctionPrototypes
XTestJumpInfo * /* fjump */
#endif
);
static void parse_delay_fake(
#if NeedFunctionPrototypes
XTestDelayInfo * /* tevent */
#endif
);
static void send_ack(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
static void start_play_clock(
#if NeedFunctionPrototypes
void
#endif
);
static void compute_action_time(
#if NeedFunctionPrototypes
struct timeval * /* rtime */
#endif
);
static int find_residual_time(
#if NeedFunctionPrototypes
struct timeval * /* rtime */
#endif
);
static CARD16 check_time_event(
#if NeedFunctionPrototypes
void
#endif
);
static CARD32 current_ms(
#if NeedFunctionPrototypes
struct timeval * /* otime */
#endif
);
static int there_is_room(
#if NeedFunctionPrototypes
int /* actsize */
#endif
);
/******************************************************************************
@ -471,7 +436,6 @@ flush_input_actions()
/*
* re-initialize the input action event
*/
input_action_event_full = 0;
input_action_packet.type = XTestInputActionType;
packet_index = 0;
}
@ -690,7 +654,6 @@ int actsize;
{
if ((packet_index + actsize) > XTestACTIONS_SIZE)
{
input_action_event_full = 1;
return(0);
}
else
@ -1316,8 +1279,6 @@ int mousex, mousey;
action_array[read_index].x,
action_array[read_index].y,
action_array[read_index].device);
mx = action_array[read_index].x;
my = action_array[read_index].y;
}
if (action_array[read_index].type == XTestKEY_ACTION)
{

30
Xext/xtest1dd.h
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/Xext/xtest1dd.h,v 3.2 2001/08/01 00:44:44 tsi Exp $ */
/* $XFree86: xc/programs/Xserver/Xext/xtest1dd.h,v 3.3 2003/11/17 22:20:28 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@ -35,117 +35,89 @@ extern ClientPtr playback_client;
extern KeyCode xtest_command_key;
extern void stop_stealing_input(
#if NeedFunctionPrototypes
void
#endif
);
extern void
steal_input(
#if NeedFunctionPrototypes
ClientPtr /* client */,
CARD32 /* mode */
#endif
);
extern void
flush_input_actions(
#if NeedFunctionPrototypes
void
#endif
);
extern void
XTestStealJumpData(
#if NeedFunctionPrototypes
int /* jx */,
int /* jy */,
int /* dev_type */
#endif
);
extern void
XTestStealMotionData(
#if NeedFunctionPrototypes
int /* dx */,
int /* dy */,
int /* dev_type */,
int /* mx */,
int /* my */
#endif
);
extern Bool
XTestStealKeyData(
#if NeedFunctionPrototypes
unsigned /* keycode */,
int /* keystate */,
int /* dev_type */,
int /* locx */,
int /* locy */
#endif
);
extern void
parse_fake_input(
#if NeedFunctionPrototypes
ClientPtr /* client */,
char * /* req */
#endif
);
extern void
XTestComputeWaitTime(
#if NeedFunctionPrototypes
struct timeval * /* waittime */
#endif
);
extern int
XTestProcessInputAction(
#if NeedFunctionPrototypes
int /* readable */,
struct timeval * /* waittime */
#endif
);
extern void
abort_play_back(
#if NeedFunctionPrototypes
void
#endif
);
extern void
return_input_array_size(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
extern void XTestGenerateEvent(
#if NeedFunctionPrototypes
int /* dev_type */,
int /* keycode */,
int /* keystate */,
int /* mousex */,
int /* mousey */
#endif
);
extern void XTestGetPointerPos(
#if NeedFunctionPrototypes
short * /* fmousex */,
short * /* fmousey */
#endif
);
extern void XTestJumpPointer(
#if NeedFunctionPrototypes
int /* jx */,
int /* jy */,
int /* dev_type */
#endif
);
#endif /* XTEST1DD_H */

32
Xext/xtest1di.c
View File

@ -52,7 +52,7 @@ Telephone and Telegraph Company or of the Regents of the
University of California.
*/
/* $XFree86: xc/programs/Xserver/Xext/xtest1di.c,v 3.3 2001/12/14 19:58:52 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xext/xtest1di.c,v 3.6 2003/11/17 22:20:28 dawes Exp $ */
/*****************************************************************************
* include files
@ -72,6 +72,9 @@ University of California.
#include "opaque.h"
#define XTestSERVER_SIDE
#include "xtestext1.h"
#include "modinit.h"
#include "xtest1dd.h"
#include "xtest1dd.h"
@ -79,23 +82,6 @@ University of California.
* defines
****************************************************************************/
/*****************************************************************************
* externals
****************************************************************************/
/*
* id of client using XTestGetInput
*
* defined in xtest1dd.c
*/
extern ClientPtr current_xtest_client;
/*
* id of client using XTestFakeInput
*
* defined in xtest1dd.c
*/
extern ClientPtr playback_client;
/*****************************************************************************
* variables
****************************************************************************/
@ -150,29 +136,21 @@ static DISPATCH_PROC(ProcTestQueryInputSize);
static DISPATCH_PROC(SProcTestQueryInputSize);
static void XTestResetProc(
#if NeedFunctionPrototypes
ExtensionEntry * /* unused */
#endif
);
static void SReplyXTestDispatch(
#if NeedFunctionPrototypes
ClientPtr /* client_ptr */,
int /* size */,
char * /* reply_ptr */
#endif
);
static void SEventXTestDispatch(
#if NeedFunctionPrototypes
xEvent * /* from */,
xEvent * /* to */
#endif
);
static int XTestCurrentClientGone(
#if NeedFunctionPrototypes
pointer /* value */,
XID /* id */
#endif
);
/*****************************************************************************
@ -186,7 +164,7 @@ static int XTestCurrentClientGone(
* (other than the core errors).
*/
void
XTestExtension1Init()
XTestExtension1Init(INITARGS)
{
/*
* holds the pointer to the extension entry structure

18
Xext/xvdisp.c
View File

@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
/* $XFree86: xc/programs/Xserver/Xext/xvdisp.c,v 1.25 2001/11/18 23:55:48 mvojkovi Exp $ */
/* $XFree86: xc/programs/Xserver/Xext/xvdisp.c,v 1.29 2003/10/02 13:29:39 eich Exp $ */
/*
** File:
@ -70,6 +70,8 @@ SOFTWARE.
#include "xf86_ansic.h"
#endif
#include "xvdisp.h"
#ifdef PANORAMIX
#include "panoramiX.h"
#include "panoramiXsrv.h"
@ -1207,7 +1209,7 @@ ProcXvShmPutImage(ClientPtr client)
#endif
#ifdef XvMCExtension
XvImagePtr XvMCFindXvImage(XvPortPtr pPort, CARD32 id);
#include "xvmcext.h"
#endif
static int
@ -1939,8 +1941,7 @@ XineramaXvShmPutImage(ClientPtr client)
client, stuff->port, XvXRTPort, SecurityReadAccess)))
return _XvBadPort;
isRoot = (draw->type == XRT_WINDOW) &&
(stuff->drawable == WindowTable[0]->drawable.id);
isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;
x = stuff->drw_x;
y = stuff->drw_y;
@ -1987,8 +1988,7 @@ XineramaXvPutImage(ClientPtr client)
client, stuff->port, XvXRTPort, SecurityReadAccess)))
return _XvBadPort;
isRoot = (draw->type == XRT_WINDOW) &&
(stuff->drawable == WindowTable[0]->drawable.id);
isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;
x = stuff->drw_x;
y = stuff->drw_y;
@ -2033,8 +2033,7 @@ XineramaXvPutVideo(ClientPtr client)
client, stuff->port, XvXRTPort, SecurityReadAccess)))
return _XvBadPort;
isRoot = (draw->type == XRT_WINDOW) &&
(stuff->drawable == WindowTable[0]->drawable.id);
isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;
x = stuff->drw_x;
y = stuff->drw_y;
@ -2079,8 +2078,7 @@ XineramaXvPutStill(ClientPtr client)
client, stuff->port, XvXRTPort, SecurityReadAccess)))
return _XvBadPort;
isRoot = (draw->type == XRT_WINDOW) &&
(stuff->drawable == WindowTable[0]->drawable.id);
isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;
x = stuff->drw_x;
y = stuff->drw_y;

3
Xext/xvdisp.h Normal file
View File

@ -0,0 +1,3 @@
/* $XFree86: xc/programs/Xserver/Xext/xvdisp.h,v 1.1 2003/07/16 01:38:31 dawes Exp $ */
extern void XineramifyXv(void);

34
Xext/xvmain.c
View File

@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
/* $XFree86: xc/programs/Xserver/Xext/xvmain.c,v 1.13 2001/08/23 13:01:36 alanh Exp $ */
/* $XFree86: xc/programs/Xserver/Xext/xvmain.c,v 1.16 2003/10/28 23:08:44 tsi Exp $ */
/*
** File:
@ -101,7 +101,7 @@ SOFTWARE.
#ifdef PANORAMIX
#include "panoramiX.h"
#include "panoramiXsrv.h"
extern void XineramifyXv(void);
#include "xvdisp.h"
#endif
int XvScreenIndex = -1;
@ -594,6 +594,15 @@ XvdiSendPortNotify(
}
#define CHECK_SIZE(dw, dh, sw, sh) { \
if(!dw || !dh || !sw || !sh) return Success; \
/* The region code will break these if they are too large */ \
if((dw > 32767) || (dh > 32767) || (sw > 32767) || (sh > 32767)) \
return BadValue; \
}
int
XvdiPutVideo(
ClientPtr client,
@ -605,11 +614,9 @@ XvdiPutVideo(
INT16 drw_x, INT16 drw_y,
CARD16 drw_w, CARD16 drw_h
){
int status;
DrawablePtr pOldDraw;
if(!drw_w || !drw_h || !vid_w || !vid_h)
return Success;
CHECK_SIZE(drw_w, drw_h, vid_w, vid_h);
/* UPDATE TIME VARIABLES FOR USE IN EVENTS */
@ -633,7 +640,7 @@ XvdiPutVideo(
XvdiSendVideoNotify(pPort, pPort->pDraw, XvPreempted);
}
status = (* pPort->pAdaptor->ddPutVideo)(client, pDraw, pPort, pGC,
(void) (* pPort->pAdaptor->ddPutVideo)(client, pDraw, pPort, pGC,
vid_x, vid_y, vid_w, vid_h,
drw_x, drw_y, drw_w, drw_h);
@ -662,8 +669,7 @@ XvdiPutStill(
){
int status;
if(!drw_w || !drw_h || !vid_w || !vid_h)
return Success;
CHECK_SIZE(drw_w, drw_h, vid_w, vid_h);
/* UPDATE TIME VARIABLES FOR USE IN EVENTS */
@ -703,8 +709,7 @@ XvdiPutImage(
Bool sync,
CARD16 width, CARD16 height
){
if(!drw_w || !drw_h || !src_w || !src_h)
return Success;
CHECK_SIZE(drw_w, drw_h, src_w, src_h);
/* UPDATE TIME VARIABLES FOR USE IN EVENTS */
@ -739,11 +744,9 @@ XvdiGetVideo(
INT16 drw_x, INT16 drw_y,
CARD16 drw_w, CARD16 drw_h
){
int status;
DrawablePtr pOldDraw;
if(!drw_w || !drw_h || !vid_w || !vid_h)
return Success;
CHECK_SIZE(drw_w, drw_h, vid_w, vid_h);
/* UPDATE TIME VARIABLES FOR USE IN EVENTS */
@ -767,7 +770,7 @@ XvdiGetVideo(
XvdiSendVideoNotify(pPort, pPort->pDraw, XvPreempted);
}
status = (* pPort->pAdaptor->ddGetVideo)(client, pDraw, pPort, pGC,
(void) (* pPort->pAdaptor->ddGetVideo)(client, pDraw, pPort, pGC,
vid_x, vid_y, vid_w, vid_h,
drw_x, drw_y, drw_w, drw_h);
@ -796,8 +799,7 @@ XvdiGetStill(
){
int status;
if(!drw_w || !drw_h || !vid_w || !vid_h)
return Success;
CHECK_SIZE(drw_w, drw_h, vid_w, vid_h);
/* UPDATE TIME VARIABLES FOR USE IN EVENTS */

2
Xext/xvmc.c
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/Xext/xvmc.c,v 1.7 2001/11/18 23:55:48 mvojkovi Exp $ */
/* $XFree86: xc/programs/Xserver/Xext/xvmc.c,v 1.9 2003/07/17 16:04:33 dawes Exp $ */
#define NEED_REPLIES
#define NEED_EVENTS

4
Xext/xvmcext.h
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/Xext/xvmcext.h,v 1.1 2001/04/07 11:04:21 alanh Exp $ */
/* $XFree86: xc/programs/Xserver/Xext/xvmcext.h,v 1.2 2003/07/17 16:04:33 dawes Exp $ */
#ifndef _XVMC_H
#define _XVMC_H
@ -106,4 +106,6 @@ void XvMCExtensionInit(void);
int XvMCScreenInit(ScreenPtr pScreen, int num, XvMCAdaptorPtr adapt);
XvImagePtr XvMCFindXvImage(XvPortPtr pPort, CARD32 id);
#endif /* _XVMC_H */

6
Xi/allowev.h
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/Xi/allowev.h,v 3.1 1996/04/15 11:18:23 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xi/allowev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@ -29,16 +29,12 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXAllowDeviceEvents(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
int
ProcXAllowDeviceEvents(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
#endif /* ALLOWEV_H */

8
Xi/chgdctl.h
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/Xi/chgdctl.h,v 3.1 1996/04/15 11:18:25 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xi/chgdctl.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@ -29,25 +29,19 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXChangeDeviceControl(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
int
ProcXChangeDeviceControl(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
void
SRepXChangeDeviceControl (
#if NeedFunctionPrototypes
ClientPtr /* client */,
int /* size */,
xChangeDeviceControlReply * /* rep */
#endif
);
#endif /* CHGDCTL_H */

18
Xi/chgfctl.h
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/Xi/chgfctl.h,v 3.1 1996/04/15 11:18:26 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xi/chgfctl.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@ -29,82 +29,66 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXChangeFeedbackControl(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
int
ProcXChangeFeedbackControl(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
int
ChangeKbdFeedback (
#if NeedFunctionPrototypes
ClientPtr /* client */,
DeviceIntPtr /* dev */,
unsigned long /* mask */,
KbdFeedbackPtr /* k */,
xKbdFeedbackCtl * /* f */
#endif
);
int
ChangePtrFeedback (
#if NeedFunctionPrototypes
ClientPtr /* client */,
DeviceIntPtr /* dev */,
unsigned long /* mask */,
PtrFeedbackPtr /* p */,
xPtrFeedbackCtl * /* f */
#endif
);
int
ChangeIntegerFeedback (
#if NeedFunctionPrototypes
ClientPtr /* client */,
DeviceIntPtr /* dev */,
unsigned long /* mask */,
IntegerFeedbackPtr /* i */,
xIntegerFeedbackCtl * /* f */
#endif
);
int
ChangeStringFeedback (
#if NeedFunctionPrototypes
ClientPtr /* client */,
DeviceIntPtr /* dev */,
unsigned long /* mask */,
StringFeedbackPtr /* s */,
xStringFeedbackCtl * /* f */
#endif
);
int
ChangeBellFeedback (
#if NeedFunctionPrototypes
ClientPtr /* client */,
DeviceIntPtr /* dev */,
unsigned long /* mask */,
BellFeedbackPtr /* b */,
xBellFeedbackCtl * /* f */
#endif
);
int
ChangeLedFeedback (
#if NeedFunctionPrototypes
ClientPtr /* client */,
DeviceIntPtr /* dev */,
unsigned long /* mask */,
LedFeedbackPtr /* l */,
xLedFeedbackCtl * /* f */
#endif
);
#endif /* CHGFCTL_H */

8
Xi/chgkbd.h
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/Xi/chgkbd.h,v 3.1 1996/04/15 11:18:27 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xi/chgkbd.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@ -29,25 +29,19 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXChangeKeyboardDevice(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
int
ProcXChangeKeyboardDevice (
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
void
SRepXChangeKeyboardDevice (
#if NeedFunctionPrototypes
ClientPtr /* client */,
int /* size */,
xChangeKeyboardDeviceReply * /* rep */
#endif
);

6
Xi/chgkmap.h
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/Xi/chgkmap.h,v 3.1 1996/04/15 11:18:28 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xi/chgkmap.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@ -29,16 +29,12 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXChangeDeviceKeyMapping(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
int
ProcXChangeDeviceKeyMapping(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
#endif /* CHGKMAP_H */

6
Xi/chgprop.h
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/Xi/chgprop.h,v 3.1 1996/04/15 11:18:29 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xi/chgprop.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@ -29,16 +29,12 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXChangeDeviceDontPropagateList (
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
int
ProcXChangeDeviceDontPropagateList (
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
#endif /* CHGPROP_H */

14
Xi/chgptr.h
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/Xi/chgptr.h,v 3.1 1996/04/15 11:18:31 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xi/chgptr.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@ -29,53 +29,41 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXChangePointerDevice(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
int
ProcXChangePointerDevice (
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
void
DeleteFocusClassDeviceStruct(
#if NeedFunctionPrototypes
DeviceIntPtr /* dev */
#endif
);
void
SendEventToAllWindows (
#if NeedFunctionPrototypes
DeviceIntPtr /* dev */,
Mask /* mask */,
xEvent * /* ev */,
int /* count */
#endif
);
void
FindInterestedChildren ( /* FIXME: could be static? */
#if NeedFunctionPrototypes
DeviceIntPtr /* dev */,
WindowPtr /* p1 */,
Mask /* mask */,
xEvent * /* ev */,
int /* count */
#endif
);
void
SRepXChangePointerDevice (
#if NeedFunctionPrototypes
ClientPtr /* client */,
int /* size */,
xChangePointerDeviceReply * /* rep */
#endif
);
#endif /* CHGPTR_H */

10
Xi/closedev.h
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/Xi/closedev.h,v 3.1 1996/04/15 11:18:32 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xi/closedev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@ -29,34 +29,26 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXCloseDevice(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
int
ProcXCloseDevice(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
void
DeleteEventsFromChildren(
#if NeedFunctionPrototypes
DeviceIntPtr /* dev */,
WindowPtr /* p1 */,
ClientPtr /* client */
#endif
);
void
DeleteDeviceEvents (
#if NeedFunctionPrototypes
DeviceIntPtr /* dev */,
WindowPtr /* pWin */,
ClientPtr /* client */
#endif
);
#endif /* CLOSEDEV_H */

6
Xi/devbell.h
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/Xi/devbell.h,v 3.1 1996/04/15 11:18:32 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xi/devbell.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@ -29,16 +29,12 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXDeviceBell (
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
int
ProcXDeviceBell (
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
#endif /* DEVBELL_H */

77
Xi/exevents.c
View File

@ -44,7 +44,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
/* $XFree86: xc/programs/Xserver/Xi/exevents.c,v 3.10 2001/12/14 19:58:55 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xi/exevents.c,v 3.11 2003/11/17 22:20:29 dawes Exp $ */
/********************************************************************
*
@ -82,15 +82,11 @@ SOFTWARE.
(class)->state | (class)->motionMask)
static Bool ShouldFreeInputMasks(
#if NeedFunctionPrototypes
WindowPtr /* pWin */,
Bool /* ignoreSelectedEvents */
#endif
);
static Bool MakeInputMasks (
#if NeedFunctionPrototypes
WindowPtr /* pWin */
#endif
);
/**************************************************************************
@ -328,7 +324,6 @@ InitValuatorAxisStruct( DeviceIntPtr dev,
}
static void
#if NeedFunctionPrototypes
FixDeviceStateNotify (
DeviceIntPtr dev,
deviceStateNotify *ev,
@ -336,15 +331,6 @@ FixDeviceStateNotify (
ButtonClassPtr b,
ValuatorClassPtr v,
int first)
#else
FixDeviceStateNotify (dev, ev, k, b, v, first)
DeviceIntPtr dev;
deviceStateNotify *ev;
KeyClassPtr k;
ButtonClassPtr b;
ValuatorClassPtr v;
int first;
#endif
{
ev->type = DeviceStateNotify;
ev->deviceid = dev->id;
@ -383,19 +369,11 @@ FixDeviceStateNotify (dev, ev, k, b, v, first)
}
static void
#if NeedFunctionPrototypes
FixDeviceValuator (
DeviceIntPtr dev,
deviceValuator *ev,
ValuatorClassPtr v,
int first)
#else
FixDeviceValuator (dev, ev, v, first)
DeviceIntPtr dev;
deviceValuator *ev;
ValuatorClassPtr v;
int first;
#endif
{
int nval = v->numAxes - first;
@ -538,7 +516,6 @@ DeviceFocusEvent(dev, type, mode, detail, pWin)
}
int
#if NeedFunctionPrototypes
GrabButton(
ClientPtr client,
DeviceIntPtr dev,
@ -552,23 +529,6 @@ GrabButton(
Cursor rcursor,
Window rconfineTo,
Mask eventMask)
#else
GrabButton(client, dev, this_device_mode, other_devices_mode, modifiers,
modifier_device, button, grabWindow, ownerEvents, rcursor, rconfineTo,
eventMask)
ClientPtr client;
DeviceIntPtr dev;
BYTE this_device_mode;
BYTE other_devices_mode;
CARD16 modifiers;
DeviceIntPtr modifier_device;
CARD8 button;
Window grabWindow;
BOOL ownerEvents;
Cursor rcursor;
Window rconfineTo;
Mask eventMask;
#endif
{
WindowPtr pWin, confineTo;
CursorPtr cursor;
@ -630,7 +590,6 @@ GrabButton(client, dev, this_device_mode, other_devices_mode, modifiers,
}
int
#if NeedFunctionPrototypes
GrabKey(
ClientPtr client,
DeviceIntPtr dev,
@ -642,20 +601,6 @@ GrabKey(
Window grabWindow,
BOOL ownerEvents,
Mask mask)
#else
GrabKey(client, dev, this_device_mode, other_devices_mode, modifiers,
modifier_device, key, grabWindow, ownerEvents, mask)
ClientPtr client;
DeviceIntPtr dev;
BYTE this_device_mode;
BYTE other_devices_mode;
CARD16 modifiers;
DeviceIntPtr modifier_device;
CARD8 key;
Window grabWindow;
BOOL ownerEvents;
Mask mask;
#endif
{
WindowPtr pWin;
GrabPtr grab;
@ -1102,18 +1047,11 @@ SetModifierMapping(client, dev, len, rlen, numKeyPerModifier, inputMap, k)
}
void
#if NeedFunctionPrototypes
SendDeviceMappingNotify(
CARD8 request,
KeyCode firstKeyCode,
CARD8 count,
DeviceIntPtr dev)
#else
SendDeviceMappingNotify(request, firstKeyCode, count, dev)
CARD8 request, count;
KeyCode firstKeyCode;
DeviceIntPtr dev;
#endif
{
xEvent event;
deviceMappingNotify *ev = (deviceMappingNotify *) &event;
@ -1132,7 +1070,6 @@ SendDeviceMappingNotify(request, firstKeyCode, count, dev)
}
int
#if NeedFunctionPrototypes
ChangeKeyMapping(
ClientPtr client,
DeviceIntPtr dev,
@ -1142,18 +1079,6 @@ ChangeKeyMapping(
CARD8 keyCodes,
CARD8 keySymsPerKeyCode,
KeySym *map)
#else
ChangeKeyMapping(client, dev, len, type, firstKeyCode, keyCodes,
keySymsPerKeyCode, map)
ClientPtr client;
DeviceIntPtr dev;
unsigned len;
int type;
KeyCode firstKeyCode;
CARD8 keyCodes;
CARD8 keySymsPerKeyCode;
KeySym *map;
#endif
{
KeySymsRec keysyms;
KeyClassPtr k = dev->key;

7
Xi/extinit.c
View File

@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
/* $XFree86: xc/programs/Xserver/Xi/extinit.c,v 3.6 2001/12/14 19:58:55 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xi/extinit.c,v 3.7 2003/11/17 22:20:29 dawes Exp $ */
/********************************************************************
*
@ -894,13 +894,8 @@ MakeDeviceTypeAtoms ()
*/
DeviceIntPtr
#if NeedFunctionPrototypes
LookupDeviceIntRec (
CARD8 id)
#else
LookupDeviceIntRec (id)
CARD8 id;
#endif
{
DeviceIntPtr dev;

8
Xi/getbmap.h
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/Xi/getbmap.h,v 3.1 1996/04/15 11:18:37 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xi/getbmap.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@ -29,25 +29,19 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXGetDeviceButtonMapping(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
int
ProcXGetDeviceButtonMapping (
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
void
SRepXGetDeviceButtonMapping (
#if NeedFunctionPrototypes
ClientPtr /* client */,
int /* size */,
xGetDeviceButtonMappingReply * /* rep */
#endif
);
#endif /* GETBMAP_H */

10
Xi/getdctl.h
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/Xi/getdctl.h,v 3.1 1996/04/15 11:18:38 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xi/getdctl.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@ -29,35 +29,27 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXGetDeviceControl (
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
int
ProcXGetDeviceControl (
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
void
CopySwapDeviceResolution (
#if NeedFunctionPrototypes
ClientPtr /* client */,
ValuatorClassPtr /* v */,
char * /* buf */,
int /* length */
#endif
);
void
SRepXGetDeviceControl (
#if NeedFunctionPrototypes
ClientPtr /* client */,
int /* size */,
xGetDeviceControlReply * /* rep */
#endif
);
#endif /* GETDCTL_H */

20
Xi/getfctl.h
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/Xi/getfctl.h,v 3.1 1996/04/15 11:18:39 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xi/getfctl.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@ -29,79 +29,61 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXGetFeedbackControl(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
int
ProcXGetFeedbackControl(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
void
CopySwapKbdFeedback (
#if NeedFunctionPrototypes
ClientPtr /* client */,
KbdFeedbackPtr /* k */,
char ** /* buf */
#endif
);
void
CopySwapPtrFeedback (
#if NeedFunctionPrototypes
ClientPtr /* client */,
PtrFeedbackPtr /* p */,
char ** /* buf */
#endif
);
void
CopySwapIntegerFeedback (
#if NeedFunctionPrototypes
ClientPtr /* client */,
IntegerFeedbackPtr /* i */,
char ** /* buf */
#endif
);
void
CopySwapStringFeedback (
#if NeedFunctionPrototypes
ClientPtr /* client */,
StringFeedbackPtr /* s */,
char ** /* buf */
#endif
);
void
CopySwapLedFeedback (
#if NeedFunctionPrototypes
ClientPtr /* client */,
LedFeedbackPtr /* l */,
char ** /* buf */
#endif
);
void
CopySwapBellFeedback (
#if NeedFunctionPrototypes
ClientPtr /* client */,
BellFeedbackPtr /* b */,
char ** /* buf */
#endif
);
void
SRepXGetFeedbackControl (
#if NeedFunctionPrototypes
ClientPtr /* client */,
int /* size */,
xGetFeedbackControlReply * /* rep */
#endif
);
#endif /* GETFCTL_H */

8
Xi/getfocus.h
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/Xi/getfocus.h,v 3.1 1996/04/15 11:18:40 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xi/getfocus.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@ -29,25 +29,19 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXGetDeviceFocus(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
int
ProcXGetDeviceFocus(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
void
SRepXGetDeviceFocus (
#if NeedFunctionPrototypes
ClientPtr /* client */,
int /* size */,
xGetDeviceFocusReply * /* rep */
#endif
);
#endif /* GETFOCUS_H */

8
Xi/getkmap.h
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/Xi/getkmap.h,v 3.1 1996/04/15 11:18:41 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xi/getkmap.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@ -29,25 +29,19 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXGetDeviceKeyMapping(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
int
ProcXGetDeviceKeyMapping(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
void
SRepXGetDeviceKeyMapping (
#if NeedFunctionPrototypes
ClientPtr /* client */,
int /* size */,
xGetDeviceKeyMappingReply * /* rep */
#endif
);
#endif /* GETKMAP_H */

8
Xi/getmmap.h
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/Xi/getmmap.h,v 3.1 1996/04/15 11:18:42 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xi/getmmap.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@ -29,25 +29,19 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXGetDeviceModifierMapping(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
int
ProcXGetDeviceModifierMapping(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
void
SRepXGetDeviceModifierMapping (
#if NeedFunctionPrototypes
ClientPtr /* client */,
int /* size */,
xGetDeviceModifierMappingReply * /* rep */
#endif
);
#endif /* GETMMAP_H */

10
Xi/getprop.h
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/Xi/getprop.h,v 3.1 1996/04/15 11:18:44 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xi/getprop.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@ -29,36 +29,28 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXGetDeviceDontPropagateList(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
int
ProcXGetDeviceDontPropagateList (
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
XEventClass *
ClassFromMask (
#if NeedFunctionPrototypes
XEventClass * /* buf */,
Mask /* mask */,
int /* maskndx */,
CARD16 * /* count */,
int /* mode */
#endif
);
void
SRepXGetDeviceDontPropagateList (
#if NeedFunctionPrototypes
ClientPtr /* client */,
int /* size */,
xGetDeviceDontPropagateListReply * /* rep */
#endif
);
#endif /* GETPROP_H */

8
Xi/getselev.h
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/Xi/getselev.h,v 3.1 1996/04/15 11:18:49 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xi/getselev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@ -29,25 +29,19 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXGetSelectedExtensionEvents(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
int
ProcXGetSelectedExtensionEvents(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
void
SRepXGetSelectedExtensionEvents (
#if NeedFunctionPrototypes
ClientPtr /* client */,
int /* size */,
xGetSelectedExtensionEventsReply * /* rep */
#endif
);
#endif /* GETSELEV_H */

8
Xi/getvers.h
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/Xi/getvers.h,v 3.1 1996/04/15 11:18:50 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xi/getvers.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@ -29,25 +29,19 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXGetExtensionVersion(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
int
ProcXGetExtensionVersion (
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
void
SRepXGetExtensionVersion (
#if NeedFunctionPrototypes
ClientPtr /* client */,
int /* size */,
xGetExtensionVersionReply * /* rep */
#endif
);
#endif /* GETVERS_H */

10
Xi/grabdev.h
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/Xi/grabdev.h,v 3.1 1996/04/15 11:18:51 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xi/grabdev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@ -29,37 +29,29 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXGrabDevice(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
int
ProcXGrabDevice(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
int
CreateMaskFromList (
#if NeedFunctionPrototypes
ClientPtr /* client */,
XEventClass * /* list */,
int /* count */,
struct tmask /* mask */[],
DeviceIntPtr /* dev */,
int /* req */
#endif
);
void
SRepXGrabDevice (
#if NeedFunctionPrototypes
ClientPtr /* client */,
int /* size */,
xGrabDeviceReply * /* rep */
#endif
);
#endif /* GRABDEV_H */

6
Xi/grabdevb.h
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/Xi/grabdevb.h,v 3.1 1996/04/15 11:18:52 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xi/grabdevb.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@ -29,16 +29,12 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXGrabDeviceButton(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
int
ProcXGrabDeviceButton(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
#endif /* GRABDEVB_H */

6
Xi/grabdevk.h
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/Xi/grabdevk.h,v 3.1 1996/04/15 11:18:53 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xi/grabdevk.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@ -29,16 +29,12 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXGrabDeviceKey(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
int
ProcXGrabDeviceKey(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
#endif /* GRABDEVK_H */

8
Xi/gtmotion.h
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/Xi/gtmotion.h,v 3.1 1996/04/15 11:18:56 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xi/gtmotion.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@ -29,25 +29,19 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXGetDeviceMotionEvents(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
int
ProcXGetDeviceMotionEvents(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
void
SRepXGetDeviceMotionEvents (
#if NeedFunctionPrototypes
ClientPtr /* client */,
int /* size */,
xGetDeviceMotionEventsReply * /* rep */
#endif
);
#endif /* GTMOTION_H */

22
Xi/listdev.h
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/Xi/listdev.h,v 3.1 1996/04/15 11:18:57 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xi/listdev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@ -29,91 +29,71 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXListInputDevices(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
int
ProcXListInputDevices (
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
void
SizeDeviceInfo (
#if NeedFunctionPrototypes
DeviceIntPtr /* d */,
int * /* namesize */,
int * /* size */
#endif
);
void
ListDeviceInfo (
#if NeedFunctionPrototypes
ClientPtr /* client */,
DeviceIntPtr /* d */,
xDeviceInfoPtr /* dev */,
char ** /* devbuf */,
char ** /* classbuf */,
char ** /* namebuf */
#endif
);
void
CopyDeviceName (
#if NeedFunctionPrototypes
char ** /* namebuf */,
char * /* name */
#endif
);
void
CopySwapDevice (
#if NeedFunctionPrototypes
ClientPtr /* client */,
DeviceIntPtr /* d */,
int /* num_classes */,
char ** /* buf */
#endif
);
void
CopySwapKeyClass (
#if NeedFunctionPrototypes
ClientPtr /* client */,
KeyClassPtr /* k */,
char ** /* buf */
#endif
);
void
CopySwapButtonClass (
#if NeedFunctionPrototypes
ClientPtr /* client */,
ButtonClassPtr /* b */,
char ** /* buf */
#endif
);
int
CopySwapValuatorClass (
#if NeedFunctionPrototypes
ClientPtr /* client */,
ValuatorClassPtr /* v */,
char ** /* buf */
#endif
);
void
SRepXListInputDevices (
#if NeedFunctionPrototypes
ClientPtr /* client */,
int /* size */,
xListInputDevicesReply * /* rep */
#endif
);
#endif /* LISTDEV_H */

8
Xi/opendev.h
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/Xi/opendev.h,v 3.1 1996/04/15 11:18:58 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xi/opendev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@ -29,25 +29,19 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXOpenDevice(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
int
ProcXOpenDevice(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
void
SRepXOpenDevice (
#if NeedFunctionPrototypes
ClientPtr /* client */,
int /* size */,
xOpenDeviceReply * /* rep */
#endif
);
#endif /* OPENDEV_H */

8
Xi/queryst.h
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/Xi/queryst.h,v 3.1 1996/04/15 11:19:00 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xi/queryst.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@ -29,25 +29,19 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXQueryDeviceState(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
int
ProcXQueryDeviceState(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
void
SRepXQueryDeviceState (
#if NeedFunctionPrototypes
ClientPtr /* client */,
int /* size */,
xQueryDeviceStateReply * /* rep */
#endif
);
#endif /* QUERYST_H */

6
Xi/selectev.h
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/Xi/selectev.h,v 3.1 1996/04/15 11:19:01 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xi/selectev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@ -29,16 +29,12 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXSelectExtensionEvent (
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
int
ProcXSelectExtensionEvent (
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
#endif /* SELECTEV_H */

6
Xi/sendexev.h
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/Xi/sendexev.h,v 3.1 1996/04/15 11:19:02 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xi/sendexev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@ -29,16 +29,12 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXSendExtensionEvent(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
int
ProcXSendExtensionEvent(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
#endif /* SENDEXEV_H */

8
Xi/setbmap.h
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/Xi/setbmap.h,v 3.1 1996/04/15 11:19:03 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xi/setbmap.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@ -29,25 +29,19 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXSetDeviceButtonMapping(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
int
ProcXSetDeviceButtonMapping(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
void
SRepXSetDeviceButtonMapping(
#if NeedFunctionPrototypes
ClientPtr /* client */,
int /* size */,
xSetDeviceButtonMappingReply * /* rep */
#endif
);
#endif /* SETBMAP_H */

8
Xi/setdval.h
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/Xi/setdval.h,v 3.1 1996/04/15 11:19:04 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xi/setdval.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@ -29,25 +29,19 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXSetDeviceValuators(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
int
ProcXSetDeviceValuators(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
void
SRepXSetDeviceValuators(
#if NeedFunctionPrototypes
ClientPtr /* client */,
int /* size */,
xSetDeviceValuatorsReply * /* rep */
#endif
);
#endif /* SETDVAL_H */

6
Xi/setfocus.h
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/Xi/setfocus.h,v 3.1 1996/04/15 11:19:05 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xi/setfocus.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@ -29,16 +29,12 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXSetDeviceFocus(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
int
ProcXSetDeviceFocus(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
#endif /* SETFOCUS_H */

8
Xi/setmmap.h
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/Xi/setmmap.h,v 3.1 1996/04/15 11:19:06 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xi/setmmap.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@ -29,25 +29,19 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXSetDeviceModifierMapping(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
int
ProcXSetDeviceModifierMapping(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
void
SRepXSetDeviceModifierMapping(
#if NeedFunctionPrototypes
ClientPtr /* client */,
int /* size */,
xSetDeviceModifierMappingReply * /* rep */
#endif
);
#endif /* SETMMAP_H */

8
Xi/setmode.h
View File

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/Xi/setmode.h,v 3.1 1996/04/15 11:19:07 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xi/setmode.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@ -29,25 +29,19 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
int
SProcXSetDeviceMode(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
int
ProcXSetDeviceMode(
#if NeedFunctionPrototypes
ClientPtr /* client */
#endif
);
void
SRepXSetDeviceMode(
#if NeedFunctionPrototypes
ClientPtr /* client */,
int /* size */,
xSetDeviceModeReply * /* rep */
#endif
);
#endif /* SETMODE_H */

Some files were not shown because too many files have changed in this diff Show More