andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

XQuartz: Reduce code duplication in X11.app

Browse Source 
(cherry picked from commit b81809cd91)
This commit is contained in:
Jeremy Huddleston 2007-12-21 01:57:43 -08:00
parent f3042a63be
commit 2c24231fc2
1 changed files with 39 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
hw/xquartz/bundle/bundle-main.c
View File

@ -39,8 +39,8 @@
#define DEFAULT_CLIENT "/usr/X11/bin/xterm"
#define DEFAULT_STARTX "/usr/X11/bin/startx"
static int launcher_main(int argc, char **argv);
static int server_main(int argc, char **argv);
static int execute(const char *command);
static char *command_from_prefs(const char *key, const char *default_value);
int main(int argc, char **argv) {
Display *display;
@ -66,26 +66,26 @@ int main(int argc, char **argv) {
* TODO: *Really* fix this race condition
*/
usleep(2000);
return launcher_main(argc, argv);
return execute(command_from_prefs("app_to_run", DEFAULT_CLIENT));
}
}
/* Start the server */
fprintf(stderr, "X11.app: Could not connect to server. Starting X server.");
return server_main(argc, argv);
return execute(command_from_prefs("startx_script", DEFAULT_STARTX));
}
static int myexecvp(const char *command) {
static int execute(const char *command) {
const char *newargv[7];
const char **s;
newargv[0] = "/usr/bin/login";
newargv[1] = "-fp";
newargv[2] = getlogin();
newargv[3] = "/bin/sh";
newargv[4] = "-c";
newargv[5] = command;
newargv[6] = NULL;
newargv[0] = "/usr/bin/login";
newargv[1] = "-fp";
newargv[2] = getlogin();
newargv[3] = "/bin/sh";
newargv[4] = "-c";
newargv[5] = command;
newargv[6] = NULL;
fprintf(stderr, "X11.app: Launching %s:\n", command);
for(s=newargv; *s; s++) {
@ -97,42 +97,33 @@ static int myexecvp(const char *command) {
return(1);
}
int launcher_main (int argc, char **argv) {
char *command = DEFAULT_CLIENT;
static char *command_from_prefs(const char *key, const char *default_value) {
char *command = NULL;
CFPropertyListRef PlistRef = CFPreferencesCopyAppValue(CFSTR("app_to_run"), kCFPreferencesCurrentApplication);
CFStringRef cfKey = CFStringCreateWithPascalString(NULL, key, kCFStringEncodingASCII);
CFPropertyListRef PlistRef = CFPreferencesCopyAppValue(cfKey, kCFPreferencesCurrentApplication);
if ((PlistRef == NULL) || (CFGetTypeID(PlistRef) != CFStringGetTypeID())) {
CFPreferencesSetAppValue(CFSTR("app_to_run"), CFSTR(DEFAULT_CLIENT), kCFPreferencesCurrentApplication);
CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication);
} else {
int len = CFStringGetLength((CFStringRef)PlistRef)+1;
command = (char *)malloc(len);
CFStringGetCString((CFStringRef)PlistRef, command, len, kCFStringEncodingASCII);
if ((PlistRef == NULL) || (CFGetTypeID(PlistRef) != CFStringGetTypeID())) {
CFStringRef cfDefaultValue = CFStringCreateWithPascalString(NULL, default_value, kCFStringEncodingASCII);
CFPreferencesSetAppValue(cfKey, cfDefaultValue, kCFPreferencesCurrentApplication);
CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication);
int len = strlen(default_value) + 1;
command = (char *)malloc(len * sizeof(char));
if(!command)
return NULL;
strcpy(command, default_value);
} else {
int len = CFStringGetLength((CFStringRef)PlistRef) + 1;
command = (char *)malloc(len * sizeof(char));
if(!command)
return NULL;
CFStringGetCString((CFStringRef)PlistRef, command, len, kCFStringEncodingASCII);
}
if (PlistRef)
if (PlistRef)
CFRelease(PlistRef);
return myexecvp(command);
}
int server_main (int argc, char **argv) {
char *command = DEFAULT_STARTX;
CFPropertyListRef PlistRef = CFPreferencesCopyAppValue(CFSTR("startx_script"), kCFPreferencesCurrentApplication);
if ((PlistRef == NULL) || (CFGetTypeID(PlistRef) != CFStringGetTypeID())) {
CFPreferencesSetAppValue(CFSTR("startx_script"), CFSTR(DEFAULT_STARTX), kCFPreferencesCurrentApplication);
CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication);
} else {
int len = CFStringGetLength((CFStringRef)PlistRef)+1;
command = (char *)malloc(len);
CFStringGetCString((CFStringRef)PlistRef, command, len, kCFStringEncodingASCII);
}
if (PlistRef)
CFRelease(PlistRef);
return myexecvp(command);
return command;
}