summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@freedesktop.org>2008-11-22 20:23:46 -0800
committerJeremy Huddleston <jeremyhu@freedesktop.org>2008-11-25 00:54:22 -0800
commit09c3f6e04c273ffafcb547c252137fb17c8ce016 (patch)
tree4be8c82c5b446a6dd4b5c08a53730889b4097676
parentab12c7516207908f3e063a78904d68e2db14208e (diff)
XQuartz: Dead code removal
(cherry picked from commit 46c077d9b4a883fc809c32077ce40f33a70d268b)
-rw-r--r--hw/xquartz/quartz.h8
-rw-r--r--hw/xquartz/xpr/xprScreen.c4
2 files changed, 0 insertions, 12 deletions
diff --git a/hw/xquartz/quartz.h b/hw/xquartz/quartz.h
index 8b04b798e..c5da4c510 100644
--- a/hw/xquartz/quartz.h
+++ b/hw/xquartz/quartz.h
@@ -54,20 +54,16 @@ typedef void (*InitInputProc)(int argc, char **argv);
* Cursor functions
*/
typedef Bool (*InitCursorProc)(ScreenPtr pScreen);
-typedef void (*CursorUpdateProc)(void);
/*
* Suspend and resume X11 activity
*/
typedef void (*SuspendScreenProc)(ScreenPtr pScreen);
typedef void (*ResumeScreenProc)(ScreenPtr pScreen, int x, int y);
-typedef void (*CaptureScreensProc)(void);
-typedef void (*ReleaseScreensProc)(void);
/*
* Screen state change support
*/
-typedef void (*ScreenChangedProc)(void);
typedef void (*AddPseudoramiXScreensProc)(int *x, int *y, int *width, int *height);
typedef void (*UpdateScreenProc)(ScreenPtr pScreen);
@@ -101,14 +97,10 @@ typedef struct _QuartzModeProcs {
InitInputProc InitInput;
InitCursorProc InitCursor;
- CursorUpdateProc CursorUpdate; // Not used if NULL
SuspendScreenProc SuspendScreen;
ResumeScreenProc ResumeScreen;
- CaptureScreensProc CaptureScreens; // Only called in fullscreen
- ReleaseScreensProc ReleaseScreens; // Only called in fullscreen
- ScreenChangedProc ScreenChanged;
AddPseudoramiXScreensProc AddPseudoramiXScreens;
UpdateScreenProc UpdateScreen;
diff --git a/hw/xquartz/xpr/xprScreen.c b/hw/xquartz/xpr/xprScreen.c
index a4ee30351..18406b89c 100644
--- a/hw/xquartz/xpr/xprScreen.c
+++ b/hw/xquartz/xpr/xprScreen.c
@@ -423,12 +423,8 @@ static QuartzModeProcsRec xprModeProcs = {
xprSetupScreen,
xprInitInput,
QuartzInitCursor,
- NULL, // No need to update cursor
QuartzSuspendXCursor,
QuartzResumeXCursor,
- NULL, // No capture or release in rootless mode
- NULL,
- NULL, // Xplugin sends screen change events directly
xprAddPseudoramiXScreens,
xprUpdateScreen,
xprIsX11Window,