From bcae436ba46b52356a24bbaebf03ad97cb4c1fa6 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Mon, 27 Jan 2020 21:39:22 -0500 Subject: Add VoidLinux OS interface. Update readme. Remove the hardcoded keycode for the start menu (not consistent across OS's) --- src-qt5/OS-detect.pri | 5 + src-qt5/core/README.md | 5 + src-qt5/core/libLumina/LuminaOS-VoidLinux.cpp | 270 +++++++++++++++++++++ .../core/lumina-desktop/fluxboxconf/fluxbox-keys | 1 - 4 files changed, 280 insertions(+), 1 deletion(-) create mode 100644 src-qt5/core/libLumina/LuminaOS-VoidLinux.cpp diff --git a/src-qt5/OS-detect.pri b/src-qt5/OS-detect.pri index be32aea6..2214016d 100644 --- a/src-qt5/OS-detect.pri +++ b/src-qt5/OS-detect.pri @@ -81,6 +81,11 @@ isEmpty(OS){ isEmpty(L_ETCDIR){ L_ETCDIR = $${PREFIX}/../etc } isEmpty(L_MANDIR){ L_MANDIR = $${PREFIX}/share/man } } + equals(LINUX_DISTRO,"VoidLinux"){ + isEmpty(L_BINDIR){ L_BINDIR = $${PREFIX}/bin } + isEmpty(L_ETCDIR){ L_ETCDIR = $${PREFIX}/../etc } + isEmpty(L_MANDIR){ L_MANDIR = $${PREFIX}/share/man } + } }else{ OS="Unknown"; } diff --git a/src-qt5/core/README.md b/src-qt5/core/README.md index d46b8448..e3b11a81 100644 --- a/src-qt5/core/README.md +++ b/src-qt5/core/README.md @@ -89,3 +89,8 @@ Other Files that get installed if "core" is built directly: * `pavucontrol`: Graphical audio mixer utility * `acpi`: Battery detection/status * `dbus-send`: System shutdown/restart + 10. Void Linux + * `xbacklight`: screen brightness control + * `amixer`: Audio mixer control + * `pavucontrol`: Graphical audio mixer utility + * `acpi`: Battery detection/status diff --git a/src-qt5/core/libLumina/LuminaOS-VoidLinux.cpp b/src-qt5/core/libLumina/LuminaOS-VoidLinux.cpp new file mode 100644 index 00000000..c9da6fc5 --- /dev/null +++ b/src-qt5/core/libLumina/LuminaOS-VoidLinux.cpp @@ -0,0 +1,270 @@ +//=========================================== +// Lumina-DE source code +// Copyright (c) 2014, Ken Moore +// Available under the 3-clause BSD license +// See the LICENSE file for full details +//=========================================== +#ifdef __linux__ +#include +#include "LuminaOS.h" +#include +#include // Needed for BUFSIZ +#include + +//can't read xbrightness settings - assume invalid until set +static int screenbrightness = -1; + +QString LOS::OSName(){ return "VoidLinux"; } + +//OS-specific prefix(s) +// NOTE: PREFIX, L_ETCDIR, L_SHAREDIR are defined in the OS-detect.pri project file and passed in +QString LOS::LuminaShare(){ return (L_SHAREDIR+"/lumina-desktop/"); } //Install dir for Lumina share files +QString LOS::AppPrefix(){ return "/usr/"; } //Prefix for applications +QString LOS::SysPrefix(){ return "/usr/"; } //Prefix for system + +//OS-specific application shortcuts (*.desktop files) +QString LOS::ControlPanelShortcut(){ return "lumina-config.desktop"; } //system control panel +QString LOS::AppStoreShortcut(){ return ""; } //graphical app/pkg manager +//OS-specific RSS feeds (Format: QStringList[ :::: ]; ) +QStringList LOS::RSSFeeds(){ + QStringList list; + list << "Void News::::https://voidlinux.org/atom.xml"; + list << "Void Packages::::https://github.com/void-linux/void-packages/commits/master.atom"; + list << "Void XBPS::::https://github.com/void-linux/xbps/commits/master.atom"; + return list; +} + +// ==== ExternalDevicePaths() ==== +QStringList LOS::ExternalDevicePaths(){ + //Returns: QStringList[::::::::] + //Note: = [USB, HDRIVE, DVD, SDCARD, UNKNOWN] + QStringList devs = LUtils::getCmdOutput("mount"); + //Now check the output + for(int i=0; i100){ percent=100; } + // float pf = percent/100.0; //convert to a decimel + //Run the command + QString cmd = "xbacklight -set %1"; + // cmd = cmd.arg( QString::number( int(65535*pf) ) ); + cmd = cmd.arg( QString::number( percent ) ); + int ret = LUtils::runCmd(cmd); + //Save the result for later + if(ret!=0){ screenbrightness = -1; } + else{ + screenbrightness = percent; + LUtils::writeFile(QString(getenv("XDG_CONFIG_HOME"))+"/lumina-desktop/.currentxbrightness", QStringList() << QString::number(screenbrightness), true); + } +} + +//Read the current volume +int LOS::audioVolume(){ //Returns: audio volume as a percentage (0-100, with -1 for errors) + QStringList info = LUtils::getCmdOutput("pactl list sinks"); + if(info.isEmpty()){ return -1; } + bool isRunning = false; + int out = -1; + for(int i=0; i100){percent=100;} + QString info = QString("pactl set-sink-volume @DEFAULT_SINK@ ")+QString::number(percent)+"%"; + //Run Command + LUtils::runCmd(info); +} + +//Change the current volume a set amount (+ or -) +void LOS::changeAudioVolume(int percentdiff){ + int old_volume = audioVolume(); + int new_volume = old_volume + percentdiff; + if (new_volume < 0) + new_volume = 0; + if (new_volume > 100) + new_volume = 100; + //qDebug() << "Setting new volume to: " << new_volume; + setAudioVolume(new_volume); +} + +//Check if a graphical audio mixer is installed +bool LOS::hasMixerUtility(){ + return QFile::exists(LOS::AppPrefix() + "bin/pavucontrol"); +} + +//Launch the graphical audio mixer utility +void LOS::startMixerUtility(){ + QProcess::startDetached(LOS::AppPrefix() + "bin/pavucontrol"); +} + +//Check for user system permission (shutdown/restart) +bool LOS::userHasShutdownAccess(){ + return QFile::exists(LOS::AppPrefix()+"bin/qsudo"); +} + +//Check for whether the system is safe to power off (no updates being perfomed) +bool LOS::systemPerformingUpdates(){ + return false; //Not implemented yet +} + +//Return the details of any updates which are waiting to apply on shutdown +QString LOS::systemPendingUpdates(){ + return ""; +} + +//System Shutdown +void LOS::systemShutdown(bool){ //start poweroff sequence + //INPUT: skip updates (true/false) + QProcess::startDetached("qsudo poweroff"); +} + +//System Restart +void LOS::systemRestart(bool){ //start reboot sequence + //INPUT: skip updates (true/false) + QProcess::startDetached("qsudo reboot"); +} + +//Check for suspend support +bool LOS::systemCanSuspend(){ + bool ok = QFile::exists(LOS::AppPrefix()+"bin/qsudo"); + return ok; +} + +//Put the system into the suspend state +void LOS::systemSuspend(){ + QProcess::startDetached("qsudo zzz"); +} + +//Battery Availability +bool LOS::hasBattery(){ + QString my_status = LUtils::getCmdOutput("acpi -b").join(""); + bool no_battery = my_status.contains("No support"); + if (no_battery) return false; + return true; +} + +//Battery Charge Level +int LOS::batteryCharge(){ //Returns: percent charge (0-100), anything outside that range is counted as an error + QString my_status = LUtils::getCmdOutput("acpi -b").join(""); + int my_start = my_status.indexOf("%"); + // get the number right before the % sign + int my_end = my_start; + my_start--; + while ( (my_status[my_start] != ' ') && (my_start > 0) ) + my_start--; + my_start++; + int my_charge = my_status.mid(my_start, my_end - my_start).toInt(); + if ( (my_charge < 0) || (my_charge > 100) ) return -1; + return my_charge; +} + +//Battery Charging State +// Many possible values are returned if the laptop is plugged in +// these include "Unknown, Full and No support. +// However, it seems just one status is returned when running +// on battery and that is "Discharging". So if the value we get +// is NOT Discharging then we assume the battery is charging. +bool LOS::batteryIsCharging(){ + QString my_status = LUtils::getCmdOutput("acpi -b").join(""); + bool discharging = my_status.contains("Discharging"); + if (discharging) return false; + return true; +} + +//Battery Time Remaining +int LOS::batterySecondsLeft(){ //Returns: estimated number of seconds remaining + QString my_status = LUtils::getCmdOutput("acpi -b").join("\n"); + QRegExp timefind(" [0-9]{2}:[0-9]{2}:[0-9]{2} "); + int tmp = timefind.indexIn(my_status); + if(tmp>=0){ + QTime time = QTime::fromString(timefind.cap(0),"HH:mm:ss"); + if(time.isValid()){ tmp = time.hour()*3600 + time.minute()*60 + time.second(); } + } + return tmp; //not implemented yet for Linux +} + +//File Checksums +QStringList LOS::Checksums(QStringList filepaths){ //Return: checksum of the input file + QStringList info = LUtils::getCmdOutput("md5sum \""+filepaths.join("\" \"")+"\""); + for(int i=0; i