xserver: Branch 'xorg-server-1.2-apple' - 2 commits
Jeremy Huddleston
jeremyhu at kemper.freedesktop.org
Thu Nov 22 00:35:58 PST 2007
hw/darwin/quartz/X11Application.h | 1
hw/darwin/quartz/X11Application.m | 6 -
hw/darwin/quartz/X11Controller.h | 3
hw/darwin/quartz/X11Controller.m | 11 --
hw/darwin/quartz/applewm.c | 2
hw/darwin/quartz/cr/crAppleWM.m | 6 -
hw/darwin/quartz/cr/crFrame.m | 4
hw/darwin/quartz/cr/crScreen.m | 4
hw/darwin/quartz/fullscreen/fullscreen.c | 2
hw/darwin/quartz/fullscreen/quartzCursor.c | 4
hw/darwin/quartz/keysym2ucs.h | 2
hw/darwin/quartz/quartzCocoa.m | 1
hw/darwin/quartz/quartzKeyboard.c | 3
hw/darwin/quartz/quartzStartup.c | 13 ++
hw/darwin/quartz/xpr/dri.c | 4
hw/darwin/quartz/xpr/x-hash.c | 1
hw/darwin/quartz/xpr/x-hook.c | 1
hw/darwin/quartz/xpr/x-list.c | 1
hw/darwin/quartz/xpr/xprAppleWM.c | 1
hw/darwin/quartz/xpr/xprCursor.c | 1
hw/darwin/quartz/xpr/xprFrame.c | 1
hw/darwin/quartz/xpr/xprScreen.c | 1
hw/darwin/utils/Makefile.am | 2
hw/darwin/utils/dumpkeymap.c | 2
hw/darwin/utils/event_status_driver.h | 133 -----------------------------
25 files changed, 44 insertions(+), 166 deletions(-)
New commits:
commit 52e84a353f8f21af5209879d7aece7066d0715b0
Author: Jeremy Huddleston <jeremy at tifa.local>
Date: Thu Nov 22 00:35:36 2007 -0800
Darwin: Misc cleanups to line up with master
diff --git a/hw/darwin/quartz/X11Application.h b/hw/darwin/quartz/X11Application.h
index fb153e7..8615657 100644
--- a/hw/darwin/quartz/X11Application.h
+++ b/hw/darwin/quartz/X11Application.h
@@ -1,5 +1,4 @@
/* X11Application.h -- subclass of NSApplication to multiplex events
- $Id: X11Application.h,v 1.26 2003/08/08 19:16:13 jharper Exp $
Copyright (c) 2002-2007 Apple Inc. All rights reserved.
diff --git a/hw/darwin/quartz/X11Application.m b/hw/darwin/quartz/X11Application.m
index d2cc7fa..6705b3c 100644
--- a/hw/darwin/quartz/X11Application.m
+++ b/hw/darwin/quartz/X11Application.m
@@ -27,19 +27,17 @@
promote the sale, use or other dealings in this Software without
prior written authorization. */
-#include "../quartz/quartzCommon.h"
+#include "quartzCommon.h"
#import "X11Application.h"
#include <Carbon/Carbon.h>
/* ouch! */
#define BOOL X_BOOL
-//# include "Xproto.h"
# include "darwin.h"
-# include "../quartz/quartz.h"
+# include "quartz.h"
# define _APPLEWM_SERVER_
# include "X11/extensions/applewm.h"
-//# include "X.h"
# include "micmap.h"
#undef BOOL
diff --git a/hw/darwin/quartz/X11Controller.h b/hw/darwin/quartz/X11Controller.h
index 954d0ab..f1399dc 100644
--- a/hw/darwin/quartz/X11Controller.h
+++ b/hw/darwin/quartz/X11Controller.h
@@ -1,5 +1,4 @@
/* X11Controller.h -- connect the IB ui
- $Id: X11Controller.h,v 1.21 2003/07/24 17:52:29 jharper Exp $
Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
@@ -34,7 +33,7 @@
#if __OBJC__
#import <Cocoa/Cocoa.h>
-#include "../quartz/xpr/x-list.h"
+#include "xpr/x-list.h"
@interface X11Controller : NSObject
{
diff --git a/hw/darwin/quartz/X11Controller.m b/hw/darwin/quartz/X11Controller.m
index df90049..6929566 100644
--- a/hw/darwin/quartz/X11Controller.m
+++ b/hw/darwin/quartz/X11Controller.m
@@ -1,5 +1,4 @@
/* X11Controller.m -- connect the IB ui, also the NSApp delegate
- $Id: X11Controller.m,v 1.40 2006/09/06 21:19:32 jharper Exp $
Copyright (c) 2002-2007 Apple Inc. All rights reserved.
@@ -30,7 +29,7 @@
#define DEFAULT_PATH "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/X11/bin"
-#include "../quartz/quartzCommon.h"
+#include "quartzCommon.h"
#import "X11Controller.h"
#import "X11Application.h"
@@ -38,14 +37,12 @@
/* ouch! */
#define BOOL X_BOOL
-//# include "Xproto.h"
#include "opaque.h"
# include "darwin.h"
-# include "../quartz/quartz.h"
+# include "quartz.h"
# define _APPLEWM_SERVER_
# include "X11/extensions/applewm.h"
-# include "../quartz/applewmExt.h"
-//# include "X.h"
+# include "applewmExt.h"
#undef BOOL
#include <stdio.h>
@@ -305,7 +302,7 @@
argv[4] = "-c";
argv[5] = command;
argv[6] = NULL;
-
+
/* Do the fork-twice trick to avoid having to reap zombies */
child1 = fork();
diff --git a/hw/darwin/quartz/applewm.c b/hw/darwin/quartz/applewm.c
index 11cec4a..5c1c6c2 100644
--- a/hw/darwin/quartz/applewm.c
+++ b/hw/darwin/quartz/applewm.c
@@ -461,7 +461,7 @@ ProcAppleWMSetWindowMenuCheck(
REQUEST(xAppleWMSetWindowMenuCheckReq);
REQUEST_SIZE_MATCH(xAppleWMSetWindowMenuCheckReq);
- X11ApplicationSetWindowMenuCheck (stuff->index);
+ X11ApplicationSetWindowMenuCheck(stuff->index);
return (client->noClientException);
}
diff --git a/hw/darwin/quartz/cr/crAppleWM.m b/hw/darwin/quartz/cr/crAppleWM.m
index da05fed..c3aa885 100644
--- a/hw/darwin/quartz/cr/crAppleWM.m
+++ b/hw/darwin/quartz/cr/crAppleWM.m
@@ -29,8 +29,8 @@
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
-#include "quartzCommon.h"
-#include "cr.h"
+#include "quartz/quartzCommon.h"
+#include "quartz/cr/cr.h"
#undef BOOL
#define BOOL xBOOL
@@ -38,7 +38,7 @@
#include "X11/X.h"
#define _APPLEWM_SERVER_
#include "X11/extensions/applewm.h"
-#include "applewmExt.h"
+#include "quartz/applewmExt.h"
#undef BOOL
#define StdDocumentStyleMask (NSTitledWindowMask | \
diff --git a/hw/darwin/quartz/cr/crFrame.m b/hw/darwin/quartz/cr/crFrame.m
index f54afc9..39ca211 100644
--- a/hw/darwin/quartz/cr/crFrame.m
+++ b/hw/darwin/quartz/cr/crFrame.m
@@ -30,8 +30,8 @@
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
-#include "quartzCommon.h"
-#include "cr.h"
+#include "quartz/quartzCommon.h"
+#include "quartz/cr/cr.h"
#undef BOOL
#define BOOL xBOOL
diff --git a/hw/darwin/quartz/cr/crScreen.m b/hw/darwin/quartz/cr/crScreen.m
index 0e358ab..ce43305 100644
--- a/hw/darwin/quartz/cr/crScreen.m
+++ b/hw/darwin/quartz/cr/crScreen.m
@@ -30,8 +30,8 @@
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
-#include "quartzCommon.h"
-#include "cr.h"
+#include "quartz/quartzCommon.h"
+#include "quartz/cr/cr.h"
#undef BOOL
#define BOOL xBOOL
diff --git a/hw/darwin/quartz/fullscreen/fullscreen.c b/hw/darwin/quartz/fullscreen/fullscreen.c
index ce3036f..c4a80d2 100644
--- a/hw/darwin/quartz/fullscreen/fullscreen.c
+++ b/hw/darwin/quartz/fullscreen/fullscreen.c
@@ -29,7 +29,7 @@
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
-#include "quartzCommon.h"
+#include "quartz/quartzCommon.h"
#include "darwin.h"
#include "quartz/quartz.h"
#include "quartz/quartzCursor.h"
diff --git a/hw/darwin/quartz/fullscreen/quartzCursor.c b/hw/darwin/quartz/fullscreen/quartzCursor.c
index a5483ee..41767c1 100644
--- a/hw/darwin/quartz/fullscreen/quartzCursor.c
+++ b/hw/darwin/quartz/fullscreen/quartzCursor.c
@@ -31,8 +31,8 @@
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
-#include "quartzCommon.h"
-#include "quartzCursor.h"
+#include "quartz/quartzCommon.h"
+#include "quartz/quartzCursor.h"
#include "darwin.h"
#include <pthread.h>
diff --git a/hw/darwin/quartz/keysym2ucs.h b/hw/darwin/quartz/keysym2ucs.h
index e167d6a..f5b7a18 100644
--- a/hw/darwin/quartz/keysym2ucs.h
+++ b/hw/darwin/quartz/keysym2ucs.h
@@ -1,4 +1,4 @@
-/*
+/*
* This module converts keysym values into the corresponding ISO 10646
* (UCS, Unicode) values.
*
diff --git a/hw/darwin/quartz/quartzCocoa.m b/hw/darwin/quartz/quartzCocoa.m
index bff3772..c6cf8e5 100644
--- a/hw/darwin/quartz/quartzCocoa.m
+++ b/hw/darwin/quartz/quartzCocoa.m
@@ -6,7 +6,6 @@
* This file is separate from the parts of Quartz support
* that use X include files to avoid symbol collisions.
*
- *
* Copyright (c) 2001-2004 Torrey T. Lyons and Greg Parker.
* All Rights Reserved.
*
diff --git a/hw/darwin/quartz/quartzKeyboard.c b/hw/darwin/quartz/quartzKeyboard.c
index 79028ef..a5e7dce 100644
--- a/hw/darwin/quartz/quartzKeyboard.c
+++ b/hw/darwin/quartz/quartzKeyboard.c
@@ -3,7 +3,7 @@
Code to build a keymap using the Carbon Keyboard Layout API.
- Copyright (c) 2003-2007 Apple, Inc.
+ Copyright (c) 2003-2007 Apple Inc.
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation files
@@ -34,6 +34,7 @@
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
+
#include "quartzCommon.h"
#include <CoreServices/CoreServices.h>
diff --git a/hw/darwin/quartz/quartzStartup.c b/hw/darwin/quartz/quartzStartup.c
index 3c8412f..6f45949 100644
--- a/hw/darwin/quartz/quartzStartup.c
+++ b/hw/darwin/quartz/quartzStartup.c
@@ -36,6 +36,7 @@
#include "opaque.h"
#include "micmap.h"
#include <assert.h>
+
char **envpGlobal; // argcGlobal and argvGlobal
// are from dix/globals.c
@@ -99,9 +100,19 @@ void DarwinHandleGUI(
}
}
+
+ /* Initially I ran the X server on the main thread, and received
+ events on the second thread. But now we may be using Carbon,
+ that needs to run on the main thread. (Otherwise, when it's
+ prebound, it will initialize itself on the wrong thread)
+
+ grr.. but doing that means that if the X thread gets scheduled
+ before the main thread when we're _not_ prebound, things fail,
+ so initialize by hand. */
+
extern void _InitHLTB(void);
- _InitHLTB();
+ _InitHLTB();
X11ControllerMain(argc, argv, server_thread, NULL);
exit(0);
}
diff --git a/hw/darwin/quartz/xpr/dri.c b/hw/darwin/quartz/xpr/dri.c
index 70efca7..1047199 100644
--- a/hw/darwin/quartz/xpr/dri.c
+++ b/hw/darwin/quartz/xpr/dri.c
@@ -34,9 +34,12 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
*/
+#include <dix-config.h>
+
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
+
#ifdef XFree86LOADER
#include "xf86.h"
#include "xf86_ansic.h"
@@ -44,7 +47,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <sys/time.h>
#include <unistd.h>
#endif
-#include <dix-config.h>
#define NEED_REPLIES
#define NEED_EVENTS
diff --git a/hw/darwin/quartz/xpr/x-hash.c b/hw/darwin/quartz/xpr/x-hash.c
index 62d1a99..8dc9563 100644
--- a/hw/darwin/quartz/xpr/x-hash.c
+++ b/hw/darwin/quartz/xpr/x-hash.c
@@ -30,6 +30,7 @@
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
+
#include "x-hash.h"
#include "x-list.h"
#include <stdlib.h>
diff --git a/hw/darwin/quartz/xpr/x-hook.c b/hw/darwin/quartz/xpr/x-hook.c
index 84bf444..59629f5 100644
--- a/hw/darwin/quartz/xpr/x-hook.c
+++ b/hw/darwin/quartz/xpr/x-hook.c
@@ -30,6 +30,7 @@
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
+
#include "x-hook.h"
#include <stdlib.h>
#include <assert.h>
diff --git a/hw/darwin/quartz/xpr/x-list.c b/hw/darwin/quartz/xpr/x-list.c
index 2e74ae8..5c49f26 100644
--- a/hw/darwin/quartz/xpr/x-list.c
+++ b/hw/darwin/quartz/xpr/x-list.c
@@ -30,6 +30,7 @@
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
+
#include "x-list.h"
#include <stdlib.h>
#include <assert.h>
diff --git a/hw/darwin/quartz/xpr/xprAppleWM.c b/hw/darwin/quartz/xpr/xprAppleWM.c
index 17d3600..8928060 100644
--- a/hw/darwin/quartz/xpr/xprAppleWM.c
+++ b/hw/darwin/quartz/xpr/xprAppleWM.c
@@ -30,6 +30,7 @@
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
+
#include "xpr.h"
#include "quartz/applewmExt.h"
#include "rootless.h"
diff --git a/hw/darwin/quartz/xpr/xprCursor.c b/hw/darwin/quartz/xpr/xprCursor.c
index e45bd1f..440bed1 100644
--- a/hw/darwin/quartz/xpr/xprCursor.c
+++ b/hw/darwin/quartz/xpr/xprCursor.c
@@ -32,6 +32,7 @@
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
+
#include "quartz/quartzCommon.h"
#include "xpr.h"
#include "darwin.h"
diff --git a/hw/darwin/quartz/xpr/xprFrame.c b/hw/darwin/quartz/xpr/xprFrame.c
index 54b2035..d25fce4 100644
--- a/hw/darwin/quartz/xpr/xprFrame.c
+++ b/hw/darwin/quartz/xpr/xprFrame.c
@@ -30,6 +30,7 @@
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
+
#include "xpr.h"
#include "rootlessCommon.h"
#include "Xplugin.h"
diff --git a/hw/darwin/quartz/xpr/xprScreen.c b/hw/darwin/quartz/xpr/xprScreen.c
index c8e3005..eb04b39 100644
--- a/hw/darwin/quartz/xpr/xprScreen.c
+++ b/hw/darwin/quartz/xpr/xprScreen.c
@@ -30,6 +30,7 @@
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
+
#include "quartz/quartzCommon.h"
#include "quartz/quartz.h"
#include "xpr.h"
diff --git a/hw/darwin/utils/Makefile.am b/hw/darwin/utils/Makefile.am
index 92bf151..911e14d 100644
--- a/hw/darwin/utils/Makefile.am
+++ b/hw/darwin/utils/Makefile.am
@@ -9,4 +9,3 @@ man1_MANS = dumpkeymap.man
EXTRA_DIST = \
README.txt \
dumpkeymap.man
-
commit cef853a568c2c72b389bbdf85821c0b356e8f349
Author: Jeremy Huddleston <jeremy at tifa.local>
Date: Wed Nov 21 23:38:23 2007 -0800
Darwin: dumpkeymap: Use system's event_status_driver.h
diff --git a/hw/darwin/utils/Makefile.am b/hw/darwin/utils/Makefile.am
index 76cb793..92bf151 100644
--- a/hw/darwin/utils/Makefile.am
+++ b/hw/darwin/utils/Makefile.am
@@ -8,6 +8,5 @@ man1_MANS = dumpkeymap.man
EXTRA_DIST = \
README.txt \
- event_status_driver.h \
dumpkeymap.man
diff --git a/hw/darwin/utils/dumpkeymap.c b/hw/darwin/utils/dumpkeymap.c
index 6a8b8b1..0c8bdcd 100644
--- a/hw/darwin/utils/dumpkeymap.c
+++ b/hw/darwin/utils/dumpkeymap.c
@@ -143,7 +143,7 @@
#include <string.h>
#include <sys/stat.h>
#if !defined(DUMPKEYMAP_FILE_ONLY)
-#include "event_status_driver.h"
+#include <IOKit/hidsystem/event_status_driver.h>
#endif
#define PROG_NAME "dumpkeymap"
diff --git a/hw/darwin/utils/event_status_driver.h b/hw/darwin/utils/event_status_driver.h
deleted file mode 100644
index 8948f33..0000000
--- a/hw/darwin/utils/event_status_driver.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- *
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License"). You may not use this file except in compliance with the
- * License. Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- *
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * @APPLE_LICENSE_HEADER_END@
- */
-/******************************************************************************
- event_status_driver.h
- API for the events status driver.
- This file contains public API.
- mpaque 11Oct91
-
- Copyright 1991 NeXT Computer, Inc.
-
- Modified:
-
-******************************************************************************/
-
-#ifndef _DRIVERS_EVENT_STATUS_DRIVER_
-#define _DRIVERS_EVENT_STATUS_DRIVER_
-
-__BEGIN_DECLS
-
-#include <mach/port.h>
-#include <IOKit/hidsystem/IOLLEvent.h>
-#include <IOKit/hidsystem/IOHIDTypes.h>
-#include <AvailabilityMacros.h>
-
-/*
- * Event System Handle:
- *
- * Information used by the system between calls to NXOpenEventSystem and
- * NXCloseEventSystem. The application should not
- * access any of the elements of this structure.
- */
-typedef mach_port_t NXEventHandle;
-
-/* Open and Close */
-NXEventHandle NXOpenEventStatus(void);
-void NXCloseEventStatus(NXEventHandle handle);
-
-/* Status */
-extern NXEventSystemInfoType NXEventSystemInfo(NXEventHandle handle,
- char *flavor,
- int *evs_info,
- unsigned int *evs_info_cnt);
-/* Keyboard */
-extern void NXSetKeyRepeatInterval(NXEventHandle handle, double seconds);
-extern double NXKeyRepeatInterval(NXEventHandle handle);
-extern void NXSetKeyRepeatThreshold(NXEventHandle handle, double threshold);
-extern double NXKeyRepeatThreshold(NXEventHandle handle);
-extern void NXResetKeyboard(NXEventHandle handle);
-
-/* Mouse */
-extern void NXSetClickTime(NXEventHandle handle, double seconds);
-extern double NXClickTime(NXEventHandle handle);
-extern void NXSetClickSpace(NXEventHandle handle, _NXSize_ *area);
-extern void NXGetClickSpace(NXEventHandle handle, _NXSize_ *area);
-extern void NXResetMouse(NXEventHandle handle);
-
-/* DEPRECATED API */
-
-/* NXIdleTime has been deprecated as this API does not take into account
- events posted through the CG API set. Instead, we strongly encourage
- developers to make use of the CGSSecondsSinceLastInputEvent API. */
-extern double NXIdleTime(NXEventHandle handle)
-AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_4;
-
-/* These methods are NOT supported. */
-extern NXKeyMapping *NXSetKeyMapping(NXEventHandle h, NXKeyMapping *keymap)
-AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_4;
-
-extern int NXKeyMappingLength(NXEventHandle handle)
-AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_4;
-
-extern NXKeyMapping *NXGetKeyMapping(NXEventHandle h, NXKeyMapping *keymap)
-AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_4;
-
-/* These methods are NOT supported and will return NULL values. */
-extern void NXSetMouseScaling(NXEventHandle handle, NXMouseScaling *scaling)
-AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_4;
-
-extern void NXGetMouseScaling(NXEventHandle handle, NXMouseScaling *scaling)
-AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_4;
-
-extern void NXSetAutoDimThreshold(NXEventHandle handle, double seconds)
-AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_4;
-
-extern double NXAutoDimThreshold(NXEventHandle handle)
-AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_4;
-
-extern double NXAutoDimTime(NXEventHandle handle)
-AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_4;
-
-extern void NXSetAutoDimState(NXEventHandle handle, boolean_t dimmed)
-AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_4;
-
-extern boolean_t NXAutoDimState(NXEventHandle handle)
-AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_4;
-
-extern void NXSetAutoDimBrightness(NXEventHandle handle, double level)
-AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_4;
-
-extern double NXAutoDimBrightness(NXEventHandle handle)
-AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_4;
-
-extern void NXSetScreenBrightness(NXEventHandle handle, double level)
-AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_4;
-
-extern double NXScreenBrightness(NXEventHandle handle)
-AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_4;
-
-/* END DEPRECATED API */
-
-__END_DECLS
-
-#endif /*_DRIVERS_EVENT_STATUS_DRIVER_ */
-
More information about the xorg-commit
mailing list