From 770a5a5bffc7018dcfb15ce3ef363b8ea7651104 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Tue, 14 Feb 2017 18:29:14 +0800
Subject: [PATCH] DisplayConfig: Drop width/height from logical monitor

It is redundant, and either side still need to do the equivalent
calculations, so lets drop it.

https://bugzilla.gnome.org/show_bug.cgi?id=777732
---
 src/backends/meta-monitor-manager.c    | 4 +---
 src/org.gnome.Mutter.DisplayConfig.xml | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c
index 90d3a9ced..35a8822a4 100644
--- a/src/backends/meta-monitor-manager.c
+++ b/src/backends/meta-monitor-manager.c
@@ -1204,7 +1204,7 @@ meta_monitor_manager_legacy_handle_apply_configuration  (MetaDBusDisplayConfig *
 #define MONITORS_FORMAT "a" MONITOR_FORMAT
 
 #define LOGICAL_MONITOR_MONITORS_FORMAT "a" MONITOR_SPEC_FORMAT
-#define LOGICAL_MONITOR_FORMAT "(iiii" LOGICAL_MONITOR_MONITORS_FORMAT "dba{sv})"
+#define LOGICAL_MONITOR_FORMAT "(ii" LOGICAL_MONITOR_MONITORS_FORMAT "dba{sv})"
 #define LOGICAL_MONITORS_FORMAT "a" LOGICAL_MONITOR_FORMAT
 
 static gboolean
@@ -1313,8 +1313,6 @@ meta_monitor_manager_handle_get_current_state (MetaDBusDisplayConfig *skeleton,
                              LOGICAL_MONITOR_FORMAT,
                              logical_monitor->rect.x,
                              logical_monitor->rect.y,
-                             logical_monitor->rect.width,
-                             logical_monitor->rect.height,
                              &logical_monitor_monitors_builder,
                              (double) logical_monitor->scale,
                              logical_monitor->is_primary,
diff --git a/src/org.gnome.Mutter.DisplayConfig.xml b/src/org.gnome.Mutter.DisplayConfig.xml
index 2e4b1986d..92ee46071 100644
--- a/src/org.gnome.Mutter.DisplayConfig.xml
+++ b/src/org.gnome.Mutter.DisplayConfig.xml
@@ -328,8 +328,6 @@
 
 	* i x: x position
 	* i y: y position
-	* i width: width
-	* i height: height
 	* a(sss) monitors: monitors displaying this logical monitor
 	    * connector: name of the connector (e.g. DP-1, eDP-1 etc)
 	    * vendor: vendor name
@@ -356,7 +354,7 @@
     <method name="GetCurrentState">
       <arg name="serial" direction="out" type="u" />
       <arg name="monitors" direction="out" type="a((ssss)a(iiddu)a{sv})" />
-      <arg name="logical_monitors" direction="out" type="a(iiiia(ssss)dba{sv})" />
+      <arg name="logical_monitors" direction="out" type="a(iia(ssss)dba{sv})" />
       <arg name="supported_scales" direction="out" type="ad" />
       <arg name="max_screen_size" direction="out" type="(ii)" />
       <arg name="properties" direction="out" type="a{sv}" />