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

autocommit 2022-04-11 13:11:56 CEST

Browse source
This commit is contained in:
Julian Orth 2022-04-11 13:11:56 +02:00
parent 6b3316e920
commit 86ca98c38a
11 changed files with 23 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/ifs/wl_output.rs
View file

@ -107,11 +107,11 @@ impl WlOutputGlobal {
binding.send_mode();
binding.send_scale();
binding.send_done();
binding.client.flush();
let xdg = binding.xdg_outputs.lock();
for xdg in xdg.values() {
xdg.send_updates();
}
binding.client.flush();
}
}
}

1
src/ifs/wl_seat/event_handling.rs
View file

@ -215,7 +215,6 @@ impl WlSeatGlobal {
fn key_event(&self, key: u32, state: KeyState) {
let (state, xkb_dir) = {
log::info!("{} {:?}", key, state);
let mut pk = self.pressed_keys.borrow_mut();
match state {
KeyState::Released => {

8
src/ifs/wl_surface/xdg_surface/xdg_toplevel.rs
View file

@ -282,11 +282,19 @@ impl XdgToplevel {
fn set_fullscreen(&self, parser: MsgParser<'_, '_>) -> Result<(), SetFullscreenError> {
let _req: SetFullscreen = self.xdg.surface.client.parse(self, parser)?;
self.states.borrow_mut().insert(STATE_FULLSCREEN);
let rect = self.xdg.absolute_desired_extents.get();
self.send_configure_checked(rect.width(), rect.height());
self.xdg.do_send_configure();
Ok(())
}
fn unset_fullscreen(&self, parser: MsgParser<'_, '_>) -> Result<(), UnsetFullscreenError> {
let _req: UnsetFullscreen = self.xdg.surface.client.parse(self, parser)?;
self.states.borrow_mut().remove(&STATE_FULLSCREEN);
let rect = self.xdg.absolute_desired_extents.get();
self.send_configure_checked(rect.width(), rect.height());
self.xdg.do_send_configure();
Ok(())
}

7
src/ifs/zxdg_output_v1.rs
View file

@ -11,7 +11,6 @@ use {
thiserror::Error,
};
#[allow(dead_code)]
pub const NAME_SINCE: u32 = 2;
#[allow(dead_code)]
pub const DESCRIPTION_SINCE: u32 = 2;
@ -46,7 +45,6 @@ impl ZxdgOutputV1 {
self.client.event(Done { self_id: self.id });
}
#[allow(dead_code)]
pub fn send_name(&self, name: &str) {
self.client.event(Name {
self_id: self.id,
@ -66,7 +64,10 @@ impl ZxdgOutputV1 {
let pos = self.output.global.position();
self.send_logical_position(pos.x1(), pos.y1());
self.send_logical_size(pos.width(), pos.height());
if self.version >= NO_DONE_SINCE || self.output.version < SEND_DONE_SINCE {
if self.version >= NAME_SINCE {
self.send_name(&self.output.global.connector.name);
}
if self.version >= NO_DONE_SINCE && self.output.version >= SEND_DONE_SINCE {
self.output.send_done();
} else {
self.send_done();