summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEamon Walsh <ewalsh@tycho.nsa.gov>2007-10-15 22:09:47 -0400
committerEamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil>2007-10-15 22:09:47 -0400
commit58c3240fcbec23aad122e1c340f6bb6d3b18f779 (patch)
tree444579033d5b905dcb1b690e7d818b4eb2a26333
parent4e274e90e16b1d954391e1af3e2074fb10f70ee7 (diff)
registry: Register MIT-SCREEN-SAVER extension protocol names.
-rw-r--r--Xext/saver.c26
1 files changed, 19 insertions, 7 deletions
diff --git a/Xext/saver.c b/Xext/saver.c
index d282173f8..eff932573 100644
--- a/Xext/saver.c
+++ b/Xext/saver.c
@@ -49,6 +49,7 @@ in this Software without prior written authorization from the X Consortium.
#include "cursorstr.h"
#include "colormapst.h"
#include "xace.h"
+#include "registry.h"
#ifdef PANORAMIX
#include "panoramiX.h"
#include "panoramiXsrv.h"
@@ -62,9 +63,6 @@ in this Software without prior written authorization from the X Consortium.
#include "modinit.h"
-#if 0
-static unsigned char ScreenSaverReqCode = 0;
-#endif
static int ScreenSaverEventBase = 0;
static DISPATCH_PROC(ProcScreenSaverQueryInfo);
@@ -274,12 +272,26 @@ ScreenSaverExtensionInit(INITARGS)
ProcScreenSaverDispatch, SProcScreenSaverDispatch,
ScreenSaverResetProc, StandardMinorOpcode)))
{
-#if 0
- ScreenSaverReqCode = (unsigned char)extEntry->base;
-#endif
ScreenSaverEventBase = extEntry->eventBase;
EventSwapVector[ScreenSaverEventBase] = (EventSwapPtr) SScreenSaverNotifyEvent;
- }
+ } else
+ return;
+
+ RegisterRequestName(extEntry->base, X_ScreenSaverQueryVersion,
+ ScreenSaverName ":QueryVersion");
+ RegisterRequestName(extEntry->base, X_ScreenSaverQueryInfo,
+ ScreenSaverName ":QueryInfo");
+ RegisterRequestName(extEntry->base, X_ScreenSaverSelectInput,
+ ScreenSaverName ":SelectInput");
+ RegisterRequestName(extEntry->base, X_ScreenSaverSetAttributes,
+ ScreenSaverName ":SetAttributes");
+ RegisterRequestName(extEntry->base, X_ScreenSaverUnsetAttributes,
+ ScreenSaverName ":UnsetAttributes");
+ RegisterRequestName(extEntry->base, X_ScreenSaverSuspend,
+ ScreenSaverName ":Suspend");
+
+ RegisterEventName(ScreenSaverEventBase + ScreenSaverNotify,
+ ScreenSaverName ":Notify");
}
/*ARGSUSED*/