commit 03de3e2

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

 1@@ -1,6 +1,6 @@
 2 /* swc: input_focus.c
 3  *
 4- * Copyright (c) 2013 Michael Forney
 5+ * Copyright (c) 2013, 2014 Michael Forney
 6  *
 7  * Permission is hereby granted, free of charge, to any person obtaining a copy
 8  * of this software and associated documentation files (the "Software"), to deal
 9@@ -26,7 +26,7 @@
10 #include "surface.h"
11 #include "util.h"
12 
13-static inline void focus(struct swc_input_focus * input_focus,
14+static inline void focus(struct input_focus * input_focus,
15                          struct swc_surface * surface,
16                          struct wl_resource * resource)
17 {
18@@ -43,7 +43,7 @@ static inline void focus(struct swc_input_focus * input_focus,
19     input_focus->resource = resource;
20 }
21 
22-static inline void unfocus(struct swc_input_focus * input_focus)
23+static inline void unfocus(struct input_focus * input_focus)
24 {
25     if (input_focus->surface)
26         wl_list_remove(&input_focus->surface_destroy_listener.link);
27@@ -58,15 +58,15 @@ static inline void unfocus(struct swc_input_focus * input_focus)
28 static void handle_focus_surface_destroy(struct wl_listener * listener,
29                                          void * data)
30 {
31-    struct swc_input_focus * input_focus = CONTAINER_OF
32+    struct input_focus * input_focus = CONTAINER_OF
33         (listener, typeof(*input_focus), surface_destroy_listener);
34 
35     input_focus->surface = NULL;
36     input_focus->resource = NULL;
37 }
38 
39-bool swc_input_focus_initialize(struct swc_input_focus * input_focus,
40-                                struct swc_input_focus_handler * handler)
41+bool input_focus_initialize(struct input_focus * input_focus,
42+                            struct input_focus_handler * handler)
43 {
44     input_focus->resource = NULL;
45     input_focus->surface = NULL;
46@@ -80,13 +80,13 @@ bool swc_input_focus_initialize(struct swc_input_focus * input_focus,
47     return true;
48 }
49 
50-void swc_input_focus_finalize(struct swc_input_focus * input_focus)
51+void input_focus_finalize(struct input_focus * input_focus)
52 {
53     /* XXX: Destroy resources? */
54 }
55 
56-void swc_input_focus_add_resource(struct swc_input_focus * input_focus,
57-                                  struct wl_resource * resource)
58+void input_focus_add_resource(struct input_focus * input_focus,
59+                              struct wl_resource * resource)
60 {
61     /* If this new input resource corresponds to our focus, set it as our
62      * focus. */
63@@ -107,8 +107,8 @@ void swc_input_focus_add_resource(struct swc_input_focus * input_focus,
64     wl_list_insert(&input_focus->resources, wl_resource_get_link(resource));
65 }
66 
67-void swc_input_focus_remove_resource(struct swc_input_focus * input_focus,
68-                                     struct wl_resource * resource)
69+void input_focus_remove_resource(struct input_focus * input_focus,
70+                                 struct wl_resource * resource)
71 {
72     if (resource == input_focus->resource)
73         input_focus->resource = NULL;
74@@ -116,12 +116,12 @@ void swc_input_focus_remove_resource(struct swc_input_focus * input_focus,
75     swc_remove_resource(resource);
76 }
77 
78-void swc_input_focus_set(struct swc_input_focus * input_focus,
79-                         struct swc_surface * surface)
80+void input_focus_set(struct input_focus * input_focus,
81+                     struct swc_surface * surface)
82 {
83     struct wl_client * client;
84     struct wl_resource * resource;
85-    struct swc_input_focus_event_data data;
86+    struct input_focus_event_data data;
87 
88     if (surface == input_focus->surface)
89         return;
90@@ -147,7 +147,7 @@ void swc_input_focus_set(struct swc_input_focus * input_focus,
91 
92     data.new = input_focus->surface;
93 
94-    swc_send_event(&input_focus->event_signal, SWC_INPUT_FOCUS_EVENT_CHANGED,
95+    swc_send_event(&input_focus->event_signal, INPUT_FOCUS_EVENT_CHANGED,
96                    &data);
97 
98     return;

 1@@ -1,6 +1,6 @@
 2 /* swc: input_focus.h
 3  *
 4- * Copyright (c) 2013 Michael Forney
 5+ * Copyright (c) 2013, 2014 Michael Forney
 6  *
 7  * Permission is hereby granted, free of charge, to any person obtaining a copy
 8  * of this software and associated documentation files (the "Software"), to deal
 9@@ -29,49 +29,49 @@
10 
11 enum
12 {
13-    SWC_INPUT_FOCUS_EVENT_CHANGED
14+    INPUT_FOCUS_EVENT_CHANGED
15 };
16 
17-struct swc_input_focus_event_data
18+struct input_focus_event_data
19 {
20     struct swc_surface * old, * new;
21 };
22 
23-struct swc_input_focus_handler
24+struct input_focus_handler
25 {
26-    void (* enter)(struct swc_input_focus_handler * handler,
27+    void (* enter)(struct input_focus_handler * handler,
28                    struct wl_resource * resource,
29                    struct swc_surface * surface);
30-    void (* leave)(struct swc_input_focus_handler * handler,
31+    void (* leave)(struct input_focus_handler * handler,
32                    struct wl_resource * resource,
33                    struct swc_surface * surface);
34 };
35 
36-struct swc_input_focus
37+struct input_focus
38 {
39     struct wl_resource * resource;
40     struct swc_surface * surface;
41     struct wl_listener surface_destroy_listener;
42 
43-    struct swc_input_focus_handler * handler;
44+    struct input_focus_handler * handler;
45     struct wl_list resources;
46 
47     struct wl_signal event_signal;
48 };
49 
50-bool swc_input_focus_initialize(struct swc_input_focus * input_focus,
51-                                struct swc_input_focus_handler * input_handler);
52+bool input_focus_initialize(struct input_focus * input_focus,
53+                            struct input_focus_handler * input_handler);
54 
55-void swc_input_focus_finalize(struct swc_input_focus * input_focus);
56+void input_focus_finalize(struct input_focus * input_focus);
57 
58-void swc_input_focus_add_resource(struct swc_input_focus * input_focus,
59-                                  struct wl_resource * resource);
60+void input_focus_add_resource(struct input_focus * input_focus,
61+                              struct wl_resource * resource);
62 
63-void swc_input_focus_remove_resource(struct swc_input_focus * input_focus,
64-                                     struct wl_resource * resource);
65+void input_focus_remove_resource(struct input_focus * input_focus,
66+                                 struct wl_resource * resource);
67 
68-void swc_input_focus_set(struct swc_input_focus * input_focus,
69-                         struct swc_surface * surface);
70+void input_focus_set(struct input_focus * input_focus,
71+                     struct swc_surface * surface);
72 
73 #endif
74 

 1@@ -32,7 +32,7 @@
 2 #include <stdio.h>
 3 #include <string.h>
 4 
 5-static void enter(struct swc_input_focus_handler * handler,
 6+static void enter(struct input_focus_handler * handler,
 7                   struct wl_resource * resource, struct swc_surface * surface)
 8 {
 9     struct swc_keyboard * keyboard;
10@@ -49,7 +49,7 @@ static void enter(struct swc_input_focus_handler * handler,
11                            &keyboard->client_handler.keys);
12 }
13 
14-static void leave(struct swc_input_focus_handler * handler,
15+static void leave(struct input_focus_handler * handler,
16                   struct wl_resource * resource, struct swc_surface * surface)
17 {
18     struct wl_client * client;
19@@ -110,7 +110,7 @@ bool swc_keyboard_initialize(struct swc_keyboard * keyboard)
20         goto error0;
21     }
22 
23-    if (!swc_input_focus_initialize(&keyboard->focus, &keyboard->focus_handler))
24+    if (!input_focus_initialize(&keyboard->focus, &keyboard->focus_handler))
25         goto error1;
26 
27     keyboard->modifier_state = (struct swc_keyboard_modifier_state) { 0 };
28@@ -123,8 +123,6 @@ bool swc_keyboard_initialize(struct swc_keyboard * keyboard)
29     wl_list_init(&keyboard->handlers);
30     wl_list_insert(&keyboard->handlers, &keyboard->client_handler.link);
31 
32-    swc_input_focus_initialize(&keyboard->focus, &keyboard->focus_handler);
33-
34     return true;
35 
36   error1:
37@@ -136,7 +134,7 @@ bool swc_keyboard_initialize(struct swc_keyboard * keyboard)
38 void swc_keyboard_finalize(struct swc_keyboard * keyboard)
39 {
40     wl_array_release(&keyboard->client_handler.keys);
41-    swc_input_focus_finalize(&keyboard->focus);
42+    input_focus_finalize(&keyboard->focus);
43     swc_xkb_finalize(&keyboard->xkb);
44 }
45 
46@@ -146,14 +144,14 @@ void swc_keyboard_finalize(struct swc_keyboard * keyboard)
47 void swc_keyboard_set_focus(struct swc_keyboard * keyboard,
48                             struct swc_surface * surface)
49 {
50-    swc_input_focus_set(&keyboard->focus, surface);
51+    input_focus_set(&keyboard->focus, surface);
52 }
53 
54 static void unbind(struct wl_resource * resource)
55 {
56     struct swc_keyboard * keyboard = wl_resource_get_user_data(resource);
57 
58-    swc_input_focus_remove_resource(&keyboard->focus, resource);
59+    input_focus_remove_resource(&keyboard->focus, resource);
60 }
61 
62 struct wl_resource * swc_keyboard_bind(struct swc_keyboard * keyboard,
63@@ -163,7 +161,7 @@ struct wl_resource * swc_keyboard_bind(struct swc_keyboard * keyboard,
64 
65     client_resource = wl_resource_create(client, &wl_keyboard_interface, 1, id);
66     wl_resource_set_implementation(client_resource, NULL, keyboard, &unbind);
67-    swc_input_focus_add_resource(&keyboard->focus, client_resource);
68+    input_focus_add_resource(&keyboard->focus, client_resource);
69 
70     /* Subtract one to remove terminating NULL character. */
71     wl_keyboard_send_keymap(client_resource, WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1,

 1@@ -54,8 +54,8 @@ struct swc_keyboard_handler
 2 
 3 struct swc_keyboard
 4 {
 5-    struct swc_input_focus focus;
 6-    struct swc_input_focus_handler focus_handler;
 7+    struct input_focus focus;
 8+    struct input_focus_handler focus_handler;
 9     struct swc_xkb xkb;
10 
11     struct wl_list handlers;

 1@@ -39,7 +39,7 @@ struct button_press
 2     struct swc_pointer_handler * handler;
 3 };
 4 
 5-static void enter(struct swc_input_focus_handler * handler,
 6+static void enter(struct input_focus_handler * handler,
 7                   struct wl_resource * resource, struct swc_surface * surface)
 8 {
 9     struct swc_pointer * pointer;
10@@ -60,7 +60,7 @@ static void enter(struct swc_input_focus_handler * handler,
11                           surface_x, surface_y);
12 }
13 
14-static void leave(struct swc_input_focus_handler * handler,
15+static void leave(struct input_focus_handler * handler,
16                   struct wl_resource * resource, struct swc_surface * surface)
17 {
18     struct wl_client * client;
19@@ -278,7 +278,7 @@ bool swc_pointer_initialize(struct swc_pointer * pointer)
20 
21     swc_pointer_set_cursor(pointer, cursor_left_ptr);
22 
23-    swc_input_focus_initialize(&pointer->focus, &pointer->focus_handler);
24+    input_focus_initialize(&pointer->focus, &pointer->focus_handler);
25     pixman_region32_init(&pointer->region);
26 
27     return true;
28@@ -286,7 +286,7 @@ bool swc_pointer_initialize(struct swc_pointer * pointer)
29 
30 void swc_pointer_finalize(struct swc_pointer * pointer)
31 {
32-    swc_input_focus_finalize(&pointer->focus);
33+    input_focus_finalize(&pointer->focus);
34     pixman_region32_fini(&pointer->region);
35 }
36 
37@@ -296,7 +296,7 @@ void swc_pointer_finalize(struct swc_pointer * pointer)
38 void swc_pointer_set_focus(struct swc_pointer * pointer,
39                            struct swc_surface * surface)
40 {
41-    swc_input_focus_set(&pointer->focus, surface);
42+    input_focus_set(&pointer->focus, surface);
43 }
44 
45 static void clip_position(struct swc_pointer * pointer,
46@@ -365,7 +365,7 @@ static void unbind(struct wl_resource * resource)
47 {
48     struct swc_pointer * pointer = wl_resource_get_user_data(resource);
49 
50-    swc_input_focus_remove_resource(&pointer->focus, resource);
51+    input_focus_remove_resource(&pointer->focus, resource);
52 }
53 
54 struct wl_resource * swc_pointer_bind(struct swc_pointer * pointer,
55@@ -376,7 +376,7 @@ struct wl_resource * swc_pointer_bind(struct swc_pointer * pointer,
56     client_resource = wl_resource_create(client, &wl_pointer_interface, 1, id);
57     wl_resource_set_implementation(client_resource, &pointer_implementation,
58                                    pointer, &unbind);
59-    swc_input_focus_add_resource(&pointer->focus, client_resource);
60+    input_focus_add_resource(&pointer->focus, client_resource);
61 
62     return client_resource;
63 }

 1@@ -47,8 +47,8 @@ struct swc_pointer_handler
 2 
 3 struct swc_pointer
 4 {
 5-    struct swc_input_focus focus;
 6-    struct swc_input_focus_handler focus_handler;
 7+    struct input_focus focus;
 8+    struct input_focus_handler focus_handler;
 9 
10     struct
11     {

 1@@ -96,11 +96,11 @@ static void handle_keyboard_focus_event(struct wl_listener * listener,
 2                                         void * data)
 3 {
 4     struct swc_event * event = data;
 5-    struct swc_input_focus_event_data * event_data = event->data;
 6+    struct input_focus_event_data * event_data = event->data;
 7 
 8     switch (event->type)
 9     {
10-        case SWC_INPUT_FOCUS_EVENT_CHANGED:
11+        case INPUT_FOCUS_EVENT_CHANGED:
12             if (event_data->new)
13             {
14                 struct wl_client * client

 1@@ -39,10 +39,10 @@
 2 static void handle_window_enter(struct wl_listener * listener, void * data)
 3 {
 4     struct swc_event * event = data;
 5-    struct swc_input_focus_event_data * event_data = event->data;
 6+    struct input_focus_event_data * event_data = event->data;
 7     struct window * window;
 8 
 9-    if (event->type != SWC_INPUT_FOCUS_EVENT_CHANGED)
10+    if (event->type != INPUT_FOCUS_EVENT_CHANGED)
11         return;
12 
13     if (!event_data->new || !(window = event_data->new->window))