mirror of
https://github.com/niri-wm/niri.git
synced 2026-06-23 02:05:33 +07:00
committed by
Ivan Molodetskikh
parent
1d3820a064
commit
34679c75a4
+1
-1
@@ -2973,7 +2973,7 @@ fn should_intercept_key(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
(_, false) => {
|
(_, false) => {
|
||||||
// By this point, we know that the key was supressed on press. Even if we're inhibiting
|
// By this point, we know that the key was suppressed on press. Even if we're inhibiting
|
||||||
// shortcuts, we should still suppress the release.
|
// shortcuts, we should still suppress the release.
|
||||||
// But we don't need to check for shortcuts inhibition here, because
|
// But we don't need to check for shortcuts inhibition here, because
|
||||||
// if it was inhibited on press (forwarded to the client), it wouldn't be suppressed,
|
// if it was inhibited on press (forwarded to the client), it wouldn't be suppressed,
|
||||||
|
|||||||
+2
-2
@@ -3077,7 +3077,7 @@ impl<W: LayoutElement> Layout<W> {
|
|||||||
target.previous_workspace_id = Some(target.workspaces[target.active_workspace_idx].id());
|
target.previous_workspace_id = Some(target.workspaces[target.active_workspace_idx].id());
|
||||||
|
|
||||||
if target.options.empty_workspace_above_first && target.workspaces.len() == 1 {
|
if target.options.empty_workspace_above_first && target.workspaces.len() == 1 {
|
||||||
// Insert a new empty workspace on top to prepare for insertion of new workspce.
|
// Insert a new empty workspace on top to prepare for insertion of new workspace.
|
||||||
target.add_workspace_top();
|
target.add_workspace_top();
|
||||||
}
|
}
|
||||||
// Insert the workspace after the currently active one. Unless the currently active one is
|
// Insert the workspace after the currently active one. Unless the currently active one is
|
||||||
@@ -3159,7 +3159,7 @@ impl<W: LayoutElement> Layout<W> {
|
|||||||
target.previous_workspace_id = Some(target.workspaces[target.active_workspace_idx].id());
|
target.previous_workspace_id = Some(target.workspaces[target.active_workspace_idx].id());
|
||||||
|
|
||||||
if target.options.empty_workspace_above_first && target.workspaces.len() == 1 {
|
if target.options.empty_workspace_above_first && target.workspaces.len() == 1 {
|
||||||
// Insert a new empty workspace on top to prepare for insertion of new workspce.
|
// Insert a new empty workspace on top to prepare for insertion of new workspace.
|
||||||
target.add_workspace_top();
|
target.add_workspace_top();
|
||||||
}
|
}
|
||||||
// Insert the workspace after the currently active one. Unless the currently active one is
|
// Insert the workspace after the currently active one. Unless the currently active one is
|
||||||
|
|||||||
+3
-3
@@ -62,7 +62,7 @@ pub struct Window {
|
|||||||
pub viewport: WpViewport,
|
pub viewport: WpViewport,
|
||||||
pub pending_configure: Configure,
|
pub pending_configure: Configure,
|
||||||
pub configures_received: Vec<(u32, Configure)>,
|
pub configures_received: Vec<(u32, Configure)>,
|
||||||
pub close_requsted: bool,
|
pub close_requested: bool,
|
||||||
|
|
||||||
pub configures_looked_at: usize,
|
pub configures_looked_at: usize,
|
||||||
}
|
}
|
||||||
@@ -194,7 +194,7 @@ impl State {
|
|||||||
viewport,
|
viewport,
|
||||||
pending_configure: Configure::default(),
|
pending_configure: Configure::default(),
|
||||||
configures_received: Vec::new(),
|
configures_received: Vec::new(),
|
||||||
close_requsted: false,
|
close_requested: false,
|
||||||
|
|
||||||
configures_looked_at: 0,
|
configures_looked_at: 0,
|
||||||
};
|
};
|
||||||
@@ -459,7 +459,7 @@ impl Dispatch<XdgToplevel, ()> for State {
|
|||||||
.collect();
|
.collect();
|
||||||
}
|
}
|
||||||
xdg_toplevel::Event::Close => {
|
xdg_toplevel::Event::Close => {
|
||||||
window.close_requsted = true;
|
window.close_requested = true;
|
||||||
}
|
}
|
||||||
xdg_toplevel::Event::ConfigureBounds { width, height } => {
|
xdg_toplevel::Event::ConfigureBounds { width, height } => {
|
||||||
window.pending_configure.bounds = Some((width, height));
|
window.pending_configure.bounds = Some((width, height));
|
||||||
|
|||||||
@@ -125,7 +125,7 @@ impl Fixture {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Rountrip twice in a row.
|
/// Roundtrip twice in a row.
|
||||||
///
|
///
|
||||||
/// For some reason, when running tests on many threads at once, a single roundtrip is
|
/// For some reason, when running tests on many threads at once, a single roundtrip is
|
||||||
/// sometimes not sufficient to get the configure events to the client.
|
/// sometimes not sufficient to get the configure events to the client.
|
||||||
|
|||||||
@@ -339,7 +339,7 @@ window-rule {{
|
|||||||
window.ack_last_and_commit();
|
window.ack_last_and_commit();
|
||||||
f.double_roundtrip(id);
|
f.double_roundtrip(id);
|
||||||
|
|
||||||
// Commit to the post-intial configures.
|
// Commit to the post-initial configures.
|
||||||
let window = f.client(id).window(&surface);
|
let window = f.client(id).window(&surface);
|
||||||
let new_serial = window.configures_received.last().unwrap().0;
|
let new_serial = window.configures_received.last().unwrap().0;
|
||||||
if new_serial != serial {
|
if new_serial != serial {
|
||||||
@@ -582,7 +582,7 @@ window-rule {
|
|||||||
window.ack_last_and_commit();
|
window.ack_last_and_commit();
|
||||||
f.double_roundtrip(id);
|
f.double_roundtrip(id);
|
||||||
|
|
||||||
// Commit to the post-intial configures.
|
// Commit to the post-initial configures.
|
||||||
let window = f.client(id).window(&surface);
|
let window = f.client(id).window(&surface);
|
||||||
let new_serial = window.configures_received.last().unwrap().0;
|
let new_serial = window.configures_received.last().unwrap().0;
|
||||||
if new_serial != serial {
|
if new_serial != serial {
|
||||||
|
|||||||
@@ -778,7 +778,7 @@ impl LayoutElement for Mapped {
|
|||||||
let _span =
|
let _span =
|
||||||
trace_span!("send_pending_configure", surface = ?toplevel.wl_surface().id()).entered();
|
trace_span!("send_pending_configure", surface = ?toplevel.wl_surface().id()).entered();
|
||||||
|
|
||||||
// Check for pending changes manually to account fo RequestSizeOnce::UseWindowSize.
|
// Check for pending changes manually to account for RequestSizeOnce::UseWindowSize.
|
||||||
let has_pending_changes = with_toplevel_role(self.toplevel(), |role| {
|
let has_pending_changes = with_toplevel_role(self.toplevel(), |role| {
|
||||||
if role.server_pending.is_none() {
|
if role.server_pending.is_none() {
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
Reference in New Issue
Block a user