leyoda/cosmic-comp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tiling: Don't share workspaces across outputs

Browse source
This commit is contained in:
Victoria Brekenfeld 2022-03-30 16:06:35 +02:00
parent 45a478eff0
commit 3ebeab17b7
3 changed files with 41 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/debug.rs
View file

@ -146,7 +146,11 @@ pub fn debug_ui(
.speed(1.0), .speed(1.0),
); );
if active != active_val as usize { if active != active_val as usize {
state.shell.activate(&output, active_val as usize); state.shell.activate(
&state.seats[0],
&output,
active_val as usize,
);
} }
}); });
} }
@ -162,7 +166,11 @@ pub fn debug_ui(
); );
if active != active_val as usize { if active != active_val as usize {
let output = state.shell.outputs().next().cloned().unwrap(); let output = state.shell.outputs().next().cloned().unwrap();
state.shell.activate(&output, active_val as usize); state.shell.activate(
&state.seats[0],
&output,
active_val as usize,
);
} }
}); });
} }

7
src/input/mod.rs
View file

@ -271,8 +271,11 @@ impl Common {
0 => 9, 0 => 9,
x => x - 1, x => x - 1,
}; };
self.shell self.shell.activate(
.activate(&current_output, workspace as usize); seat,
&current_output,
workspace as usize,
);
userdata userdata
.get::<SupressedKeys>() .get::<SupressedKeys>()
.unwrap() .unwrap()

29
src/shell/mod.rs
View file

@ -185,17 +185,40 @@ impl Shell {
Rectangle::from_loc_and_size(pos, self.output_size(output)) Rectangle::from_loc_and_size(pos, self.output_size(output))
} }
pub fn activate(&mut self, output: &Output, idx: usize) { pub fn activate(&mut self, seat: &Seat, output: &Output, idx: usize) {
match self.mode { match self.mode {
Mode::OutputBound => { Mode::OutputBound => {
// TODO check for other outputs already occupying that space for output in &self.outputs {
if output
.user_data()
.get::<ActiveWorkspace>()
.and_then(|i| i.get().map(|i| i == idx))
.unwrap_or(false)
{
let geometry = self.output_geometry(output);
if let Some(ptr) = seat.get_pointer() {
ptr.motion(
Point::<i32, Logical>::from((
geometry.loc.x + (geometry.size.w / 2),
geometry.loc.y + (geometry.size.h / 2),
))
.to_f64(),
None,
SERIAL_COUNTER.next_serial(),
0,
);
return;
}
}
}
if let Some(active) = output.user_data().get::<ActiveWorkspace>() { if let Some(active) = output.user_data().get::<ActiveWorkspace>() {
if let Some(old_idx) = active.set(idx) { if let Some(old_idx) = active.set(idx) {
self.spaces[old_idx].space.unmap_output(output); self.spaces[old_idx].space.unmap_output(output);
} }
self.spaces[idx].space.map_output(output, 1.0, (0, 0)); self.spaces[idx].space.map_output(output, 1.0, (0, 0));
self.spaces[idx].refresh();
} }
// TODO translate windows from previous space size into new size
} }
Mode::Global { ref mut active } => { Mode::Global { ref mut active } => {
let old = *active; let old = *active;