From f7d30d3222a891506350ae96e4a3439bcd4f6264 Mon Sep 17 00:00:00 2001 From: Bill Kendrick Date: Sat, 21 Sep 2019 16:33:55 -0700 Subject: [PATCH] Added --nostereo option Ability to disable stereo panning effect (e.g., paint brush, UI elements sound effect feedback, etc.), useful for users with hearing impairment in one ear, or situations where one speaker or headphone is being used. Use "--nostereo" command-line option or "nostereo=yes" config. file option. --- docs/CHANGES.txt | 8 +- docs/en/OPTIONS.txt | 571 ++++++++++++++++++----------------- docs/en/README.txt | 2 +- docs/en/html/OPTIONS.html | 12 +- docs/en/html/README.html | 2 +- src/manpage/tuxpaint.1 | 14 +- src/parse.gperf | 1 + src/parse.h | 1 + src/playsound.c | 38 ++- src/playsound.h | 4 +- src/tuxpaint-completion.bash | 1 + src/tuxpaint.c | 14 +- src/tuxpaint.conf | 9 +- 13 files changed, 367 insertions(+), 310 deletions(-) diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt index ff1f27099..91cfb47bc 100644 --- a/docs/CHANGES.txt +++ b/docs/CHANGES.txt @@ -8,7 +8,7 @@ http://www.tuxpaint.org/ $Id$ -2019.Sep.14 (0.9.24) +2019.Sep.21 (0.9.24) * New tools --------- * Fill @@ -67,6 +67,12 @@ $Id$ * Updated some Starter source images so they work better with flood fill (Bald Eagle, World map, Gecko). + * Ability to disable stereo panning effect (e.g., paint brush, UI + elements sound effect feedback, etc.), useful for users with + hearing impairment in one ear, or situations where one speaker or + headphone is being used. Use "--nostereo" command-line option + or "nostereo=yes" config. file option. + * Documentation updates --------------------- * Mended link to MinGW/MSYS instructions at John Popplewell's website. diff --git a/docs/en/OPTIONS.txt b/docs/en/OPTIONS.txt index 88f707e7b..0797db276 100644 --- a/docs/en/OPTIONS.txt +++ b/docs/en/OPTIONS.txt @@ -3,10 +3,10 @@ Options Documentation - Copyright (c) 2002-2018 by various contributors; see AUTHORS.txt + Copyright (c) 2002-2019 by various contributors; see AUTHORS.txt http://www.tuxpaint.org/ - December 18, 2018 + September 21, 2019 ---------------------------------------------------------------------- @@ -129,6 +129,11 @@ Windows Users used to reenable sounds if they were disabled using this option.) + nostereo=yes + Disable stereo panning support. (Useful for users with hearing + impairment in one ear, or places where a single speaker or + headphone is being used.) + noquit=yes Disable the on-screen "Quit" button and prevent the [Escape] @@ -963,6 +968,7 @@ Windows Users --allowscreensaver --startblank --nosound + --nostereo --noquit --noprint --printdelay=SECONDS @@ -1036,6 +1042,7 @@ Windows Users --disablescreensaver --startlast --sound + --stereo --quit --print --printdelay=0 @@ -1137,287 +1144,285 @@ Command-Line Informational Options Available Languages +------------------------------------------------------------------+ - | |Language |Language |Input Method | - |Locale Code |(native name) |(English name) |Cycle Key | - | | | |Combination | - |----------------+----------------+---------------+----------------| - |C | |English | | - |----------------+----------------+---------------+----------------| - |ach_UG |Acoli |Acholi | | - |----------------+----------------+---------------+----------------| - |af_ZA | |Afrikaans | | - |----------------+----------------+---------------+----------------| - |ak_GH | |Akan | | - |----------------+----------------+---------------+----------------| - |am_ET | |Amharic | | - |----------------+----------------+---------------+----------------| - |an_ES | |Aragones | | - |----------------+----------------+---------------+----------------| - |ar_SA | |Arabic | | - |----------------+----------------+---------------+----------------| - |as_IN | |Assamese | | - |----------------+----------------+---------------+----------------| - |ast_ES | |Asturian | | - |----------------+----------------+---------------+----------------| - |az_AZ | |Azerbaijani | | - |----------------+----------------+---------------+----------------| - |bm_ML | |Bambara | | - |----------------+----------------+---------------+----------------| - |bn_IN | |Bengali | | - |----------------+----------------+---------------+----------------| - |be_BY |Bielaruskaja |Belarusian | | - |----------------+----------------+---------------+----------------| - |bg_BG | |Bulgarian | | - |----------------+----------------+---------------+----------------| - |bo_CN (*) | |Tibetan | | - |----------------+----------------+---------------+----------------| - |br_FR |Brezhoneg |Breton | | - |----------------+----------------+---------------+----------------| - |brx_IN | |Bodo | | - |----------------+----------------+---------------+----------------| - |bs_BA | |Bosnian | | - |----------------+----------------+---------------+----------------| - |ca_ES |Català |Catalan | | - |----------------+----------------+---------------+----------------| - |ca_ES@valencia |Valencia |Valencian | | - |----------------+----------------+---------------+----------------| - |cgg_UG |Chiga |Kiga | | - |----------------+----------------+---------------+----------------| - |cs_CZ |Cesky |Czech | | - |----------------+----------------+---------------+----------------| - |cy_GB |Cymraeg |Welsh | | - |----------------+----------------+---------------+----------------| - |da_DK |Dansk |Danish | | - |----------------+----------------+---------------+----------------| - |de_DE |Deutsch |German | | - |----------------+----------------+---------------+----------------| - |doi_IN | |Dogri | | - |----------------+----------------+---------------+----------------| - |et_EE | |Estonian | | - |----------------+----------------+---------------+----------------| - |el_GR (*) | |Greek | | - |----------------+----------------+---------------+----------------| - |en_AU | |Australian | | - | | |English | | - |----------------+----------------+---------------+----------------| - |en_CA | |Canadian | | - | | |English | | - |----------------+----------------+---------------+----------------| - |en_GB | |British English| | - |----------------+----------------+---------------+----------------| - |en_ZA | |South African | | - | | |English | | - |----------------+----------------+---------------+----------------| - |eo | |Esperanto | | - |----------------+----------------+---------------+----------------| - |es_ES |Español |Spanish | | - |----------------+----------------+---------------+----------------| - |es_MX |Español-Mejicano|Mexican Spanish| | - |----------------+----------------+---------------+----------------| - |eu_ES |Euskara |Basque | | - |----------------+----------------+---------------+----------------| - |fa_IR | |Persian | | - |----------------+----------------+---------------+----------------| - |ff_SN |Fulah |Fula | | - |----------------+----------------+---------------+----------------| - |fi_FI |Suomi |Finnish | | - |----------------+----------------+---------------+----------------| - |fo_FO | |Faroese | | - |----------------+----------------+---------------+----------------| - |fr_FR |Français |French | | - |----------------+----------------+---------------+----------------| - |ga_IE |Gàidhlig |Irish Gaelic | | - |----------------+----------------+---------------+----------------| - |gd_GB |Ghaidhlig |Scottish Gaelic| | - |----------------+----------------+---------------+----------------| - |gl_ES |Galego |Galician | | - |----------------+----------------+---------------+----------------| - |gos_NL |Zudelk |Gronings | | - | |Veenkelonioals | | | - |----------------+----------------+---------------+----------------| - |gu_IN | |Gujarati | | - |----------------+----------------+---------------+----------------| - |he_IL (*) | |Hebrew | | - |----------------+----------------+---------------+----------------| - |hi_IN (*) | |Hindi | | - |----------------+----------------+---------------+----------------| - |hr_HR |Hrvatski |Croatian | | - |----------------+----------------+---------------+----------------| - |hu_HU |Magyar |Hungarian | | - |----------------+----------------+---------------+----------------| - |hy_AM |Hayeren |Armenian | | - |----------------+----------------+---------------+----------------| - |id_ID |Bahasa Indonesia|Indonesian | | - |----------------+----------------+---------------+----------------| - |is_IS |Íslenska |Icelandic | | - |----------------+----------------+---------------+----------------| - |it_IT |Italiano |Italian | | - |----------------+----------------+---------------+----------------| - |iu_CA | |Inuktitut | | - |----------------+----------------+---------------+----------------| - |ja_JP (*) | |Japanese |right [Alt] | - |----------------+----------------+---------------+----------------| - |ka_GE | |Georgian | | - |----------------+----------------+---------------+----------------| - |kab | |Kabyle | | - |----------------+----------------+---------------+----------------| - |km_KH | |Khmer | | - |----------------+----------------+---------------+----------------| - |kn_IN | |Kannada | | - |----------------+----------------+---------------+----------------| - |ko_KR (*) | |Korean |right [Alt] or | - | | | |left [Alt] | - |----------------+----------------+---------------+----------------| - |kok_IN | |Konkani | | - | | |(Devaganari) | | - |----------------+----------------+---------------+----------------| - |kok@roman | |Konkani (Roman)| | - |----------------+----------------+---------------+----------------| - |ks_IN@devanagari| |Kashmiri | | - | | |(Devanagari) | | - |----------------+----------------+---------------+----------------| - |ks_IN | |Kashmiri | | - | | |(Perso-Arabic) | | - |----------------+----------------+---------------+----------------| - |ku_TR | |Kurdish | | - |----------------+----------------+---------------+----------------| - |lb_LU |Letzebuergesch |Luxembourgish | | - |----------------+----------------+---------------+----------------| - |lg_UG | |Luganda | | - |----------------+----------------+---------------+----------------| - |lt_LT |Lietuviu |Lithuanian | | - |----------------+----------------+---------------+----------------| - |lv_LV | |Latvian | | - |----------------+----------------+---------------+----------------| - |mk_MK | |Macedonian | | - |----------------+----------------+---------------+----------------| - |mai_IN | |Maithili | | - |----------------+----------------+---------------+----------------| - |ml_IN | |Malayalam | | - |----------------+----------------+---------------+----------------| - |mn_MN | |Mongolian | | - |----------------+----------------+---------------+----------------| - |mni_IN | |Manipuri | | - | | |(Bengali) | | - |----------------+----------------+---------------+----------------| - |mni@meiteimayek | |Manipuri | | - | | |(Meitei Mayek) | | - |----------------+----------------+---------------+----------------| - |mr_IN | |Marathi | | - |----------------+----------------+---------------+----------------| - |ms_MY | |Malay | | - |----------------+----------------+---------------+----------------| - |nb_NO |Norsk (bokmål) |Norwegian | | - | | |Bokmål | | - |----------------+----------------+---------------+----------------| - |ne_NP |Nepali | | | - |----------------+----------------+---------------+----------------| - |nl_NL | |Dutch | | - |----------------+----------------+---------------+----------------| - |nn_NO |Norsk (nynorsk) |Norwegian | | - | | |Nynorsk | | - |----------------+----------------+---------------+----------------| - |nr_ZA | |Ndebele | | - |----------------+----------------+---------------+----------------| - |nso_ZA |Sesotho sa Leboa|Northern Sotho | | - |----------------+----------------+---------------+----------------| - |oc_FR | |Occitan | | - |----------------+----------------+---------------+----------------| - |oj_CA | |Ojibwe |Ojibway | - |----------------+----------------+---------------+----------------| - |pa_IN | |Punjabi | | - |----------------+----------------+---------------+----------------| - |or_IN | |Odia |Oriya | - |----------------+----------------+---------------+----------------| - |pl_PL |Polski |Polish | | - |----------------+----------------+---------------+----------------| - |pt_BR |Portugês |Brazilian | | - | |Brazileiro |Portuguese | | - |----------------+----------------+---------------+----------------| - |pt_PT |Portugês |Portuguese | | - |----------------+----------------+---------------+----------------| - |ro_RO | |Romanian | | - |----------------+----------------+---------------+----------------| - |ru_RU |Russkiy |Russian | | - |----------------+----------------+---------------+----------------| - |rw_RW | |Kinyarwanda | | - |----------------+----------------+---------------+----------------| - |sa_IN | |Sanskrit | | - |----------------+----------------+---------------+----------------| - |sat_IN | |Santali | | - | | |(Devaganari) | | - |----------------+----------------+---------------+----------------| - |sat@olchiki | |Santali | | - | | |(Ol-Chikii) | | - |----------------+----------------+---------------+----------------| - |shs_CA |Secwepemctin |Shuswap | | - |----------------+----------------+---------------+----------------| - |si_LK | |Sinhala | | - |----------------+----------------+---------------+----------------| - |sd_IN@devanagari| |Sindhi | | - | | |(Devanagari) | | - |----------------+----------------+---------------+----------------| - |sd_IN | |Sindhi | | - |----------------+----------------+---------------+----------------| - |sk_SK | |Slovak | | - |----------------+----------------+---------------+----------------| - |sl_SI | |Slovenian | | - |----------------+----------------+---------------+----------------| - |son | |Songhay | | - |----------------+----------------+---------------+----------------| - |sq_AL | |Albanian | | - |----------------+----------------+---------------+----------------| - |sr_YU | |Serbian | | - | | |(cyrillic) | | - |----------------+----------------+---------------+----------------| - |sr_RS@latin | |Serbian (latin)| | - |----------------+----------------+---------------+----------------| - |su_ID | |Sundanese | | - |----------------+----------------+---------------+----------------| - |sv_SE |Svenska |Swedish | | - |----------------+----------------+---------------+----------------| - |sw_TZ | |Swahili | | - |----------------+----------------+---------------+----------------| - |ta_IN (*) | |Tamil | | - |----------------+----------------+---------------+----------------| - |te_IN (*) | |Telugu | | - |----------------+----------------+---------------+----------------| - |th_TH (*) | |Thai | | - |----------------+----------------+---------------+----------------| - |tl_PH (*) | |Tagalog | | - |----------------+----------------+---------------+----------------| - |tlh |tlhIngan |Klingon | | - |----------------+----------------+---------------+----------------| - |tr_TR | |Turkish | | - |----------------+----------------+---------------+----------------| - |tw_GH | |Twi | | - |----------------+----------------+---------------+----------------| - |uk_UA | |Ukrainian | | - |----------------+----------------+---------------+----------------| - |ur_IN | |Urdu | | - |----------------+----------------+---------------+----------------| - |ve_ZA | |Venda | | - |----------------+----------------+---------------+----------------| - |vec |Venèto |Venetian | | - |----------------+----------------+---------------+----------------| - |vi_VN | |Vietnamese | | - |----------------+----------------+---------------+----------------| - |wa_BE | |Walloon | | - |----------------+----------------+---------------+----------------| - |wo_SN | |Wolof | | - |----------------+----------------+---------------+----------------| - |xh_ZA | |Xhosa | | - |----------------+----------------+---------------+----------------| - |zh_CN (*) | |Chinese | | - | | |(Simplified) | | - |----------------+----------------+---------------+----------------| - |zh_TW (*) | |Chinese | | - | | |(Traditional) | | - |----------------+----------------+---------------+----------------| - |zam | |Zapotec | | - | | |(Miahuatlan) | | - |----------------+----------------+---------------+----------------| - |zu_ZA | |Zulu | | + | |Language |Language |Input Method | + |Locale Code |(native name) |(English name) |Cycle Key | + | | | |Combination | + |----------------+----------------+----------------+---------------| + |C | |English | | + |----------------+----------------+----------------+---------------| + |ach_UG |Acoli |Acholi | | + |----------------+----------------+----------------+---------------| + |af_ZA | |Afrikaans | | + |----------------+----------------+----------------+---------------| + |ak_GH | |Akan | | + |----------------+----------------+----------------+---------------| + |am_ET | |Amharic | | + |----------------+----------------+----------------+---------------| + |an_ES | |Aragones | | + |----------------+----------------+----------------+---------------| + |ar_SA | |Arabic | | + |----------------+----------------+----------------+---------------| + |as_IN | |Assamese | | + |----------------+----------------+----------------+---------------| + |ast_ES | |Asturian | | + |----------------+----------------+----------------+---------------| + |az_AZ | |Azerbaijani | | + |----------------+----------------+----------------+---------------| + |bm_ML | |Bambara | | + |----------------+----------------+----------------+---------------| + |bn_IN | |Bengali | | + |----------------+----------------+----------------+---------------| + |be_BY |Bielaruskaja |Belarusian | | + |----------------+----------------+----------------+---------------| + |bg_BG | |Bulgarian | | + |----------------+----------------+----------------+---------------| + |bo_CN (*) | |Tibetan | | + |----------------+----------------+----------------+---------------| + |br_FR |Brezhoneg |Breton | | + |----------------+----------------+----------------+---------------| + |brx_IN | |Bodo | | + |----------------+----------------+----------------+---------------| + |bs_BA | |Bosnian | | + |----------------+----------------+----------------+---------------| + |ca_ES |Català |Catalan | | + |----------------+----------------+----------------+---------------| + |ca_ES@valencia |Valencia |Valencian | | + |----------------+----------------+----------------+---------------| + |cgg_UG |Chiga |Kiga | | + |----------------+----------------+----------------+---------------| + |cs_CZ |Cesky |Czech | | + |----------------+----------------+----------------+---------------| + |cy_GB |Cymraeg |Welsh | | + |----------------+----------------+----------------+---------------| + |da_DK |Dansk |Danish | | + |----------------+----------------+----------------+---------------| + |de_DE |Deutsch |German | | + |----------------+----------------+----------------+---------------| + |doi_IN | |Dogri | | + |----------------+----------------+----------------+---------------| + |et_EE | |Estonian | | + |----------------+----------------+----------------+---------------| + |el_GR (*) | |Greek | | + |----------------+----------------+----------------+---------------| + |en_AU | |Australian | | + | | |English | | + |----------------+----------------+----------------+---------------| + |en_CA | |Canadian English| | + |----------------+----------------+----------------+---------------| + |en_GB | |British English | | + |----------------+----------------+----------------+---------------| + |en_ZA | |South African | | + | | |English | | + |----------------+----------------+----------------+---------------| + |eo | |Esperanto | | + |----------------+----------------+----------------+---------------| + |es_ES |Español |Spanish | | + |----------------+----------------+----------------+---------------| + |es_MX |Español-Mejicano|Mexican Spanish | | + |----------------+----------------+----------------+---------------| + |eu_ES |Euskara |Basque | | + |----------------+----------------+----------------+---------------| + |fa_IR | |Persian | | + |----------------+----------------+----------------+---------------| + |ff_SN |Fulah |Fula | | + |----------------+----------------+----------------+---------------| + |fi_FI |Suomi |Finnish | | + |----------------+----------------+----------------+---------------| + |fo_FO | |Faroese | | + |----------------+----------------+----------------+---------------| + |fr_FR |Français |French | | + |----------------+----------------+----------------+---------------| + |ga_IE |Gàidhlig |Irish Gaelic | | + |----------------+----------------+----------------+---------------| + |gd_GB |Ghaidhlig |Scottish Gaelic | | + |----------------+----------------+----------------+---------------| + |gl_ES |Galego |Galician | | + |----------------+----------------+----------------+---------------| + |gos_NL |Zudelk |Gronings | | + | |Veenkelonioals | | | + |----------------+----------------+----------------+---------------| + |gu_IN | |Gujarati | | + |----------------+----------------+----------------+---------------| + |he_IL (*) | |Hebrew | | + |----------------+----------------+----------------+---------------| + |hi_IN (*) | |Hindi | | + |----------------+----------------+----------------+---------------| + |hr_HR |Hrvatski |Croatian | | + |----------------+----------------+----------------+---------------| + |hu_HU |Magyar |Hungarian | | + |----------------+----------------+----------------+---------------| + |hy_AM |Hayeren |Armenian | | + |----------------+----------------+----------------+---------------| + |id_ID |Bahasa Indonesia|Indonesian | | + |----------------+----------------+----------------+---------------| + |is_IS |Íslenska |Icelandic | | + |----------------+----------------+----------------+---------------| + |it_IT |Italiano |Italian | | + |----------------+----------------+----------------+---------------| + |iu_CA | |Inuktitut | | + |----------------+----------------+----------------+---------------| + |ja_JP (*) | |Japanese |right [Alt] | + |----------------+----------------+----------------+---------------| + |ka_GE | |Georgian | | + |----------------+----------------+----------------+---------------| + |kab | |Kabyle | | + |----------------+----------------+----------------+---------------| + |km_KH | |Khmer | | + |----------------+----------------+----------------+---------------| + |kn_IN | |Kannada | | + |----------------+----------------+----------------+---------------| + |ko_KR (*) | |Korean |right [Alt] or | + | | | |left [Alt] | + |----------------+----------------+----------------+---------------| + |kok_IN | |Konkani | | + | | |(Devaganari) | | + |----------------+----------------+----------------+---------------| + |kok@roman | |Konkani (Roman) | | + |----------------+----------------+----------------+---------------| + |ks_IN@devanagari| |Kashmiri | | + | | |(Devanagari) | | + |----------------+----------------+----------------+---------------| + |ks_IN | |Kashmiri | | + | | |(Perso-Arabic) | | + |----------------+----------------+----------------+---------------| + |ku_TR | |Kurdish | | + |----------------+----------------+----------------+---------------| + |lb_LU |Letzebuergesch |Luxembourgish | | + |----------------+----------------+----------------+---------------| + |lg_UG | |Luganda | | + |----------------+----------------+----------------+---------------| + |lt_LT |Lietuviu |Lithuanian | | + |----------------+----------------+----------------+---------------| + |lv_LV | |Latvian | | + |----------------+----------------+----------------+---------------| + |mk_MK | |Macedonian | | + |----------------+----------------+----------------+---------------| + |mai_IN | |Maithili | | + |----------------+----------------+----------------+---------------| + |ml_IN | |Malayalam | | + |----------------+----------------+----------------+---------------| + |mn_MN | |Mongolian | | + |----------------+----------------+----------------+---------------| + |mni_IN | |Manipuri | | + | | |(Bengali) | | + |----------------+----------------+----------------+---------------| + |mni@meiteimayek | |Manipuri (Meitei| | + | | |Mayek) | | + |----------------+----------------+----------------+---------------| + |mr_IN | |Marathi | | + |----------------+----------------+----------------+---------------| + |ms_MY | |Malay | | + |----------------+----------------+----------------+---------------| + |nb_NO |Norsk (bokmål) |Norwegian Bokmål| | + |----------------+----------------+----------------+---------------| + |ne_NP |Nepali | | | + |----------------+----------------+----------------+---------------| + |nl_NL | |Dutch | | + |----------------+----------------+----------------+---------------| + |nn_NO |Norsk (nynorsk) |Norwegian | | + | | |Nynorsk | | + |----------------+----------------+----------------+---------------| + |nr_ZA | |Ndebele | | + |----------------+----------------+----------------+---------------| + |nso_ZA |Sesotho sa Leboa|Northern Sotho | | + |----------------+----------------+----------------+---------------| + |oc_FR | |Occitan | | + |----------------+----------------+----------------+---------------| + |oj_CA | |Ojibwe |Ojibway | + |----------------+----------------+----------------+---------------| + |pa_IN | |Punjabi | | + |----------------+----------------+----------------+---------------| + |or_IN | |Odia |Oriya | + |----------------+----------------+----------------+---------------| + |pl_PL |Polski |Polish | | + |----------------+----------------+----------------+---------------| + |pt_BR |Portugês |Brazilian | | + | |Brazileiro |Portuguese | | + |----------------+----------------+----------------+---------------| + |pt_PT |Portugês |Portuguese | | + |----------------+----------------+----------------+---------------| + |ro_RO | |Romanian | | + |----------------+----------------+----------------+---------------| + |ru_RU |Russkiy |Russian | | + |----------------+----------------+----------------+---------------| + |rw_RW | |Kinyarwanda | | + |----------------+----------------+----------------+---------------| + |sa_IN | |Sanskrit | | + |----------------+----------------+----------------+---------------| + |sat_IN | |Santali | | + | | |(Devaganari) | | + |----------------+----------------+----------------+---------------| + |sat@olchiki | |Santali | | + | | |(Ol-Chikii) | | + |----------------+----------------+----------------+---------------| + |shs_CA |Secwepemctin |Shuswap | | + |----------------+----------------+----------------+---------------| + |si_LK | |Sinhala | | + |----------------+----------------+----------------+---------------| + |sd_IN@devanagari| |Sindhi | | + | | |(Devanagari) | | + |----------------+----------------+----------------+---------------| + |sd_IN | |Sindhi | | + |----------------+----------------+----------------+---------------| + |sk_SK | |Slovak | | + |----------------+----------------+----------------+---------------| + |sl_SI | |Slovenian | | + |----------------+----------------+----------------+---------------| + |son | |Songhay | | + |----------------+----------------+----------------+---------------| + |sq_AL | |Albanian | | + |----------------+----------------+----------------+---------------| + |sr_YU | |Serbian | | + | | |(cyrillic) | | + |----------------+----------------+----------------+---------------| + |sr_RS@latin | |Serbian (latin) | | + |----------------+----------------+----------------+---------------| + |su_ID | |Sundanese | | + |----------------+----------------+----------------+---------------| + |sv_SE |Svenska |Swedish | | + |----------------+----------------+----------------+---------------| + |sw_TZ | |Swahili | | + |----------------+----------------+----------------+---------------| + |ta_IN (*) | |Tamil | | + |----------------+----------------+----------------+---------------| + |te_IN (*) | |Telugu | | + |----------------+----------------+----------------+---------------| + |th_TH (*) | |Thai | | + |----------------+----------------+----------------+---------------| + |tl_PH (*) | |Tagalog | | + |----------------+----------------+----------------+---------------| + |tlh |tlhIngan |Klingon | | + |----------------+----------------+----------------+---------------| + |tr_TR | |Turkish | | + |----------------+----------------+----------------+---------------| + |tw_GH | |Twi | | + |----------------+----------------+----------------+---------------| + |uk_UA | |Ukrainian | | + |----------------+----------------+----------------+---------------| + |ur_IN | |Urdu | | + |----------------+----------------+----------------+---------------| + |ve_ZA | |Venda | | + |----------------+----------------+----------------+---------------| + |vec |Venèto |Venetian | | + |----------------+----------------+----------------+---------------| + |vi_VN | |Vietnamese | | + |----------------+----------------+----------------+---------------| + |wa_BE | |Walloon | | + |----------------+----------------+----------------+---------------| + |wo_SN | |Wolof | | + |----------------+----------------+----------------+---------------| + |xh_ZA | |Xhosa | | + |----------------+----------------+----------------+---------------| + |zh_CN (*) | |Chinese | | + | | |(Simplified) | | + |----------------+----------------+----------------+---------------| + |zh_TW (*) | |Chinese | | + | | |(Traditional) | | + |----------------+----------------+----------------+---------------| + |zam | |Zapotec | | + | | |(Miahuatlan) | | + |----------------+----------------+----------------+---------------| + |zu_ZA | |Zulu | | +------------------------------------------------------------------+ (*) - These languages require their own fonts, since they are not diff --git a/docs/en/README.txt b/docs/en/README.txt index 28b30d1f3..325889a26 100644 --- a/docs/en/README.txt +++ b/docs/en/README.txt @@ -6,7 +6,7 @@ Copyright 2002-2019 by various contributors; see AUTHORS.txt http://www.tuxpaint.org/ - June 14, 2002 - September 12, 2019 + June 14, 2002 - September 21, 2019 ---------------------------------------------------------------------- diff --git a/docs/en/html/OPTIONS.html b/docs/en/html/OPTIONS.html index e01243862..230f6a9b6 100644 --- a/docs/en/html/OPTIONS.html +++ b/docs/en/html/OPTIONS.html @@ -16,10 +16,10 @@ version

