From b2b9c458a46e9a41c3c76ffe83a2b580a41d0e90 Mon Sep 17 00:00:00 2001 From: Jan Hauffa Date: Wed, 16 Jun 2010 09:25:41 -0700 Subject: [PATCH] XQuartz: Remove some dead code. Signed-off-by: Jan Hauffa Reviewed-by: Jeremy Huddleston Signed-off-by: Jeremy Huddleston --- hw/xquartz/quartz.c | 4 ---- hw/xquartz/quartzCocoa.m | 11 ----------- hw/xquartz/quartzCommon.h | 15 --------------- 3 files changed, 30 deletions(-) diff --git a/hw/xquartz/quartz.c b/hw/xquartz/quartz.c index 2828c57ed..bdaa26242 100644 --- a/hw/xquartz/quartz.c +++ b/hw/xquartz/quartz.c @@ -67,12 +67,8 @@ #define FAKE_RANDR 1 // Shared global variables for Quartz modes -int quartzEventWriteFD = -1; int quartzUseSysBeep = 0; -int quartzUseAGL = 1; -int quartzEnableKeyEquivalents = 1; int quartzServerVisible = FALSE; -int quartzServerQuitting = FALSE; DevPrivateKeyRec quartzScreenKeyRec; int aquaMenuBarHeight = 0; QuartzModeProcsPtr quartzProcs = NULL; diff --git a/hw/xquartz/quartzCocoa.m b/hw/xquartz/quartzCocoa.m index 450147207..54c900dfa 100644 --- a/hw/xquartz/quartzCocoa.m +++ b/hw/xquartz/quartzCocoa.m @@ -43,17 +43,6 @@ #include "darwin.h" -/* - * QuartzFSUseQDCursor - * Return whether the screen should use a QuickDraw cursor. - */ -int QuartzFSUseQDCursor( - int depth) // screen depth -{ - return TRUE; -} - - /* * QuartzBlockHandler * Clean out any autoreleased objects. diff --git a/hw/xquartz/quartzCommon.h b/hw/xquartz/quartzCommon.h index c038ed026..eb761ed04 100644 --- a/hw/xquartz/quartzCommon.h +++ b/hw/xquartz/quartzCommon.h @@ -51,20 +51,13 @@ typedef struct { #define QUARTZ_PRIV(pScreen) \ ((QuartzScreenPtr)dixLookupPrivate(&pScreen->devPrivates, quartzScreenKey)) -// Data stored at startup for Cocoa front end -extern int quartzEventWriteFD; - // User preferences used by Quartz modes extern int quartzUseSysBeep; -extern int focusOnNewWindow; -extern int quartzUseAGL; -extern int quartzEnableKeyEquivalents; extern int quartzFullscreenDisableHotkeys; extern int quartzOptionSendsAlt; // Other shared data extern int quartzServerVisible; -extern int quartzServerQuitting; extern DevPrivateKeyRec quartzScreenKeyRec; #define quartzScreenKey (&quartzScreenKeyRec) extern int aquaMenuBarHeight; @@ -72,14 +65,6 @@ 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); void QuartzBlockHandler(pointer blockData, OSTimePtr pTimeout, pointer pReadmask); void QuartzWakeupHandler(pointer blockData, int result, pointer pReadmask);