fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-20 08:10:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "dix: unexport fields from opaque.h not used by modules/drivers"

Browse source 
This reverts commit 06b599edb6.
This commit is contained in:
kohnish 2025-11-21 20:04:51 +01:00
parent 5bd03e1824
commit eb45328bd9
21 changed files with 32 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Xext/saver.c
View file

@ -46,6 +46,7 @@ in this Software without prior written authorization from the X Consortium.
#include "extnsionst.h"
#include "dixstruct.h"
#include "resource.h"
#include "opaque.h"
#include "gcstruct.h"
#include "cursorstr.h"
#include "colormapst.h"

1
Xext/sync.c
View file

@ -67,6 +67,7 @@ PERFORMANCE OF THIS SOFTWARE.
#include "dixstruct.h"
#include "pixmapstr.h"
#include "resource.h"
#include "opaque.h"
#include "syncsrv.h"
#include "syncsdk.h"
#include "protocol-versions.h"

22
dix/dix_priv.h
View file

@ -230,26 +230,4 @@ int CorePointerProc(DeviceIntPtr dev, int what);
int CoreKeyboardProc(DeviceIntPtr dev, int what);
extern Bool whiteRoot;
extern volatile char isItTimeToYield;
/* bit values for dispatchException */
#define DE_RESET 1
#define DE_TERMINATE 2
#define DE_PRIORITYCHANGE 4 /* set when a client's priority changes */
extern volatile char dispatchException;
extern int ScreenSaverBlanking;
extern int ScreenSaverAllowExposures;
extern int defaultScreenSaverBlanking;
extern int defaultScreenSaverAllowExposures;
extern const char *display;
extern int displayfd;
extern Bool explicit_display;
extern Bool disableBackingStore;
extern Bool enableBackingStore;
#endif /* _XSERVER_DIX_PRIV_H */

4
dix/main.c
View file

@ -110,6 +110,10 @@ Equipment Corporation.
#include "colormapst.h"
#include "cursorstr.h"
#include "selection.h"
#include <X11/fonts/font.h>
#include <X11/fonts/fontstruct.h>
#include <X11/fonts/libxfont2.h>
#include "opaque.h"
#include "servermd.h"
#include "dixfont.h"
#include "extnsionst.h"

2
glx/vndext.c
View file

@ -40,8 +40,6 @@
#include <GL/glxproto.h>
#include "vndservervendor.h"
#include "dix/dix_priv.h"
ExtensionEntry *GlxExtensionEntry;
int GlxErrorBase = 0;
static CallbackListRec vndInitCallbackList;

2
hw/xfree86/common/xf86Events.c
View file

@ -62,8 +62,6 @@
#include "dix/input_priv.h"
#include "dix/dix_priv.h"
#include "misc.h"
#include "xf86.h"
#include "xf86Priv.h"

2
hw/xwayland/xwayland-window.c
View file

@ -32,8 +32,6 @@
#include <X11/X.h>
#include <X11/Xatom.h>
#include "dix/dix_priv.h"
#include "compositeext.h"
#include "compint.h"
#include "inputstr.h"

2
hw/xwin/InitOutput.c
View file

