diff options
author | marha <marha@users.sourceforge.net> | 2009-09-11 12:31:56 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2009-09-11 12:31:56 +0000 |
commit | de33a8e7273592eefd303a94e87a8b38592099a1 (patch) | |
tree | 6d3dd0379c8dae67fd57478239dce282d997ec05 /xorg-server/dix/main.c | |
parent | b8d02796c52d4cedbacb49099edf9e59970276f7 (diff) | |
download | vcxsrv-de33a8e7273592eefd303a94e87a8b38592099a1.tar.gz vcxsrv-de33a8e7273592eefd303a94e87a8b38592099a1.tar.bz2 vcxsrv-de33a8e7273592eefd303a94e87a8b38592099a1.zip |
- 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.
Diffstat (limited to 'xorg-server/dix/main.c')
-rw-r--r-- | xorg-server/dix/main.c | 8 |
1 files changed, 8 insertions, 0 deletions
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(); |