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

dix mods for Darwin

Browse Source
This commit is contained in:
Ben Byer 2007-02-17 01:21:43 -08:00
parent cece060157
commit cf4994b0db
5 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dix/devices.c
View File

@ -213,7 +213,11 @@ CoreKeyboardBell(int volume, DeviceIntPtr pDev, pointer arg, int something)
{
KeybdCtrl *ctrl = arg;
#ifdef __DARWIN__
// not yet implemented :(
#else
DDXRingBell(volume, ctrl->bell_pitch, ctrl->bell_duration);
#endif
}
static void

1
dix/dixfonts.c
View File

@ -64,6 +64,7 @@ Equipment Corporation.
#include "opaque.h"
#include "dixfontstr.h"
#include "closestr.h"
#include "dixfont.h"
#ifdef DEBUG
#include <stdio.h>

13
hw/Makefile.am
View File

@ -1,10 +1,18 @@
if DMX
if BUILD_DARWIN
# Darwin does not need the dmx subdir
else
DMX_SUBDIRS = dmx
endif
endif
if XORG
if BUILD_DARWIN
# Darwin does not need the xfree86 subdir
else
XORG_SUBDIRS = xfree86
endif
endif
if XVFB
XVFB_SUBDIRS = vfb
@ -30,12 +38,15 @@ if XPRINT
XPRINT_SUBDIRS = xprint
endif
# need to add darwin support here
if BUILD_DARWIN
DARWIN_SUBDIRS = darwin
endif
SUBDIRS = \
$(XORG_SUBDIRS) \
$(XGL_SUBDIRS) \
$(XWIN_SUBDIRS) \
$(DARWIN_SUBDIRS) \
$(XVFB_SUBDIRS) \
$(XNEST_SUBDIRS) \
$(DMX_SUBDIRS) \

1
hw/xfree86/common/xf86Init.c
View File

@ -36,6 +36,7 @@
#endif
#include <stdlib.h>
#include <errno.h>
#undef HAS_UTSNAME
#if !defined(WIN32) && !defined(__UNIXOS2__)

9
mi/miinitext.c
View File

@ -338,12 +338,14 @@ extern void XFree86DGAExtensionInit(INITARGS);
#endif
#ifdef GLXEXT
typedef struct __GLXprovider __GLXprovider;
#ifndef __DARWIN__
extern __GLXprovider __glXMesaProvider;
extern void GlxPushProvider(__GLXprovider *impl);
#ifndef __DARWIN__
extern void GlxExtensionInit(INITARGS);
extern void GlxWrapInitVisuals(miInitVisualsProcPtr *);
#else
extern __GLXprovider* __DarwinglXMesaProvider;
extern void DarwinGlxPushProvider(__GLXprovider *impl);
extern void DarwinGlxExtensionInit(INITARGS);
extern void DarwinGlxWrapInitVisuals(miInitVisualsProcPtr *);
#endif
@ -629,13 +631,14 @@ InitExtensions(argc, argv)
if (!noXFree86DRIExtension) XFree86DRIExtensionInit();
#endif
#endif
#ifdef GLXEXT
GlxPushProvider(&__glXMesaProvider);
#ifdef GLXEXT
#ifndef __DARWIN__
GlxPushProvider(&__glXMesaProvider);
if (!noGlxExtension) GlxExtensionInit();
#else
if (!noGlxExtension) DarwinGlxExtensionInit();
GlxPushProvider(&__glXMesaProvider);
#endif
#endif
#ifdef XFIXES