src/osd/sdl/input.c
| r934 | r935 | |
|---|
| 495 | 495 | return r; |
| 496 | 496 | } |
| 497 | 497 | |
| 498 | | static char *alloc_name(char *instr) |
| 498 | static char *alloc_name(const char *instr) |
| 499 | 499 | { |
| 500 | 500 | char *out; |
| 501 | 501 | |
| r934 | r935 | |
|---|
| 814 | 814 | |
| 815 | 815 | // SDL 1.2 only has 1 keyboard (1.3+ will have multiple, this must be revisited then) |
| 816 | 816 | // add it now |
| 817 | | devinfo = generic_device_alloc(&keyboard_list, alloc_name((char *)"System keyboard")); |
| 817 | devinfo = generic_device_alloc(&keyboard_list, alloc_name((const char *)"System keyboard")); |
| 818 | 818 | devinfo->device = input_device_add(DEVICE_CLASS_KEYBOARD, devinfo->name, devinfo); |
| 819 | 819 | |
| 820 | 820 | // populate it |
| r934 | r935 | |
|---|
| 832 | 832 | } |
| 833 | 833 | |
| 834 | 834 | // SDL 1.2 has only 1 mouse - 1.3+ will also change that, so revisit this then |
| 835 | | devinfo = generic_device_alloc(&mouse_list, alloc_name((char *)"System mouse")); |
| 835 | devinfo = generic_device_alloc(&mouse_list, alloc_name((const char *)"System mouse")); |
| 836 | 836 | devinfo->device = input_device_add(DEVICE_CLASS_MOUSE, devinfo->name, devinfo); |
| 837 | 837 | |
| 838 | 838 | // add the axes |
| r934 | r935 | |
|---|
| 975 | 975 | devinfo->keyboard.state[event.key.keysym.sym-SDLK_FIRST] = 0; |
| 976 | 976 | break; |
| 977 | 977 | case SDL_JOYAXISMOTION: |
| 978 | | printf("joy %d axis %d to %d\n", event.jaxis.which, event.jaxis.axis, event.jaxis.value); |
| 979 | 978 | devinfo = generic_device_find_index(joystick_list, event.jaxis.which); |
| 980 | 979 | if (devinfo) |
| 981 | 980 | { |