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

XQuartz: Set noPanoramixExtension earlier to avoid a possible race. 

(cherry picked from commit 49668e8a88137e9f258eae970826883b88b7d8ba)
This commit is contained in:
Jeremy Huddleston 2008-06-25 11:51:27 -07:00
parent 8d2e2e1d85
commit e69b9f9ca4
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/xquartz/mach-startup/bundle-main.c
View File

@ -51,6 +51,8 @@
/* From darwinEvents.c ... but don't want to pull in all the server cruft */ /* From darwinEvents.c ... but don't want to pull in all the server cruft */
void DarwinListenOnOpenFD(int fd); void DarwinListenOnOpenFD(int fd);
extern int noPanoramiXExtension;
#define DEFAULT_CLIENT "/usr/X11/bin/xterm" #define DEFAULT_CLIENT "/usr/X11/bin/xterm"
#define DEFAULT_STARTX "/usr/X11/bin/startx" #define DEFAULT_STARTX "/usr/X11/bin/startx"
#define DEFAULT_SHELL "/bin/sh" #define DEFAULT_SHELL "/bin/sh"
@ -360,6 +362,9 @@ int main(int argc, char **argv, char **envp) {
mach_port_t mp; mach_port_t mp;
kern_return_t kr; kern_return_t kr;
// The server must not run the PanoramiX operations.
noPanoramiXExtension = TRUE;
fprintf(stderr, "X11.app: main(): argc=%d\n", argc); fprintf(stderr, "X11.app: main(): argc=%d\n", argc);
for(i=1; i < argc; i++) { for(i=1; i < argc; i++) {
fprintf(stderr, "\targv[%u] = %s\n", (unsigned)i, argv[i]); fprintf(stderr, "\targv[%u] = %s\n", (unsigned)i, argv[i]);

4
hw/xquartz/pseudoramiX.c
View File

@ -46,7 +46,6 @@ Equipment Corporation.
#include "globals.h" #include "globals.h"
Bool noPseudoramiXExtension = FALSE; Bool noPseudoramiXExtension = FALSE;
extern int noPanoramiXExtension;
extern int ProcPanoramiXQueryVersion (ClientPtr client); extern int ProcPanoramiXQueryVersion (ClientPtr client);
@ -131,9 +130,6 @@ void PseudoramiXExtensionInit(int argc, char *argv[])
} }
#endif #endif
// The server must not run the PanoramiX operations.
noPanoramiXExtension = TRUE;
if (pseudoramiXGeneration != serverGeneration) { if (pseudoramiXGeneration != serverGeneration) {
extEntry = AddExtension(PANORAMIX_PROTOCOL_NAME, 0, 0, extEntry = AddExtension(PANORAMIX_PROTOCOL_NAME, 0, 0,
ProcPseudoramiXDispatch, ProcPseudoramiXDispatch,

4
hw/xquartz/quartzCocoa.m
View File

@ -44,10 +44,6 @@
#include "darwin.h" #include "darwin.h"
extern void FatalError(const char *, ...);
extern char *display;
extern int noPanoramiXExtension;
/* /*
* QuartzWriteCocoaPasteboard * QuartzWriteCocoaPasteboard
* Write text to the Mac OS X pasteboard. * Write text to the Mac OS X pasteboard.