Skip to content

Commit

Permalink
context_menu: Handle multiple gpus
Browse files Browse the repository at this point in the history
  • Loading branch information
@Drakulix
Drakulix committed Jan 31, 2024
1 parent f81e8a4 commit 9b010b2
Show file tree
Hide file tree
Showing 4 changed files with 105 additions and 20 deletions.
9 changes: 9 additions & 0 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ xdg = "2.4.0"
i18n-embed = { version = "0.13.4", features = ["fluent-system", "desktop-requester"] }
i18n-embed-fl = "0.6.4"
rust-embed = "6.3.0"
zbus = "3.13"
zbus = "3.14"
glob = "0.3.0"
freedesktop-desktop-entry = "0.5.0"
shlex = "1.1.0"
Expand All @@ -31,5 +31,7 @@ current_locale = "0.1.1"
url = "2.4"
nix = "0.26"
clap = { version = "4.4.8", features = ["derive"] }
switcheroo-control = { git = "https://github.com/pop-os/dbus-settings-bindings" }

[profile.release]
lto = "thin"
2 changes: 2 additions & 0 deletions i18n/en/cosmic_app_library.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ cancel = Cancel
search-placeholder = Type to search apps...
new-group-placeholder = Folder Name
run = Run
run-on = Run on {$gpu}
run-on-default = (Default)
remove = Remove
create-new = Create new folder
delete = Delete
Expand Down
110 changes: 91 additions & 19 deletions src/app.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ use log::error;
use once_cell::sync::Lazy;
use serde::{Deserialize, Serialize};
use std::sync::Arc;
use switcheroo_control::Gpu;

use crate::app_group::AppLibraryConfig;
use crate::fl;
Expand Down Expand Up @@ -128,6 +129,24 @@ struct CosmicAppLibrary {
scroll_offset: f32,
core: Core,
group_to_delete: Option<usize>,
gpus: Option<Vec<Gpu>>,
}

async fn try_get_gpus() -> Option<Vec<Gpu>> {
let connection = zbus::Connection::system().await.ok()?;
let proxy = switcheroo_control::SwitcherooControlProxy::new(&connection)
.await
.ok()?;

if !proxy.has_dual_gpu().await.ok()? {
return None;
}

let gpus = proxy.get_gpus().await.ok()?;
if gpus.is_empty() {
return None;
}
Some(gpus)
}

