Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 030f8c62a6 | |||
| 3c34b4ec25 | |||
| 63d6c656bd |
@@ -43,8 +43,8 @@ cd pkg && makepkg -sf && sudo pacman -U moongreet-git-<version>-x86_64.pkg.tar.z
|
|||||||
- `power.rs` — Reboot/Shutdown via systemctl (`--no-ask-password`)
|
- `power.rs` — Reboot/Shutdown via systemctl (`--no-ask-password`)
|
||||||
- `i18n.rs` — Locale-Erkennung (LANG / /etc/locale.conf) und String-Tabellen (DE/EN), alle UI- und Login-Fehlermeldungen
|
- `i18n.rs` — Locale-Erkennung (LANG / /etc/locale.conf) und String-Tabellen (DE/EN), alle UI- und Login-Fehlermeldungen
|
||||||
- `fingerprint.rs` — fprintd D-Bus Probe (gio::DBusProxy) — Geräteerkennung und Enrollment-Check für UI-Feedback
|
- `fingerprint.rs` — fprintd D-Bus Probe (gio::DBusProxy) — Geräteerkennung und Enrollment-Check für UI-Feedback
|
||||||
- `config.rs` — TOML-Config ([appearance] background, gtk-theme, fingerprint-enabled) + Wallpaper-Fallback + Blur-Validierung (finite, clamp 0–200)
|
- `config.rs` — TOML-Config ([appearance] background, gtk-theme, cursor-theme, cursor-size, fingerprint-enabled) + Wallpaper-Fallback + Blur-Validierung (finite, clamp 0–200) + Cursor-Size-Validierung (range 1–256)
|
||||||
- `greeter.rs` — GTK4 UI (Overlay-Layout), Login-Flow via greetd IPC (Multi-Stage-Auth für fprintd), Faillock-Warnung, Avatar-Cache, Last-User/Last-Session Persistence (0o700 Dirs, 0o600 Files)
|
- `greeter.rs` — GTK4 UI (Overlay-Layout), Login-Flow via greetd IPC (Multi-Stage-Auth für fprintd), Faillock-Warnung, Power-Confirm (Inline-Bestätigung vor Reboot/Shutdown, wie moonlock), Avatar-Cache, Last-User/Last-Session Persistence (0o700 Dirs, 0o600 Files)
|
||||||
- `main.rs` — Entry Point, GTK App, Layer Shell Setup, ein Greeter-Fenster auf dem fokussierten Output (kein `set_monitor`), `KeyboardMode::Exclusive`, systemd-journal-logger
|
- `main.rs` — Entry Point, GTK App, Layer Shell Setup, ein Greeter-Fenster auf dem fokussierten Output (kein `set_monitor`), `KeyboardMode::Exclusive`, systemd-journal-logger
|
||||||
- `resources/style.css` — Catppuccin-inspiriertes Theme
|
- `resources/style.css` — Catppuccin-inspiriertes Theme
|
||||||
|
|
||||||
@@ -60,6 +60,7 @@ cd pkg && makepkg -sf && sudo pacman -U moongreet-git-<version>-x86_64.pkg.tar.z
|
|||||||
- **Symmetrie mit moonlock/moonset**: Gleiche Patterns (i18n, config, users, power, GResource, GPU-Blur)
|
- **Symmetrie mit moonlock/moonset**: Gleiche Patterns (i18n, config, users, power, GResource, GPU-Blur)
|
||||||
- **Session-Validierung**: Relative Pfade erlaubt (greetd löst PATH auf), nur `..`/Null-Bytes werden abgelehnt
|
- **Session-Validierung**: Relative Pfade erlaubt (greetd löst PATH auf), nur `..`/Null-Bytes werden abgelehnt
|
||||||
- **GTK-Theme-Validierung**: Nur alphanumerisch + `_-+.` erlaubt, verhindert Path-Traversal über Config
|
- **GTK-Theme-Validierung**: Nur alphanumerisch + `_-+.` erlaubt, verhindert Path-Traversal über Config
|
||||||
|
- **Cursor-Theme via GtkSettings**: GTK4 unter greetd liest `XCURSOR_THEME` env nicht zuverlässig — Cursor wird via `gtk::Settings::set_gtk_cursor_theme_name()` gesetzt, analog zu `gtk-theme`. Gleiche Validierung (`is_valid_gtk_theme`) gegen Path-Traversal.
|
||||||
- **Journal-Logging**: `systemd-journal-logger` statt File-Logging — `journalctl -t moongreet`, Debug-Level per `MOONGREET_DEBUG` Env-Var
|
- **Journal-Logging**: `systemd-journal-logger` statt File-Logging — `journalctl -t moongreet`, Debug-Level per `MOONGREET_DEBUG` Env-Var
|
||||||
- **File Permissions**: Cache-Verzeichnisse 0o700 via `DirBuilder::mode()`, Cache-Dateien 0o600
|
- **File Permissions**: Cache-Verzeichnisse 0o700 via `DirBuilder::mode()`, Cache-Dateien 0o600
|
||||||
- **Testbare Persistence**: `save_*_to`/`load_*_from` Varianten mit konfigurierbarem Pfad für Unit-Tests
|
- **Testbare Persistence**: `save_*_to`/`load_*_from` Varianten mit konfigurierbarem Pfad für Unit-Tests
|
||||||
|
|||||||
Generated
+1
-1
@@ -575,7 +575,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "moongreet"
|
name = "moongreet"
|
||||||
version = "0.8.7"
|
version = "0.10.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"gdk-pixbuf",
|
"gdk-pixbuf",
|
||||||
"gdk4",
|
"gdk4",
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "moongreet"
|
name = "moongreet"
|
||||||
version = "0.8.7"
|
version = "0.10.1"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
description = "A greetd greeter for Wayland with GTK4 and Layer Shell"
|
description = "A greetd greeter for Wayland with GTK4 and Layer Shell"
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
|
|||||||
@@ -1,5 +1,26 @@
|
|||||||
# Decisions
|
# Decisions
|
||||||
|
|
||||||
|
## 2026-06-02 – Align power-confirm to moonset's ActionDef pattern (v0.10.1)
|
||||||
|
|
||||||
|
- **Who**: ClaudeCode, Dom
|
||||||
|
- **Why**: Code review of v0.10.0 flagged the power-confirm code (ported verbatim from moonlock) as lower-altitude than moonset's: two near-identical reboot/shutdown handlers and a `show_power_confirm` taking loose `message`/`action_fn`/`error_message` params that can drift apart. moonset already solved this with an `ActionDef` table + button factory.
|
||||||
|
- **Tradeoffs**: A `PowerAction` struct + `power_actions()` table + `create_power_button` factory is slightly more machinery for just two actions, but couples icon/prompt/error/action into one value (mismatch becomes unrepresentable) and makes a third action a one-line table entry. Kept in lockstep with moonlock (same change landed there). Did NOT touch `confirm_box: Rc<RefCell<Option<gtk::Box>>>` — moonset uses the same, it is the shared convention.
|
||||||
|
- **How**: Replaced the two hand-wired handlers with a loop over `power_actions()`; `show_power_confirm`/`execute_power_action` now take `PowerAction` (Copy) instead of three loose strings. Re-introduced the in-flight re-trigger guard via `power_box.set_sensitive(false)` (re-enabled on failure) — this restores the protection that v0.10.0 dropped, superseding that entry's "no guard" tradeoff.
|
||||||
|
|
||||||
|
## 2026-06-02 – Inline power confirmation before reboot/shutdown (v0.10.0)
|
||||||
|
|
||||||
|
- **Who**: ClaudeCode, Dom
|
||||||
|
- **Why**: Reboot/Shutdown buttons triggered the action immediately on click — one misclick rebooted the machine from the greeter. moonlock already guards power actions with an inline confirm; moongreet should match.
|
||||||
|
- **Tradeoffs**: Ported moonlock's `show_power_confirm`/`dismiss_power_confirm` verbatim instead of inventing a new widget — keeps the two codebases symmetric (i18n, CSS classes, focus-on-Cancel behaviour all identical). Dropped the `button` parameter from `execute_power_action`: the old per-button `set_sensitive(false)` double-click guard is now redundant because the confirm box itself blocks accidental re-trigger, and after "Yes" there is no button left to re-enable.
|
||||||
|
- **How**: Inline confirm box appended to the central `login_box` (mirrors moonlock placement). Reboot/Shutdown handlers call `show_power_confirm`; "Yes" dismisses and runs the action, "Cancel" (focused by default) just dismisses. New i18n strings (`reboot_confirm`, `shutdown_confirm`, `confirm_yes`, `confirm_no`) and `.confirm-*` CSS classes ported from moonlock; `.confirm-no` background adapted to moongreet's `alpha(@theme_fg_color, …)` idiom.
|
||||||
|
|
||||||
|
## 2026-06-02 – Cursor theme via GtkSettings, salvaged from unpushed work (v0.9.0)
|
||||||
|
|
||||||
|
- **Who**: ClaudeCode, Dom
|
||||||
|
- **Why**: On some machines the greeter showed the wrong (GTK-default) cursor. GTK4 under greetd does not honour `XCURSOR_THEME` reliably — niri renders its own pointer from the kdl `cursor` block, but GTK widgets (button hover, text-input I-beam) read `gtk-cursor-theme-name` on `GtkSettings`, which without a session settings.ini stays at the GTK default. This fix was written and tagged v0.9.0 on 2026-04-24 but never pushed — it sat in a local-only branch while the bug kept shipping. Salvaged onto main now (cherry-picked from commit 29ce185).
|
||||||
|
- **Tradeoffs**: Adds two `[appearance]` config fields (`cursor-theme`, `cursor-size`), symmetric with the existing `gtk-theme` field. Alternative — a system-wide `/etc/gtk-4.0/settings.ini` with `gtk-cursor-theme-name=` — would couple moongreet to host GTK config and affect every GTK4 app; rejected for the same reason as `gtk-theme`.
|
||||||
|
- **How**: `config.rs` gains `cursor_theme: Option<String>` and `cursor_size: Option<i32>` (range-validated 1–256). `greeter::create_greeter_window` applies them via `gtk::Settings::set_gtk_cursor_theme_name()` / `set_gtk_cursor_theme_size()` after the existing gtk-theme handling, reusing `is_valid_gtk_theme()`. Deployed `moongreet.toml` gains `cursor-theme = "Sweet-cursors"` + `cursor-size = 24`. The orphaned April branch (v0.9.0/v0.10.0) is otherwise discarded; its keyboard refactor is superseded by the v0.8.7 single-window fix.
|
||||||
|
|
||||||
## 2026-06-02 – Power buttons fixed (loginctl→systemctl) + single greeter window (v0.8.7)
|
## 2026-06-02 – Power buttons fixed (loginctl→systemctl) + single greeter window (v0.8.7)
|
||||||
|
|
||||||
- **Who**: ClaudeCode, Dom
|
- **Who**: ClaudeCode, Dom
|
||||||
|
|||||||
@@ -8,3 +8,8 @@ background = "/usr/share/backgrounds/wallpaper.jpg"
|
|||||||
# GTK theme name — must match a directory in /usr/share/themes/
|
# GTK theme name — must match a directory in /usr/share/themes/
|
||||||
# Required because GTK4 under greetd does not reliably read settings.ini
|
# Required because GTK4 under greetd does not reliably read settings.ini
|
||||||
gtk-theme = "Colloid-Grey-Dark-Catppuccin"
|
gtk-theme = "Colloid-Grey-Dark-Catppuccin"
|
||||||
|
|
||||||
|
# Cursor theme name — must match a directory in /usr/share/icons/
|
||||||
|
# GTK4 under greetd does not honour XCURSOR_THEME, so set it here.
|
||||||
|
cursor-theme = "Sweet-cursors"
|
||||||
|
cursor-size = 24
|
||||||
|
|||||||
@@ -82,6 +82,38 @@ window.wallpaper {
|
|||||||
background-color: alpha(@theme_fg_color, 0.2);
|
background-color: alpha(@theme_fg_color, 0.2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Power confirmation prompt */
|
||||||
|
.confirm-label {
|
||||||
|
font-size: 16px;
|
||||||
|
color: @theme_fg_color;
|
||||||
|
margin-bottom: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.confirm-yes {
|
||||||
|
padding: 8px 24px;
|
||||||
|
border-radius: 8px;
|
||||||
|
background-color: @error_color;
|
||||||
|
color: @theme_bg_color;
|
||||||
|
border: none;
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
|
||||||
|
.confirm-yes:hover {
|
||||||
|
background-color: lighter(@error_color);
|
||||||
|
}
|
||||||
|
|
||||||
|
.confirm-no {
|
||||||
|
padding: 8px 24px;
|
||||||
|
border-radius: 8px;
|
||||||
|
background-color: alpha(@theme_fg_color, 0.15);
|
||||||
|
color: @theme_fg_color;
|
||||||
|
border: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.confirm-no:hover {
|
||||||
|
background-color: alpha(@theme_fg_color, 0.25);
|
||||||
|
}
|
||||||
|
|
||||||
/* Power buttons on the bottom right */
|
/* Power buttons on the bottom right */
|
||||||
.power-button {
|
.power-button {
|
||||||
min-width: 48px;
|
min-width: 48px;
|
||||||
|
|||||||
+61
-1
@@ -25,6 +25,10 @@ struct Appearance {
|
|||||||
background_blur: Option<f32>,
|
background_blur: Option<f32>,
|
||||||
#[serde(rename = "gtk-theme")]
|
#[serde(rename = "gtk-theme")]
|
||||||
gtk_theme: Option<String>,
|
gtk_theme: Option<String>,
|
||||||
|
#[serde(rename = "cursor-theme")]
|
||||||
|
cursor_theme: Option<String>,
|
||||||
|
#[serde(rename = "cursor-size")]
|
||||||
|
cursor_size: Option<i32>,
|
||||||
#[serde(rename = "fingerprint-enabled")]
|
#[serde(rename = "fingerprint-enabled")]
|
||||||
fingerprint_enabled: Option<bool>,
|
fingerprint_enabled: Option<bool>,
|
||||||
}
|
}
|
||||||
@@ -35,6 +39,8 @@ pub struct Config {
|
|||||||
pub background_path: Option<String>,
|
pub background_path: Option<String>,
|
||||||
pub background_blur: Option<f32>,
|
pub background_blur: Option<f32>,
|
||||||
pub gtk_theme: Option<String>,
|
pub gtk_theme: Option<String>,
|
||||||
|
pub cursor_theme: Option<String>,
|
||||||
|
pub cursor_size: Option<i32>,
|
||||||
pub fingerprint_enabled: bool,
|
pub fingerprint_enabled: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -44,6 +50,8 @@ impl Default for Config {
|
|||||||
background_path: None,
|
background_path: None,
|
||||||
background_blur: None,
|
background_blur: None,
|
||||||
gtk_theme: None,
|
gtk_theme: None,
|
||||||
|
cursor_theme: None,
|
||||||
|
cursor_size: None,
|
||||||
fingerprint_enabled: true,
|
fingerprint_enabled: true,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -88,6 +96,16 @@ pub fn load_config(config_paths: Option<&[PathBuf]>) -> Config {
|
|||||||
if appearance.gtk_theme.is_some() {
|
if appearance.gtk_theme.is_some() {
|
||||||
merged.gtk_theme = appearance.gtk_theme;
|
merged.gtk_theme = appearance.gtk_theme;
|
||||||
}
|
}
|
||||||
|
if appearance.cursor_theme.is_some() {
|
||||||
|
merged.cursor_theme = appearance.cursor_theme;
|
||||||
|
}
|
||||||
|
if let Some(size) = appearance.cursor_size {
|
||||||
|
if (1..=256).contains(&size) {
|
||||||
|
merged.cursor_size = Some(size);
|
||||||
|
} else {
|
||||||
|
log::warn!("Ignoring cursor-size out of range (1–256): {size}");
|
||||||
|
}
|
||||||
|
}
|
||||||
if let Some(fp) = appearance.fingerprint_enabled {
|
if let Some(fp) = appearance.fingerprint_enabled {
|
||||||
merged.fingerprint_enabled = fp;
|
merged.fingerprint_enabled = fp;
|
||||||
}
|
}
|
||||||
@@ -104,7 +122,15 @@ pub fn load_config(config_paths: Option<&[PathBuf]>) -> Config {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
log::debug!("Config result: background={:?}, blur={:?}, gtk_theme={:?}, fingerprint={}", merged.background_path, merged.background_blur, merged.gtk_theme, merged.fingerprint_enabled);
|
log::debug!(
|
||||||
|
"Config result: background={:?}, blur={:?}, gtk_theme={:?}, cursor_theme={:?}, cursor_size={:?}, fingerprint={}",
|
||||||
|
merged.background_path,
|
||||||
|
merged.background_blur,
|
||||||
|
merged.gtk_theme,
|
||||||
|
merged.cursor_theme,
|
||||||
|
merged.cursor_size,
|
||||||
|
merged.fingerprint_enabled
|
||||||
|
);
|
||||||
merged
|
merged
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -331,6 +357,40 @@ mod tests {
|
|||||||
assert!(config.background_blur.is_none());
|
assert!(config.background_blur.is_none());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// -- Cursor theme tests --
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn load_config_cursor_theme_and_size() {
|
||||||
|
let dir = tempfile::tempdir().unwrap();
|
||||||
|
let conf = dir.path().join("moongreet.toml");
|
||||||
|
fs::write(
|
||||||
|
&conf,
|
||||||
|
"[appearance]\ncursor-theme = \"Sweet-cursors\"\ncursor-size = 32\n",
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
let config = load_config(Some(&[conf]));
|
||||||
|
assert_eq!(config.cursor_theme.as_deref(), Some("Sweet-cursors"));
|
||||||
|
assert_eq!(config.cursor_size, Some(32));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn load_config_cursor_size_out_of_range_rejected() {
|
||||||
|
let dir = tempfile::tempdir().unwrap();
|
||||||
|
let conf = dir.path().join("moongreet.toml");
|
||||||
|
fs::write(&conf, "[appearance]\ncursor-size = 9999\n").unwrap();
|
||||||
|
let config = load_config(Some(&[conf]));
|
||||||
|
assert!(config.cursor_size.is_none());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn load_config_cursor_size_zero_rejected() {
|
||||||
|
let dir = tempfile::tempdir().unwrap();
|
||||||
|
let conf = dir.path().join("moongreet.toml");
|
||||||
|
fs::write(&conf, "[appearance]\ncursor-size = 0\n").unwrap();
|
||||||
|
let config = load_config(Some(&[conf]));
|
||||||
|
assert!(config.cursor_size.is_none());
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn load_config_blur_inf_rejected() {
|
fn load_config_blur_inf_rejected() {
|
||||||
let dir = tempfile::tempdir().unwrap();
|
let dir = tempfile::tempdir().unwrap();
|
||||||
|
|||||||
+191
-36
@@ -262,6 +262,23 @@ pub fn create_greeter_window(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Apply cursor theme from config — GTK4 under greetd does not read XCURSOR_THEME
|
||||||
|
// reliably, so set the gtk-cursor-theme-name property directly.
|
||||||
|
if let Some(ref cursor) = config.cursor_theme {
|
||||||
|
if is_valid_gtk_theme(cursor) {
|
||||||
|
if let Some(settings) = gtk::Settings::default() {
|
||||||
|
settings.set_gtk_cursor_theme_name(Some(cursor));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
log::warn!("Ignoring invalid cursor theme name: {cursor}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if let Some(size) = config.cursor_size {
|
||||||
|
if let Some(settings) = gtk::Settings::default() {
|
||||||
|
settings.set_gtk_cursor_theme_size(size);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
let strings = load_strings(None);
|
let strings = load_strings(None);
|
||||||
let fingerprint_enabled = config.fingerprint_enabled;
|
let fingerprint_enabled = config.fingerprint_enabled;
|
||||||
let all_users = users::get_users(None);
|
let all_users = users::get_users(None);
|
||||||
@@ -356,6 +373,12 @@ pub fn create_greeter_window(
|
|||||||
error_label.set_visible(false);
|
error_label.set_visible(false);
|
||||||
login_box.append(&error_label);
|
login_box.append(&error_label);
|
||||||
|
|
||||||
|
// Confirm box area (for power confirm)
|
||||||
|
let confirm_area = gtk::Box::new(gtk::Orientation::Vertical, 0);
|
||||||
|
confirm_area.set_halign(gtk::Align::Center);
|
||||||
|
login_box.append(&confirm_area);
|
||||||
|
let confirm_box: Rc<RefCell<Option<gtk::Box>>> = Rc::new(RefCell::new(None));
|
||||||
|
|
||||||
// Fingerprint label (hidden until probe confirms availability)
|
// Fingerprint label (hidden until probe confirms availability)
|
||||||
let fp_label = gtk::Label::new(None);
|
let fp_label = gtk::Label::new(None);
|
||||||
fp_label.add_css_class("fingerprint-label");
|
fp_label.add_css_class("fingerprint-label");
|
||||||
@@ -411,7 +434,12 @@ pub fn create_greeter_window(
|
|||||||
state,
|
state,
|
||||||
#[strong]
|
#[strong]
|
||||||
sessions_rc,
|
sessions_rc,
|
||||||
|
#[weak]
|
||||||
|
confirm_area,
|
||||||
|
#[strong]
|
||||||
|
confirm_box,
|
||||||
move |_| {
|
move |_| {
|
||||||
|
dismiss_power_confirm(&confirm_area, &confirm_box);
|
||||||
cancel_pending_session(&state);
|
cancel_pending_session(&state);
|
||||||
switch_to_user(
|
switch_to_user(
|
||||||
&user_clone,
|
&user_clone,
|
||||||
@@ -444,33 +472,17 @@ pub fn create_greeter_window(
|
|||||||
power_box.set_halign(gtk::Align::End);
|
power_box.set_halign(gtk::Align::End);
|
||||||
power_box.set_valign(gtk::Align::End);
|
power_box.set_valign(gtk::Align::End);
|
||||||
|
|
||||||
let reboot_btn = gtk::Button::new();
|
for action in power_actions() {
|
||||||
reboot_btn.set_icon_name("system-reboot-symbolic");
|
let button = create_power_button(
|
||||||
reboot_btn.add_css_class("power-button");
|
action,
|
||||||
reboot_btn.set_tooltip_text(Some(strings.reboot_tooltip));
|
strings,
|
||||||
reboot_btn.connect_clicked(clone!(
|
&power_box,
|
||||||
#[weak]
|
&confirm_area,
|
||||||
error_label,
|
&confirm_box,
|
||||||
move |btn| {
|
&error_label,
|
||||||
btn.set_sensitive(false);
|
);
|
||||||
execute_power_action(power::reboot, strings.reboot_failed, &error_label, btn);
|
power_box.append(&button);
|
||||||
}
|
}
|
||||||
));
|
|
||||||
power_box.append(&reboot_btn);
|
|
||||||
|
|
||||||
let shutdown_btn = gtk::Button::new();
|
|
||||||
shutdown_btn.set_icon_name("system-shutdown-symbolic");
|
|
||||||
shutdown_btn.add_css_class("power-button");
|
|
||||||
shutdown_btn.set_tooltip_text(Some(strings.shutdown_tooltip));
|
|
||||||
shutdown_btn.connect_clicked(clone!(
|
|
||||||
#[weak]
|
|
||||||
error_label,
|
|
||||||
move |btn| {
|
|
||||||
btn.set_sensitive(false);
|
|
||||||
execute_power_action(power::shutdown, strings.shutdown_failed, &error_label, btn);
|
|
||||||
}
|
|
||||||
));
|
|
||||||
power_box.append(&shutdown_btn);
|
|
||||||
|
|
||||||
bottom_bar.append(&power_box);
|
bottom_bar.append(&power_box);
|
||||||
overlay.add_overlay(&bottom_bar);
|
overlay.add_overlay(&bottom_bar);
|
||||||
@@ -522,17 +534,22 @@ pub fn create_greeter_window(
|
|||||||
}
|
}
|
||||||
));
|
));
|
||||||
|
|
||||||
// Keyboard handling — Escape clears password and error
|
// Keyboard handling — Escape clears password, error, and any open power confirm
|
||||||
let key_controller = gtk::EventControllerKey::new();
|
let key_controller = gtk::EventControllerKey::new();
|
||||||
key_controller.connect_key_pressed(clone!(
|
key_controller.connect_key_pressed(clone!(
|
||||||
#[weak]
|
#[weak]
|
||||||
password_entry,
|
password_entry,
|
||||||
#[weak]
|
#[weak]
|
||||||
error_label,
|
error_label,
|
||||||
|
#[weak]
|
||||||
|
confirm_area,
|
||||||
|
#[strong]
|
||||||
|
confirm_box,
|
||||||
#[upgrade_or]
|
#[upgrade_or]
|
||||||
glib::Propagation::Proceed,
|
glib::Propagation::Proceed,
|
||||||
move |_, keyval, _, _| {
|
move |_, keyval, _, _| {
|
||||||
if keyval == gdk::Key::Escape {
|
if keyval == gdk::Key::Escape {
|
||||||
|
dismiss_power_confirm(&confirm_area, &confirm_box);
|
||||||
password_entry.set_text("");
|
password_entry.set_text("");
|
||||||
error_label.set_visible(false);
|
error_label.set_visible(false);
|
||||||
glib::Propagation::Stop
|
glib::Propagation::Stop
|
||||||
@@ -1297,18 +1314,156 @@ fn login_worker(
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Execute a power action in a background thread.
|
/// Definition for a single power-action button (reboot, shutdown).
|
||||||
fn execute_power_action(
|
/// Couples icon, prompt, error text and action so a button cannot be wired
|
||||||
|
/// with a mismatched prompt/action pair. Mirrors moonset's `ActionDef`.
|
||||||
|
#[derive(Clone, Copy)]
|
||||||
|
struct PowerAction {
|
||||||
|
icon_name: &'static str,
|
||||||
|
tooltip_attr: fn(&Strings) -> &'static str,
|
||||||
|
confirm_attr: fn(&Strings) -> &'static str,
|
||||||
|
error_attr: fn(&Strings) -> &'static str,
|
||||||
action_fn: fn() -> Result<(), PowerError>,
|
action_fn: fn() -> Result<(), PowerError>,
|
||||||
error_message: &'static str,
|
}
|
||||||
|
|
||||||
|
/// The power actions offered by the greeter.
|
||||||
|
fn power_actions() -> [PowerAction; 2] {
|
||||||
|
[
|
||||||
|
PowerAction {
|
||||||
|
icon_name: "system-reboot-symbolic",
|
||||||
|
tooltip_attr: |s| s.reboot_tooltip,
|
||||||
|
confirm_attr: |s| s.reboot_confirm,
|
||||||
|
error_attr: |s| s.reboot_failed,
|
||||||
|
action_fn: power::reboot,
|
||||||
|
},
|
||||||
|
PowerAction {
|
||||||
|
icon_name: "system-shutdown-symbolic",
|
||||||
|
tooltip_attr: |s| s.shutdown_tooltip,
|
||||||
|
confirm_attr: |s| s.shutdown_confirm,
|
||||||
|
error_attr: |s| s.shutdown_failed,
|
||||||
|
action_fn: power::shutdown,
|
||||||
|
},
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Build a power-action icon button wired to the confirmation flow.
|
||||||
|
fn create_power_button(
|
||||||
|
action: PowerAction,
|
||||||
|
strings: &'static Strings,
|
||||||
|
power_box: >k::Box,
|
||||||
|
confirm_area: >k::Box,
|
||||||
|
confirm_box: &Rc<RefCell<Option<gtk::Box>>>,
|
||||||
error_label: >k::Label,
|
error_label: >k::Label,
|
||||||
button: >k::Button,
|
) -> gtk::Button {
|
||||||
) {
|
let button = gtk::Button::new();
|
||||||
glib::spawn_future_local(clone!(
|
button.set_icon_name(action.icon_name);
|
||||||
|
button.add_css_class("power-button");
|
||||||
|
button.set_tooltip_text(Some((action.tooltip_attr)(strings)));
|
||||||
|
button.connect_clicked(clone!(
|
||||||
|
#[weak]
|
||||||
|
power_box,
|
||||||
|
#[weak]
|
||||||
|
confirm_area,
|
||||||
|
#[strong]
|
||||||
|
confirm_box,
|
||||||
#[weak]
|
#[weak]
|
||||||
error_label,
|
error_label,
|
||||||
|
move |_| {
|
||||||
|
show_power_confirm(action, strings, &power_box, &confirm_area, &confirm_box, &error_label);
|
||||||
|
}
|
||||||
|
));
|
||||||
|
button
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Show an inline confirmation prompt before executing a power action.
|
||||||
|
fn show_power_confirm(
|
||||||
|
action: PowerAction,
|
||||||
|
strings: &'static Strings,
|
||||||
|
power_box: >k::Box,
|
||||||
|
confirm_area: >k::Box,
|
||||||
|
confirm_box: &Rc<RefCell<Option<gtk::Box>>>,
|
||||||
|
error_label: >k::Label,
|
||||||
|
) {
|
||||||
|
dismiss_power_confirm(confirm_area, confirm_box);
|
||||||
|
error_label.set_visible(false);
|
||||||
|
|
||||||
|
let new_box = gtk::Box::new(gtk::Orientation::Vertical, 8);
|
||||||
|
new_box.set_halign(gtk::Align::Center);
|
||||||
|
new_box.set_margin_top(16);
|
||||||
|
|
||||||
|
let confirm_label = gtk::Label::new(Some((action.confirm_attr)(strings)));
|
||||||
|
confirm_label.add_css_class("confirm-label");
|
||||||
|
new_box.append(&confirm_label);
|
||||||
|
|
||||||
|
let button_row = gtk::Box::new(gtk::Orientation::Horizontal, 8);
|
||||||
|
button_row.set_halign(gtk::Align::Center);
|
||||||
|
|
||||||
|
let yes_btn = gtk::Button::with_label(strings.confirm_yes);
|
||||||
|
yes_btn.add_css_class("confirm-yes");
|
||||||
|
yes_btn.connect_clicked(clone!(
|
||||||
#[weak]
|
#[weak]
|
||||||
button,
|
power_box,
|
||||||
|
#[weak]
|
||||||
|
confirm_area,
|
||||||
|
#[strong]
|
||||||
|
confirm_box,
|
||||||
|
#[weak]
|
||||||
|
error_label,
|
||||||
|
move |_| {
|
||||||
|
execute_power_action(action, strings, &power_box, &confirm_area, &confirm_box, &error_label);
|
||||||
|
}
|
||||||
|
));
|
||||||
|
button_row.append(&yes_btn);
|
||||||
|
|
||||||
|
let no_btn = gtk::Button::with_label(strings.confirm_no);
|
||||||
|
no_btn.add_css_class("confirm-no");
|
||||||
|
no_btn.connect_clicked(clone!(
|
||||||
|
#[weak]
|
||||||
|
confirm_area,
|
||||||
|
#[strong]
|
||||||
|
confirm_box,
|
||||||
|
move |_| {
|
||||||
|
dismiss_power_confirm(&confirm_area, &confirm_box);
|
||||||
|
}
|
||||||
|
));
|
||||||
|
button_row.append(&no_btn);
|
||||||
|
|
||||||
|
new_box.append(&button_row);
|
||||||
|
confirm_area.append(&new_box);
|
||||||
|
*confirm_box.borrow_mut() = Some(new_box);
|
||||||
|
no_btn.grab_focus();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Remove the power confirmation prompt.
|
||||||
|
fn dismiss_power_confirm(confirm_area: >k::Box, confirm_box: &Rc<RefCell<Option<gtk::Box>>>) {
|
||||||
|
if let Some(box_widget) = confirm_box.borrow_mut().take() {
|
||||||
|
confirm_area.remove(&box_widget);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Execute a power action in a background thread, guarding against re-trigger.
|
||||||
|
fn execute_power_action(
|
||||||
|
action: PowerAction,
|
||||||
|
strings: &'static Strings,
|
||||||
|
power_box: >k::Box,
|
||||||
|
confirm_area: >k::Box,
|
||||||
|
confirm_box: &Rc<RefCell<Option<gtk::Box>>>,
|
||||||
|
error_label: >k::Label,
|
||||||
|
) {
|
||||||
|
dismiss_power_confirm(confirm_area, confirm_box);
|
||||||
|
|
||||||
|
let action_fn = action.action_fn;
|
||||||
|
let error_message = (action.error_attr)(strings);
|
||||||
|
|
||||||
|
// Desensitize the power buttons so a double-click or keyboard repeat cannot
|
||||||
|
// fire the same action twice while it is in flight.
|
||||||
|
power_box.set_sensitive(false);
|
||||||
|
|
||||||
|
glib::spawn_future_local(clone!(
|
||||||
|
#[weak]
|
||||||
|
power_box,
|
||||||
|
#[weak]
|
||||||
|
error_label,
|
||||||
async move {
|
async move {
|
||||||
let result = gio::spawn_blocking(action_fn).await;
|
let result = gio::spawn_blocking(action_fn).await;
|
||||||
|
|
||||||
@@ -1318,13 +1473,13 @@ fn execute_power_action(
|
|||||||
log::error!("Power action failed: {e}");
|
log::error!("Power action failed: {e}");
|
||||||
error_label.set_text(error_message);
|
error_label.set_text(error_message);
|
||||||
error_label.set_visible(true);
|
error_label.set_visible(true);
|
||||||
button.set_sensitive(true);
|
power_box.set_sensitive(true);
|
||||||
}
|
}
|
||||||
Err(_) => {
|
Err(_) => {
|
||||||
log::error!("Power action panicked");
|
log::error!("Power action panicked");
|
||||||
error_label.set_text(error_message);
|
error_label.set_text(error_message);
|
||||||
error_label.set_visible(true);
|
error_label.set_visible(true);
|
||||||
button.set_sensitive(true);
|
power_box.set_sensitive(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+18
@@ -16,6 +16,12 @@ pub struct Strings {
|
|||||||
pub reboot_tooltip: &'static str,
|
pub reboot_tooltip: &'static str,
|
||||||
pub shutdown_tooltip: &'static str,
|
pub shutdown_tooltip: &'static str,
|
||||||
|
|
||||||
|
// Power confirmation prompts
|
||||||
|
pub reboot_confirm: &'static str,
|
||||||
|
pub shutdown_confirm: &'static str,
|
||||||
|
pub confirm_yes: &'static str,
|
||||||
|
pub confirm_no: &'static str,
|
||||||
|
|
||||||
// Error messages
|
// Error messages
|
||||||
pub no_session_selected: &'static str,
|
pub no_session_selected: &'static str,
|
||||||
pub greetd_sock_not_set: &'static str,
|
pub greetd_sock_not_set: &'static str,
|
||||||
@@ -39,6 +45,10 @@ const STRINGS_DE: Strings = Strings {
|
|||||||
password_placeholder: "Passwort",
|
password_placeholder: "Passwort",
|
||||||
reboot_tooltip: "Neustart",
|
reboot_tooltip: "Neustart",
|
||||||
shutdown_tooltip: "Herunterfahren",
|
shutdown_tooltip: "Herunterfahren",
|
||||||
|
reboot_confirm: "Wirklich neu starten?",
|
||||||
|
shutdown_confirm: "Wirklich herunterfahren?",
|
||||||
|
confirm_yes: "Ja",
|
||||||
|
confirm_no: "Abbrechen",
|
||||||
no_session_selected: "Keine Session ausgewählt",
|
no_session_selected: "Keine Session ausgewählt",
|
||||||
greetd_sock_not_set: "GREETD_SOCK nicht gesetzt",
|
greetd_sock_not_set: "GREETD_SOCK nicht gesetzt",
|
||||||
greetd_sock_not_absolute: "GREETD_SOCK ist kein absoluter Pfad",
|
greetd_sock_not_absolute: "GREETD_SOCK ist kein absoluter Pfad",
|
||||||
@@ -59,6 +69,10 @@ const STRINGS_EN: Strings = Strings {
|
|||||||
password_placeholder: "Password",
|
password_placeholder: "Password",
|
||||||
reboot_tooltip: "Reboot",
|
reboot_tooltip: "Reboot",
|
||||||
shutdown_tooltip: "Shut down",
|
shutdown_tooltip: "Shut down",
|
||||||
|
reboot_confirm: "Really reboot?",
|
||||||
|
shutdown_confirm: "Really shut down?",
|
||||||
|
confirm_yes: "Yes",
|
||||||
|
confirm_no: "Cancel",
|
||||||
no_session_selected: "No session selected",
|
no_session_selected: "No session selected",
|
||||||
greetd_sock_not_set: "GREETD_SOCK not set",
|
greetd_sock_not_set: "GREETD_SOCK not set",
|
||||||
greetd_sock_not_absolute: "GREETD_SOCK is not an absolute path",
|
greetd_sock_not_absolute: "GREETD_SOCK is not an absolute path",
|
||||||
@@ -276,6 +290,10 @@ mod tests {
|
|||||||
assert!(!s.password_placeholder.is_empty(), "{locale}: password_placeholder");
|
assert!(!s.password_placeholder.is_empty(), "{locale}: password_placeholder");
|
||||||
assert!(!s.reboot_tooltip.is_empty(), "{locale}: reboot_tooltip");
|
assert!(!s.reboot_tooltip.is_empty(), "{locale}: reboot_tooltip");
|
||||||
assert!(!s.shutdown_tooltip.is_empty(), "{locale}: shutdown_tooltip");
|
assert!(!s.shutdown_tooltip.is_empty(), "{locale}: shutdown_tooltip");
|
||||||
|
assert!(!s.reboot_confirm.is_empty(), "{locale}: reboot_confirm");
|
||||||
|
assert!(!s.shutdown_confirm.is_empty(), "{locale}: shutdown_confirm");
|
||||||
|
assert!(!s.confirm_yes.is_empty(), "{locale}: confirm_yes");
|
||||||
|
assert!(!s.confirm_no.is_empty(), "{locale}: confirm_no");
|
||||||
assert!(!s.no_session_selected.is_empty(), "{locale}: no_session_selected");
|
assert!(!s.no_session_selected.is_empty(), "{locale}: no_session_selected");
|
||||||
assert!(!s.greetd_sock_not_set.is_empty(), "{locale}: greetd_sock_not_set");
|
assert!(!s.greetd_sock_not_set.is_empty(), "{locale}: greetd_sock_not_set");
|
||||||
assert!(!s.auth_failed.is_empty(), "{locale}: auth_failed");
|
assert!(!s.auth_failed.is_empty(), "{locale}: auth_failed");
|
||||||
|
|||||||
Reference in New Issue
Block a user