Options Documentation

-

Copyright (c) 2002-2018 by various contributors; see AUTHORS.txt
+

Copyright (c) 2002-2019 by various contributors; see AUTHORS.txt
http://www.tuxpaint.org/

-

December 18, 2018

+

September 21, 2019

@@ -174,6 +174,12 @@ version cannot be used to reenable sounds if they were disabled using this option.) +
nostereo=yes
+
+ Disable stereo panning support. (Useful for users with hearing impairment + in one ear, or places where a single speaker or headphone is being used.) +
+
noquit=yes

Disable the on-screen "Quit" button and prevent the [Escape] key @@ -1512,6 +1518,7 @@ version --allowscreensaver
--startblank
--nosound
+ --nostereo
--noquit
--noprint
--printdelay=SECONDS
@@ -1588,6 +1595,7 @@ version --disablescreensaver
--startlast
--sound
+ --stereo
--quit
--print
--printdelay=0
diff --git a/docs/en/html/README.html b/docs/en/html/README.html index 5ac5e6efc..63796688d 100644 --- a/docs/en/html/README.html +++ b/docs/en/html/README.html @@ -22,7 +22,7 @@ version

June 14, 2002 - - September 12, 2019

+ September 21, 2019

diff --git a/src/manpage/tuxpaint.1 b/src/manpage/tuxpaint.1 index 0c4a2535a..0040cf1a0 100644 --- a/src/manpage/tuxpaint.1 +++ b/src/manpage/tuxpaint.1 @@ -1,5 +1,5 @@ -.\" tuxpaint.1 - 2019.09.12 -.TH TUXPAINT 1 "12 September 2019" "0.9.24" "Tux Paint" +.\" tuxpaint.1 - 2019.09.21 +.TH TUXPAINT 1 "21 September 2019" "0.9.24" "Tux Paint" .SH NAME tuxpaint -- "Tux Paint", a drawing program for young children. @@ -23,6 +23,8 @@ tuxpaint -- "Tux Paint", a drawing program for young children. .br [\-\-nosound] .br +[\-\-nostereo] +.br [\-\-noquit] .br [\-\-noprint] @@ -153,6 +155,8 @@ tuxpaint -- "Tux Paint", a drawing program for young children. .br [\-\-sound] .br +[\-\-stereo] +.br [\-\-quit] .br [\-\-print] @@ -277,7 +281,7 @@ orientations are both supported. (Also see \-\-orient, below.) .TP 8 .B \-\-orient=landscape \-\-orient=portrait -If \-\-orient=portraitis set, asks \fITux Paint\fP to swap the WIDTH and HEIGHT +If \-\-orient=portrait is set, asks \fITux Paint\fP to swap the WIDTH and HEIGHT values it uses for windowed or fullscreen mode, without having to actually change the WIDTH and HEIGHT values in the configuration file or on the command-line. (This is useful on devices where the screen can be rotated, @@ -287,6 +291,10 @@ e.g. tablet PCs.) .B \-\-nosound \-\-sound Disable or enable (default) sound. +.TP 8 +.B \-\-nostereo \-\-stereo +Disable or enable (default) stereo panning support. + .TP 8 .B \-\-noquit \-\-quit Disable or enable (default) the on-screen \fIQuit\fP button and \fIEscape\fP diff --git a/src/parse.gperf b/src/parse.gperf index 7780d75b6..916701295 100644 --- a/src/parse.gperf +++ b/src/parse.gperf @@ -146,6 +146,7 @@ shortcuts, NEGBOOL(noshortcuts) showcursor, NEGBOOL(hide_cursor) simpleshapes, POSBOOL(simple_shapes) sound, POSBOOL(use_sound) +stereo, POSBOOL(use_stereo) stampcontrols, NEGBOOL(disable_stamp_controls) stamps, NEGBOOL(dont_load_stamps) stampsize, MULTI(stamp_size_override) diff --git a/src/parse.h b/src/parse.h index 65e58b073..b78bb9a8b 100644 --- a/src/parse.h +++ b/src/parse.h @@ -54,6 +54,7 @@ struct cfginfo const char *start_blank; const char *use_print_config; const char *use_sound; + const char *use_stereo; const char *wheely; const char *mouseaccessibility; const char *onscreen_keyboard; diff --git a/src/playsound.c b/src/playsound.c index 56aef1131..82d9ec929 100644 --- a/src/playsound.c +++ b/src/playsound.c @@ -1,7 +1,7 @@ /* playsound.c - Copyright (c) 2002-2009 + Copyright (c) 2002-2019 http://www.tuxpaint.org/ This program is free software; you can redistribute it and/or modify @@ -31,6 +31,7 @@ Mix_Chunk *sounds[NUM_SOUNDS]; int mute; int use_sound = 1; +int use_stereo = 1; static int old_sound[4] = { -1, -1, -1, -1 }; /** @@ -80,22 +81,31 @@ void playsound(SDL_Surface * screen, int chan, int s, int override, int x, int y dist = (255 * ((screen->h - 1) - y)) / (screen->h - 1); } - if (x == SNDPOS_LEFT) - left = 255 - dist; - else if (x == SNDPOS_CENTER) - left = (255 - dist) / 2; - else if (x == SNDPOS_RIGHT) - left = 0; + + if (use_stereo) + { + if (x == SNDPOS_LEFT) + left = 255 - dist; + else if (x == SNDPOS_CENTER) + left = (255 - dist) / 2; + else if (x == SNDPOS_RIGHT) + left = 0; + else + { + if (x < 0) + x = 0; + else if (x >= screen->w) + x = screen->w - 1; + + left = ((255 - dist) * ((screen->w - 1) - x)) / (screen->w - 1); + } + } else { - if (x < 0) - x = 0; - else if (x >= screen->w) - x = screen->w - 1; - - left = ((255 - dist) * ((screen->w - 1) - x)) / (screen->w - 1); + /* Stereo disabled; treat everything like a SNDPOS_CENTER + (equal amount in each of the left/right channels) */ + left = (255 - dist) / 2; } - #ifdef DEBUG printf("Panning of sound #%d in channel %d, left=%d, right=%d\n", s, chan, left, (255 - dist) - left); fflush(stdout); diff --git a/src/playsound.h b/src/playsound.h index d6f39a822..c0d9097f0 100644 --- a/src/playsound.h +++ b/src/playsound.h @@ -1,6 +1,6 @@ /* playsound.h - Copyright (c) 2002-2009 + Copyright (c) 2002-2019 http://www.tuxpaint.org/ This program is free software; you can redistribute it and/or modify @@ -35,7 +35,7 @@ #define SNDDIST_NEAR -999 extern Mix_Chunk *sounds[NUM_SOUNDS]; -extern int mute, use_sound; +extern int mute, use_sound, use_stereo; void playsound(SDL_Surface * screen, int chan, int s, int override, int x, int y); diff --git a/src/tuxpaint-completion.bash b/src/tuxpaint-completion.bash index 63c7511b4..ac849f4d7 100644 --- a/src/tuxpaint-completion.bash +++ b/src/tuxpaint-completion.bash @@ -30,6 +30,7 @@ _tuxpaint() --orient=landscape --orient=portrait \ -b --startblank --startlast \ --sound -q --nosound \ + --stereo --nostereo \ -x --noquit --quit -p --print --noprint \ --complexshapes -s --simpleshapes \ diff --git a/src/tuxpaint.c b/src/tuxpaint.c index 8e93cbe27..849afc8ab 100644 --- a/src/tuxpaint.c +++ b/src/tuxpaint.c @@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA (See COPYING.txt) - June 14, 2002 - August 29, 2019 + June 14, 2002 - September 21, 2019 */ @@ -6456,6 +6456,7 @@ void show_usage(int exitcode) " [--orient=landscape | --orient=portrait]\n" " [--disablescreensaver | --allowscreensaver ]\n" " [--sound | --nosound]\n" + " [--stereo | --nostereo]\n" " [--colorfile FILE]\n" "\n" " Mouse/Keyboard:\n" @@ -18574,7 +18575,15 @@ static void magic_playsound(Mix_Chunk * snd, int left_right, int up_down) else if (left_right > 255) left_right = 255; - left = ((255 - dist) * (255 - left_right)) / 255; + if (use_stereo) + { + left = ((255 - dist) * (255 - left_right)) / 255; + } + else + { + /* Stereo disabled; no panning (see playsound.c) */ + left = (255 - dist) / 2; + } Mix_SetPanning(0, left, (255 - dist) - left); #endif @@ -22590,6 +22599,7 @@ static void setup_config(char *argv[]) SETBOOL(start_blank); SETBOOL(use_print_config); SETBOOL(use_sound); + SETBOOL(use_stereo); SETBOOL(wheely); SETBOOL(mouseaccessibility); SETBOOL(onscreen_keyboard); diff --git a/src/tuxpaint.conf b/src/tuxpaint.conf index 88b34bae1..8e68914b5 100644 --- a/src/tuxpaint.conf +++ b/src/tuxpaint.conf @@ -7,7 +7,7 @@ # http://www.tuxpaint.org/ # # Default distribution version last modified: -# April 30, 2012 +# September 21, 2019 # # $Id$ @@ -76,6 +76,13 @@ # sound=yes +### Disable stereo sound (only use mono)? +### ------------------------------------- +# +# nostereo=yes +# stereo=yes + + ### Disable the on-screen 'Quit' button in the toolbar? ### --------------------------------------------------- ### Note: Pressing the [Escape] key,