--- a/test/testalpha.c	Mon May 08 05:17:10 2006 +0000
+++ b/test/testalpha.c	Mon May 08 05:30:15 2006 +0000
@@ -505,7 +505,10 @@
 					}
 					break;
 				case SDL_KEYDOWN:
-					/* Any keypress quits the app... */
+					if ( event.key.keysym.sym == SDLK_ESCAPE ) {
+						done = 1;
+					}
+					break;
 				case SDL_QUIT:
 					done = 1;
 					break;

--- a/test/testwm.c	Mon May 08 05:17:10 2006 +0000
+++ b/test/testwm.c	Mon May 08 05:30:15 2006 +0000
@@ -180,10 +180,10 @@
 				event->active.gain ? "gained" : "lost");
 			if ( event->active.state & SDL_APPACTIVE )
 				printf("active ");
+			if ( event->active.state & SDL_APPINPUTFOCUS )
+				printf("input ");
 			if ( event->active.state & SDL_APPMOUSEFOCUS )
 				printf("mouse ");
-			if ( event->active.state & SDL_APPINPUTFOCUS )
-				printf("input ");
 			printf("focus\n");
 
 			/* See if we are iconified or restored */