--- uae/src/xwin.c	2018/04/24 16:47:20	1.1.1.7
+++ uae/src/xwin.c	2018/04/24 16:56:29	1.1.1.11
@@ -29,7 +29,6 @@
 #include "xwin.h"
 #include "custom.h"
 #include "drawing.h"
-#include "readcpu.h"
 #include "newcpu.h"
 #include "keyboard.h"
 #include "keybuf.h"
@@ -449,7 +448,7 @@ void flush_screen (int ystart, int ystop
 #endif
 }
 
-static __inline__ int bitsInMask (unsigned long mask)
+STATIC_INLINE int bitsInMask (unsigned long mask)
 {
     /* count bits in mask */
     int n = 0;
@@ -460,7 +459,7 @@ static __inline__ int bitsInMask (unsign
     return n;
 }
 
-static __inline__ int maskShift (unsigned long mask)
+STATIC_INLINE int maskShift (unsigned long mask)
 {
     /* determine how far mask is shifted */
     int n = 0;
@@ -1098,7 +1097,11 @@ static int kc_decode (KeySym ks)
      case XK_Left: return AK_LF;
      case XK_Right: return AK_RT;
 
+#if 0
      case XK_F11: return AK_BACKSLASH;
+#else
+     case XK_F11: frametime = 0; timeframes = 0; bogusframe = 1; break;
+#endif
 #ifdef XK_Page_Up /* These are missing occasionally */
      case XK_Page_Up: return AK_RAMI;          /* PgUp mapped to right amiga */
      case XK_Page_Down: return AK_LAMI;        /* PgDn mapped to left amiga */
@@ -1599,6 +1602,9 @@ int check_prefs_changed_gfx (void)
     currprefs.gfx_ycenter = changed_prefs.gfx_ycenter;
     currprefs.gfx_afullscreen = changed_prefs.gfx_afullscreen;
     currprefs.gfx_pfullscreen = changed_prefs.gfx_pfullscreen;
+
+    gui_update_gfx ();
+
     graphics_subinit ();
 
     if (! inwindow)
@@ -1860,19 +1866,18 @@ static void handle_inhibit (void)
 
 static void handle_interpol (void)
 {
-    if (sample_handler == sample16si_handler) {
-	sample_handler = sample16s_handler;
-	printf ("Interpol off\n");
+    if (currprefs.sound_interpol == 0) {
+	currprefs.sound_interpol = 1;
+	printf ("Interpol on: rh\n");
+    }
+    else if (currprefs.sound_interpol == 1) {
+	currprefs.sound_interpol = 2;
+	printf ("Interpol on: crux\n");
     }
-    else if (sample_handler == sample16s_handler) {
-	sample_handler = sample16si_handler;
-	printf ("Interpol on\n");
-    }
-    else if (sample_handler == sample16i_handler)
-	sample_handler = sample16_handler;
-    else if (sample_handler == sample16_handler)
-	sample_handler = sample16i_handler;
-    
+    else {
+	currprefs.sound_interpol = 0;
+	printf ("Interpol off\n");
+    }    
 }
 
 static void framerate_up (void)