Apply changes from upstream: https://gitlab.gnome.org/jadahl/libdecor

1 files changed, 7 insertions, 27 deletions

diff --git a/libdecor/src/libdecor-plugin.h b/libdecor/src/libdecor-plugin.h
index 9e5d9510b..eba41d409 100644
--- a/libdecor/src/libdecor-plugin.h
+++ b/libdecor/src/libdecor-plugin.h
@@ -97,12 +97,6 @@ struct libdecor_plugin_interface {
 			      struct libdecor_configuration *configuration);
 	void (*frame_property_changed)(struct libdecor_plugin *plugin,
 				       struct libdecor_frame *frame);
-	void (* frame_translate_coordinate)(struct libdecor_plugin *plugin,
-					    struct libdecor_frame *frame,
-					    int content_x,
-					    int content_y,
-					    int *window_x,
-					    int *window_y);
 	void (* frame_popup_grab)(struct libdecor_plugin *plugin,
 				  struct libdecor_frame *frame,
 				  const char *seat_name);
@@ -110,17 +104,13 @@ struct libdecor_plugin_interface {
 				    struct libdecor_frame *frame,
 				    const char *seat_name);
 
-	bool (* frame_get_window_size_for)(struct libdecor_plugin *plugin,
-					   struct libdecor_frame *frame,
-					   struct libdecor_state *state,
-					   int *window_width,
-					   int *window_height);
-
-	bool (* configuration_get_content_size)(struct libdecor_plugin *plugin,
-						struct libdecor_configuration *configuration,
-						struct libdecor_frame *frame,
-						int *content_width,
-						int *content_height);
+	bool (* frame_get_border_size)(struct libdecor_plugin *plugin,
+				       struct libdecor_frame *frame,
+				       struct libdecor_configuration *configuration,
+				       int *left,
+				       int *right,
+				       int *top,
+				       int *bottom);
 
 	/* Reserved */
 	void (* reserved0)(void);
@@ -147,11 +137,6 @@ libdecor_frame_get_content_height(struct libdecor_frame *frame);
 enum libdecor_window_state
 libdecor_frame_get_window_state(struct libdecor_frame *frame);
 
-void
-libdecor_frame_set_window_geometry(struct libdecor_frame *frame,
-				   int32_t x, int32_t y,
-				   int32_t width, int32_t height);
-
 enum libdecor_capabilities
 libdecor_frame_get_capabilities(const struct libdecor_frame *frame);
 
@@ -183,11 +168,6 @@ libdecor_state_get_content_height (struct libdecor_state *state);
 enum libdecor_window_state
 libdecor_state_get_window_state(struct libdecor_state *state);
 
-bool
-libdecor_configuration_get_window_size(struct libdecor_configuration *configuration,
-				       int *width,
-				       int *height);
-
 int
 libdecor_plugin_init(struct libdecor_plugin *plugin,
 		     struct libdecor *context,