9 files changed, 52 insertions, 49 deletions

diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h
index 22bd1933..5d6ff231 100644
--- a/include/backend/drm/drm.h
+++ b/include/backend/drm/drm.h
@@ -136,12 +136,12 @@ struct wlr_drm_connector {
 	struct wl_list link;
 };
 
-bool drm_check_features(struct wlr_drm_backend *drm);
-bool drm_resources_init(struct wlr_drm_backend *drm);
-void drm_resources_finish(struct wlr_drm_backend *drm);
-void drm_restore_outputs(struct wlr_drm_backend *drm);
-void drm_scan_connectors(struct wlr_drm_backend *state);
-int drm_event(int fd, uint32_t mask, void *data);
-void drm_connector_enable(struct wlr_output *output, bool enable);
+bool check_drm_features(struct wlr_drm_backend *drm);
+bool init_drm_resources(struct wlr_drm_backend *drm);
+void finish_drm_resources(struct wlr_drm_backend *drm);
+void restore_drm_outputs(struct wlr_drm_backend *drm);
+void scan_drm_connectors(struct wlr_drm_backend *state);
+int handle_drm_event(int fd, uint32_t mask, void *data);
+void enable_drm_connector(struct wlr_output *output, bool enable);
 
 #endif
diff --git a/include/backend/drm/properties.h b/include/backend/drm/properties.h
index 85a61903..1b3b2241 100644
--- a/include/backend/drm/properties.h
+++ b/include/backend/drm/properties.h
@@ -59,12 +59,12 @@ union wlr_drm_plane_props {
 	uint32_t props[12];
 };
 
