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

Xquartz: Use X11ControllerMain() 

(cherry picked from commit a9ac932543374aa2540f5a12cc85ef82c85b0e0c)
This commit is contained in:
Jeremy Huddleston 2007-12-20 15:46:40 -08:00
parent 1393a97ea9
commit 2d15d439f8
5 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xquartz/X11Application.h
View File

@ -72,7 +72,7 @@ void X11ApplicationSetCanQuit (int state);
void X11ApplicationServerReady (void); void X11ApplicationServerReady (void);
void X11ApplicationShowHideMenubar (int state); void X11ApplicationShowHideMenubar (int state);
void X11ApplicationMain(int argc, char **argv, void (*server_thread) (void *), void *server_arg); void X11ApplicationMain(int argc, const char **argv, void (*server_thread) (void *), void *server_arg);
extern int X11EnableKeyEquivalents; extern int X11EnableKeyEquivalents;
extern int quartzHasRoot, quartzEnableRootless; extern int quartzHasRoot, quartzEnableRootless;

2
hw/xquartz/X11Application.m
View File

@ -790,7 +790,7 @@ environment?", @"Startup xinitrc dialog");
[X11App prefs_synchronize]; [X11App prefs_synchronize];
} }
void X11ApplicationMain (int argc, char **argv, void (*server_thread) (void *), void *server_arg) { void X11ApplicationMain (int argc, const char **argv, void (*server_thread) (void *), void *server_arg) {
NSAutoreleasePool *pool; NSAutoreleasePool *pool;
#ifdef DEBUG #ifdef DEBUG

2
hw/xquartz/X11Controller.h
View File

@ -78,4 +78,6 @@
#endif /* __OBJC__ */ #endif /* __OBJC__ */
void X11ControllerMain(int argc, const char **argv, void (*server_thread) (void *), void *server_arg);
#endif /* X11CONTROLLER_H */ #endif /* X11CONTROLLER_H */

4
hw/xquartz/X11Controller.m
View File

@ -741,3 +741,7 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn row:(int)row
} }
@end @end
void X11ControllerMain(int argc, const char **argv, void (*server_thread) (void *), void *server_arg) {
X11ApplicationMain (argc, argv, server_thread, server_arg);
}

4
hw/xquartz/quartzStartup.c
View File

@ -35,7 +35,7 @@
#include <unistd.h> #include <unistd.h>
#include <CoreFoundation/CoreFoundation.h> #include <CoreFoundation/CoreFoundation.h>
#include "quartzCommon.h" #include "quartzCommon.h"
#include "X11Application.h" #include "X11Controller.h"
#include "darwin.h" #include "darwin.h"
#include "quartz.h" #include "quartz.h"
#include "opaque.h" #include "opaque.h"
@ -106,6 +106,6 @@ void DarwinHandleGUI(int argc, char **argv, char **envp) {
extern void _InitHLTB(void); extern void _InitHLTB(void);
_InitHLTB(); _InitHLTB();
X11ApplicationMain(argc, argv, server_thread, NULL); X11ControllerMain(argc, argv, server_thread, NULL);
exit(0); exit(0);
} }