Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
maximbaz committed Jul 31, 2023
1 parent 7642de2 commit a7fab79
Show file tree
Hide file tree
Showing 3 changed files with 133 additions and 41 deletions.
154 changes: 122 additions & 32 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ authors = ["Maxim Baz", "Cyril Levis"]
edition = "2021"

[dependencies]
wayland-client = { version = "0.29" }
wayland-protocols = { version = "0.29", features = ["client", "unstable_protocols"] }
wayland-client = { version = "0.30" }
wayland-backend = { version = "0.2", features = ["dlopen"] }
wayland-protocols = { version = "0.30", features = ["client", "unstable"] }
wayland-protocols-wlr = { version = "0.1", features = ["client"] }
serde = { version = "1.0", features = ["derive"] }
serde_yaml = "0.9"
toml = { git = "https://github.com/HarveyHunt/toml", branch = "dotted-table-parsing-toml" }
Expand Down
14 changes: 7 additions & 7 deletions src/frame/capturer/wlroots.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ use crate::predictor::Controller;
use std::{cell::RefCell, rc::Rc, thread, time::Duration};
use wayland_client::{
protocol::{wl_output::WlOutput, wl_registry::WlRegistry},
Display, EventQueue, GlobalManager, Main,
Connection, EventQueue, GlobalManager, Main,
};
use wayland_protocols::wlr::unstable::export_dmabuf::v1::client::{
use wayland_protocols_wlr::export_dmabuf::v1::client::{
zwlr_export_dmabuf_frame_v1::{CancelReason, Event},
zwlr_export_dmabuf_manager_v1::ZwlrExportDmabufManagerV1,
};

use wayland_protocols::unstable::xdg_output::v1::client::zxdg_output_manager_v1::ZxdgOutputManagerV1;
use wayland_protocols::unstable::xdg_output::v1::client::zxdg_output_v1::Event::Description;
use wayland_protocols::xdg::xdg_output::zv1::client::zxdg_output_manager_v1::ZxdgOutputManagerV1;
use wayland_protocols::xdg::xdg_output::zv1::client::zxdg_output_v1::Event::Description;

const DELAY_SUCCESS: Duration = Duration::from_millis(100);
const DELAY_FAILURE: Duration = Duration::from_millis(1000);
Expand Down Expand Up @@ -67,9 +67,9 @@ impl super::Capturer for Capturer {

impl Default for Capturer {
fn default() -> Self {
let display = Display::connect_to_env().unwrap();
let mut event_queue = display.create_event_queue();
let attached_display = display.attach(event_queue.token());
let connection = Connection::connect_to_env().unwrap();
let mut event_queue = connection.new_event_queue();
let attached_display = connection.attach(event_queue.token());
let registry = attached_display.get_registry();
let globals = GlobalManager::new(&attached_display);

Expand Down

0 comments on commit a7fab79

Please sign in to comment.