org.handhelds.familiar/packages/frodo/frodo-4.1b/frodo-joystick-4state.diff

   1 diff -u Src/C64_Qtopia.i Src/C64_Qtopia.i
   2 --- Src/C64_Qtopia.i    2004-07-11 09:28:05.000000000 +0200
   3 +++ Src/C64_Qtopia.i    2004-07-11 09:30:20.000000000 +0200
   4 @@ -246,10 +246,16 @@
   5         }
   6
   7         // Joystick keyboard emulation
   8 -       if (TheDisplay->NumLock())
   9 +       if (TheDisplay->NumLock() == 1)
  10                 TheCIA1->Joystick1 &= joykey;
  11         else
  12 +       if (TheDisplay->NumLock() == 2)
  13                 TheCIA1->Joystick2 &= joykey;
  14 +       else
  15 +       if (TheDisplay->NumLock() == 3) {
  16 +               TheCIA1->Joystick1 &= joykey;
  17 +               TheCIA1->Joystick2 &= joykey;
  18 +       }
  19
  20         // Count TOD clocks
  21         TheCIA1->CountTOD();
  22 diff -u Src/Display.h Src/Display.h
  23 --- Src/Display.h       2002-01-02 22:31:34.000000000 +0100
  24 +++ Src/Display.h       2004-07-11 09:30:43.000000000 +0200
  25 @@ -59,7 +59,7 @@
  26  #else
  27         void PollKeyboard(uint8 *key_matrix, uint8 *rev_matrix, uint8 *joystick);
  28  #endif
  29 -       bool NumLock(void);
  30 +       int NumLock(void);
  31         void InitColors(uint8 *colors);
  32         void NewPrefs(Prefs *prefs);
  33
  34 diff -u Src/Display_QtopiaSDL.i Src/Display_QtopiaSDL.i
  35 --- Src/Display_QtopiaSDL.i     2004-07-11 09:28:06.000000000 +0200
  36 +++ Src/Display_QtopiaSDL.i     2004-07-11 09:31:47.000000000 +0200
  37 @@ -17,7 +17,7 @@
  38  // Display surface
  39  static SDL_Surface *screen = NULL;
  40
  41 -// Mode of Joystick emulation. 0 = none, 1 = Joyport 1, 2 = Joyport 2
  42 +// Mode of Joystick emulation. 0 = none, 1 = Joyport 1, 2 = Joyport 2, 3 = both
  43  static short joy_emu = 0;
  44
  45  // Keyboard
  46 @@ -210,6 +210,8 @@
  47                 draw_string(screen, DISPLAY_X * 4/5 + 2, (screen->h - 17) + 4, "1", black, fill_gray);
  48         else if (joy_emu == 2)
  49                 draw_string(screen, DISPLAY_X * 4/5 + 2, (screen->h - 17) + 4, "2", black, fill_gray);
  50 +       else if (joy_emu == 3)
  51 +               draw_string(screen, DISPLAY_X * 4/5 + 2, (screen->h - 17) + 4, "3", black, fill_gray);
  52         draw_string(screen, 24, (screen->h - 17) + 4, speedometer_string, black, fill_gray);
  53
  54         // Update display
  55 @@ -500,7 +502,7 @@
  56  //                             fprintf(stderr, "SDL-Key: %d\n", event.key.keysym.sym);
  57                                 if (tab_pressed && event.key.keysym.sym == SDLK_j)
  58                                 {
  59 -                                       if (joy_emu < 2)
  60 +                                       if (joy_emu < 3)
  61                                                 joy_emu++;
  62                                         else
  63                                                 joy_emu = 0;
  64 @@ -573,11 +575,9 @@
  65   *  Check if NumLock is down (for switching the joystick keyboard emulation)
  66   */
  67
  68 -bool C64Display::NumLock(void)
  69 +int C64Display::NumLock(void)
  70  {
  71 -       if (joy_emu == 2)
  72 -               return true;
  73 -       return false;
  74 +       return joy_emu;
  75  }
  76
  77