This fixes some keyboard defs for Haiku.
authorSam Lantinga
Sat, 16 Oct 2010 17:15:19 -0700
changeset 490667acc9ab60ff
parent 4905 9779093454d2
child 4907 a2cf0174e5ab
This fixes some keyboard defs for Haiku.
From: Fran├žois Revol <revol@free.fr>
Checked By: Scott McCreary <scottmc2@gmail.com>
src/video/bwindow/SDL_BWin.h
     1.1 --- a/src/video/bwindow/SDL_BWin.h	Sat Oct 16 17:14:04 2010 -0700
     1.2 +++ b/src/video/bwindow/SDL_BWin.h	Sat Oct 16 17:15:19 2010 -0700
     1.3 @@ -103,8 +103,8 @@
     1.4          keymap[B_F10_KEY] = SDLK_F10;
     1.5          keymap[B_F11_KEY] = SDLK_F11;
     1.6          keymap[B_F12_KEY] = SDLK_F12;
     1.7 -        keymap[B_PRINT_KEY] = SDLK_PRINT;
     1.8 -        keymap[B_SCROLL_KEY] = SDLK_SCROLLOCK;
     1.9 +        keymap[B_PRINT_KEY] = SDLK_PRINTSCREEN;
    1.10 +        keymap[B_SCROLL_KEY] = SDLK_SCROLLLOCK;
    1.11          keymap[B_PAUSE_KEY] = SDLK_PAUSE;
    1.12          keymap[0x11] = SDLK_BACKQUOTE;
    1.13          keymap[0x12] = SDLK_1;
    1.14 @@ -123,7 +123,7 @@
    1.15          keymap[0x1f] = SDLK_INSERT;
    1.16          keymap[0x20] = SDLK_HOME;
    1.17          keymap[0x21] = SDLK_PAGEUP;
    1.18 -        keymap[0x22] = SDLK_NUMLOCK;
    1.19 +        keymap[0x22] = SDLK_NUMLOCKCLEAR;
    1.20          keymap[0x23] = SDLK_KP_DIVIDE;
    1.21          keymap[0x24] = SDLK_KP_MULTIPLY;
    1.22          keymap[0x25] = SDLK_KP_MINUS;
    1.23 @@ -144,9 +144,9 @@
    1.24          keymap[0x34] = SDLK_DELETE;
    1.25          keymap[0x35] = SDLK_END;
    1.26          keymap[0x36] = SDLK_PAGEDOWN;
    1.27 -        keymap[0x37] = SDLK_KP7;
    1.28 -        keymap[0x38] = SDLK_KP8;
    1.29 -        keymap[0x39] = SDLK_KP9;
    1.30 +        keymap[0x37] = SDLK_KP_7;
    1.31 +        keymap[0x38] = SDLK_KP_8;
    1.32 +        keymap[0x39] = SDLK_KP_9;
    1.33          keymap[0x3a] = SDLK_KP_PLUS;
    1.34          keymap[0x3b] = SDLK_CAPSLOCK;
    1.35          keymap[0x3c] = SDLK_a;
    1.36 @@ -161,9 +161,9 @@
    1.37          keymap[0x45] = SDLK_SEMICOLON;
    1.38          keymap[0x46] = SDLK_QUOTE;
    1.39          keymap[0x47] = SDLK_RETURN;
    1.40 -        keymap[0x48] = SDLK_KP4;
    1.41 -        keymap[0x49] = SDLK_KP5;
    1.42 -        keymap[0x4a] = SDLK_KP6;
    1.43 +        keymap[0x48] = SDLK_KP_4;
    1.44 +        keymap[0x49] = SDLK_KP_5;
    1.45 +        keymap[0x4a] = SDLK_KP_6;
    1.46          keymap[0x4b] = SDLK_LSHIFT;
    1.47          keymap[0x4c] = SDLK_z;
    1.48          keymap[0x4d] = SDLK_x;
    1.49 @@ -177,9 +177,9 @@
    1.50          keymap[0x55] = SDLK_SLASH;
    1.51          keymap[0x56] = SDLK_RSHIFT;
    1.52          keymap[0x57] = SDLK_UP;
    1.53 -        keymap[0x58] = SDLK_KP1;
    1.54 -        keymap[0x59] = SDLK_KP2;
    1.55 -        keymap[0x5a] = SDLK_KP3;
    1.56 +        keymap[0x58] = SDLK_KP_1;
    1.57 +        keymap[0x59] = SDLK_KP_2;
    1.58 +        keymap[0x5a] = SDLK_KP_3;
    1.59          keymap[0x5b] = SDLK_KP_ENTER;
    1.60          keymap[0x5c] = SDLK_LCTRL;
    1.61          keymap[0x5d] = SDLK_LALT;
    1.62 @@ -189,12 +189,12 @@
    1.63          keymap[0x61] = SDLK_LEFT;
    1.64          keymap[0x62] = SDLK_DOWN;
    1.65          keymap[0x63] = SDLK_RIGHT;
    1.66 -        keymap[0x64] = SDLK_KP0;
    1.67 +        keymap[0x64] = SDLK_KP_0;
    1.68          keymap[0x65] = SDLK_KP_PERIOD;
    1.69 -        keymap[0x66] = SDLK_LMETA;
    1.70 -        keymap[0x67] = SDLK_RMETA;
    1.71 +        keymap[0x66] = SDLK_LGUI;
    1.72 +        keymap[0x67] = SDLK_RGUI;
    1.73          keymap[0x68] = SDLK_MENU;
    1.74 -        keymap[0x69] = SDLK_EURO;
    1.75 +        keymap[0x69] = SDLK_2; //SDLK_EURO;
    1.76          keymap[0x6a] = SDLK_KP_EQUALS;
    1.77          keymap[0x6b] = SDLK_POWER;
    1.78      }