1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
|
$NetBSD: patch-ai,v 1.5 2009/04/17 16:51:07 drochner Exp $
--- src/key_events.c.orig 2009-03-25 17:41:49.000000000 +0100
+++ src/key_events.c
@@ -767,6 +767,7 @@ void kb_edit_show (void)
static void do_edit_binding (void)
{
+ char *title;
editkey = *lookup_binding (&catch_key_iter);
editdesc = editkey.desc;
editkey.desc = getdesc (&editkey);
@@ -775,7 +776,7 @@ static void do_edit_binding (void)
gtk_text_buffer_set_text (kb_binding_command_buf, editkey.cmd, -1);
gtk_entry_set_text (GTK_ENTRY (kb_binding_key), editkey.keyname);
- char *title = g_strdup_printf (_("Keybinding: %s"), editkey.desc);
+ title = g_strdup_printf (_("Keybinding: %s"), editkey.desc);
gtk_window_set_title (GTK_WINDOW (kb_binding_edit_dlg), title);
free (title);
@@ -1110,9 +1111,7 @@ static JSBool js_keypad_show (JSContext
/* Xine event mapping data */
-static const kb_xine_event_map_t xine_input = {
- "INPUT",
- {
+static const kb_xine_event_id_t xine_input_ids[] = {
{ "ANGLE_NEXT", XINE_EVENT_INPUT_ANGLE_NEXT },
{ "ANGLE_PREVIOUS", XINE_EVENT_INPUT_ANGLE_PREVIOUS },
{ "DOWN", XINE_EVENT_INPUT_DOWN },
@@ -1153,7 +1152,10 @@ static const kb_xine_event_map_t xine_in
{ "9", XINE_EVENT_INPUT_NUMBER_9 },
{ "-", -1 }, /* null event */
{ "" }
- }
+};
+
+static const kb_xine_event_map_t xine_input = {
+ "INPUT", &xine_input_ids
};
@@ -1199,9 +1201,7 @@ static void kb_xine_event_help (se_t *se
}
-static const kb_xine_event_map_t xine_vdr = {
- "VDR",
- {
+static const kb_xine_event_id_t xine_vdr_ids[] = {
{ "AUDIO", XINE_EVENT_VDR_AUDIO },
{ "BACK", XINE_EVENT_VDR_BACK },
{ "BLUE", XINE_EVENT_VDR_BLUE },
@@ -1239,7 +1239,10 @@ static const kb_xine_event_map_t xine_vd
{ "VOLPLUS", XINE_EVENT_VDR_VOLPLUS },
{ "YELLOW", XINE_EVENT_VDR_YELLOW },
{ "" }
- }
+};
+
+static const kb_xine_event_map_t xine_vdr = {
+ "VDR", &xine_vdr_ids
};
JSBool js_event_generic (JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
|