impl CosmicAppLibrary {
Expand All @@ -141,6 +160,9 @@ impl CosmicAppLibrary {
self.scroll_offset = 0.0;
self.cur_group = 0;
self.load_apps();
let fetch_gpus = Command::perform(try_get_gpus(), |gpus| {
cosmic::app::Message::App(Message::GpuUpdate(gpus))
});
return Command::batch(vec![
text_input::focus(SEARCH_ID.clone()),
get_layer_surface(SctkLayerSurfaceSettings {
Expand All @@ -157,6 +179,7 @@ impl CosmicAppLibrary {
},
..Default::default()
}),
fetch_gpus,
]);
}
}
Expand All @@ -167,8 +190,8 @@ enum Message {
InputChanged(String),
Layer(LayerEvent, SurfaceId),
Hide,
ActivateApp(usize),
ActivationToken(Option<String>, String),
ActivateApp(usize, Option<usize>),
ActivationToken(Option<String>, String, Option<usize>),
SelectGroup(usize),
Delete(usize),
ConfirmDelete,
Expand All @@ -194,6 +217,7 @@ enum Message {
LeaveDndOffer,
ScrollYOffset(f32),
Ignore,
GpuUpdate(Option<Vec<Gpu>>),
}

#[derive(Clone)]
Expand Down Expand Up @@ -322,24 +346,29 @@ impl cosmic::Application for CosmicAppLibrary {
Message::Hide => {
return self.hide();
}
Message::ActivateApp(i) => {
Message::ActivateApp(i, gpu_idx) => {
self.edit_name = None;
if let Some(de) = self.entry_path_input.get(i) {
let exec = de.exec.clone().unwrap();
return request_token(
Some(String::from(Self::APP_ID)),
Some(WINDOW_ID.clone()),
move |token| {
cosmic::app::Message::App(Message::ActivationToken(token, exec))
cosmic::app::Message::App(Message::ActivationToken(
token, exec, gpu_idx,
))
},
);
}
}
Message::ActivationToken(token, exec) => {
Message::ActivationToken(token, exec, gpu_idx) => {
let mut env_vars = Vec::new();
if let Some(token) = token {
env_vars.push(("XDG_ACTIVATION_TOKEN", token.clone()));
env_vars.push(("DESKTOP_STARTUP_ID", token));
env_vars.push(("XDG_ACTIVATION_TOKEN".to_string(), token.clone()));
env_vars.push(("DESKTOP_STARTUP_ID".to_string(), token));
}
if let (Some(gpus), Some(idx)) = (self.gpus.as_ref(), gpu_idx) {
env_vars.extend(gpus[idx].environment.clone().into_iter());
}
tokio::task::spawn_blocking(move || {
cosmic::desktop::spawn_desktop_exec(exec, env_vars)
Expand Down Expand Up @@ -560,6 +589,9 @@ impl cosmic::Application for CosmicAppLibrary {
return self.filter_apps();
}
}
Message::GpuUpdate(gpus) => {
self.gpus = gpus;
}
}
Command::none()
}
Expand Down Expand Up @@ -604,26 +636,59 @@ impl cosmic::Application for CosmicAppLibrary {
.into();
};

let mut list_column =
column![menu_button(text(RUN.clone())).on_press(Message::ActivateApp(*i))]
.padding([8, 0]);
let mut list_column = Vec::new();

if let Some(gpus) = self.gpus.as_ref() {
for (j, gpu) in gpus.iter().enumerate() {
let default_idx = if menu.prefers_dgpu {
gpus.iter().position(|gpu| !gpu.default).unwrap_or(0)
} else {
gpus.iter().position(|gpu| gpu.default).unwrap_or(0)
};
list_column.push(
menu_button(text(format!(
"{} {}",
fl!("run-on", gpu = gpu.name.clone()),
if j == default_idx {
fl!("run-on-default")
} else {
String::new()
}
)))
.on_press(Message::ActivateApp(*i, Some(j)))
.into(),
)
}
} else {
list_column.push(
menu_button(text(RUN.clone()))
.on_press(Message::ActivateApp(*i, None))
.into(),
);
}

if menu.desktop_actions.len() > 0 {
list_column = list_column.push(menu_divider(spacing));
list_column.push(menu_divider(spacing).into());
for action in menu.desktop_actions.iter() {
list_column = list_column.push(menu_button(text(&action.name)).on_press(
Message::SelectAction(MenuAction::DesktopAction(action.exec.clone())),
));
list_column.push(
menu_button(text(&action.name))
.on_press(Message::SelectAction(
MenuAction::DesktopAction(action.exec.clone()).into(),
))
.into(),
);
}
list_column = list_column.push(menu_divider(spacing));
list_column.push(menu_divider(spacing).into());
}

list_column = list_column.push(
list_column.push(
menu_button(text(REMOVE.clone()))
.on_press(Message::SelectAction(MenuAction::Remove)),
.on_press(Message::SelectAction(MenuAction::Remove))
.into(),
);

return container(list_column)
return container(scrollable(Column::with_children(list_column)))
.padding([8, 0])
.style(theme::Container::Custom(Box::new(|theme| {
container::Appearance {
text_color: Some(theme.cosmic().on_bg_color().into()),
Expand Down Expand Up @@ -851,8 +916,15 @@ impl cosmic::Application for CosmicAppLibrary {
spacing,
);
if self.menu.is_none() {
let gpu_idx = self.gpus.as_ref().map(|gpus| {
if entry.prefers_dgpu {
gpus.iter().position(|gpu| !gpu.default).unwrap_or(0)
} else {
gpus.iter().position(|gpu| gpu.default).unwrap_or(0)
}
});
b = b
.on_pressed(Message::ActivateApp(i))
.on_pressed(Message::ActivateApp(i, gpu_idx))
.on_cancel(Message::CancelDrag)
.on_finish(Message::FinishDrag)
.on_create_dnd_source(Message::StartDrag(i))
Expand Down

0 comments on commit 9b010b2

Please sign in to comment.