xserver: Branch 'xorg-server-1.4-apple' - 3 commits
Jeremy Huddleston
jeremyhu at kemper.freedesktop.org
Wed Oct 29 17:21:16 PDT 2008
hw/xquartz/X11Application.m | 2 ++
hw/xquartz/darwinEvents.c | 8 --------
hw/xquartz/mach-startup/bundle-main.c | 9 ---------
include/dix-config.h.in | 3 ---
4 files changed, 2 insertions(+), 20 deletions(-)
New commits:
commit 423f68cd529c7b53f5c02b57c6c091878fa97ae5
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date: Wed Oct 29 17:20:51 2008 -0700
Removed unused DARWIN_WITH_QUARTZ option from dix-config.h
diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index da59687..47cf728 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -35,9 +35,6 @@
/* Support Damage extension */
#undef DAMAGE
-/* Build for darwin with Quartz support */
-#undef DARWIN_WITH_QUARTZ
-
/* Use OsVendorInit */
#undef DDXOSINIT
commit 60d7359a67900ad4601dbc73e07bcd8c803100a5
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date: Wed Oct 29 17:20:11 2008 -0700
XQuartz: if 0 out a block to avoid thread-unsafe lockups
diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index f213cbf..766fe13 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -948,6 +948,7 @@ extern int darwin_modifier_flags; // darwinEvents.c
pDev = darwinTabletCurrent;
}
+#if 0 // XPlugin isn't thread safe ... sigh
if(!quartzServerVisible) {
xp_window_id wid;
@@ -963,6 +964,7 @@ extern int darwin_modifier_flags; // darwinEvents.c
if (wid == 0)
return;
}
+#endif
DarwinSendPointerEvents(pDev, ev_type, ev_button, pointer_x, pointer_y,
pressure, tilt_x, tilt_y);
commit 490756c7fbe0792c4bd6ae434e7a48e0beffa5c7
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date: Wed Oct 29 17:18:05 2008 -0700
XQuartz: Purge the old XQUARTZ_EXPORTS_LAUNCHD_FD option
diff --git a/hw/xquartz/darwinEvents.c b/hw/xquartz/darwinEvents.c
index 9acc0cc..1801f75 100644
--- a/hw/xquartz/darwinEvents.c
+++ b/hw/xquartz/darwinEvents.c
@@ -267,16 +267,9 @@ static void DarwinEventHandler(int screenNum, xEventPtr xe, DeviceIntPtr dev, in
}
}
-#ifdef XQUARTZ_EXPORTS_LAUNCHD_FD
-int xquartz_launchd_fd = -1;
-#endif
-
void DarwinListenOnOpenFD(int fd) {
ErrorF("DarwinListenOnOpenFD: %d\n", fd);
-#ifdef XQUARTZ_EXPORTS_LAUNCHD_FD
- xquartz_launchd_fd = fd;
-#else
pthread_mutex_lock(&fd_add_lock);
if(fd_add_count < FD_ADD_MAX)
fd_add[fd_add_count++] = fd;
@@ -285,7 +278,6 @@ void DarwinListenOnOpenFD(int fd) {
pthread_cond_broadcast(&fd_add_ready_cond);
pthread_mutex_unlock(&fd_add_lock);
-#endif
}
static void DarwinProcessFDAdditionQueue_thread(void *args) {
diff --git a/hw/xquartz/mach-startup/bundle-main.c b/hw/xquartz/mach-startup/bundle-main.c
index 9f03647..a49013e 100644
--- a/hw/xquartz/mach-startup/bundle-main.c
+++ b/hw/xquartz/mach-startup/bundle-main.c
@@ -213,7 +213,6 @@ static void socket_handoff_thread(void *arg) {
unlink(handoff_data->filename);
free(handoff_data);
-#ifndef XQUARTZ_EXPORTS_LAUNCHD_FD
/* TODO: Clean up this race better... giving xinitrc time to run... need to wait for 1.5 branch:
*
* From ajax:
@@ -226,7 +225,6 @@ static void socket_handoff_thread(void *arg) {
unsigned remain = 3000000;
fprintf(stderr, "X11.app: Received new $DISPLAY fd: %d ... sleeping to allow xinitrc to catchup.\n", launchd_fd);
while((remain = usleep(remain)) > 0);
-#endif
fprintf(stderr, "X11.app Handing off fd to server thread via DarwinListenOnOpenFD(%d)\n", launchd_fd);
DarwinListenOnOpenFD(launchd_fd);
@@ -398,13 +396,6 @@ int startup_trigger(int argc, char **argv, char **envp) {
/* Could open the display, start the launcher */
XCloseDisplay(display);
-#ifdef XQUARTZ_EXPORTS_LAUNCHD_FD
- fprintf(stderr, "X11.app: Received new DISPLAY fd: %d ... sleeping to allow xinitrc to catchup.\n", launchd_fd);
-
- /* TODO: Clean up this race better... givint xinitrc time to run. */
- sleep(2);
-#endif
-
return execute(command_from_prefs("app_to_run", DEFAULT_CLIENT));
}
}
More information about the xorg-commit
mailing list