XQuartz: Under the new startup model, we no longer need to do the foreground/background dance.
(cherry picked from commit 4505bae5d7
)
This commit is contained in:
parent
8e3a85beb9
commit
be616f0f8f
@ -26,7 +26,6 @@ libXquartz_la_SOURCES = \
|
||||
quartz.c \
|
||||
quartzAudio.c \
|
||||
quartzCocoa.m \
|
||||
quartzForeground.c \
|
||||
quartzKeyboard.c \
|
||||
quartzPasteboard.c \
|
||||
quartzStartup.c \
|
||||
@ -44,7 +43,6 @@ EXTRA_DIST = \
|
||||
quartz.h \
|
||||
quartzAudio.h \
|
||||
quartzCommon.h \
|
||||
quartzForeground.h \
|
||||
quartzKeyboard.h \
|
||||
quartzPasteboard.h \
|
||||
sanitizedCarbon.h \
|
||||
|
@ -37,7 +37,5 @@ Copyright © 2003-2008, X.org Foundation, Inc.
|
||||
<string>main</string>
|
||||
<key>NSPrincipalClass</key>
|
||||
<string>X11Application</string>
|
||||
<key>LSBackgroundOnly</key>
|
||||
<true/>
|
||||
</dict>
|
||||
</plist>
|
||||
|
@ -1,47 +0,0 @@
|
||||
/* foreground.c - Push the current process into the foreground.
|
||||
|
||||
This is in a separate file because of Quartz/X type conflicts.
|
||||
|
||||
Copyright (c) 2007 Jeremy Huddleston
|
||||
|
||||
Permission is hereby granted, free of charge, to any person
|
||||
obtaining a copy of this software and associated documentation files
|
||||
(the "Software"), to deal in the Software without restriction,
|
||||
including without limitation the rights to use, copy, modify, merge,
|
||||
publish, distribute, sublicense, and/or sell copies of the Software,
|
||||
and to permit persons to whom the Software is furnished to do so,
|
||||
subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be
|
||||
included in all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
NONINFRINGEMENT. IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
|
||||
HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
DEALINGS IN THE SOFTWARE.
|
||||
|
||||
Except as contained in this notice, the name(s) of the above
|
||||
copyright holders shall not be used in advertising or otherwise to
|
||||
promote the sale, use or other dealings in this Software without
|
||||
prior written authorization. */
|
||||
|
||||
#include <ApplicationServices/ApplicationServices.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#include "quartzForeground.h"
|
||||
|
||||
int QuartzMoveToForeground() {
|
||||
ProcessSerialNumber psn = { 0, kCurrentProcess };
|
||||
OSStatus returnCode = TransformProcessType(& psn, kProcessTransformToForegroundApplication);
|
||||
if( returnCode == 0) {
|
||||
/* fprintf(stderr, "TransformProcessType: Success\n"); */
|
||||
SetFrontProcess(&psn);
|
||||
} else {
|
||||
fprintf(stderr, "TransformProcessType: Failure\n");
|
||||
}
|
||||
return (int)returnCode;
|
||||
}
|
@ -1,37 +0,0 @@
|
||||
/* foreground.h - Push the current process into the foreground.
|
||||
|
||||
This is in a separate file because of Quartz/X type conflicts.
|
||||
|
||||
Copyright (c) 2007 Jeremy Huddleston
|
||||
|
||||
Permission is hereby granted, free of charge, to any person
|
||||
obtaining a copy of this software and associated documentation files
|
||||
(the "Software"), to deal in the Software without restriction,
|
||||
including without limitation the rights to use, copy, modify, merge,
|
||||
publish, distribute, sublicense, and/or sell copies of the Software,
|
||||
and to permit persons to whom the Software is furnished to do so,
|
||||
subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be
|
||||
included in all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
NONINFRINGEMENT. IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
|
||||
HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
DEALINGS IN THE SOFTWARE.
|
||||
|
||||
Except as contained in this notice, the name(s) of the above
|
||||
copyright holders shall not be used in advertising or otherwise to
|
||||
promote the sale, use or other dealings in this Software without
|
||||
prior written authorization. */
|
||||
|
||||
#ifndef _QUARTZ_FOREGROUND_H_
|
||||
#define _QUARTZ_FOREGROUND_H_
|
||||
|
||||
int QuartzMoveToForeground(void);
|
||||
|
||||
#endif /* _QUARTZ_FOREGROUND_H_ */
|
@ -127,7 +127,6 @@ int server_main(int argc, char **argv, char **envp) {
|
||||
/* Create the audio mutex */
|
||||
QuartzAudioInit();
|
||||
|
||||
QuartzMoveToForeground();
|
||||
X11ControllerMain(argc, argv, envp);
|
||||
exit(0);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user