dix mods for Darwin
This commit is contained in:
parent
cece060157
commit
cf4994b0db
|
@ -213,7 +213,11 @@ CoreKeyboardBell(int volume, DeviceIntPtr pDev, pointer arg, int something)
|
||||||
{
|
{
|
||||||
KeybdCtrl *ctrl = arg;
|
KeybdCtrl *ctrl = arg;
|
||||||
|
|
||||||
|
#ifdef __DARWIN__
|
||||||
|
// not yet implemented :(
|
||||||
|
#else
|
||||||
DDXRingBell(volume, ctrl->bell_pitch, ctrl->bell_duration);
|
DDXRingBell(volume, ctrl->bell_pitch, ctrl->bell_duration);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
|
@ -64,6 +64,7 @@ Equipment Corporation.
|
||||||
#include "opaque.h"
|
#include "opaque.h"
|
||||||
#include "dixfontstr.h"
|
#include "dixfontstr.h"
|
||||||
#include "closestr.h"
|
#include "closestr.h"
|
||||||
|
#include "dixfont.h"
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
|
@ -1,10 +1,18 @@
|
||||||
if DMX
|
if DMX
|
||||||
|
if BUILD_DARWIN
|
||||||
|
# Darwin does not need the dmx subdir
|
||||||
|
else
|
||||||
DMX_SUBDIRS = dmx
|
DMX_SUBDIRS = dmx
|
||||||
endif
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
if XORG
|
if XORG
|
||||||
|
if BUILD_DARWIN
|
||||||
|
# Darwin does not need the xfree86 subdir
|
||||||
|
else
|
||||||
XORG_SUBDIRS = xfree86
|
XORG_SUBDIRS = xfree86
|
||||||
endif
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
if XVFB
|
if XVFB
|
||||||
XVFB_SUBDIRS = vfb
|
XVFB_SUBDIRS = vfb
|
||||||
|
@ -30,12 +38,15 @@ if XPRINT
|
||||||
XPRINT_SUBDIRS = xprint
|
XPRINT_SUBDIRS = xprint
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# need to add darwin support here
|
if BUILD_DARWIN
|
||||||
|
DARWIN_SUBDIRS = darwin
|
||||||
|
endif
|
||||||
|
|
||||||
SUBDIRS = \
|
SUBDIRS = \
|
||||||
$(XORG_SUBDIRS) \
|
$(XORG_SUBDIRS) \
|
||||||
$(XGL_SUBDIRS) \
|
$(XGL_SUBDIRS) \
|
||||||
$(XWIN_SUBDIRS) \
|
$(XWIN_SUBDIRS) \
|
||||||
|
$(DARWIN_SUBDIRS) \
|
||||||
$(XVFB_SUBDIRS) \
|
$(XVFB_SUBDIRS) \
|
||||||
$(XNEST_SUBDIRS) \
|
$(XNEST_SUBDIRS) \
|
||||||
$(DMX_SUBDIRS) \
|
$(DMX_SUBDIRS) \
|
||||||
|
|
|
@ -36,6 +36,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
#include <errno.h>
|
||||||
|
|
||||||
#undef HAS_UTSNAME
|
#undef HAS_UTSNAME
|
||||||
#if !defined(WIN32) && !defined(__UNIXOS2__)
|
#if !defined(WIN32) && !defined(__UNIXOS2__)
|
||||||
|
|
|
@ -338,12 +338,14 @@ extern void XFree86DGAExtensionInit(INITARGS);
|
||||||
#endif
|
#endif
|
||||||
#ifdef GLXEXT
|
#ifdef GLXEXT
|
||||||
typedef struct __GLXprovider __GLXprovider;
|
typedef struct __GLXprovider __GLXprovider;
|
||||||
|
#ifndef __DARWIN__
|
||||||
extern __GLXprovider __glXMesaProvider;
|
extern __GLXprovider __glXMesaProvider;
|
||||||
extern void GlxPushProvider(__GLXprovider *impl);
|
extern void GlxPushProvider(__GLXprovider *impl);
|
||||||
#ifndef __DARWIN__
|
|
||||||
extern void GlxExtensionInit(INITARGS);
|
extern void GlxExtensionInit(INITARGS);
|
||||||
extern void GlxWrapInitVisuals(miInitVisualsProcPtr *);
|
extern void GlxWrapInitVisuals(miInitVisualsProcPtr *);
|
||||||
#else
|
#else
|
||||||
|
extern __GLXprovider* __DarwinglXMesaProvider;
|
||||||
|
extern void DarwinGlxPushProvider(__GLXprovider *impl);
|
||||||
extern void DarwinGlxExtensionInit(INITARGS);
|
extern void DarwinGlxExtensionInit(INITARGS);
|
||||||
extern void DarwinGlxWrapInitVisuals(miInitVisualsProcPtr *);
|
extern void DarwinGlxWrapInitVisuals(miInitVisualsProcPtr *);
|
||||||
#endif
|
#endif
|
||||||
|
@ -629,13 +631,14 @@ InitExtensions(argc, argv)
|
||||||
if (!noXFree86DRIExtension) XFree86DRIExtensionInit();
|
if (!noXFree86DRIExtension) XFree86DRIExtensionInit();
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
#ifdef GLXEXT
|
|
||||||
|
|
||||||
GlxPushProvider(&__glXMesaProvider);
|
#ifdef GLXEXT
|
||||||
#ifndef __DARWIN__
|
#ifndef __DARWIN__
|
||||||
|
GlxPushProvider(&__glXMesaProvider);
|
||||||
if (!noGlxExtension) GlxExtensionInit();
|
if (!noGlxExtension) GlxExtensionInit();
|
||||||
#else
|
#else
|
||||||
if (!noGlxExtension) DarwinGlxExtensionInit();
|
if (!noGlxExtension) DarwinGlxExtensionInit();
|
||||||
|
GlxPushProvider(&__glXMesaProvider);
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
#ifdef XFIXES
|
#ifdef XFIXES
|
||||||
|
|
Loading…
Reference in New Issue