commit 9df1eb0

xserver, xwm: Drop swc_ prefix for internal functions

 1@@ -156,7 +156,7 @@ bool swc_initialize(struct wl_display * display,
 2     }
 3 
 4 #ifdef ENABLE_XWAYLAND
 5-    if (!swc_xserver_initialize())
 6+    if (!xserver_initialize())
 7     {
 8         ERROR("Could not initialize xwayland\n");
 9         goto error10;
10@@ -197,7 +197,7 @@ EXPORT
11 void swc_finalize()
12 {
13 #ifdef ENABLE_XWAYLAND
14-    swc_xserver_finalize();
15+    xserver_finalize();
16 #endif
17     panel_manager_finalize();
18     swc_shell_finalize();

 1@@ -65,7 +65,7 @@ static void set_window_id(struct wl_client * client,
 2 {
 3     struct swc_surface * surface = wl_resource_get_user_data(surface_resource);
 4 
 5-    swc_xwm_manage_window(id, surface);
 6+    xwm_manage_window(id, surface);
 7 }
 8 
 9 const static struct xserver_interface xserver_implementation = {
10@@ -201,7 +201,7 @@ static void bind_xserver(struct wl_client * client, void * data,
11     /* Need to flush the xserver client so the X window manager can connect to
12      * it's socket. */
13     wl_client_flush(xserver.client);
14-    swc_xwm_initialize(sv[0]);
15+    xwm_initialize(sv[0]);
16 
17     xserver_send_listen_socket(xserver.resource, xserver.abstract_socket);
18     xserver_send_listen_socket(xserver.resource, xserver.unix_socket);
19@@ -265,7 +265,7 @@ static bool start_xserver()
20     return false;
21 }
22 
23-bool swc_xserver_initialize()
24+bool xserver_initialize()
25 {
26     xserver.global = wl_global_create(swc.display, &xserver_interface, 1,
27                                       NULL, &bind_xserver);
28@@ -284,9 +284,9 @@ bool swc_xserver_initialize()
29     return false;
30 }
31 
32-void swc_xserver_finalize()
33+void xserver_finalize()
34 {
35-    swc_xwm_finalize();
36+    xwm_finalize();
37     close_display();
38     wl_global_destroy(xserver.global);
39 }

 1@@ -1,6 +1,6 @@
 2 /* swc: libswc/xserver.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@@ -26,8 +26,8 @@
10 
11 #include <stdbool.h>
12 
13-bool swc_xserver_initialize();
14-void swc_xserver_finalize();
15+bool xserver_initialize();
16+void xserver_finalize();
17 
18 #endif
19 

 1@@ -170,7 +170,7 @@ static int connection_data(int fd, uint32_t mask, void * data)
 2     return count;
 3 }
 4 
 5-bool swc_xwm_initialize(int fd)
 6+bool xwm_initialize(int fd)
 7 {
 8     const xcb_setup_t * setup;
 9     xcb_screen_iterator_t screen_iterator;
10@@ -263,7 +263,7 @@ bool swc_xwm_initialize(int fd)
11     return false;
12 }
13 
14-void swc_xwm_finalize()
15+void xwm_finalize()
16 {
17     wl_event_source_remove(xwm.source);
18     xcb_ewmh_connection_wipe(&xwm.ewmh);
19@@ -314,7 +314,7 @@ static void handle_surface_destroy(struct wl_listener * listener, void * data)
20     wl_list_insert(&xwm.unpaired_windows, &xwl_window->link);
21 }
22 
23-void swc_xwm_manage_window(xcb_window_t id, struct swc_surface * surface)
24+void xwm_manage_window(xcb_window_t id, struct swc_surface * surface)
25 {
26     struct xwl_window * xwl_window;
27     xcb_get_geometry_cookie_t geometry_cookie;

 1@@ -29,10 +29,10 @@
 2 
 3 struct swc_surface;
 4 
 5-bool swc_xwm_initialize(int fd);
 6-void swc_xwm_finalize();
 7+bool xwm_initialize(int fd);
 8+void xwm_finalize();
 9 
10-void swc_xwm_manage_window(xcb_window_t window, struct swc_surface * surface);
11+void xwm_manage_window(xcb_window_t window, struct swc_surface * surface);
12 
13 #endif
14