github-personal/sysadm
1
0
Fork 0
mirror of https://github.com/outbackdingo/sysadm.git synced 2026-01-27 02:20:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix the loading of the current moused device settings. Only trim the quotes off the end if necessary.

Browse Source
This commit is contained in:
Ken Moore
2017-01-19 16:21:29 -05:00
parent 26557e3756
commit b1d8c1f048
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/server/library/sysadm-moused.cpp
View File

@@ -59,11 +59,14 @@ QJsonObject moused::readOptions(QJsonObject obj){
//qDebug() << "Read Options for Device:" << device;
if(device.isEmpty()){ return QJsonObject(); } //invalid inputs
QStringList args = General::getConfFileValue(_MOUSED_CONF, "moused_args_"+device+"=" ).section("\"",1,-2).split(" ");
if(args.isEmpty()){ General::getConfFileValue(_MOUSED_SYS_CONF, "moused_flags=" ).section("\"",1,-2).split(" "); }
if(args.isEmpty()){ General::getConfFileValue(_MOUSED_DEFAULT_CONF, "moused_flags=" ).section("\"",1,-2).split(" "); }
//qDebug() << " - Arguments:" << args;
QString val = General::getConfFileValue(_MOUSED_CONF, "moused_args_"+device+"=" );
if(val.isEmpty()){ General::getConfFileValue(_MOUSED_SYS_CONF, "moused_flags=" ); }
if(val.isEmpty()){ General::getConfFileValue(_MOUSED_DEFAULT_CONF, "moused_flags=" ); }
val = val.simplified();
if(val.startsWith("\"")){ val.remove(0,1); }
if(val.endsWith("\"")){ val.chop(1); }
QStringList args = val.split(" ");
qDebug() << " - Arguments:" << args;
QJsonObject out;
//Now parse the arguments and list them in the output object
out.insert("emulate_button_3", args.contains("-3") ? "true" : "false");
@@ -77,7 +80,7 @@ QJsonObject moused::readOptions(QJsonObject obj){
out.insert("virtual_scrolling", args.contains("-V") ? "true" : "false" );
index = args.indexOf("-A");
QString val = "1.0";
val = "1.0";
if(index>=0 && args.length()>(index+1)){ val = args[index+1].section(",",0,0); }
out.insert("accel_exponential", val);