-bool drm_get_connector_props(int fd, uint32_t id,
+bool get_drm_connector_props(int fd, uint32_t id,
 	union wlr_drm_connector_props *out);
-bool drm_get_crtc_props(int fd, uint32_t id, union wlr_drm_crtc_props *out);
-bool drm_get_plane_props(int fd, uint32_t id, union wlr_drm_plane_props *out);
+bool get_drm_crtc_props(int fd, uint32_t id, union wlr_drm_crtc_props *out);
+bool get_drm_plane_props(int fd, uint32_t id, union wlr_drm_plane_props *out);
 
-bool drm_get_prop(int fd, uint32_t obj, uint32_t prop, uint64_t *ret);
-void *drm_get_prop_blob(int fd, uint32_t obj, uint32_t prop, size_t *ret_len);
+bool get_drm_prop(int fd, uint32_t obj, uint32_t prop, uint64_t *ret);
+void *get_drm_prop_blob(int fd, uint32_t obj, uint32_t prop, size_t *ret_len);
 
 #endif
diff --git a/include/backend/drm/renderer.h b/include/backend/drm/renderer.h
index 1624a5ec..5e15f3d5 100644
--- a/include/backend/drm/renderer.h
+++ b/include/backend/drm/renderer.h
@@ -31,25 +31,25 @@ struct wlr_drm_surface {
 	struct gbm_bo *back;
 };
 
-bool drm_renderer_init(struct wlr_drm_backend *drm,
+bool init_drm_renderer(struct wlr_drm_backend *drm,
 	struct wlr_drm_renderer *renderer);
-void drm_renderer_finish(struct wlr_drm_renderer *renderer);
+void finish_drm_renderer(struct wlr_drm_renderer *renderer);
 
-bool drm_surface_init(struct wlr_drm_surface *surf,
+bool init_drm_surface(struct wlr_drm_surface *surf,
 	struct wlr_drm_renderer *renderer, uint32_t width, uint32_t height,
 	uint32_t format, uint32_t flags);
 
-bool drm_plane_surfaces_init(struct wlr_drm_plane *plane,
+bool init_drm_plane_surfaces(struct wlr_drm_plane *plane,
 	struct wlr_drm_backend *drm, int32_t width, uint32_t height,
 	uint32_t format);
 
-void drm_surface_finish(struct wlr_drm_surface *surf);
-bool drm_surface_make_current(struct wlr_drm_surface *surf, int *buffer_age);
-struct gbm_bo *drm_surface_swap_buffers(struct wlr_drm_surface *surf,
+void finish_drm_surface(struct wlr_drm_surface *surf);
+bool make_drm_surface_current(struct wlr_drm_surface *surf, int *buffer_age);
+struct gbm_bo *swap_drm_surface_buffers(struct wlr_drm_surface *surf,
 	pixman_region32_t *damage);
-struct gbm_bo *drm_surface_get_front(struct wlr_drm_surface *surf);
-void drm_surface_post(struct wlr_drm_surface *surf);
-struct gbm_bo *drm_surface_mgpu_copy(struct wlr_drm_surface *dest,
+struct gbm_bo *get_drm_surface_front(struct wlr_drm_surface *surf);
+void post_drm_surface(struct wlr_drm_surface *surf);
+struct gbm_bo *copy_drm_surface_mgpu(struct wlr_drm_surface *dest,
 	struct gbm_bo *src);
 
 #endif
diff --git a/include/backend/drm/util.h b/include/backend/drm/util.h
index 25da858f..0b55182b 100644
--- a/include/backend/drm/util.h
+++ b/include/backend/drm/util.h
@@ -9,7 +9,8 @@
 // Calculates a more accurate refresh rate (mHz) than what mode itself provides
 int32_t calculate_refresh_rate(drmModeModeInfo *mode);
 // Populates the make/model/phys_{width,height} of output from the edid data
-void parse_edid(struct wlr_output *restrict output, size_t len, const uint8_t *data);
+void parse_edid(struct wlr_output *restrict output, size_t len,
+	const uint8_t *data);
 // Returns the string representation of a DRM output type
 const char *conn_get_name(uint32_t type_id);
 // Returns the DRM framebuffer id for a gbm_bo
@@ -36,4 +37,5 @@ enum {
 size_t match_obj(size_t num_objs, const uint32_t objs[static restrict num_objs],
 		size_t num_res, const uint32_t res[static restrict num_res],
 		uint32_t out[static restrict num_res]);
+
 #endif
diff --git a/include/backend/libinput.h b/include/backend/libinput.h
index 1e66a9ec..f0928133 100644
--- a/include/backend/libinput.h
+++ b/include/backend/libinput.h
@@ -31,19 +31,19 @@ struct wlr_libinput_input_device {
 
 uint32_t usec_to_msec(uint64_t usec);
 
-void libinput_handle_event(struct wlr_libinput_backend *state,
+void handle_libinput_event(struct wlr_libinput_backend *state,
 		struct libinput_event *event);
 
 struct wlr_input_device *get_appropriate_device(
 		enum wlr_input_device_type desired_type,
 		struct libinput_device *device);
 
-struct wlr_keyboard *libinput_keyboard_create(
+struct wlr_keyboard *create_libinput_keyboard(
 		struct libinput_device *device);
 void handle_keyboard_key(struct libinput_event *event,
 		struct libinput_device *device);
 
-struct wlr_pointer *libinput_pointer_create(
+struct wlr_pointer *create_libinput_pointer(
 		struct libinput_device *device);
 void handle_pointer_motion(struct libinput_event *event,
 		struct libinput_device *device);
@@ -54,7 +54,7 @@ void handle_pointer_button(struct libinput_event *event,
 void handle_pointer_axis(struct libinput_event *event,
 		struct libinput_device *device);
 
-struct wlr_touch *libinput_touch_create(
+struct wlr_touch *create_libinput_touch(
 		struct libinput_device *device);
 void handle_touch_down(struct libinput_event *event,
 		struct libinput_device *device);
@@ -65,7 +65,7 @@ void handle_touch_motion(struct libinput_event *event,
 void handle_touch_cancel(struct libinput_event *event,
 		struct libinput_device *device);
 
-struct wlr_tablet_tool *libinput_tablet_tool_create(
+struct wlr_tablet_tool *create_libinput_tablet_tool(
 		struct libinput_device *device);
 void handle_tablet_tool_axis(struct libinput_event *event,
 		struct libinput_device *device);
@@ -76,7 +76,7 @@ void handle_tablet_tool_tip(struct libinput_event *event,
 void handle_tablet_tool_button(struct libinput_event *event,
 		struct libinput_device *device);
 
-struct wlr_tablet_pad *libinput_tablet_pad_create(
+struct wlr_tablet_pad *create_libinput_tablet_pad(
 		struct libinput_device *device);
 void handle_tablet_pad_button(struct libinput_event *event,
 		struct libinput_device *device);
diff --git a/include/backend/wayland.h b/include/backend/wayland.h
index 15e9f595..d1af954c 100644
--- a/include/backend/wayland.h
+++ b/include/backend/wayland.h
@@ -74,11 +74,11 @@ struct wlr_wl_pointer {
 	struct wl_listener output_destroy_listener;
 };
 
-void wl_registry_poll(struct wlr_wl_backend *backend);
-void wl_output_update_cursor(struct wlr_wl_backend_output *output);
-struct wlr_wl_backend_output *wl_output_for_surface(
+void poll_wl_registry(struct wlr_wl_backend *backend);
+void update_wl_output_cursor(struct wlr_wl_backend_output *output);
+struct wlr_wl_backend_output *get_wl_output_for_surface(
 		struct wlr_wl_backend *backend, struct wl_surface *surface);
-void wl_output_layout_get_box(struct wlr_wl_backend *backend,
+void get_wl_output_layout_box(struct wlr_wl_backend *backend,
 		struct wlr_box *box);
 
 extern const struct wl_seat_listener seat_listener;
diff --git a/include/backend/x11.h b/include/backend/x11.h
index aa946912..6ab1cec6 100644
--- a/include/backend/x11.h
+++ b/include/backend/x11.h
@@ -72,19 +72,19 @@ struct wlr_x11_backend {
 	struct wl_listener display_destroy;
 };
 
-struct wlr_x11_output *x11_output_from_window_id(struct wlr_x11_backend *x11,
+struct wlr_x11_output *get_x11_output_from_window_id(struct wlr_x11_backend *x11,
 	xcb_window_t window);
-void x11_output_layout_get_box(struct wlr_x11_backend *backend,
+void get_x11_output_layout_box(struct wlr_x11_backend *backend,
 	struct wlr_box *box);
 
-const struct wlr_input_device_impl input_device_impl;
+extern const struct wlr_input_device_impl input_device_impl;
 
-void x11_handle_input_event(struct wlr_x11_backend *x11,
+void handle_x11_input_event(struct wlr_x11_backend *x11,
 	xcb_generic_event_t *event);
-void x11_update_pointer_position(struct wlr_x11_output *output,
+void update_x11_pointer_position(struct wlr_x11_output *output,
 	xcb_timestamp_t time);
 
-void x11_output_handle_configure_notify(struct wlr_x11_output *output,
+void handle_x11_configure_notify(struct wlr_x11_output *output,
 	xcb_configure_notify_event_t *event);
 
 #endif
diff --git a/include/render/gles2.h b/include/render/gles2.h
index 792f1b40..99beff29 100644
--- a/include/render/gles2.h
+++ b/include/render/gles2.h
@@ -18,7 +18,7 @@
 
 extern PFNGLEGLIMAGETARGETTEXTURE2DOESPROC glEGLImageTargetTexture2DOES;
 
-struct gles2_pixel_format {
+struct wlr_gles2_pixel_format {
 	uint32_t wl_format;
 	GLint gl_format, gl_type;
 	int depth, bpp;
@@ -68,15 +68,16 @@ struct wlr_gles2_texture {
 	};
 };
 
-const struct gles2_pixel_format *gles2_format_from_wl(enum wl_shm_format fmt);
-const enum wl_shm_format *gles2_formats(size_t *len);
+const struct wlr_gles2_pixel_format *get_gles2_format_from_wl(
+	enum wl_shm_format fmt);
+const enum wl_shm_format *get_gles2_formats(size_t *len);
 
-struct wlr_gles2_texture *gles2_get_texture_in_context(
+struct wlr_gles2_texture *get_gles2_texture_in_context(
 	struct wlr_texture *wlr_texture);
 
-void gles2_push_marker(const char *file, const char *func);
-void gles2_pop_marker(void);
-#define GLES2_DEBUG_PUSH gles2_push_marker(wlr_strip_path(__FILE__), __func__)
-#define GLES2_DEBUG_POP gles2_pop_marker()
+void push_gles2_marker(const char *file, const char *func);
+void pop_gles2_marker(void);
+#define PUSH_GLES2_DEBUG push_gles2_marker(wlr_strip_path(__FILE__), __func__)
+#define POP_GLES2_DEBUG pop_gles2_marker()
 
 #endif
diff --git a/include/xwayland/selection.h b/include/xwayland/selection.h
index bb3a894d..fc910e46 100644
--- a/include/xwayland/selection.h
+++ b/include/xwayland/selection.h
@@ -60,8 +60,8 @@ void xwm_handle_selection_notify(struct wlr_xwm *xwm,
 	xcb_selection_notify_event_t *event);
 int xwm_handle_xfixes_selection_notify(struct wlr_xwm *xwm,
 	xcb_xfixes_selection_notify_event_t *event);
-bool wlr_data_source_is_xwayland_data_source(struct wlr_data_source *wlr_source);
-bool wlr_primary_selection_source_is_xwayland_primary_selection_source(
+bool data_source_is_xwayland(struct wlr_data_source *wlr_source);
+bool primary_selection_source_is_xwayland(
 	struct wlr_primary_selection_source *wlr_source);
 
 void xwm_seat_handle_start_drag(struct wlr_xwm *xwm, struct wlr_drag *drag);