Browse Source

Merge pull request #114 from blackberry-gaming/next-dgough

Next dgough
Sean Paul Taylor 14 years ago
parent
commit
ed2412f0c6
2 changed files with 157 additions and 157 deletions
  1. 155 155
      gameplay/src/Keyboard.h
  2. 2 2
      gameplay/src/PlatformQNX.cpp

+ 155 - 155
gameplay/src/Keyboard.h

@@ -28,161 +28,161 @@ public:
      */
     enum Key
     {
-        KEY_NONE,
-        KEY_PAUSE,
-        KEY_SCROLL_LOCK,
-        KEY_PRINT,
-        KEY_SYSREQ,
-        KEY_BREAK,
-        KEY_ESCAPE,
-        KEY_BACKSPACE,
-        KEY_TAB,
-        KEY_BACK_TAB,
-        KEY_RETURN,
-        KEY_CAPS_LOCK,
-        KEY_LEFT_SHIFT,
-        KEY_RIGHT_SHIFT,
-        KEY_LEFT_CTRL,
-        KEY_RIGHT_CTRL,
-        KEY_LEFT_ALT,
-        KEY_RIGHT_ALT,
-        KEY_MENU,
-        KEY_LEFT_HYPER,
-        KEY_RIGHT_HYPER,
-        KEY_INSERT,
-        KEY_HOME,
-        KEY_PG_UP,
-        KEY_DELETE,
-        KEY_END,
-        KEY_PG_DOWN,
-        KEY_LEFT_ARROW,
-        KEY_RIGHT_ARROW,
-        KEY_UP_ARROW,
-        KEY_DOWN_ARROW,
-        KEY_NUM_LOCK,
-        KEY_KP_PLUS,
-        KEY_KP_MINUS,
-        KEY_KP_MULTIPLY,
-        KEY_KP_DIVIDE,
-        KEY_KP_ENTER,
-        KEY_KP_HOME,
-        KEY_KP_UP,
-        KEY_KP_PG_UP,
-        KEY_KP_LEFT,
-        KEY_KP_FIVE,
-        KEY_KP_RIGHT,
-        KEY_KP_END,
-        KEY_KP_DOWN,
-        KEY_KP_PG_DOWN,
-        KEY_KP_INSERT,
-        KEY_KP_DELETE,
-        KEY_F1,
-        KEY_F2,
-        KEY_F3,
-        KEY_F4,
-        KEY_F5,
-        KEY_F6,
-        KEY_F7,
-        KEY_F8,
-        KEY_F9,
-        KEY_F10,
-        KEY_F11,
-        KEY_F12,
-        KEY_SPACE,
-        KEY_EXCLAM,
-        KEY_QUOTE,
-        KEY_NUMBER,
-        KEY_DOLLAR,
-        KEY_PERCENT,
-        KEY_AMPERSAND,
-        KEY_APOSTROPHE,
-        KEY_LEFT_PARENTHESIS,
-        KEY_RIGHT_PARENTHESIS,
-        KEY_ASTERISK,
-        KEY_PLUS,
-        KEY_COMMA,
-        KEY_MINUS,
-        KEY_PERIOD,
-        KEY_SLASH,
-        KEY_ZERO,
-        KEY_ONE,
-        KEY_TWO,
-        KEY_THREE,
-        KEY_FOUR,
-        KEY_FIVE,
-        KEY_SIX,
-        KEY_SEVEN,
-        KEY_EIGHT,
-        KEY_NINE,
-        KEY_COLON,
-        KEY_SEMICOLON,
-        KEY_LESS_THAN,
-        KEY_EQUAL,
-        KEY_GREATER_THAN,
-        KEY_QUESTION,
-        KEY_AT,
-        KEY_CAPITAL_A,
-        KEY_CAPITAL_B,
-        KEY_CAPITAL_C,
-        KEY_CAPITAL_D,
-        KEY_CAPITAL_E,
-        KEY_CAPITAL_F,
-        KEY_CAPITAL_G,
-        KEY_CAPITAL_H,
-        KEY_CAPITAL_I,
-        KEY_CAPITAL_J,
-        KEY_CAPITAL_K,
-        KEY_CAPITAL_L,
-        KEY_CAPITAL_M,
-        KEY_CAPITAL_N,
-        KEY_CAPITAL_O,
-        KEY_CAPITAL_P,
-        KEY_CAPITAL_Q,
-        KEY_CAPITAL_R,
-        KEY_CAPITAL_S,
-        KEY_CAPITAL_T,
-        KEY_CAPITAL_U,
-        KEY_CAPITAL_V,
-        KEY_CAPITAL_W,
-        KEY_CAPITAL_X,
-        KEY_CAPITAL_Y,
-        KEY_CAPITAL_Z,
-        KEY_LEFT_BRACKET,
-        KEY_BACK_SLASH,
-        KEY_RIGHT_BRACKET,
-        KEY_CIRCUMFLEX,
-        KEY_UNDERSCORE,
-        KEY_GRAVE,
-        KEY_A,
-        KEY_B,
-        KEY_C,
-        KEY_D,
-        KEY_E,
-        KEY_F,
-        KEY_G,
-        KEY_H,
-        KEY_I,
-        KEY_J,
-        KEY_K,
-        KEY_L,
-        KEY_M,
-        KEY_N,
-        KEY_O,
-        KEY_P,
-        KEY_Q,
-        KEY_R,
-        KEY_S,
-        KEY_T,
-        KEY_U,
-        KEY_V,
-        KEY_W,
-        KEY_X,
-        KEY_Y,
-        KEY_Z,
-        KEY_LEFT_BRACE,
-        KEY_BAR,
-        KEY_RIGHT_BRACE,
-        KEY_TILDE
+        KEY_NONE              = 0,
+        KEY_PAUSE             = 0x0013,
+        KEY_SCROLL_LOCK       = 0x1014,
+        KEY_PRINT             = 0x1061,
+        KEY_SYSREQ            = 0x106A,
+        KEY_BREAK             = 0x106B,
+        KEY_ESCAPE            = 0x001B,
+        KEY_BACKSPACE         = 0x0008,
+        KEY_TAB               = 0x0009,
+        KEY_BACK_TAB          = 0x0089,
+        KEY_RETURN            = 0x000D,
+        KEY_CAPS_LOCK         = 0x00E5,
+        KEY_LEFT_SHIFT        = 0x00E1,
+        KEY_RIGHT_SHIFT       = 0x00E2,
+        KEY_LEFT_CTRL         = 0x00E3,
+        KEY_RIGHT_CTRL        = 0x00E4,
+        KEY_LEFT_ALT          = 0x00E9,
+        KEY_RIGHT_ALT         = 0x00EA,
+        KEY_MENU              = 0x1067,
+        KEY_LEFT_HYPER        = 0x10ED,
+        KEY_RIGHT_HYPER       = 0x10EE,
+        KEY_INSERT            = 0x1063,
+        KEY_HOME              = 0x1050,
+        KEY_PG_UP             = 0x1055,
+        KEY_DELETE            = 0x10FF,
+        KEY_END               = 0x1057,
+        KEY_PG_DOWN           = 0x1056,
+        KEY_LEFT_ARROW        = 0x1051,
+        KEY_RIGHT_ARROW       = 0x1053,
+        KEY_UP_ARROW          = 0x1052,
+        KEY_DOWN_ARROW        = 0x1054,
+        KEY_NUM_LOCK          = 0x107F,
+        KEY_KP_PLUS           = 0x10AB,
+        KEY_KP_MINUS          = 0x10AD,
+        KEY_KP_MULTIPLY       = 0x10AA,
+        KEY_KP_DIVIDE         = 0x10AF,
+        KEY_KP_ENTER          = 0x108D,
+        KEY_KP_HOME           = 0x10B7,
+        KEY_KP_UP             = 0x10B8,
+        KEY_KP_PG_UP          = 0x10B9,
+        KEY_KP_LEFT           = 0x10B4,
+        KEY_KP_FIVE           = 0x10B5,
+        KEY_KP_RIGHT          = 0x10B6,
+        KEY_KP_END            = 0x10B1,
+        KEY_KP_DOWN           = 0x10B2,
+        KEY_KP_PG_DOWN        = 0x10B3,
+        KEY_KP_INSERT         = 0x10B0,
+        KEY_KP_DELETE         = 0x10AE,
+        KEY_F1                = 0x00BE,
+        KEY_F2                = 0x00BF,
+        KEY_F3                = 0x00C0,
+        KEY_F4                = 0x00C1,
+        KEY_F5                = 0x00C2,
+        KEY_F6                = 0x00C3,
+        KEY_F7                = 0x00C4,
+        KEY_F8                = 0x00C5,
+        KEY_F9                = 0x00C6,
+        KEY_F10               = 0x00C7,
+        KEY_F11               = 0x00C8,
+        KEY_F12               = 0x00C9,
+        KEY_CIRCUMFLEX        = 0x005E,
+        KEY_SPACE             = ' ',
+        KEY_EXCLAM            = '!',
+        KEY_QUOTE             = '"',
+        KEY_NUMBER            = '#',
+        KEY_DOLLAR            = '$',
+        KEY_PERCENT           = '%',
+        KEY_AMPERSAND         = '&',
+        KEY_APOSTROPHE        = '\'',
+        KEY_LEFT_PARENTHESIS  = '(',
+        KEY_RIGHT_PARENTHESIS = ')',
+        KEY_ASTERISK          = '*',
+        KEY_PLUS              = '+',
+        KEY_COMMA             = ',',
+        KEY_MINUS             = '-',
+        KEY_PERIOD            = '.',
+        KEY_SLASH             = '/',
+        KEY_ZERO              = '0',
+        KEY_ONE               = '1',
+        KEY_TWO               = '2',
+        KEY_THREE             = '3',
+        KEY_FOUR              = '4',
+        KEY_FIVE              = '5',
+        KEY_SIX               = '6',
+        KEY_SEVEN             = '7',
+        KEY_EIGHT             = '8',
+        KEY_NINE              = '9',
+        KEY_COLON             = ':',
+        KEY_SEMICOLON         = ';',
+        KEY_LESS_THAN         = '<',
+        KEY_EQUAL             = '=',
+        KEY_GREATER_THAN      = '>',
+        KEY_QUESTION          = '?',
+        KEY_AT                = '@',
+        KEY_CAPITAL_A         = 'A',
+        KEY_CAPITAL_B         = 'B',
+        KEY_CAPITAL_C         = 'C',
+        KEY_CAPITAL_D         = 'D',
+        KEY_CAPITAL_E         = 'E',
+        KEY_CAPITAL_F         = 'F',
+        KEY_CAPITAL_G         = 'G',
+        KEY_CAPITAL_H         = 'H',
+        KEY_CAPITAL_I         = 'I',
+        KEY_CAPITAL_J         = 'J',
+        KEY_CAPITAL_K         = 'K',
+        KEY_CAPITAL_L         = 'L',
+        KEY_CAPITAL_M         = 'M',
+        KEY_CAPITAL_N         = 'N',
+        KEY_CAPITAL_O         = 'O',
+        KEY_CAPITAL_P         = 'P',
+        KEY_CAPITAL_Q         = 'Q',
+        KEY_CAPITAL_R         = 'R',
+        KEY_CAPITAL_S         = 'S',
+        KEY_CAPITAL_T         = 'T',
+        KEY_CAPITAL_U         = 'U',
+        KEY_CAPITAL_V         = 'V',
+        KEY_CAPITAL_W         = 'W',
+        KEY_CAPITAL_X         = 'X',
+        KEY_CAPITAL_Y         = 'Y',
+        KEY_CAPITAL_Z         = 'Z',
+        KEY_LEFT_BRACKET      = '[',
+        KEY_BACK_SLASH        = '\\',
+        KEY_RIGHT_BRACKET     = ']',
+        KEY_UNDERSCORE        = '_',
+        KEY_GRAVE             = '`',
+        KEY_A                 = 'a',
+        KEY_B                 = 'b',
+        KEY_C                 = 'c',
+        KEY_D                 = 'd',
+        KEY_E                 = 'e',
+        KEY_F                 = 'f',
+        KEY_G                 = 'g',
+        KEY_H                 = 'h',
+        KEY_I                 = 'i',
+        KEY_J                 = 'j',
+        KEY_K                 = 'k',
+        KEY_L                 = 'l',
+        KEY_M                 = 'm',
+        KEY_N                 = 'n',
+        KEY_O                 = 'o',
+        KEY_P                 = 'p',
+        KEY_Q                 = 'q',
+        KEY_R                 = 'r',
+        KEY_S                 = 's',
+        KEY_T                 = 't',
+        KEY_U                 = 'u',
+        KEY_V                 = 'v',
+        KEY_W                 = 'w',
+        KEY_X                 = 'x',
+        KEY_Y                 = 'y',
+        KEY_Z                 = 'z',
+        KEY_LEFT_BRACE        = '{',
+        KEY_BAR               = '|',
+        KEY_RIGHT_BRACE       = '}',
+        KEY_TILDE             = '~'
     };
 
 private:

+ 2 - 2
gameplay/src/PlatformQNX.cpp

@@ -805,7 +805,7 @@ int Platform::enterMessagePump()
                         // Handle right mouse
                         if (buttons & SCREEN_RIGHT_MOUSE_BUTTON)
                         {
-                            if (mouse_pressed & SCREEN_RIGHT_MOUSE_BUTTON == 0)
+                            if ((mouse_pressed & SCREEN_RIGHT_MOUSE_BUTTON) == 0)
                             {
                                 move = false;
                                 mouse_pressed |= SCREEN_RIGHT_MOUSE_BUTTON;
@@ -822,7 +822,7 @@ int Platform::enterMessagePump()
                         // Handle middle mouse
                         if (buttons & SCREEN_MIDDLE_MOUSE_BUTTON)
                         {
-                            if (mouse_pressed & SCREEN_MIDDLE_MOUSE_BUTTON == 0)
+                            if ((mouse_pressed & SCREEN_MIDDLE_MOUSE_BUTTON) == 0)
                             {
                                 move = false;
                                 mouse_pressed |= SCREEN_MIDDLE_MOUSE_BUTTON;