From 4505bae5d7341e1241be50c25cb3d1b941701de4 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Tue, 10 Jun 2008 02:15:25 -0700 Subject: [PATCH] XQuartz: Under the new startup model, we no longer need to do the foreground/background dance. --- hw/xquartz/Makefile.am | 2 -- hw/xquartz/bundle/Info.plist | 2 -- hw/xquartz/quartzForeground.c | 47 ----------------------------------- hw/xquartz/quartzForeground.h | 37 --------------------------- hw/xquartz/quartzStartup.c | 1 - 5 files changed, 89 deletions(-) delete mode 100644 hw/xquartz/quartzForeground.c delete mode 100644 hw/xquartz/quartzForeground.h diff --git a/hw/xquartz/Makefile.am b/hw/xquartz/Makefile.am index 69778c129..eb2ebb07a 100644 --- a/hw/xquartz/Makefile.am +++ b/hw/xquartz/Makefile.am @@ -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 \ diff --git a/hw/xquartz/bundle/Info.plist b/hw/xquartz/bundle/Info.plist index 30bb3c891..f06a30d0e 100644 --- a/hw/xquartz/bundle/Info.plist +++ b/hw/xquartz/bundle/Info.plist @@ -37,7 +37,5 @@ Copyright © 2003-2008, X.org Foundation, Inc. main NSPrincipalClass X11Application - LSBackgroundOnly - diff --git a/hw/xquartz/quartzForeground.c b/hw/xquartz/quartzForeground.c deleted file mode 100644 index 80a04a13b..000000000 --- a/hw/xquartz/quartzForeground.c +++ /dev/null @@ -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 -#include - -#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; -} diff --git a/hw/xquartz/quartzForeground.h b/hw/xquartz/quartzForeground.h deleted file mode 100644 index b5422ff9c..000000000 --- a/hw/xquartz/quartzForeground.h +++ /dev/null @@ -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_ */ diff --git a/hw/xquartz/quartzStartup.c b/hw/xquartz/quartzStartup.c index 5cc437f23..8a0501abb 100644 --- a/hw/xquartz/quartzStartup.c +++ b/hw/xquartz/quartzStartup.c @@ -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); }