@ -70,8 +70,6 @@ typedef WINAPI HRESULT(*SHGETFOLDERPATHPROC) (HWND hwndOwner,
#include "extinit_priv.h"
#include "pseudoramiX/pseudoramiX.h"
#include "dix/dix_priv.h"
#include "glx_extinit.h"
#ifdef XWIN_GLX_WINDOWS
#include "glx/glwindows.h"

3
hw/xwin/wincreatewnd.c
View file

@ -31,9 +31,6 @@
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#endif
#include "dix/dix_priv.h"
#include "win.h"
#include "shellapi.h"

2
hw/xwin/windisplay.c
View file

@ -30,8 +30,6 @@
#endif
#include <opaque.h> // for display
#include "dix/dix_priv.h" // for display
#include "windisplay.h"
#include "winmsg.h"

2
hw/xwin/wintrayicon.c
View file

@ -38,8 +38,6 @@
#include "winprefs.h"
#include "winclipboard/winclipboard.h"
#include "dix/dix_priv.h"
/*
* Initialize the tray icon
*/

21
include/opaque.h
View file

@ -35,6 +35,27 @@ from The Open Group.
// needed by libglx and libglamor (server modules)
extern _X_EXPORT Bool enableIndirectGLX;
extern _X_EXPORT volatile char isItTimeToYield;
extern _X_EXPORT volatile char dispatchException;
/* bit values for dispatchException */
#define DE_RESET 1
#define DE_TERMINATE 2
#define DE_PRIORITYCHANGE 4 /* set when a client's priority changes */
extern _X_EXPORT int ScreenSaverBlanking;
extern _X_EXPORT int ScreenSaverAllowExposures;
extern _X_EXPORT int defaultScreenSaverBlanking;
extern _X_EXPORT int defaultScreenSaverAllowExposures;
extern _X_EXPORT const char *display;
extern _X_EXPORT int displayfd;
extern _X_EXPORT Bool explicit_display;
extern _X_EXPORT Bool disableBackingStore;
extern _X_EXPORT Bool enableBackingStore;
extern _X_EXPORT Bool RunFromSigStopParent;
extern _X_EXPORT Bool whiteRoot;
extern _X_EXPORT Bool bgNoneRoot;
#endif /* OPAQUE_H */

2
os/WaitFor.c
View file

@ -70,7 +70,7 @@ SOFTWARE.
#include "misc.h"
#include "osdep.h"
#include "dixstruct_priv.h"
#include "globals.h"
#include "opaque.h"
#ifdef DPMSExtension
#include "dpmsproc.h"
#endif

1
os/connection.c
View file

@ -103,6 +103,7 @@ SOFTWARE.
#include "os/osdep.h"
#include "misc.h" /* for typedef of pointer */
#include "opaque.h"
#include "dixstruct_priv.h"
#include "globals.h"
#include "xace.h"

1
os/osinit.c
View file

@ -61,7 +61,6 @@ SOFTWARE.
#include <execinfo.h>
#endif
#include "dix/dix_priv.h"
#include "os/busfault.h"
#include "os/serverlock.h"

2
os/utils.c
View file

@ -184,8 +184,6 @@ Bool noGEExtension = FALSE;
Bool CoreDump;
Bool enableIndirectGLX = FALSE;
Bool AllowByteSwappedClients = FALSE;
#ifdef XINERAMA

2
os/xdmcp.c
View file

@ -38,7 +38,6 @@
#include <X11/X.h>
#include <X11/Xmd.h>
#include "dix/dix_priv.h"
#include "os/auth.h"
#include "misc.h"
@ -47,6 +46,7 @@
#include "xdmauth.h"
#include "input.h"
#include "dixstruct.h"
#include "opaque.h"
#define XSERV_t
#define TRANS_SERVER

6
randr/rrproperty.c
View file

@ -19,15 +19,11 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
* OF THIS SOFTWARE.
*/
#include <dix-config.h>
#include <X11/Xatom.h>
#include "dix/dix_priv.h"
#include "randrstr_priv.h"
#include "propertyst.h"
#include "swaprep.h"
#include <X11/Xatom.h>
static int
DeliverPropertyEvent(WindowPtr pWin, void *value)

3
randr/rrproviderproperty.c
View file

@ -19,9 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
* OF THIS SOFTWARE.
*/
#include <dix-config.h>
#include "dix/dix_priv.h"
#include "randrstr_priv.h"
#include "propertyst.h"

1
xfixes/disconnect.c
View file

@ -47,6 +47,7 @@
#include "dix/dix_priv.h"
#include "xfixesint.h"
#include "opaque.h"
static DevPrivateKeyRec ClientDisconnectPrivateKeyRec;

1
xkb/ddxLoad.c
View file

@ -38,7 +38,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <X11/extensions/XI.h>
#include <X11/extensions/XKM.h>
#include "dix/dix_priv.h"
#include "os/osdep.h"
#include "inputstr.h"