Fimeg/souveraine
Watch
1
0
Fork
You've already forked souveraine
 0
Code Releases Activity

lock: surface charge rate, and stop counting down while plugged in

Browse source 
UPower's ChargeType (fork, read off the charger) reaches the lock line as
fast/slow charging. Discharging with the cable in is the charger resting
between top-ups, not a drain — it now reads Charged/Plugged in.
This commit is contained in:
Fimeg 2026-07-26 16:56:39 -04:00
commit 2b69957f18
4 changed files with 152 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
surfaces/quickshell/deploy.sh
View file

@ -36,6 +36,7 @@ panelFamilies/SouveraineFamily.qml souveraine/panelFamilies/SouveraineFamily.qml
services/Souveraine.qml souveraine/services/Souveraine.qml
services/Ai.qml souveraine/services/Ai.qml
services/Cellular.qml souveraine/services/Cellular.qml
services/ChargeRate.qml souveraine/services/ChargeRate.qml
services/Network.qml souveraine/services/Network.qml
services/TaskbarApps.qml souveraine/services/TaskbarApps.qml
services/GlobalFocusGrab.qml souveraine/services/GlobalFocusGrab.qml

14
surfaces/quickshell/modules/souveraine/lock/LockSurfaceHost.qml
View file

@ -68,11 +68,23 @@ Item {
case UPowerDeviceState.FullyCharged:
return "Full " + pct + "%";
case UPowerDeviceState.Charging:
// ChargeRate.label is "Charging" unless the charger
// is doing something worth naming — fast, trickle,
// long-life. A charger that has quietly dropped to
// trickle used to look exactly like one that hadn't.
// Right after a driver rebind the pack can briefly
// report 0% while charging. Drop the number rather
// than lie.
return pct > 0 ? "Charging " + pct + "%" : "Charging";
return pct > 0 ? ChargeRate.label + " " + pct + "%"
: ChargeRate.label;
case UPowerDeviceState.Discharging:
// Discharging with the cable still in is the charger
// resting between top-ups, not the battery draining.
// Saying "Battery 94%" there — and watching it count
// down while plugged in — reads as a broken charger.
if (ChargeRate.pluggedNotCharging)
return pct >= 95 ? "Charged " + pct + "%"
: "Plugged in " + pct + "%";
return "Battery " + pct + "%";
default:
// Unknown / Empty / Pending* — show the number

137
surfaces/quickshell/services/ChargeRate.qml Normal file
View file

@ -0,0 +1,137 @@
// How fast the battery is actually charging — fast, standard, or trickle.
//
// Android surfaced this and the phone did not, so a charger that had quietly
// fallen back to trickle looked exactly like one that hadn't: "Charging 41%"
// either way, for hours.
//
// The value comes from the kernel's `charge_type`, which on SDM845 lives on
// the *charger* (`pmi8998-charger`), not the fuel gauge (`qcom-battery`) —
// the fuel gauge has no such attribute at all. Our UPower fork walks the
// supplier device link to find it and publishes it as the `ChargeType`
// property on the battery device (see packaging/upower-souveraine,
// up_device_supply_get_supplier_charge_type_str).
//
// Quickshell's UPowerDevice binds a fixed set of properties in C++ and
// `ChargeType` is not among them, so this reads D-Bus directly: one initial
// get-property, then gdbus monitor for changes (the property is declared
// emits-change, so the signal is real, not a poll). Same pattern as the
// squeekboard visibility monitor in OnScreenKeyboard.qml.
pragma Singleton
import QtQuick
import Quickshell
import Quickshell.Io
import Quickshell.Services.UPower
Singleton {
id: root
// UpDeviceChargeType, from libupower-glib/up-types.h. Kept as plain ints
// because the enum crosses as a uint32 and Quickshell has no binding for
// it — if the fork ever renumbers, this list is the one place to fix.
readonly property int unknown: 0
readonly property int none: 1
readonly property int trickle: 2
readonly property int fast: 3
readonly property int standard: 4
readonly property int adaptive: 5
readonly property int custom: 6
readonly property int longlife: 7
readonly property int bypass: 8
// Raw charge type as UPower last reported it. -1 until the first read
// lands, so "not asked yet" is distinguishable from "driver says unknown".
property int chargeType: -1
readonly property bool charging:
UPower.displayDevice?.state === UPowerDeviceState.Charging
// The cable is in and the charger has stopped anyway. This is normal
// charge-termination hysteresis, not a fault: the charger terminates at
// full, the pack self-discharges to its recharge threshold, and the
// charger starts again. UPower reports `discharging` throughout, so a
// surface that trusts state alone shows "Battery 94%" ticking down with
// the cable plugged in — which reads as a failing charger and isn't one.
readonly property bool pluggedNotCharging:
!UPower.onBattery && !root.charging
&& UPower.displayDevice?.state !== UPowerDeviceState.FullyCharged
// True when the rate is something worth saying out loud. `standard` is
// the unremarkable case and gets the plain verb; none/unknown mean the
// driver told us nothing and must not be dressed up as information.
readonly property bool rateKnown: root.charging
&& root.chargeType !== root.none
&& root.chargeType !== root.unknown
&& root.chargeType !== -1
// The phrase a surface shows in place of "Charging". Empty when the
// device is not charging — a charge *rate* while discharging is a stale
// reading of the last session, not a fact about now.
readonly property string label: {
if (!root.charging) return "";
switch (root.chargeType) {
case root.fast: return "Fast charging";
case root.trickle: return "Slow charging";
case root.adaptive: return "Adaptive charging";
case root.longlife: return "Charging (long life)";
case root.bypass: return "Bypass charging";
// standard, custom, none, unknown, and not-yet-read all fall
// through to the verb with no adverb attached.
default: return "Charging";
}
}
// Initial value. The monitor below only carries *changes*, so without
// this a session that starts already plugged in shows nothing until the
// charger next shifts gear — which on a topped-off pack may be never.
Process {
id: initialRead
running: true
command: ["sh", "-c",
"p=$(upower -e | grep -m1 -i batt) || exit 0; " +
"busctl get-property org.freedesktop.UPower \"$p\" " +
"org.freedesktop.UPower.Device ChargeType"]
stdout: SplitParser {
// `busctl get-property` prints "u 4".
onRead: line => {
const m = line.match(/^u\s+(\d+)/);
if (m) root.chargeType = parseInt(m[1], 10);
}
}
}
// PropertiesChanged carries the new value inline:
// /org/…/battery_qcom_battery: org.freedesktop.DBus.Properties
// ::PropertiesChanged ('org.freedesktop.UPower.Device',
// {'ChargeType': <uint32 3>}, @as [])
// Broadcast signals are receivable without eavesdrop privileges, so this
// needs no root and no polling.
Process {
id: chargeTypeMonitor
running: true
command: ["gdbus", "monitor", "--system",
"--dest", "org.freedesktop.UPower"]
stdout: SplitParser {
onRead: line => {
const m = line.match(/'ChargeType':\s*<uint32\s+(\d+)>/);
if (!m) return;
const next = parseInt(m[1], 10);
if (next === root.chargeType) return;
console.log("[charge-rate] charge type " + root.chargeType
+ " -> " + next);
root.chargeType = next;
}
}
}
// A charger swap can change the rate without UPower re-emitting if the
// battery device is re-added rather than updated. Re-read on every
// plug/unplug edge; it is one busctl call, not a poll.
Connections {
target: UPower.displayDevice
function onStateChanged() {
initialRead.running = false;
initialRead.running = true;
}
}
}

1
surfaces/quickshell/services/qmldir
View file

@ -7,6 +7,7 @@ singleton BluetoothStatus 1.0 BluetoothStatus.qml
singleton Booru 1.0 Booru.qml
singleton Brightness 1.0 Brightness.qml
singleton Cellular 1.0 Cellular.qml
singleton ChargeRate 1.0 ChargeRate.qml
singleton ClaudeUsage 1.0 ClaudeUsage.qml
singleton Cliphist 1.0 Cliphist.qml
singleton ConflictKiller 1.0 ConflictKiller.qml