diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/backend/x11.h | 2 | ||||
| -rw-r--r-- | include/render/gles2.h | 2 | ||||
| -rw-r--r-- | include/rootston/output.h | 3 | ||||
| -rw-r--r-- | include/wlr/types/wlr_compositor.h | 1 | ||||
| -rw-r--r-- | include/wlr/types/wlr_idle.h | 4 | ||||
| -rw-r--r-- | include/wlr/types/wlr_output_layout.h | 15 | ||||
| -rw-r--r-- | include/wlr/util/log.h | 6 | ||||
| -rw-r--r-- | include/wlr/xwm.h | 3 |
8 files changed, 29 insertions, 7 deletions
diff --git a/include/backend/x11.h b/include/backend/x11.h index c5f258c0..9e1c8146 100644 --- a/include/backend/x11.h +++ b/include/backend/x11.h @@ -46,6 +46,8 @@ struct wlr_x11_backend { struct { struct wlr_x11_atom wm_protocols; struct wlr_x11_atom wm_delete_window; + struct wlr_x11_atom net_wm_name; + struct wlr_x11_atom utf8_string; } atoms; // The time we last received an event diff --git a/include/render/gles2.h b/include/render/gles2.h index 797c5293..e015160d 100644 --- a/include/render/gles2.h +++ b/include/render/gles2.h @@ -62,7 +62,7 @@ extern const GLchar fragment_src_external[]; bool _gles2_flush_errors(const char *file, int line); #define gles2_flush_errors(...) \ - _gles2_flush_errors(_strip_path(__FILE__), __LINE__) + _gles2_flush_errors(wlr_strip_path(__FILE__), __LINE__) #define GL_CALL(func) func; gles2_flush_errors() diff --git a/include/rootston/output.h b/include/rootston/output.h index 9682e4f5..a852a204 100644 --- a/include/rootston/output.h +++ b/include/rootston/output.h @@ -19,7 +19,8 @@ struct roots_output { struct wlr_output_damage *damage; struct wl_listener destroy; - struct wl_listener frame; + struct wl_listener damage_frame; + struct wl_listener damage_destroy; }; void handle_new_output(struct wl_listener *listener, void *data); diff --git a/include/wlr/types/wlr_compositor.h b/include/wlr/types/wlr_compositor.h index 8481c590..5919b934 100644 --- a/include/wlr/types/wlr_compositor.h +++ b/include/wlr/types/wlr_compositor.h @@ -14,6 +14,7 @@ struct wlr_compositor { struct { struct wl_signal new_surface; + struct wl_signal destroy; } events; }; diff --git a/include/wlr/types/wlr_idle.h b/include/wlr/types/wlr_idle.h index 689c33a4..1744f07c 100644 --- a/include/wlr/types/wlr_idle.h +++ b/include/wlr/types/wlr_idle.h @@ -19,7 +19,9 @@ struct wlr_idle { struct wl_event_loop *event_loop; struct wl_listener display_destroy; - struct wl_signal activity_notify; + struct { + struct wl_signal activity_notify; + } events; void *data; }; diff --git a/include/wlr/types/wlr_output_layout.h b/include/wlr/types/wlr_output_layout.h index 7dd2b16a..4d10720e 100644 --- a/include/wlr/types/wlr_output_layout.h +++ b/include/wlr/types/wlr_output_layout.h @@ -96,4 +96,19 @@ void wlr_output_layout_add_auto(struct wlr_output_layout *layout, struct wlr_output *wlr_output_layout_get_center_output( struct wlr_output_layout *layout); +enum wlr_direction { + WLR_DIRECTION_UP = 0, + WLR_DIRECTION_DOWN = 1, + WLR_DIRECTION_LEFT = 2, + WLR_DIRECTION_RIGHT = 4, +}; + +/** + * Get the closest adjacent output to the reference output from the reference + * point in the given direction. + */ +struct wlr_output *wlr_output_layout_adjacent_output( + struct wlr_output_layout *layout, enum wlr_direction direction, + struct wlr_output *reference, double ref_x, double ref_y); + #endif diff --git a/include/wlr/util/log.h b/include/wlr/util/log.h index 3d3f25f9..5528664b 100644 --- a/include/wlr/util/log.h +++ b/include/wlr/util/log.h @@ -28,13 +28,13 @@ void wlr_log_init(log_importance_t verbosity, log_callback_t callback); void _wlr_log(log_importance_t verbosity, const char *format, ...) ATTRIB_PRINTF(2, 3); void _wlr_vlog(log_importance_t verbosity, const char *format, va_list args) ATTRIB_PRINTF(2, 0); -const char *_strip_path(const char *filepath); +const char *wlr_strip_path(const char *filepath); #define wlr_log(verb, fmt, ...) \ - _wlr_log(verb, "[%s:%d] " fmt, _strip_path(__FILE__), __LINE__, ##__VA_ARGS__) + _wlr_log(verb, "[%s:%d] " fmt, wlr_strip_path(__FILE__), __LINE__, ##__VA_ARGS__) #define wlr_vlog(verb, fmt, args) \ - _wlr_vlog(verb, "[%s:%d] " fmt, _strip_path(__FILE__), __LINE__, args) + _wlr_vlog(verb, "[%s:%d] " fmt, wlr_strip_path(__FILE__), __LINE__, args) #define wlr_log_errno(verb, fmt, ...) \ wlr_log(verb, fmt ": %s", ##__VA_ARGS__, strerror(errno)) diff --git a/include/wlr/xwm.h b/include/wlr/xwm.h index 242ff9cc..65681607 100644 --- a/include/wlr/xwm.h +++ b/include/wlr/xwm.h @@ -93,7 +93,8 @@ struct wlr_xwm { const xcb_query_extension_reply_t *xfixes; - struct wl_listener compositor_surface_create; + struct wl_listener compositor_new_surface; + struct wl_listener compositor_destroy; struct wl_listener seat_selection; struct wl_listener seat_primary_selection; }; |