commit 4782023

xkb: Drop swc_ prefix for non-public structures/functions

1@@ -80,7 +80,7 @@ static struct binding * find_binding(struct wl_array * bindings,
2 static struct binding * find_key_binding(uint32_t modifiers, uint32_t key)
3 {
4     struct binding * binding;
5-    struct swc_xkb * xkb = &swc.seat->keyboard->xkb;
6+    struct xkb * xkb = &swc.seat->keyboard->xkb;
7     xkb_keysym_t keysym;
8 
9     /* First try the keysym the keymap generates in it's current state. */

 1@@ -113,7 +113,7 @@ static bool client_handle_modifiers
 2 
 3 bool keyboard_initialize(struct keyboard * keyboard)
 4 {
 5-    if (!swc_xkb_initialize(&keyboard->xkb))
 6+    if (!xkb_initialize(&keyboard->xkb))
 7     {
 8         ERROR("Could not initialize XKB\n");
 9         goto error0;
10@@ -136,7 +136,7 @@ bool keyboard_initialize(struct keyboard * keyboard)
11     return true;
12 
13   error1:
14-    swc_xkb_finalize(&keyboard->xkb);
15+    xkb_finalize(&keyboard->xkb);
16   error0:
17     return false;
18 }
19@@ -146,7 +146,7 @@ void keyboard_finalize(struct keyboard * keyboard)
20     wl_array_release(&keyboard->client_keys);
21     wl_array_release(&keyboard->keys);
22     input_focus_finalize(&keyboard->focus);
23-    swc_xkb_finalize(&keyboard->xkb);
24+    xkb_finalize(&keyboard->xkb);
25 }
26 
27 /**
28@@ -198,7 +198,7 @@ void keyboard_handle_key(struct keyboard * keyboard, uint32_t time,
29     struct key * key;
30     struct keyboard_modifier_state modifier_state;
31     enum xkb_key_direction direction;
32-    struct swc_xkb * xkb = &keyboard->xkb;
33+    struct xkb * xkb = &keyboard->xkb;
34     struct keyboard_handler * handler;
35     uint32_t serial;
36 

1@@ -61,7 +61,7 @@ struct keyboard
2 {
3     struct input_focus focus;
4     struct input_focus_handler focus_handler;
5-    struct swc_xkb xkb;
6+    struct xkb xkb;
7 
8     struct wl_array keys;
9     struct wl_list handlers;

 1@@ -36,7 +36,7 @@ const struct xkb_rule_names rule_names = {
 2 
 3 static const char keymap_file_template[] = "swc-xkb-keymap-XXXXXX";
 4 
 5-bool swc_xkb_initialize(struct swc_xkb * xkb)
 6+bool xkb_initialize(struct xkb * xkb)
 7 {
 8     xkb->context = xkb_context_new(0);
 9 
10@@ -62,7 +62,7 @@ bool swc_xkb_initialize(struct swc_xkb * xkb)
11         goto error2;
12     }
13 
14-    if (!swc_xkb_update_keymap(xkb))
15+    if (!xkb_update_keymap(xkb))
16     {
17         ERROR("Could not update XKB keymap\n");
18         goto error3;
19@@ -80,7 +80,7 @@ bool swc_xkb_initialize(struct swc_xkb * xkb)
20     return false;
21 }
22 
23-void swc_xkb_finalize(struct swc_xkb * xkb)
24+void xkb_finalize(struct xkb * xkb)
25 {
26     munmap(xkb->keymap.area, xkb->keymap.size);
27     close(xkb->keymap.fd);
28@@ -89,7 +89,7 @@ void swc_xkb_finalize(struct swc_xkb * xkb)
29     xkb_context_unref(xkb->context);
30 }
31 
32-bool swc_xkb_update_keymap(struct swc_xkb * xkb)
33+bool xkb_update_keymap(struct xkb * xkb)
34 {
35     const char * keymap_directory = getenv("XDG_RUNTIME_DIR") ?: "/tmp";
36     char * keymap_string;
37@@ -158,7 +158,7 @@ bool swc_xkb_update_keymap(struct swc_xkb * xkb)
38     return false;
39 }
40 
41-void swc_xkb_update_key_indices(struct swc_xkb * xkb)
42+void xkb_update_key_indices(struct xkb * xkb)
43 {
44 }
45 

 1@@ -30,7 +30,7 @@
 2 /* Keycodes are offset by 8 in XKB. */
 3 #define XKB_KEY(key) ((key) + 8)
 4 
 5-struct swc_xkb
 6+struct xkb
 7 {
 8     struct xkb_context * context;
 9     struct xkb_state * state;
10@@ -49,10 +49,10 @@ struct swc_xkb
11     } indices;
12 };
13 
14-bool swc_xkb_initialize(struct swc_xkb * xkb);
15-void swc_xkb_finalize(struct swc_xkb * xkb);
16+bool xkb_initialize(struct xkb * xkb);
17+void xkb_finalize(struct xkb * xkb);
18 
19-bool swc_xkb_update_keymap(struct swc_xkb * xkb);
20+bool xkb_update_keymap(struct xkb * xkb);
21 
22 #endif
23