diff options
| author | Francois Andriot <francois.andriot@free.fr> | 2013-05-24 01:37:29 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-05-24 01:41:17 +0200 |
| commit | 6391ef85bec64ea539e50f4f0b826e431b24039d (patch) | |
| tree | cd29a53cbe93cb30a8d2c80a075fc53b5c36e864 /krandr | |
| parent | 83803589ba6230c8d1542c4d89f301046ebf6b59 (diff) | |
| download | tdelibs-6391ef85bec64ea539e50f4f0b826e431b24039d.tar.gz tdelibs-6391ef85bec64ea539e50f4f0b826e431b24039d.zip | |
Fix saving display config when Gamma is not supported by xrandr
This resolves Bug 1506
(cherry picked from commit 90c0f26c7c977c52e78246db83906807e0a109f5)
Diffstat (limited to 'krandr')
| -rw-r--r-- | krandr/libkrandr.cc | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/krandr/libkrandr.cc b/krandr/libkrandr.cc index 06a242101..01aeb7d3f 100644 --- a/krandr/libkrandr.cc +++ b/krandr/libkrandr.cc @@ -24,6 +24,7 @@ #include <tqtimer.h> #include <tqstringlist.h> +#include <tqregexp.h> #include <klocale.h> #include <kmessagebox.h> @@ -624,7 +625,16 @@ bool KRandrSimpleAPI::applySystemwideDisplayConfiguration(TQPtrList<SingleScreen TQString xrandr_command_output = exec(command.ascii()); xrandr_command_output = xrandr_command_output.stripWhiteSpace(); if (test) { - if (xrandr_command_output != "") { + // In case gamma settings is not supported, try again without '--gamma' parameter + if (xrandr_command_output == "xrandr: Gamma size is 0.") { + command = command.replace(TQRegExp("--gamma [0-9\\.]*:[0-9\\.]*:[0-9\\.]*"), ""); + xrandr_command_output = exec(command.ascii()); + xrandr_command_output = xrandr_command_output.stripWhiteSpace(); + } + + if(xrandr_command_output.startsWith("xrandr: Failed to get size of gamma for output")) { + KMessageBox::sorry(0, xrandr_command_output, i18n("Setting gamma failed.")); + } else if (xrandr_command_output != "") { applySystemwideDisplayConfiguration(oldconfig, FALSE, kde_confdir); accepted = false; destroyScreenInformationObject(oldconfig); @@ -1146,19 +1156,19 @@ TQPtrList<SingleScreenData> KRandrSimpleAPI::readCurrentDisplayConfiguration() { // It may not always be 100% correct, or even anywhere close... // Essentially it "undoes" the LUT gamma calculation from xrandr // lut_gamma->green[i] = (pow(i/(size - 1), desired_gamma.green) * (size - 1) * 256); + screendata->gamma_red = 2.2; + screendata->gamma_green = 2.2; + screendata->gamma_blue = 2.2; if (current_crtc) { //int slot = 127; int slot = 7; int size = XRRGetCrtcGammaSize(randr_display, current_crtc->id); - XRRCrtcGamma *gammastruct = XRRGetCrtcGamma (randr_display, current_crtc->id); - screendata->gamma_red = log(gammastruct->red[slot]/((size-1.0)*256.0))/log(slot/(size-1.0)); - screendata->gamma_green = log(gammastruct->green[slot]/((size-1.0)*256.0))/log(slot/(size-1.0)); - screendata->gamma_blue = log(gammastruct->blue[slot]/((size-1.0)*256.0))/log(slot/(size-1.0)); - } - else { - screendata->gamma_red = 2.2; - screendata->gamma_green = 2.2; - screendata->gamma_blue = 2.2; + if(size>0) { + XRRCrtcGamma *gammastruct = XRRGetCrtcGamma (randr_display, current_crtc->id); + screendata->gamma_red = log(gammastruct->red[slot]/((size-1.0)*256.0))/log(slot/(size-1.0)); + screendata->gamma_green = log(gammastruct->green[slot]/((size-1.0)*256.0))/log(slot/(size-1.0)); + screendata->gamma_blue = log(gammastruct->blue[slot]/((size-1.0)*256.0))/log(slot/(size-1.0)); + } } // Round off the gamma to one decimal place screendata->gamma_red = floorf(screendata->gamma_red * 10 + 0.5) / 10; |