Mercurial > sdl-ios-xcode

diff src/video/x11/SDL_x11wm.c @ 1659:14717b52abc0 SDL-1.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge trunk-1.3-3
author Sam Lantinga <slouken@libsdl.org>
date Wed, 17 May 2006 08:18:28 +0000
parents 3ba88cb7eb1b
children 782fd950bd46
line wrap: on
line diff
--- a/src/video/x11/SDL_x11wm.c	Mon May 01 06:58:33 2006 +0000
+++ b/src/video/x11/SDL_x11wm.c	Wed May 17 08:18:28 2006 +0000
@@ -240,7 +240,7 @@
 	SDL_FreeSurface(sicon);
 }
 
-void X11_SetCaption(_THIS, const char *title, const char *icon)
+void X11_SetCaptionNoLock(_THIS, const char *title, const char *icon)
 {
 	XTextProperty titleprop, iconprop;
 	Status status;
@@ -256,9 +256,6 @@
 	}
 #endif
 
-	/* Lock the event thread, in multi-threading environments */
-	SDL_Lock_EventThread();
-
 	if ( title != NULL ) {
 		char *title_latin1 = SDL_iconv_utf8_latin1((char *)title);
 		if ( !title_latin1 ) {
@@ -306,7 +303,12 @@
 #endif
 	}
 	XSync(SDL_Display, False);
+}
 
+void X11_SetCaption(_THIS, const char *title, const char *icon)
+{
+	SDL_Lock_EventThread();
+	X11_SetCaptionNoLock(this, title, icon);
 	SDL_Unlock_EventThread();
 }
 
@@ -344,7 +346,7 @@
 #if 0 /* We'll wait here until we actually grab, otherwise behavior undefined */
 		for ( numtries = 0; numtries < 10; ++numtries ) {
 #else
-		while ( 1 ) {
+		for ( ; ; ) {
 #endif
 			result = XGrabPointer(SDL_Display, SDL_Window, True, 0,
 						GrabModeAsync, GrabModeAsync,