Jayden/wayvr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cargo fmt

Browse Source
This commit is contained in:
galister
2025-03-12 03:07:35 +09:00
parent bca6376b50
commit a1cc41f541
5 changed files with 180 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

160
src/backend/notifications_dbus.rs
View File

@@ -1,13 +1,22 @@
// This code was autogenerated with `dbus-codegen-rust -g -m None -d org.freedesktop.Notifications -p /org/freedesktop/Notifications`, see https://github.com/diwic/dbus-rs // This code was autogenerated with `dbus-codegen-rust -g -m None -d org.freedesktop.Notifications -p /org/freedesktop/Notifications`, see https://github.com/diwic/dbus-rs
use dbus as dbus; use dbus;
#[allow(unused_imports)] #[allow(unused_imports)]
use dbus::arg; use dbus::arg;
use dbus::blocking; use dbus::blocking;
pub trait OrgFreedesktopDBusProperties { pub trait OrgFreedesktopDBusProperties {
fn get<R0: for<'b> arg::Get<'b> + 'static>(&self, interface_name: &str, property_name: &str) -> Result<R0, dbus::Error>; fn get<R0: for<'b> arg::Get<'b> + 'static>(
&self,
interface_name: &str,
property_name: &str,
) -> Result<R0, dbus::Error>;
fn get_all(&self, interface_name: &str) -> Result<arg::PropMap, dbus::Error>; fn get_all(&self, interface_name: &str) -> Result<arg::PropMap, dbus::Error>;
fn set<I2: arg::Arg + arg::Append>(&self, interface_name: &str, property_name: &str, value: I2) -> Result<(), dbus::Error>; fn set<I2: arg::Arg + arg::Append>(
&self,
interface_name: &str,
property_name: &str,
value: I2,
) -> Result<(), dbus::Error>;
} }
#[derive(Debug)] #[derive(Debug)]
@@ -40,20 +49,42 @@ impl dbus::message::SignalArgs for OrgFreedesktopDBusPropertiesPropertiesChanged
const INTERFACE: &'static str = "org.freedesktop.DBus.Properties"; const INTERFACE: &'static str = "org.freedesktop.DBus.Properties";
} }
impl<'a, T: blocking::BlockingSender, C: ::std::ops::Deref<Target=T>> OrgFreedesktopDBusProperties for blocking::Proxy<'a, C> { impl<'a, T: blocking::BlockingSender, C: ::std::ops::Deref<Target = T>> OrgFreedesktopDBusProperties
for blocking::Proxy<'a, C>
fn get<R0: for<'b> arg::Get<'b> + 'static>(&self, interface_name: &str, property_name: &str) -> Result<R0, dbus::Error> { {
self.method_call("org.freedesktop.DBus.Properties", "Get", (interface_name, property_name, )) fn get<R0: for<'b> arg::Get<'b> + 'static>(
.and_then(|r: (arg::Variant<R0>, )| Ok((r.0).0, )) &self,
interface_name: &str,
property_name: &str,
) -> Result<R0, dbus::Error> {
self.method_call(
"org.freedesktop.DBus.Properties",
"Get",
(interface_name, property_name),
)
.and_then(|r: (arg::Variant<R0>,)| Ok((r.0).0))
} }
fn get_all(&self, interface_name: &str) -> Result<arg::PropMap, dbus::Error> { fn get_all(&self, interface_name: &str) -> Result<arg::PropMap, dbus::Error> {
self.method_call("org.freedesktop.DBus.Properties", "GetAll", (interface_name, )) self.method_call(
.and_then(|r: (arg::PropMap, )| Ok(r.0, )) "org.freedesktop.DBus.Properties",
"GetAll",
(interface_name,),
)
.and_then(|r: (arg::PropMap,)| Ok(r.0))
} }
fn set<I2: arg::Arg + arg::Append>(&self, interface_name: &str, property_name: &str, value: I2) -> Result<(), dbus::Error> { fn set<I2: arg::Arg + arg::Append>(
self.method_call("org.freedesktop.DBus.Properties", "Set", (interface_name, property_name, arg::Variant(value), )) &self,
interface_name: &str,
property_name: &str,
value: I2,
) -> Result<(), dbus::Error> {
self.method_call(
"org.freedesktop.DBus.Properties",
"Set",
(interface_name, property_name, arg::Variant(value)),
)
} }
} }
@@ -61,11 +92,12 @@ pub trait OrgFreedesktopDBusIntrospectable {
fn introspect(&self) -> Result<String, dbus::Error>; fn introspect(&self) -> Result<String, dbus::Error>;
} }
impl<'a, T: blocking::BlockingSender, C: ::std::ops::Deref<Target=T>> OrgFreedesktopDBusIntrospectable for blocking::Proxy<'a, C> { impl<'a, T: blocking::BlockingSender, C: ::std::ops::Deref<Target = T>>
OrgFreedesktopDBusIntrospectable for blocking::Proxy<'a, C>
{
fn introspect(&self) -> Result<String, dbus::Error> { fn introspect(&self) -> Result<String, dbus::Error> {
self.method_call("org.freedesktop.DBus.Introspectable", "Introspect", ()) self.method_call("org.freedesktop.DBus.Introspectable", "Introspect", ())
.and_then(|r: (String, )| Ok(r.0, )) .and_then(|r: (String,)| Ok(r.0))
} }
} }
@@ -74,15 +106,16 @@ pub trait OrgFreedesktopDBusPeer {
fn get_machine_id(&self) -> Result<String, dbus::Error>; fn get_machine_id(&self) -> Result<String, dbus::Error>;
} }
impl<'a, T: blocking::BlockingSender, C: ::std::ops::Deref<Target=T>> OrgFreedesktopDBusPeer for blocking::Proxy<'a, C> { impl<'a, T: blocking::BlockingSender, C: ::std::ops::Deref<Target = T>> OrgFreedesktopDBusPeer
for blocking::Proxy<'a, C>
{
fn ping(&self) -> Result<(), dbus::Error> { fn ping(&self) -> Result<(), dbus::Error> {
self.method_call("org.freedesktop.DBus.Peer", "Ping", ()) self.method_call("org.freedesktop.DBus.Peer", "Ping", ())
} }
fn get_machine_id(&self) -> Result<String, dbus::Error> { fn get_machine_id(&self) -> Result<String, dbus::Error> {
self.method_call("org.freedesktop.DBus.Peer", "GetMachineId", ()) self.method_call("org.freedesktop.DBus.Peer", "GetMachineId", ())
.and_then(|r: (String, )| Ok(r.0, )) .and_then(|r: (String,)| Ok(r.0))
} }
} }
@@ -95,7 +128,17 @@ pub trait OrgFreedesktopNotifications {
fn close_all_notifications(&self) -> Result<(), dbus::Error>; fn close_all_notifications(&self) -> Result<(), dbus::Error>;
fn hide_latest_notification(&self, close: bool) -> Result<(), dbus::Error>; fn hide_latest_notification(&self, close: bool) -> Result<(), dbus::Error>;
fn get_capabilities(&self) -> Result<Vec<String>, dbus::Error>; fn get_capabilities(&self) -> Result<Vec<String>, dbus::Error>;
fn notify(&self, app_name: &str, replaces_id: u32, app_icon: &str, summary: &str, body: &str, actions: Vec<&str>, hints: arg::PropMap, expire_timeout: i32) -> Result<u32, dbus::Error>; fn notify(
&self,
app_name: &str,
replaces_id: u32,
app_icon: &str,
summary: &str,
body: &str,
actions: Vec<&str>,
hints: arg::PropMap,
expire_timeout: i32,
) -> Result<u32, dbus::Error>;
fn close_notification(&self, id: u32) -> Result<(), dbus::Error>; fn close_notification(&self, id: u32) -> Result<(), dbus::Error>;
fn get_server_information(&self) -> Result<(String, String, String, String), dbus::Error>; fn get_server_information(&self) -> Result<(String, String, String, String), dbus::Error>;
fn dnd(&self) -> Result<bool, dbus::Error>; fn dnd(&self) -> Result<bool, dbus::Error>;
@@ -115,9 +158,7 @@ impl arg::AppendAll for OrgFreedesktopNotificationsOnDndToggle {
impl arg::ReadAll for OrgFreedesktopNotificationsOnDndToggle { impl arg::ReadAll for OrgFreedesktopNotificationsOnDndToggle {
fn read(i: &mut arg::Iter) -> Result<Self, arg::TypeMismatchError> { fn read(i: &mut arg::Iter) -> Result<Self, arg::TypeMismatchError> {
Ok(OrgFreedesktopNotificationsOnDndToggle { Ok(OrgFreedesktopNotificationsOnDndToggle { dnd: i.read()? })
dnd: i.read()?,
})
} }
} }
@@ -207,28 +248,37 @@ impl dbus::message::SignalArgs for OrgFreedesktopNotificationsNotificationReplie
const INTERFACE: &'static str = "org.freedesktop.Notifications"; const INTERFACE: &'static str = "org.freedesktop.Notifications";
} }
impl<'a, T: blocking::BlockingSender, C: ::std::ops::Deref<Target=T>> OrgFreedesktopNotifications for blocking::Proxy<'a, C> { impl<'a, T: blocking::BlockingSender, C: ::std::ops::Deref<Target = T>> OrgFreedesktopNotifications
for blocking::Proxy<'a, C>
{
fn set_noti_window_visibility(&self, value: bool) -> Result<(), dbus::Error> { fn set_noti_window_visibility(&self, value: bool) -> Result<(), dbus::Error> {
self.method_call("org.freedesktop.Notifications", "SetNotiWindowVisibility", (value, )) self.method_call(
"org.freedesktop.Notifications",
"SetNotiWindowVisibility",
(value,),
)
} }
fn toggle_dnd(&self) -> Result<bool, dbus::Error> { fn toggle_dnd(&self) -> Result<bool, dbus::Error> {
self.method_call("org.freedesktop.Notifications", "ToggleDnd", ()) self.method_call("org.freedesktop.Notifications", "ToggleDnd", ())
.and_then(|r: (bool, )| Ok(r.0, )) .and_then(|r: (bool,)| Ok(r.0))
} }
fn set_dnd(&self, state: bool) -> Result<(), dbus::Error> { fn set_dnd(&self, state: bool) -> Result<(), dbus::Error> {
self.method_call("org.freedesktop.Notifications", "SetDnd", (state, )) self.method_call("org.freedesktop.Notifications", "SetDnd", (state,))
} }
fn get_dnd(&self) -> Result<bool, dbus::Error> { fn get_dnd(&self) -> Result<bool, dbus::Error> {
self.method_call("org.freedesktop.Notifications", "GetDnd", ()) self.method_call("org.freedesktop.Notifications", "GetDnd", ())
.and_then(|r: (bool, )| Ok(r.0, )) .and_then(|r: (bool,)| Ok(r.0))
} }
fn manually_close_notification(&self, id: u32, timeout: bool) -> Result<(), dbus::Error> { fn manually_close_notification(&self, id: u32, timeout: bool) -> Result<(), dbus::Error> {
self.method_call("org.freedesktop.Notifications", "ManuallyCloseNotification", (id, timeout, )) self.method_call(
"org.freedesktop.Notifications",
"ManuallyCloseNotification",
(id, timeout),
)
} }
fn close_all_notifications(&self) -> Result<(), dbus::Error> { fn close_all_notifications(&self) -> Result<(), dbus::Error> {
@@ -236,21 +286,48 @@ impl<'a, T: blocking::BlockingSender, C: ::std::ops::Deref<Target=T>> OrgFreedes
} }
fn hide_latest_notification(&self, close: bool) -> Result<(), dbus::Error> { fn hide_latest_notification(&self, close: bool) -> Result<(), dbus::Error> {
self.method_call("org.freedesktop.Notifications", "HideLatestNotification", (close, )) self.method_call(
"org.freedesktop.Notifications",
"HideLatestNotification",
(close,),
)
} }
fn get_capabilities(&self) -> Result<Vec<String>, dbus::Error> { fn get_capabilities(&self) -> Result<Vec<String>, dbus::Error> {
self.method_call("org.freedesktop.Notifications", "GetCapabilities", ()) self.method_call("org.freedesktop.Notifications", "GetCapabilities", ())
.and_then(|r: (Vec<String>, )| Ok(r.0, )) .and_then(|r: (Vec<String>,)| Ok(r.0))
} }
fn notify(&self, app_name: &str, replaces_id: u32, app_icon: &str, summary: &str, body: &str, actions: Vec<&str>, hints: arg::PropMap, expire_timeout: i32) -> Result<u32, dbus::Error> { fn notify(
self.method_call("org.freedesktop.Notifications", "Notify", (app_name, replaces_id, app_icon, summary, body, actions, hints, expire_timeout, )) &self,
.and_then(|r: (u32, )| Ok(r.0, )) app_name: &str,
replaces_id: u32,
app_icon: &str,
summary: &str,
body: &str,
actions: Vec<&str>,
hints: arg::PropMap,
expire_timeout: i32,
) -> Result<u32, dbus::Error> {
self.method_call(
"org.freedesktop.Notifications",
"Notify",
(
app_name,
replaces_id,
app_icon,
summary,
body,
actions,
hints,
expire_timeout,
),
)
.and_then(|r: (u32,)| Ok(r.0))
} }
fn close_notification(&self, id: u32) -> Result<(), dbus::Error> { fn close_notification(&self, id: u32) -> Result<(), dbus::Error> {
self.method_call("org.freedesktop.Notifications", "CloseNotification", (id, )) self.method_call("org.freedesktop.Notifications", "CloseNotification", (id,))
} }
fn get_server_information(&self) -> Result<(String, String, String, String), dbus::Error> { fn get_server_information(&self) -> Result<(String, String, String, String), dbus::Error> {
@@ -258,10 +335,19 @@ impl<'a, T: blocking::BlockingSender, C: ::std::ops::Deref<Target=T>> OrgFreedes
} }
fn dnd(&self) -> Result<bool, dbus::Error> { fn dnd(&self) -> Result<bool, dbus::Error> {
<Self as blocking::stdintf::org_freedesktop_dbus::Properties>::get(self, "org.freedesktop.Notifications", "Dnd") <Self as blocking::stdintf::org_freedesktop_dbus::Properties>::get(
self,
"org.freedesktop.Notifications",
"Dnd",
)
} }
fn set_dnd_(&self, value: bool) -> Result<(), dbus::Error> { fn set_dnd_(&self, value: bool) -> Result<(), dbus::Error> {
<Self as blocking::stdintf::org_freedesktop_dbus::Properties>::set(self, "org.freedesktop.Notifications", "Dnd", value) <Self as blocking::stdintf::org_freedesktop_dbus::Properties>::set(
self,
"org.freedesktop.Notifications",
"Dnd",
value,
)
} }
} }

