Merge remote-tracking branch 'origin/wlvk' into next-dash-interface

[skip ci]

wayvr-ipc/src/packet_client.rs

@@ -26,21 +26,11 @@ pub enum AttachTo {
 pub struct WvrProcessLaunchParams {
 	pub name: String,
 	pub exec: String,
-	pub target_display: packet_server::WvrDisplayHandle,
 	pub env: Vec<String>,
 	pub args: String,
 	pub userdata: HashMap<String, String>,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct WvrDisplayCreateParams {
-	pub width: u16,
-	pub height: u16,
-	pub name: String,
-	pub scale: Option<f32>,
-	pub attach_to: AttachTo,
-}
-
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct WlxHapticsParams {
 	pub intensity: f32,

wayvr-ipc/src/packet_server.rs

@@ -19,12 +19,6 @@ pub struct Disconnect {
 	pub reason: String,
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq)]
-pub struct WvrDisplayHandle {
-	pub idx: u32,
-	pub generation: u64,
-}
-
 #[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq)]
 pub struct WvrProcessHandle {
 	pub idx: u32,
@@ -37,15 +31,6 @@ pub struct WvrWindowHandle {
 	pub generation: u64,
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct WvrDisplay {
-	pub width: u16,
-	pub height: u16,
-	pub name: String,
-	pub visible: bool,
-	pub handle: WvrDisplayHandle,
-}
-
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct WvrWindow {
 	pub size_x: u32,
@@ -55,11 +40,6 @@ pub struct WvrWindow {
 	pub process_handle: WvrProcessHandle,
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct WvrDisplayList {
-	pub list: Vec<WvrDisplay>,
-}
-
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct WvrWindowList {
 	pub list: Vec<WvrWindow>,
@@ -91,12 +71,6 @@ pub struct StackingOptions {
 	pub margins_rest: Margins,
 }
 
-#[derive(Clone, PartialEq, Debug, Serialize, Deserialize)]
-pub enum WvrDisplayWindowLayout {
-	Tiling,
-	Stacking(StackingOptions),
-}
-
 #[derive(Clone, PartialEq, Debug, Serialize, Deserialize)]
 pub enum WvrStateChanged {
 	ProcessCreated,