Commit: a4774dd148f4fd23bb6d2942eebe80f90a2574a6
Parent: 9d096db53a03fea2779b7cf3d6fb3dd3217e0f42
Author: Randy Palamar
Date: Sun, 2 Apr 2023 21:19:53 -0600
mv temperature check to sct_for_screen()
Diffstat:
| M | sct.c | | | 26 | +++++++++----------------- |
1 file changed, 9 insertions(+), 17 deletions(-)
diff --git a/sct.c b/sct.c
@@ -147,7 +147,14 @@ sct_for_screen(int screen, int icrtc, struct temp_status temp)
Window root = RootWindow(dpy, screen);
XRRScreenResources *res = XRRGetScreenResourcesCurrent(dpy, root);
- t = (double)temp.temp;
+ if (temp.temp < TEMPERATURE_ZERO) {
+ fprintf(stderr, "%s: can't set temperature less than: %d\n",
+ argv0, TEMPERATURE_ZERO);
+ t = (double)TEMPERATURE_ZERO;
+ } else {
+ t = (double)temp.temp;
+ }
+
b = DoubleTrim(temp.brightness, 0.0, 1.0);
if (temp.temp < TEMPERATURE_NORM) {
gammar = 1.0;
@@ -271,15 +278,8 @@ main(int argc, char **argv)
if (!dflag) {
// Set temperature to given value or default for
// a value of 0
- if (temp.temp == 0) {
+ if (temp.temp == 0)
temp.temp = TEMPERATURE_NORM;
- } else if (temp.temp < TEMPERATURE_ZERO) {
- fprintf(stderr,
- "WARNING! Temperatures below "
- "%d cannot be displayed.\n",
- TEMPERATURE_ZERO);
- temp.temp = TEMPERATURE_ZERO;
- }
for (screen = screen_first; screen <= screen_last;
screen++)
sct_for_screen(screen, crtc_specified, temp);
@@ -291,14 +291,6 @@ main(int argc, char **argv)
struct temp_status tempd = get_sct_for_screen(
screen, crtc_specified);
tempd.temp += temp.temp;
- if (tempd.temp < TEMPERATURE_ZERO) {
- fprintf(stderr,
- "WARNING! Temperatures "
- "below %d cannot be "
- "displayed.\n",
- TEMPERATURE_ZERO);
- tempd.temp = TEMPERATURE_ZERO;
- }
sct_for_screen(screen, crtc_specified, tempd);
}
}