diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:29:01 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:29:01 +0000 |
| commit | adc7f9a4ebdfe11d4cd6de9388b63dfe36450b39 (patch) | |
| tree | 23eb7becc5360b2cbe16aa8d45529880067f3989 /hw/darwin/quartz/quartzCommon.h | |
| parent | 90f1536dd315cd265bfc7ef35058761a65a01734 (diff) | |
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_16
Diffstat (limited to 'hw/darwin/quartz/quartzCommon.h')
| -rw-r--r-- | hw/darwin/quartz/quartzCommon.h | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/hw/darwin/quartz/quartzCommon.h b/hw/darwin/quartz/quartzCommon.h index 6c375bd04..e3ae4b850 100644 --- a/hw/darwin/quartz/quartzCommon.h +++ b/hw/darwin/quartz/quartzCommon.h @@ -31,7 +31,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCommon.h,v 1.8 2003/01/23 00:34:26 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCommon.h,v 1.14 2003/11/12 20:21:51 torrey Exp $ */ #ifndef _QUARTZCOMMON_H #define _QUARTZCOMMON_H @@ -48,8 +48,6 @@ #undef WindowPtr #undef Picture -#include "quartzShared.h" - // Quartz specific per screen storage structure typedef struct { // List of CoreGraphics displays that this X11 screen covers. @@ -78,11 +76,17 @@ extern int quartzServerQuitting; extern int quartzScreenIndex; extern int aquaMenuBarHeight; +// Name of GLX bundle for native OpenGL +extern const char *quartzOpenGLBundle; + void QuartzReadPreferences(void); void QuartzMessageMainThread(unsigned msg, void *data, unsigned length); +void QuartzMessageServerThread(int type, int argc, ...); +void QuartzSetWindowMenu(int nitems, const char **items, + const char *shortcuts); void QuartzFSCapture(void); void QuartzFSRelease(void); -int QuartzFSUseQDCursor(int depth); +int QuartzFSUseQDCursor(int depth); void QuartzBlockHandler(void *blockData, void *pTimeout, void *pReadmask); void QuartzWakeupHandler(void *blockData, int result, void *pReadmask); @@ -92,7 +96,11 @@ enum { kQuartzServerStarted, kQuartzServerDied, kQuartzCursorUpdate, - kQuartzPostEvent + kQuartzPostEvent, + kQuartzSetWindowMenu, + kQuartzSetWindowMenuCheck, + kQuartzSetFrontProcess, + kQuartzSetCanQuit }; #endif /* _QUARTZCOMMON_H */ |