aboutsummaryrefslogtreecommitdiff
path: root/libLumina
diff options
context:
space:
mode:
Diffstat (limited to 'libLumina')
-rw-r--r--libLumina/LuminaOS-DragonFly.cpp5
-rw-r--r--libLumina/LuminaOS-FreeBSD.cpp7
-rw-r--r--libLumina/LuminaOS-Linux.cpp5
-rw-r--r--libLumina/LuminaOS-OpenBSD.cpp179
-rw-r--r--libLumina/LuminaOS-template.cpp5
-rw-r--r--libLumina/LuminaOS.h5
-rw-r--r--libLumina/LuminaX11.cpp21
-rw-r--r--libLumina/LuminaXDG.cpp5
-rw-r--r--libLumina/libLumina.pro1
9 files changed, 222 insertions, 11 deletions
diff --git a/libLumina/LuminaOS-DragonFly.cpp b/libLumina/LuminaOS-DragonFly.cpp
index 64bad97f..990bf9f7 100644
--- a/libLumina/LuminaOS-DragonFly.cpp
+++ b/libLumina/LuminaOS-DragonFly.cpp
@@ -15,6 +15,11 @@ static int screenbrightness = -1;
QString LOS::AppPrefix(){ return "/usr/local/"; } //Prefix for applications
QString LOS::SysPrefix(){ return "/usr/"; } //Prefix for system
+//OS-specific application shortcuts (*.desktop files)
+QString LOS::ControlPanelShortcut(){ return ""; } //system control panel
+QString LOS::AppStoreShortcut(){ return ""; } //graphical app/pkg manager
+QString LOS::QtConfigShortcut(){ return "/usr/local/bin/qtconfig-qt4"; } //qtconfig binary (NOT *.desktop file)
+
// ==== ExternalDevicePaths() ====
QStringList LOS::ExternalDevicePaths(){
//Returns: QStringList[<type>::::<filesystem>::::<path>]
diff --git a/libLumina/LuminaOS-FreeBSD.cpp b/libLumina/LuminaOS-FreeBSD.cpp
index 0e381660..a078687d 100644
--- a/libLumina/LuminaOS-FreeBSD.cpp
+++ b/libLumina/LuminaOS-FreeBSD.cpp
@@ -15,7 +15,12 @@ static int screenbrightness = -1;
//OS-specific prefix(s)
QString LOS::AppPrefix(){ return "/usr/local/"; } //Prefix for applications
QString LOS::SysPrefix(){ return "/usr/"; } //Prefix for system
-
+
+//OS-specific application shortcuts (*.desktop files)
+QString LOS::ControlPanelShortcut(){ return "/usr/local/share/applications/pccontrol.desktop"; } //system control panel
+QString LOS::AppStoreShortcut(){ return "/usr/local/share/applications/softmanager.desktop"; } //graphical app/pkg manager
+QString LOS::QtConfigShortcut(){ return "/usr/local/bin/qtconfig-qt4"; } //qtconfig binary (NOT *.desktop file)
+
// ==== ExternalDevicePaths() ====
QStringList LOS::ExternalDevicePaths(){
//Returns: QStringList[<type>::::<filesystem>::::<path>]
diff --git a/libLumina/LuminaOS-Linux.cpp b/libLumina/LuminaOS-Linux.cpp
index f3ac854e..b7bb3685 100644
--- a/libLumina/LuminaOS-Linux.cpp
+++ b/libLumina/LuminaOS-Linux.cpp
@@ -17,6 +17,11 @@ static int screenbrightness = -1;
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 ""; } //system control panel
+QString LOS::AppStoreShortcut(){ return ""; } //graphical app/pkg manager
+QString LOS::QtConfigShortcut(){ return "/usr/bin/qtconfig-qt4"; } //qtconfig binary (NOT *.desktop file)
+
// ==== ExternalDevicePaths() ====
QStringList LOS::ExternalDevicePaths(){
//Returns: QStringList[<type>::::<filesystem>::::<path>]
diff --git a/libLumina/LuminaOS-OpenBSD.cpp b/libLumina/LuminaOS-OpenBSD.cpp
new file mode 100644
index 00000000..770e3a3a
--- /dev/null
+++ b/libLumina/LuminaOS-OpenBSD.cpp
@@ -0,0 +1,179 @@
+//===========================================
+// Lumina-DE source code
+// Copyright (c) 2014, Ken Moore
+// Copyright (c) 2014, Antoine Jacoutot <ajacoutot@openbsd.org>
+// Available under the 3-clause BSD license
+// See the LICENSE file for full details
+//===========================================
+#ifdef __OpenBSD__
+#include "LuminaOS.h"
+#include <unistd.h>
+
+//can't read xbrightness settings - assume invalid until set
+static int screenbrightness = -1;
+
+
+//OS-specific prefix(s)
+QString LOS::AppPrefix(){ return "/usr/local/"; } //Prefix for applications
+QString LOS::SysPrefix(){ return "/usr/"; } //Prefix for system
+
+//OS-specific application shortcuts (*.desktop files)
+QString LOS::ControlPanelShortcut(){ return ""; } //system control panel
+QString LOS::AppStoreShortcut(){ return ""; } //graphical app/pkg manager
+QString LOS::QtConfigShortcut(){ return "/usr/local/bin/qtconfig4"; } //qtconfig binary (NOT *.desktop file)
+
+// ==== ExternalDevicePaths() ====
+QStringList LOS::ExternalDevicePaths(){
+ //Returns: QStringList[<type>::::<filesystem>::::<path>]
+ //Note: <type> = [USB, HDRIVE, DVD, SDCARD, UNKNOWN]
+ QStringList devs = LUtils::getCmdOutput("mount");
+ //Now check the output
+ for(int i=0; i<devs.length(); i++){
+ if(devs[i].startsWith("/dev/")){
+ QString type = devs[i].section(" on ",0,0);
+ type.remove("/dev/");
+ //Determine the type of hardware device based on the dev node
+ if(type.startsWith("sd")||type.startsWith("wd")){ type = "HDRIVE"; }
+ else if(type.startsWith("cd")){ type="DVD"; }
+ else{ type = "UNKNOWN"; }
+ //Now put the device in the proper output format
+ devs[i] = type+"::::"+devs[i].section("(",1,1).section(",",0,0)+"::::"+devs[i].section(" on ",1,50).section("(",0,0).simplified();
+ }else{
+ //invalid device - remove it from the list
+ devs.removeAt(i);
+ i--;
+ }
+ }
+ return devs;
+}
+
+//Read screen brightness information
+int LOS::ScreenBrightness(){
+ //Returns: Screen Brightness as a percentage (0-100, with -1 for errors)
+ if(screenbrightness==-1){
+ if(QFile::exists(QDir::homePath()+"/.lumina/.currentxbrightness")){
+ int val = LUtils::readFile(QDir::homePath()+"/.lumina/.currentxbrightness").join("").simplified().toInt();
+ screenbrightness = val;
+ }
+ }
+ return screenbrightness;
+}
+
+//Set screen brightness
+void LOS::setScreenBrightness(int percent){
+ //ensure bounds
+ if(percent<0){percent=0;}
+ else if(percent>100){ percent=100; }
+ //Run the command
+ QString cmd = "xbacklight -set %1";
+ 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(QDir::homePath()+"/.lumina/.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)
+ QString info = LUtils::getCmdOutput("mixerctl -n outputs.master").join(",").simplified(); //ignores any other lines
+ int out = -1;
+ if(!info.isEmpty()){
+ int L = info.section(",",0,0).toInt();
+ int R = info.section(",",1,1).toInt();
+ L = (L*100)/255; //percent
+ R = (R*100)/255; //percent
+ if(L>R){ out = L; }
+ else{ out = R; }
+ }
+ return out;
+}
+
+//Set the current volume
+void LOS::setAudioVolume(int percent){
+ if(percent<0){percent=0;}
+ else if(percent>100){percent=100;}
+ QString info = LUtils::getCmdOutput("mixerctl -n outputs.master").join(",").simplified(); //ignores any other lines
+ if(!info.isEmpty()){
+ int L = info.section(",",0,0).toInt();
+ int R = info.section(",",1,1).toInt();
+ L = (L*100)/255; //percent
+ R = (R*100)/255; //percent
+ int diff = L-R;
+ if(diff<0){ R=percent; L=percent+diff; } //R Greater
+ else{ L=percent; R=percent-diff; } //L Greater or equal
+ //Check bounds
+ if(L<0){L=0;}else if(L>100){L=100;}
+ if(R<0){R=0;}else if(R>100){R=100;}
+ //Run Command
+ L = (L*255)/100; //0-255
+ R = (R*255)/100; //0-255
+ LUtils::runCmd("mixerctl -q outputs.master="+QString::number(L)+","+QString::number(R));
+ }
+}
+
+//Change the current volume a set amount (+ or -)
+void LOS::changeAudioVolume(int percentdiff){
+ QString info = LUtils::getCmdOutput("mixerctl -n outputs.master").join(",").simplified(); //ignores any other lines
+ if(!info.isEmpty()){
+ int L = info.section(",",0,0).toInt();
+ int R = info.section(",",1,1).toInt();
+ L = (L*100)/255; //percent
+ R = (R*100)/255; //percent
+ L = L + percentdiff;
+ R = R + percentdiff;
+ //Check bounds
+ if(L<0){L=0;}else if(L>100){L=100;}
+ if(R<0){R=0;}else if(R>100){R=100;}
+ //Run Command
+ L = (L*255)/100; //0-255
+ R = (R*255)/100; //0-255
+ LUtils::runCmd("mixerctl -q outputs.master="+QString::number(L)+","+QString::number(R));
+ }
+}
+
+//Check if a graphical audio mixer is installed
+bool LOS::hasMixerUtility(){
+ return false; //not implemented yet for OpenBSD
+}
+
+//Launch the graphical audio mixer utility
+void LOS::startMixerUtility(){
+ //Not implemented yet for OpenBSD
+}
+
+//System Shutdown
+void LOS::systemShutdown(){ //start poweroff sequence
+ QProcess::startDetached("shutdown -hp now");
+}
+
+//System Restart
+void LOS::systemRestart(){ //start reboot sequence
+ QProcess::startDetached("shutdown -r now");
+}
+
+//Battery Availability
+bool LOS::hasBattery(){
+ int val = LUtils::getCmdOutput("apm -l").join("").toInt();
+ return (val >= 0 && val <= 100);
+}
+
+//Battery Charge Level
+int LOS::batteryCharge(){ //Returns: percent charge (0-100), anything outside that range is counted as an error
+ int charge = LUtils::getCmdOutput("apm -l").join("").toInt();
+ if(charge > 100){ charge = -1; } //invalid charge
+ return charge;
+}
+
+//Battery Charging State
+bool LOS::batteryIsCharging(){
+ return (LUtils::getCmdOutput("apm -a").join("").simplified() == "1");
+}
+
+//Battery Time Remaining
+int LOS::batterySecondsLeft(){ //Returns: estimated number of seconds remaining
+ int min = LUtils::getCmdOutput("apm -m").join("").toInt();
+ return (min * 60);
+}
+
+#endif
diff --git a/libLumina/LuminaOS-template.cpp b/libLumina/LuminaOS-template.cpp
index 88d1b72e..0bfac22a 100644
--- a/libLumina/LuminaOS-template.cpp
+++ b/libLumina/LuminaOS-template.cpp
@@ -13,6 +13,11 @@
QString LOS::AppPrefix(){ return "/usr/local/"; } //Prefix for applications
QString LOS::SysPrefix(){ return "/usr/"; } //Prefix for system
+//OS-specific application shortcuts (*.desktop files)
+QString LOS::ControlPanelShortcut(){ return ""; } //system control panel
+QString LOS::AppStoreShortcut(){ return ""; } //graphical app/pkg manager
+QString LOS::QtConfigShortcut(){ return ""; } //qtconfig binary (NOT *.desktop file)
+
// ==== ExternalDevicePaths() ====
QStringList LOS::ExternalDevicePaths(){
//Returns: QStringList[<type>::::<filesystem>::::<path>]
diff --git a/libLumina/LuminaOS.h b/libLumina/LuminaOS.h
index 84bc9806..6b755e03 100644
--- a/libLumina/LuminaOS.h
+++ b/libLumina/LuminaOS.h
@@ -25,6 +25,11 @@ public:
static QString AppPrefix(); //Prefix for applications (/usr/local/ on FreeBSD)
static QString SysPrefix(); //Prefix for system (/usr/ on FreeBSD)
+ //OS-specific application shortcuts (*.desktop files)
+ static QString ControlPanelShortcut();
+ static QString AppStoreShortcut();
+ static QString QtConfigShortcut();
+
//Scan for mounted external devices
static QStringList ExternalDevicePaths(); //Returns: QStringList[<type>::::<filesystem>::::<path>]
//Note: <type> = [USB, HDRIVE, DVD, SDCARD, UNKNOWN]
diff --git a/libLumina/LuminaX11.cpp b/libLumina/LuminaX11.cpp
index 6b847df6..418e041f 100644
--- a/libLumina/LuminaX11.cpp
+++ b/libLumina/LuminaX11.cpp
@@ -551,33 +551,34 @@ int LX11::WindowDesktop(WId win){
LX11::WINDOWSTATE LX11::GetWindowState(WId win){
Display *disp = QX11Info::display();
- Atom SA = XInternAtom(disp, "_NET_WM_STATE", false);
+ Atom SA = XInternAtom(disp, "_NET_WM_STATE", true);
Atom ATTENTION = XInternAtom(disp, "_NET_WM_STATE_DEMANDS_ATTENTION", false);
Atom SKIPP = XInternAtom(disp, "_NET_WM_STATE_SKIP_PAGER", false);
Atom HIDDEN = XInternAtom(disp, "_NET_WM_STATE_HIDDEN", false);
Atom SKIPT = XInternAtom(disp, "_NET_WM_STATE_SKIP_TASKBAR", false);
- Atom MODAL = XInternAtom(disp, "_NET_WM_STATE_MODAL", false);
+ //Atom MODAL = XInternAtom(disp, "_NET_WM_STATE_MODAL", false);
Atom type;
int format;
unsigned long num, bytes;
- unsigned char *data = 0;
+ unsigned long *data = 0;
int status = XGetWindowProperty( disp, win, SA, 0, ~(0L), false, AnyPropertyType,
- &type, &format, &num, &bytes, &data);
+ &type, &format, &num, &bytes, (unsigned char**) &data);
LX11::WINDOWSTATE state = LX11::VISIBLE;
if(status >= Success && data){
- Atom *array = (Atom*) data;
for(unsigned int i=0; i<num; i++){
- if(array[i] == SKIPP || array[i]==SKIPT || array[i]==MODAL ){
+ if(data[i] == SKIPP || data[i]==SKIPT){
state = LX11::IGNORE;
+ //qDebug() << "Ignore Window:" << win;
break;
- }else if(array[i]==HIDDEN){
- qDebug() << "Hidden Window:" << win;
+ }else if(data[i]==HIDDEN){
+ //qDebug() << "Hidden Window:" << win;
state = LX11::INVISIBLE;
- }else if(array[i]==ATTENTION){
- qDebug() << "Attention Window: " << win;
+ }else if(data[i]==ATTENTION){
+ //qDebug() << "Attention Window: " << win;
state = LX11::ATTENTION;
+ break; //This state has priority over others
}
}
XFree(data);
diff --git a/libLumina/LuminaXDG.cpp b/libLumina/LuminaXDG.cpp
index 7934c924..84e9ad90 100644
--- a/libLumina/LuminaXDG.cpp
+++ b/libLumina/LuminaXDG.cpp
@@ -32,8 +32,13 @@ XDGDesktop LXDG::loadDesktopFile(QString filePath, bool& ok){
}
QTextStream os(&file);
//Read in the File
+ bool insection=false;
while(!os.atEnd()){
QString line = os.readLine();
+ //Check that this is the entry portion of the file (not the action/other sections)
+ if(line=="[Desktop Entry]"){ insection=true; continue; }
+ else if(line.startsWith("[")){ insection=false; }
+ if(!insection || line.startsWith("#")){ continue; }
//Now parse out the file
line = line.simplified();
QString var = line.section("=",0,0).simplified();
diff --git a/libLumina/libLumina.pro b/libLumina/libLumina.pro
index 245fe922..b7655bb7 100644
--- a/libLumina/libLumina.pro
+++ b/libLumina/libLumina.pro
@@ -20,6 +20,7 @@ SOURCES += LuminaXDG.cpp \
LuminaX11.cpp \
LuminaOS-FreeBSD.cpp \
LuminaOS-DragonFly.cpp \
+ LuminaOS-OpenBSD.cpp \
LuminaOS-Linux.cpp
# new OS support can be added here
bgstack15