82
src/backend/wayvr/smithay_wrapper.rs
View File

@@ -2,53 +2,53 @@ use super::egl_data;
use smithay::backend::{egl as smithay_egl, renderer::gles::ffi}; use smithay::backend::{egl as smithay_egl, renderer::gles::ffi};
pub fn get_egl_display(data: &egl_data::EGLData) -> anyhow::Result<smithay_egl::EGLDisplay> { pub fn get_egl_display(data: &egl_data::EGLData) -> anyhow::Result<smithay_egl::EGLDisplay> {
Ok(unsafe { smithay_egl::EGLDisplay::from_raw(data.display.as_ptr(), data.config.as_ptr())? }) Ok(unsafe { smithay_egl::EGLDisplay::from_raw(data.display.as_ptr(), data.config.as_ptr())? })
} }
pub fn get_egl_context( pub fn get_egl_context(
data: &egl_data::EGLData, data: &egl_data::EGLData,
display: &smithay_egl::EGLDisplay, display: &smithay_egl::EGLDisplay,
) -> anyhow::Result<smithay_egl::EGLContext> { ) -> anyhow::Result<smithay_egl::EGLContext> {
let display_ptr = display.get_display_handle().handle; let display_ptr = display.get_display_handle().handle;
debug_assert!(display_ptr == data.display.as_ptr()); debug_assert!(display_ptr == data.display.as_ptr());
let config_ptr = data.config.as_ptr(); let config_ptr = data.config.as_ptr();
let context_ptr = data.context.as_ptr(); let context_ptr = data.context.as_ptr();
Ok(unsafe { smithay_egl::EGLContext::from_raw(display_ptr, config_ptr, context_ptr)? }) Ok(unsafe { smithay_egl::EGLContext::from_raw(display_ptr, config_ptr, context_ptr)? })
} }
pub fn create_framebuffer_texture( pub fn create_framebuffer_texture(
gl: &ffi::Gles2, gl: &ffi::Gles2,
width: u32, width: u32,
height: u32, height: u32,
tex_format: u32, tex_format: u32,
internal_format: u32, internal_format: u32,
) -> u32 { ) -> u32 {
unsafe { unsafe {
let mut tex = 0; let mut tex = 0;
gl.GenTextures(1, &mut tex); gl.GenTextures(1, &mut tex);
gl.BindTexture(ffi::TEXTURE_2D, tex); gl.BindTexture(ffi::TEXTURE_2D, tex);
gl.TexParameteri( gl.TexParameteri(
ffi::TEXTURE_2D, ffi::TEXTURE_2D,
ffi::TEXTURE_MIN_FILTER, ffi::TEXTURE_MIN_FILTER,
ffi::NEAREST as i32, ffi::NEAREST as i32,
); );
gl.TexParameteri( gl.TexParameteri(
ffi::TEXTURE_2D, ffi::TEXTURE_2D,
ffi::TEXTURE_MAG_FILTER, ffi::TEXTURE_MAG_FILTER,
ffi::NEAREST as i32, ffi::NEAREST as i32,
); );
gl.TexImage2D( gl.TexImage2D(
ffi::TEXTURE_2D, ffi::TEXTURE_2D,
0, 0,
internal_format as i32, internal_format as i32,
width as i32, width as i32,
height as i32, height as i32,
0, 0,
tex_format, tex_format,
ffi::UNSIGNED_BYTE, ffi::UNSIGNED_BYTE,
std::ptr::null(), std::ptr::null(),
); );
gl.BindTexture(ffi::TEXTURE_2D, 0); gl.BindTexture(ffi::TEXTURE_2D, 0);
tex tex
} }
} }

