kossLAN/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

autocommit 2022-04-08 23:02:38 CEST

Browse source
This commit is contained in:
Julian Orth 2022-04-08 23:02:38 +02:00
parent 0bd9a70e69
commit 21e2216ce5
40 changed files with 587 additions and 255 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/render/egl/display.rs
View file

@ -1,6 +1,5 @@
use {
crate::{
video::{dma::DmaBuf, drm::Drm, gbm::GbmDevice, INVALID_MODIFIER},
format::{formats, Format},
render::{
egl::{
@ -27,6 +26,7 @@ use {
sys::{eglInitialize, EGL_PLATFORM_GBM_KHR},
RenderError,
},
video::{dma::DmaBuf, drm::Drm, gbm::GbmDevice, INVALID_MODIFIER},
},
ahash::AHashMap,
std::{ptr, rc::Rc},

8
src/render/renderer/context.rs
View file

@ -1,9 +1,5 @@
use {
crate::{
video::{
dma::DmaBuf,
drm::{Drm, NodeType},
},
format::{Format, XRGB8888},
render::{
egl::{context::EglContext, display::EglDisplay},
@ -13,6 +9,10 @@ use {
renderer::{framebuffer::Framebuffer, image::Image},
RenderError, Texture,
},
video::{
dma::DmaBuf,
drm::{Drm, NodeType},
},
},
ahash::AHashMap,
std::{

21
src/render/renderer/renderer.rs
View file

@ -25,7 +25,7 @@ use {
},
state::State,
theme::Color,
tree::{ContainerNode, FloatNode, Node, OutputNode, WorkspaceNode},
tree::{ContainerNode, FloatNode, OutputNode, WorkspaceNode},
utils::rc_eq::rc_eq,
},
std::{ops::Deref, rc::Rc},
@ -70,23 +70,14 @@ impl Renderer<'_> {
self.render_workspace(&ws, x, y + th);
}
for stacked in self.state.root.stacked.iter() {
if let Some(ws) = stacked.get_workspace() {
if ws.visible.get() {
let pos = stacked.absolute_position();
if pos.intersects(&opos) {
let (x, y) = opos.translate(pos.x1(), pos.y1());
stacked.render(self, x, y);
}
if stacked.visible() {
let pos = stacked.absolute_position();
if pos.intersects(&opos) {
let (x, y) = opos.translate(pos.x1(), pos.y1());
stacked.render(self, x, y);
}
}
}
for stacked in self.state.root.xstacked.iter() {
let pos = stacked.absolute_position();
if pos.intersects(&opos) {
let (x, y) = opos.translate(pos.x1(), pos.y1());
stacked.render(self, x, y);
}
}
render_layer!(output.layers[2]);
render_layer!(output.layers[3]);
}