--- np2/x11/np2.c	2004/07/26 15:53:26	1.22
+++ np2/x11/np2.c	2007/01/23 15:48:20	1.27
@@ -10,8 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -102,28 +100,18 @@ NP2OSCFG np2oscfg = {
 	0,			/* jastsnd */
 	0,			/* I286SAVE */
 
-	SNDDRV_NODRV,		/* snddrv */
-	"",			/* audiodev */
+	SNDDRV_SDL,		/* snddrv */
 	{ "", "" }, 		/* MIDIDEV */
 	0,			/* MIDIWAIT */
 
 	MOUSE_RATIO_100,	/* mouse_move_ratio */
 
-#if defined(USE_GTK)		/* toolkit */
-	"gtk",
-#elif defined(USE_QT)
-	"qt",
-#elif defined(USE_SDL)
-	"sdl",
-#else
-	"unknown",
-#endif
-
 	MMXFLAG_DISABLE,	/* disablemmx */
-	FALSE,			/* shared_pixmap */
+	INTERP_NEAREST,		/* drawinterp */
+	0,			/* F11KEY */
 };
 
-volatile BOOL np2running = FALSE;
+volatile sig_atomic_t np2running = 0;
 BYTE scrnmode = 0;
 
 UINT framecnt = 0;
@@ -151,7 +139,7 @@ char fontfilename[MAX_PATH] = FONTNAME_D
 
 char timidity_cfgfile_path[MAX_PATH];
 
-BOOL use_shared_pixmap = FALSE;
+int verbose = 0;
 
 
 UINT32