8
src/backend/wayvr/time.rs
View File

@@ -2,8 +2,8 @@ use std::time::{SystemTime, UNIX_EPOCH};
// Returns milliseconds since unix epoch // Returns milliseconds since unix epoch
pub fn get_millis() -> u64 { pub fn get_millis() -> u64 {
SystemTime::now() SystemTime::now()
.duration_since(UNIX_EPOCH) .duration_since(UNIX_EPOCH)
.unwrap() .unwrap()
.as_millis() as u64 .as_millis() as u64
} }

8
src/overlays/wayvr.rs
View File

@@ -153,7 +153,13 @@ impl InteractionHandler for WayVRInteractionHandler {
} }
} }
fn on_scroll(&mut self, _app: &mut state::AppState, _hit: &input::PointerHit, delta_y: f32, delta_x: f32) { fn on_scroll(
&mut self,
_app: &mut state::AppState,
_hit: &input::PointerHit,
delta_y: f32,
delta_x: f32,
) {
let ctx = self.context.borrow(); let ctx = self.context.borrow();
ctx.wayvr ctx.wayvr
.borrow_mut() .borrow_mut()

10
src/shaders/mod.rs
View File

@@ -46,11 +46,11 @@ pub mod frag_color {
", ",
} }
} }
//layout (location = 1) in float corner_radius; //layout (location = 1) in float corner_radius;
//out_color = in_color; //out_color = in_color;
// Some equation that determines whether to keep the pixel // Some equation that determines whether to keep the pixel
// Use Lerp not if // Use Lerp not if
//out_color.a = 0; //out_color.a = 0;
pub mod frag_glyph { pub mod frag_glyph {
vulkano_shaders::shader! { vulkano_shaders::shader! {