diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2018-02-27 09:33:19 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2018-02-27 09:33:19 +0100 |
| commit | 6d4049640ed1de6a29b7108ebde89947877d5d27 (patch) | |
| tree | 1ee4f2f134b971766d6b7eceb4e254f7f420c67f /nxcomp | |
| parent | a88ca271751c1bcf90b352b8c5a79631263c56aa (diff) | |
| parent | 29c166dbed16cbc3112b4915f4e6938b92983999 (diff) | |
| download | nx-libs-6d4049640ed1de6a29b7108ebde89947877d5d27.tar.gz nx-libs-6d4049640ed1de6a29b7108ebde89947877d5d27.tar.bz2 nx-libs-6d4049640ed1de6a29b7108ebde89947877d5d27.zip | |
Merge branch 'sunweaver-pr/autodetect-dpi' into 3.6.x
Attributes GH PR #522: https://github.com/ArcticaProject/nx-libs/pull/522
Diffstat (limited to 'nxcomp')
| -rw-r--r-- | nxcomp/src/Loop.cpp | 3 | ||||
| -rw-r--r-- | nxcomp/src/Misc.cpp | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp index 251eb04f3..5365a99cf 100644 --- a/nxcomp/src/Loop.cpp +++ b/nxcomp/src/Loop.cpp @@ -8476,7 +8476,8 @@ int ParseEnvironmentOptions(const char *env, int force) strcasecmp(name, "tile") == 0 || strcasecmp(name, "menu") == 0 || strcasecmp(name, "magicpixel") == 0 || - strcasecmp(name, "state") == 0 ) + strcasecmp(name, "autodpi") == 0 || + strcasecmp(name, "state") == 0 ) { nxdbg << "Loop: Ignoring agent option '" << name << "' with value '" << value << "'.\n" diff --git a/nxcomp/src/Misc.cpp b/nxcomp/src/Misc.cpp index b6bf24578..4f1af0ec4 100644 --- a/nxcomp/src/Misc.cpp +++ b/nxcomp/src/Misc.cpp @@ -344,6 +344,7 @@ defer=n\n\ tile=s\n\ menu=n\n\ magicpixel=n\n\ +autodpi=n\n\ sleep=n\n\ tolerancechecks=s\n\ keyconv=s\n\ |