aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--po/da.po102
-rw-r--r--po/redshift.pot99
-rw-r--r--po/ru.po99
-rw-r--r--src/randr.c39
-rw-r--r--src/randr.h2
-rw-r--r--src/redshift.c44
-rw-r--r--src/redshift.h2
-rw-r--r--src/vidmode.c30
-rw-r--r--src/vidmode.h2
-rw-r--r--src/w32gdi.c2
-rw-r--r--src/w32gdi.h2
11 files changed, 245 insertions, 178 deletions
diff --git a/po/da.po b/po/da.po
index 9d0c6e2..1f8fe15 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: redshift\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/redshift\n"
-"POT-Creation-Date: 2010-05-24 18:24+0200\n"
+"POT-Creation-Date: 2010-05-24 21:10+0200\n"
"PO-Revision-Date: 2010-05-05 22:20+0000\n"
"Last-Translator: Jon Lund Steffensen <Unknown>\n"
"Language-Team: Danish <da@li.org>\n"
@@ -17,17 +17,17 @@ msgstr ""
"X-Launchpad-Export-Date: 2010-05-06 04:09+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: src/redshift.c:197
+#: src/redshift.c:175
#, c-format
msgid "Period: Night\n"
msgstr "Periode: Nat\n"
-#: src/redshift.c:204
+#: src/redshift.c:182
#, c-format
msgid "Period: Transition (%.2f%% day)\n"
msgstr "Periode: Overgang (%.2f%% dag)\n"
-#: src/redshift.c:208
+#: src/redshift.c:186
#, c-format
msgid "Period: Daytime\n"
msgstr "Periode: Dag\n"
@@ -37,20 +37,20 @@ msgstr "Periode: Dag\n"
#. DAY is temperature at daytime,
#. NIGHT is temperature at night
#. no-wrap
-#: src/redshift.c:223
+#: src/redshift.c:201
#, c-format
msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n"
msgstr "Brug: %s -l BRED:LÆNG -t DAG:NAT [TILVALG...]\n"
#. TRANSLATORS: help output 2
#. no-wrap
-#: src/redshift.c:229
+#: src/redshift.c:207
msgid "Set color temperature of display according to time of day.\n"
msgstr "Indstil skærmens farvetemperatur ud fra klokkeslæt.\n"
#. TRANSLATORS: help output 3
#. no-wrap
-#: src/redshift.c:235
+#: src/redshift.c:213
msgid ""
" -h\t\tDisplay this help message\n"
" -v\t\tVerbose output\n"
@@ -60,7 +60,7 @@ msgstr ""
#. TRANSLATORS: help output 4
#. no-wrap
-#: src/redshift.c:241
+#: src/redshift.c:219
#, fuzzy
msgid ""
" -g R:G:B\tAdditional gamma correction to apply\n"
@@ -84,7 +84,7 @@ msgstr ""
" -t DAG:NAT\tFarvetemperatur som sættes hhv. dag og nat\n"
#. TRANSLATORS: help output 5
-#: src/redshift.c:255
+#: src/redshift.c:233
#, c-format
msgid ""
"Default values:\n"
@@ -98,155 +98,160 @@ msgstr ""
" Nattemperatur: %uK\n"
#. TRANSLATORS: help output 6
-#: src/redshift.c:263
+#: src/redshift.c:241
#, c-format
msgid "Please report bugs to <%s>\n"
msgstr ""
-#: src/redshift.c:269
+#: src/redshift.c:247
msgid "Available adjustment methods:\n"
msgstr ""
-#: src/redshift.c:327
+#: src/redshift.c:301
msgid "Malformed gamma argument.\n"
msgstr "Fejl i gamma-argument.\n"
-#: src/redshift.c:329 src/redshift.c:348 src/redshift.c:394 src/redshift.c:406
-#: src/redshift.c:415
+#: src/redshift.c:303 src/redshift.c:322 src/redshift.c:372 src/redshift.c:384
+#: src/redshift.c:393
msgid "Try `-h' for more information.\n"
msgstr "Prøv `-h' for mere information.\n"
-#: src/redshift.c:346
+#: src/redshift.c:320
msgid "Malformed location argument.\n"
msgstr "Fejl i placeringsargument.\n"
#. TRANSLATORS: This refers to the method
#. used to adjust colors e.g VidMode
-#: src/redshift.c:375
+#: src/redshift.c:356
#, c-format
msgid "Unknown method `%s'.\n"
msgstr "Ukendt metode `%s'.\n"
-#: src/redshift.c:392
+#: src/redshift.c:370
msgid "Malformed temperature argument.\n"
msgstr "Fejl i temperaturargument.\n"
-#: src/redshift.c:414
+#: src/redshift.c:392
msgid "Latitude and longitude must be set.\n"
msgstr "Breddegrad og længdegrad skal angives.\n"
#. TRANSLATORS: Append degree symbols if possible.
-#: src/redshift.c:421
+#: src/redshift.c:399
#, c-format
msgid "Location: %f, %f\n"
msgstr "Placering: %f°, %f°\n"
-#: src/redshift.c:428
+#: src/redshift.c:406
#, c-format
msgid "Latitude must be between %.1f and %.1f.\n"
msgstr "Breddegrad skal være mellem %.1f° og %.1f°.\n"
-#: src/redshift.c:437
+#: src/redshift.c:415
#, c-format
msgid "Longitude must be between %.1f and %.1f.\n"
msgstr "Længdegrad skal være mellem %.1f° og %.1f°.\n"
-#: src/redshift.c:445 src/redshift.c:453
+#: src/redshift.c:423 src/redshift.c:431
#, c-format
msgid "Temperature must be between %uK and %uK.\n"
msgstr "Temperatur skal være mellem %uK og %uK.\n"
-#: src/redshift.c:463
+#: src/redshift.c:441
#, c-format
msgid "Gamma value must be between %.1f and %.1f.\n"
msgstr "Gamma-værdi skal være mellem %.1f og %.1f.\n"
-#: src/redshift.c:469
+#: src/redshift.c:447
#, c-format
msgid "Gamma: %.3f, %.3f, %.3f\n"
msgstr "Gamma: %.3f, %.3f, %.3f\n"
-#: src/redshift.c:475
-#, c-format
-msgid "CRTC can only be selected with the RANDR method.\n"
-msgstr "CRTC kan kun vælges med RANDR metoden.\n"
-
-#: src/redshift.c:488 src/redshift.c:498
+#: src/redshift.c:459 src/redshift.c:469
#, fuzzy, c-format
msgid "Initialization of %s failed.\n"
msgstr "Fejl under klargøring af RANDR.\n"
-#: src/redshift.c:500
+#: src/redshift.c:471
msgid "Trying other method...\n"
msgstr "Prøver anden metode...\n"
-#: src/redshift.c:509
+#: src/redshift.c:480
msgid "No more methods to try.\n"
msgstr ""
-#: src/redshift.c:519 src/redshift.c:626
+#: src/redshift.c:490 src/redshift.c:597
#, fuzzy
msgid "Unable to read system time.\n"
msgstr "Kan ikke genskabe CRTC %i\n"
#. TRANSLATORS: Append degree symbol if possible.
-#: src/redshift.c:528
+#: src/redshift.c:499
#, c-format
msgid "Solar elevation: %f\n"
msgstr "Solhøjde: %f°\n"
-#: src/redshift.c:535 src/redshift.c:693
+#: src/redshift.c:506 src/redshift.c:664
#, c-format
msgid "Color temperature: %uK\n"
msgstr "Farvetemperatur: %uK\n"
-#: src/redshift.c:540 src/redshift.c:701
+#: src/redshift.c:511 src/redshift.c:672
msgid "Temperature adjustment failed.\n"
msgstr "Fejl ved justering af temperatur.\n"
-#: src/randr.c:61 src/randr.c:108 src/randr.c:149 src/randr.c:177
-#: src/randr.c:236 src/randr.c:300
+#: src/randr.c:59 src/randr.c:67 src/vidmode.c:54
+#, c-format
+msgid "Missing value for parameter: `%s'.\n"
+msgstr ""
+
+#: src/randr.c:74 src/vidmode.c:61
+#, fuzzy, c-format
+msgid "Unknown method parameter: `%s'.\n"
+msgstr "Ukendt metode `%s'.\n"
+
+#: src/randr.c:98 src/randr.c:145 src/randr.c:186 src/randr.c:214
+#: src/randr.c:273 src/randr.c:337
#, c-format
msgid "`%s' returned error %d\n"
msgstr "`%s' returnerede fejlen %d\n"
-#: src/randr.c:69
+#: src/randr.c:106
#, c-format
msgid "Unsupported RANDR version (%u.%u)\n"
msgstr "Ikke-understøttet RANDR version (%u.%u)\n"
-#: src/randr.c:92
+#: src/randr.c:129
#, c-format
msgid "Screen %i could not be found.\n"
msgstr "Skærm %i kunne ikke findes.\n"
-#: src/randr.c:162 src/vidmode.c:75
+#: src/randr.c:199 src/vidmode.c:103
#, c-format
msgid "Gamma ramp size too small: %i\n"
msgstr "Størrelsen på gammarampen er for lille: %i\n"
-#: src/randr.c:238
+#: src/randr.c:275
#, c-format
msgid "Unable to restore CRTC %i\n"
msgstr "Kan ikke genskabe CRTC %i\n"
-#: src/randr.c:263
+#: src/randr.c:300
#, c-format
msgid "CRTC %d does not exist. "
msgstr "CRTC %d eksisterer ikke. "
-#: src/randr.c:266
+#: src/randr.c:303
#, c-format
msgid "Valid CRTCs are [0-%d].\n"
msgstr "Gyldige CRTCer er [0-%d].\n"
-#: src/randr.c:269
+#: src/randr.c:306
#, c-format
msgid "Only CRTC 0 exists.\n"
msgstr "Kun CRTC 0 eksisterer.\n"
-#: src/vidmode.c:46 src/vidmode.c:58 src/vidmode.c:68 src/vidmode.c:98
-#: src/vidmode.c:129 src/vidmode.c:158
+#: src/vidmode.c:74 src/vidmode.c:86 src/vidmode.c:96 src/vidmode.c:126
+#: src/vidmode.c:157 src/vidmode.c:186
#, c-format
msgid "X request failed: %s\n"
msgstr "Fejl ved X forespørgsel: %s\n"
@@ -255,6 +260,9 @@ msgstr "Fejl ved X forespørgsel: %s\n"
msgid "Toggle"
msgstr "Slå til/fra"
+#~ msgid "CRTC can only be selected with the RANDR method.\n"
+#~ msgstr "CRTC kan kun vælges med RANDR metoden.\n"
+
#~ msgid "RANDR method was not enabled at compile time.\n"
#~ msgstr "RANDR metode blev ikke slået til under kompilering.\n"
diff --git a/po/redshift.pot b/po/redshift.pot
index 48c84cc..da9fded 100644
--- a/po/redshift.pot
+++ b/po/redshift.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: redshift 1.3\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/redshift\n"
-"POT-Creation-Date: 2010-05-24 18:24+0200\n"
+"POT-Creation-Date: 2010-05-24 21:10+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,17 +16,17 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/redshift.c:197
+#: src/redshift.c:175
#, c-format
msgid "Period: Night\n"
msgstr ""
-#: src/redshift.c:204
+#: src/redshift.c:182
#, c-format
msgid "Period: Transition (%.2f%% day)\n"
msgstr ""
-#: src/redshift.c:208
+#: src/redshift.c:186
#, c-format
msgid "Period: Daytime\n"
msgstr ""
@@ -36,20 +36,20 @@ msgstr ""
#. DAY is temperature at daytime,
#. NIGHT is temperature at night
#. no-wrap
-#: src/redshift.c:223
+#: src/redshift.c:201
#, c-format
msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n"
msgstr ""
#. TRANSLATORS: help output 2
#. no-wrap
-#: src/redshift.c:229
+#: src/redshift.c:207
msgid "Set color temperature of display according to time of day.\n"
msgstr ""
#. TRANSLATORS: help output 3
#. no-wrap
-#: src/redshift.c:235
+#: src/redshift.c:213
msgid ""
" -h\t\tDisplay this help message\n"
" -v\t\tVerbose output\n"
@@ -57,7 +57,7 @@ msgstr ""
#. TRANSLATORS: help output 4
#. no-wrap
-#: src/redshift.c:241
+#: src/redshift.c:219
msgid ""
" -g R:G:B\tAdditional gamma correction to apply\n"
" -l LAT:LON\tYour current location\n"
@@ -71,7 +71,7 @@ msgid ""
msgstr ""
#. TRANSLATORS: help output 5
-#: src/redshift.c:255
+#: src/redshift.c:233
#, c-format
msgid ""
"Default values:\n"
@@ -81,154 +81,159 @@ msgid ""
msgstr ""
#. TRANSLATORS: help output 6
-#: src/redshift.c:263
+#: src/redshift.c:241
#, c-format
msgid "Please report bugs to <%s>\n"
msgstr ""
-#: src/redshift.c:269
+#: src/redshift.c:247
msgid "Available adjustment methods:\n"
msgstr ""
-#: src/redshift.c:327
+#: src/redshift.c:301
msgid "Malformed gamma argument.\n"
msgstr ""
-#: src/redshift.c:329 src/redshift.c:348 src/redshift.c:394 src/redshift.c:406
-#: src/redshift.c:415
+#: src/redshift.c:303 src/redshift.c:322 src/redshift.c:372 src/redshift.c:384
+#: src/redshift.c:393
msgid "Try `-h' for more information.\n"
msgstr ""
-#: src/redshift.c:346
+#: src/redshift.c:320
msgid "Malformed location argument.\n"
msgstr ""
#. TRANSLATORS: This refers to the method
#. used to adjust colors e.g VidMode
-#: src/redshift.c:375
+#: src/redshift.c:356
#, c-format
msgid "Unknown method `%s'.\n"
msgstr ""
-#: src/redshift.c:392
+#: src/redshift.c:370
msgid "Malformed temperature argument.\n"
msgstr ""
-#: src/redshift.c:414
+#: src/redshift.c:392
msgid "Latitude and longitude must be set.\n"
msgstr ""
#. TRANSLATORS: Append degree symbols if possible.
-#: src/redshift.c:421
+#: src/redshift.c:399
#, c-format
msgid "Location: %f, %f\n"
msgstr ""
-#: src/redshift.c:428
+#: src/redshift.c:406
#, c-format
msgid "Latitude must be between %.1f and %.1f.\n"
msgstr ""
-#: src/redshift.c:437
+#: src/redshift.c:415
#, c-format
msgid "Longitude must be between %.1f and %.1f.\n"
msgstr ""
-#: src/redshift.c:445 src/redshift.c:453
+#: src/redshift.c:423 src/redshift.c:431
#, c-format
msgid "Temperature must be between %uK and %uK.\n"
msgstr ""
-#: src/redshift.c:463
+#: src/redshift.c:441
#, c-format
msgid "Gamma value must be between %.1f and %.1f.\n"
msgstr ""
-#: src/redshift.c:469
+#: src/redshift.c:447
#, c-format
msgid "Gamma: %.3f, %.3f, %.3f\n"
msgstr ""
-#: src/redshift.c:475
-#, c-format
-msgid "CRTC can only be selected with the RANDR method.\n"
-msgstr ""
-
-#: src/redshift.c:488 src/redshift.c:498
+#: src/redshift.c:459 src/redshift.c:469
#, c-format
msgid "Initialization of %s failed.\n"
msgstr ""
-#: src/redshift.c:500
+#: src/redshift.c:471
msgid "Trying other method...\n"
msgstr ""
-#: src/redshift.c:509
+#: src/redshift.c:480
msgid "No more methods to try.\n"
msgstr ""
-#: src/redshift.c:519 src/redshift.c:626
+#: src/redshift.c:490 src/redshift.c:597
msgid "Unable to read system time.\n"
msgstr ""
#. TRANSLATORS: Append degree symbol if possible.
-#: src/redshift.c:528
+#: src/redshift.c:499
#, c-format
msgid "Solar elevation: %f\n"
msgstr ""
-#: src/redshift.c:535 src/redshift.c:693
+#: src/redshift.c:506 src/redshift.c:664
#, c-format
msgid "Color temperature: %uK\n"
msgstr ""
-#: src/redshift.c:540 src/redshift.c:701
+#: src/redshift.c:511 src/redshift.c:672
msgid "Temperature adjustment failed.\n"
msgstr ""
-#: src/randr.c:61 src/randr.c:108 src/randr.c:149 src/randr.c:177
-#: src/randr.c:236 src/randr.c:300
+#: src/randr.c:59 src/randr.c:67 src/vidmode.c:54
+#, c-format
+msgid "Missing value for parameter: `%s'.\n"
+msgstr ""
+
+#: src/randr.c:74 src/vidmode.c:61
+#, c-format
+msgid "Unknown method parameter: `%s'.\n"
+msgstr ""
+
+#: src/randr.c:98 src/randr.c:145 src/randr.c:186 src/randr.c:214
+#: src/randr.c:273 src/randr.c:337
#, c-format
msgid "`%s' returned error %d\n"
msgstr ""
-#: src/randr.c:69
+#: src/randr.c:106
#, c-format
msgid "Unsupported RANDR version (%u.%u)\n"
msgstr ""
-#: src/randr.c:92
+#: src/randr.c:129
#, c-format
msgid "Screen %i could not be found.\n"
msgstr ""
-#: src/randr.c:162 src/vidmode.c:75
+#: src/randr.c:199 src/vidmode.c:103
#, c-format
msgid "Gamma ramp size too small: %i\n"
msgstr ""
-#: src/randr.c:238
+#: src/randr.c:275
#, c-format
msgid "Unable to restore CRTC %i\n"
msgstr ""
-#: src/randr.c:263
+#: src/randr.c:300
#, c-format
msgid "CRTC %d does not exist. "
msgstr ""
-#: src/randr.c:266
+#: src/randr.c:303
#, c-format
msgid "Valid CRTCs are [0-%d].\n"
msgstr ""
-#: src/randr.c:269
+#: src/randr.c:306
#, c-format
msgid "Only CRTC 0 exists.\n"
msgstr ""
-#: src/vidmode.c:46 src/vidmode.c:58 src/vidmode.c:68 src/vidmode.c:98
-#: src/vidmode.c:129 src/vidmode.c:158
+#: src/vidmode.c:74 src/vidmode.c:86 src/vidmode.c:96 src/vidmode.c:126
+#: src/vidmode.c:157 src/vidmode.c:186
#, c-format
msgid "X request failed: %s\n"
msgstr ""
diff --git a/po/ru.po b/po/ru.po
index f6e19b8..262925b 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: redshift\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/redshift\n"
-"POT-Creation-Date: 2010-05-24 18:24+0200\n"
+"POT-Creation-Date: 2010-05-24 21:10+0200\n"
"PO-Revision-Date: 2010-02-02 09:20+0000\n"
"Last-Translator: Gregory Petrosyan <gregory.petrosyan@gmail.com>\n"
"Language-Team: Russian <ru@li.org>\n"
@@ -17,17 +17,17 @@ msgstr ""
"X-Launchpad-Export-Date: 2010-02-13 05:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: src/redshift.c:197
+#: src/redshift.c:175
#, c-format
msgid "Period: Night\n"
msgstr "Период: Ночь\n"
-#: src/redshift.c:204
+#: src/redshift.c:182
#, c-format
msgid "Period: Transition (%.2f%% day)\n"
msgstr "Период: Переходный (%.2f%% дневной)\n"
-#: src/redshift.c:208
+#: src/redshift.c:186
#, c-format
msgid "Period: Daytime\n"
msgstr "Период: День\n"
@@ -37,20 +37,20 @@ msgstr "Период: День\n"
#. DAY is temperature at daytime,
#. NIGHT is temperature at night
#. no-wrap
-#: src/redshift.c:223
+#: src/redshift.c:201
#, c-format
msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n"
msgstr "Использование: %s -l ШИР:ДОЛ -t ДЕНЬ:НОЧЬ [ОПЦИИ...]\n"
#. TRANSLATORS: help output 2
#. no-wrap
-#: src/redshift.c:229
+#: src/redshift.c:207
msgid "Set color temperature of display according to time of day.\n"
msgstr "Установить цветовую температуру в соответствии со временем суток.\n"
#. TRANSLATORS: help output 3
#. no-wrap
-#: src/redshift.c:235
+#: src/redshift.c:213
msgid ""
" -h\t\tDisplay this help message\n"
" -v\t\tVerbose output\n"
@@ -60,7 +60,7 @@ msgstr ""
#. TRANSLATORS: help output 4
#. no-wrap
-#: src/redshift.c:241
+#: src/redshift.c:219
#, fuzzy
msgid ""
" -g R:G:B\tAdditional gamma correction to apply\n"
@@ -82,7 +82,7 @@ msgstr ""
" -t ДЕНЬ:НОЧЬ\tЦветовая температура для ночного/дневного времени\n"
#. TRANSLATORS: help output 5
-#: src/redshift.c:255
+#: src/redshift.c:233
#, c-format
msgid ""
"Default values:\n"
@@ -92,155 +92,160 @@ msgid ""
msgstr ""
#. TRANSLATORS: help output 6
-#: src/redshift.c:263
+#: src/redshift.c:241
#, c-format
msgid "Please report bugs to <%s>\n"
msgstr ""
-#: src/redshift.c:269
+#: src/redshift.c:247
msgid "Available adjustment methods:\n"
msgstr ""
-#: src/redshift.c:327
+#: src/redshift.c:301
msgid "Malformed gamma argument.\n"
msgstr "Некорректная величина гаммы.\n"
-#: src/redshift.c:329 src/redshift.c:348 src/redshift.c:394 src/redshift.c:406
-#: src/redshift.c:415
+#: src/redshift.c:303 src/redshift.c:322 src/redshift.c:372 src/redshift.c:384
+#: src/redshift.c:393
msgid "Try `-h' for more information.\n"
msgstr "Воспользуйтесь «-h» для получения дополнительной информации.\n"
-#: src/redshift.c:346
+#: src/redshift.c:320
msgid "Malformed location argument.\n"
msgstr "Некорректное значение местоположения.\n"
#. TRANSLATORS: This refers to the method
#. used to adjust colors e.g VidMode
-#: src/redshift.c:375
+#: src/redshift.c:356
#, c-format
msgid "Unknown method `%s'.\n"
msgstr "Неизвестный метод «%s».\n"
-#: src/redshift.c:392
+#: src/redshift.c:370
msgid "Malformed temperature argument.\n"
msgstr "Некорректное значение температуры.\n"
-#: src/redshift.c:414
+#: src/redshift.c:392
msgid "Latitude and longitude must be set.\n"
msgstr "Широта и долгота должны быть указаны.\n"
#. TRANSLATORS: Append degree symbols if possible.
-#: src/redshift.c:421
+#: src/redshift.c:399
#, c-format
msgid "Location: %f, %f\n"
msgstr "Местоположение: %f°, %f°\n"
-#: src/redshift.c:428
+#: src/redshift.c:406
#, c-format
msgid "Latitude must be between %.1f and %.1f.\n"
msgstr "Широта должна быть между %.1f и %.1f.\n"
-#: src/redshift.c:437
+#: src/redshift.c:415
#, c-format
msgid "Longitude must be between %.1f and %.1f.\n"
msgstr "Долгота должна быть между %.1f и %.1f.\n"
-#: src/redshift.c:445 src/redshift.c:453
+#: src/redshift.c:423 src/redshift.c:431
#, c-format
msgid "Temperature must be between %uK and %uK.\n"
msgstr "Температура должна быть между %uK и %uK.\n"
-#: src/redshift.c:463
+#: src/redshift.c:441
#, c-format
msgid "Gamma value must be between %.1f and %.1f.\n"
msgstr "Гамма должна быть между %.1f и %.1f.\n"
-#: src/redshift.c:469
+#: src/redshift.c:447
#, c-format
msgid "Gamma: %.3f, %.3f, %.3f\n"
msgstr "Гамма: %.3f, %.3f, %.3f\n"
-#: src/redshift.c:475
-#, c-format
-msgid "CRTC can only be selected with the RANDR method.\n"
-msgstr ""
-
-#: src/redshift.c:488 src/redshift.c:498
+#: src/redshift.c:459 src/redshift.c:469
#, fuzzy, c-format
msgid "Initialization of %s failed.\n"
msgstr "Инициализация RANDR не удалась.\n"
-#: src/redshift.c:500
+#: src/redshift.c:471
msgid "Trying other method...\n"
msgstr "Пробую другой метод...\n"
-#: src/redshift.c:509
+#: src/redshift.c:480
msgid "No more methods to try.\n"
msgstr ""
-#: src/redshift.c:519 src/redshift.c:626
+#: src/redshift.c:490 src/redshift.c:597
#, fuzzy
msgid "Unable to read system time.\n"
msgstr "Не удается восстановить CRTC %i\n"
#. TRANSLATORS: Append degree symbol if possible.
-#: src/redshift.c:528
+#: src/redshift.c:499
#, c-format
msgid "Solar elevation: %f\n"
msgstr "Высота Солнца над горизонтом: %f°\n"
-#: src/redshift.c:535 src/redshift.c:693
+#: src/redshift.c:506 src/redshift.c:664
#, c-format
msgid "Color temperature: %uK\n"
msgstr "Цветовая температура: %uK\n"
-#: src/redshift.c:540 src/redshift.c:701
+#: src/redshift.c:511 src/redshift.c:672
msgid "Temperature adjustment failed.\n"
msgstr "Корректировка цветовой температуры не удалась.\n"
-#: src/randr.c:61 src/randr.c:108 src/randr.c:149 src/randr.c:177
-#: src/randr.c:236 src/randr.c:300
+#: src/randr.c:59 src/randr.c:67 src/vidmode.c:54
+#, c-format
+msgid "Missing value for parameter: `%s'.\n"
+msgstr ""
+
+#: src/randr.c:74 src/vidmode.c:61
+#, fuzzy, c-format
+msgid "Unknown method parameter: `%s'.\n"
+msgstr "Неизвестный метод «%s».\n"
+
+#: src/randr.c:98 src/randr.c:145 src/randr.c:186 src/randr.c:214
+#: src/randr.c:273 src/randr.c:337
#, c-format
msgid "`%s' returned error %d\n"
msgstr "«%s» завершилось с ошибкой %d\n"
-#: src/randr.c:69
+#: src/randr.c:106
#, c-format
msgid "Unsupported RANDR version (%u.%u)\n"
msgstr "Неподдерживаемая версия RANDR (%u.%u)\n"
-#: src/randr.c:92
+#: src/randr.c:129
#, c-format
msgid "Screen %i could not be found.\n"
msgstr "Экран %i не может быть найден.\n"
-#: src/randr.c:162 src/vidmode.c:75
+#: src/randr.c:199 src/vidmode.c:103
#, c-format
msgid "Gamma ramp size too small: %i\n"
msgstr "Размер кривой гаммы слишком мал: %i\n"
-#: src/randr.c:238
+#: src/randr.c:275
#, c-format
msgid "Unable to restore CRTC %i\n"
msgstr "Не удается восстановить CRTC %i\n"
-#: src/randr.c:263
+#: src/randr.c:300
#, c-format
msgid "CRTC %d does not exist. "
msgstr ""
-#: src/randr.c:266
+#: src/randr.c:303
#, c-format
msgid "Valid CRTCs are [0-%d].\n"
msgstr ""
-#: src/randr.c:269
+#: src/randr.c:306
#, c-format
msgid "Only CRTC 0 exists.\n"
msgstr ""
-#: src/vidmode.c:46 src/vidmode.c:58 src/vidmode.c:68 src/vidmode.c:98
-#: src/vidmode.c:129 src/vidmode.c:158
+#: src/vidmode.c:74 src/vidmode.c:86 src/vidmode.c:96 src/vidmode.c:126
+#: src/vidmode.c:157 src/vidmode.c:186
#, c-format
msgid "X request failed: %s\n"
msgstr "Запрос X не удался: %s\n"
diff --git a/src/randr.c b/src/randr.c
index 3ee0f42..4ee1756 100644
--- a/src/randr.c
+++ b/src/randr.c
@@ -19,6 +19,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <stdint.h>
#include <string.h>
#ifdef ENABLE_NLS
@@ -40,8 +41,44 @@
int
-randr_init(randr_state_t *state, int screen_num, int crtc_num)
+randr_init(randr_state_t *state, char *args)
{
+ int screen_num = -1;
+ int crtc_num = -1;
+
+ /* Parse arguments. */
+ while (args != NULL) {
+ char *next_arg = strchr(args, ':');
+ if (next_arg != NULL) *(next_arg++) = '\0';
+
+ char *value = strchr(args, '=');
+ if (value != NULL) *(value++) = '\0';
+
+ if (strcasecmp(args, "screen") == 0) {
+ if (value == NULL) {
+ fprintf(stderr, _("Missing value for"
+ " parameter: `%s'.\n"),
+ args);
+ return -1;
+ }
+ screen_num = atoi(value);
+ } else if (strcasecmp(args, "crtc") == 0) {
+ if (value == NULL) {
+ fprintf(stderr, _("Missing value for"
+ " parameter: `%s'.\n"),
+ args);
+ return -1;
+ }
+ crtc_num = atoi(value);
+ } else {
+ fprintf(stderr, _("Unknown method parameter: `%s'.\n"),
+ args);
+ return -1;
+ }
+
+ args = next_arg;
+ }
+
xcb_generic_error_t *error;
/* Open X server connection */
diff --git a/src/randr.h b/src/randr.h
index 8e8e56e..3ad83bf 100644
--- a/src/randr.h
+++ b/src/randr.h
@@ -43,7 +43,7 @@ typedef struct {
} randr_state_t;
-int randr_init(randr_state_t *state, int screen_num, int crtc_num);
+int randr_init(randr_state_t *state, char *args);
void randr_free(randr_state_t *state);
void randr_restore(randr_state_t *state);
int randr_set_temperature(randr_state_t *state, int temp, float gamma[3]);
diff --git a/src/redshift.c b/src/redshift.c
index c39c033..869714f 100644
--- a/src/redshift.c
+++ b/src/redshift.c
@@ -81,15 +81,6 @@ typedef union {
} gamma_state_t;
-/* Enum of gamma adjustment methods */
-typedef enum {
- GAMMA_METHOD_RANDR,
- GAMMA_METHOD_VIDMODE,
- GAMMA_METHOD_WINGDI,
- GAMMA_METHOD_MAX
-} gamma_method_t;
-
-
/* Gamma adjustment method structs */
static const gamma_method_spec_t gamma_methods[] = {
#ifdef ENABLE_RANDR
@@ -283,9 +274,8 @@ main(int argc, char *argv[])
float gamma[3] = { DEFAULT_GAMMA, DEFAULT_GAMMA, DEFAULT_GAMMA };
const gamma_method_spec_t *method = NULL;
+ char *method_args = NULL;
- int screen_num = -1;
- int crtc_num = -1;
int transition = 1;
int one_shot = 0;
int verbose = 0;
@@ -293,11 +283,8 @@ main(int argc, char *argv[])
/* Parse arguments. */
int opt;
- while ((opt = getopt(argc, argv, "c:g:hl:m:ors:t:v")) != -1) {
+ while ((opt = getopt(argc, argv, "g:hl:m:ort:v")) != -1) {
switch (opt) {
- case 'c':
- crtc_num = atoi(optarg);
- break;
case 'g':
s = strchr(optarg, ':');
if (s == NULL) {
@@ -347,6 +334,13 @@ main(int argc, char *argv[])
exit(EXIT_SUCCESS);
}
+ /* Split off method arguments. */
+ s = strchr(optarg, ':');
+ if (s != NULL) {
+ *(s++) = '\0';
+ method_args = s;
+ }
+
/* Lookup argument in gamma methods table */
for (int i = 0; gamma_methods[i].name != NULL; i++) {
const gamma_method_spec_t *m =
@@ -370,9 +364,6 @@ main(int argc, char *argv[])
case 'r':
transition = 0;
break;
- case 's':
- screen_num = atoi(optarg);
- break;
case 't':
s = strchr(optarg, ':');
if (s == NULL) {
@@ -457,30 +448,23 @@ main(int argc, char *argv[])
gamma[0], gamma[1], gamma[2]);
}
- /* CRTC can only be selected for RANDR */
- if (crtc_num > -1 && method != GAMMA_METHOD_RANDR) {
- fprintf(stderr, _("CRTC can only be selected"
- " with the RANDR method.\n"));
- exit(EXIT_FAILURE);
- }
-
- /* Initialize gamma adjustment method. If method is negative
+ /* Initialize gamma adjustment method. If method is NULL
try all methods until one that works is found. */
gamma_state_t state;
if (method != NULL) {
- /* Use method specified on command line */
- r = method->init(&state, screen_num, crtc_num);
+ /* Use method specified on command line. */
+ r = method->init(&state, method_args);
if (r < 0) {
fprintf(stderr, _("Initialization of %s failed.\n"),
method->name);
exit(EXIT_FAILURE);
}
} else {
- /* Try all methods, use the first that works */
+ /* Try all methods, use the first that works. */
for (int i = 0; gamma_methods[i].name != NULL; i++) {
const gamma_method_spec_t *m = &gamma_methods[i];
- r = m->init(&state, screen_num, crtc_num);
+ r = m->init(&state, method_args);
if (r < 0) {
fprintf(stderr, _("Initialization of %s"
" failed.\n"), m->name);
diff --git a/src/redshift.h b/src/redshift.h
index 84e7818..3cfe738 100644
--- a/src/redshift.h
+++ b/src/redshift.h
@@ -21,7 +21,7 @@
#define _REDSHIFT_REDSHIFT_H
-typedef int gamma_method_init_func(void *state, int screen_num, int crtc_num);
+typedef int gamma_method_init_func(void *state, char *args);
typedef void gamma_method_free_func(void *state);
typedef void gamma_method_restore_func(void *state);
typedef int gamma_method_set_temperature_func(void *state, int temp,
diff --git a/src/vidmode.c b/src/vidmode.c
index 12bec8b..df66f8c 100644
--- a/src/vidmode.c
+++ b/src/vidmode.c
@@ -20,6 +20,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <stdint.h>
+#include <string.h>
#ifdef ENABLE_NLS
# include <libintl.h>
@@ -36,8 +37,35 @@
int
-vidmode_init(vidmode_state_t *state, int screen_num, int crtc_num)
+vidmode_init(vidmode_state_t *state, char *args)
{
+ int screen_num = -1;
+
+ /* Parse arguments. */
+ while (args != NULL) {
+ char *next_arg = strchr(args, ':');
+ if (next_arg != NULL) *(next_arg++) = '\0';
+
+ char *value = strchr(args, '=');
+ if (value != NULL) *(value++) = '\0';
+
+ if (strcasecmp(args, "screen") == 0) {
+ if (value == NULL) {
+ fprintf(stderr, _("Missing value for"
+ " parameter: `%s'.\n"),
+ args);
+ return -1;
+ }
+ screen_num = atoi(value);
+ } else {
+ fprintf(stderr, _("Unknown method parameter: `%s'.\n"),
+ args);
+ return -1;
+ }
+
+ args = next_arg;
+ }
+
int r;
/* Open display */
diff --git a/src/vidmode.h b/src/vidmode.h
index 0386adc..2b6796d 100644
--- a/src/vidmode.h
+++ b/src/vidmode.h
@@ -31,7 +31,7 @@ typedef struct {
uint16_t *saved_ramps;
} vidmode_state_t;
-int vidmode_init(vidmode_state_t *state, int screen_num, int crtc_num);
+int vidmode_init(vidmode_state_t *state, char *args);
void vidmode_free(vidmode_state_t *state);
void vidmode_restore(vidmode_state_t *state);
int vidmode_set_temperature(vidmode_state_t *state, int temp, float gamma[3]);
diff --git a/src/w32gdi.c b/src/w32gdi.c
index e130d03..f15746e 100644
--- a/src/w32gdi.c
+++ b/src/w32gdi.c
@@ -38,7 +38,7 @@
int
-w32gdi_init(w32gdi_state_t *state, int screen_num, int crtc_num)
+w32gdi_init(w32gdi_state_t *state, char *args)
{
BOOL r;
diff --git a/src/w32gdi.h b/src/w32gdi.h
index 6a7c1c2..99ba3ee 100644
--- a/src/w32gdi.h
+++ b/src/w32gdi.h
@@ -29,7 +29,7 @@ typedef struct {
WORD *saved_ramps;
} w32gdi_state_t;
-int w32gdi_init(w32gdi_state_t *state, int screen_num, int crtc_num);
+int w32gdi_init(w32gdi_state_t *state, char *args);
void w32gdi_free(w32gdi_state_t *state);
void w32gdi_restore(w32gdi_state_t *state);
int w32gdi_set_temperature(w32gdi_state_t *state, int temp, float gamma[3]);
generated by cgit v1.2.3-70-g09d2 (git 2.48.0) at 2025-04-07 17:29:25 +0000