Skip to content

Commit cde1ecf

Browse files
authored
Merge pull request #1 from martinetd/wayland
wayland: do not exit until ^C in wayland mode
2 parents 420d0d5 + 613bd1a commit cde1ecf

File tree

1 file changed

+14
-11
lines changed

1 file changed

+14
-11
lines changed

src/redshift.c

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1244,11 +1244,12 @@ main(int argc, char *argv[])
12441244
exit(EXIT_FAILURE);
12451245
}
12461246

1247-
/* In Quartz (macOS) the gamma adjustments will
1248-
automatically revert when the process exits.
1247+
/* In Quartz (macOS) and wayland, the gamma adjustments
1248+
will automatically revert when the process exits.
12491249
Therefore, we have to loop until CTRL-C is received.
12501250
*/
1251-
if (strcmp(options.method->name, "quartz") == 0) {
1251+
if (strcmp(options.method->name, "quartz") == 0 ||
1252+
strcmp(options.method->name, "wayland") == 0) {
12521253
fputs(_("Press ctrl-c to stop...\n"), stderr);
12531254
pause();
12541255
}
@@ -1273,10 +1274,11 @@ main(int argc, char *argv[])
12731274
exit(EXIT_FAILURE);
12741275
}
12751276

1276-
/* In Quartz (OSX) the gamma adjustments will automatically
1277-
revert when the process exits. Therefore, we have to loop
1278-
until CTRL-C is received. */
1279-
if (strcmp(options.method->name, "quartz") == 0) {
1277+
/* In Quartz (OSX) and wayland, the gamma adjustments will
1278+
automatically revert when the process exits.
1279+
Therefore, we have to loop until CTRL-C is received. */
1280+
if (strcmp(options.method->name, "quartz") == 0 ||
1281+
strcmp(options.method->name, "wayland") == 0) {
12801282
fputs(_("Press ctrl-c to stop...\n"), stderr);
12811283
pause();
12821284
}
@@ -1295,10 +1297,11 @@ main(int argc, char *argv[])
12951297
exit(EXIT_FAILURE);
12961298
}
12971299

1298-
/* In Quartz (OSX) the gamma adjustments will automatically
1299-
revert when the process exits. Therefore, we have to loop
1300-
until CTRL-C is received. */
1301-
if (strcmp(options.method->name, "quartz") == 0) {
1300+
/* In Quartz (OSX) and wayland, the gamma adjustments will
1301+
automatically revert when the process exits.
1302+
Therefore, we have to loop until CTRL-C is received. */
1303+
if (strcmp(options.method->name, "quartz") == 0 ||
1304+
strcmp(options.method->name, "wayland") == 0) {
13021305
fputs(_("Press ctrl-c to stop...\n"), stderr);
13031306
pause();
13041307
}

0 commit comments

Comments
 (0)