andrei/niri
1
0
Fork 0
mirror of https://github.com/niri-wm/niri.git synced 2026-06-23 02:05:33 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

Make WorkspaceId inner field private

Browse Source
This commit is contained in:
Ivan Molodetskikh
2024-08-31 10:25:56 +03:00
parent 52265e2e19
commit 446a9f1e06
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ipc/server.rs
+5 -5
View File
@@ -378,7 +378,7 @@ fn make_ipc_window(mapped: &Mapped, workspace_id: Option<WorkspaceId>) -> niri_i
id: mapped.id().get(), id: mapped.id().get(),
title: role.title.clone(), title: role.title.clone(),
app_id: role.app_id.clone(), app_id: role.app_id.clone(),
workspace_id: workspace_id.map(|id| u64::from(id.0)), workspace_id: workspace_id.map(|id| id.get()),
is_focused: mapped.is_focused(), is_focused: mapped.is_focused(),
} }
}) })
@@ -424,13 +424,13 @@ impl State {
let mut events = Vec::new(); let mut events = Vec::new();
let layout = &self.niri.layout; let layout = &self.niri.layout;
let focused_ws_id = layout.active_workspace().map(|ws| u64::from(ws.id().0)); let focused_ws_id = layout.active_workspace().map(|ws| ws.id().get());
// Check for workspace changes. // Check for workspace changes.
let mut seen = HashSet::new(); let mut seen = HashSet::new();
let mut need_workspaces_changed = false; let mut need_workspaces_changed = false;
for (mon, ws_idx, ws) in layout.workspaces() { for (mon, ws_idx, ws) in layout.workspaces() {
let id = u64::from(ws.id().0); let id = ws.id().get();
seen.insert(id); seen.insert(id);
let Some(ipc_ws) = state.workspaces.get(&id) else { let Some(ipc_ws) = state.workspaces.get(&id) else {
@@ -482,7 +482,7 @@ impl State {
let workspaces = layout let workspaces = layout
.workspaces() .workspaces()
.map(|(mon, ws_idx, ws)| { .map(|(mon, ws_idx, ws)| {
let id = u64::from(ws.id().0); let id = ws.id().get();
Workspace { Workspace {
id, id,
idx: u8::try_from(ws_idx + 1).unwrap_or(u8::MAX), idx: u8::try_from(ws_idx + 1).unwrap_or(u8::MAX),
@@ -534,7 +534,7 @@ impl State {
return; return;
}; };
let workspace_id = Some(u64::from(ws_id.0)); let workspace_id = Some(ws_id.get());
let mut changed = ipc_win.workspace_id != workspace_id; let mut changed = ipc_win.workspace_id != workspace_id;
let wl_surface = mapped.toplevel().wl_surface(); let wl_surface = mapped.toplevel().wl_surface();
src/layout/workspace.rs
+5 -1
View File
@@ -123,12 +123,16 @@ pub struct OutputId(String);
static WORKSPACE_ID_COUNTER: IdCounter = IdCounter::new(); static WORKSPACE_ID_COUNTER: IdCounter = IdCounter::new();
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
pub struct WorkspaceId(pub u32); pub struct WorkspaceId(u32);
impl WorkspaceId { impl WorkspaceId {
fn next() -> WorkspaceId { fn next() -> WorkspaceId {
WorkspaceId(WORKSPACE_ID_COUNTER.next()) WorkspaceId(WORKSPACE_ID_COUNTER.next())
} }
pub fn get(self) -> u64 {
u64::from(self.0)
}
} }
niri_render_elements! { niri_render_elements! {