--- fuse-0.8.0/ui/svga/svgadisplay.c.orig	2007-02-02 17:21:59.000000000 +0100

+++ fuse-0.8.0/ui/svga/svgadisplay.c	2007-04-18 12:47:53.005091161 +0200

@@ -258,7 +258,7 @@ uidisplay_area( int x, int y, int w, int

   scaled_x = scale * x; scaled_y = scale * y;

   /* Create scaled image */

-  scaler_proc16( (libspectrum_byte*)&svgadisplay_image[y][x], display_pitch,

+  scaler_proc16( (libspectrum_byte*)&svgadisplay_image[y][x], svgadisplay_pitch,

 		 (libspectrum_byte*)&scaled_image[scaled_y][scaled_x],

 		 scaled_pitch, w, h );

--- fuse-0.8.0/ui/svga/svgakeyboard.c.orig	2007-02-02 17:21:59.000000000 +0100

+++ fuse-0.8.0/ui/svga/svgakeyboard.c	2007-04-18 13:11:33.462038389 +0200

@@ -75,7 +75,7 @@ svgakeyboard_keypress( int keysym )

   if( fuse_keysym == INPUT_KEY_NONE ) return 0;

   fuse_event.type = INPUT_EVENT_KEYPRESS;

-  fuse_event.types.key.key = fuse_keysym;

+  fuse_event.types.key.native_key = fuse_keysym;

   return input_event( &fuse_event );

 }

@@ -91,7 +91,7 @@ svgakeyboard_keyrelease( int keysym )

   if( fuse_keysym == INPUT_KEY_NONE ) return 0;

   fuse_event.type = INPUT_EVENT_KEYRELEASE;

-  fuse_event.types.key.key = fuse_keysym;

+  fuse_event.types.key.native_key = fuse_keysym;

   return input_event( &fuse_event );

 }

--- fuse-0.8.0/ui/svga/keysyms.c.orig	2007-04-11 11:36:20.000000000 +0200

+++ fuse-0.8.0/ui/svga/keysyms.c	2007-04-18 13:12:30.369281348 +0200

@@ -116,7 +116,7 @@ keysyms_map_t keysyms_map[] = {

   { SCANCODE_CURSORBLOCKLEFT,  INPUT_KEY_Left        },

   { SCANCODE_CURSORBLOCKRIGHT, INPUT_KEY_Right       },

   { SCANCODE_INSERT,           INPUT_KEY_Insert      },

-  { SCANCODE_DELETE,           INPUT_KEY_Delete      },

+  { SCANCODE_REMOVE,           INPUT_KEY_Delete      },

   { SCANCODE_HOME,             INPUT_KEY_Home        },

   { SCANCODE_END,              INPUT_KEY_End         },

   { SCANCODE_PAGEUP,           INPUT_KEY_Page_Up     },

--- fuse-0.8.0/ui/fb/fbkeyboard.c.orig	2007-02-02 17:21:56.000000000 +0100

+++ fuse-0.8.0/ui/fb/fbkeyboard.c	2007-04-18 13:30:45.523690641 +0200

@@ -139,9 +139,9 @@ keyboard_update( void )

 	fuse_event.type = ( keybuf[i] & 0x80 ) ?

                           INPUT_EVENT_KEYRELEASE :

                           INPUT_EVENT_KEYPRESS;

-	fuse_event.types.key.key = keysyms_remap( keybuf[i] & 0x7f );

+	fuse_event.types.key.native_key = keysyms_remap( keybuf[i] & 0x7f );

-	if( fuse_event.types.key.key ) input_event( &fuse_event );

+	if( fuse_event.types.key.native_key ) input_event( &fuse_event );

       }

   }

 }