diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/backend/drm/drm.h | 19 | ||||
| -rw-r--r-- | include/backend/drm/properties.h | 11 | ||||
| -rw-r--r-- | include/backend/drm/renderer.h | 20 | ||||
| -rw-r--r-- | include/backend/libinput.h | 12 | ||||
| -rw-r--r-- | include/backend/wayland.h | 8 | ||||
| -rw-r--r-- | include/wlr/backend/drm.h | 2 |
6 files changed, 35 insertions, 37 deletions
diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h index cb10ad20..22bd1933 100644 --- a/include/backend/drm/drm.h +++ b/include/backend/drm/drm.h @@ -136,17 +136,12 @@ struct wlr_drm_connector { struct wl_list link; }; -bool wlr_drm_check_features(struct wlr_drm_backend *drm); -bool wlr_drm_resources_init(struct wlr_drm_backend *drm); -void wlr_drm_resources_free(struct wlr_drm_backend *drm); -void wlr_drm_restore_outputs(struct wlr_drm_backend *drm); -void wlr_drm_connector_cleanup(struct wlr_drm_connector *conn); -void wlr_drm_scan_connectors(struct wlr_drm_backend *state); -int wlr_drm_event(int fd, uint32_t mask, void *data); -void wlr_drm_connector_enable(struct wlr_output *output, bool enable); - -void wlr_drm_connector_start_renderer(struct wlr_drm_connector *conn); - -struct wlr_session *wlr_drm_backend_get_session(struct wlr_backend *backend); +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); #endif diff --git a/include/backend/drm/properties.h b/include/backend/drm/properties.h index 3cf8cc87..85a61903 100644 --- a/include/backend/drm/properties.h +++ b/include/backend/drm/properties.h @@ -59,11 +59,12 @@ union wlr_drm_plane_props { uint32_t props[12]; }; -bool wlr_drm_get_connector_props(int fd, uint32_t id, union wlr_drm_connector_props *out); -bool wlr_drm_get_crtc_props(int fd, uint32_t id, union wlr_drm_crtc_props *out); -bool wlr_drm_get_plane_props(int fd, uint32_t id, union wlr_drm_plane_props *out); +bool drm_get_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 wlr_drm_get_prop(int fd, uint32_t obj, uint32_t prop, uint64_t *ret); -void *wlr_drm_get_prop_blob(int fd, uint32_t obj, uint32_t prop, size_t *ret_len); +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); #endif diff --git a/include/backend/drm/renderer.h b/include/backend/drm/renderer.h index 73adfc27..1624a5ec 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 wlr_drm_renderer_init(struct wlr_drm_backend *drm, +bool drm_renderer_init(struct wlr_drm_backend *drm, struct wlr_drm_renderer *renderer); -void wlr_drm_renderer_finish(struct wlr_drm_renderer *renderer); +void drm_renderer_finish(struct wlr_drm_renderer *renderer); -bool wlr_drm_surface_init(struct wlr_drm_surface *surf, +bool drm_surface_init(struct wlr_drm_surface *surf, struct wlr_drm_renderer *renderer, uint32_t width, uint32_t height, uint32_t format, uint32_t flags); -bool wlr_drm_plane_surfaces_init(struct wlr_drm_plane *plane, +bool drm_plane_surfaces_init(struct wlr_drm_plane *plane, struct wlr_drm_backend *drm, int32_t width, uint32_t height, uint32_t format); -void wlr_drm_surface_finish(struct wlr_drm_surface *surf); -bool wlr_drm_surface_make_current(struct wlr_drm_surface *surf, int *buffer_age); -struct gbm_bo *wlr_drm_surface_swap_buffers(struct wlr_drm_surface *surf, +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, pixman_region32_t *damage); -struct gbm_bo *wlr_drm_surface_get_front(struct wlr_drm_surface *surf); -void wlr_drm_surface_post(struct wlr_drm_surface *surf); -struct gbm_bo *wlr_drm_surface_mgpu_copy(struct wlr_drm_surface *dest, +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 *src); #endif diff --git a/include/backend/libinput.h b/include/backend/libinput.h index 4eee7eb8..1e66a9ec 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 wlr_libinput_event(struct wlr_libinput_backend *state, +void libinput_handle_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 *wlr_libinput_keyboard_create( +struct wlr_keyboard *libinput_keyboard_create( struct libinput_device *device); void handle_keyboard_key(struct libinput_event *event, struct libinput_device *device); -struct wlr_pointer *wlr_libinput_pointer_create( +struct wlr_pointer *libinput_pointer_create( 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 *wlr_libinput_touch_create( +struct wlr_touch *libinput_touch_create( 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 *wlr_libinput_tablet_tool_create( +struct wlr_tablet_tool *libinput_tablet_tool_create( 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 *wlr_libinput_tablet_pad_create( +struct wlr_tablet_pad *libinput_tablet_pad_create( 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 00b6ae89..15e9f595 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 wlr_wl_registry_poll(struct wlr_wl_backend *backend); -void wlr_wl_output_update_cursor(struct wlr_wl_backend_output *output); -struct wlr_wl_backend_output *wlr_wl_output_for_surface( +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( struct wlr_wl_backend *backend, struct wl_surface *surface); -void wlr_wl_output_layout_get_box(struct wlr_wl_backend *backend, +void wl_output_layout_get_box(struct wlr_wl_backend *backend, struct wlr_box *box); extern const struct wl_seat_listener seat_listener; diff --git a/include/wlr/backend/drm.h b/include/wlr/backend/drm.h index 0c9e5c8b..14fafe10 100644 --- a/include/wlr/backend/drm.h +++ b/include/wlr/backend/drm.h @@ -19,4 +19,6 @@ struct wlr_backend *wlr_drm_backend_create(struct wl_display *display, bool wlr_backend_is_drm(struct wlr_backend *backend); bool wlr_output_is_drm(struct wlr_output *output); +struct wlr_session *wlr_drm_backend_get_session(struct wlr_backend *backend); + #endif |