From de33a8e7273592eefd303a94e87a8b38592099a1 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 11 Sep 2009 12:31:56 +0000 Subject: - Removed waiting until clipboard was started after being launched in function winProcSetSelectionOwner. (This was causing a dead lock) - Changed welcome message - Synchronised winclipboardxevents with the version on the release branch (Removed calls to XLockDisplay and XUnlockDisplay) - Call to XInitThreads has been moved to the beginning of dix\main. This function should be called before any call to a Xlib function. --- xorg-server/dix/main.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'xorg-server/dix') diff --git a/xorg-server/dix/main.c b/xorg-server/dix/main.c index e667b2fc7..d607c8431 100644 --- a/xorg-server/dix/main.c +++ b/xorg-server/dix/main.c @@ -153,6 +153,14 @@ int main(int argc, char *argv[], char *envp[]) ptw32_processInitialize(); display = "0"; + #ifdef WIN32 + /* In Win32 we have different threads call Xlib functions (depending + on the commandline options given). + XInitThreads has to be called before + any xlib function is called (aoccording to the man page) */ + XInitThreads(); + #endif + InitRegions(); pixman_disable_out_of_bounds_workaround(); -- cgit v1.2.3