Skip to content

Added 'Encoding' option #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
harawata wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added 'Encoding' option #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,38 @@
<input id="prefdisablesounds" type="checkbox" class="prefinput">
<label class="preflabel" for="prefautoplayvideos">Autoplay log videos:</label>
<input id="prefautoplayvideos" type="checkbox" class="prefinput">
<label class="preflabel" for="prefencoding">Encoding:</label>
<select id="prefencoding" class="prefinput">
<optgroup>
<option value="windows-1252">Western (Windows-1252)</option>
<option value="macintosh">Western (Macintosh)</option>
<option value="iso-8859-15">Western (ISO-8859-15)</option>
<option value="iso-8859-1">Western (ISO-8859-1)</option>
</optgroup>
<optgroup>
<option value="utf-8">Unicode (UTF-8)</option>
<option value="utf-16">Unicode (UTF-16)</option>
</optgroup>
<optgroup>
<option value="shift_jis">Japanese (Shift_JIS)</option>
</optgroup>
<optgroup>
<option value="gb2312">Chinese Simplified (GB2312)</option>
<option value="gbk">Chinese Simplified (GBK)</option>
<option value="big5">Chinese Traditional (Big5)</option>
</optgroup>
<optgroup>
<option value="iso-8859-5">Cyrillic (ISO-8859-5)</option>
<option value="windows-1251">Cyrillic (Windows-1251)</option>
</optgroup>
<optgroup>
<option value="iso-8859-14">Celtic (ISO-8859-14)</option>
</optgroup>
<optgroup>
<option value="windows-1253">Greek (Widows-1253)</option>
<option value="iso-8859-7">Greek (ISO-8859-7)</option>
</optgroup>
</select>
</div>

<div id="authenticate" class="zoompanel" data-state=0>
Expand Down
7 changes: 5 additions & 2 deletions js/client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,7 @@ class PalaceProtocol {

connect(ip,port) {

this.textDecoder = new TextDecoder('windows-1252'); // default server encoding
this.textEncoder = new TextEncoder('windows-1252', { NONSTANDARD_allowLegacyEncoding: true }); // palace default! :\
this.setEncoder(prefs.general.encoding);

if (!port) port = '9998';
this.ip = ip.trim();
Expand Down Expand Up @@ -1160,6 +1159,10 @@ class PalaceProtocol {
this.send(packet);
}

setEncoder(encoding) {
this.textDecoder = new TextDecoder(encoding);
this.textEncoder = new TextEncoder(encoding, { NONSTANDARD_allowLegacyEncoding: true }); // palace default! :\
}
}


Expand Down
9 changes: 9 additions & 0 deletions js/interface.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,15 @@ if (window.require) {
document.getElementById('prefhomepalace').onchange = function() {
setGeneralPref('home',this.value);
};
document.getElementById('prefencoding').onchange = function() {
try {
palace.setEncoder(this.value);
setGeneralPref('encoding',this.value);
} catch (error) {
logerror(error);
this.value = getGeneralPref('encoding');
}
};
document.getElementById('prefpropbagsize').oninput = function() { // change prop bag tile size :D
setGeneralPref('propBagTileSize',this.value);
refreshPropBagView(true);
Expand Down
5 changes: 3 additions & 2 deletions js/preferences.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ function setGeneralPref(id,value) {
prefs.general[id] = value;
}

function getGeneralPref(id) {
return prefs.general[id];
function getGeneralPref(id,def) {
return prefs.general.hasOwnProperty(id) ? prefs.general[id] : def;
}

window.onunload = function(e) {
Expand Down Expand Up @@ -66,4 +66,5 @@ window.onunload = function(e) {
}
document.getElementById('prefusername').value = getGeneralPref('userName');
document.getElementById('prefhomepalace').value = getGeneralPref('home');
document.getElementById('prefencoding').value = getGeneralPref('encoding','windows-1252');
})();