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

1 files changed, 9 insertions, 35 deletions

diff --git a/libdecor/src/libdecor-fallback.c b/libdecor/src/libdecor-fallback.c
index c281197c2..7f5f2fddc 100644
--- a/libdecor/src/libdecor-fallback.c
+++ b/libdecor/src/libdecor-fallback.c
@@ -128,18 +128,6 @@ libdecor_plugin_fallback_frame_property_changed(struct libdecor_plugin *plugin,
 }
 
 static void
-libdecor_plugin_fallback_frame_translate_coordinate(struct libdecor_plugin *plugin,
-						    struct libdecor_frame *frame,
-						    int content_x,
-						    int content_y,
-						    int *frame_x,
-						    int *frame_y)
-{
-	*frame_x = content_x;
-	*frame_y = content_y;
-}
-
-static void
 libdecor_plugin_fallback_frame_popup_grab(struct libdecor_plugin *plugin,
 					  struct libdecor_frame *frame,
 					  const char *seat_name)
@@ -154,27 +142,16 @@ libdecor_plugin_fallback_frame_popup_ungrab(struct libdecor_plugin *plugin,
 }
 
 static bool
-libdecor_plugin_fallback_configuration_get_content_size(struct libdecor_plugin *plugin,
-							struct libdecor_configuration *configuration,
-							struct libdecor_frame *frame,
-							int *content_width,
-							int *content_height)
+libdecor_plugin_fallback_frame_get_border_size(struct libdecor_plugin *plugin,
+					       struct libdecor_frame *frame,
+					       struct libdecor_configuration *configuration,
+					       int *left,
+					       int *right,
+					       int *top,
+					       int *bottom)
 {
-	return libdecor_configuration_get_window_size(configuration,
-						      content_width,
-						      content_height);
-}
+	*left = *right = *top = *bottom = 0;
 
-static bool
-libdecor_plugin_fallback_frame_get_window_size_for(
-		struct libdecor_plugin *plugin,
-		struct libdecor_frame *frame,
-		struct libdecor_state *state,
-		int *window_width,
-		int *window_height)
-{
-	*window_width = libdecor_state_get_content_width (state);
-	*window_height = libdecor_state_get_content_height (state);
 	return true;
 }
 
@@ -186,12 +163,9 @@ static struct libdecor_plugin_interface fallback_plugin_iface = {
 	.frame_free = libdecor_plugin_fallback_frame_free,
 	.frame_commit = libdecor_plugin_fallback_frame_commit,
 	.frame_property_changed = libdecor_plugin_fallback_frame_property_changed,
-	.frame_translate_coordinate =
-		libdecor_plugin_fallback_frame_translate_coordinate,
 	.frame_popup_grab = libdecor_plugin_fallback_frame_popup_grab,
 	.frame_popup_ungrab = libdecor_plugin_fallback_frame_popup_ungrab,
-	.configuration_get_content_size = libdecor_plugin_fallback_configuration_get_content_size,
-	.frame_get_window_size_for = libdecor_plugin_fallback_frame_get_window_size_for,
+	.frame_get_border_size = libdecor_plugin_fallback_frame_get_border_size,
 };
 
 struct libdecor_plugin *