frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "registry: Register XINERAMA extension protocol names." 

This reverts commit b9f5ab98c8.

Moving all the names into dix/registry.c
This commit is contained in:
Eamon Walsh 2007-11-20 17:37:48 -05:00 committed by Eamon Walsh
parent fd2d83d5bf
commit 546d46224e
3 changed files with 5 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Xext/panoramiX.c
View File

@ -53,7 +53,6 @@ Equipment Corporation.
#include "globals.h"
#include "servermd.h"
#include "resource.h"
#include "registry.h"
#ifdef RENDER
#include "picturestr.h"
#endif
@ -590,19 +589,6 @@ void PanoramiXExtensionInit(int argc, char *argv[])
#ifdef RENDER
PanoramiXRenderInit ();
#endif
RegisterRequestName(extEntry->base, X_PanoramiXQueryVersion,
PANORAMIX_PROTOCOL_NAME ":QueryVersion");
RegisterRequestName(extEntry->base, X_PanoramiXGetState,
PANORAMIX_PROTOCOL_NAME ":GetState");
RegisterRequestName(extEntry->base, X_PanoramiXGetScreenCount,
PANORAMIX_PROTOCOL_NAME ":GetScreenCount");
RegisterRequestName(extEntry->base, X_PanoramiXGetScreenSize,
PANORAMIX_PROTOCOL_NAME ":GetScreenSize");
RegisterRequestName(extEntry->base, X_XineramaIsActive,
PANORAMIX_PROTOCOL_NAME ":IsActive");
RegisterRequestName(extEntry->base, X_XineramaQueryScreens,
PANORAMIX_PROTOCOL_NAME ":QueryScreens");
}
extern Bool CreateConnectionBlock(void);

14
hw/darwin/quartz/pseudoramiX.c
View File

@ -42,7 +42,6 @@ Equipment Corporation.
#include "window.h"
#include <X11/extensions/panoramiXproto.h>
#include "globals.h"
#include "registry.h"
extern int noPseudoramiXExtension;
extern int noPanoramiXExtension;
@ -148,19 +147,6 @@ void PseudoramiXExtensionInit(int argc, char *argv[])
PANORAMIX_PROTOCOL_NAME);
return;
}
RegisterRequestName(extEntry->base, X_PanoramiXQueryVersion,
PANORAMIX_PROTOCOL_NAME ":QueryVersion");
RegisterRequestName(extEntry->base, X_PanoramiXGetState,
PANORAMIX_PROTOCOL_NAME ":GetState");
RegisterRequestName(extEntry->base, X_PanoramiXGetScreenCount,
PANORAMIX_PROTOCOL_NAME ":GetScreenCount");
RegisterRequestName(extEntry->base, X_PanoramiXGetScreenSize,
PANORAMIX_PROTOCOL_NAME ":GetScreenSize");
RegisterRequestName(extEntry->base, X_XineramaIsActive,
PANORAMIX_PROTOCOL_NAME ":IsActive");
RegisterRequestName(extEntry->base, X_XineramaQueryScreens,
PANORAMIX_PROTOCOL_NAME ":QueryScreens");
}

26
randr/rrxinerama.c
View File

@ -71,7 +71,6 @@
#include "randrstr.h"
#include "swaprep.h"
#include <X11/extensions/panoramiXproto.h>
#include "registry.h"
#define RR_XINERAMA_MAJOR_VERSION 1
#define RR_XINERAMA_MINOR_VERSION 1
@ -424,8 +423,6 @@ RRXineramaResetProc(ExtensionEntry* extEntry)
void
RRXineramaExtensionInit(void)
{
ExtensionEntry *extEntry;
#ifdef PANORAMIX
if(!noPanoramiXExtension)
return;
@ -439,22 +436,9 @@ RRXineramaExtensionInit(void)
if (screenInfo.numScreens > 1)
return;
extEntry = AddExtension(PANORAMIX_PROTOCOL_NAME, 0, 0,
ProcRRXineramaDispatch,
SProcRRXineramaDispatch,
RRXineramaResetProc,
StandardMinorOpcode);
RegisterRequestName(extEntry->base, X_PanoramiXQueryVersion,
PANORAMIX_PROTOCOL_NAME ":QueryVersion");
RegisterRequestName(extEntry->base, X_PanoramiXGetState,
PANORAMIX_PROTOCOL_NAME ":GetState");
RegisterRequestName(extEntry->base, X_PanoramiXGetScreenCount,
PANORAMIX_PROTOCOL_NAME ":GetScreenCount");
RegisterRequestName(extEntry->base, X_PanoramiXGetScreenSize,
PANORAMIX_PROTOCOL_NAME ":GetScreenSize");
RegisterRequestName(extEntry->base, X_XineramaIsActive,
PANORAMIX_PROTOCOL_NAME ":IsActive");
RegisterRequestName(extEntry->base, X_XineramaQueryScreens,
PANORAMIX_PROTOCOL_NAME ":QueryScreens");
(void) AddExtension(PANORAMIX_PROTOCOL_NAME, 0,0,
ProcRRXineramaDispatch,
SProcRRXineramaDispatch,
RRXineramaResetProc,
StandardMinorOpcode);
}