xserver: Branch 'xorg-server-1.4-apple'
Jeremy Huddleston
jeremyhu at kemper.freedesktop.org
Tue Jun 10 02:15:37 PDT 2008
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(-)
New commits:
commit 4505bae5d7341e1241be50c25cb3d1b941701de4
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date: Tue Jun 10 02:15:25 2008 -0700
XQuartz: Under the new startup model, we no longer need to do the foreground/background dance.
diff --git a/hw/xquartz/Makefile.am b/hw/xquartz/Makefile.am
index 69778c1..eb2ebb0 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 30bb3c8..f06a30d 100644
--- a/hw/xquartz/bundle/Info.plist
+++ b/hw/xquartz/bundle/Info.plist
@@ -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>
diff --git a/hw/xquartz/quartzForeground.c b/hw/xquartz/quartzForeground.c
deleted file mode 100644
index 80a04a1..0000000
--- 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 <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;
-}
diff --git a/hw/xquartz/quartzForeground.h b/hw/xquartz/quartzForeground.h
deleted file mode 100644
index b5422ff..0000000
--- 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 5cc437f..8a0501a 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);
}
More information about the xorg-commit
mailing list