diff -c -r ../ori/l_joy.c ./l_joy.c
*** ../ori/l_joy.c	Sat Oct 31 16:37:29 1998
--- ./l_joy.c	Tue Nov 10 20:25:50 1998
***************
*** 43,49 ****
--- 43,51 ----
  #endif
  }
  
+ #ifndef NO_JOY_CODE
  static struct JS_DATA_TYPE jdata;
+ #endif
  
  static int I_ReadJoystick(void)
  {
***************
*** 54,59 ****
--- 56,63 ----
      return 0;
    }
    return 1;
+ #else
+   return 0;
  #endif
  }
  
***************
*** 71,76 ****
--- 75,82 ----
        return 0;
    }
    return 1;
+ #else
+   return 0;
  #endif
  }
  
diff -c -r ../ori/l_video_x.c ./l_video_x.c
*** ../ori/l_video_x.c	Sat Oct 31 16:37:30 1998
--- ./l_video_x.c	Tue Nov 10 20:38:56 1998
***************
*** 154,159 ****
--- 154,166 ----
    
    switch(rc = XKeycodeToKeysym(X_display, pEvent->xkey.keycode, 0))
      {
+       /* Jamie's hacks to work with stock NetWinder X server. */
+       case 65430:	rc = KEYD_LEFTARROW;	break;
+       case 65432:	rc = KEYD_RIGHTARROW;	break;
+       case 65433:	rc = KEYD_DOWNARROW;	break;
+       case 65431:	rc = KEYD_UPARROW;	break;
+       /* ... */
+ 
      case XK_Left:	rc = KEYD_LEFTARROW;	break;
      case XK_Right:	rc = KEYD_RIGHTARROW;	break;
      case XK_Down:	rc = KEYD_DOWNARROW;	break;