Skip to content

Commit

Permalink
Add breaking changes for wlroots 0.15
Browse files Browse the repository at this point in the history
These changes bring pywlroots in line with wlroots' 0.15 release. These
changes are the changes that may break users so let's wait until 0.15 is
released before merging and releasing these changes ourselves.
  • Loading branch information
m-col committed Aug 25, 2021
1 parent 189a7b5 commit ced0740
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 15 deletions.
13 changes: 4 additions & 9 deletions wlroots/ffi_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,6 @@ def check_version():
void wlr_box_transform(struct wlr_box *dest, const struct wlr_box *box,
enum wl_output_transform transform, int width, int height);
void wlr_box_rotated_bounds(struct wlr_box *dest, const struct wlr_box *box, float rotation);
"""

# types/wlr_cursor.h
Expand All @@ -170,6 +168,7 @@ def check_version():
struct wl_signal touch_down;
struct wl_signal touch_motion;
struct wl_signal touch_cancel;
struct wl_signal touch_frame;
struct wl_signal tablet_tool_axis;
struct wl_signal tablet_tool_proximity;
Expand Down Expand Up @@ -572,7 +571,7 @@ def check_version():
struct pixman_region32 previous[WLR_OUTPUT_DAMAGE_PREVIOUS_LEN];
size_t previous_idx;
enum wlr_output_state_buffer_type pending_buffer_type;
bool pending_attach_render;
struct {
struct wl_signal frame;
Expand Down Expand Up @@ -1211,10 +1210,6 @@ def check_version():
struct wlr_texture *wlr_surface_get_texture(struct wlr_surface *surface);
struct wlr_subsurface *wlr_subsurface_create(struct wlr_surface *surface,
struct wlr_surface *parent, uint32_t version, uint32_t id,
struct wl_list *resource_list);
struct wlr_surface *wlr_surface_get_root_surface(struct wlr_surface *surface);
bool wlr_surface_point_accepts_input(struct wlr_surface *surface,
Expand Down Expand Up @@ -1772,7 +1767,7 @@ def check_version():
struct wlr_layer_shell_v1 *shell;
struct wl_list popups; // wlr_xdg_popup::link
char *namespace;
bool added, configured, mapped, closed;
bool added, configured, mapped;
uint32_t configure_serial;
uint32_t configure_next_serial;
struct wl_list configure_list;
Expand All @@ -1797,7 +1792,7 @@ def check_version():
void wlr_layer_surface_v1_configure(struct wlr_layer_surface_v1 *surface,
uint32_t width, uint32_t height);
void wlr_layer_surface_v1_close(struct wlr_layer_surface_v1 *surface);
void wlr_layer_surface_v1_destroy(struct wlr_layer_surface_v1 *surface);
bool wlr_surface_is_layer_surface(struct wlr_surface *surface);
Expand Down
8 changes: 2 additions & 6 deletions wlroots/wlr_types/layer_shell_v1.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,6 @@ def configured(self) -> bool:
def mapped(self) -> bool:
return self._ptr.mapped

@property
def closed(self) -> bool:
return self._ptr.closed

@property
def client_pending(self) -> LayerSurfaceV1State:
state_ptr = self._ptr.client_pending
Expand All @@ -159,8 +155,8 @@ def configure(self, width: int, height: int) -> None:
"""
lib.wlr_layer_surface_v1_configure(self._ptr, width, height)

def close(self) -> None:
lib.wlr_layer_surface_v1_close(self._ptr)
def destroy(self) -> None:
lib.wlr_layer_surface_v1_destroy(self._ptr)

@classmethod
def from_wlr_surface(cls, surface: Surface):
Expand Down

0 comments on commit ced0740

Please sign in to comment.