Revision 99a0949b keymaps.c

b/keymaps.c
25 25
#include "keymaps.h"
26 26
#include "sysemu.h"
27 27

  
28
static int get_keysym(const name2keysym_t *table,
28
static int get_keysym(const a_name2keysym *table,
29 29
		      const char *name)
30 30
{
31
    const name2keysym_t *p;
31
    const a_name2keysym *p;
32 32
    for(p = table; p->name != NULL; p++) {
33 33
        if (!strcmp(p->name, name))
34 34
            return p->keysym;
......
59 59
    }
60 60
}
61 61

  
62
static kbd_layout_t *parse_keyboard_layout(const name2keysym_t *table,
62
static a_kbd_layout *parse_keyboard_layout(const a_name2keysym *table,
63 63
					   const char *language,
64
					   kbd_layout_t * k)
64
					   a_kbd_layout * k)
65 65
{
66 66
    FILE *f;
67 67
    char * filename;
......
71 71
    filename = qemu_find_file(QEMU_FILE_TYPE_KEYMAP, language);
72 72

  
73 73
    if (!k)
74
	k = qemu_mallocz(sizeof(kbd_layout_t));
74
	k = qemu_mallocz(sizeof(a_kbd_layout));
75 75
    if (!(filename && (f = fopen(filename, "r")))) {
76 76
	fprintf(stderr,
77 77
		"Could not read keymap file: '%s'\n", language);
......
142 142
}
143 143

  
144 144

  
145
void *init_keyboard_layout(const name2keysym_t *table, const char *language)
145
void *init_keyboard_layout(const a_name2keysym *table, const char *language)
146 146
{
147 147
    return parse_keyboard_layout(table, language, NULL);
148 148
}
......
150 150

  
151 151
int keysym2scancode(void *kbd_layout, int keysym)
152 152
{
153
    kbd_layout_t *k = kbd_layout;
153
    a_kbd_layout *k = kbd_layout;
154 154
    if (keysym < MAX_NORMAL_KEYCODE) {
155 155
	if (k->keysym2keycode[keysym] == 0)
156 156
	    fprintf(stderr, "Warning: no scancode found for keysym %d\n",
......
171 171

  
172 172
int keycode_is_keypad(void *kbd_layout, int keycode)
173 173
{
174
    kbd_layout_t *k = kbd_layout;
174
    a_kbd_layout *k = kbd_layout;
175 175
    struct key_range *kr;
176 176

  
177 177
    for (kr = k->keypad_range; kr; kr = kr->next)
......
182 182

  
183 183
int keysym_is_numlock(void *kbd_layout, int keysym)
184 184
{
185
    kbd_layout_t *k = kbd_layout;
185
    a_kbd_layout *k = kbd_layout;
186 186
    struct key_range *kr;
187 187

  
188 188
    for (kr = k->numlock_range; kr; kr = kr->next)

Also available in: Unified diff