TDE
/
tdelibs
7
1
Fork 0
Code Issues 16 Pull Requests 8 Releases Wiki Activity

Fix saving display config when Gamma is not supported by xrandr

Browse Source 
This resolves Bug 1506
(cherry picked from commit 90c0f26c7c)
v3.5.13-sru
Francois Andriot 11 years ago committed by Slávek Banko
parent 83803589ba
commit 6391ef85be
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File

30
krandr/libkrandr.cc
Unescape View File

@ -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;

Write Preview
Loading…
Cancel
Save